Switch the 'modify' code of admin/field.php to use templates

[bugdar.git] / login.php

diff --git a/login.php b/login.php
index 14723127908056af262644f1341157a7d0c0df23..c38ca4553232b92fd205ba929d506a6eedd64643 100755 (executable)
--- a/login.php
+++ b/login.php
@@ -25,13 +25,11 @@ $fetchtemplates = array(
        'passwordreset'
 );
 
-define('SVN', '$Id$');
 
 $focus['user'] = 'focus';
 
 require_once('./global.php');
 require_once('./includes/api_user.php');
-require_once('./includes/class_api_error.php');
 
 // ###################################################################
 
@@ -91,7 +89,7 @@ if ($_REQUEST['do'] == 'logout')
        {
                $db->query("DELETE FROM " . TABLE_PREFIX . "adminsession WHERE sessionid = '" . $input->inputEscape(COOKIE_PREFIX . 'adminsession') . "'");
                $auth->clearCookies();
-               BSFunctions::cookie(COOKIE_PREFIX . 'adminsession', null);
+               BSFunctions::cookie(COOKIE_PREFIX . 'adminsession', false);
                $message->redirect(T('You have been logged out.'), ($_SERVER['HTTP_REFERER'] ? $_SERVER['HTTP_REFERER'] : 'index.php'));
        }
        else
@@ -104,7 +102,7 @@ if ($_REQUEST['do'] == 'logout')
 
 if ($_POST['do'] == 'sendpw')
 {      
-       $user = new UserAPI($bugsys);
+       $user = new UserAPI();
        $user->set('email', $input->in['email'], true, false); // don't verify so we don't get errors about existing emails
        $user->setCondition(array('email'));
        $user->fetch();
@@ -119,14 +117,12 @@ if ($_POST['do'] == 'sendpw')
                $activator = BSFunctions::random(25);
                $db->query("INSERT INTO " . TABLE_PREFIX . "passwordreset (activatorid, dateline, userid) VALUES ('" . $activator . "', " . TIMENOW . ", " . $user->record['userid'] . ")");
                
-               $email = new BSTemplate(FetchEmailPath('passwordreset.xml', bugdar::$datastore['language'][$user->record['languageid']]['langcode']));
-               $email->vars = array('activator' => $activator);
-               
-               $email = $bugsys->xml->parse($email->evaluate()->getTemplate());
-               
-               $mail->setSubject($email['email']['subject']['value']);
-               $mail->setBodyText($email['email']['bodyText']['value']);
-               
+               $email = get_email_text('password_reset');
+               $mail = new BSMail();
+               $mail->setSubject($email['subject']);
+               $mail->setBodyText(sprintf($email['bodyText'], $user->record['displayname'], bugdar::$options['trackertitle'], bugdar::$options['trackerurl'], $activator));
+               $mail->setFromAddress(MAIL_FROM_ADDRESS);
+               $mail->setFromName(MAIL_FROM_NAME);
                $mail->send($user->record['email'], $user->record['displayname']);
                
                $message->message(sprintf(T('An email has been dispatched to %1$s that contains instructions on how to reset your password.'), $user->record['email']));
@@ -154,7 +150,7 @@ if ($_POST['do'] == 'resetpw')
                $message->error(L_INVALID_ID);
        }
        
-       $user = new UserAPI($bugsys);
+       $user = new UserAPI();
        $user->set('userid', $activation['userid']);
        
        if ($input->in['fix_password'] != $input->in['confirm_password'])
@@ -212,7 +208,7 @@ if ($_REQUEST['do'] == 'cplogout')
        if ($_COOKIE[COOKIE_PREFIX . 'adminsession'])
        {
                $db->query("DELETE FROM " . TABLE_PREFIX . "adminsession WHERE sessionid = '" . $input->inputEscape(COOKIE_PREFIX . 'adminsession') . "'");
-               BSFunctions::cookie(COOKIE_PREFIX . 'adminsession', null);
+               BSFunctions::cookie(COOKIE_PREFIX . 'adminsession', false);
                $message->redirect(T('You have been logged out.'), 'admin/');
        }
        else
@@ -221,10 +217,4 @@ if ($_REQUEST['do'] == 'cplogout')
        }
 }
 
-/*=====================================================================*\
-|| ###################################################################
-|| # $HeadURL$
-|| # $Id$
-|| ###################################################################
-\*=====================================================================*/
 ?>
\ No newline at end of file