Thread: [Pieforms-commit] SF.net SVN: pieforms: [75] pieforms-php5/trunk/src/pieform/rules/required. php
Status: Alpha
Brought to you by:
oracleshinoda
Menu
▾
▴
pieforms-commit
|
From: <ora...@us...> - 2006-12-06 09:21:07
|
Revision: 75
http://svn.sourceforge.net/pieforms/?rev=75&view=rev
Author: oracleshinoda
Date: 2006-12-06 01:21:00 -0800 (Wed, 06 Dec 2006)
Log Message:
-----------
Honour 'required' => false correctly (Alastair Pharo)
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/rules/required.php
Modified: pieforms-php5/trunk/src/pieform/rules/required.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/required.php 2006-12-01 01:04:30 UTC (rev 74)
+++ pieforms-php5/trunk/src/pieform/rules/required.php 2006-12-06 09:21:00 UTC (rev 75)
@@ -27,23 +27,26 @@
/**
* Checks whether the field has been specified.
*
- * @param Pieform $form The form the rule is being applied to
- * @param string $field The field to check
- * @param array $element The element to check
+ * @param Pieform $form The form the rule is being applied to
+ * @param string $field The field to check
+ * @param array $element The element to check
+ * @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) {
- $function = 'form_is_empty_' . $element['type'];
- if (function_exists($function)) {
- if ($function($value, $element)) {
+function pieform_rule_required(Pieform $form, $value, $element, $check) {
+ if ($check) {
+ $function = 'form_is_empty_' . $element['type'];
+ if (function_exists($function)) {
+ if ($function($value, $element)) {
+ return $form->i18n('required');
+ }
+ return;
+ }
+
+ if ($value == '') {
return $form->i18n('required');
}
- return;
}
-
- if ($value == '') {
- return $form->i18n('required');
- }
}
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2006-12-23 03:47:07
|
Revision: 109
http://svn.sourceforge.net/pieforms/?rev=109&view=rev
Author: oracleshinoda
Date: 2006-12-22 19:47:04 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
Use new i18n API for required rule
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/rules/required.php
Modified: pieforms-php5/trunk/src/pieform/rules/required.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/required.php 2006-12-23 03:46:16 UTC (rev 108)
+++ pieforms-php5/trunk/src/pieform/rules/required.php 2006-12-23 03:47:04 UTC (rev 109)
@@ -28,7 +28,7 @@
* Checks whether the field has been specified.
*
* @param Pieform $form The form the rule is being applied to
- * @param string $field The field to check
+ * @param string $value The value of the field
* @param array $element The element to check
* @param string $check Whether to check the element
* @return string The error message, if the value is invalid.
@@ -38,15 +38,23 @@
$function = 'form_is_empty_' . $element['type'];
if (function_exists($function)) {
if ($function($value, $element)) {
- return $form->i18n('required');
+ return $form->i18n('rule', 'required', 'required', $element);
}
return;
}
if ($value == '') {
- return $form->i18n('required');
+ return $form->i18n('rule', 'required', 'required', $element);
}
}
}
+function pieform_rule_required_i18n() {
+ return array(
+ 'en.utf8' => array(
+ 'required' => 'This field is required'
+ )
+ );
+}
+
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2006-12-23 05:07:24
|
Revision: 130
http://svn.sourceforge.net/pieforms/?rev=130&view=rev
Author: oracleshinoda
Date: 2006-12-22 21:07:25 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
Removed the references to form_is_empty_ in the required rule, there's a more generic way to do this now
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/rules/required.php
Modified: pieforms-php5/trunk/src/pieform/rules/required.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/required.php 2006-12-23 05:06:21 UTC (rev 129)
+++ pieforms-php5/trunk/src/pieform/rules/required.php 2006-12-23 05:07:25 UTC (rev 130)
@@ -34,16 +34,7 @@
* @return string The error message, if the value is invalid.
*/
function pieform_rule_required(Pieform $form, $value, $element, $check) {
- if ($check) {
- $function = 'form_is_empty_' . $element['type'];
- if (function_exists($function)) {
- if ($function($value, $element)) {
- return $form->i18n('rule', 'required', 'required', $element);
- }
- return;
- }
-
- if ($value == '') {
+ if ($check && $value == '') {
return $form->i18n('rule', 'required', 'required', $element);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2006-12-23 05:09:19
|
Revision: 131
http://svn.sourceforge.net/pieforms/?rev=131&view=rev
Author: oracleshinoda
Date: 2006-12-22 21:09:20 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
Fix silly parse error
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/rules/required.php
Modified: pieforms-php5/trunk/src/pieform/rules/required.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/required.php 2006-12-23 05:07:25 UTC (rev 130)
+++ pieforms-php5/trunk/src/pieform/rules/required.php 2006-12-23 05:09:20 UTC (rev 131)
@@ -35,8 +35,7 @@
*/
function pieform_rule_required(Pieform $form, $value, $element, $check) {
if ($check && $value == '') {
- return $form->i18n('rule', 'required', 'required', $element);
- }
+ return $form->i18n('rule', 'required', 'required', $element);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2007-08-01 12:41:42
|
Revision: 214
http://pieforms.svn.sourceforge.net/pieforms/?rev=214&view=rev
Author: oracleshinoda
Date: 2007-08-01 05:41:44 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
German translation for required rule (thanks to Heinz)
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/rules/required.php
Modified: pieforms-php5/trunk/src/pieform/rules/required.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/required.php 2007-08-01 12:40:44 UTC (rev 213)
+++ pieforms-php5/trunk/src/pieform/rules/required.php 2007-08-01 12:41:44 UTC (rev 214)
@@ -43,7 +43,10 @@
return array(
'en.utf8' => array(
'required' => 'This field is required'
- )
+ ),
+ 'de.utf8' => array(
+ 'required' => 'Das Feld ist erforderlich'
+ ),
);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2007-12-31 02:03:36
|
Revision: 259
http://pieforms.svn.sourceforge.net/pieforms/?rev=259&view=rev
Author: oracleshinoda
Date: 2007-12-30 18:03:42 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
Made the required rule fail on empty arrays. This makes multiple selects (and probably other elements that returned empty arrays) validate properly.
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/rules/required.php
Modified: pieforms-php5/trunk/src/pieform/rules/required.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/required.php 2007-12-31 02:03:07 UTC (rev 258)
+++ pieforms-php5/trunk/src/pieform/rules/required.php 2007-12-31 02:03:42 UTC (rev 259)
@@ -34,7 +34,7 @@
* @return string The error message, if the value is invalid.
*/
function pieform_rule_required(Pieform $form, $value, $element, $check) {/*{{{*/
- if ($check && $value == '') {
+ if ($check && ($value == '' || $value == array())) {
return $form->i18n('rule', 'required', 'required', $element);
}
}/*}}}*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X