Changeset 17:6fc4226eaebd

Timestamp:

04/27/11 16:30:40 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

default

Children:

18:3b981ecb888d, 67:a5f9c67df8fe, 126:2be2ac72171e

Message:

Temporarily removed safe_mode on stable branch, will work on it on dedicated branch before further merge.

Files:

• admin/auth.php (modified) (6 diffs)
• inc/admin/lib.dc.page.php (modified) (1 diff)
• inc/core/class.dc.modules.php (modified) (2 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>'.__('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()) {

inc/admin/lib.dc.page.php

@@ -128 +128 @@
           '<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/core/class.dc.modules.php

@@ -66 +66 @@
           $this->ns = $ns;
           
-          $disabled = isset($_SESSION['sess_safe_mode']) && $_SESSION['sess_safe_mode'];
-          $disabled = $disabled && !get_parent_class($this) ? true : false;
-          
           foreach ($this->path as $root)
           {
@@ -90 +87 @@
                     && file_exists($full_entry.'/_define.php'))
                     {
-                         if (!file_exists($full_entry.'/_disabled') && !$disabled)
+                         if (!file_exists($full_entry.'/_disabled'))
                          {
                               $this->id = $entry;