aboutsummaryrefslogtreecommitdiff
path: root/h-source/Library/Form
diff options
context:
space:
mode:
Diffstat (limited to 'h-source/Library/Form')
-rwxr-xr-xh-source/Library/Form/Checkbox.php4
-rwxr-xr-xh-source/Library/Form/Entry.php3
-rw-r--r--h-source/Library/Form/File.php4
-rwxr-xr-xh-source/Library/Form/Form.php120
-rwxr-xr-xh-source/Library/Form/Hidden.php4
-rw-r--r--h-source/Library/Form/Html.php2
-rwxr-xr-xh-source/Library/Form/InputText.php4
-rw-r--r--h-source/Library/Form/Password.php4
-rwxr-xr-xh-source/Library/Form/Radio.php4
-rwxr-xr-xh-source/Library/Form/Select.php4
-rwxr-xr-xh-source/Library/Form/Textarea.php4
11 files changed, 36 insertions, 121 deletions
diff --git a/h-source/Library/Form/Checkbox.php b/h-source/Library/Form/Checkbox.php
index 91191a9..497c097 100755
--- a/h-source/Library/Form/Checkbox.php
+++ b/h-source/Library/Form/Checkbox.php
@@ -2,7 +2,7 @@
// EasyGiant is a PHP framework for creating and managing dynamic content
//
-// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com)
+// Copyright (C) 2009 - 2011 Antonio Gallo
// See COPYRIGHT.txt and LICENSE.txt.
//
// This file is part of EasyGiant
@@ -39,7 +39,7 @@ class Form_Checkbox extends Form_Entry
$returnString .= $wrap[1];
$returnString .= $this->getLabelTag();
$returnString .= $wrap[2];
- $returnString .= Html_Form::checkbox($this->entryName, $value, $this->options, $this->className,$this->idName,$this->attributes);
+ $returnString .= Html_Form::checkbox($this->entryName, $value, $this->options, $this->className,$this->idName);
$returnString .= $wrap[3];
$returnString .="</div>\n";
$returnString .= $wrap[4];
diff --git a/h-source/Library/Form/Entry.php b/h-source/Library/Form/Entry.php
index fa3b84f..6f45557 100755
--- a/h-source/Library/Form/Entry.php
+++ b/h-source/Library/Form/Entry.php
@@ -2,7 +2,7 @@
// EasyGiant is a PHP framework for creating and managing dynamic content
//
-// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com)
+// Copyright (C) 2009 - 2011 Antonio Gallo
// See COPYRIGHT.txt and LICENSE.txt.
//
// This file is part of EasyGiant
@@ -33,7 +33,6 @@ abstract class Form_Entry {
public $labelClass = null; //the class of the tag of the label
public $options = array(); //options (if the entry is a <select> entry or a radio button). Associative array or comma-divided list.
public $reverse = null; //reverse label with value in select entries
- public $attributes = null; //attributes of the field
public $defaultValue = '';
public $wrap = array();
public $deleteButton = null;
diff --git a/h-source/Library/Form/File.php b/h-source/Library/Form/File.php
index f1e7d2d..ac9b8ab 100644
--- a/h-source/Library/Form/File.php
+++ b/h-source/Library/Form/File.php
@@ -2,7 +2,7 @@
// EasyGiant is a PHP framework for creating and managing dynamic content
//
-// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com)
+// Copyright (C) 2009 - 2011 Antonio Gallo
// See COPYRIGHT.txt and LICENSE.txt.
//
// This file is part of EasyGiant
@@ -39,7 +39,7 @@ class Form_File extends Form_Entry
$returnString .= $wrap[1];
$returnString .= $this->getLabelTag();
$returnString .= $wrap[2];
- $returnString .= Html_Form::fileUpload($this->entryName, $value, $this->className, $this->idName, $this->attributes);
+ $returnString .= Html_Form::fileUpload($this->entryName, $value, $this->className, $this->idName);
if (is_array($this->deleteButton))
{
$sname = isset($this->deleteButton[0]) ? $this->deleteButton[0] : 'delete_'.$this->entryName;
diff --git a/h-source/Library/Form/Form.php b/h-source/Library/Form/Form.php
index 9b05c51..a1a9fda 100755
--- a/h-source/Library/Form/Form.php
+++ b/h-source/Library/Form/Form.php
@@ -2,7 +2,7 @@
// EasyGiant is a PHP framework for creating and managing dynamic content
//
-// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com)
+// Copyright (C) 2009 - 2011 Antonio Gallo
// See COPYRIGHT.txt and LICENSE.txt.
//
// This file is part of EasyGiant
@@ -25,15 +25,6 @@ if (!defined('EG')) die('Direct access not allowed!');
//create the HTML of the whole form
class Form_Form {
- //default attributes of the entries
- public static $defaultEntryAttributes = array(
- "entryClass" => null,
- "className" => null,
- "idName" => null,
- "submitClass" => "btn btn-primary",
- "formWrap" => null,
- );
-
public $entry = array(); //associative array containing the entries of the form (objects that inherit the class form_entryModel). Each element of the array corresponds to one field of the table
public $action = null; //the action of the form
@@ -62,9 +53,8 @@ class Form_Form {
{
throw new Exception("class <b>$entryObjName</b> not defined: the entry <b>$entryName</b> can't be set");
}
-
$this->entry[$entryName] = new $entryObjName($entryName);
- $this->entry[$entryName]->labelString = getFieldLabel($entryName);
+ $this->entry[$entryName]->labelString = $entryName.':';
//set the type
$this->entry[$entryName]->type = $entryType;
if (isset($options))
@@ -82,18 +72,17 @@ class Form_Form {
$type = array_key_exists('type',$entry) ? $entry['type'] : 'InputText';
$options = array_key_exists('options',$entry) ? $entry['options'] : null;
$this->setEntry($name,$type,$options);
-
- $entryClass = array_key_exists('entryClass',$entry) ? $entry['entryClass'] : self::$defaultEntryAttributes['entryClass'];
- $labelString = array_key_exists('labelString',$entry) ? $entry['labelString'] : getFieldLabel($name);
- $idName = array_key_exists('idName',$entry) ? $entry['idName'] : self::$defaultEntryAttributes['idName'];
- $className = array_key_exists('className',$entry) ? $entry['className'] : self::$defaultEntryAttributes['className'];
+
+ $entryClass = array_key_exists('entryClass',$entry) ? $entry['entryClass'] : null;
+ $labelString = array_key_exists('labelString',$entry) ? $entry['labelString'] : "$name:";
+ $idName = array_key_exists('idName',$entry) ? $entry['idName'] : null;
+ $className = array_key_exists('className',$entry) ? $entry['className'] : null;
$labelClass = array_key_exists('labelClass',$entry) ? $entry['labelClass'] : null;
$defaultValue = array_key_exists('defaultValue',$entry) ? $entry['defaultValue'] : null;
$wrap = array_key_exists('wrap',$entry) ? $entry['wrap'] : array();
$deleteButton = array_key_exists('deleteButton',$entry) ? $entry['deleteButton'] : null;
$reverse = array_key_exists('reverse',$entry) ? $entry['reverse'] : null;
- $attributes = array_key_exists('attributes',$entry) ? $entry['attributes'] : null;
-
+
$this->entry[$name]->entryClass = $entryClass;
$this->entry[$name]->labelString = $labelString;
$this->entry[$name]->idName = $idName;
@@ -103,13 +92,12 @@ class Form_Form {
$this->entry[$name]->wrap = $wrap;
$this->entry[$name]->deleteButton = $deleteButton;
$this->entry[$name]->reverse = $reverse;
- $this->entry[$name]->attributes = $attributes;
}
}
//function to create the HTML of the form
//$values: an associative array ('entryName'=>'value')
- //$subset: subset to print (comma seprated list of string or array)
+ //$subset: subset to print
public function render($values = null, $subset = null)
{
@@ -125,99 +113,27 @@ class Form_Form {
$fid = isset($this->id) ? "id='".$this->id."'" : null;
$fname = isset($this->name) ? "name='".$this->name."'" : null;
$fclass = isset($this->className) ? "class='".$this->className."'" : null;
- $fenctype = isset($this->enctype) ? " enctype='".$this->enctype."' " : null;
+ $fenctype = isset($this->enctype) ? " enctype=".$this->enctype." " : null;
$htmlForm = "<form $fname $fclass $fid action='".Url::getRoot($this->action)."' method='".$this->method."' $fenctype>\n";
- if (!isset($subset))
- {
- $subset = array_keys($values);
- }
- else
- {
- $subset = !is_array($subset) ? explode(',',$subset) : $subset;
- }
-// $subset = (isset($subset)) ? explode(',',$subset) : array_keys($values);
-
- //first cicle: write the HTML of tabs if there are any
- $tabsHtml = null;
- $fCount = 0;
- foreach ($subset as $key => $entry)
- {
- if (is_array($entry))
- {
- $currClass = $fCount === 0 ? "current_tab" : null;
- $cleanKey = encode($key);
- $tabsHtml .= "\t<li class='form_tab_li $currClass'><a rel='tab_$cleanKey' class='form_tab_a form_tab_a_$cleanKey' href='#'>$key</a></li>\n";
- $fCount++;
- }
- }
- if (isset($tabsHtml))
- {
- $htmlForm .= "<ul class='form_tab_ul'>\n$tabsHtml\n</ul>\n";
- }
+ $subset = (isset($subset)) ? explode(',',$subset) : array_keys($values);
- $fCount = 0;
- foreach ($subset as $k => $entry)
+ foreach ($subset as $entry)
{
-
- $cleanK = encode($k);
- if (!is_array($entry))
- {
- if (array_key_exists($entry,$this->entry))
- {
- $value = array_key_exists($entry,$values) ? $values[$entry] : $this->entry[$entry]->defaultValue;
- $htmlForm .= $this->entry[$entry]->render($value);
- }
- }
- else
+
+ if (array_key_exists($entry,$this->entry))
{
- $tHtml = null;
- $displClass = $fCount === 0 ? null : "display_none";
- foreach ($entry as $e)
- {
- if (array_key_exists($e,$this->entry))
- {
- $value = array_key_exists($e,$values) ? $values[$e] : $this->entry[$e]->defaultValue;
- $tHtml .= $this->entry[$e]->render($value);
- }
- }
- $htmlForm .= "<div id='tab_$cleanK' class='tab_description_item $displClass'>$tHtml</div>";
- $fCount++;
+ $value = array_key_exists($entry,$values) ? $values[$entry] : $this->entry[$entry]->defaultValue;
+ $htmlForm .= $this->entry[$entry]->render($value);
}
+
}
- $htmlForm .= "<div class='submit_entry'>";
foreach ($this->submit as $name => $value)
{
- if (!is_array($value))
- {
- $submitClass= "";
- if (!is_array(self::$defaultEntryAttributes['submitClass']))
- {
- $submitClass = self::$defaultEntryAttributes['submitClass'];
- }
- else
- {
- if (array_key_exists($value,self::$defaultEntryAttributes['submitClass']))
- {
- $submitClass = self::$defaultEntryAttributes['submitClass'][$value];
- }
- }
- $htmlForm .= "<span class='submit_entry_$value'>".Html_Form::submit($name, $value, $submitClass, $name)."</span>";
- }
- else
- {
- array_unshift($value,$name);
- $htmlForm .= call_user_func_array(array("Html_Form","submit"),$value);
- }
+ $htmlForm .= "<div class='inputEntry'>\n<input id='".$name."' type='submit' name='$name' value='$value'>\n</div>\n";
}
- $htmlForm .= "</div>";
$htmlForm .= "</form>\n";
-
- if (isset(self::$defaultEntryAttributes["formWrap"]) and is_array(self::$defaultEntryAttributes["formWrap"]) and count(self::$defaultEntryAttributes["formWrap"]) === 2)
- {
- return self::$defaultEntryAttributes["formWrap"][0] . $htmlForm . self::$defaultEntryAttributes["formWrap"][1];
- }
return $htmlForm;
}
diff --git a/h-source/Library/Form/Hidden.php b/h-source/Library/Form/Hidden.php
index c2185b9..c589662 100755
--- a/h-source/Library/Form/Hidden.php
+++ b/h-source/Library/Form/Hidden.php
@@ -2,7 +2,7 @@
// EasyGiant is a PHP framework for creating and managing dynamic content
//
-// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com)
+// Copyright (C) 2009 - 2011 Antonio Gallo
// See COPYRIGHT.txt and LICENSE.txt.
//
// This file is part of EasyGiant
@@ -33,7 +33,7 @@ class Form_Hidden extends Form_Entry
public function render($value = null)
{
- $returnString = Html_Form::hidden($this->entryName, $value, $this->className, $this->idName, $this->attributes);
+ $returnString = Html_Form::hidden($this->entryName, $value);
return $returnString;
}
diff --git a/h-source/Library/Form/Html.php b/h-source/Library/Form/Html.php
index a7181cc..e5c9989 100644
--- a/h-source/Library/Form/Html.php
+++ b/h-source/Library/Form/Html.php
@@ -2,7 +2,7 @@
// EasyGiant is a PHP framework for creating and managing dynamic content
//
-// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com)
+// Copyright (C) 2009 - 2011 Antonio Gallo
// See COPYRIGHT.txt and LICENSE.txt.
//
// This file is part of EasyGiant
diff --git a/h-source/Library/Form/InputText.php b/h-source/Library/Form/InputText.php
index 086c0a1..344264e 100755
--- a/h-source/Library/Form/InputText.php
+++ b/h-source/Library/Form/InputText.php
@@ -2,7 +2,7 @@
// EasyGiant is a PHP framework for creating and managing dynamic content
//
-// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com)
+// Copyright (C) 2009 - 2011 Antonio Gallo
// See COPYRIGHT.txt and LICENSE.txt.
//
// This file is part of EasyGiant
@@ -39,7 +39,7 @@ class Form_InputText extends Form_Entry
$returnString .= $wrap[1];
$returnString .= $this->getLabelTag();
$returnString .= $wrap[2];
- $returnString .= Html_Form::input($this->entryName, $value, $this->className, $this->idName, $this->attributes);
+ $returnString .= Html_Form::input($this->entryName, $value, $this->className, $this->idName);
$returnString .= $wrap[3];
$returnString .="</div>\n";
$returnString .= $wrap[4];
diff --git a/h-source/Library/Form/Password.php b/h-source/Library/Form/Password.php
index 41fbc8e..9bfc68b 100644
--- a/h-source/Library/Form/Password.php
+++ b/h-source/Library/Form/Password.php
@@ -2,7 +2,7 @@
// EasyGiant is a PHP framework for creating and managing dynamic content
//
-// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com)
+// Copyright (C) 2009 - 2011 Antonio Gallo
// See COPYRIGHT.txt and LICENSE.txt.
//
// This file is part of EasyGiant
@@ -39,7 +39,7 @@ class Form_Password extends Form_Entry
$returnString .= $wrap[1];
$returnString .= $this->getLabelTag();
$returnString .= $wrap[2];
- $returnString .= Html_Form::password($this->entryName, null, $this->className, $this->idName, $this->attributes);
+ $returnString .= Html_Form::password($this->entryName, null, $this->className);
$returnString .= $wrap[3];
$returnString .="</div>\n";
$returnString .= $wrap[4];
diff --git a/h-source/Library/Form/Radio.php b/h-source/Library/Form/Radio.php
index 10154be..4f596ed 100755
--- a/h-source/Library/Form/Radio.php
+++ b/h-source/Library/Form/Radio.php
@@ -2,7 +2,7 @@
// EasyGiant is a PHP framework for creating and managing dynamic content
//
-// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com)
+// Copyright (C) 2009 - 2011 Antonio Gallo
// See COPYRIGHT.txt and LICENSE.txt.
//
// This file is part of EasyGiant
@@ -39,7 +39,7 @@ class Form_Radio extends Form_Entry
$returnString .= $wrap[1];
$returnString .= $this->getLabelTag();
$returnString .= $wrap[2];
- $returnString .= Html_Form::radio($this->entryName,$value,$this->options,$this->className, 'after', $this->idName, $this->attributes);
+ $returnString .= Html_Form::radio($this->entryName,$value,$this->options,$this->className, 'after', $this->idName);
$returnString .= $wrap[3];
$returnString .="</div>\n";
$returnString .= $wrap[4];
diff --git a/h-source/Library/Form/Select.php b/h-source/Library/Form/Select.php
index 8b2a634..53d7632 100755
--- a/h-source/Library/Form/Select.php
+++ b/h-source/Library/Form/Select.php
@@ -2,7 +2,7 @@
// EasyGiant is a PHP framework for creating and managing dynamic content
//
-// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com)
+// Copyright (C) 2009 - 2011 Antonio Gallo
// See COPYRIGHT.txt and LICENSE.txt.
//
// This file is part of EasyGiant
@@ -39,7 +39,7 @@ class Form_Select extends Form_Entry
$returnString .= $wrap[1];
$returnString .= $this->getLabelTag();
$returnString .= $wrap[2];
- $returnString .= Html_Form::select($this->entryName,$value,$this->options,$this->className, $this->idName, $this->reverse, $this->attributes);
+ $returnString .= Html_Form::select($this->entryName,$value,$this->options,$this->className, $this->idName, $this->reverse);
$returnString .= $wrap[3];
$returnString .="</div>\n";
$returnString .= $wrap[4];
diff --git a/h-source/Library/Form/Textarea.php b/h-source/Library/Form/Textarea.php
index f294b0a..aaaf19e 100755
--- a/h-source/Library/Form/Textarea.php
+++ b/h-source/Library/Form/Textarea.php
@@ -2,7 +2,7 @@
// EasyGiant is a PHP framework for creating and managing dynamic content
//
-// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com)
+// Copyright (C) 2009 - 2011 Antonio Gallo
// See COPYRIGHT.txt and LICENSE.txt.
//
// This file is part of EasyGiant
@@ -39,7 +39,7 @@ class Form_Textarea extends Form_Entry
$returnString .= $wrap[1];
$returnString .= $this->getLabelTag();
$returnString .= $wrap[2];
- $returnString .= Html_Form::textarea($this->entryName, $value, $this->className, $this->idName, $this->attributes);
+ $returnString .= Html_Form::textarea($this->entryName, $value, $this->className, $this->idName);
$returnString .= $wrap[3];
$returnString .="</div>\n";
$returnString .= $wrap[4];
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 17:52:52 +0000