Changeset 5925

Timestamp:

01/11/12 23:08:24 (4 months ago)

Author:

vain

Message:

• renamed for simplicity

Location:

trunk/core/viewhelper/form

Files:

• decorators (moved) (moved from trunk/core/viewhelper/form/formdecorators)
• decorators/form/label.form.php (modified) (2 diffs)
• decorators/form/table.form.php (modified) (1 diff)
• elements (moved) (moved from trunk/core/viewhelper/form/formelements)
• elements/hidden.form.php (modified) (2 diffs)
• elements/securitytoken.form.php (modified) (1 diff)
• form.php (moved) (moved from trunk/core/viewhelper/form/form.core.php) (3 diffs)
• formdecorator.php (moved) (moved from trunk/core/viewhelper/form/formdecorator.core.php) (5 diffs)
• formelement.php (moved) (moved from trunk/core/viewhelper/form/formelement.core.php) (3 diffs)
• formelementdecorator.php (added)
• formelementvalidator.php (moved) (moved from trunk/core/viewhelper/form/validator.php)
• formgenerators (deleted)

trunk/core/viewhelper/form/decorators/form/label.form.php

@@ -38 +38 @@
 
 class Clansuite_Form_Decorator_Label extends Clansuite_Form_Decorator
-{    
+{
     /**
      * Name of this decorator
@@ -50 +50 @@
      */
     public function render($html_form_content)
-    {  
-           
+    {
+           echo 'some LABEL' . $html_form_content;
     }
 }

trunk/core/viewhelper/form/decorators/form/table.form.php

@@ -48 +48 @@
     public function render($html_form_content)
     {
-        return $html_form_content,
-    }   
+        return 'TABLE' .$html_form_content;
+    }
 }
 ?>

trunk/core/viewhelper/form/elements/hidden.form.php

@@ -37 +37 @@
 }
 
-# conditional include of the parent class
-if (false == class_exists('Clansuite_Formelement_Input',false))
-{ 
-    include __DIR__ . '/input.form.php';
-}
 
-/**
- *  Clansuite_Formelement
- *  |
- *  \- Clansuite_Formelement_Input
- *      |
- *      \- Clansuite_Formelement_Hidden
- */
 class Clansuite_Formelement_Hidden extends Clansuite_Formelement_Input implements Clansuite_Formelement_Interface
 {
@@ -56 +44 @@
         $this->type = 'hidden';
     }
+
+    public function addHiddenFieldForCharsetDetection()
+    {
+        return '<input name="_charset_" type="hidden" />';
+    }
 }
 ?>

trunk/core/viewhelper/form/elements/securitytoken.form.php

@@ -37 +37 @@
 }
 
-/**
- *
- *  Clansuite_Form
- *  |
- *  \- Clansuite_Formelement_Securitytoken
- */
-class Clansuite_Formelement_Securitytoken extends Clansuite_Formelement implements Clansuite_Formelement_Interface
+
+class Clansuite_Formelement_Securitytoken extends Clansuite_Formelement_Hidden implements Clansuite_Formelement_Interface
 {
+    public function __construct(l)
+    {
+        parent::__construct();
+        
+        $this->isRequired();
+        $this->setValidator('NotEmpty');
+        $this->initCsrfValidator();
+    }
+    
+    public function initCsrfValidator()
+    {
+        $session = $this->getSession();
+        
+        if (isset($session->hash))
+        {
+            $validHash = $session->hash;
+        }
+        else
+        {
+            $validHash = null;
+        }
 
+        $this->addValidator('Identical', true, array($validHash));
+        
+        return $this;
+    }
+
+    # getHash
+    # setHashToSession
+    # getHashFromSession
+    # compare
+
+    public function render()
+    {
+
+    }
 }
 ?>

trunk/core/viewhelper/form/form.php

@@ -1100 +1100 @@
         if (false == class_exists($formelement_classname, false))
         {
-            $file = ROOT_CORE . 'viewhelper/form/formelements/'.$formelement.'.form.php';
+            $file = ROOT_CORE . 'viewhelper/form/elements/'.$formelement.'.form.php';
 
             if(is_file($file) === true)
@@ -1395 +1395 @@
      * Factory method. Instantiates and returns a new formdecorator object.
      *
+     * @param string Name of Formdecorator.
      * @return Clansuite_Formdecorator
      */
-    public function decoratorFactory($formdecorator)
-    {
+    public function decoratorFactory($decorator)
+    {
+        # construct Clansuite_Form_Decorator_Name
+        $class = 'Clansuite_Form_Decorator_' . ucfirst($decorator);
+
         # if not already loaded, require forelement file
-        if(false == class_exists('Clansuite_Form_Decorator_' . $formdecorator, false))
-        {
-            $file = ROOT_CORE . 'viewhelper/form/formdecorators/form/' . $formdecorator . '.form.php';
+        if(false == class_exists('Clansuite_Form_Decorator_' . $decorator, false))
+        {
+            $file = ROOT_CORE . 'viewhelper/form/decorators/form/' . $decorator . '.form.php';
 
             if(is_file($file) === true)
@@ -1410 +1414 @@
         }
 
-        # construct Clansuite_Formdecorator_Name
-        $formdecorator_classname = 'Clansuite_Form_Decorator_' . ucfirst($formdecorator);
         # instantiate the new $formdecorator and return
-        return new $formdecorator_classname();
+        return new $class();
     }
 

trunk/core/viewhelper/form/formdecorator.php

@@ -37 +37 @@
 }
 
+interface Clansuite_Form_Decorator_Interface
+{
+    public function decorateWith($form_decorator);
+    public function getName();
+}
+
 /**
  * Clansuite_Form_Decorator
@@ -72 +78 @@
     # instance of form, which is to decorate
     protected $form;
-    
-    private $class, $id;
+
+    private $name, $class, $id;
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
 
     /**
@@ -96 +112 @@
         return $this->class;
     }
-    
+
     /**
     * Set id=""
@@ -162 +178 @@
         }
     }
-    
+
     /**
      * __call Magic Method
@@ -176 +192 @@
         {
             return call_user_func_array( array($this->form, $method), $parameters);
-        }            
+        }
     }
 }
-
-/**
- * Clansuite_Formelement_Decorator
- *
- * @author     Jens-André Koch  <vain@clansuite.com>
- * @copyright  Jens-André Koch (2005-onwards)
- *
- * @category    Clansuite
- * @package     Core
- * @subpackage  Form
- */
-
-abstract class Clansuite_Formelement_Decorator implements Clansuite_Formelement_Decorator_Interface
-{
-    # instance of formelement, which is to decorate
-    protected $formelement;
-
-    private $class;
-
-    /**
-    * Set class=""
-    *
-    * @param string $classname
-    */
-    public function setClass($classname)
-    {
-        $this->class = $classname;
-
-        return $this->formelement;
-    }
-
-    /**
-    * Get class="" values
-    *
-    * @return string
-    */
-    public function getClass()
-    {
-        return $this->class;
-    }
-
-    /**
-     * Constructor
-     *
-     * @param $form Accepts a Clansuite_Form Object implementing the Clansuite_Form_Interface.
-     */
-    /*public function __construct(Clansuite_Form_Interface $form)
-    {
-        $this->decorate($form);
-    }*/
-
-    /**
-     * Setter method to set the object which is to decorate.
-     *
-     * @param $form object of type Clansuite_Form_Interface or Clansuite_Form_Decorator_Interface
-     */
-    public function decorateWith($formelement)
-    {
-        $this->formelement = $formelement;
-    }
-
-    /**
-     * Purpose of this method is to check, if this object or a decorator implements a certain method.
-     *
-     * @param $method
-     * @return boolean
-     */
-    public function hasMethod($method)
-    {
-        # check if method exists in this object
-        if(method_exists($this, $method))
-        {
-            return true;
-        }
-        # check if method exists in the decorator of this object
-        elseif($this->formelement instanceof Clansuite_Formelement_Decorator)
-        {
-            return $this->formelement->hasMethod($method);
-        }
-        else # nope, method does not exist
-        {
-            return false;
-        }
-    }
-
-    /**
-     * __call Magic Method
-     *
-     * In general this calls a certain method with parameters on the object which is to decorate ($form).
-     *
-     * @param $method
-     * @param $parameters
-     */
-    public function __call($method, $parameters)
-    {
-        return call_user_func_array(array($this->formelement, $method), $parameters);
-    }
-}
-
-interface Clansuite_Formelement_Decorator_Interface
-{
-    public function decorateWith($formelement_decorator);
-}
-
-interface Clansuite_Form_Decorator_Interface
-{
-    public function decorateWith($form_decorator);
-}
 ?>

trunk/core/viewhelper/form/formelement.php

@@ -557 +557 @@
     public function getValidator($validator)
     {
-        # load baseclass
-        # @todo move to map / autoloader
-        if(false == class_exists('Clansuite_Formelement_Validator', false))
-        {
-            include ROOT_CORE . 'viewhelper/form/validator.php';
-        }
-
         # construct classname
         $class = 'Clansuite_Formelement_Validator_' . ucfirst($validator);
@@ -847 +840 @@
     public function decoratorFactory($decorator)
     {
-        # construct Clansuite_Formdecorator_Name
+        # construct Clansuite_Formelement_Decorator_Name
         $class = 'Clansuite_Formelement_Decorator_' . ucfirst($decorator);
 
@@ -853 +846 @@
         if(false == class_exists($class, false))
         {
-            $file = ROOT_CORE . 'viewhelper/form/formdecorators/formelement/' . $decorator . '.form.php';
+            $file = ROOT_CORE . 'viewhelper/form/decorators/formelement/' . $decorator . '.form.php';
 
             if(is_file($file) === true)