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

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

Revision: 112
          http://svn.sourceforge.net/pieforms/?rev=112&view=rev
Author:   oracleshinoda
Date:     2006-12-22 19:50:31 -0800 (Fri, 22 Dec 2006)

Log Message:
-----------
Updated elements to new API

Modified Paths:
--------------
    pieforms-php5/trunk/src/pieform/elements/fieldset.php
    pieforms-php5/trunk/src/pieform/elements/password.php
    pieforms-php5/trunk/src/pieform/elements/radio.php

Modified: pieforms-php5/trunk/src/pieform/elements/fieldset.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/fieldset.php	2006-12-23 03:48:43 UTC (rev 111)
+++ pieforms-php5/trunk/src/pieform/elements/fieldset.php	2006-12-23 03:50:31 UTC (rev 112)
@@ -28,11 +28,11 @@
  * Renders a fieldset. Fieldsets contain other elements, and do not count as a
  * "true" element, in that they do not have a value and cannot be validated.
  *
- * @param array $element The element to render
- * @param Pieform  $form    The form to render the element for
- * @return string        The HTML for the element
+ * @param Pieform $form    The form to render the element for
+ * @param array   $element The element to render
+ * @return string          The HTML for the element
  */
-function pieform_render_fieldset($element, Pieform $form) {
+function pieform_element_fieldset(Pieform $form, $element) {
     $result = "\n<fieldset>\n";
     if (isset($element['legend'])) {
         $result .= '<legend>' . Pieform::hsc($element['legend']) . "</legend>\n";
@@ -42,7 +42,7 @@
         if ($subelement['type'] == 'hidden') {
             throw new PieformError("You cannot put hidden elements in fieldsets");
         }
-        $result .= "\t" . pieform_render_element($subelement, $form);
+        $result .= "\t" . pieform_render_element($form, $subelement);
     }
 
     $result .= "</fieldset>\n";

Modified: pieforms-php5/trunk/src/pieform/elements/password.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/password.php	2006-12-23 03:48:43 UTC (rev 111)
+++ pieforms-php5/trunk/src/pieform/elements/password.php	2006-12-23 03:50:31 UTC (rev 112)
@@ -31,14 +31,14 @@
  * @param Pieform  $form    The form to render the element for
  * @return string           The HTML for the element
  */
-function pieform_render_password($element, Pieform $form) {
+function pieform_element_password(Pieform $form, $element) {
     return '<input type="password"'
         . $form->element_attributes($element)
         . ' value="' . Pieform::hsc($form->get_value($element)) . '">';
 }
 
-function pieform_get_value_password($element, Pieform $form) {
-    $global = ($form->get_method() == 'get') ? $_GET : $_POST;
+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']];
     }

Modified: pieforms-php5/trunk/src/pieform/elements/radio.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/radio.php	2006-12-23 03:48:43 UTC (rev 111)
+++ pieforms-php5/trunk/src/pieform/elements/radio.php	2006-12-23 03:50:31 UTC (rev 112)
@@ -31,7 +31,7 @@
  * @param Pieform  $form    The form to render the element for
  * @return string           The HTML for the element
  */
-function pieform_render_radio($element, Pieform $form) {
+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');
     }
@@ -59,25 +59,7 @@
     return $result;
 }
 
-/**
- * radio doesn't need a function to get a value from phpland because it comes
- * through correctly from the request... however in javascript land things are
- * harder.
- *
- * @todo maybe later: make the get_value_js functions return a javascript function,
- * to keep their stuff in its own scope. Maybe. If js scoping rules mean this will help.
- */
-function pieform_get_value_js_radio($element, Pieform $form) {
-    $formname = $form->get_name();
-    $name = $element['name'];
-    return <<<EOF
-    var radio = filter(function(radio) { return radio.checked; }, document.forms['$formname'].elements['$name']);
-    data['$name'] = radio[0].value;
-
-EOF;
-}
-
-function pieform_render_radio_set_attributes($element) {
+function pieform_element_radio_set_attributes($element) {
     $element['nolabel'] = true;
     $element['rules']['validateoptions'] = true;
     return $element;


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