Changeset 1061:f522c5a73b4e

Timestamp:

12/10/12 07:43:16 (13 years ago)

Author:

JcDenis

Branch:

twig

Message:

• Prepare safe_mode

Files:

• admin/auth.php (modified) (1 diff)
• inc/admin/class.dc.admincontext.php (modified) (4 diffs)

admin/auth.php

@@ -303 +303 @@
 $_ctx->change_pwd = $core->auth->allowPassChange() && $form->new_pwd != '' && $form->new_pwd_c != '' && $form->login_data != '';
 $_ctx->recover = $form->recover = $core->auth->allowPassChange() && !empty($_REQUEST['recover']);
-$_ctx->safe_mode = $form->safe_mode = !empty($_REQUEST['safe_mode']);
+$_ctx->setSafeMode(!empty($_REQUEST['safe_mode'])); 
+$form->safe_mode = !empty($_REQUEST['safe_mode']);
 $_ctx->akey = false;
 

inc/admin/class.dc.admincontext.php

@@ -41 +41 @@
                
                'version'           => DC_VERSION,
-               'vendor_name'  => DC_VENDOR_NAME
+               'vendor_name'  => DC_VENDOR_NAME,
+               
+               'safe_mode'    => isset($_SESSION['sess_safe_mode']) && $_SESSION['sess_safe_mode']
           );
      }
@@ -152 +154 @@
      }
      
+     public function setSafeMode($safe_mode)
+     {
+          $this->protected_globals['safe_mode'] = (boolean) $safe_mode;
+          return $this;
+     }
+     
      /**
      Set information message
@@ -210 +218 @@
      protected function getBlogs()
      {
+          $blog_id = '';
+          
           # Blogs list
           $blogs = array();
           if ($this->core->auth->blog_count > 1 && $this->core->auth->blog_count < 20) {
+               $blog_id = $this->core->blog->id;
                $rs_blogs = $this->core->getBlogs(array('order'=>'LOWER(blog_name)','limit'=>20));
                while ($rs_blogs->fetch()) {
@@ -231 +242 @@
           $form
                ->addField(
-                    new dcFieldCombo('switchblog',$this->core->blog->id,$blogs,array(
+                    new dcFieldCombo('switchblog',$blog_id,$blogs,array(
                     'label' => __('Blogs:'))))
                ->addField(