Merge branch 'master' of github.com:gallery/gallery3-vendor

formo/README

@@ -1,6 +1,6 @@
 CURRENT INFO -- 2013/04/06
 --------------------------
-Formo -- master branch last revised 2013/03/26
+Formo -- master branch last revised 2013/04/26
 - project homepage:  http://github.com/bmidget/kohana-formo
 - current dl link :  http://github.com/bmidget/kohana-formo/zipball/master
 
@@ -20,3 +20,17 @@ $ git push
 
 $ cd ../../gallery3
 $ git commit -m "Updated upstream to Formo <VERSION_NUMBER>" modules/formo
+
+VERIFYING PATCHES
+-----------------
+
+We have some patches in our version of the Kohana code.  After every
+update, you should verify that every one of our deviations is tracked
+by a Kohana ticket.
+
+To see the differences you can run a diff command
+$ diff --exclude=bootstrap.php -r modified ../../gallery3 | egrep -v '^Only in'
+
+Expected differences:
+  * http://github.com/bmidget/kohana-formo/pull/194
+    Allow can_be_empty to be set on a per-field basis. This is useful for CSRF.

formo/modified/classes/Formo/Core/Driver/Checkboxes.php

@@ -39,8 +39,6 @@ public static function get_title( array $array)
 		return ($label !== Formo::NOTSET)
 			? $label
 			: $field->alias();
-
-		return $label;
 	}
 
 	public static function get_val( array $array)

formo/modified/classes/Formo/Core/Driver/Radios.php

@@ -28,7 +28,12 @@ public static function get_opts_template( array $array)
 	public static function get_title( array $array)
 	{
 		$field = $array['field'];
-		return $field->alias();
+
+		$label = $field->get('label');
+
+		return ($label !== Formo::NOTSET)
+			? $label
+			: $field->alias();
 	}
 
 }

formo/modified/classes/Formo/Core/Formo.php

@@ -100,9 +100,8 @@ public function __invoke()
 		}
 
 		$str = $this->open();
-
-		$opts = $this->driver('get_opts');
-		$str.= implode("\n", $opts);
+		$str.= $this->html();
+		$str.= $this->render_opts();
 
 		foreach ($this->_fields as $field)
 		{
@@ -872,7 +871,7 @@ public function order($field, $new_order = NULL, $relative_field = NULL)
 		{
 			foreach($field as $alias => $values)
 			{
-				$this->order($alias, $values[0], $values[1]);
+				$this->order($alias, Arr::get($values, 0), Arr::get($values, 1));
 			}
 		}
 		else
@@ -1052,7 +1051,7 @@ public function remove_rules_fields($array)
 	 * @access public
 	 * @return string
 	 */
-	public function render()
+	public function render($template = NULL)
 	{
 		if (Kohana::$profiling === TRUE)
 		{
@@ -1065,8 +1064,11 @@ public function render()
 			return NULL;
 		}
 
-		$template = $this->driver('get_template');
-		$template = $this->config('template_dir').$template;
+		if ($template == NULL)
+		{
+			$template = $this->driver('get_template');
+			$template = $this->config('template_dir').$template;
+		}
 
 		$view = View::factory($template)
 			->set('field', $this)
@@ -1481,4 +1483,4 @@ public function validation_errors( Kohana_Validation $validation)
 		}
 	}
 
-}
+}

formo/modified/classes/Formo/Core/Innards.php

@@ -563,7 +563,7 @@ protected function _load( array $array)
 			{
 				$field->driver('load', array('val' => $value));
 			}
-			elseif ($field->driver('can_be_empty') === TRUE)
+			elseif ($field->get('can_be_empty', $field->driver('can_be_empty')) === TRUE)
 			{
 				$field->val(null);
 			}
@@ -773,7 +773,7 @@ protected function _set_driver($driver)
 	 */
 	protected function _set_id( array & $array)
 	{
-		if ($this->config('auto_id') === TRUE AND empty($array['attr']['id']))
+		if ($this->config('auto_id') === TRUE AND Arr::path($array, 'attr.id') === NULL)
 		{
 			if (empty($array['attr']))
 			{
@@ -861,4 +861,35 @@ protected function _resolve_construct_aliases($array)
 
 		return $_array;
 	}
-}
+
+	/**
+	 * Validation method that properly validates for html5 range
+	 * 
+	 * @access public
+	 * @static
+	 * @param mixed $field
+	 * @param mixed $form
+	 * @return boolean
+	 */
+	public static function range($field, $form)
+	{
+		$value = $form->$field->val();
+		$attr = $form->$field->get('attr');
+
+		$max = Arr::get($attr, 'max');
+		$min = Arr::get($attr, 'min');
+		$step = Arr::get($attr, 'step');
+
+		if ($min AND $value <= $min)
+			return FALSE;
+
+		if ($max AND $value >= $max)
+			return FALSE;
+
+		// Use the default step of 1
+		( ! $step AND $step = 1);
+
+		return strpos(($value - $min) / $step, '.') === FALSE;
+	}
+
+}

formo/modified/views/formo_bootstrap/checkbox_template.php

@@ -1,9 +1,9 @@
 <div class="field control-group formo-<?=$field->get('driver')?><?php if ($error = $field->error()) echo ' error'; ?>" id="field-container-<?=$field->alias()?>">
-	<label><?=$field->open().$field->html().$field->render_opts().$field->close()?> <span class="checkbox-label"><?=$field->label()?></span></label>
+	<label class="checkbox"><?=$field->open().$field->html().$field->render_opts().$field->close()?> <span class="checkbox-label"><?=$field->label()?></span></label>
 
 	<?php if ($msg = $field->error()): ?>
 		<span class="help-block"><?=$msg?></span>
 	<?php elseif ($msg = $field->get('message')): ?>
 		<span class="help-block"><?=$msg?></span>
 	<?php endif; ?>
-</div>
+</div>

formo/modified/views/formo_bootstrap/field_template.php

@@ -1,8 +1,8 @@
 <div class="field control-group formo-<?=$field->get('driver')?><?php if ($error = $field->error()) echo ' error'; ?>" id="field-container-<?=$field->alias()?>">
-	<?php if ($label = $field->label()): ?>
-		<label for="<?=$field->attr('id')?>"><?=$label?></label>
-	<?php elseif ($title): ?>
+	<?php if ($title): ?>
 		<span class="title"><?=$title?></span>
+	<?php elseif ($label = $field->label()): ?>
+		<label for="<?=$field->attr('id')?>"><?=$label?></label>
 	<?php endif; ?>
 
 	<?=$field->open().$field->html().$field->render_opts().$field->close()?>

formo/upstream/README.md

@@ -1,3 +1,3 @@
 Formo is a form module for Kohana 3 that lets you work with forms as objects.
 
-http://bmidget.github.com/kohana-formo/
+http://bmidget.github.io/kohana-formo/

formo/upstream/classes/Formo/Core/Driver/Checkboxes.php

@@ -39,8 +39,6 @@ public static function get_title( array $array)
 		return ($label !== Formo::NOTSET)
 			? $label
 			: $field->alias();
-
-		return $label;
 	}
 
 	public static function get_val( array $array)

formo/upstream/classes/Formo/Core/Driver/Radios.php

@@ -28,7 +28,12 @@ public static function get_opts_template( array $array)
 	public static function get_title( array $array)
 	{
 		$field = $array['field'];
-		return $field->alias();
+
+		$label = $field->get('label');
+
+		return ($label !== Formo::NOTSET)
+			? $label
+			: $field->alias();
 	}
 
 }

formo/upstream/classes/Formo/Core/Formo.php

@@ -100,9 +100,8 @@ public function __invoke()
 		}
 
 		$str = $this->open();
-
-		$opts = $this->driver('get_opts');
-		$str.= implode("\n", $opts);
+		$str.= $this->html();
+		$str.= $this->render_opts();
 
 		foreach ($this->_fields as $field)
 		{
@@ -872,7 +871,7 @@ public function order($field, $new_order = NULL, $relative_field = NULL)
 		{
 			foreach($field as $alias => $values)
 			{
-				$this->order($alias, $values[0], $values[1]);
+				$this->order($alias, Arr::get($values, 0), Arr::get($values, 1));
 			}
 		}
 		else
@@ -1052,7 +1051,7 @@ public function remove_rules_fields($array)
 	 * @access public
 	 * @return string
 	 */
-	public function render()
+	public function render($template = NULL)
 	{
 		if (Kohana::$profiling === TRUE)
 		{
@@ -1065,8 +1064,11 @@ public function render()
 			return NULL;
 		}
 
-		$template = $this->driver('get_template');
-		$template = $this->config('template_dir').$template;
+		if ($template == NULL)
+		{
+			$template = $this->driver('get_template');
+			$template = $this->config('template_dir').$template;
+		}
 
 		$view = View::factory($template)
 			->set('field', $this)
@@ -1481,4 +1483,4 @@ public function validation_errors( Kohana_Validation $validation)
 		}
 	}
 
-}
+}

formo/upstream/classes/Formo/Core/Innards.php

@@ -563,7 +563,7 @@ protected function _load( array $array)
 			{
 				$field->driver('load', array('val' => $value));
 			}
-			elseif ($field->driver('can_be_empty') === TRUE)
+			elseif ($field->get('can_be_empty', $field->driver('can_be_empty')) === TRUE)
 			{
 				$field->val(null);
 			}
@@ -773,7 +773,7 @@ protected function _set_driver($driver)
 	 */
 	protected function _set_id( array & $array)
 	{
-		if ($this->config('auto_id') === TRUE AND empty($array['attr']['id']))
+		if ($this->config('auto_id') === TRUE AND Arr::path($array, 'attr.id') === NULL)
 		{
 			if (empty($array['attr']))
 			{
@@ -861,4 +861,35 @@ protected function _resolve_construct_aliases($array)
 
 		return $_array;
 	}
-}
+
+	/**
+	 * Validation method that properly validates for html5 range
+	 * 
+	 * @access public
+	 * @static
+	 * @param mixed $field
+	 * @param mixed $form
+	 * @return boolean
+	 */
+	public static function range($field, $form)
+	{
+		$value = $form->$field->val();
+		$attr = $form->$field->get('attr');
+
+		$max = Arr::get($attr, 'max');
+		$min = Arr::get($attr, 'min');
+		$step = Arr::get($attr, 'step');
+
+		if ($min AND $value <= $min)
+			return FALSE;
+
+		if ($max AND $value >= $max)
+			return FALSE;
+
+		// Use the default step of 1
+		( ! $step AND $step = 1);
+
+		return strpos(($value - $min) / $step, '.') === FALSE;
+	}
+
+}

formo/upstream/config/formo.php

@@ -35,11 +35,11 @@
 		'month'          => array(array('regex', array(':value', '/^\d{4}-(?:0[1-9]|1[0-2])$/'))),
 		'range'          => array(
 			array('digit'),
-			array('Formo_Validator::range', array(':field', ':form')),
+			array('Formo::range', array(':field', ':form')),
 		),
 		'number'        => array(
 			array('digit'),
-			array('Formo_Validator::range', array(':field', ':form')),
+			array('Formo::range', array(':field', ':form')),
 		),
 	),
-);
+);

formo/upstream/views/formo_bootstrap/checkbox_template.php

@@ -1,9 +1,9 @@
 <div class="field control-group formo-<?=$field->get('driver')?><?php if ($error = $field->error()) echo ' error'; ?>" id="field-container-<?=$field->alias()?>">
-	<label><?=$field->open().$field->html().$field->render_opts().$field->close()?> <span class="checkbox-label"><?=$field->label()?></span></label>
+	<label class="checkbox"><?=$field->open().$field->html().$field->render_opts().$field->close()?> <span class="checkbox-label"><?=$field->label()?></span></label>
 
 	<?php if ($msg = $field->error()): ?>
 		<span class="help-block"><?=$msg?></span>
 	<?php elseif ($msg = $field->get('message')): ?>
 		<span class="help-block"><?=$msg?></span>
 	<?php endif; ?>
-</div>
+</div>

formo/upstream/views/formo_bootstrap/field_template.php

@@ -1,8 +1,8 @@
 <div class="field control-group formo-<?=$field->get('driver')?><?php if ($error = $field->error()) echo ' error'; ?>" id="field-container-<?=$field->alias()?>">
-	<?php if ($label = $field->label()): ?>
-		<label for="<?=$field->attr('id')?>"><?=$label?></label>
-	<?php elseif ($title): ?>
+	<?php if ($title): ?>
 		<span class="title"><?=$title?></span>
+	<?php elseif ($label = $field->label()): ?>
+		<label for="<?=$field->attr('id')?>"><?=$label?></label>
 	<?php endif; ?>
 
 	<?=$field->open().$field->html().$field->render_opts().$field->close()?>