Changeset 2566:9bf417837888 for admin/auth.php

Timestamp:

11/17/13 20:25:53 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.6

Children:

2567:6c11245cbf04, 2568:61c67a7d17fa

Message:

Add some people in CREDITS, remove trailing spaces and tabs.

File:

• admin/auth.php (modified) (18 diffs)

admin/auth.php

@@ -83 +83 @@
      {
           $recover_key = $core->auth->setRecoverKey($user_id,$user_email);
-          
+
           $subject = mail::B64Header('DotClear '.__('Password reset'));
           $message =
@@ -90 +90 @@
           __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.')."\n".
           $page_url.'?akey='.$recover_key;
-          
+
           $headers[] = 'From: '.(defined('DC_ADMIN_MAILFROM') && DC_ADMIN_MAILFROM ? DC_ADMIN_MAILFROM : 'dotclear@local');
           $headers[] = 'Content-Type: text/plain; charset=UTF-8;';
-          
+
           mail::sendMail($user_email,$subject,$message,$headers);
           $msg = sprintf(__('The e-mail was sent successfully to %s.'),$user_email);
@@ -108 +108 @@
      {
           $recover_res = $core->auth->recoverUserPassword($akey);
-          
+
           $subject = mb_encode_mimeheader('DotClear '.__('Your new password'),'UTF-8','B');
           $message =
@@ -114 +114 @@
           __('Password:').' '.$recover_res['new_pass']."\n\n".
           preg_replace('/\?(.*)$/','',$page_url);
-          
+
           $headers[] = 'From: dotclear@'.$_SERVER['HTTP_HOST'];
           $headers[] = 'Content-Type: text/plain; charset=UTF-8;';
-          
+
           mail::sendMail($recover_res['user_email'],$subject,$message,$headers);
           $msg = __('Your new password is in your mailbox.');
@@ -143 +143 @@
                throw new Exception();
           }
-          
+
      # Check login informations
      $check_user = false;
@@ -157 +157 @@
           }
      }
-     
+
           if (!$core->auth->allowPassChange() || !$check_user) {
                $change_pwd = false;
                throw new Exception();
           }
-          
+
           if ($_POST['new_pwd'] != $_POST['new_pwd_c']) {
                throw new Exception(__("Passwords don't match"));
           }
-          
+
           if ($core->auth->checkUser($user_id,$_POST['new_pwd']) === true) {
                throw new Exception(__("You didn't change your password."));
           }
-          
+
           $cur = $core->con->openCursor($core->prefix.'user');
           $cur->user_change_pwd = 0;
           $cur->user_pwd = $_POST['new_pwd'];
           $core->updUser($core->auth->userID(),$cur);
-          
+
           $core->session->start();
           $_SESSION['sess_user_id'] = $user_id;
           $_SESSION['sess_browser_uid'] = http::browserUID(DC_MASTER_KEY);
-          
+
           if ($data['user_remember'])
           {
                setcookie('dc_admin',$data['cookie_admin'],strtotime('+15 days'),'','',DC_ADMIN_SSL);
           }
-          
+
           http::redirect('index.php');
      }
@@ -202 +202 @@
           $check_perms = false;
      }
-     
+
      $cookie_admin = http::browserUID(DC_MASTER_KEY.$user_id.
           crypt::hmac(DC_MASTER_KEY,$user_pwd)).bin2hex(pack('a32',$user_id));
-     
+
      if ($check_perms && $core->auth->mustChangePassword())
      {
@@ -213 +213 @@
                empty($_POST['user_remember'])?'0':'1'
           ));
-          
+
           if (!$core->auth->allowPassChange()) {
                $err = __('You have to change your password before you can login.');
@@ -221 +221 @@
           }
      }
-     elseif ($check_perms && !empty($_POST['safe_mode']) && !$core->auth->isSuperAdmin()) 
+     elseif ($check_perms && !empty($_POST['safe_mode']) && !$core->auth->isSuperAdmin())
      {
           $err = __('Safe Mode can only be used for super administrators.');
@@ -230 +230 @@
           $_SESSION['sess_user_id'] = $user_id;
           $_SESSION['sess_browser_uid'] = http::browserUID(DC_MASTER_KEY);
-          
+
           if (!empty($_POST['blog'])) {
                $_SESSION['sess_blog_id'] = $_POST['blog'];
           }
-          
+
           if (!empty($_POST['safe_mode']) && $core->auth->isSuperAdmin()) {
                $_SESSION['sess_safe_mode'] = true;
           }
-          
+
           if (!empty($_POST['user_remember'])) {
                setcookie('dc_admin',$cookie_admin,strtotime('+15 days'),'','',DC_ADMIN_SSL);
           }
-          
+
           http::redirect('index.php');
      }
@@ -280 +280 @@
   <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
 
-  
+
 <?php
 echo dcPage::jsLoadIE7();
 echo dcPage::jsCommon();
 ?>
-  
+
      <link rel="stylesheet" href="style/default.css" type="text/css" media="screen" />
-      
+
   <?php
   # --BEHAVIOR-- loginPageHTMLHead
   $core->callBehavior('loginPageHTMLHead');
   ?>
-  
+
   <script type="text/javascript">
   //<![CDATA[
@@ -299 +299 @@
     var upw = $('input[name=user_pwd]');
     uid.focus();
-    
+
     if (upw.length == 0) { return; }
-    
+
     uid.keypress(processKey);
 
@@ -347 +347 @@
      '<p><label for="user_id">'.__('Username:').'</label> '.
      form::field(array('user_id','user_id'),20,32,html::escapeHTML($user_id)).'</p>'.
-     
+
      '<p><label for="user_email">'.__('Email:').'</label> '.
      form::field(array('user_email','user_email'),20,255,html::escapeHTML($user_email)).'</p>'.
-     
+
      '<p><input type="submit" value="'.__('recover').'" />'.
      form::hidden(array('recover'),1).'</p>'.
      '</div>'.
-     
+
      '<div id="issue">'.
      '<p><a href="auth.php">'.__('Back to login screen').'</a></p>'.
@@ -365 +365 @@
      '<p><label for="new_pwd">'.__('New password:').'</label> '.
      form::password(array('new_pwd','new_pwd'),20,255).'</p>'.
-     
+
      '<p><label for="new_pwd_c">'.__('Confirm password:').'</label> '.
      form::password(array('new_pwd_c','new_pwd_c'),20,255).'</p>'.
      '</div>'.
-     
+
      '<p><input type="submit" value="'.__('change').'" />'.
      form::hidden('login_data',$login_data).'</p>';
@@ -384 +384 @@
                echo '<div class="fieldset">';
                echo '<h2>'.__('Safe mode login').'</h2>';
-               echo 
+               echo
                     '<p class="form-note">'.
                     __('This mode allows you to login without activating any of your plugins. This may be useful to solve compatibility problems').'&nbsp;</p>'.
@@ -397 +397 @@
           '<p><label for="user_id">'.__('Username:').'</label> '.
           form::field(array('user_id','user_id'),20,32,html::escapeHTML($user_id)).'</p>'.
-          
+
           '<p><label for="user_pwd">'.__('Password:').'</label> '.
           form::password(array('user_pwd','user_pwd'),20,255).'</p>'.
-          
+
           '<p>'.
           form::checkbox(array('user_remember','user_remember'),1).
           '<label for="user_remember" class="classic">'.
           __('Remember my ID on this computer').'</label></p>'.
-          
+
           '<p><input type="submit" value="'.__('log in').'" class="login" /></p>';
-          
+
           if (!empty($_REQUEST['blog'])) {
                echo form::hidden('blog',html::escapeHTML($_REQUEST['blog']));
           }
           if($safe_mode) {
-               echo 
+               echo
                form::hidden('safe_mode',1).
                '</div>';
@@ -423 +423 @@
 
           echo '<div id="issue">';
-          
+
           if ($safe_mode) {
                echo
@@ -434 +434 @@
                echo '<p><a href="auth.php?safe_mode=1" id="safe_mode_link">'.__('I want to log in in safe mode').'</a></p>';
           }
-          
+
           echo '</div>';
      }