[Pieforms-commit] SF.net SVN: pieforms: [294] pieforms-php5/trunk/src

[<ora...@us...>]

Revision: 294
          http://pieforms.svn.sourceforge.net/pieforms/?rev=294&view=rev
Author:   oracleshinoda
Date:     2008-07-06 20:16:10 -0700 (Sun, 06 Jul 2008)

Log Message:
-----------
Fix an old bug - only check for submitted values if the form has actually been submitted.

Previously, the value was checked for regardless of whether the form had been submitted, leading to obscure problems when there was two forms on the page.

Modified Paths:
--------------
    pieforms-php5/trunk/src/pieform/elements/calendar.php
    pieforms-php5/trunk/src/pieform/elements/date.php
    pieforms-php5/trunk/src/pieform/elements/image.php
    pieforms-php5/trunk/src/pieform/elements/password.php
    pieforms-php5/trunk/src/pieform/elements/select.php
    pieforms-php5/trunk/src/pieform/elements/textarea.php
    pieforms-php5/trunk/src/pieform.php

Modified: pieforms-php5/trunk/src/pieform/elements/calendar.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/calendar.php	2008-03-25 05:15:13 UTC (rev 293)
+++ pieforms-php5/trunk/src/pieform/elements/calendar.php	2008-07-07 03:16:10 UTC (rev 294)
@@ -126,7 +126,7 @@
         return $element['value'];
     }
 
-    if (isset($global[$name])) {
+    if ($form->is_submitted() && isset($global[$name])) {
         if (trim($global[$name]) == '') {
             return null;
         }

Modified: pieforms-php5/trunk/src/pieform/elements/date.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/date.php	2008-03-25 05:15:13 UTC (rev 293)
+++ pieforms-php5/trunk/src/pieform/elements/date.php	2008-07-07 03:16:10 UTC (rev 294)
@@ -116,7 +116,7 @@
 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']) ) {
+    if ($form->is_submitted() && isset($global[$name . '_day']) && isset($global[$name . '_month']) && isset($global[$name . '_year'])) {
         $time = mktime(0, 0, 0, $global[$name . '_month'], $global[$name . '_day'], $global[$name . '_year']);
         if (false === $time) {
             return null;

Modified: pieforms-php5/trunk/src/pieform/elements/image.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/image.php	2008-03-25 05:15:13 UTC (rev 293)
+++ pieforms-php5/trunk/src/pieform/elements/image.php	2008-07-07 03:16:10 UTC (rev 294)
@@ -54,7 +54,7 @@
     }
     
     $global = $form->get_property('method') == 'get' ? $_GET : $_POST;
-    if (isset($global[$element['name'] . '_x'])) {
+    if ($form->is_submitted() && isset($global[$element['name'] . '_x'])) {
         return true;
     }
 

Modified: pieforms-php5/trunk/src/pieform/elements/password.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/password.php	2008-03-25 05:15:13 UTC (rev 293)
+++ pieforms-php5/trunk/src/pieform/elements/password.php	2008-07-07 03:16:10 UTC (rev 294)
@@ -39,7 +39,7 @@
 
 function pieform_element_password_get_value(Pieform $form, $element) {/*{{{*/
     $global = ($form->get_property('method') == 'get') ? $_GET : $_POST;
-    if (isset($global[$element['name']])) {
+    if ($form->is_submitted() && isset($global[$element['name']])) {
         return $global[$element['name']];
     }
     if (isset($element['value'])) {

Modified: pieforms-php5/trunk/src/pieform/elements/select.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/select.php	2008-03-25 05:15:13 UTC (rev 293)
+++ pieforms-php5/trunk/src/pieform/elements/select.php	2008-07-07 03:16:10 UTC (rev 294)
@@ -136,7 +136,7 @@
         if (isset($element['value'])) {
             $values = (array) $element['value'];
         }
-        else if (isset($global[$element['name']])) {
+        else if ($form->is_submitted() && isset($global[$element['name']])) {
             $values = (array) $global[$element['name']];
         }
         else if (isset($element['defaultvalue'])) {
@@ -157,7 +157,7 @@
         if (isset($element['value'])) {
             $values = (array) $element['value'];
         }
-        else if (isset($global[$element['name']])) {
+        else if ($form->is_submitted() && isset($global[$element['name']])) {
             $values = (array) $global[$element['name']];
         }
         else if (!$form->is_submitted() && isset($element['defaultvalue'])) {

Modified: pieforms-php5/trunk/src/pieform/elements/textarea.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/textarea.php	2008-03-25 05:15:13 UTC (rev 293)
+++ pieforms-php5/trunk/src/pieform/elements/textarea.php	2008-07-07 03:16:10 UTC (rev 294)
@@ -79,7 +79,7 @@
     }
 
     $global = ($form->get_property('method') == 'get') ? $_GET : $_POST;
-    if (isset($global[$element['name']])) {
+    if ($form->is_submitted() && isset($global[$element['name']])) {
         return str_replace("\r\n", "\n", $global[$element['name']]);
     }
 

Modified: pieforms-php5/trunk/src/pieform.php
===================================================================
--- pieforms-php5/trunk/src/pieform.php	2008-03-25 05:15:13 UTC (rev 293)
+++ pieforms-php5/trunk/src/pieform.php	2008-07-07 03:16:10 UTC (rev 294)
@@ -716,7 +716,7 @@
         if (isset($element['value'])) {
             return $element['value'];
         }
-        else if (isset($global[$element['name']]) && $element['type'] != 'submit') {
+        else if ($this->submitted && isset($global[$element['name']]) && $element['type'] != 'submit') {
             return $global[$element['name']];
         }
         else if (isset($element['defaultvalue'])) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.