[Pieforms-commit] SF.net SVN: pieforms: [258] pieforms-php5/trunk/src/pieform
Status: Alpha
Brought to you by:
oracleshinoda
From: <ora...@us...> - 2007-12-31 02:03:03
|
Revision: 258 http://pieforms.svn.sourceforge.net/pieforms/?rev=258&view=rev Author: oracleshinoda Date: 2007-12-30 18:03:07 -0800 (Sun, 30 Dec 2007) Log Message: ----------- Added foldmarkers to all files. Updated copyright for all files to 2008 Modified Paths: -------------- pieforms-php5/trunk/src/pieform/elements/button.php pieforms-php5/trunk/src/pieform/elements/bytes.php pieforms-php5/trunk/src/pieform/elements/calendar.php pieforms-php5/trunk/src/pieform/elements/cancel.php pieforms-php5/trunk/src/pieform/elements/checkbox.php pieforms-php5/trunk/src/pieform/elements/date.php pieforms-php5/trunk/src/pieform/elements/expiry.php pieforms-php5/trunk/src/pieform/elements/file.php pieforms-php5/trunk/src/pieform/elements/hidden.php pieforms-php5/trunk/src/pieform/elements/html.php pieforms-php5/trunk/src/pieform/elements/image.php pieforms-php5/trunk/src/pieform/elements/password.php pieforms-php5/trunk/src/pieform/elements/radio.php pieforms-php5/trunk/src/pieform/elements/select.php pieforms-php5/trunk/src/pieform/elements/submit.php pieforms-php5/trunk/src/pieform/elements/submitcancel.php pieforms-php5/trunk/src/pieform/elements/text.php pieforms-php5/trunk/src/pieform/elements/textarea.php pieforms-php5/trunk/src/pieform/renderers/div.php pieforms-php5/trunk/src/pieform/renderers/multicolumntable.php pieforms-php5/trunk/src/pieform/renderers/oneline.php pieforms-php5/trunk/src/pieform/renderers/table.php pieforms-php5/trunk/src/pieform/rules/before.php pieforms-php5/trunk/src/pieform/rules/email.php pieforms-php5/trunk/src/pieform/rules/integer.php pieforms-php5/trunk/src/pieform/rules/maxlength.php pieforms-php5/trunk/src/pieform/rules/maxvalue.php pieforms-php5/trunk/src/pieform/rules/minlength.php pieforms-php5/trunk/src/pieform/rules/minvalue.php pieforms-php5/trunk/src/pieform/rules/regex.php pieforms-php5/trunk/src/pieform/rules/required.php pieforms-php5/trunk/src/pieform/rules/validateoptions.php Modified: pieforms-php5/trunk/src/pieform/elements/button.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/button.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/button.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -34,13 +34,13 @@ * @return string The HTML for the element * @todo rename to inputbutton */ -function pieform_element_button(Pieform $form, $element) { +function pieform_element_button(Pieform $form, $element) {/*{{{*/ if (!isset($element['value'])) { throw new PieformException('Button elements must have a value'); } return '<input type="button"' . $form->element_attributes($element) . ' value="' . Pieform::hsc($element['value']) . '">'; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/bytes.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/bytes.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/bytes.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Martyn Smith <ma...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -32,7 +32,7 @@ * @param array $element The element to render * @return string The HTML for the element */ -function pieform_element_bytes(Pieform $form, $element) { +function pieform_element_bytes(Pieform $form, $element) {/*{{{*/ $formname = $form->get_name(); $result = ''; $name = $element['name']; @@ -78,7 +78,7 @@ $uselect .= "</select>\n"; return $numberinput . $uselect; -} +}/*}}}*/ /** * Gets the value of the expiry element and converts it to a time in seconds. @@ -87,7 +87,7 @@ * @param array $element The element to get the value for * @return int The number of seconds until expiry */ -function pieform_element_bytes_get_value(Pieform $form, $element) { +function pieform_element_bytes_get_value(Pieform $form, $element) {/*{{{*/ $name = $element['name']; $global = ($form->get_property('method') == 'get') ? $_GET : $_POST; @@ -103,9 +103,9 @@ return null; } return $number * pieform_element_bytes_in($unit); -} +}/*}}}*/ -function pieform_element_bytes_in($units) { +function pieform_element_bytes_in($units) {/*{{{*/ switch ($units) { case 'megabytes': return 1048576; @@ -117,9 +117,9 @@ return 1; break; }; -} +}/*}}}*/ -function pieform_element_bytes_i18n() { +function pieform_element_bytes_i18n() {/*{{{*/ return array( 'en.utf8' => array( 'bytes' => 'Bytes', @@ -140,13 +140,13 @@ 'invalidvalue' => 'Valeur doit être un nombre', ), ); -} +}/*}}}*/ -function pieform_element_bytes_get_bytes_units() { +function pieform_element_bytes_get_bytes_units() {/*{{{*/ return array('bytes', 'kilobytes', 'megabytes'); -} +}/*}}}*/ -function pieform_element_bytes_get_bytes_from_bytes($bytes) { +function pieform_element_bytes_get_bytes_from_bytes($bytes) {/*{{{*/ if ($bytes == null) { return array('number' => '0', 'units' => 'bytes'); } @@ -158,6 +158,6 @@ } return array('number' => $bytes, 'units' => 'bytes'); -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/calendar.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/calendar.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/calendar.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -34,7 +34,7 @@ * @param array $element The element to render * @return string The HTML for the element */ -function pieform_element_calendar(Pieform $form, $element) { +function pieform_element_calendar(Pieform $form, $element) {/*{{{*/ $id = $form->get_name() . '_' . $element['name']; $value = $form->get_value($element); if ($value) { @@ -66,7 +66,7 @@ $result .= '<script type="text/javascript">Calendar.setup(' . $encodedoptions . ');</script>'; return $result; -} +}/*}}}*/ /** * Sets default attributes of the calendar element. @@ -74,14 +74,14 @@ * @param array $element The element to configure * @return array The configured element */ -function pieform_element_calendar_set_attributes($element) { +function pieform_element_calendar_set_attributes($element) {/*{{{*/ $element['jsroot'] = isset($element['jsroot']) ? $element['jsroot'] : ''; $element['language'] = isset($element['language']) ? $element['language'] : 'en'; $element['theme'] = isset($element['theme']) ? $element['theme'] : 'calendar-win2k-2'; $element['caloptions']['ifFormat'] = isset($element['caloptions']['ifFormat']) ? $element['caloptions']['ifFormat'] : '%Y/%m/%d'; $element['caloptions']['daFormat'] = isset($element['caloptions']['daFormat']) ? $element['caloptions']['daFormat'] : '%Y/%m/%d'; return $element; -} +}/*}}}*/ /** * Returns code to go in <head> for the given calendar instance @@ -89,7 +89,7 @@ * @param array $element The element to get <head> code for * @return array An array of HTML elements to go in the <head> */ -function pieform_element_calendar_get_headdata($element) { +function pieform_element_calendar_get_headdata($element) {/*{{{*/ if (isset($element['themefile'])) { $themefile = $element['themefile']; } @@ -109,7 +109,7 @@ '<script type="text/javascript" src="' . $setupfile . '"></script>' ); return $result; -} +}/*}}}*/ /** * Retrieves the value of the calendar as a unix timestamp @@ -118,7 +118,7 @@ * @param array $element The element to get the value for * @return int The unix timestamp represented by the calendar */ -function pieform_element_calendar_get_value(Pieform $form, $element) { +function pieform_element_calendar_get_value(Pieform $form, $element) {/*{{{*/ $name = $element['name']; $global = ($form->get_property('method') == 'get') ? $_GET : $_POST; @@ -145,12 +145,12 @@ } return null; -} +}/*}}}*/ /** * i18n for calendar */ -function pieform_element_calendar_i18n() { +function pieform_element_calendar_i18n() {/*{{{*/ return array( 'en.utf8' => array( 'invalidvalue' => 'Invalid date/time specified' @@ -162,6 +162,6 @@ 'invalidvalue' => 'Date/Heure indiquée invalide' ), ); -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/cancel.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/cancel.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/cancel.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -33,7 +33,7 @@ * @param array $element The element to render * @return string The HTML for the element */ -function pieform_element_cancel(Pieform $form, $element) { +function pieform_element_cancel(Pieform $form, $element) {/*{{{*/ if (!isset($element['value'])) { throw new PieformException('Cancel elements must have a value'); } @@ -44,11 +44,11 @@ return '<input type="submit"' . $attributes . ' value="' . Pieform::hsc($element['value']) . '">'; -} +}/*}}}*/ -function pieform_element_cancel_set_attributes($element) { +function pieform_element_cancel_set_attributes($element) {/*{{{*/ $element['cancelelement'] = true; return $element; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/checkbox.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/checkbox.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/checkbox.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -31,7 +31,7 @@ * @param array $element The element to render * @return string The HTML for the element */ -function pieform_element_checkbox(Pieform $form, $element) { +function pieform_element_checkbox(Pieform $form, $element) {/*{{{*/ $checked = false; if (!empty($element['value'])) { $checked = true; @@ -48,9 +48,9 @@ . $form->element_attributes($element) . ($checked ? ' checked="checked"' : '') . '>'; -} +}/*}}}*/ -function pieform_element_checkbox_get_value(Pieform $form, $element) { +function pieform_element_checkbox_get_value(Pieform $form, $element) {/*{{{*/ $name = $element['name']; $global = ($form->get_property('method') == 'get') ? $_GET : $_POST; @@ -70,6 +70,6 @@ } return false; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/date.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/date.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/date.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -31,7 +31,7 @@ * @param array $element The element to render * @return string The HTML for the element */ -function pieform_element_date(Pieform $form, $element) { +function pieform_element_date(Pieform $form, $element) {/*{{{*/ $result = ''; $name = $element['name']; $element['minyear'] = (isset($element['minyear'])) ? intval($element['minyear']) : 1950; @@ -104,7 +104,7 @@ } return $result; -} +}/*}}}*/ /** * Gets the value of the date element from the request and converts it into a @@ -113,7 +113,7 @@ * @param Pieform $form The form the element is attached to * @param array $element The element to get the value for */ -function pieform_element_date_get_value(Pieform $form, $element) { +function pieform_element_date_get_value(Pieform $form, $element) {/*{{{*/ $name = $element['name']; $global = ($form->get_property('method') == 'get') ? $_GET : $_POST; if ( isset($global[$name . '_day']) && isset($global[$name . '_month']) && isset($global[$name . '_year']) ) { @@ -125,9 +125,9 @@ } return null; -} +}/*}}}*/ -function pieform_element_date_i18n() { +function pieform_element_date_i18n() {/*{{{*/ return array( 'en.utf8' => array( 'or' => 'or', @@ -142,10 +142,10 @@ 'notspecified' => 'Non indiqué' ), ); -} +}/*}}}*/ /** helper: used when rendering the element, to get the value for it */ -function pieform_element_date_get_timeperiod_value($timeperiod, $min, $max, $element, Pieform $form) { +function pieform_element_date_get_timeperiod_value($timeperiod, $min, $max, $element, Pieform $form) {/*{{{*/ static $lookup = array( 'year' => 0, 'month' => 1, @@ -189,6 +189,6 @@ } return $value; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/expiry.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/expiry.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/expiry.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Richard Mansfield <ric...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -32,7 +32,7 @@ * @param array $element The element to render * @return string The HTML for the element */ -function pieform_element_expiry(Pieform $form, $element) { +function pieform_element_expiry(Pieform $form, $element) {/*{{{*/ $formname = $form->get_name(); $result = ''; $name = $element['name']; @@ -98,7 +98,7 @@ EOJS; return $numberinput . $uselect . $script; -} +}/*}}}*/ /** * Gets the value of the expiry element and converts it to a time in seconds. @@ -107,7 +107,7 @@ * @param array $element The element to get the value for * @return int The number of seconds until expiry */ -function pieform_element_expiry_get_value(Pieform $form, $element) { +function pieform_element_expiry_get_value(Pieform $form, $element) {/*{{{*/ $name = $element['name']; $global = ($form->get_property('method') == 'get') ? $_GET : $_POST; $unit = $global[$name . '_units']; @@ -120,9 +120,9 @@ return null; } return $number * pieform_element_expiry_seconds_in($unit); -} +}/*}}}*/ -function pieform_element_expiry_i18n() { +function pieform_element_expiry_i18n() {/*{{{*/ return array( 'en.utf8' => array( 'days' => 'Days', @@ -146,13 +146,13 @@ 'noenddate' => 'Pas de date de fin' ), ); -} +}/*}}}*/ -function pieform_element_expire_get_expiry_units() { +function pieform_element_expire_get_expiry_units() {/*{{{*/ return array('days', 'weeks', 'months', 'years', 'noenddate'); -} +}/*}}}*/ -function pieform_element_expiry_seconds_in($unit) { +function pieform_element_expiry_seconds_in($unit) {/*{{{*/ $dayseconds = 60 * 60 * 24; switch ($unit) { case 'days' : return $dayseconds; @@ -161,9 +161,9 @@ case 'years' : return $dayseconds * 365; default : return null; } -} +}/*}}}*/ -function pieform_element_expiry_get_expiry_from_seconds($seconds) { +function pieform_element_expiry_get_expiry_from_seconds($seconds) {/*{{{*/ if ($seconds == null) { return array('number' => '', 'units' => 'noenddate'); } @@ -186,6 +186,6 @@ return array('number' => (int) ($seconds / $dayseconds), 'units' => 'days'); } return null; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/file.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/file.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/file.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -31,18 +31,18 @@ * @param array $element The element to render * @return string The HTML for the element */ -function pieform_element_file(Pieform $form, $element) { +function pieform_element_file(Pieform $form, $element) {/*{{{*/ return '<input type="file"' . $form->element_attributes($element) . '>'; -} +}/*}}}*/ -function pieform_element_file_get_value(Pieform $form, $element) { +function pieform_element_file_get_value(Pieform $form, $element) {/*{{{*/ if (isset($_FILES[$element['name']])) { if (!$_FILES[$element['name']]['error']) { return $_FILES[$element['name']]; } return null; } -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/hidden.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/hidden.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/hidden.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -31,7 +31,7 @@ * @param array $element The element to render * @return string The HTML for the element */ -function pieform_element_hidden(Pieform $form, $element) { +function pieform_element_hidden(Pieform $form, $element) {/*{{{*/ if (!isset($element['value'])) { throw new PieformException('The hidden element "' . $element['name'] . '" must have a value set'); } @@ -47,14 +47,14 @@ return '<input type="hidden"' . $form->element_attributes($element, array('accesskey', 'onclick', 'size', 'style', 'tabindex')) . ' value="' . Pieform::hsc($form->get_value($element)) . "\">\n"; -} +}/*}}}*/ /** * Returns the value for a hidden element. Hidden elements only listen to the * 'value' index, and not to GET/POST */ -function pieform_element_hidden_get_value(Pieform $form, $element) { +function pieform_element_hidden_get_value(Pieform $form, $element) {/*{{{*/ return $element['value']; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/html.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/html.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/html.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Penny Leach <pe...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -32,14 +32,14 @@ * @param Pieform $form The form to render the element for * @return string The HTML for the element */ -function pieform_element_html(Pieform $form, $element) { +function pieform_element_html(Pieform $form, $element) {/*{{{*/ return $element['value']; -} +}/*}}}*/ -function pieform_element_html_set_attributes($element) { +function pieform_element_html_set_attributes($element) {/*{{{*/ $element['nolabel'] = true; $element['nofocus'] = true; return $element; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/image.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/image.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/image.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -31,7 +31,7 @@ * @param array $element The element to render * @return string The HTML for the element */ -function pieform_element_image(Pieform $form, $element) { +function pieform_element_image(Pieform $form, $element) {/*{{{*/ if (!isset($element['src'])) { throw new PieformException('"image" elements must have a "src" for the image'); } @@ -41,14 +41,14 @@ return '<input type="image" src="' . Pieform::hsc($element['src']) . '"' . $form->element_attributes($element) . ' value="' . Pieform::hsc($form->get_value($element)) . '">'; -} +}/*}}}*/ -function pieform_element_image_set_attributes($element) { +function pieform_element_image_set_attributes($element) {/*{{{*/ $element['submitelement'] = true; return $element; -} +}/*}}}*/ -function pieform_element_image_get_value(Pieform $form, $element) { +function pieform_element_image_get_value(Pieform $form, $element) {/*{{{*/ if (isset($element['value'])) { return $element['value']; } @@ -59,6 +59,6 @@ } return null; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/password.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/password.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/password.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -31,13 +31,13 @@ * @param Pieform $form The form to render the element for * @return string The HTML for the element */ -function pieform_element_password(Pieform $form, $element) { +function pieform_element_password(Pieform $form, $element) {/*{{{*/ return '<input type="password"' . $form->element_attributes($element) . ' value="' . Pieform::hsc($form->get_value($element)) . '">'; -} +}/*}}}*/ -function pieform_element_password_get_value(Pieform $form, $element) { +function pieform_element_password_get_value(Pieform $form, $element) {/*{{{*/ $global = ($form->get_property('method') == 'get') ? $_GET : $_POST; if (isset($global[$element['name']])) { return $global[$element['name']]; @@ -46,6 +46,6 @@ return $element['value']; } return null; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/radio.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/radio.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/radio.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -31,7 +31,7 @@ * @param Pieform $form The form to render the element for * @return string The HTML for the element */ -function pieform_element_radio(Pieform $form, $element) { +function pieform_element_radio(Pieform $form, $element) {/*{{{*/ if (!isset($element['options']) || !is_array($element['options']) || count($element['options']) < 1) { throw new PieformException('Radio elements should have at least one option'); } @@ -57,12 +57,12 @@ $result = substr($result, 0, -strlen($separator)); return $result; -} +}/*}}}*/ -function pieform_element_radio_set_attributes($element) { +function pieform_element_radio_set_attributes($element) {/*{{{*/ $element['nolabel'] = true; $element['rules']['validateoptions'] = true; return $element; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/select.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/select.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/select.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -35,7 +35,7 @@ * @param array $element The element to render * @return string The HTML for the element */ -function pieform_element_select(Pieform $form, $element) { +function pieform_element_select(Pieform $form, $element) {/*{{{*/ if (!empty($element['multiple'])) { $element['name'] .= '[]'; } @@ -120,17 +120,17 @@ $result .= '</select>'; return $result; -} +}/*}}}*/ -function pieform_element_select_set_attributes($element) { +function pieform_element_select_set_attributes($element) {/*{{{*/ if (!isset($element['collapseifoneoption'])) { $element['collapseifoneoption'] = true; } $element['rules']['validateoptions'] = true; return $element; -} +}/*}}}*/ -function pieform_element_select_get_value(Pieform $form, $element) { +function pieform_element_select_get_value(Pieform $form, $element) {/*{{{*/ if (empty($element['multiple'])) { $global = ($form->get_property('method') == 'get') ? $_GET : $_POST; if (isset($element['value'])) { @@ -169,6 +169,6 @@ } return $values; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/submit.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/submit.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/submit.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -31,7 +31,7 @@ * @param array $element The element to render * @return string The HTML for the element */ -function pieform_element_submit(Pieform $form, $element) { +function pieform_element_submit(Pieform $form, $element) {/*{{{*/ if (isset($element['confirm'])) { $element['onclick'] = 'return confirm(' . json_encode($element['confirm']) . ');'; } @@ -39,11 +39,11 @@ return '<input type="submit"' . $form->element_attributes($element) . ' value="' . Pieform::hsc($form->get_value($element)) . '">'; -} +}/*}}}*/ -function pieform_element_submit_set_attributes($element) { +function pieform_element_submit_set_attributes($element) {/*{{{*/ $element['submitelement'] = true; return $element; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/submitcancel.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/submitcancel.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/submitcancel.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -31,7 +31,7 @@ * @param array $element The element to render * @return string The HTML for the element */ -function pieform_element_submitcancel(Pieform $form, $element) { +function pieform_element_submitcancel(Pieform $form, $element) {/*{{{*/ if (!isset($element['value']) || !is_array($element['value']) || count($element['value']) != 2) { throw new PieformException('The submitcancel element "' . $element['name'] . '" must have a two element array for its value'); @@ -43,20 +43,20 @@ $cancelelement = $element; $cancelelement['value'] = $element['value'][1]; return pieform_element_submit($form, $submitelement) . ' ' . pieform_element_cancel($form, $cancelelement); -} +}/*}}}*/ -function pieform_element_submitcancel_set_attributes($element) { +function pieform_element_submitcancel_set_attributes($element) {/*{{{*/ $element['submitelement'] = true; return $element; -} +}/*}}}*/ -function pieform_element_submitcancel_get_value(Pieform $form, $element) { +function pieform_element_submitcancel_get_value(Pieform $form, $element) {/*{{{*/ if (is_array($element['value'])) { return $element['value'][0]; } else { return $element['value']; } -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/text.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/text.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/text.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -31,10 +31,10 @@ * @param array $element The element to render * @return string The HTML for the element */ -function pieform_element_text(Pieform $form, $element) { +function pieform_element_text(Pieform $form, $element) {/*{{{*/ return '<input type="text"' . $form->element_attributes($element) . ' value="' . Pieform::hsc($form->get_value($element)) . '">'; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/elements/textarea.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/textarea.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/elements/textarea.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage element * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -31,7 +31,7 @@ * @param Pieform $form The form to render the element for * @return string The HTML for the element */ -function pieform_element_textarea(Pieform $form, $element) { +function pieform_element_textarea(Pieform $form, $element) {/*{{{*/ $rows = $cols = $style = ''; if (isset($element['height'])) { $style .= 'height:' . $element['height'] . ';'; @@ -64,9 +64,9 @@ . (($cols) ? ' cols="' . $cols . '"' : '') . $form->element_attributes($element, array('maxlength', 'size')) . '>' . Pieform::hsc($form->get_value($element)) . '</textarea>'; -} +}/*}}}*/ -function pieform_element_textarea_get_value(Pieform $form, $element) { +function pieform_element_textarea_get_value(Pieform $form, $element) {/*{{{*/ if (isset($element['value'])) { return $element['value']; } @@ -81,6 +81,6 @@ } return ''; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/renderers/div.php =================================================================== --- pieforms-php5/trunk/src/pieform/renderers/div.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/renderers/div.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage renderer * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -31,7 +31,7 @@ * @param array $element The element to be rendered * @return string The element rendered inside an appropriate container */ -function pieform_renderer_div(Pieform $form, $element) { +function pieform_renderer_div(Pieform $form, $element) {/*{{{*/ $formname = $form->get_name(); // Set the class of the enclosing <div> to match that of the element $result = '<div'; @@ -66,10 +66,10 @@ $result .= "</div>\n"; return $result; -} +}/*}}}*/ -function pieform_renderer_div_get_js($id) { +function pieform_renderer_div_get_js($id) {/*{{{*/ $result = <<<EOF // Given a message and form element name, should set an error on the element function {$id}_set_error(message, element) { @@ -88,6 +88,6 @@ } EOF; return $result; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/renderers/multicolumntable.php =================================================================== --- pieforms-php5/trunk/src/pieform/renderers/multicolumntable.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/renderers/multicolumntable.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage renderer * @author Penny Leach <pe...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -37,13 +37,13 @@ * @param array $element The element to be rendered * @return string The element rendered inside an appropriate container */ -function pieform_renderer_multicolumntable(Pieform $form, $element) { +function pieform_renderer_multicolumntable(Pieform $form, $element) {/*{{{*/ global $formrenderermct; $formrenderermct->add_element($element['html'], $element); $formrenderermct->set_form($form); -} +}/*}}}*/ -function pieform_renderer_multicolumntable_get_js($id) { +function pieform_renderer_multicolumntable_get_js($id) {/*{{{*/ return <<<EOF function {$id}_set_error (message, element) { element = '{$id}_' + element; @@ -78,19 +78,19 @@ }); } EOF; -} +}/*}}}*/ -function pieform_renderer_multicolumntable_header() { +function pieform_renderer_multicolumntable_header() {/*{{{*/ global $formrenderermct; $formrenderermct = new FormRendererMultiColumnTable(); -} +}/*}}}*/ -function pieform_renderer_multicolumntable_footer() { +function pieform_renderer_multicolumntable_footer() {/*{{{*/ global $formrenderermct; return $formrenderermct->build(); -} +}/*}}}*/ -class FormRendererMultiColumnTable { +class FormRendererMultiColumnTable {/*{{{*/ private $elements = array(); private $form; @@ -172,6 +172,6 @@ return $result; } -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/renderers/oneline.php =================================================================== --- pieforms-php5/trunk/src/pieform/renderers/oneline.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/renderers/oneline.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,17 +20,17 @@ * @subpackage renderer * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ -function pieform_renderer_oneline_header() { +function pieform_renderer_oneline_header() {/*{{{*/ return '<div>'; -} +}/*}}}*/ -function pieform_renderer_oneline_footer() { +function pieform_renderer_oneline_footer() {/*{{{*/ return '</div>'; -} +}/*}}}*/ /** * Renders form elements all on one line. @@ -39,7 +39,7 @@ * @param array $element The element that is being rendered * @return string The element rendered inside an appropriate container */ -function pieform_renderer_oneline(Pieform $form, $element) { +function pieform_renderer_oneline(Pieform $form, $element) {/*{{{*/ $formname = $form->get_name(); // Set the class of the enclosing <div> to match that of the element $result = '<span'; @@ -68,13 +68,13 @@ $result .= "</span>"; return $result; -} +}/*}}}*/ -function pieform_renderer_oneline_get_js($id) { +function pieform_renderer_oneline_get_js($id) {/*{{{*/ return <<<EOF function {$id}_remove_all_errors () {} function {$id}_set_error () {} EOF; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/renderers/table.php =================================================================== --- pieforms-php5/trunk/src/pieform/renderers/table.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/renderers/table.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage renderer * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -31,7 +31,7 @@ * @param array $element The element to be rendered * @return string The element rendered inside an appropriate container */ -function pieform_renderer_table(Pieform $form, $element) { +function pieform_renderer_table(Pieform $form, $element) {/*{{{*/ $formname = $form->get_name(); if ($element['type'] == 'fieldset') { // Add table tags to the build element, to preserve HTML compliance @@ -92,17 +92,17 @@ } return $result; -} +}/*}}}*/ -function pieform_renderer_table_header() { +function pieform_renderer_table_header() {/*{{{*/ return "<table cellspacing=\"0\"><tbody>\n"; -} +}/*}}}*/ -function pieform_renderer_table_footer() { +function pieform_renderer_table_footer() {/*{{{*/ return "</tbody></table>\n"; -} +}/*}}}*/ -function pieform_renderer_table_get_js($id) { +function pieform_renderer_table_get_js($id) {/*{{{*/ $result = <<<EOF function {$id}_set_error(message, element) { element = $('{$id}_' + element + '_container'); @@ -122,6 +122,6 @@ } EOF; return $result; -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/rules/before.php =================================================================== --- pieforms-php5/trunk/src/pieform/rules/before.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/rules/before.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage rule * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -35,15 +35,15 @@ * @param string $otherelement The other element to check for * @return string The error message, if the value is invalid. */ -function pieform_rule_before(Pieform $form, $value, $element, $otherelement) { +function pieform_rule_before(Pieform $form, $value, $element, $otherelement) {/*{{{*/ $otherelement = $form->get_element($otherelement); $othervalue = $form->get_value($otherelement); if ($value != '' && $othervalue != '' && intval($value) > intval($othervalue)) { return sprintf($form->i18n('rule', 'before', 'before', $element), $otherelement['title']); } -} +}/*}}}*/ -function pieform_rule_before_i18n() { +function pieform_rule_before_i18n() {/*{{{*/ return array( 'en.utf8' => array( 'before' => 'This can not be after the field "%s"' @@ -55,6 +55,6 @@ 'before' => 'Ceci ne peut pas être placé après le champ "%s"' ), ); -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/rules/email.php =================================================================== --- pieforms-php5/trunk/src/pieform/rules/email.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/rules/email.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage rule * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -36,13 +36,13 @@ * @return string The error message, if there is something wrong with * the address. */ -function pieform_rule_email(Pieform $form, $value, $element) { +function pieform_rule_email(Pieform $form, $value, $element) {/*{{{*/ if (!preg_match('/^[a-z0-9\._%-]+@(?:[a-z0-9-]+\.)+[a-z]{2,4}$/', $value)) { return $form->i18n('rule', 'email', 'email', $element); } -} +}/*}}}*/ -function pieform_rule_email_i18n() { +function pieform_rule_email_i18n() {/*{{{*/ return array( 'en.utf8' => array( 'email' => 'E-mail address is invalid' @@ -54,6 +54,6 @@ 'email' => 'Cette adresse de courriel n\'est pas valide' ), ); -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/rules/integer.php =================================================================== --- pieforms-php5/trunk/src/pieform/rules/integer.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/rules/integer.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage rule * @author Penny Leach <pe...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -33,13 +33,13 @@ * @return string The error message, if there is something wrong with * the address. */ -function pieform_rule_integer(Pieform $form, $value, $element) { +function pieform_rule_integer(Pieform $form, $value, $element) {/*{{{*/ if (!is_numeric($value) || $value != (int)$value) { return $form->i18n('rule', 'integer', 'integer', $element); } -} +}/*}}}*/ -function pieform_rule_integer_i18n() { +function pieform_rule_integer_i18n() {/*{{{*/ return array( 'en.utf8' => array( 'integer' => 'The field must be an integer' @@ -51,6 +51,6 @@ 'integer' => 'Ce champ doit être un nombre entier' ), ); -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/rules/maxlength.php =================================================================== --- pieforms-php5/trunk/src/pieform/rules/maxlength.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/rules/maxlength.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage rule * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -33,13 +33,13 @@ * @param int $maxlength The length to check for * @return string The error message, if the value is invalid. */ -function pieform_rule_maxlength(Pieform $form, $value, $element, $maxlength) { +function pieform_rule_maxlength(Pieform $form, $value, $element, $maxlength) {/*{{{*/ if (strlen($value) > $maxlength) { return sprintf($form->i18n('rule', 'maxlength', 'maxlength', $element), $maxlength); } -} +}/*}}}*/ -function pieform_rule_maxlength_i18n() { +function pieform_rule_maxlength_i18n() {/*{{{*/ return array( 'en.utf8' => array( 'maxlength' => 'This field must be at most %d characters long' @@ -51,6 +51,6 @@ 'maxlength' => 'Ce champ ne peut pas contenir plus de %d signes' ), ); -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/rules/maxvalue.php =================================================================== --- pieforms-php5/trunk/src/pieform/rules/maxvalue.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/rules/maxvalue.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage rule * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -33,13 +33,13 @@ * @param int $maxvalue The value to check for * @return string The error message, if the value is invalid. */ -function pieform_rule_maxvalue(Pieform $form, $value, $element, $maxvalue) { +function pieform_rule_maxvalue(Pieform $form, $value, $element, $maxvalue) {/*{{{*/ if ($value != '' && intval($value) > $maxvalue) { return sprintf($form->i18n('rule', 'maxvalue', 'maxvalue', $element), $maxvalue); } -} +}/*}}}*/ -function pieform_rule_maxvalue_i18n() { +function pieform_rule_maxvalue_i18n() {/*{{{*/ return array( 'en.utf8' => array( 'maxvalue' => 'This value can not be larger than %d' @@ -51,6 +51,6 @@ 'maxvalue' => 'Cette valeur ne peut pas supérieure à %d' ), ); -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/rules/minlength.php =================================================================== --- pieforms-php5/trunk/src/pieform/rules/minlength.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/rules/minlength.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage rule * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -33,13 +33,13 @@ * @param int $minlength The length to check for * @return string The error message, if the value is invalid. */ -function pieform_rule_minlength(Pieform $form, $value, $element, $minlength) { +function pieform_rule_minlength(Pieform $form, $value, $element, $minlength) {/*{{{*/ if (strlen($value) < $minlength) { return sprintf($form->i18n('rule', 'minlength', 'minlength', $element), $minlength); } -} +}/*}}}*/ -function pieform_rule_minlength_i18n() { +function pieform_rule_minlength_i18n() {/*{{{*/ return array( 'en.utf8' => array( 'minlength' => 'This field must be at least %d characters long', @@ -51,6 +51,6 @@ 'minlength' => 'Ce champ doit contenir au moins %d caractères', ), ); -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/rules/minvalue.php =================================================================== --- pieforms-php5/trunk/src/pieform/rules/minvalue.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/rules/minvalue.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage rule * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -33,13 +33,13 @@ * @param int $maxlength The value to check for * @return string The error message, if the value is invalid. */ -function pieform_rule_minvalue(Pieform $form, $value, $element, $minvalue) { +function pieform_rule_minvalue(Pieform $form, $value, $element, $minvalue) {/*{{{*/ if ($value != '' && intval($value) < $minvalue) { return sprintf($form->i18n('rule', 'minvalue', 'minvalue', $element), $minvalue); } -} +}/*}}}*/ -function pieform_rule_minvalue_i18n() { +function pieform_rule_minvalue_i18n() {/*{{{*/ return array( 'en.utf8' => array( 'minvalue' => 'This value can not be smaller than %d' @@ -51,6 +51,6 @@ 'minvalue' => 'Cette valeur ne peut pas être inférieure à %d' ), ); -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/rules/regex.php =================================================================== --- pieforms-php5/trunk/src/pieform/rules/regex.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/rules/regex.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage rule * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -34,13 +34,13 @@ * @return string The error message, if there is something wrong with * the value. */ -function pieform_rule_regex(Pieform $form, $value, $element, $regex) { +function pieform_rule_regex(Pieform $form, $value, $element, $regex) {/*{{{*/ if (!preg_match($regex, $value)) { return $form->i18n('rule', 'regex', 'regex', $element); } -} +}/*}}}*/ -function pieform_rule_regex_i18n() { +function pieform_rule_regex_i18n() {/*{{{*/ return array( 'en.utf8' => array( 'regex' => 'This field is not in valid form' @@ -52,6 +52,6 @@ 'regex' => 'Ce champ n\'a pas une forme correcte' ), ); -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/rules/required.php =================================================================== --- pieforms-php5/trunk/src/pieform/rules/required.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/rules/required.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage rule * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -33,13 +33,13 @@ * @param string $check Whether to check the element * @return string The error message, if the value is invalid. */ -function pieform_rule_required(Pieform $form, $value, $element, $check) { +function pieform_rule_required(Pieform $form, $value, $element, $check) {/*{{{*/ if ($check && $value == '') { return $form->i18n('rule', 'required', 'required', $element); } -} +}/*}}}*/ -function pieform_rule_required_i18n() { +function pieform_rule_required_i18n() {/*{{{*/ return array( 'en.utf8' => array( 'required' => 'This field is required' @@ -51,6 +51,6 @@ 'required' => 'Ce champ est obligatoire' ), ); -} +}/*}}}*/ ?> Modified: pieforms-php5/trunk/src/pieform/rules/validateoptions.php =================================================================== --- pieforms-php5/trunk/src/pieform/rules/validateoptions.php 2007-12-31 02:01:32 UTC (rev 257) +++ pieforms-php5/trunk/src/pieform/rules/validateoptions.php 2007-12-31 02:03:07 UTC (rev 258) @@ -20,7 +20,7 @@ * @subpackage rule * @author Nigel McNie <ni...@ca...> * @license http://www.gnu.org/copyleft/gpl.html GNU GPL - * @copyright (C) 2006 Catalyst IT Ltd http://catalyst.net.nz + * @copyright (C) 2006-2008 Catalyst IT Ltd http://catalyst.net.nz * */ @@ -34,7 +34,7 @@ * @param string $element The element being checked * @return string The error message, if the value is invalid. */ -function pieform_rule_validateoptions(Pieform $form, $field, $element) { +function pieform_rule_validateoptions(Pieform $form, $field, $element) {/*{{{*/ // Get the value into an array as a key if it's a scalar, since // the actual check involves array keys $field = (array) $field; @@ -45,9 +45,9 @@ return sprintf($form->i18n('rule', 'validateoptions', 'validateoptions', $element), $key); } } -} +}/*}}}*/ -function pieform_rule_validateoptions_i18n() { +function pieform_rule_validateoptions_i18n() {/*{{{*/ return array( 'en.utf8' => array( 'validateoptions' => 'The option "%s" is invalid' @@ -59,6 +59,6 @@ 'validateoptions' => 'Cette option "%s" n\'est pas valide' ), ); -} +}/*}}}*/ ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |