Changeset 18:3b981ecb888d

Timestamp:

04/27/11 16:32:48 (15 years ago)

Author:

Dsls <dsls@…>

Branch:

userprefs

Parents:

16:40836c17e96a (diff), 17:6fc4226eaebd (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:

Merged safe_mode removal on userprefs branch

Files:

• admin/auth.php (modified) (6 diffs)
• admin/auth.php (modified) (3 diffs)
• inc/admin/lib.dc.page.php (modified) (1 diff)
• inc/admin/lib.dc.page.php (modified) (3 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;
@@ -206 +205 @@
           }
      }
-     elseif ($check_user && !empty($_POST['safe_mode']) && !$core->auth->isSuperAdmin()) 
-     {
-          $err = __('Safe Mode can only be used for super administrators.');
-     }
      elseif ($check_user)
      {
@@ -218 +213 @@
           if (!empty($_POST['blog'])) {
                $_SESSION['sess_blog_id'] = $_POST['blog'];
-          }
-          
-          if (!empty($_POST['safe_mode']) && $core->auth->isSuperAdmin()) {
-               $_SESSION['sess_safe_mode'] = true;
           }
           
@@ -355 +346 @@
           echo
           '<fieldset>';
-          if ($safe_mode) {
-               echo '<legend>'.__('Safe mode login').'</legend>';
-          }
           echo
           '<p><label for="user_id">'.__('Username:').' '.
@@ -374 +362 @@
                echo form::hidden('blog',html::escapeHTML($_REQUEST['blog']));
           }
-          if($safe_mode) {
-               echo form::hidden('safe_mode',1);
-          }
           
           echo
@@ -382 +367 @@
           
           '<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 have a connection problem').'</a></p>';
-          }
           
           if ($core->auth->allowPassChange()) {

admin/auth.php

@@ -310 +310 @@
      echo
      '<fieldset><legend>'.__('Request a new password').'</legend>'.
-     '<p><label>'.__('Username:').' '.
-     form::field(array('user_id'),20,32,html::escapeHTML($user_id),'',1).'</label></p>'.
-     
-     '<p><label>'.__('Email:').' '.
-     form::field(array('user_email'),20,255,html::escapeHTML($user_email),'',2).'</label></p>'.
+     '<p><label for="user_id">'.__('Username:').' '.
+     form::field(array('user_id','user_id'),20,32,html::escapeHTML($user_id),'',1).'</label></p>'.
+     
+     '<p><label for="user_email">'.__('Email:').' '.
+     form::field(array('user_email','user_email'),20,255,html::escapeHTML($user_email),'',2).'</label></p>'.
      
      '<p><input type="submit" value="'.__('recover').'" tabindex="3" />'.
@@ -326 +326 @@
      echo
      '<fieldset><legend>'.__('Change your password').'</legend>'.
-     '<p><label>'.__('New password:').' '.
-     form::password(array('new_pwd'),20,255,'','',1).'</label></p>'.
-     
-     '<p><label>'.__('Confirm password:').' '.
-     form::password(array('new_pwd_c'),20,255,'','',2).'</label></p>'.
+     '<p><label for="new_pwd">'.__('New password:').' '.
+     form::password(array('new_pwd','new_pwd'),20,255,'','',1).'</label></p>'.
+     
+     '<p><label for="new_pwd_c">'.__('Confirm password:').' '.
+     form::password(array('new_pwd_c','new_pwd_c'),20,255,'','',2).'</label></p>'.
      '</fielset>'.
      
@@ -347 +347 @@
           '<fieldset>';
           echo
-          '<p><label>'.__('Username:').' '.
-          form::field(array('user_id'),20,32,html::escapeHTML($user_id),'',1).'</label></p>'.
-          
-          '<p><label>'.__('Password:').' '.
-          form::password(array('user_pwd'),20,255,'','',2).'</label></p>'.
+          '<p><label for="user_id">'.__('Username:').' '.
+          form::field(array('user_id','user_id'),20,32,html::escapeHTML($user_id),'',1).'</label></p>'.
+          
+          '<p><label for="user_pwd">'.__('Password:').' '.
+          form::password(array('user_pwd','user_pwd'),20,255,'','',2).'</label></p>'.
           
           '<p><label class="classic">'.
-          form::checkbox(array('user_remember'),1,'','',3).' '.
-          __('Remember my ID on this computer').'</label></p>'.
+          '<p><label for="user_remember" class="classic">'.
+          form::checkbox(array('user_remember','user_remember'),1,'','',3).' '.
           
           '<p><input type="submit" value="'.__('login').'" tabindex="4" /></p>';

inc/admin/lib.dc.page.php

@@ -131 +131 @@
           '<div id="main">'."\n".
           '<div id="content">'."\n";
-          
-          # Recovery mode
-          if (isset($_SESSION['sess_safe_mode']) && $_SESSION['sess_safe_mode'])
-          {
-               echo
-               '<div class="error"><h3>'.__('Recovery mode').'</h3>'.
-               '<p>'.__('You are in recovery mode means no plugin have been loaded.').'</p>'.
-               '</div>';
-          }
           
           if ($core->error->flag()) {

inc/admin/lib.dc.page.php

@@ -118 +118 @@
           '<form action="index.php" method="post"><div>'.
           $blog_box.
-          ' - <a href="'.$core->blog->url.'" class="button">'.__('View site').'</a>'.
-          ' - '.__('User:').' <strong>'.$core->auth->userID().'</strong>'.
-          ' - <a href="index.php?logout=1" class="logout">'.__('Logout').'</a>'.
+          '<a href="'.$core->blog->url.'"onclick="window.open(this.href);return false;" title="'.__('Go to site').' ('.__('new window').')'.'">'.__('Go to site').' <img src="images/outgoing.png" alt="" /></a>'.
+          '</div></form>'.
+          '</div>'.
+          '<div id="info-box2"><form action="index.php" method="post><div>"'.
+          ' '.__('User:').' <strong>'.$core->auth->userID().'</strong>'.
+          ' - <a href="index.php?logout=1" class="logout">'.__('Logout').' <img src="images/logout.png" alt="" /></a>'.
           '</div></form>'.
           '</div>';
@@ -153 +156 @@
           echo
           '</div>'."\n".      // End of #main-menu
-          '<div id="footer"><p><img src="images/dotclear_pw.png" alt="Dotclear" /> '.
-          sprintf(__('Thank you for using %s.'),'<a href="http://dotclear.org/">Dotclear</a>').
+          '<div id="footer"><p>'.
+          sprintf(__('Thank you for using %s.'),'<a href="http://dotclear.org/">Dotclear '.DC_VERSION.'</a>').
+          ' <span class="credit"> (Icons by <a href="http://dryicons.com/">Dryicons</a>)</span>'.
           '</p></div>'."\n".
           "</div>\n";         // End of #wrapper
@@ -319 +323 @@
           
           echo
-          '<div id="help"><hr /><div class="help-content"><h2>'.__('Help').'</h2>'.
+          '<div id="help"><hr /><div class="help-content clear"><h2>'.__('Help').'</h2>'.
           $content.
           '</div></div>';