librefm-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Librefm-commits] [1173] some tweaks to Piotr's patch.


From: Clint Adams
Subject: [Librefm-commits] [1173] some tweaks to Piotr's patch.
Date: Mon, 04 May 2009 00:23:04 +0000

Revision: 1173
          http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1173
Author:   clint
Date:     2009-05-04 00:23:03 +0000 (Mon, 04 May 2009)
Log Message:
-----------
some tweaks to Piotr's patch.

Modified Paths:
--------------
    trunk/gnukebox/install.php
    trunk/nixtape/data/Server.php
    trunk/nixtape/delete_profile.php
    trunk/nixtape/themes/librefm/templates/maxiprofile.tpl

Modified: trunk/gnukebox/install.php
===================================================================
--- trunk/gnukebox/install.php  2009-05-04 00:22:58 UTC (rev 1172)
+++ trunk/gnukebox/install.php  2009-05-04 00:23:03 UTC (rev 1173)
@@ -230,8 +230,8 @@
        //Table for delete profile requests             
        $res = $mdb2->query("CREATE TABLE Delete_Request (
                        code VARCHAR(300), 
-                       expire INT, 
-                       username VARCHAR(100) REFERENCES Users(username),
+                       expires INTEGER, 
+                       username VARCHAR(64) REFERENCES Users(username),
                        PRIMARY KEY(code)");
 
        $res = $mdb2->exec("CREATE TABLE Scrobble_Track(
@@ -256,7 +256,7 @@
 //      $res = $mdb2->exec("CREATE INDEX scrobbles_track_idx on 
Scrobbles(lower(track))");
 
 // uncomment these if you're using postgresql and want to run the software as 
www-data
-//     $res = $mdb2->exec("GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE 
Album, Artist, Auth, Clientcodes, Error, Invitation_Request, Invitations, 
Now_Playing, Places, Radio_Sessions, Scrobble_Sessions, Scrobbles, 
Scrobble_Track, Similar_Artist, Tags, Track, Users to \"www-data\"");
+//     $res = $mdb2->exec("GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE 
Album, Artist, Auth, Clientcodes, Delete_Request Error, Invitation_Request, 
Invitations, Now_Playing, Places, Radio_Sessions, Scrobble_Sessions, Scrobbles, 
Scrobble_Track, Similar_Artist, Tags, Track, Users to \"www-data\"");
 //     $res = $mdb2->exec("GRANT SELECT ON Free_Scrobbles to \"www-data\"");
 //     $res = $mdb2->exec("GRANT SELECT, UPDATE ON users_uniqueid_seq, 
scrobble_track_id_seq to \"www-data\"");
 

Modified: trunk/nixtape/data/Server.php
===================================================================
--- trunk/nixtape/data/Server.php       2009-05-04 00:22:58 UTC (rev 1172)
+++ trunk/nixtape/data/Server.php       2009-05-04 00:23:03 UTC (rev 1173)
@@ -272,6 +272,8 @@
                if ($component == 'edit')
                {
                        return $base_url . "/user-edit.php";
+               } elseif ($component == 'delete') {
+                       return $base_url . "/delete-profile.php";
                }
                elseif($friendly_urls)
                {

Modified: trunk/nixtape/delete_profile.php
===================================================================
--- trunk/nixtape/delete_profile.php    2009-05-04 00:22:58 UTC (rev 1172)
+++ trunk/nixtape/delete_profile.php    2009-05-04 00:23:03 UTC (rev 1173)
@@ -22,7 +22,8 @@
        $smarty->display('error.tpl');
        die ();
 } elseif ( isset ($_GET['code'])) {
-       //TODO: Implement expiration
+       $mdb2->exec("DELETE FROM Delete_Request WHERE expires < " . 
$mdb2->quote(time(), "integer"));
+
        $user = new User($_SESSION['user']->name);
        $username = $user->name;
        $code = $_GET['code'];
@@ -38,14 +39,14 @@
                $smarty->display('error.tpl');
                die ();
        } else {
-               $mdb2->query("DELETE FROM Users WHERE lower(username) = 
".$mdb2->quote(strtolower($username), 'text'));
-               $mdb2->query("DELETE FROM Scrobble_Sessions WHERE username = 
".$mdb2->quote($username, 'text'));
-               $mdb2->query("DELETE FROM Delete_Request WHERE username = 
".$mdb2->quote($username, 'text'));
-               $mdb2->query("DELETE FROM Auth WHERE username = 
".$mdb2->quote($username, 'text'));
-               $mdb2->query("DELETE FROM Group_Members WHERE member = 
".$mdb2->quote($username, 'text'));
-               $mdb2->query("DELETE FROM Radio_Sessions WHERE username = 
".$mdb2->quote($username, 'text'));
-               $mdb2->query("DELETE FROM Recovery_Request WHERE username = 
".$mdb2->quote($username, 'text'));
-               $mdb2->query("DELETE FROM Scrobbles WHERE username = 
".$mdb2->quote($username, 'text'));
+               $mdb2->exec("DELETE FROM Users WHERE lower(username) = 
".$mdb2->quote(strtolower($username), 'text'));
+               $mdb2->exec("DELETE FROM Scrobble_Sessions WHERE username = 
".$mdb2->quote($username, 'text'));
+               $mdb2->exec("DELETE FROM Delete_Request WHERE username = 
".$mdb2->quote($username, 'text'));
+               $mdb2->exec("DELETE FROM Auth WHERE username = 
".$mdb2->quote($username, 'text'));
+               $mdb2->exec("DELETE FROM Group_Members WHERE member = 
".$mdb2->quote($username, 'text'));
+               $mdb2->exec("DELETE FROM Radio_Sessions WHERE username = 
".$mdb2->quote($username, 'text'));
+               $mdb2->exec("DELETE FROM Recovery_Request WHERE username = 
".$mdb2->quote($username, 'text'));
+               $mdb2->exec("DELETE FROM Scrobbles WHERE username = 
".$mdb2->quote($username, 'text'));
                session_destroy();
                header("Location: index.php");
        }
@@ -55,9 +56,9 @@
        $username = $user->name;
        $email = $user->email;
        $expire = time()+86400;
-       $mdb2->query("INSERT INTO Delete_Request VALUES (".$mdb2->quote($code, 
'text').', '.$mdb2->quote($expire, 'text').",".$mdb2->quote($username, 
'text').')');
+       $mdb2->exec("INSERT INTO Delete_Request (code, expires, username) 
VALUES (".$mdb2->quote($code, 'text').', '.$mdb2->quote($expire, 
'text').",".$mdb2->quote($username, 'text').')');
        $url = $base_url."/delete_profile.php?code=".$code;
-       $content = "Hi!\n\nSomeone from the IP-address 
".$_SERVER['REMOTE_ADDR']." requested "."account delete @ libre.fm. To remove 
acount click: \n\n".$url."\n\n- The Libre.fm Team";
+       $content = "Hi!\n\nSomeone from the IP address 
".$_SERVER['REMOTE_ADDR']." requested account deletion @ libre.fm.  To remove 
this account click: \n\n".$url."\n\n- The Libre.fm Team";
        $headers = 'From: Libre.fm <address@hidden>';
        $subject = 'Libre.fm Account Delete Request - Action needed!';
        mail($email, $subject, $text, $headers);

Modified: trunk/nixtape/themes/librefm/templates/maxiprofile.tpl
===================================================================
--- trunk/nixtape/themes/librefm/templates/maxiprofile.tpl      2009-05-04 
00:22:58 UTC (rev 1172)
+++ trunk/nixtape/themes/librefm/templates/maxiprofile.tpl      2009-05-04 
00:23:03 UTC (rev 1173)
@@ -6,6 +6,7 @@
 
        {if $isme}
        <a class="edit" 
href="{$me->getURL('edit')|escape:'html':'UTF-8'}">[edit]</a>
+       <a class="delete" 
href="{$me->getURL('edit')|escape:'html':'UTF-8'}">[delete]</a>
        {/if}
 
        <dl>





reply via email to

[Prev in Thread] Current Thread [Next in Thread]