Changeset 46:36f4421937ed for admin

Timestamp:

04/29/11 10:08:59 (14 years ago)

Author:

kozlika

Branch:

userprefs

Children:

48:0891631a2623, 52:9a388f5e4e3a

Parents:

45:282249d3b55d (diff), 43:bd53e32fe98b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge

Location:

admin

Files:

• auth.php (modified) (7 diffs)
• style/default.css (modified) (1 diff)
• style/default.css (modified) (1 diff)

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:').' '.
@@ -362 +378 @@
                echo form::hidden('blog',html::escapeHTML($_REQUEST['blog']));
           }
+          if($safe_mode) {
+               echo form::hidden('safe_mode',1);
+          }
           
           echo
@@ -367 +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()) {

admin/style/default.css

@@ -1094 +1094 @@
      font-size: 1.3em;
 }
-/* à supprimer quand tous les formulaires auront été corrigés */
-label.required:before {
-     content: '* ';
-     color: #c00;
-}
-
+label.inline {
+     display: inline;
+}
 p.field {
      position: relative;

admin/style/default.css

@@ -1152 +1152 @@
      width: 100%;
 }
+
+#login-screen #safe_mode_help {
+     display : none;
+     margin : 0 0 1em 0;
+     padding: 5px 10px 5px 30px;
+     background: #fbfbfb url(msg-std.png) no-repeat 5px 5px;
+     border: 1px solid #999;
+     -moz-border-radius: 4px;
+     -webkit-border-radius: 4px;
+}
+
 
 /* ------------------  Tous les boutons -------------------- */