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

[bugdar.git] / login.php

diff --git a/login.php b/login.php
index ef1620520e39974ea010d9d135419ace5e653613..c38ca4553232b92fd205ba929d506a6eedd64643 100755 (executable)
--- a/login.php
+++ b/login.php
@@ -25,15 +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');
-
-APIError(array(new API_Error_Handler($message), 'user_cumulative'));
 
 // ###################################################################
 
@@ -46,14 +42,14 @@ if (bugdar::$userinfo['userid'] AND $_REQUEST['do'] != 'logout' AND $_POST['do']
 
 if (empty($_REQUEST['do']))
 {
-       eval('$template->flush("' . $template->fetch('login') . '");');
+       BSTemplate::fetch('login')->evaluate()->flush();
 }
 
 // ###################################################################
 
 if ($_POST['do'] == 'login' OR $_POST['do'] == 'cplogin')
 {
-       $keeplogin = $bugsys->input_clean('rememberme', TYPE_BOOL);
+       $keeplogin = $input->inputClean('rememberme', TYPE_BOOL);
        if ($_POST['cplogin'])
        {
                $keeplogin = 0;
@@ -68,7 +64,7 @@ if ($_POST['do'] == 'login' OR $_POST['do'] == 'cplogin')
                $url = 'index.php';
        }
        
-       if ($auth->authenticateLogin($bugsys->in['email'], $bugsys->in['password'], $keeplogin))
+       if ($auth->authenticateLogin($input->in['email'], $input->in['password'], $keeplogin))
        {
                if ($_POST['do'] == 'cplogin')
                {
@@ -91,9 +87,9 @@ if ($_REQUEST['do'] == 'logout')
 {
        if (bugdar::$userinfo['userid'])
        {
-               $db->query("DELETE FROM " . TABLE_PREFIX . "adminsession WHERE sessionid = '" . $bugsys->input_escape(COOKIE_PREFIX . 'adminsession') . "'");
+               $db->query("DELETE FROM " . TABLE_PREFIX . "adminsession WHERE sessionid = '" . $input->inputEscape(COOKIE_PREFIX . 'adminsession') . "'");
                $auth->clearCookies();
-               BSFunctions::cookie(COOKIE_PREFIX . 'adminsession');
+               BSFunctions::cookie(COOKIE_PREFIX . 'adminsession', false);
                $message->redirect(T('You have been logged out.'), ($_SERVER['HTTP_REFERER'] ? $_SERVER['HTTP_REFERER'] : 'index.php'));
        }
        else
@@ -106,9 +102,9 @@ if ($_REQUEST['do'] == 'logout')
 
 if ($_POST['do'] == 'sendpw')
 {      
-       $user = new UserAPI($bugsys);
-       $user->set('email', $bugsys->in['email'], true, false); // don't verify so we don't get errors about existing emails
-       $user->set_condition(array('email'));
+       $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();
        
        if ($message->hasErrors())
@@ -119,17 +115,17 @@ if ($_POST['do'] == 'sendpw')
        else
        {
                $activator = BSFunctions::random(25);
-               $db->query("INSERT INTO " . TABLE_PREFIX . "passwordreset (activatorid, dateline, userid) VALUES ('" . $activator . "', " . TIMENOW . ", " . $user->objdata['userid'] . ")");
-               
-               eval('$email = "' . $template->fetch(FetchEmailPath('passwordreset.xml', bugdar::$datastore['language'][$user->objdata['languageid']]['langcode'])) . '";');
-               $email = $bugsys->xml->parse($email);
+               $db->query("INSERT INTO " . TABLE_PREFIX . "passwordreset (activatorid, dateline, userid) VALUES ('" . $activator . "', " . TIMENOW . ", " . $user->record['userid'] . ")");
                
-               $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']);
                
-               $mail->send($user->objdata['email'], $user->objdata['displayname']);
-               
-               $message->message(sprintf(T('An email has been dispatched to %1$s that contains instructions on how to reset your password.'), $user->objdata['email']));
+               $message->message(sprintf(T('An email has been dispatched to %1$s that contains instructions on how to reset your password.'), $user->record['email']));
        }
 }
 
@@ -137,7 +133,7 @@ if ($_POST['do'] == 'sendpw')
 
 if ($_REQUEST['do'] == 'lostpw')
 {
-       eval('$template->flush("' . $template->fetch('lostpassword') . '");');
+       BSTemplate::fetch('lostpassword')->evaluate()->flush();
 }
 
 // ###################################################################
@@ -148,26 +144,25 @@ if ($_POST['do'] == 'resetpw')
        $db->query("DELETE FROM " . TABLE_PREFIX . "passwordreset WHERE dateline < " . (TIMENOW - 86400));
        
        // now look for ours
-       $activation = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "passwordreset WHERE activatorid = '" . $bugsys->input_escape('activator') . "'");
+       $activation = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "passwordreset WHERE activatorid = '" . $input->inputEscape('activator') . "'");
        if (!$activation)
        {
                $message->error(L_INVALID_ID);
        }
        
-       $user = new UserAPI($bugsys);
+       $user = new UserAPI();
        $user->set('userid', $activation['userid']);
-       $user->set_condition();
        
-       if ($bugsys->in['fix_password'] != $bugsys->in['confirm_password'])
+       if ($input->in['fix_password'] != $input->in['confirm_password'])
        {
                $message->addError(T('The passwords you entered do not patch.'));
        }
-       if (empty($bugsys->in['fix_password']))
+       if (empty($input->in['fix_password']))
        {
                $message->addError(T('Your new password cannot be empty.'));
        }
        
-       $user->set('password', $bugsys->in['fix_password']);
+       $user->set('password', $input->in['fix_password']);
        
        if (!$message->hasErrors())
        {
@@ -192,13 +187,18 @@ if ($_REQUEST['do'] == 'recoverpw')
        $db->query("DELETE FROM " . TABLE_PREFIX . "passwordreset WHERE dateline < " . (TIMENOW - 86400));
        
        // now look for ours
-       $activation = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "passwordreset WHERE activatorid = '" . $bugsys->input_escape('activator') . "'");
+       $activation = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "passwordreset WHERE activatorid = '" . $input->inputEscape('activator') . "'");
        if (!$activation)
        {
                $message->error(T('Invalid activation reset key. Please make sure you copied the URL exactly as it appeared in the email.'));
        }
        
-       eval('$template->flush("' . $template->fetch('passwordreset') . '");');
+       $tpl = new BSTemplate('passwordreset');
+       $tpl->vars = array(
+               'activation'    => $activation,
+               'message'               => $message
+       );
+       $tpl->evaluate()->flush();
 }
 
 // ###################################################################
@@ -207,8 +207,8 @@ if ($_REQUEST['do'] == 'cplogout')
 {
        if ($_COOKIE[COOKIE_PREFIX . 'adminsession'])
        {
-               $db->query("DELETE FROM " . TABLE_PREFIX . "adminsession WHERE sessionid = '" . $bugsys->input_escape(COOKIE_PREFIX . 'adminsession') . "'");
-               BSFunctions::cookie(COOKIE_PREFIX . 'adminsession');
+               $db->query("DELETE FROM " . TABLE_PREFIX . "adminsession WHERE sessionid = '" . $input->inputEscape(COOKIE_PREFIX . 'adminsession') . "'");
+               BSFunctions::cookie(COOKIE_PREFIX . 'adminsession', false);
                $message->redirect(T('You have been logged out.'), 'admin/');
        }
        else
@@ -217,10 +217,4 @@ if ($_REQUEST['do'] == 'cplogout')
        }
 }
 
-/*=====================================================================*\
-|| ###################################################################
-|| # $HeadURL$
-|| # $Id$
-|| ###################################################################
-\*=====================================================================*/
 ?>
\ No newline at end of file