[Pieforms-commit] SF.net SVN: pieforms: [96] pieforms-php5/trunk/src/pieform/elements/ calendar.php

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

Revision: 96
          http://svn.sourceforge.net/pieforms/?rev=96&view=rev
Author:   oracleshinoda
Date:     2006-12-14 17:27:49 -0800 (Thu, 14 Dec 2006)

Log Message:
-----------
Made the calendar element deal in unix timestamps (Martyn Smith)

Modified Paths:
--------------
    pieforms-php5/trunk/src/pieform/elements/calendar.php

Modified: pieforms-php5/trunk/src/pieform/elements/calendar.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/calendar.php	2006-12-15 01:26:25 UTC (rev 95)
+++ pieforms-php5/trunk/src/pieform/elements/calendar.php	2006-12-15 01:27:49 UTC (rev 96)
@@ -38,7 +38,7 @@
     $id = $form->get_name() . '_' . $element['name'];
     $result = '<input type="text"'
         . $form->element_attributes($element)
-        . ' value="' . Pieform::hsc($form->get_value($element)) . '">';
+        . ' value="' . ( $form->get_value($element) ? Pieform::hsc(strftime($element['caloptions']['ifFormat'],$form->get_value($element))) : '' ) . '">';
     if (isset($element['imagefile'])) {
         $result .= '<a href="" id="'. $id . '_btn" onclick="return false;" class="pieform-calendar-toggle">'
             . '<img src="' . $element['imagefile'] . '" alt=""></a>';
@@ -62,9 +62,8 @@
     $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'] = '%Y/%m/%d';
-    $element['caloptions']['daFormat'] = '%Y/%m/%d';
-    $element['rules']['regex'] = '#^(\d{4}/\d{2}/\d{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;
 }
 
@@ -91,7 +90,36 @@
     return $result;
 }
 
+function pieform_get_value_calendar($element, Pieform $form) {
+    $name = $element['name'];
 
-// TODO: use the get_value function to do strtotime? (possibly, also might need the javascript version for ajax forms)
+    $global = ($form->get_method() == 'get') ? $_GET : $_POST;
 
+    if (isset($element['value'])) {
+        return $element['value'];
+    }
+
+    if (isset($global[$name])) {
+        if (trim($global[$name]) == '') {
+            return null;
+        }
+
+        $value = strtotime($global[$name]);
+
+        if ($value === false) {
+            $form->set_error($name, 'TODO');
+            return null;
+        }
+        return $value;
+    }
+
+    if (isset($element['defaultvalue'])) {
+        return $element['defaultvalue'];
+    }
+
+    return null;
+}
+
+// TODO: (possibly, also might need the javascript version for ajax forms)
+
 ?>


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