Changeset 2321:3ab5e6c3d301 for inc/admin/class.dc.admincontext.php

Timestamp:

10/09/13 15:21:14 (12 years ago)

Author:

Dsls

Branch:

twig

Message:

page layout readapted.

File:

• inc/admin/class.dc.admincontext.php (modified) (6 diffs)

inc/admin/class.dc.admincontext.php

@@ -63 +63 @@
           }
      }
+     
+     public function __isset($name) {
+          if ($this->isAllowed($name,$this->attributes)) {
+               return isset($this->object->$name);
+          } else {
+               return false;
+          }
+     }
+     
 
      public function __call($name,$args) {
@@ -258 +267 @@
           $p = path::info($_SERVER['REQUEST_URI']);
           $this->protected_globals['current_page'] = $p['base'];
-          $this->protected_globals['blog_count'] = $this->core->auth->blog_count;
+          $this->protected_globals['blog_count'] = $this->core->auth->getBlogCount();
           $this->protected_globals['rtl'] = l10n::getTextDirection(
                $this->protected_globals['current_user']['lang']) == 'rtl';
@@ -266 +275 @@
                'nonce' => $this->core->getNonce()
           );
-          
           # Keep protected globals safe
           return array_merge($this->globals,$this->protected_globals);
@@ -421 +429 @@
           # Blogs list
           $blogs = array();
-          if ($this->core->auth->blog_count > 1 && $this->core->auth->blog_count < 20) {
+          $blog_count = $this->core->auth->getBlogCount();
+          if ($blog_count > 1 && $blog_count < 20) {
                $blog_id = $this->core->blog->id;
                $rs_blogs = $this->core->getBlogs(array('order'=>'LOWER(blog_name)','limit'=>20));
@@ -446 +455 @@
           $sform
                ->addField(
-                    new dcFieldText('q','',array(
+                    new dcFieldText('qx','',array(
                     'maxlength'         => 255,
                     'label' => __('Search:'))))
@@ -460 +469 @@
      protected function getCurrentBlog()
      {
-          $this->protected_globals['current_blog'] = $this->core->auth->blog_count ?
-               new dcProxy($this->core->blog,array(
+          $this->protected_globals['current_blog'] = $this->core->auth->getBlogCount() ?
+               new dcProxy($this->core->blog,array('attr' => array(
                     'id','name','desc','url','host','creadt','upddt'
-               )) : array(
+               ))) : array(
                     'id'      => '',
                     'name'    => '',