Changeset 1053:96e69ef76fc9 for inc

Timestamp:

12/03/12 14:29:47 (13 years ago)

Author:

Dsls <dsls@…>

Branch:

twig

Message:

• Added page errors & informations in context and default layout page.
• Added submit actions and hidden fields.
• cleaned up code in admin/post.php, all actions need to be recoded.

Location:

inc/admin

Files:

• class.dc.admincontext.php (modified) (3 diffs)
• class.dc.form.php (modified) (11 diffs)
• default-templates/layout.html.twig (modified) (1 diff)

inc/admin/class.dc.admincontext.php

@@ -6 +6 @@
      protected $js_var;
      protected $head;
+     protected $globals;
      
      protected $core;
@@ -16 +17 @@
           $this->jsCommon();
           $this->blogs = array();
+          $this->globals = array();
           if ($this->core->auth->blog_count > 1 && $this->core->auth->blog_count < 20) {
                $rs_blogs = $core->getBlogs(array('order'=>'LOWER(blog_name)','limit'=>20));
@@ -110 +112 @@
      }
      public function getGlobals() {
-          return array();
+          return $this->globals;
      }
      public function getName() {
           return 'AdminPage';
      }
+
+     public function setMessage($message) {
+          $this->globals['page_message'] = $message;
+          return $this;
+     }
+     
+     public function addError($error) {
+          if (!isset($this->globals['page_errors']))
+               $this->globals['page_errors']=array();
+          $this->globals['page_errors'][] = $error;
+          return $this;
+     }
+
      public function getFilters()
      {

inc/admin/class.dc.form.php

@@ -20 +20 @@
                 $this->getAttribute('name')."');\n")
             ->subcompile($this->getNode('body'))
+            ->write("\$context['dc_form']->renderHiddenWidgets();\n")
             ->write("\$context['dc_form']->endForm();\n")
         ;
@@ -101 +102 @@
      public function renderWidget($name,$attributes=array()) {
           $field = $this->currentForm->$name;
-          if ($field)
-          echo $this->template->renderBlock(
-               $field->getWidgetBlock(),
-               array_merge($field->getAttributes(),array('attr'=>$attributes)),
-               $this->blocks);
-
+          if ($field) {
+               echo $this->template->renderBlock(
+                    $field->getWidgetBlock(),
+                    array_merge($field->getAttributes(),array('attr'=>$attributes)),
+                    $this->blocks);
+          }
+     }
+
+     public function renderHiddenWidgets() {
+          foreach ($this->currentForm->getHiddenFields() as $h) {
+               $this->renderWidget($h->getName());
+          }
      }
 
@@ -132 +139 @@
 }
 
+class InvalidFieldException extends Exception {
+}
+
 
 class dcForm {
@@ -138 +148 @@
      protected $action;
      protected $fields;
-
+     protected $method;
+     protected $submitfields;
+     protected $hiddenfields;
+     protected $errors;
+     
+     private function addNonce() {
+          $this->addField(new dcFieldHidden(array('xd_check'), $this->core->getNonce()));
+     }
+     
      public function __construct($core,$name,$action, $method='POST') {
           $this->core = $core;
@@ -146 +164 @@
           $this->fields = array();
           $this->core->page->getExtension('dc_form')->addForm($this);
+          $this->submitfields = array();
+          $this->hiddenfields = array();
+          $this->errors = array();
+          if ($method == 'POST') {
+               $this->addNonce();
+          }
      }
 
@@ -152 +176 @@
      }
 
+     public function getErrors() {
+          return $this->errors;
+     }
+     
      public function addField(dcField $f) {
+          
+          if ($f instanceof dcFieldAction) {
+               $this->submitfields[$f->getName()]=$f;
+          }
+          if ($f instanceof dcFieldHidden) {
+               $this->hiddenfields[$f->getName()]=$f;
+          }
+
           $this->fields[$f->getName()]=$f;
           return $this;
@@ -184 +220 @@
     }
 
+     public function isSubmitted() {
+          $from = ($this->method == 'POST')?$_POST:$_GET;
+          echo "form fields :\n";
+     }
+     
+     public function setup() {
+          $from = ($this->method=='POST')?$_POST:$_GET;
+          foreach ($this->fields as $f) {
+               $f->setup($from);
+          }
+          foreach ($this->submitfields as $f) {
+               if ($f->isDefined()) {
+                    $ret = call_user_func ($f->getAction(),$this);
+                    return;
+               }
+          }
+     }
+     
+     public function check() {
+          foreach ($this->fields as $f) {
+               try {
+                    $f->check();
+               } catch (InvalidFieldException $e) {
+                    $this->errors[]=$e->getMessage();
+               }
+          }
+     }
+     
+     public function getHiddenFields() {
+          return $this->hiddenfields;
+     }
+     
 }
 
@@ -191 +259 @@
      protected $value;
      protected $id;
+     protected $defined;
      
      protected function getNID($nid) {
@@ -208 +277 @@
           $this->attributes['id'] = $this->id;
           $this->attributes['value'] = $this->value;
+          $this->defined = false;
 
      }
@@ -227 +297 @@
 
      public function check() {
-
-     }
+          if (!$this->defined && $this->attributes['defined']) {
+               throw new InvalidFieldException(sprintf('Field "%s" is mandatory'),$this->attributes['label']);
+          }
+
+     }
+     
+     public function setup($from) {
+          if (isset($from[$this->id])) {
+               $this->value = $from[$this->id];
+               $this->defined = true;
+          }
+     }
+     
+     public function isDefined() {
+          return $this->defined;
+     }
+     
 }
 
@@ -264 +349 @@
 }
 
-class dcFieldSubmit extends dcField {
+abstract class dcFieldAction extends dcField {
+     protected $action;
+     public function __construct($name, $value, $attributes = array()) {
+          parent::__construct($name, $value, $attributes);
+          if (isset($attributes['action'])) {
+               $this->action = $attributes['action'];
+          }
+     }
+     public function getAction() {
+          return $this->action;
+     }
+}
+
+class dcFieldSubmit extends dcFieldAction {
 
      public function getWidgetBlock() {

inc/admin/default-templates/layout.html.twig

@@ -40 +40 @@
                     {% block content %}
                     <h2>Mon premier blog &rsaquo; <span class="page-title"></span></h2>
-                    {% endblock %}                     
+                    {% if page_message is not empty %}
+                         <p class="message">{{page_message}}</p>
+                    {% endif %}
+                    {% if page_errors is not empty %}
+                         <div class="error">
+                              <p><strong>Errors :</strong></p>
+                              <ul>
+                              {% for error in page_errors %}
+                                   <li>{{error}}</li>
+                              {% endfor %}
+                              </ul>
+                         </div>
+                    {% endif %}
+                    {% endblock %}
+
                </div>
           </div>