Changeset 1153:1e48950b05af for inc/admin

Timestamp:

04/02/13 13:15:32 (12 years ago)

Author:

Dsls <dsls@…>

Branch:

twig

Parents:

1152:fbd922f6ed09 (diff), 1138:11db80678704 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge

Location:

inc/admin

Files:

• class.dc.admincontext.php (modified) (9 diffs)
• class.dc.form.php (modified) (23 diffs)
• default-templates/forms/form_layout.html.twig (modified) (1 diff)

inc/admin/class.dc.admincontext.php

@@ -12 +12 @@
 if (!defined('DC_RC_PATH')) { return; }
 
+
+class dcProxy {
+     protected $object;
+     protected $attributes;
+     protected $methods;
+     protected $default;
+     protected $denyfirst;
+
+    /**
+     * valuesToArray - converts a list of strings to an array having these strings as keys.
+     * 
+     * @param mixed $val the list to convert.
+     * @access protected
+     * @return mixed Value The resulting array
+     */
+     protected function valuesToArray($val) {
+          $arr = array();
+          foreach ($val as $k) {
+               $arr[$k]=true;
+          }
+          return $arr;
+     }
+
+     protected function isAllowed ($name,$list) {
+          if ($this->denyfirst) {
+               return isset($list[$name]);
+          } else {
+               return !isset($list[$name]);
+          }
+     }
+
+     public function __construct($object,$rights,$default='',$denyfirst=true) {
+          $this->object = $object;
+          $this->attributes = array();
+          $this->methods = array();
+          $this->denyfirst = $denyfirst;
+          if (isset($rights['attr'])) {
+               $this->attributes = $this->valuesToArray($rights['attr']);
+          }
+          if (isset($rights['methods'])) {
+               $this->methods = $this->valuesToArray($rights['methods']);
+          }
+     }
+
+     public function __get($name) {
+          if ($this->isAllowed($name,$this->attributes)) {
+               return $this->object->$name;
+          } else {
+               return $this->default;
+          }
+     }
+
+     public function __call($name,$args) {
+          if ($this->isAllowed($name,$this->methods) &&
+               is_callable(array($this->object,$name))) {
+               return call_user_func_array(array($this->object,$name),$args);
+          } else {
+               return $this->default;
+          }
+
+     }
+}
+
+class dcArrayProxy extends dcProxy implements ArrayAccess {
+     public function offsetExists ($offset) {
+          return (isset($this->value[$offset]));
+     }
+     public function offsetGet ($offset) {
+          return new ProxyValue($this->object[$offset],$this->rights);
+     }
+     public function offsetSet ($offset ,$value ) {
+          // Do nothing, we are read only
+     }
+     public function offsetUnset ($offset) {
+          // Do nothing, we are read only
+     }
+}
+
+
 /**
- * @ingroup DC_CORE
- * @brief Template extension for admin context.
- * 
- * This extends template environment with tools required in admin context.
- */
-class dcAdminContext extends dcContext
+@ingroup DC_CORE
+@brief Template extension for admin context
+
+This extends template environment with tools required in admin context.
+*/
+class dcAdminContext extends Twig_Extension
 {
+     protected $core;
+     protected $globals = array();
+     protected $protected_globals = array();
+     protected $memory = array();
+     
      public function __construct($core)
      {
-          parent::__construct($core);
-          
-          $this->protected_globals = array_merge($this->protected_globals,array(
+          $this->core = $core;
+          
+          # Globals editable via context
+          $this->globals = array();
+          
+          # Globals not editable via context
+          $this->protected_globals = array(
+               'messages' => array(
+                    'static' => array(),
+                    'lists' => array(),
+                    'alert' => '',
+                    'errors' => array()
+               ),
+               
                'page_title'   => array(),
                'page_global'  => false,
                
                'admin_url'    => DC_ADMIN_URL,
-               'theme_url'    => DC_ADMIN_URL.'index.php?tf=',
+               'theme_url'    => '',
                'plugin_url'   => DC_ADMIN_URL.'index.php?pf=',
-          ));
-     }
-     
-     /**
-      * Returns a list of global variables to add to the existing list.
-      *
-      * This merges overloaded variables with defined variables.
-      * 
-      * @return array An array of global variables
-      */
+               
+               'version'           => DC_VERSION,
+               'vendor_name'  => DC_VENDOR_NAME,
+               
+               'safe_mode'    => isset($_SESSION['sess_safe_mode']) && $_SESSION['sess_safe_mode'],
+               'debug_mode'   => DC_DEBUG
+          );
+     }
+     
+     /**
+     Prevent call crash from template on method that return this class
+     */
+     public function __toString()
+     {
+          return '';
+     }
+     
+     /**
+     Test a global variable
+     
+     @param string $name Name of the variable to test
+     @return boolean
+     */
+     public function __isset($name)
+     {
+          return isset($this->globals[$name]);
+     }
+     
+     /**
+     Add a global variable
+     
+     @param string $name Name of the variable
+     @param mixed $value Value of the variable
+     */
+     public function __set($name,$value)
+     {
+/*
+          # Overload protect
+          if ($value === null && isset($this->globals[$name])) {
+               unset($this->globals[$name]);
+          }
+          elseif (!isset($this->globals[$name])) {
+               throw new Exception('Modification of overloaded globals has no effect');
+          }
+//*/
+          $this->globals[$name] = $value;
+     }
+     
+     /**
+     Get a global variable
+     
+     @param string $name Name of the variable
+     @return mixed Value of the variable or null
+     */
+     public function __get($name)
+     {
+          return isset($this->globals[$name]) ? $this->globals[$name] : null;
+     }
+     
+     /**
+     Returns a list of filters to add to the existing list.
+     
+     @return array An array of filters
+     */
+     public function getFilters()
+     {
+          return array(
+               'trans' => new Twig_Filter_Function("__", array('is_safe' => array('html')))
+          );
+     }
+     
+     /**
+     Returns a list of functions to add to the existing list.
+     
+     @return array An array of functions
+     */
+     public function getFunctions()
+     {
+          return array(
+               '__'           => new Twig_Function_Function("__", array('is_safe' => array('html'))),
+               'debug_info' => new Twig_Function_Method($this, 'getDebugInfo', array('is_safe' => array('html'))),
+               'memorize' => new Twig_Function_Method($this, 'setMemory', array('is_safe' => array('html'))),
+               'memorized' => new Twig_Function_Method($this, 'getMemory', array('is_safe' => array('html')))
+          );
+     }
+     
+     /**
+     Returns a list of global variables to add to the existing list.
+     
+     This merges overloaded variables with defined variables.
+     
+     @return array An array of global variables
+     */
      public function getGlobals()
      {
@@ -65 +243 @@
      
      /**
-      * Fill the page title.
-      *
-      * $title can be: 
-      * - a string for page title part or 
-      * - TRUE to add blog name at the begining of title or
-      * - NULL to empty/reset title
-      *
-      * @param mixed $title A title part
-      * @param boolean $url Link of the title part
-      * @return object self
-      */
+     Returns the name of the extension.
+     
+     @return string The extension name
+     */
+     public function getName()
+     {
+          return 'AdminContext';
+     }
+     
+     
+     /**
+     Add an informational message
+     
+     @param string $message A message
+     @return object self
+     */
+     public function setSafeMode($safe_mode)
+     {
+          $this->protected_globals['safe_mode'] = (boolean) $safe_mode;
+          return $this;
+     }
+     
+     /**
+     Add an informational message
+     
+     @param string $message A message
+     @return object self
+     */
+     public function addMessageStatic($message)
+     {
+          $this->protected_globals['messages']['static'][] = $message;
+          return $this;
+     }
+     
+     /**
+     Add a list of informational messages
+     
+     @param string $message A title
+     @param array $message A list of messages
+     @return object self
+     */
+     public function addMessagesList($title,$messages)
+     {
+          $this->protected_globals['messages']['lists'][$title] = $messages;
+          return $this;
+     }
+     
+     /**
+     Set an important message
+     
+     @param string $message A message
+     @return object self
+     */
+     public function setAlert($message)
+     {
+          $this->protected_globals['messages']['alert'] = $message;
+          return $this;
+     }
+     
+     /**
+     Add an error message
+     
+     @param string Error message
+     @return object self
+     */
+     public function addError($error)
+     {
+          $this->protected_globals['messages']['errors'][] = $error;
+          return $this;
+     }
+     
+     /**
+     Check if there is an error message
+     
+     @return boolean
+     */
+     public function hasError()
+     {
+          return !empty($this->protected_globals['messages']['errors']);
+     }
+     
+     /**
+     Fill the page title
+     
+     $title can be: 
+     a string for page title part or 
+     TRUE to add blog name at the begining of title or
+     NULL to empty/reset title
+     
+     @param mixed $title A title part
+     @param boolean $url Link of the title part
+     @return object self
+     */
      public function fillPageTitle($title,$url='')
      {
@@ -95 +355 @@
      
      /**
-      * Check if a page title is set
-      */
+     Check if a page title is set
+     */
      public function hasPageTitle()
      {
@@ -103 +363 @@
      
      /**
-      * Get list of blogs
-      */
+     Get list of blogs
+     */
      protected function getBlogs()
      {
@@ -116 +376 @@
                while ($rs_blogs->fetch()) {
                     $blogs[$rs_blogs->blog_id] = $rs_blogs->blog_name.' - '.$rs_blogs->blog_url;
-                    $this->protected_globals['blogs'][$rs_blogs->blog_id] = array(
-                         'id'      => $rs_blogs->blog_id,
-                         'name'    => $rs_blogs->blog_name,
-                         'desc'    => $rs_blogs->blog_desc,
-                         'url'     => $rs_blogs->blog_url,
-                         'creadt'  => $rs_blogs->blog_creadt,
-                         'upddt'   => $rs_blogs->blog_upddt
-                    );
+                    $this->protected_globals['blogs'][$rs_blogs->blog_id] = 
+                    new dcArrayProxy($rs_blogs, array(
+                         'blog_id','blog_name','blog_desc','blog_url','blog_creadt','blog_upddt'));
                }
           }
@@ -140 +395 @@
      
      /**
-      * Get current blog information
-      */
+     Get current blog information
+     */
      protected function getCurrentBlog()
      {
           $this->protected_globals['current_blog'] = $this->core->auth->blog_count ?
-               array(
-                    'id'      => $this->core->blog->id,
-                    'name'    => $this->core->blog->name,
-                    'desc'    => $this->core->blog->desc,
-                    'url'     => $this->core->blog->url,
-                    'host'    => $this->core->blog->host,
-                    'creadt'  => $this->core->blog->creadt,
-                    'upddt'   => $this->core->blog->upddt
-               ) : array(
+               new dcProxy($this->core->blog,array(
+                    'id','name','desc','url','host','creadt','upddt'
+               )) : array(
                     'id'      => '',
                     'name'    => '',
@@ -165 +414 @@
      
      /**
-      * Get current user information
-      */
+     Get current user information
+     */
      protected function getCurrentUser()
      {
@@ -214 +463 @@
      
      /**
-      * Get sidebar menus
-      */
+     Get sidebar menus
+     */
      protected function getMenus()
      {
@@ -235 +484 @@
           }
      }
+     
+     /**
+     Get an array of debug/dev infos
+     */
+     public function getDebugInfo()
+     {
+          if (!DC_DEBUG) {
+               return array();
+          }
+          
+          $di = array(
+               'global_vars' => implode(', ',array_keys($GLOBALS)),
+               'memory' => array(
+                    'usage' => memory_get_usage(),
+                    'size' => files::size(memory_get_usage())
+               ),
+               'xdebug' => array()
+          );
+          
+          if (function_exists('xdebug_get_profiler_filename')) {
+          
+               $url = http::getSelfURI();
+               $url .= strpos($url,'?') === false ? '?' : '&';
+               $url .= 'XDEBUG_PROFILE';
+               
+               $di['xdebug'] = array(
+                    'elapse_time' => xdebug_time_index(),
+                    'profiler_file' => xdebug_get_profiler_filename(),
+                    'profiler_url' =>  $url
+               );
+               
+               /* xdebug configuration:
+               zend_extension = /.../xdebug.so
+               xdebug.auto_trace = On
+               xdebug.trace_format = 0
+               xdebug.trace_options = 1
+               xdebug.show_mem_delta = On
+               xdebug.profiler_enable = 0
+               xdebug.profiler_enable_trigger = 1
+               xdebug.profiler_output_dir = /tmp
+               xdebug.profiler_append = 0
+               xdebug.profiler_output_name = timestamp
+               */
+          }
+          
+          return $di;
+     }
+     
+     /**
+     Add a value in a namespace memory
+     
+     This help keep variable when recalling Twig macros
+     
+     @param string $ns A namespace
+     @param string $str A value to memorize in this namespace
+     */
+     public function setMemory($ns,$str)
+     {
+          if (!array_key_exists($ns,$this->memory) || !in_array($str,$this->memory[$ns])) {
+               $this->memory[$ns][] = $str;
+          }
+     }
+     
+     /**
+     Check if a value is previously memorized in a namespace
+     
+     @param string $ns A namespace
+     @param string $str A value to search in this namespace
+     @return array True if exists
+     */
+     public function getMemory($ns,$str)
+     {
+          return array_key_exists($ns,$this->memory) && in_array($str,$this->memory[$ns]);
+     }
 }
 ?>

inc/admin/class.dc.form.php

@@ -13 +13 @@
 
 /**
- * Template form node
- */
+* dcFormNode
+*
+* @uses     Twig_Node
+*
+*/
 class dcFormNode extends Twig_Node
 {
@@ -30 +33 @@
      {
           $compiler
-               ->addDebugInfo($this)
-               ->write("\$context['dc_form']->beginForm('".
-                    $this->getAttribute('name')."');\n")
+               ->addDebugInfo($this);
+          $compiler
+               ->write("\$context['dc_form']->beginForm(")
+               ->subcompile($this->getAttribute('name'))
+               ->write(");\n");
+          $compiler
                ->subcompile($this->getNode('body'))
                ->write("\$context['dc_form']->renderHiddenWidgets();\n")
@@ -49 +55 @@
           $lineno = $token->getLine();
           $stream = $this->parser->getStream();
-          $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
+          $name = $this->parser->getExpressionParser()->parseExpression();
           $stream->expect(Twig_Token::BLOCK_END_TYPE);
           $body = $this->parser->subparse(array($this,'decideBlockEnd'),true);
@@ -77 +83 @@
      protected $core;
      protected $twig;
-     protected $blocks;
      protected $forms;
      protected $currentForm;
+     protected $blocks;
      
      public function __construct($core)
      {
           $this->core = $core;
-          $this->tpl = 'form_layout.html.twig';
+          $this->tpl = array('@forms/form_layout.html.twig');
           $this->forms = array();
+          $this->blocks = array();
           $this->currentForm = null;
      }
@@ -92 +99 @@
      {
           $this->twig = $environment;
-          $this->template = $this->twig->loadTemplate($this->tpl);
-          $this->blocks = $this->template->getBlocks();
-     }
-     
+          $this->twig->getLoader()->addPath(dirname(__FILE__).'/default-templates/forms','forms');
+          foreach ($this->tpl as $tpl) {
+               $this->template = $this->twig->loadTemplate($tpl);
+               $this->blocks = array_merge($this->blocks,$this->template->getBlocks());
+          }
+     }
+     
+     public function addTemplate($tpl) {
+          $this->tpl[]=$tpl;
+          if (isset($this->twig)) {
+               $this->template = $this->twig->loadTemplate($tpl);
+               $this->blocks = array_merge($this->blocks,$this->template->getBlocks());
+          }
+     }
+
      public function getGlobals()
      {
@@ -104 +122 @@
      {
           return array(
-               'form_field' => new Twig_Function_Method(
-                    $this,
-                    'renderWidget',
+               new Twig_SimpleFunction(
+                    'widget',
+                    array($this,'renderWidget'),
                     array('is_safe' => array('html'))
                ),
-               '_form_is_choice_group' => new Twig_Function_Method(
-                    $this,
-                    'isChoiceGroup',
+               new Twig_SimpleFunction(
+                    'haswidget',
+                    array($this,'hasWidget'),
                     array('is_safe' => array('html'))
                ),
-               '_form_is_choice_selected' => new Twig_Function_Method(
-                    $this,
-                    'isChoiceSelected',
+               new Twig_SimpleFunction(
+                    'form_field',
+                    array($this,'renderField'),
+                    array('is_safe' => array('html'))
+               ),
+               new Twig_SimpleFunction(
+                    '_form_is_choice_group',
+                    array($this,'isChoiceGroup'),
+                    array('is_safe' => array('html'))
+               ),
+               new Twig_SimpleFunction(
+                    '_form_is_choice_selected',
+                    array($this,'isChoiceSelected'),
                     array('is_safe' => array('html'))
                )
@@ -137 +165 @@
      }
      
-     public function renderWidget($name,$attributes=array())
+     public function hasWidget($name) {
+          return isset($this->blocks[$name]);
+     }
+     public function renderWidget($name,$attr) {
+          if (!isset($this->blocks[$name]))
+               return '';
+          echo $this->template->renderBlock(
+               $name,
+               $attr,
+               $this->blocks
+          );
+     }
+
+     public function getCurrentForm() {
+          return $this->currentForm;
+     }
+
+     public function renderField($name,$attributes=array(),$extra=array())
      {
           $field = $this->currentForm->$name;
           if ($field) {
-               echo $this->template->renderBlock(
+               $attr = $field->getAttributes($attributes);
+               if (isset($attr['attr'])) {
+                    $attr['attr'] = array_merge($attr['attr'],$attributes);
+               } else {
+                    $attr['attr'] = $attributes;
+               }
+               $this->renderWidget(
                     $field->getWidgetBlock(),
                     array_merge(
-                         $field->getAttributes(),
-                         array('attr' => $attributes)
-                    ),
-                    $this->blocks
+                         $attr,
+                         $extra
+                    )
                );
           }
@@ -155 +205 @@
      {
           foreach ($this->currentForm->getHiddenFields() as $h) {
-               $this->renderWidget($h->getName());
+               $this->renderField($h->getName());
           }
      }
@@ -197 +247 @@
 
 /**
- * Template form
- */
+* dcForm - Template form
+*
+*/
 class dcForm
 {
@@ -211 +262 @@
      protected $errors;
      
-     private function addNonce()
+     public function addTemplate($t) {
+          $this->core->tpl->getExtension('dc_form')->addTemplate($t);
+     }
+
+    /**
+     * addNonce -- adds dc nonce to form fields
+     * 
+     * @access protected
+     *
+     * @return nothing
+     */
+     protected function addNonce()
      {
           $this->addField(
@@ -219 +281 @@
      }
      
-     protected function getNID($nid)
+
+    /**
+     * Defines Name & ID from field
+     * 
+     * @param mixed $nid either an array (name, id) or a string (name only, id will be set to null).
+     *
+     * @access protected
+     *
+     * @return nothing.
+     */
+     protected function setNID($nid)
      {
           if (is_array($nid)) {
@@ -231 +303 @@
      }
      
+     public function getContext() {
+          return array();
+     }
+
+    /**
+     * Class constructor
+     * 
+     * @param mixed  $core   dotclear core
+     * @param mixed  $name   form name
+     * @param mixed  $action form action
+     * @param string $method form method ('GET' or 'POST')
+     *
+     * @access public
+     *
+     * @return mixed Value.
+     */
      public function __construct($core,$name,$action,$method='POST')
      {
           $this->core = $core;
-          $this->getNID($name);
+          $this->setNID($name);
           $this->method = $method;
           $this->action = $action;
@@ -247 +335 @@
      }
      
+
+    /**
+     * Returns form name
+     * 
+     * @access public
+     *
+     * @return mixed Value.
+     */
      public function getName()
      {
@@ -270 +366 @@
      }
      
+     public function removeField(dcField $f) {
+          $n = $f->getName();
+          if (isset($this->fields[$n])){
+               unset($this->fields[$n]);
+          }
+
+     }
+     public function renameField($field,$newname) {
+          $oldname = $field->getName();
+          if (isset($this->fields[$oldname])) {
+               unset($this->fields[$oldname]);
+               $field->setName($newname);
+               $this->fields[$newname] = $field;
+          }
+     }
      public function begin()
      {
@@ -292 +403 @@
      public function __get($name)
      {
-          return isset($this->fields[$name]) ? 
+          return isset($this->fields[$name]) ?
                $this->fields[$name] : null;
      }
-     
+
      public function __set($name,$value)
      {
           if (isset($this->fields[$name])) {
-               $this->fields[$name]->setAttribute('value',$value);
-          }
-     }
-     
+               $this->fields[$name]->setValue($value);
+          }
+     }
+
      public function isSubmitted()
      {
           $from = $this->method == 'POST' ? $_POST : $_GET;
-          echo "form fields :\n";
-     }
-     
-     public function setup()
-     {
+     }
+
+     protected function setupFields() {
           $from = $this->method == 'POST' ? $_POST : $_GET;
           foreach ($this->fields as $f) {
                $f->setup($from);
           }
+     }
+
+     protected function handleActions($submitted) {
+          foreach ($submitted as $f) {
+               $action = $f->getAction();
+               if ($action != NULL) {
+                    $ret = call_user_func($action,$this);
+               }
+          }
+     }
+
+     protected function getSubmittedFields() {
+          $s = array();
           foreach ($this->submitfields as $f) {
                if ($f->isDefined()) {
-                    $ret = call_user_func($f->getAction(),$this);
-                    return;
+                    $s[$f->getName()] = $f;
                }
           }
-     }
-     
+          return $s;
+     }
+
+     public function setup()
+     {
+          $this->setupFields();
+          $submitted = $this->getSubmittedFields();
+          $this->handleActions($submitted);
+     }
+
      public function check()
      {
@@ -344 +473 @@
  * Template form field
  */
-abstract class dcField
-{
-     protected $attributes;
+abstract class dcField implements Countable
+{
+     protected $options;
      protected $name;
-     protected $value;
+     protected $values;
      protected $id;
+     protected $multiple;
      protected $defined;
      
-     protected function getNID($nid)
+     protected function setNID($nid)
      {
           if (is_array($nid)) {
@@ -363 +493 @@
      }
      
-     public function __construct($name,$value,$attributes=array())
-     {
-          $this->getNID($name);
-          $this->attributes = $attributes;
-          $this->value = $value;
-          $this->attributes['name'] = $this->name;
-          $this->attributes['id'] = $this->id;
-          $this->attributes['value'] = $this->value;
+     public function __construct($name,$values,$options=array())
+     {
+          $this->setNID($name);
+          $this->options = new ArrayObject($options);
+          if ($values === NULL){
+               $values = array();
+          }
+          $this->setValues($values);
           $this->defined = false;
-     }
-     
+          $this->multiple = (isset($options['multiple']) && $options['multiple']);
+
+     }
+     
+     public function setValue($value,$offset=0) {
+          $this->values[$offset] = $value;
+     }
+
+     public function setValues($values) {
+          if (is_array($values)) {
+               $this->values = $values;
+          } elseif ($values !== NULL) {
+               $this->values = array($values);
+          }
+
+     }
+
+     public function getValues() {
+          return $this->values;
+     }
+
+     public function getValue($offset=0) {
+          if (isset($this->values[$offset])) {
+               return $this->values[$offset];
+          }
+     }
+
+     public function addValue($value) {
+          $this->values[] = $value;
+     }
+     public function delValue($offset) {
+          if (isset($this->values[$offset])) {
+               array_splice($this->values,$offset,1);
+          }
+     }
+
+     public function count() {
+          return count($this->values);
+     }
+
      public function __toString()
      {
-          return (string) $this->value;
+          return join(',',$this->values);
      }
      
      abstract public function getWidgetBlock();
      
-     public function setAttribute($name,$value)
-     {
-          $this->attributes[$name] = $value;
-     }
-     
-     public function getAttributes()
-     {
-          return $this->attributes;
-     }
-     
+     public function getAttributes($options)
+     {
+          $offset = isset($options['offset']) ? $options['offset'] : 0;
+
+          $attr = $this->options->getArrayCopy();
+          if (isset($this->values[$offset])) {
+               $attr['value'] = $this->values[$offset];
+          } else {
+               $attr['value'] = $this->getDefaultValue();
+          }
+          if ($offset==0) {
+               $attr['id']=$this->id;
+          }
+          $attr['name'] = $this->name;
+          if ($this->multiple) {
+               $attr['name'] = $attr['name'].'[]';
+          }
+          return $attr;
+     }
+     
+     public function getDefaultValue() {
+          return '';
+     }
+
      public function getName()
      {
           return $this->name;
      }
-     
+
+     public function setName($name) {
+          $this->setNID($name);
+     }
+
      public function check()
      {
-          if (!$this->defined && $this->attributes['defined']) {
+          if (!$this->defined && $this->options['mandatory']) {
                throw new InvalidFieldException(sprintf(
                     'Field "%s" is mandatory',
@@ -406 +592 @@
      }
      
+     public function parseValues($from) {
+          if (isset($from[$this->name])) {
+               $n = $from[$this->name];
+               if (!is_array($n)) {
+                    $n = array($n);
+               }
+               return $n;
+          }
+          return array();
+     }
+
      public function setup($from)
      {
-          if (isset($from[$this->id])) {
-               $this->value = $from[$this->id];
+          $values = $this->parseValues($from);
+          if (count($values)) {
+               $this->setValues($values);
                $this->defined = true;
           }
@@ -420 +618 @@
 }
 
+
 /**
  * Template form field of type "password"
@@ -473 +672 @@
           return "field_checkbox";
      }
+
+     public function getDefaultValue() {
+          return 0;
+     }
 }
 
@@ -481 +684 @@
 {
      protected $action;
-     
-     public function __construct($name,$value,$attributes=array())
-     {
-          parent::__construct($name,$value,$attributes);
-          
-          if (isset($attributes['action'])) {
-               $this->action = $attributes['action'];
-          }
-     }
-     
+
+     public function __construct($name,$values,$options=array())
+     {
+          parent::__construct($name,$values,$options);
+
+          if (isset($options['action'])) {
+               $this->action = $options['action'];
+          } else {
+               $this->action = NULL;
+          }
+     }
+
      public function getAction()
      {
@@ -513 +718 @@
 class dcFieldCombo extends dcField
 {
-     protected $options;
-     
-     public function __construct($name,$value,$options,$attributes=array())
-     {
-          $this->options = $options;
-          parent::__construct($name,$value,$attributes);
-          $this->attributes['options']=$options;
+     protected $combo;
+     
+     public function __construct($name,$value,$combo,$options=array())
+     {
+          $this->combo = $combo;
+          parent::__construct($name,$value,$options);
      }
      
@@ -527 +731 @@
      }
 
-}
+     public function getDefaultValue() {
+          return current($this->combo);
+     }
+
+     public function parseValues($from) {
+          $values = parent::parseValues($from);
+          if (!is_array($values)) {
+               $values = array($values);
+          }
+          foreach ($values as &$v) {
+               if (!isset($this->combo[$v]))
+               $v = $this->getDefaultValue();
+          }
+          return $values;
+     }
+
+     public function getAttributes($options) {
+          $attr = parent::getAttributes($options);
+          $attr['options'] = $this->combo;
+          return $attr;
+     }
+}
+
 ?>

inc/admin/default-templates/forms/form_layout.html.twig

@@ -57 +57 @@
           <label for="{{name}}" class="classic">
      {% endif %}
-    <input type="checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
+    <input type="checkbox" {{ block('field_attr') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
      {% if label is not empty %}
           {{ label }}</label>