Changes in admin/auth.php [27:3bde88e1fff6:42:aba6d23140fc]

File:

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

admin/auth.php

@@ -32 +32 @@
 $login_data = !empty($_POST['login_data']) ? $_POST['login_data'] : null;
 $recover = $core->auth->allowPassChange() && !empty($_REQUEST['recover']);
+$safe_mode = !empty($_REQUEST['safe_mode']);
 $akey = $core->auth->allowPassChange() && !empty($_GET['akey']) ? $_GET['akey'] : null;
 $user_id = $user_pwd = $user_key = $user_email = null;
@@ -205 +206 @@
           }
      }
+     elseif ($check_user && !empty($_POST['safe_mode']) && !$core->auth->isSuperAdmin()) 
+     {
+          $err = __('Safe Mode can only be used for super administrators.');
+     }
      elseif ($check_user)
      {
@@ -213 +218 @@
           if (!empty($_POST['blog'])) {
                $_SESSION['sess_blog_id'] = $_POST['blog'];
+          }
+          
+          if (!empty($_POST['safe_mode']) && $core->auth->isSuperAdmin()) {
+               $_SESSION['sess_safe_mode'] = true;
           }
           
@@ -284 +293 @@
       return true;
     };
+    
+    $('a#safe_mode_link_help').click(function() {
+      $(this).parent().next().slideToggle();
+    });
   });
   //]]>
@@ -346 +359 @@
           echo
           '<fieldset>';
+          if ($safe_mode) {
+               echo '<legend>'.__('Safe mode login').'</legend>';
+          }
           echo
           '<p><label for="user_id">'.__('Username:').' '.
@@ -353 +369 @@
           form::password(array('user_pwd','user_pwd'),20,255,'','',2).'</label></p>'.
           
-          '<p><label class="classic">'.
           '<p><label for="user_remember" class="classic">'.
           form::checkbox(array('user_remember','user_remember'),1,'','',3).' '.
@@ -363 +378 @@
                echo form::hidden('blog',html::escapeHTML($_REQUEST['blog']));
           }
+          if($safe_mode) {
+               echo form::hidden('safe_mode',1);
+          }
           
           echo
@@ -368 +386 @@
           
           '<p>'.__('You must accept cookies in order to use the private area.').'</p>';
+          
+          if ($safe_mode) {
+               echo
+               '<p><a href="auth.php" id="normal_mode_link">'.__('Get back to normal authentication').'</a></p>';
+          } else {
+               echo
+               '<p><a href="auth.php?safe_mode=1" id="safe_mode_link">'.__('I want to log in in safe mode').'</a></p>'.
+               '<p class="form-note"><a href="#" id="safe_mode_link_help">'.__('What is dotclear safe mode ?').'</a></p>'.
+               '<p id="safe_mode_help"><em>'.
+                    __('This mode allows you to login without activating any of your plugins. This may be useful to solve compatibility problems').'&nbsp;'.
+                    __('Disable or delete any plugin suspected to cause trouble, then log out and log back in normally.').
+               '</em></p>';
+          }
           
           if ($core->auth->allowPassChange()) {