- Resolví un conflicto en este archivo.

[mecon/meconlib.git] / lib / MECON / HTML / QuickForm / caritas.php

diff --git a/lib/MECON/HTML/QuickForm/caritas.php b/lib/MECON/HTML/QuickForm/caritas.php
index 8ae3f415eba5e883e517e2f3213cf8e07e12e179..9308aba35c75fb8dbfa2697d9e2927732509bbd8 100644 (file)
--- a/lib/MECON/HTML/QuickForm/caritas.php
+++ b/lib/MECON/HTML/QuickForm/caritas.php
@@ -22,15 +22,14 @@
 require_once('HTML/QuickForm/element.php');
 require_once('HTML/QuickForm/radio.php');
 require_once('MECON/defaults.php');
 require_once('HTML/QuickForm/element.php');
 require_once('HTML/QuickForm/radio.php');
 require_once('MECON/defaults.php');

-require_once('HTML/Image.php');
+require_once 'MECON/HTML/Image.php';

 /**
  * Class to dynamically create HTML Select elements from a date
  *
  * @author       Bertrand Mansion <bmansion@mamasam.com>
  * @access       public
  */
 /**
  * Class to dynamically create HTML Select elements from a date
  *
  * @author       Bertrand Mansion <bmansion@mamasam.com>
  * @access       public
  */

-class HTML_QuickForm_caritas extends HTML_QuickForm_element
-{   
+class MECON_HTML_QuickForm_caritas extends HTML_QuickForm_element {

     // {{{ properties
 
     /**
     // {{{ properties
 
     /**


@@ -39,14 +38,14 @@ class HTML_QuickForm_caritas extends HTML_QuickForm_element
      * @access    private
      */
     var $radios = array();
      * @access    private
      */
     var $radios = array();

-    
+

     /**
      * Default values of the SELECTs
      * @var       array
      * @access    private
      */
     var $_selected = null;
     /**
      * Default values of the SELECTs
      * @var       array
      * @access    private
      */
     var $_selected = null;

-    
+

     var $_cols = 5;
 
 
     var $_cols = 5;
 
 


@@ -57,7 +56,7 @@ class HTML_QuickForm_caritas extends HTML_QuickForm_element
      */
     var $_flagFrozen = false;
 
      */
     var $_flagFrozen = false;
 

-// +X2C Operation 533
+    // +X2C Operation 533

     /**
      * Lista archivos devolviendo un array apropiado para un SELECT.
      *
     /**
      * Lista archivos devolviendo un array apropiado para un SELECT.
      *


@@ -92,9 +91,8 @@ class HTML_QuickForm_caritas extends HTML_QuickForm_element
      * @access    public
      * @return    void
      */
      * @access    public
      * @return    void
      */

-     
-    function HTML_QuickForm_caritas($elementName=null, $elementLabel=null, $options=array(), $attributes=null)
-    {
+
+    function MECON_HTML_QuickForm_caritas($elementName=null, $elementLabel=null, $options=array(), $attributes=null) {

         HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
         $this->_persistantFreeze = true;
         $this->_type = 'caritas';
         HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
         $this->_persistantFreeze = true;
         $this->_type = 'caritas';


@@ -116,21 +114,20 @@ class HTML_QuickForm_caritas extends HTML_QuickForm_element
      * @access    private
      * @return    void
      */
      * @access    private
      * @return    void
      */

-    function _setDefaults($options)
-    {
+    function _setDefaults($options) {

         if (isset($options['cols'])) {
             $this->setCols($options['cols']);
         }
         if (isset($options['cols'])) {
             $this->setCols($options['cols']);
         }

-       /* if (isset($options['language'])) {
-            $this->setLanguage($options['language']);
-        }
-        if (isset($options['minYear'])) {
-            $this->setMinYear($options['minYear']);
-        }
-        if (isset($options['maxYear'])) {
-            $this->setMaxYear($options['maxYear']);
-        }
-      */
+        /* if (isset($options['language'])) {
+             $this->setLanguage($options['language']);
+         }
+         if (isset($options['minYear'])) {
+             $this->setMinYear($options['minYear']);
+         }
+         if (isset($options['maxYear'])) {
+             $this->setMaxYear($options['maxYear']);
+         }
+        */

     } // end func _setDefaults
 
     // }}}
     } // end func _setDefaults
 
     // }}}


@@ -142,8 +139,7 @@ class HTML_QuickForm_caritas extends HTML_QuickForm_element
      * @access    public
      * @return    void
      */
      * @access    public
      * @return    void
      */

-    function setCols($cols)
-    {
+    function setCols($cols) {

         $this->_cols = $cols;
     } //end func setCols
 
         $this->_cols = $cols;
     } //end func setCols
 


@@ -153,8 +149,7 @@ class HTML_QuickForm_caritas extends HTML_QuickForm_element
      * @access    public
      * @return    void
      */
      * @access    public
      * @return    void
      */

-    function setName($name)
-    {
+    function setName($name) {

         $this->name = $name;
     } //end func setName
 
         $this->name = $name;
     } //end func setName
 


@@ -166,8 +161,7 @@ class HTML_QuickForm_caritas extends HTML_QuickForm_element
      * @access    public
      * @return    string
      */
      * @access    public
      * @return    string
      */

-    function setValue($value)
-    {
+    function setValue($value) {

         $this->_selected = $value;
     } //end func getName
 
         $this->_selected = $value;
     } //end func getName
 


@@ -176,8 +170,7 @@ class HTML_QuickForm_caritas extends HTML_QuickForm_element
      * @access    public
      * @return    string
      */
      * @access    public
      * @return    string
      */

-    function setSelected($value)
-    {
+    function setSelected($value) {

         $this->_selected = $value;
     } //end func getName
 
         $this->_selected = $value;
     } //end func getName
 


@@ -186,8 +179,7 @@ class HTML_QuickForm_caritas extends HTML_QuickForm_element
      * @access    public
      * @return    string
      */
      * @access    public
      * @return    string
      */

-    function getValue()
-    {
+    function getValue() {

         return $this->_selected;
     } //end func getName
 
         return $this->_selected;
     } //end func getName
 


@@ -196,8 +188,7 @@ class HTML_QuickForm_caritas extends HTML_QuickForm_element
      * @access    public
      * @return    string
      */
      * @access    public
      * @return    string
      */

-    function getSelected()
-    {
+    function getSelected() {

         return $this->_selected;
     } //end func getName
 
         return $this->_selected;
     } //end func getName
 


@@ -206,8 +197,7 @@ class HTML_QuickForm_caritas extends HTML_QuickForm_element
      * @access    public
      * @return    string
      */
      * @access    public
      * @return    string
      */

-    function getName()
-    {
+    function getName() {

         return $this->name;
     } //end func getName
 
         return $this->name;
     } //end func getName
 


@@ -219,15 +209,13 @@ class HTML_QuickForm_caritas extends HTML_QuickForm_element
      * @access    public
      * @return    void
      */
      * @access    public
      * @return    void
      */

-    function _createRadios()
-    {
+    function _createRadios() {

         $this->caritas= array();
         $elementName = $this->name;
         $dir = MECON_DIR_FS_IMG.'/caritas';
         $cant=5;
         $i=1;
         $this->caritas= array();
         $elementName = $this->name;
         $dir = MECON_DIR_FS_IMG.'/caritas';
         $cant=5;
         $i=1;

-        foreach ($this->listarArchivos($dir,'','.gif') as $nombre)
-        {
+        foreach ($this->listarArchivos($dir,'','.gif') as $nombre) {

             $this->radios[$nombre] = &new HTML_QuickForm_radio($elementName, '', '', $nombre, $this->getAttributes());
         }
     } // end func _createSelects
             $this->radios[$nombre] = &new HTML_QuickForm_radio($elementName, '', '', $nombre, $this->getAttributes());
         }
     } // end func _createSelects


@@ -242,9 +230,8 @@ class HTML_QuickForm_caritas extends HTML_QuickForm_element
      * @access    public
      * @return    string
      * @throws    
      * @access    public
      * @return    string
      * @throws    

- */    
-    function toHtml()
-    {
+    */
+    function toHtml() {

         $this->_createRadios();
         $strHtml = '';
         $i = 1;
         $this->_createRadios();
         $strHtml = '';
         $i = 1;


@@ -265,7 +252,7 @@ class HTML_QuickForm_caritas extends HTML_QuickForm_element
                     $strHtml .= $element->toHtml();
                 }
             }
                     $strHtml .= $element->toHtml();
                 }
             }

-            $imagen =& new HTML_Image(MECON_DIR_IMG."/caritas/$nombre");
+            $imagen =& new MECON_HTML_Image(MECON_DIR_IMG."/caritas/$nombre");

             $strHtml .= '&nbsp;' . $imagen->toHtml() . '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
             if (!($i++ % $this->_cols))
                 $strHtml .=  '<br>';
             $strHtml .= '&nbsp;' . $imagen->toHtml() . '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
             if (!($i++ % $this->_cols))
                 $strHtml .=  '<br>';


@@ -287,28 +274,27 @@ class HTML_QuickForm_caritas extends HTML_QuickForm_element
      * @return    void
      * @throws    
      */
      * @return    void
      * @throws    
      */

-    function onQuickFormEvent($event, $arg, &$caller)
-    {
+    function onQuickFormEvent($event, $arg, &$caller) {

         switch ($event) {
         switch ($event) {

-            case 'updateValue':
+        case 'updateValue':

                 // constant values override both default and submitted ones
                 // default values are overriden by submitted
                 $value = $this->_findValue($caller->_constantValues);
                 // constant values override both default and submitted ones
                 // default values are overriden by submitted
                 $value = $this->_findValue($caller->_constantValues);

+            if (null === $value) {
+                $value = $this->_findValue($caller->_submitValues);

                 if (null === $value) {
                 if (null === $value) {

-                    $value = $this->_findValue($caller->_submitValues);
-                    if (null === $value) {
-                        $value = $this->_findValue($caller->_defaultValues);
-                    }
-                }
-                if (null !== $value) {
-                    $this->setSelected($value);
+                    $value = $this->_findValue($caller->_defaultValues);

                 }
                 }

-                break;
-            case 'setGroupValue':
-                $this->setSelected($arg);
-                break;
-            default:
-                parent::onQuickFormEvent($event, $arg, $caller);
+            }
+            if (null !== $value) {
+                $this->setSelected($value);
+            }
+            break;
+        case 'setGroupValue':
+            $this->setSelected($arg);
+            break;
+        default:
+            parent::onQuickFormEvent($event, $arg, $caller);

         }
         return true;
     } // end func onQuickFormEvent
         }
         return true;
     } // end func onQuickFormEvent