[Librefm-commits] [1731] change to email address reset, not username

[Matt Lee]

Revision: 1731
          http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1731
Author:   mattl
Date:     2009-05-21 15:29:35 +0000 (Thu, 21 May 2009)
Log Message:
-----------
change to email address reset, not username

Modified Paths:
--------------
    branches/stable/nixtape/reset.php
    branches/stable/nixtape/themes/librefm/templates/reset.tpl

Modified: branches/stable/nixtape/reset.php
===================================================================
--- branches/stable/nixtape/reset.php   2009-05-21 14:58:07 UTC (rev 1730)
+++ branches/stable/nixtape/reset.php   2009-05-21 15:29:35 UTC (rev 1731)
@@ -65,15 +65,15 @@
        $smarty->assign('changed', true);
 }
 
-else if (isset($_POST['user'])) {
-       $username = $_POST['user'];
+else if (isset($_POST['email'])) {
+       $email = $_POST['email'];
 
        $adodb->SetFetchMode(ADODB_FETCH_ASSOC);
        $err = 0;
 
        try {
-               $row = $adodb->GetRow('SELECT * FROM Users WHERE username="'
-                               . $adodb->qstr($username));
+               $row = $adodb->GetRow('SELECT * FROM Users WHERE email="'
+                               . $adodb->qstr($email));
        }
        catch (exception $e) {
                $err = 1;
@@ -103,8 +103,8 @@
                        }
 
                        $url = $base_url . '/reset.php?code=' . $code;
-                       $content = "Hi!\n\nSomeone from the IP-address " . 
$_SERVER['REMOTE_ADDR'] . " entered your username "
-                       . "in the password reset form at libre.fm. To change 
you password, please visit\n\n"
+                       $content = "Hi!\n\nSomeone from the IP-address " . 
$_SERVER['REMOTE_ADDR'] . " entered your username, " . $row['username'] 
+                       . " into the password reset form at libre.fm. To change 
your password, please visit\n\n"
                        . $url . "\n\n- The Libre.fm Team";
                        sendEmail($content, $row['email']);
                        $smarty->assign('sent', true);

Modified: branches/stable/nixtape/themes/librefm/templates/reset.tpl
===================================================================
--- branches/stable/nixtape/themes/librefm/templates/reset.tpl  2009-05-21 
14:58:07 UTC (rev 1730)
+++ branches/stable/nixtape/themes/librefm/templates/reset.tpl  2009-05-21 
15:29:35 UTC (rev 1731)
@@ -20,8 +20,8 @@
        <form action="{$base_url}/reset.php" method='post'>
                <fieldset>
 
-                       <label for='username'>{t}Username{/t}</span></label>
-                       <input id='username' name='user' type='text' value='' />
+                       <label for='email'>{t}Email address{/t}</span></label>
+                       <input id='email' name='email' type='text' value='' />
 
                        <input type='submit' name='recover' value='{t}Reset my 
password!{/t}'/>
                </fieldset>