mambax7 / smartobject

class/adsense.php

Doc Comments +3 added lines

@@ -78,6 +78,9 @@
         						'maxlength' => 6));
     }
 
+    /**
+     * @param string $key
+     */
     function getVar($key, $format = 's') {
         if ($format == 's' && in_array($key, array())) {
             return call_user_func(array($this,$key));

class/currency.php

Doc Comments +3 added lines

@@ -73,6 +73,9 @@
 		$this->hideFieldFromForm('default_currency');
     }
 
+    /**
+     * @param string $key
+     */
     function getVar($key, $format = 's') {
         if ($format == 's' && in_array($key, array('rate', 'default_currency'))) {
             return call_user_func(array($this,$key));

Indentation +27 added lines, -27 removed lines

@@ -28,7 +28,7 @@ 
 // -------------------------------------------------------------------------//
 
 if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
+	die("XOOPS root path not defined");
 }
 
 include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobject.php";
@@ -38,8 +38,8 @@ 
 
 	var $_modulePlugin=false;
 
-    function SmartobjectCurrency() {
-        $this->quickInitVar('currencyid', XOBJ_DTYPE_INT, true);
+	function SmartobjectCurrency() {
+		$this->quickInitVar('currencyid', XOBJ_DTYPE_INT, true);
 		$this->quickInitVar('iso4217', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CURRENCY_ISO4217, _CO_SOBJECT_CURRENCY_ISO4217_DSC);
 		$this->quickInitVar('name', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CURRENCY_NAME);
 		$this->quickInitVar('symbol', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CURRENCY_SYMBOL);
@@ -71,14 +71,14 @@ 
 										));
 
 		$this->hideFieldFromForm('default_currency');
-    }
+	}
 
-    function getVar($key, $format = 's') {
-        if ($format == 's' && in_array($key, array('rate', 'default_currency'))) {
-            return call_user_func(array($this,$key));
-        }
-        return parent::getVar($key, $format);
-    }
+	function getVar($key, $format = 's') {
+		if ($format == 's' && in_array($key, array('rate', 'default_currency'))) {
+			return call_user_func(array($this,$key));
+		}
+		return parent::getVar($key, $format);
+	}
 
 	function getCurrencyLink() {
 		$ret = $this->getVar('name', 'e');
@@ -90,17 +90,17 @@ 
 		return $ret;
 	}
 
-    function rate() {
-    	return smart_currency($this->getVar('rate', 'e'));
-    }
+	function rate() {
+		return smart_currency($this->getVar('rate', 'e'));
+	}
 
-    function default_currency() {
-    	if ($this->getVar('default_currency', 'e') == true) {
-    		return _YES;
-    	} else {
-    		return _NO;
-    	}
-    }
+	function default_currency() {
+		if ($this->getVar('default_currency', 'e') == true) {
+			return _YES;
+		} else {
+			return _NO;
+		}
+	}
 
    	function getDefault_currencyControl() {
    		$radio_box = '<input name="default_currency" value="' . $this->getVar('currencyid') . '" type="radio"';
@@ -114,13 +114,13 @@ 
 }
 class SmartobjectCurrencyHandler extends SmartPersistableObjectHandler {
 
-    function SmartobjectCurrencyHandler($db) {
-        $this->SmartPersistableObjectHandler($db, 'currency', 'currencyid', 'name', '', 'smartobject');
-    }
+	function SmartobjectCurrencyHandler($db) {
+		$this->SmartPersistableObjectHandler($db, 'currency', 'currencyid', 'name', '', 'smartobject');
+	}
 
-    function getCurrencies() {
-    	$currenciesObj = $this->getObjects(null, true);
-    	return $currenciesObj;
-    }
+	function getCurrencies() {
+		$currenciesObj = $this->getObjects(null, true);
+		return $currenciesObj;
+	}
 }
 ?>
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -31,12 +31,12 @@ 
     die("XOOPS root path not defined");
 }
 
-include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobject.php";
+include_once XOOPS_ROOT_PATH . "/modules/smartobject/class/smartobject.php";
 include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
 
 class SmartobjectCurrency extends SmartObject {
 
-	var $_modulePlugin=false;
+	var $_modulePlugin = false;
 
     function SmartobjectCurrency() {
         $this->quickInitVar('currencyid', XOBJ_DTYPE_INT, true);
@@ -75,7 +75,7 @@ 
 
     function getVar($key, $format = 's') {
         if ($format == 's' && in_array($key, array('rate', 'default_currency'))) {
-            return call_user_func(array($this,$key));
+            return call_user_func(array($this, $key));
         }
         return parent::getVar($key, $format);
     }

class/customtag.php

Doc Comments +3 added lines

@@ -57,6 +57,9 @@
 
     }
 
+    /**
+     * @param string $key
+     */
     function getVar($key, $format = 's') {
         if ($format == 's' && in_array($key, array())) {
             return call_user_func(array($this,$key));

class/form/elements/smartformset_passwordelement.php

Doc Comments -6 removed lines

@@ -39,12 +39,6 @@
 	/**
 	 * Constructor
 	 *
-	 * @param	string	$caption	Caption
-	 * @param	string	$name		"name" attribute
-	 * @param	int		$size		Size of the field
-	 * @param	int		$maxlength	Maximum length of the text
-	 * @param	int		$value		Initial value of the field.
-	 * 								<b>Warning:</b> this is readable in cleartext in the page's source!
 	 */
 	function SmartFormSet_passwordElement($object, $key){
 

Indentation +15 added lines, -15 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 /**
- * Contains the set password tray class
- *
- * @license GNU
- * @author marcan <marcan@smartfactory.ca>
- * @version $Id: smartformset_passwordelement.php 159 2007-12-17 16:44:05Z malanciault $
- * @link http://smartfactory.ca The SmartFactory
- * @package SmartObject
- * @subpackage SmartObjectForm
- */
+	 * Contains the set password tray class
+	 *
+	 * @license GNU
+	 * @author marcan <marcan@smartfactory.ca>
+	 * @version $Id: smartformset_passwordelement.php 159 2007-12-17 16:44:05Z malanciault $
+	 * @link http://smartfactory.ca The SmartFactory
+	 * @package SmartObject
+	 * @subpackage SmartObjectForm
+	 */
 if (!defined('XOOPS_ROOT_PATH')) {
 	die("XOOPS root path not defined");
 }
@@ -16,21 +16,21 @@ 
 class SmartFormSet_passwordElement extends XoopsFormElementTray {
 
 	/**
-     * Size of the field.
+	 * Size of the field.
 	 * @var	int
 	 * @access	private
 	 */
 	var $_size;
 
 	/**
-     * Maximum length of the text
+	 * Maximum length of the text
 	 * @var	int
 	 * @access	private
 	 */
 	var $_maxlength;
 
 	/**
-     * Initial content of the field.
+	 * Initial content of the field.
 	 * @var	string
 	 * @access	private
 	 */
@@ -48,10 +48,10 @@ 
 	 */
 	function SmartFormSet_passwordElement($object, $key){
 
-	    $var = $object->vars[$key];
-	    $control = $object->controls[$key];
+		$var = $object->vars[$key];
+		$control = $object->controls[$key];
 
-     	$this->XoopsFormElementTray($var['form_caption'] . '<br />' . _US_TYPEPASSTWICE, ' ', $key . '_password_tray');
+	 	$this->XoopsFormElementTray($var['form_caption'] . '<br />' . _US_TYPEPASSTWICE, ' ', $key . '_password_tray');
 
 		$password_box1 = new XoopsFormPassword('', $key . '1', 10, 32);
 		$this->addElement($password_box1);

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 	 * @param	int		$value		Initial value of the field.
 	 * 								<b>Warning:</b> this is readable in cleartext in the page's source!
 	 */
-	function SmartFormSet_passwordElement($object, $key){
+	function SmartFormSet_passwordElement($object, $key) {
 
 	    $var = $object->vars[$key];
 	    $control = $object->controls[$key];

class/form/elements/smartformtextelement.php

Doc Comments +4 added lines

@@ -11,6 +11,10 @@
  * @subpackage SmartObjectForm
  */
 class SmartFormTextElement extends XoopsFormText {
+
+    /**
+     * @param string $key
+     */
     function SmartFormTextElement($object, $key) {
 		$var = $object->vars[$key];
 

Indentation +3 added lines, -3 removed lines

@@ -11,12 +11,12 @@ 
  * @subpackage SmartObjectForm
  */
 class SmartFormTextElement extends XoopsFormText {
-    function SmartFormTextElement($object, $key) {
+	function SmartFormTextElement($object, $key) {
 		$var = $object->vars[$key];
 
 		if(isset($object->controls[$key])){
 			$control = $object->controls[$key];
-	        $form_maxlength = isset($control['maxlength']) ? $control['maxlength'] : (isset($var['maxlength']) ? $var['maxlength'] : 255);
+			$form_maxlength = isset($control['maxlength']) ? $control['maxlength'] : (isset($var['maxlength']) ? $var['maxlength'] : 255);
 			$form_size = isset($control['size']) ? $control['size'] : 50;
 		}else{
 			$form_maxlength =  255;
@@ -24,6 +24,6 @@ 
 		}
 
 		$this->XoopsFormText($var['form_caption'], $key, $form_size, $form_maxlength, $object->getVar($key, 'e'));
-    }
+	}
 }
 ?>
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -14,12 +14,12 @@
     function SmartFormTextElement($object, $key) {
 		$var = $object->vars[$key];
 
-		if(isset($object->controls[$key])){
+		if (isset($object->controls[$key])) {
 			$control = $object->controls[$key];
 	        $form_maxlength = isset($control['maxlength']) ? $control['maxlength'] : (isset($var['maxlength']) ? $var['maxlength'] : 255);
 			$form_size = isset($control['size']) ? $control['size'] : 50;
-		}else{
-			$form_maxlength =  255;
+		} else {
+			$form_maxlength = 255;
 			$form_size = 50;
 		}
 

Braces +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 			$control = $object->controls[$key];
 	        $form_maxlength = isset($control['maxlength']) ? $control['maxlength'] : (isset($var['maxlength']) ? $var['maxlength'] : 255);
 			$form_size = isset($control['size']) ? $control['size'] : 50;
-		}else{
+		} else{
 			$form_maxlength =  255;
 			$form_size = 50;
 		}

class/form/smartobjectform.php

Doc Comments +5 added lines, -1 removed lines

@@ -42,6 +42,10 @@ 
     var $_form_caption=false;
     var $_submit_button_caption=false;
 
+    /**
+     * @param SmartObject $target
+     * @param boolean $form_action
+     */
     function SmartobjectForm(&$target, $form_name, $form_caption, $form_action, $form_fields=null, $submit_button_caption = false, $cancel_js_action=false, $captcha=false) {
 
         $this->targetObject =& $target;
@@ -88,7 +92,7 @@ 
      * Add an element to the form
      *
      * @param	object  &$formElement    reference to a {@link XoopsFormElement}
-     * @param	bool    $required       is this a "required" element?
+     * @param	string|boolean    $required       is this a "required" element?
      */
     function addElement(&$formElement, $key=false, $var=false, $required='notset'){
         if ($key) {

Indentation +664 added lines, -664 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
+	die("XOOPS root path not defined");
 }
 
 /**
@@ -33,143 +33,143 @@ 
  */
 class SmartobjectForm extends XoopsThemeForm {
 
-    var $targetObject = null;
-    var $form_fields = null;
-    var $_cancel_js_action=false;
-    var $_custom_button=false;
-    var $_captcha=false;
-    var $_form_name=false;
-    var $_form_caption=false;
-    var $_submit_button_caption=false;
+	var $targetObject = null;
+	var $form_fields = null;
+	var $_cancel_js_action=false;
+	var $_custom_button=false;
+	var $_captcha=false;
+	var $_form_name=false;
+	var $_form_caption=false;
+	var $_submit_button_caption=false;
 
-    function SmartobjectForm(&$target, $form_name, $form_caption, $form_action, $form_fields=null, $submit_button_caption = false, $cancel_js_action=false, $captcha=false) {
+	function SmartobjectForm(&$target, $form_name, $form_caption, $form_action, $form_fields=null, $submit_button_caption = false, $cancel_js_action=false, $captcha=false) {
 
-        $this->targetObject =& $target;
-        $this->form_fields = $form_fields;
-        $this->_cancel_js_action = $cancel_js_action;
-        $this->_captcha= $captcha;
-        $this->_form_name= $form_name;
-        $this->_form_caption= $form_caption;
-        $this->_submit_button_caption= $submit_button_caption;
+		$this->targetObject =& $target;
+		$this->form_fields = $form_fields;
+		$this->_cancel_js_action = $cancel_js_action;
+		$this->_captcha= $captcha;
+		$this->_form_name= $form_name;
+		$this->_form_caption= $form_caption;
+		$this->_submit_button_caption= $submit_button_caption;
 
-        if (!isset($form_action)) {
-            $form_action = xoops_getenv('PHP_SELF');
-        }
+		if (!isset($form_action)) {
+			$form_action = xoops_getenv('PHP_SELF');
+		}
 
-        $this->XoopsForm( $form_caption, $form_name, $form_action);
-        $this->setExtra('enctype="multipart/form-data"');
+		$this->XoopsForm( $form_caption, $form_name, $form_action);
+		$this->setExtra('enctype="multipart/form-data"');
 
-        $this->createElements();
+		$this->createElements();
 
-        if ($captcha) {
-            $this->addCaptcha();
-        }
+		if ($captcha) {
+			$this->addCaptcha();
+		}
 
-        $this->createPermissionControls();
+		$this->createPermissionControls();
 
-        $this->createButtons($form_name, $form_caption, $submit_button_caption);
-    }
+		$this->createButtons($form_name, $form_caption, $submit_button_caption);
+	}
 
-    function addCaptcha() {
-        include_once(SMARTOBJECT_ROOT_PATH . 'include/captcha/formcaptcha.php');
-        $this->addElement(new XoopsFormCaptcha(), true);
-    }
+	function addCaptcha() {
+		include_once(SMARTOBJECT_ROOT_PATH . 'include/captcha/formcaptcha.php');
+		$this->addElement(new XoopsFormCaptcha(), true);
+	}
 
-    function addCustomButton($name, $caption, $onclick=false) {
-        $custom_button_array = array(
+	function addCustomButton($name, $caption, $onclick=false) {
+		$custom_button_array = array(
 						'name' => $name,
 						'caption' => $caption,
 						'onclick' => $onclick
-        );
-        $this->_custom_button[] = $custom_button_array;
-    }
-
-    /**
-     * Add an element to the form
-     *
-     * @param	object  &$formElement    reference to a {@link XoopsFormElement}
-     * @param	bool    $required       is this a "required" element?
-     */
-    function addElement(&$formElement, $key=false, $var=false, $required='notset'){
-        if ($key) {
-            if ($this->targetObject->vars[$key]['readonly']) {
-                $formElement->setExtra('disabled="disabled"');
-                $formElement->setName($key . '-readonly');
-                // Since this element is disable, we still want to pass it's value in the form
-                $hidden = new XoopsFormHidden($key, $this->targetObject->vars[$key]['value']);
-                $this->addElement($hidden);
-            }
-            $formElement->setDescription($var['form_dsc']);
-            if (isset($this->targetObject->controls[$key]['onSelect'])) {
-                $hidden = new XoopsFormHidden('changedField', false);
-                $this->addElement($hidden);
-                $otherExtra = isset($var['form_extra']) ? $var['form_extra'] : '';
-                $onchangedString = "this.form.elements.changedField.value='$key'; this.form.elements.op.value='changedField'; submit()";
-                $formElement->setExtra('onchange="' . $onchangedString . '"' . ' ' . $otherExtra);
-            } else {
-                if (isset($var['form_extra'])) {
-                    $formElement->setExtra($var['form_extra']);
-                }
-            }
-            $controls = $this->targetObject->controls;
-            if(isset($controls[$key]['js'])){
-                $formElement->customValidationCode[] = $controls[$key]['js'];
-            }
-            parent::AddElement($formElement, $required == 'notset' ? $var['required'] : $required);
-        } else {
-            parent::AddElement($formElement, $required == 'notset' ? false : true);
-        }
-        unset($formElement);
-    }
-
-    function createElements() {
-        $controls = $this->targetObject->controls;
-        $vars = $this->targetObject->vars;
-        foreach ($vars as $key=>$var) {
-
-            // If $displayOnForm is false OR this is the primary key, it doesn't
-            // need to be displayed, then we only create an hidden field
-            if ($key == $this->targetObject->handler->keyName || !$var['displayOnForm']) {
-                $elementToAdd = new XoopsFormHidden($key, $var['value']);
-                $this->addElement($elementToAdd, $key, $var, false);
-                unset($elementToAdd);
-                // If not, the we need to create the proper form control for this fields
-            } else {
-                // If this field has a specific control, we will use it
-
-                if ($key == 'parentid') {
-                    /**
-                     * Why this ?
-                     */
-                }
-                if (isset($controls[$key])) {
-                    /* If the control has name, it's because it's an object already present in the script
+		);
+		$this->_custom_button[] = $custom_button_array;
+	}
+
+	/**
+	 * Add an element to the form
+	 *
+	 * @param	object  &$formElement    reference to a {@link XoopsFormElement}
+	 * @param	bool    $required       is this a "required" element?
+	 */
+	function addElement(&$formElement, $key=false, $var=false, $required='notset'){
+		if ($key) {
+			if ($this->targetObject->vars[$key]['readonly']) {
+				$formElement->setExtra('disabled="disabled"');
+				$formElement->setName($key . '-readonly');
+				// Since this element is disable, we still want to pass it's value in the form
+				$hidden = new XoopsFormHidden($key, $this->targetObject->vars[$key]['value']);
+				$this->addElement($hidden);
+			}
+			$formElement->setDescription($var['form_dsc']);
+			if (isset($this->targetObject->controls[$key]['onSelect'])) {
+				$hidden = new XoopsFormHidden('changedField', false);
+				$this->addElement($hidden);
+				$otherExtra = isset($var['form_extra']) ? $var['form_extra'] : '';
+				$onchangedString = "this.form.elements.changedField.value='$key'; this.form.elements.op.value='changedField'; submit()";
+				$formElement->setExtra('onchange="' . $onchangedString . '"' . ' ' . $otherExtra);
+			} else {
+				if (isset($var['form_extra'])) {
+					$formElement->setExtra($var['form_extra']);
+				}
+			}
+			$controls = $this->targetObject->controls;
+			if(isset($controls[$key]['js'])){
+				$formElement->customValidationCode[] = $controls[$key]['js'];
+			}
+			parent::AddElement($formElement, $required == 'notset' ? $var['required'] : $required);
+		} else {
+			parent::AddElement($formElement, $required == 'notset' ? false : true);
+		}
+		unset($formElement);
+	}
+
+	function createElements() {
+		$controls = $this->targetObject->controls;
+		$vars = $this->targetObject->vars;
+		foreach ($vars as $key=>$var) {
+
+			// If $displayOnForm is false OR this is the primary key, it doesn't
+			// need to be displayed, then we only create an hidden field
+			if ($key == $this->targetObject->handler->keyName || !$var['displayOnForm']) {
+				$elementToAdd = new XoopsFormHidden($key, $var['value']);
+				$this->addElement($elementToAdd, $key, $var, false);
+				unset($elementToAdd);
+				// If not, the we need to create the proper form control for this fields
+			} else {
+				// If this field has a specific control, we will use it
+
+				if ($key == 'parentid') {
+					/**
+					 * Why this ?
+					 */
+				}
+				if (isset($controls[$key])) {
+					/* If the control has name, it's because it's an object already present in the script
                      * for example, "user"
                      * If the field does not have a name, than we will use a "select" (ie XoopsFormSelect)
                      */
-                    if (!isset($controls[$key]['name']) || !$controls[$key]['name']) {
-                        $controls[$key]['name'] = 'select';
-                    }
+					if (!isset($controls[$key]['name']) || !$controls[$key]['name']) {
+						$controls[$key]['name'] = 'select';
+					}
 
-                    $form_select = $this->getControl($controls[$key]['name'], $key);
+					$form_select = $this->getControl($controls[$key]['name'], $key);
 
-                    // Adding on the form, the control for this field
-                    $this->addElement($form_select, $key, $var);
-                    unset($form_select);
+					// Adding on the form, the control for this field
+					$this->addElement($form_select, $key, $var);
+					unset($form_select);
 
-                    // If this field don't have a specific control, we will use the standard one, depending on its data type
-                } else {
-                    switch ($var['data_type']) {
+					// If this field don't have a specific control, we will use the standard one, depending on its data type
+				} else {
+					switch ($var['data_type']) {
 
-                        case XOBJ_DTYPE_TXTBOX:
+						case XOBJ_DTYPE_TXTBOX:
 
-                            $form_text = $this->getControl("text", $key);
-                            $this->addElement($form_text, $key, $var);
-                            unset($form_text);
-                            break;
+							$form_text = $this->getControl("text", $key);
+							$this->addElement($form_text, $key, $var);
+							unset($form_text);
+							break;
 
-                        case XOBJ_DTYPE_INT:
-                            $this->targetObject->setControl($key, array(
+						case XOBJ_DTYPE_INT:
+							$this->targetObject->setControl($key, array(
 																'name' => 'text',
 																'size' => '5'
 																));
@@ -178,8 +178,8 @@ 
 																unset($form_text);
 																break;
 
-                        case XOBJ_DTYPE_FLOAT:
-                            $this->targetObject->setControl($key, array(
+						case XOBJ_DTYPE_FLOAT:
+							$this->targetObject->setControl($key, array(
 																'name' => 'text',
 																'size' => '5'
 																));
@@ -188,26 +188,26 @@ 
 																unset($form_text);
 																break;
 
-                        case XOBJ_DTYPE_LTIME:
-                            $form_date_time = $this->getControl('date_time', $key);
-                            $this->addElement($form_date_time, $key, $var);
-                            unset($form_date_time);
-                            break;
-
-                        case XOBJ_DTYPE_STIME:
-                            $form_date_time = $this->getControl('date', $key);
-                            $this->addElement($form_date_time, $key, $var);
-                            unset($form_date_time);
-                            break;
-
-                        case XOBJ_DTYPE_TIME_ONLY:
-                            $form_time = $this->getControl('time', $key);
-                            $this->addElement($form_time, $key, $var);
-                            unset($form_time);
-                            break;
-
-                        case XOBJ_DTYPE_CURRENCY:
-                            $this->targetObject->setControl($key, array(
+						case XOBJ_DTYPE_LTIME:
+							$form_date_time = $this->getControl('date_time', $key);
+							$this->addElement($form_date_time, $key, $var);
+							unset($form_date_time);
+							break;
+
+						case XOBJ_DTYPE_STIME:
+							$form_date_time = $this->getControl('date', $key);
+							$this->addElement($form_date_time, $key, $var);
+							unset($form_date_time);
+							break;
+
+						case XOBJ_DTYPE_TIME_ONLY:
+							$form_time = $this->getControl('time', $key);
+							$this->addElement($form_time, $key, $var);
+							unset($form_time);
+							break;
+
+						case XOBJ_DTYPE_CURRENCY:
+							$this->targetObject->setControl($key, array(
 																'name' => 'text',
 																'size' => '15'
 																));
@@ -216,511 +216,511 @@ 
 																unset($form_currency);
 																break;
 
-                        case XOBJ_DTYPE_URLLINK:
-                            $form_urllink = $this->getControl("urllink", $key);
-                            $this->addElement($form_urllink, $key, $var);
-                            unset($form_urllink);
-                            break;
-
-                        case XOBJ_DTYPE_FILE:
-                            $form_file = $this->getControl("richfile", $key);
-                            $this->addElement($form_file, $key, $var);
-                            unset($form_file);
-                            break;
-
-                        case XOBJ_DTYPE_TXTAREA:
-
-                            $form_text_area = $this->getTextArea($key, $var);
-                            $this->addElement($form_text_area, $key, $var);
-                            unset($form_text_area);
-                            break;
-
-                        case XOBJ_DTYPE_ARRAY:
-                            // TODO : To come...
-                            break;
-                        case XOBJ_DTYPE_SOURCE:
-                            // TODO : To come...
-                            break;
-                        case XOBJ_DTYPE_FORM_SECTION:
-                            $section_control = new SmartFormSection($key, $var['value']);
-                            $this->addElement($section_control, $key, $var);
-                            unset($section_control);
-                            break;
-                        case XOBJ_DTYPE_FORM_SECTION_CLOSE:
-                            $section_control = new SmartFormSectionClose($key, $var['value']);
-                            $this->addElement($section_control, $key, $var);
-                            unset($section_control);
-                            break;
-                    }
-                }
-            }
-        }
-        // Add an hidden field to store the URL of the page before this form
-        $this->addElement(new XoopsFormHidden('smart_page_before_form', smart_get_page_before_form()));
-    }
-
-    function createPermissionControls() {
-        $smartModuleConfig = $this->targetObject->handler->getModuleConfig();
-
-        $permissions = $this->targetObject->handler->getPermissions();
-
-        if ($permissions) {
-            $member_handler = &xoops_gethandler('member');
-            $group_list = $member_handler->getGroupList();
-            asort($group_list);
-            foreach($permissions as $permission) {
-                if ($this->targetObject->isNew()) {
-                    if (isset($smartModuleConfig['def_perm_' . $permission['perm_name']])) {
-                        $groups_value = $smartModuleConfig['def_perm_' . $permission['perm_name']];
-                    }
-                } else {
-                    $groups_value = $this->targetObject->getGroupPerm($permission['perm_name']);
-                }
-                $groups_select = new XoopsFormSelect($permission['caption'], $permission['perm_name'], $groups_value, 4, true);
-                $groups_select->setDescription($permission['description']);
-                $groups_select->addOptionArray($group_list);
-                $this->addElement($groups_select);
-                unset($groups_select);
-            }
-        }
-    }
-
-    function createButtons($form_name, $form_caption, $submit_button_caption = false) {
-
-        $button_tray = new XoopsFormElementTray('', '');
-        $button_tray->addElement(new XoopsFormHidden('op', $form_name));
-        if(!$submit_button_caption){
-            if ($this->targetObject->isNew()) {
-                $butt_create = new XoopsFormButton('', 'create_button', _CO_SOBJECT_CREATE, 'submit');
-            } else {
-                $butt_create = new XoopsFormButton('', 'modify_button', _CO_SOBJECT_MODIFY, 'submit');
-            }
-        }
-        else {
-            $butt_create = new XoopsFormButton('', 'modify_button', $submit_button_caption , 'submit');
-        }
-        $butt_create->setExtra('onclick="this.form.elements.op.value=\'' . $form_name . '\'"');
-        $button_tray->addElement($butt_create);
-
-        //creating custom buttons
-        if ($this->_custom_button) {
-            foreach($this->_custom_button as $custom_button) {
-                $butt_custom = new XoopsFormButton('', $custom_button['name'], $custom_button['caption'], 'submit');
-                if ($custom_button['onclick']) {
-                    $butt_custom->setExtra('onclick="' . $custom_button['onclick'] . '"');
-                }
-                $button_tray->addElement($butt_custom);
-                unset($butt_custom);
-            }
-        }
-
-        // creating the "cancel" button
-        $butt_cancel = new XoopsFormButton('', 'cancel_button', _CO_SOBJECT_CANCEL, 'button');
-        if ($this->_cancel_js_action) {
-            $butt_cancel->setExtra('onclick="' . $this->_cancel_js_action . '"');
-        } else {
-            $butt_cancel->setExtra('onclick="history.go(-1)"');
-        }
-        $button_tray->addElement($butt_cancel);
-
-        $this->addElement($button_tray);
-    }
-
-    function getControl($controlName, $key) {
-        switch ($controlName) {
-            case 'check':
-                include_once(SMARTOBJECT_ROOT_PATH."class/form/elements/smartformcheckelement.php");
-                $control = $this->targetObject->getControl($key);
-                $controlObj = new SmartFormCheckElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
-                $controlObj->addOptionArray($control['options']);
-                return $controlObj;
-                break;
-
-            case 'color':
-                $control = $this->targetObject->getControl($key);
-                $controlObj = new XoopsFormColorPicker($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
-                return $controlObj;
-                break;
-
-            case 'radio':
-                $control = $this->targetObject->getControl($key);
-
-                $controlObj = new XoopsFormRadio($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
-                $controlObj->addOptionArray($control['options']);
-                return $controlObj;
-                break;
-
-            case 'label':
-                return new XoopsFormLabel($this->targetObject->vars[$key]['form_caption'], $this->targetObject->getVar($key));
-                break;
-
-            case 'textarea' :
-                return $this->getTextArea($key);
-
-            case 'theme':
-                return $this->getThemeSelect($key, $this->targetObject->vars[$key]);
-
-            case 'theme_multi':
-                return $this->getThemeSelect($key, $this->targetObject->vars[$key], true);
-                break;
-
-            case 'timezone':
-                return new XoopsFormSelectTimezone($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
-                break;
-
-            case 'group':
-                return new XoopsFormSelectGroup($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 1, false);
-                break;
-
-            case 'group_multi':
-                return new XoopsFormSelectGroup($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 5, true);
-                break;
-
-                /*case 'user':
+						case XOBJ_DTYPE_URLLINK:
+							$form_urllink = $this->getControl("urllink", $key);
+							$this->addElement($form_urllink, $key, $var);
+							unset($form_urllink);
+							break;
+
+						case XOBJ_DTYPE_FILE:
+							$form_file = $this->getControl("richfile", $key);
+							$this->addElement($form_file, $key, $var);
+							unset($form_file);
+							break;
+
+						case XOBJ_DTYPE_TXTAREA:
+
+							$form_text_area = $this->getTextArea($key, $var);
+							$this->addElement($form_text_area, $key, $var);
+							unset($form_text_area);
+							break;
+
+						case XOBJ_DTYPE_ARRAY:
+							// TODO : To come...
+							break;
+						case XOBJ_DTYPE_SOURCE:
+							// TODO : To come...
+							break;
+						case XOBJ_DTYPE_FORM_SECTION:
+							$section_control = new SmartFormSection($key, $var['value']);
+							$this->addElement($section_control, $key, $var);
+							unset($section_control);
+							break;
+						case XOBJ_DTYPE_FORM_SECTION_CLOSE:
+							$section_control = new SmartFormSectionClose($key, $var['value']);
+							$this->addElement($section_control, $key, $var);
+							unset($section_control);
+							break;
+					}
+				}
+			}
+		}
+		// Add an hidden field to store the URL of the page before this form
+		$this->addElement(new XoopsFormHidden('smart_page_before_form', smart_get_page_before_form()));
+	}
+
+	function createPermissionControls() {
+		$smartModuleConfig = $this->targetObject->handler->getModuleConfig();
+
+		$permissions = $this->targetObject->handler->getPermissions();
+
+		if ($permissions) {
+			$member_handler = &xoops_gethandler('member');
+			$group_list = $member_handler->getGroupList();
+			asort($group_list);
+			foreach($permissions as $permission) {
+				if ($this->targetObject->isNew()) {
+					if (isset($smartModuleConfig['def_perm_' . $permission['perm_name']])) {
+						$groups_value = $smartModuleConfig['def_perm_' . $permission['perm_name']];
+					}
+				} else {
+					$groups_value = $this->targetObject->getGroupPerm($permission['perm_name']);
+				}
+				$groups_select = new XoopsFormSelect($permission['caption'], $permission['perm_name'], $groups_value, 4, true);
+				$groups_select->setDescription($permission['description']);
+				$groups_select->addOptionArray($group_list);
+				$this->addElement($groups_select);
+				unset($groups_select);
+			}
+		}
+	}
+
+	function createButtons($form_name, $form_caption, $submit_button_caption = false) {
+
+		$button_tray = new XoopsFormElementTray('', '');
+		$button_tray->addElement(new XoopsFormHidden('op', $form_name));
+		if(!$submit_button_caption){
+			if ($this->targetObject->isNew()) {
+				$butt_create = new XoopsFormButton('', 'create_button', _CO_SOBJECT_CREATE, 'submit');
+			} else {
+				$butt_create = new XoopsFormButton('', 'modify_button', _CO_SOBJECT_MODIFY, 'submit');
+			}
+		}
+		else {
+			$butt_create = new XoopsFormButton('', 'modify_button', $submit_button_caption , 'submit');
+		}
+		$butt_create->setExtra('onclick="this.form.elements.op.value=\'' . $form_name . '\'"');
+		$button_tray->addElement($butt_create);
+
+		//creating custom buttons
+		if ($this->_custom_button) {
+			foreach($this->_custom_button as $custom_button) {
+				$butt_custom = new XoopsFormButton('', $custom_button['name'], $custom_button['caption'], 'submit');
+				if ($custom_button['onclick']) {
+					$butt_custom->setExtra('onclick="' . $custom_button['onclick'] . '"');
+				}
+				$button_tray->addElement($butt_custom);
+				unset($butt_custom);
+			}
+		}
+
+		// creating the "cancel" button
+		$butt_cancel = new XoopsFormButton('', 'cancel_button', _CO_SOBJECT_CANCEL, 'button');
+		if ($this->_cancel_js_action) {
+			$butt_cancel->setExtra('onclick="' . $this->_cancel_js_action . '"');
+		} else {
+			$butt_cancel->setExtra('onclick="history.go(-1)"');
+		}
+		$button_tray->addElement($butt_cancel);
+
+		$this->addElement($button_tray);
+	}
+
+	function getControl($controlName, $key) {
+		switch ($controlName) {
+			case 'check':
+				include_once(SMARTOBJECT_ROOT_PATH."class/form/elements/smartformcheckelement.php");
+				$control = $this->targetObject->getControl($key);
+				$controlObj = new SmartFormCheckElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
+				$controlObj->addOptionArray($control['options']);
+				return $controlObj;
+				break;
+
+			case 'color':
+				$control = $this->targetObject->getControl($key);
+				$controlObj = new XoopsFormColorPicker($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
+				return $controlObj;
+				break;
+
+			case 'radio':
+				$control = $this->targetObject->getControl($key);
+
+				$controlObj = new XoopsFormRadio($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
+				$controlObj->addOptionArray($control['options']);
+				return $controlObj;
+				break;
+
+			case 'label':
+				return new XoopsFormLabel($this->targetObject->vars[$key]['form_caption'], $this->targetObject->getVar($key));
+				break;
+
+			case 'textarea' :
+				return $this->getTextArea($key);
+
+			case 'theme':
+				return $this->getThemeSelect($key, $this->targetObject->vars[$key]);
+
+			case 'theme_multi':
+				return $this->getThemeSelect($key, $this->targetObject->vars[$key], true);
+				break;
+
+			case 'timezone':
+				return new XoopsFormSelectTimezone($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
+				break;
+
+			case 'group':
+				return new XoopsFormSelectGroup($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 1, false);
+				break;
+
+			case 'group_multi':
+				return new XoopsFormSelectGroup($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 5, true);
+				break;
+
+				/*case 'user':
                  return new XoopsFormSelectUser($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 1, false);
                  break;*/
 
-            case 'user_multi':
-                return new XoopsFormSelectUser($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 5, true);
-                break;
-
-            case 'password':
-                return new XoopsFormPassword($this->targetObject->vars[$key]['form_caption'], $key, 50, 255, $this->targetObject->getVar($key, 'e'));
-                break;
-
-            case 'country':
-                return new XoopsFormSelectCountry($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key, 'e'));
-                break;
-
-            case 'urllink':
-                include_once(SMARTOBJECT_ROOT_PATH."class/form/elements/smartformurllinkelement.php");
-                return new SmartFormUrlLinkElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getUrlLinkObj($key));
-                break;
-
-            case 'richfile':
-                include_once(SMARTOBJECT_ROOT_PATH."class/form/elements/smartformrichfileelement.php");
-                return new SmartFormRichFileElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getFileObj($key));
-                break;
-            case 'section':
-                include_once(SMARTOBJECT_ROOT_PATH."class/form/elements/smartformsection.php");
-                return new SmartFormSection($key, $this->targetObject->vars[$key]['form_caption']);
-                break;
-
-
-            default:
-                $classname = "SmartForm".ucfirst($controlName)."Element";
-                if (!class_exists($classname)) {
-                    if (file_exists(SMARTOBJECT_ROOT_PATH."class/form/elements/".strtolower($classname).".php")) {
-                        include_once(SMARTOBJECT_ROOT_PATH."class/form/elements/".strtolower($classname).".php");
-                    } else {
-                        // perhaps this is a control created by the module
-                        $moduleName = $this->targetObject->handler->_moduleName;
-                        $moduleFormElementsPath = $this->targetObject->handler->_modulePath . 'class/form/elements/';
-                        $classname = ucfirst($moduleName) . ucfirst($controlName) . "Element";
-                        $classFileName = strtolower($classname).".php";
-
-                        if (file_exists($moduleFormElementsPath . $classFileName)) {
-                            include_once($moduleFormElementsPath . $classFileName);
-                        } else {
-                            trigger_error($classname." Not found", E_USER_WARNING);
-                            return new XoopsFormLabel(); //Empty object
-                        }
-                    }
-                }
-                return new $classname($this->targetObject, $key);
-                break;
-        }
-    }
-
-    function getTextArea($key) {
-        $var = $this->targetObject->vars[$key];
-
-        // if no control has been created, let's create a default one
-        if (!isset($this->targetObject->controls[$key])) {
-            $control = array('name' => 'textarea',
+			case 'user_multi':
+				return new XoopsFormSelectUser($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 5, true);
+				break;
+
+			case 'password':
+				return new XoopsFormPassword($this->targetObject->vars[$key]['form_caption'], $key, 50, 255, $this->targetObject->getVar($key, 'e'));
+				break;
+
+			case 'country':
+				return new XoopsFormSelectCountry($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key, 'e'));
+				break;
+
+			case 'urllink':
+				include_once(SMARTOBJECT_ROOT_PATH."class/form/elements/smartformurllinkelement.php");
+				return new SmartFormUrlLinkElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getUrlLinkObj($key));
+				break;
+
+			case 'richfile':
+				include_once(SMARTOBJECT_ROOT_PATH."class/form/elements/smartformrichfileelement.php");
+				return new SmartFormRichFileElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getFileObj($key));
+				break;
+			case 'section':
+				include_once(SMARTOBJECT_ROOT_PATH."class/form/elements/smartformsection.php");
+				return new SmartFormSection($key, $this->targetObject->vars[$key]['form_caption']);
+				break;
+
+
+			default:
+				$classname = "SmartForm".ucfirst($controlName)."Element";
+				if (!class_exists($classname)) {
+					if (file_exists(SMARTOBJECT_ROOT_PATH."class/form/elements/".strtolower($classname).".php")) {
+						include_once(SMARTOBJECT_ROOT_PATH."class/form/elements/".strtolower($classname).".php");
+					} else {
+						// perhaps this is a control created by the module
+						$moduleName = $this->targetObject->handler->_moduleName;
+						$moduleFormElementsPath = $this->targetObject->handler->_modulePath . 'class/form/elements/';
+						$classname = ucfirst($moduleName) . ucfirst($controlName) . "Element";
+						$classFileName = strtolower($classname).".php";
+
+						if (file_exists($moduleFormElementsPath . $classFileName)) {
+							include_once($moduleFormElementsPath . $classFileName);
+						} else {
+							trigger_error($classname." Not found", E_USER_WARNING);
+							return new XoopsFormLabel(); //Empty object
+						}
+					}
+				}
+				return new $classname($this->targetObject, $key);
+				break;
+		}
+	}
+
+	function getTextArea($key) {
+		$var = $this->targetObject->vars[$key];
+
+		// if no control has been created, let's create a default one
+		if (!isset($this->targetObject->controls[$key])) {
+			$control = array('name' => 'textarea',
 			'itemHandler' => false,
 			'method' => false,
 			'module' => false,
 			'form_editor'=>'default');
-        } else {
-            $control = $this->targetObject->controls[$key];
-        }
-        $xoops22 = smart_isXoops22();
-
-        $form_editor = isset($control['form_editor']) ? $control['form_editor'] : 'textarea';
-        /**
-         * If the editor is 'default', retreive the default editor of this module
-         */
-        if ($form_editor == 'default') {
-            global $xoopsModuleConfig;
-            $form_editor = isset($xoopsModuleConfig['default_editor']) ? $xoopsModuleConfig['default_editor'] : 'textarea';
-        }
-
-        $caption = $var['form_caption'];
-        $name = $key;
-
-        $value = $this->targetObject->getVar($key);
-
-        $value = $this->targetObject->getValueFor($key, true);
-
-        $editor_configs=array();
-        $editor_configs["name"] = $name;
-        $editor_configs["value"] = $value;
-        if ($form_editor != 'textarea') {
-            $editor_configs["rows"] = 35;
-            $editor_configs["cols"] = 60;
-        }
-
-        if (isset($control['rows'])) {
-            $editor_configs["rows"] = $control['rows'];
-        }
-        if (isset($control['cols'])) {
-            $editor_configs["cols"] = $control['cols'];
-        }
-
-        $editor_configs["width"] = "100%";
-        $editor_configs["height"] = "400px";
-
-        $dhtml = true;
-        $xoopseditorclass = XOOPS_ROOT_PATH . '/class/xoopsform/formeditor.php';
-
-        if (file_exists($xoopseditorclass)) {
-            include_once($xoopseditorclass);
-            $editor = new XoopsFormEditor($caption, $form_editor, $editor_configs, $nohtml = false, $onfailure = "textarea");
-        } else {
-
-            switch($form_editor) {
-
-                case 'tiny' :
-                    if (!$xoops22) {
-                        if ( is_readable(XOOPS_ROOT_PATH . "/class/xoopseditor/tinyeditor/formtinytextarea.php"))	{
-                            include_once(XOOPS_ROOT_PATH . "/class/xoopseditor/tinyeditor/formtinytextarea.php");
-                            $editor = new XoopsFormTinyTextArea(array('caption'=> $caption, 'name'=>$name, 'value'=>$value, 'width'=>'100%', 'height'=>'300px'),true);
-                        } else {
-                            if ($dhtml) {
-                                $editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
-                            } else {
-                                $editor = new XoopsFormTextArea($caption, $name, $value, 7, 60);
-                            }
-                        }
-                    } else {
-                        $editor = new XoopsFormEditor($caption, "tinyeditor", $editor_configs);
-                    }
-                    break;
-
-                case 'dhtmltextarea' :
-                case 'dhtmltext' :
-                    $editor = new XoopsFormDhtmlTextArea($var['form_caption'], $key, $this->targetObject->getVar($key, 'e'), 20, 60);
-                    if ($var['form_dsc']) {
-                        $editor->setDescription($var['form_dsc']);
-                    }
-                    break;
-
-                case 'fckeditor' :
-                    if (!$xoops22) {
-                        if ( is_readable(XOOPS_ROOT_PATH . "/class/xoopseditor/fckeditor/formfckeditor.php"))	{
-                            include_once(XOOPS_ROOT_PATH . "/class/xoopseditor/fckeditor/formfckeditor.php");
-                            $editor = new XoopsFormFckeditor(array('caption'=> $caption, 'name'=>$name, 'value'=>$value, 'width'=>'100%', 'height'=>'300px'),true);
-                        } else {
-                            if ($dhtml) {
-                                $editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
-                            } else {
-                                $editor = new XoopsFormTextArea($caption, $name, $value, 7, 60);
-                            }
-                        }
-                    } else {
-                        $editor = new XoopsFormEditor($caption, "fckeditor", $editor_configs);
-                    }
-                    break;
-
-                case 'inbetween' :
-                    if (!$xoops22) {
-                        if ( is_readable(XOOPS_ROOT_PATH . "/class/xoopseditor/inbetween/forminbetweentextarea.php"))	{
-                            include_once(XOOPS_ROOT_PATH . "/class/xoopseditor/inbetween/forminbetweentextarea.php");
-                            $editor = new XoopsFormInbetweenTextArea(array('caption'=> $caption, 'name'=>$name, 'value'=>$value, 'width'=>'100%', 'height'=>'300px'),true);
-                        } else {
-                            if ($dhtml) {
-                                $editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
-                            } else {
-                                $editor = new XoopsFormTextArea($caption, $name, $value, 7, 60);
-                            }
-                        }
-                    } else {
-                        $editor = new XoopsFormEditor($caption, "inbetween", $editor_configs);
-                    }
-                    break;
-
-                case 'koivi' :
-                    if (!$xoops22) {
-                        if ( is_readable(XOOPS_ROOT_PATH . "/class/wysiwyg/formwysiwygtextarea.php"))	{
-                            include_once(XOOPS_ROOT_PATH . "/class/wysiwyg/formwysiwygtextarea.php");
-                            $editor = new XoopsFormWysiwygTextArea($caption, $name, $value, '100%', '400px');
-                        } else {
-                            if ($dhtml) {
-                                $editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
-                            } else {
-                                $editor = new XoopsFormTextArea($caption, $name, $value, 7, 60);
-                            }
-                        }
-                    } else {
-                        $editor = new XoopsFormEditor($caption, "koivi", $editor_configs);
-                    }
-                    break;
-
-                case "spaw":
-                    if(!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . "/class/spaw/formspaw.php"))	{
-                            include_once(XOOPS_ROOT_PATH . "/class/spaw/formspaw.php");
-                            $editor = new XoopsFormSpaw($caption, $name, $value);
-                        }
-                    } else {
-                        $editor = new XoopsFormEditor($caption, "spaw", $editor_configs);
-                    }
-                    break;
-
-                case "htmlarea":
-                    if(!$xoops22) {
-                        if ( is_readable(XOOPS_ROOT_PATH . "/class/htmlarea/formhtmlarea.php"))	{
-                            include_once(XOOPS_ROOT_PATH . "/class/htmlarea/formhtmlarea.php");
-                            $editor = new XoopsFormHtmlarea($caption, $name, $value);
-                        }
-                    } else {
-                        $editor = new XoopsFormEditor($caption, "htmlarea", $editor_configs);
-                    }
-                    break;
-
-                default:
-                case 'textarea':
-                    $form_rows = isset($control['rows']) ? $control['rows'] : 5;
-                    $form_cols = isset($control['cols']) ? $control['cols'] : 60;
-
-                    $editor = new XoopsFormTextArea($var['form_caption'], $key, $this->targetObject->getVar($key, 'e'), $form_rows, $form_cols);
-                    if ($var['form_dsc']) {
-                        $editor->setDescription($var['form_dsc']);
-                    }
-                    break;
-
-            }
-        }
-
-        return $editor;
-    }
-
-    function getThemeSelect($key, $var, $multiple=false) {
-
-        $size = $multiple ? 5 : 1;
-        $theme_select = new XoopsFormSelect($var['form_caption'], $key, $this->targetObject->getVar($key), $size, $multiple);
-
-        $handle = opendir(XOOPS_THEME_PATH.'/');
-        $dirlist = array();
-        while (false !== ($file = readdir($handle))) {
-            if (is_dir(XOOPS_THEME_PATH.'/'.$file) && !preg_match("/^[.]{1,2}$/",$file) && strtolower($file) != 'cvs') {
-                $dirlist[$file]=$file;
-            }
-        }
-        closedir($handle);
-        if (!empty($dirlist)) {
-            asort($dirlist);
-            $theme_select->addOptionArray($dirlist);
-        }
-
-        return $theme_select;
-    }
-
-    function &getElementById($keyname) {
-        foreach ($this->_elements as $eleObj) {
-            if ($eleObj->getName() == $keyname) {
-                $ret =& $eleObj;
-                break;
-            }
-        }
-        return isset($ret) ? $ret : false;
-    }
-
-    /**
-     * create HTML to output the form as a theme-enabled table with validation.
-     *
-     * @return	string
-     */
-    function render()
-    {
-        $required =& $this->getRequired();
-        $ret = "
+		} else {
+			$control = $this->targetObject->controls[$key];
+		}
+		$xoops22 = smart_isXoops22();
+
+		$form_editor = isset($control['form_editor']) ? $control['form_editor'] : 'textarea';
+		/**
+		 * If the editor is 'default', retreive the default editor of this module
+		 */
+		if ($form_editor == 'default') {
+			global $xoopsModuleConfig;
+			$form_editor = isset($xoopsModuleConfig['default_editor']) ? $xoopsModuleConfig['default_editor'] : 'textarea';
+		}
+
+		$caption = $var['form_caption'];
+		$name = $key;
+
+		$value = $this->targetObject->getVar($key);
+
+		$value = $this->targetObject->getValueFor($key, true);
+
+		$editor_configs=array();
+		$editor_configs["name"] = $name;
+		$editor_configs["value"] = $value;
+		if ($form_editor != 'textarea') {
+			$editor_configs["rows"] = 35;
+			$editor_configs["cols"] = 60;
+		}
+
+		if (isset($control['rows'])) {
+			$editor_configs["rows"] = $control['rows'];
+		}
+		if (isset($control['cols'])) {
+			$editor_configs["cols"] = $control['cols'];
+		}
+
+		$editor_configs["width"] = "100%";
+		$editor_configs["height"] = "400px";
+
+		$dhtml = true;
+		$xoopseditorclass = XOOPS_ROOT_PATH . '/class/xoopsform/formeditor.php';
+
+		if (file_exists($xoopseditorclass)) {
+			include_once($xoopseditorclass);
+			$editor = new XoopsFormEditor($caption, $form_editor, $editor_configs, $nohtml = false, $onfailure = "textarea");
+		} else {
+
+			switch($form_editor) {
+
+				case 'tiny' :
+					if (!$xoops22) {
+						if ( is_readable(XOOPS_ROOT_PATH . "/class/xoopseditor/tinyeditor/formtinytextarea.php"))	{
+							include_once(XOOPS_ROOT_PATH . "/class/xoopseditor/tinyeditor/formtinytextarea.php");
+							$editor = new XoopsFormTinyTextArea(array('caption'=> $caption, 'name'=>$name, 'value'=>$value, 'width'=>'100%', 'height'=>'300px'),true);
+						} else {
+							if ($dhtml) {
+								$editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
+							} else {
+								$editor = new XoopsFormTextArea($caption, $name, $value, 7, 60);
+							}
+						}
+					} else {
+						$editor = new XoopsFormEditor($caption, "tinyeditor", $editor_configs);
+					}
+					break;
+
+				case 'dhtmltextarea' :
+				case 'dhtmltext' :
+					$editor = new XoopsFormDhtmlTextArea($var['form_caption'], $key, $this->targetObject->getVar($key, 'e'), 20, 60);
+					if ($var['form_dsc']) {
+						$editor->setDescription($var['form_dsc']);
+					}
+					break;
+
+				case 'fckeditor' :
+					if (!$xoops22) {
+						if ( is_readable(XOOPS_ROOT_PATH . "/class/xoopseditor/fckeditor/formfckeditor.php"))	{
+							include_once(XOOPS_ROOT_PATH . "/class/xoopseditor/fckeditor/formfckeditor.php");
+							$editor = new XoopsFormFckeditor(array('caption'=> $caption, 'name'=>$name, 'value'=>$value, 'width'=>'100%', 'height'=>'300px'),true);
+						} else {
+							if ($dhtml) {
+								$editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
+							} else {
+								$editor = new XoopsFormTextArea($caption, $name, $value, 7, 60);
+							}
+						}
+					} else {
+						$editor = new XoopsFormEditor($caption, "fckeditor", $editor_configs);
+					}
+					break;
+
+				case 'inbetween' :
+					if (!$xoops22) {
+						if ( is_readable(XOOPS_ROOT_PATH . "/class/xoopseditor/inbetween/forminbetweentextarea.php"))	{
+							include_once(XOOPS_ROOT_PATH . "/class/xoopseditor/inbetween/forminbetweentextarea.php");
+							$editor = new XoopsFormInbetweenTextArea(array('caption'=> $caption, 'name'=>$name, 'value'=>$value, 'width'=>'100%', 'height'=>'300px'),true);
+						} else {
+							if ($dhtml) {
+								$editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
+							} else {
+								$editor = new XoopsFormTextArea($caption, $name, $value, 7, 60);
+							}
+						}
+					} else {
+						$editor = new XoopsFormEditor($caption, "inbetween", $editor_configs);
+					}
+					break;
+
+				case 'koivi' :
+					if (!$xoops22) {
+						if ( is_readable(XOOPS_ROOT_PATH . "/class/wysiwyg/formwysiwygtextarea.php"))	{
+							include_once(XOOPS_ROOT_PATH . "/class/wysiwyg/formwysiwygtextarea.php");
+							$editor = new XoopsFormWysiwygTextArea($caption, $name, $value, '100%', '400px');
+						} else {
+							if ($dhtml) {
+								$editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
+							} else {
+								$editor = new XoopsFormTextArea($caption, $name, $value, 7, 60);
+							}
+						}
+					} else {
+						$editor = new XoopsFormEditor($caption, "koivi", $editor_configs);
+					}
+					break;
+
+				case "spaw":
+					if(!$xoops22) {
+						if (is_readable(XOOPS_ROOT_PATH . "/class/spaw/formspaw.php"))	{
+							include_once(XOOPS_ROOT_PATH . "/class/spaw/formspaw.php");
+							$editor = new XoopsFormSpaw($caption, $name, $value);
+						}
+					} else {
+						$editor = new XoopsFormEditor($caption, "spaw", $editor_configs);
+					}
+					break;
+
+				case "htmlarea":
+					if(!$xoops22) {
+						if ( is_readable(XOOPS_ROOT_PATH . "/class/htmlarea/formhtmlarea.php"))	{
+							include_once(XOOPS_ROOT_PATH . "/class/htmlarea/formhtmlarea.php");
+							$editor = new XoopsFormHtmlarea($caption, $name, $value);
+						}
+					} else {
+						$editor = new XoopsFormEditor($caption, "htmlarea", $editor_configs);
+					}
+					break;
+
+				default:
+				case 'textarea':
+					$form_rows = isset($control['rows']) ? $control['rows'] : 5;
+					$form_cols = isset($control['cols']) ? $control['cols'] : 60;
+
+					$editor = new XoopsFormTextArea($var['form_caption'], $key, $this->targetObject->getVar($key, 'e'), $form_rows, $form_cols);
+					if ($var['form_dsc']) {
+						$editor->setDescription($var['form_dsc']);
+					}
+					break;
+
+			}
+		}
+
+		return $editor;
+	}
+
+	function getThemeSelect($key, $var, $multiple=false) {
+
+		$size = $multiple ? 5 : 1;
+		$theme_select = new XoopsFormSelect($var['form_caption'], $key, $this->targetObject->getVar($key), $size, $multiple);
+
+		$handle = opendir(XOOPS_THEME_PATH.'/');
+		$dirlist = array();
+		while (false !== ($file = readdir($handle))) {
+			if (is_dir(XOOPS_THEME_PATH.'/'.$file) && !preg_match("/^[.]{1,2}$/",$file) && strtolower($file) != 'cvs') {
+				$dirlist[$file]=$file;
+			}
+		}
+		closedir($handle);
+		if (!empty($dirlist)) {
+			asort($dirlist);
+			$theme_select->addOptionArray($dirlist);
+		}
+
+		return $theme_select;
+	}
+
+	function &getElementById($keyname) {
+		foreach ($this->_elements as $eleObj) {
+			if ($eleObj->getName() == $keyname) {
+				$ret =& $eleObj;
+				break;
+			}
+		}
+		return isset($ret) ? $ret : false;
+	}
+
+	/**
+	 * create HTML to output the form as a theme-enabled table with validation.
+	 *
+	 * @return	string
+	 */
+	function render()
+	{
+		$required =& $this->getRequired();
+		$ret = "
 			<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."' onsubmit='return xoopsFormValidate_".$this->getName()."(this);'".$this->getExtra().">
 			<table width='100%' class='outer' cellspacing='1'>
 			<tr><th colspan='2'>".$this->getTitle()."</th></tr>
 		";
-        $hidden = '';
-        $class ='even';
-        foreach ( $this->getElements() as $ele ) {
-            if (!is_object($ele)) {
-                $ret .= $ele;
-            } elseif ( !$ele->isHidden() ) {
-                //$class = ( $class == 'even' ) ? 'odd' : 'even';
-                $ret .= "<tr id='" . $ele->getName() . "' valign='top' align='left'><td class='head'>".$ele->getCaption();
-                if ($ele->getDescription() != '') {
-                    $ret .= '<br /><br /><span style="font-weight: normal;">'.$ele->getDescription().'</span>';
-                }
-                $ret .= "</td><td class='$class'>".$ele->render()."</td></tr>\n";
-            } else {
-                $hidden .= $ele->render();
-            }
-        }
-        $ret .= "</table>\n$hidden\n</form>\n";
-        $ret .= $this->renderValidationJS( true );
-        return $ret;
-    }
-
-    /**
-     * assign to smarty form template instead of displaying directly
-     *
-     * @param	object  &$tpl    reference to a {@link Smarty} object
-     * @see     Smarty
-     */
-    function assign(&$tpl, $smartyName=false){
-        $i = 0;
-        $elements = array();
-        foreach ( $this->getElements() as $ele ) {
-            $n = ($ele->getName() != "") ? $ele->getName() : $i;
-            $elements[$n]['name']	  = $ele->getName();
-            $elements[$n]['caption']  = $ele->getCaption();
-            $elements[$n]['body']	  = $ele->render();
-            $elements[$n]['hidden']	  = $ele->isHidden();
-            $elements[$n]['section']  = strToLower(get_class($ele)) == strToLower('SmartFormSection');
-            $elements[$n]['section_close']  = get_class($ele) == 'SmartFormSectionClose';
-            $elements[$n]['hide'] = isset($this->targetObject->vars[$n]['hide']) ? $this->targetObject->vars[$n]['hide'] : false;
-            if ($ele->getDescription() != '') {
-                $elements[$n]['description']  = $ele->getDescription();
-            }
-            $i++;
-        }
-        $js = $this->renderValidationJS();
-        if (!$smartyName) {
-            $smartyName = $this->getName();
-        }
-
-        $tpl->assign($smartyName, array('title' => $this->getTitle(), 'name' => $this->getName(), 'action' => $this->getAction(),  'method' => $this->getMethod(), 'extra' => 'onsubmit="return xoopsFormValidate_'.$this->getName().'(this);"'.$this->getExtra(), 'javascript' => $js, 'elements' => $elements));
-    }
-
-
-    function renderValidationJS( $withtags = true ) {
-        $js = "";
-        if ( $withtags ) {
-            $js .= "\n<!-- Start Form Validation JavaScript //-->\n<script type='text/javascript'>\n<!--//\n";
-        }
-        $myts =& MyTextSanitizer::getInstance();
-        $formname = $this->getName();
-        $js .= "function xoopsFormValidate_{$formname}(myform) {";
-        // First, output code to check required elements
-        $elements = $this->getRequired();
-        foreach ( $elements as $elt ) {
-            $eltname    = $elt->getName();
-            $eltcaption = trim( $elt->getCaption() );
-            $eltmsg = empty($eltcaption) ? sprintf( _FORM_ENTER, $eltname ) : sprintf( _FORM_ENTER, $eltcaption );
-            $eltmsg = str_replace('"', '\"', stripslashes( $eltmsg ) );
-            if (strtolower(get_class($elt)) == 'xoopsformradio') {
-                $js .= "var myOption = -1;";
-                $js .= "for (i=myform.{$eltname}.length-1; i > -1; i--) {
+		$hidden = '';
+		$class ='even';
+		foreach ( $this->getElements() as $ele ) {
+			if (!is_object($ele)) {
+				$ret .= $ele;
+			} elseif ( !$ele->isHidden() ) {
+				//$class = ( $class == 'even' ) ? 'odd' : 'even';
+				$ret .= "<tr id='" . $ele->getName() . "' valign='top' align='left'><td class='head'>".$ele->getCaption();
+				if ($ele->getDescription() != '') {
+					$ret .= '<br /><br /><span style="font-weight: normal;">'.$ele->getDescription().'</span>';
+				}
+				$ret .= "</td><td class='$class'>".$ele->render()."</td></tr>\n";
+			} else {
+				$hidden .= $ele->render();
+			}
+		}
+		$ret .= "</table>\n$hidden\n</form>\n";
+		$ret .= $this->renderValidationJS( true );
+		return $ret;
+	}
+
+	/**
+	 * assign to smarty form template instead of displaying directly
+	 *
+	 * @param	object  &$tpl    reference to a {@link Smarty} object
+	 * @see     Smarty
+	 */
+	function assign(&$tpl, $smartyName=false){
+		$i = 0;
+		$elements = array();
+		foreach ( $this->getElements() as $ele ) {
+			$n = ($ele->getName() != "") ? $ele->getName() : $i;
+			$elements[$n]['name']	  = $ele->getName();
+			$elements[$n]['caption']  = $ele->getCaption();
+			$elements[$n]['body']	  = $ele->render();
+			$elements[$n]['hidden']	  = $ele->isHidden();
+			$elements[$n]['section']  = strToLower(get_class($ele)) == strToLower('SmartFormSection');
+			$elements[$n]['section_close']  = get_class($ele) == 'SmartFormSectionClose';
+			$elements[$n]['hide'] = isset($this->targetObject->vars[$n]['hide']) ? $this->targetObject->vars[$n]['hide'] : false;
+			if ($ele->getDescription() != '') {
+				$elements[$n]['description']  = $ele->getDescription();
+			}
+			$i++;
+		}
+		$js = $this->renderValidationJS();
+		if (!$smartyName) {
+			$smartyName = $this->getName();
+		}
+
+		$tpl->assign($smartyName, array('title' => $this->getTitle(), 'name' => $this->getName(), 'action' => $this->getAction(),  'method' => $this->getMethod(), 'extra' => 'onsubmit="return xoopsFormValidate_'.$this->getName().'(this);"'.$this->getExtra(), 'javascript' => $js, 'elements' => $elements));
+	}
+
+
+	function renderValidationJS( $withtags = true ) {
+		$js = "";
+		if ( $withtags ) {
+			$js .= "\n<!-- Start Form Validation JavaScript //-->\n<script type='text/javascript'>\n<!--//\n";
+		}
+		$myts =& MyTextSanitizer::getInstance();
+		$formname = $this->getName();
+		$js .= "function xoopsFormValidate_{$formname}(myform) {";
+		// First, output code to check required elements
+		$elements = $this->getRequired();
+		foreach ( $elements as $elt ) {
+			$eltname    = $elt->getName();
+			$eltcaption = trim( $elt->getCaption() );
+			$eltmsg = empty($eltcaption) ? sprintf( _FORM_ENTER, $eltname ) : sprintf( _FORM_ENTER, $eltcaption );
+			$eltmsg = str_replace('"', '\"', stripslashes( $eltmsg ) );
+			if (strtolower(get_class($elt)) == 'xoopsformradio') {
+				$js .= "var myOption = -1;";
+				$js .= "for (i=myform.{$eltname}.length-1; i > -1; i--) {
 					if (myform.{$eltname}[i].checked) {
 						myOption = i; i = -1;
 					}
@@ -728,9 +728,9 @@ 
 				if (myOption == -1) {
 					window.alert(\"{$eltmsg}\"); myform.{$eltname}[0].focus(); return false; }\n";
 
-            }elseif (strtolower(get_class($elt)) == 'smartformselect_multielement') {
-                $js .= "var hasSelections = false;";
-                $js .= "for(var i = 0; i < myform['{$eltname}[]'].length; i++){
+			}elseif (strtolower(get_class($elt)) == 'smartformselect_multielement') {
+				$js .= "var hasSelections = false;";
+				$js .= "for(var i = 0; i < myform['{$eltname}[]'].length; i++){
 					if (myform['{$eltname}[]'].options[i].selected) {
 						hasSelections = true;
 					}
@@ -739,11 +739,11 @@ 
 				if (hasSelections == false) {
 					window.alert(\"{$eltmsg}\"); myform['{$eltname}[]'].options[0].focus(); return false; }\n";
 
-            }elseif (strtolower(get_class($elt)) == 'xoopsformcheckbox' || strtolower(get_class($elt)) == 'smartformcheckelement' ) {
-                $js .= "var hasSelections = false;";
-                //sometimes, there is an implicit '[]', sometimes not
-                if(strpos($eltname, '[') === false){
-                    $js .= "for(var i = 0; i < myform['{$eltname}[]'].length; i++){
+			}elseif (strtolower(get_class($elt)) == 'xoopsformcheckbox' || strtolower(get_class($elt)) == 'smartformcheckelement' ) {
+				$js .= "var hasSelections = false;";
+				//sometimes, there is an implicit '[]', sometimes not
+				if(strpos($eltname, '[') === false){
+					$js .= "for(var i = 0; i < myform['{$eltname}[]'].length; i++){
 						if (myform['{$eltname}[]'][i].checked) {
 							hasSelections = true;
 						}
@@ -751,8 +751,8 @@ 
 					}
 					if (hasSelections == false) {
 						window.alert(\"{$eltmsg}\"); myform['{$eltname}[]'][0].focus(); return false; }\n";
-                }else{
-                    $js .= "for(var i = 0; i < myform['{$eltname}'].length; i++){
+				}else{
+					$js .= "for(var i = 0; i < myform['{$eltname}'].length; i++){
 						if (myform['{$eltname}'][i].checked) {
 							hasSelections = true;
 						}
@@ -760,27 +760,27 @@ 
 					}
 					if (hasSelections == false) {
 						window.alert(\"{$eltmsg}\"); myform['{$eltname}'][0].focus(); return false; }\n";
-                }
-
-            }else{
-                $js .= "if ( myform.{$eltname}.value == \"\" ) "
-                . "{ window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n";
-            }
-        }
-        // Now, handle custom validation code
-        $elements = $this->getElements( true );
-        foreach ( $elements as $elt ) {
-            if ( method_exists( $elt, 'renderValidationJS') && strtolower(get_class($elt)) != 'xoopsformcheckbox') {
-                if ( $eltjs = $elt->renderValidationJS() ) {
-                    $js .= $eltjs . "\n";
-                }
-            }
-        }
-        $js .= "return true;\n}\n";
-        if ( $withtags ) {
-            $js .= "//--></script>\n<!-- End Form Vaidation JavaScript //-->\n";
-        }
-        return $js;
-    }
+				}
+
+			}else{
+				$js .= "if ( myform.{$eltname}.value == \"\" ) "
+				. "{ window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n";
+			}
+		}
+		// Now, handle custom validation code
+		$elements = $this->getElements( true );
+		foreach ( $elements as $elt ) {
+			if ( method_exists( $elt, 'renderValidationJS') && strtolower(get_class($elt)) != 'xoopsformcheckbox') {
+				if ( $eltjs = $elt->renderValidationJS() ) {
+					$js .= $eltjs . "\n";
+				}
+			}
+		}
+		$js .= "return true;\n}\n";
+		if ( $withtags ) {
+			$js .= "//--></script>\n<!-- End Form Vaidation JavaScript //-->\n";
+		}
+		return $js;
+	}
 }
 ?>
\ No newline at end of file

Spacing +78 added lines, -78 removed lines

@@ -35,28 +35,28 @@ 
 
     var $targetObject = null;
     var $form_fields = null;
-    var $_cancel_js_action=false;
-    var $_custom_button=false;
-    var $_captcha=false;
-    var $_form_name=false;
-    var $_form_caption=false;
-    var $_submit_button_caption=false;
+    var $_cancel_js_action = false;
+    var $_custom_button = false;
+    var $_captcha = false;
+    var $_form_name = false;
+    var $_form_caption = false;
+    var $_submit_button_caption = false;
 
-    function SmartobjectForm(&$target, $form_name, $form_caption, $form_action, $form_fields=null, $submit_button_caption = false, $cancel_js_action=false, $captcha=false) {
+    function SmartobjectForm(&$target, $form_name, $form_caption, $form_action, $form_fields = null, $submit_button_caption = false, $cancel_js_action = false, $captcha = false) {
 
-        $this->targetObject =& $target;
+        $this->targetObject = & $target;
         $this->form_fields = $form_fields;
         $this->_cancel_js_action = $cancel_js_action;
-        $this->_captcha= $captcha;
-        $this->_form_name= $form_name;
-        $this->_form_caption= $form_caption;
-        $this->_submit_button_caption= $submit_button_caption;
+        $this->_captcha = $captcha;
+        $this->_form_name = $form_name;
+        $this->_form_caption = $form_caption;
+        $this->_submit_button_caption = $submit_button_caption;
 
         if (!isset($form_action)) {
             $form_action = xoops_getenv('PHP_SELF');
         }
 
-        $this->XoopsForm( $form_caption, $form_name, $form_action);
+        $this->XoopsForm($form_caption, $form_name, $form_action);
         $this->setExtra('enctype="multipart/form-data"');
 
         $this->createElements();
@@ -75,7 +75,7 @@ 
         $this->addElement(new XoopsFormCaptcha(), true);
     }
 
-    function addCustomButton($name, $caption, $onclick=false) {
+    function addCustomButton($name, $caption, $onclick = false) {
         $custom_button_array = array(
 						'name' => $name,
 						'caption' => $caption,
@@ -90,7 +90,7 @@ 
      * @param	object  &$formElement    reference to a {@link XoopsFormElement}
      * @param	bool    $required       is this a "required" element?
      */
-    function addElement(&$formElement, $key=false, $var=false, $required='notset'){
+    function addElement(&$formElement, $key = false, $var = false, $required = 'notset') {
         if ($key) {
             if ($this->targetObject->vars[$key]['readonly']) {
                 $formElement->setExtra('disabled="disabled"');
@@ -112,7 +112,7 @@ 
                 }
             }
             $controls = $this->targetObject->controls;
-            if(isset($controls[$key]['js'])){
+            if (isset($controls[$key]['js'])) {
                 $formElement->customValidationCode[] = $controls[$key]['js'];
             }
             parent::AddElement($formElement, $required == 'notset' ? $var['required'] : $required);
@@ -268,7 +268,7 @@ 
             $member_handler = &xoops_gethandler('member');
             $group_list = $member_handler->getGroupList();
             asort($group_list);
-            foreach($permissions as $permission) {
+            foreach ($permissions as $permission) {
                 if ($this->targetObject->isNew()) {
                     if (isset($smartModuleConfig['def_perm_' . $permission['perm_name']])) {
                         $groups_value = $smartModuleConfig['def_perm_' . $permission['perm_name']];
@@ -289,7 +289,7 @@ 
 
         $button_tray = new XoopsFormElementTray('', '');
         $button_tray->addElement(new XoopsFormHidden('op', $form_name));
-        if(!$submit_button_caption){
+        if (!$submit_button_caption) {
             if ($this->targetObject->isNew()) {
                 $butt_create = new XoopsFormButton('', 'create_button', _CO_SOBJECT_CREATE, 'submit');
             } else {
@@ -297,14 +297,14 @@ 
             }
         }
         else {
-            $butt_create = new XoopsFormButton('', 'modify_button', $submit_button_caption , 'submit');
+            $butt_create = new XoopsFormButton('', 'modify_button', $submit_button_caption, 'submit');
         }
         $butt_create->setExtra('onclick="this.form.elements.op.value=\'' . $form_name . '\'"');
         $button_tray->addElement($butt_create);
 
         //creating custom buttons
         if ($this->_custom_button) {
-            foreach($this->_custom_button as $custom_button) {
+            foreach ($this->_custom_button as $custom_button) {
                 $butt_custom = new XoopsFormButton('', $custom_button['name'], $custom_button['caption'], 'submit');
                 if ($custom_button['onclick']) {
                     $butt_custom->setExtra('onclick="' . $custom_button['onclick'] . '"');
@@ -329,7 +329,7 @@ 
     function getControl($controlName, $key) {
         switch ($controlName) {
             case 'check':
-                include_once(SMARTOBJECT_ROOT_PATH."class/form/elements/smartformcheckelement.php");
+                include_once(SMARTOBJECT_ROOT_PATH . "class/form/elements/smartformcheckelement.php");
                 $control = $this->targetObject->getControl($key);
                 $controlObj = new SmartFormCheckElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
                 $controlObj->addOptionArray($control['options']);
@@ -393,36 +393,36 @@ 
                 break;
 
             case 'urllink':
-                include_once(SMARTOBJECT_ROOT_PATH."class/form/elements/smartformurllinkelement.php");
+                include_once(SMARTOBJECT_ROOT_PATH . "class/form/elements/smartformurllinkelement.php");
                 return new SmartFormUrlLinkElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getUrlLinkObj($key));
                 break;
 
             case 'richfile':
-                include_once(SMARTOBJECT_ROOT_PATH."class/form/elements/smartformrichfileelement.php");
+                include_once(SMARTOBJECT_ROOT_PATH . "class/form/elements/smartformrichfileelement.php");
                 return new SmartFormRichFileElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getFileObj($key));
                 break;
             case 'section':
-                include_once(SMARTOBJECT_ROOT_PATH."class/form/elements/smartformsection.php");
+                include_once(SMARTOBJECT_ROOT_PATH . "class/form/elements/smartformsection.php");
                 return new SmartFormSection($key, $this->targetObject->vars[$key]['form_caption']);
                 break;
 
 
             default:
-                $classname = "SmartForm".ucfirst($controlName)."Element";
+                $classname = "SmartForm" . ucfirst($controlName) . "Element";
                 if (!class_exists($classname)) {
-                    if (file_exists(SMARTOBJECT_ROOT_PATH."class/form/elements/".strtolower($classname).".php")) {
-                        include_once(SMARTOBJECT_ROOT_PATH."class/form/elements/".strtolower($classname).".php");
+                    if (file_exists(SMARTOBJECT_ROOT_PATH . "class/form/elements/" . strtolower($classname) . ".php")) {
+                        include_once(SMARTOBJECT_ROOT_PATH . "class/form/elements/" . strtolower($classname) . ".php");
                     } else {
                         // perhaps this is a control created by the module
                         $moduleName = $this->targetObject->handler->_moduleName;
                         $moduleFormElementsPath = $this->targetObject->handler->_modulePath . 'class/form/elements/';
                         $classname = ucfirst($moduleName) . ucfirst($controlName) . "Element";
-                        $classFileName = strtolower($classname).".php";
+                        $classFileName = strtolower($classname) . ".php";
 
                         if (file_exists($moduleFormElementsPath . $classFileName)) {
                             include_once($moduleFormElementsPath . $classFileName);
                         } else {
-                            trigger_error($classname." Not found", E_USER_WARNING);
+                            trigger_error($classname . " Not found", E_USER_WARNING);
                             return new XoopsFormLabel(); //Empty object
                         }
                     }
@@ -463,7 +463,7 @@ 
 
         $value = $this->targetObject->getValueFor($key, true);
 
-        $editor_configs=array();
+        $editor_configs = array();
         $editor_configs["name"] = $name;
         $editor_configs["value"] = $value;
         if ($form_editor != 'textarea') {
@@ -489,13 +489,13 @@ 
             $editor = new XoopsFormEditor($caption, $form_editor, $editor_configs, $nohtml = false, $onfailure = "textarea");
         } else {
 
-            switch($form_editor) {
+            switch ($form_editor) {
 
                 case 'tiny' :
                     if (!$xoops22) {
-                        if ( is_readable(XOOPS_ROOT_PATH . "/class/xoopseditor/tinyeditor/formtinytextarea.php"))	{
+                        if (is_readable(XOOPS_ROOT_PATH . "/class/xoopseditor/tinyeditor/formtinytextarea.php")) {
                             include_once(XOOPS_ROOT_PATH . "/class/xoopseditor/tinyeditor/formtinytextarea.php");
-                            $editor = new XoopsFormTinyTextArea(array('caption'=> $caption, 'name'=>$name, 'value'=>$value, 'width'=>'100%', 'height'=>'300px'),true);
+                            $editor = new XoopsFormTinyTextArea(array('caption'=> $caption, 'name'=>$name, 'value'=>$value, 'width'=>'100%', 'height'=>'300px'), true);
                         } else {
                             if ($dhtml) {
                                 $editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
@@ -518,9 +518,9 @@ 
 
                 case 'fckeditor' :
                     if (!$xoops22) {
-                        if ( is_readable(XOOPS_ROOT_PATH . "/class/xoopseditor/fckeditor/formfckeditor.php"))	{
+                        if (is_readable(XOOPS_ROOT_PATH . "/class/xoopseditor/fckeditor/formfckeditor.php")) {
                             include_once(XOOPS_ROOT_PATH . "/class/xoopseditor/fckeditor/formfckeditor.php");
-                            $editor = new XoopsFormFckeditor(array('caption'=> $caption, 'name'=>$name, 'value'=>$value, 'width'=>'100%', 'height'=>'300px'),true);
+                            $editor = new XoopsFormFckeditor(array('caption'=> $caption, 'name'=>$name, 'value'=>$value, 'width'=>'100%', 'height'=>'300px'), true);
                         } else {
                             if ($dhtml) {
                                 $editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
@@ -535,9 +535,9 @@ 
 
                 case 'inbetween' :
                     if (!$xoops22) {
-                        if ( is_readable(XOOPS_ROOT_PATH . "/class/xoopseditor/inbetween/forminbetweentextarea.php"))	{
+                        if (is_readable(XOOPS_ROOT_PATH . "/class/xoopseditor/inbetween/forminbetweentextarea.php")) {
                             include_once(XOOPS_ROOT_PATH . "/class/xoopseditor/inbetween/forminbetweentextarea.php");
-                            $editor = new XoopsFormInbetweenTextArea(array('caption'=> $caption, 'name'=>$name, 'value'=>$value, 'width'=>'100%', 'height'=>'300px'),true);
+                            $editor = new XoopsFormInbetweenTextArea(array('caption'=> $caption, 'name'=>$name, 'value'=>$value, 'width'=>'100%', 'height'=>'300px'), true);
                         } else {
                             if ($dhtml) {
                                 $editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
@@ -552,7 +552,7 @@ 
 
                 case 'koivi' :
                     if (!$xoops22) {
-                        if ( is_readable(XOOPS_ROOT_PATH . "/class/wysiwyg/formwysiwygtextarea.php"))	{
+                        if (is_readable(XOOPS_ROOT_PATH . "/class/wysiwyg/formwysiwygtextarea.php")) {
                             include_once(XOOPS_ROOT_PATH . "/class/wysiwyg/formwysiwygtextarea.php");
                             $editor = new XoopsFormWysiwygTextArea($caption, $name, $value, '100%', '400px');
                         } else {
@@ -568,8 +568,8 @@ 
                     break;
 
                 case "spaw":
-                    if(!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . "/class/spaw/formspaw.php"))	{
+                    if (!$xoops22) {
+                        if (is_readable(XOOPS_ROOT_PATH . "/class/spaw/formspaw.php")) {
                             include_once(XOOPS_ROOT_PATH . "/class/spaw/formspaw.php");
                             $editor = new XoopsFormSpaw($caption, $name, $value);
                         }
@@ -579,8 +579,8 @@ 
                     break;
 
                 case "htmlarea":
-                    if(!$xoops22) {
-                        if ( is_readable(XOOPS_ROOT_PATH . "/class/htmlarea/formhtmlarea.php"))	{
+                    if (!$xoops22) {
+                        if (is_readable(XOOPS_ROOT_PATH . "/class/htmlarea/formhtmlarea.php")) {
                             include_once(XOOPS_ROOT_PATH . "/class/htmlarea/formhtmlarea.php");
                             $editor = new XoopsFormHtmlarea($caption, $name, $value);
                         }
@@ -606,16 +606,16 @@ 
         return $editor;
     }
 
-    function getThemeSelect($key, $var, $multiple=false) {
+    function getThemeSelect($key, $var, $multiple = false) {
 
         $size = $multiple ? 5 : 1;
         $theme_select = new XoopsFormSelect($var['form_caption'], $key, $this->targetObject->getVar($key), $size, $multiple);
 
-        $handle = opendir(XOOPS_THEME_PATH.'/');
+        $handle = opendir(XOOPS_THEME_PATH . '/');
         $dirlist = array();
         while (false !== ($file = readdir($handle))) {
-            if (is_dir(XOOPS_THEME_PATH.'/'.$file) && !preg_match("/^[.]{1,2}$/",$file) && strtolower($file) != 'cvs') {
-                $dirlist[$file]=$file;
+            if (is_dir(XOOPS_THEME_PATH . '/' . $file) && !preg_match("/^[.]{1,2}$/", $file) && strtolower($file) != 'cvs') {
+                $dirlist[$file] = $file;
             }
         }
         closedir($handle);
@@ -630,7 +630,7 @@ 
     function &getElementById($keyname) {
         foreach ($this->_elements as $eleObj) {
             if ($eleObj->getName() == $keyname) {
-                $ret =& $eleObj;
+                $ret = & $eleObj;
                 break;
             }
         }
@@ -644,30 +644,30 @@ 
      */
     function render()
     {
-        $required =& $this->getRequired();
+        $required = & $this->getRequired();
         $ret = "
-			<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."' onsubmit='return xoopsFormValidate_".$this->getName()."(this);'".$this->getExtra().">
+			<form name='".$this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "' onsubmit='return xoopsFormValidate_" . $this->getName() . "(this);'" . $this->getExtra() . ">
 			<table width='100%' class='outer' cellspacing='1'>
-			<tr><th colspan='2'>".$this->getTitle()."</th></tr>
+			<tr><th colspan='2'>".$this->getTitle() . "</th></tr>
 		";
         $hidden = '';
-        $class ='even';
-        foreach ( $this->getElements() as $ele ) {
+        $class = 'even';
+        foreach ($this->getElements() as $ele) {
             if (!is_object($ele)) {
                 $ret .= $ele;
-            } elseif ( !$ele->isHidden() ) {
+            } elseif (!$ele->isHidden()) {
                 //$class = ( $class == 'even' ) ? 'odd' : 'even';
-                $ret .= "<tr id='" . $ele->getName() . "' valign='top' align='left'><td class='head'>".$ele->getCaption();
+                $ret .= "<tr id='" . $ele->getName() . "' valign='top' align='left'><td class='head'>" . $ele->getCaption();
                 if ($ele->getDescription() != '') {
-                    $ret .= '<br /><br /><span style="font-weight: normal;">'.$ele->getDescription().'</span>';
+                    $ret .= '<br /><br /><span style="font-weight: normal;">' . $ele->getDescription() . '</span>';
                 }
-                $ret .= "</td><td class='$class'>".$ele->render()."</td></tr>\n";
+                $ret .= "</td><td class='$class'>" . $ele->render() . "</td></tr>\n";
             } else {
                 $hidden .= $ele->render();
             }
         }
         $ret .= "</table>\n$hidden\n</form>\n";
-        $ret .= $this->renderValidationJS( true );
+        $ret .= $this->renderValidationJS(true);
         return $ret;
     }
 
@@ -677,20 +677,20 @@ 
      * @param	object  &$tpl    reference to a {@link Smarty} object
      * @see     Smarty
      */
-    function assign(&$tpl, $smartyName=false){
+    function assign(&$tpl, $smartyName = false) {
         $i = 0;
         $elements = array();
-        foreach ( $this->getElements() as $ele ) {
+        foreach ($this->getElements() as $ele) {
             $n = ($ele->getName() != "") ? $ele->getName() : $i;
             $elements[$n]['name']	  = $ele->getName();
             $elements[$n]['caption']  = $ele->getCaption();
             $elements[$n]['body']	  = $ele->render();
             $elements[$n]['hidden']	  = $ele->isHidden();
             $elements[$n]['section']  = strToLower(get_class($ele)) == strToLower('SmartFormSection');
-            $elements[$n]['section_close']  = get_class($ele) == 'SmartFormSectionClose';
+            $elements[$n]['section_close'] = get_class($ele) == 'SmartFormSectionClose';
             $elements[$n]['hide'] = isset($this->targetObject->vars[$n]['hide']) ? $this->targetObject->vars[$n]['hide'] : false;
             if ($ele->getDescription() != '') {
-                $elements[$n]['description']  = $ele->getDescription();
+                $elements[$n]['description'] = $ele->getDescription();
             }
             $i++;
         }
@@ -699,25 +699,25 @@ 
             $smartyName = $this->getName();
         }
 
-        $tpl->assign($smartyName, array('title' => $this->getTitle(), 'name' => $this->getName(), 'action' => $this->getAction(),  'method' => $this->getMethod(), 'extra' => 'onsubmit="return xoopsFormValidate_'.$this->getName().'(this);"'.$this->getExtra(), 'javascript' => $js, 'elements' => $elements));
+        $tpl->assign($smartyName, array('title' => $this->getTitle(), 'name' => $this->getName(), 'action' => $this->getAction(), 'method' => $this->getMethod(), 'extra' => 'onsubmit="return xoopsFormValidate_' . $this->getName() . '(this);"' . $this->getExtra(), 'javascript' => $js, 'elements' => $elements));
     }
 
 
-    function renderValidationJS( $withtags = true ) {
+    function renderValidationJS($withtags = true) {
         $js = "";
-        if ( $withtags ) {
+        if ($withtags) {
             $js .= "\n<!-- Start Form Validation JavaScript //-->\n<script type='text/javascript'>\n<!--//\n";
         }
-        $myts =& MyTextSanitizer::getInstance();
+        $myts = & MyTextSanitizer::getInstance();
         $formname = $this->getName();
         $js .= "function xoopsFormValidate_{$formname}(myform) {";
         // First, output code to check required elements
         $elements = $this->getRequired();
-        foreach ( $elements as $elt ) {
+        foreach ($elements as $elt) {
             $eltname    = $elt->getName();
-            $eltcaption = trim( $elt->getCaption() );
-            $eltmsg = empty($eltcaption) ? sprintf( _FORM_ENTER, $eltname ) : sprintf( _FORM_ENTER, $eltcaption );
-            $eltmsg = str_replace('"', '\"', stripslashes( $eltmsg ) );
+            $eltcaption = trim($elt->getCaption());
+            $eltmsg = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
+            $eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
             if (strtolower(get_class($elt)) == 'xoopsformradio') {
                 $js .= "var myOption = -1;";
                 $js .= "for (i=myform.{$eltname}.length-1; i > -1; i--) {
@@ -739,10 +739,10 @@ 
 				if (hasSelections == false) {
 					window.alert(\"{$eltmsg}\"); myform['{$eltname}[]'].options[0].focus(); return false; }\n";
 
-            }elseif (strtolower(get_class($elt)) == 'xoopsformcheckbox' || strtolower(get_class($elt)) == 'smartformcheckelement' ) {
+            }elseif (strtolower(get_class($elt)) == 'xoopsformcheckbox' || strtolower(get_class($elt)) == 'smartformcheckelement') {
                 $js .= "var hasSelections = false;";
                 //sometimes, there is an implicit '[]', sometimes not
-                if(strpos($eltname, '[') === false){
+                if (strpos($eltname, '[') === false) {
                     $js .= "for(var i = 0; i < myform['{$eltname}[]'].length; i++){
 						if (myform['{$eltname}[]'][i].checked) {
 							hasSelections = true;
@@ -751,7 +751,7 @@ 
 					}
 					if (hasSelections == false) {
 						window.alert(\"{$eltmsg}\"); myform['{$eltname}[]'][0].focus(); return false; }\n";
-                }else{
+                } else {
                     $js .= "for(var i = 0; i < myform['{$eltname}'].length; i++){
 						if (myform['{$eltname}'][i].checked) {
 							hasSelections = true;
@@ -762,22 +762,22 @@ 
 						window.alert(\"{$eltmsg}\"); myform['{$eltname}'][0].focus(); return false; }\n";
                 }
 
-            }else{
+            } else {
                 $js .= "if ( myform.{$eltname}.value == \"\" ) "
                 . "{ window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n";
             }
         }
         // Now, handle custom validation code
-        $elements = $this->getElements( true );
-        foreach ( $elements as $elt ) {
-            if ( method_exists( $elt, 'renderValidationJS') && strtolower(get_class($elt)) != 'xoopsformcheckbox') {
-                if ( $eltjs = $elt->renderValidationJS() ) {
+        $elements = $this->getElements(true);
+        foreach ($elements as $elt) {
+            if (method_exists($elt, 'renderValidationJS') && strtolower(get_class($elt)) != 'xoopsformcheckbox') {
+                if ($eltjs = $elt->renderValidationJS()) {
                     $js .= $eltjs . "\n";
                 }
             }
         }
         $js .= "return true;\n}\n";
-        if ( $withtags ) {
+        if ($withtags) {
             $js .= "//--></script>\n<!-- End Form Vaidation JavaScript //-->\n";
         }
         return $js;

Braces +5 added lines, -6 removed lines

@@ -295,8 +295,7 @@ 
             } else {
                 $butt_create = new XoopsFormButton('', 'modify_button', _CO_SOBJECT_MODIFY, 'submit');
             }
-        }
-        else {
+        } else {
             $butt_create = new XoopsFormButton('', 'modify_button', $submit_button_caption , 'submit');
         }
         $butt_create->setExtra('onclick="this.form.elements.op.value=\'' . $form_name . '\'"');
@@ -728,7 +727,7 @@ 
 				if (myOption == -1) {
 					window.alert(\"{$eltmsg}\"); myform.{$eltname}[0].focus(); return false; }\n";
 
-            }elseif (strtolower(get_class($elt)) == 'smartformselect_multielement') {
+            } elseif (strtolower(get_class($elt)) == 'smartformselect_multielement') {
                 $js .= "var hasSelections = false;";
                 $js .= "for(var i = 0; i < myform['{$eltname}[]'].length; i++){
 					if (myform['{$eltname}[]'].options[i].selected) {
@@ -739,7 +738,7 @@ 
 				if (hasSelections == false) {
 					window.alert(\"{$eltmsg}\"); myform['{$eltname}[]'].options[0].focus(); return false; }\n";
 
-            }elseif (strtolower(get_class($elt)) == 'xoopsformcheckbox' || strtolower(get_class($elt)) == 'smartformcheckelement' ) {
+            } elseif (strtolower(get_class($elt)) == 'xoopsformcheckbox' || strtolower(get_class($elt)) == 'smartformcheckelement' ) {
                 $js .= "var hasSelections = false;";
                 //sometimes, there is an implicit '[]', sometimes not
                 if(strpos($eltname, '[') === false){
@@ -751,7 +750,7 @@ 
 					}
 					if (hasSelections == false) {
 						window.alert(\"{$eltmsg}\"); myform['{$eltname}[]'][0].focus(); return false; }\n";
-                }else{
+                } else{
                     $js .= "for(var i = 0; i < myform['{$eltname}'].length; i++){
 						if (myform['{$eltname}'][i].checked) {
 							hasSelections = true;
@@ -762,7 +761,7 @@ 
 						window.alert(\"{$eltmsg}\"); myform['{$eltname}'][0].focus(); return false; }\n";
                 }
 
-            }else{
+            } else{
                 $js .= "if ( myform.{$eltname}.value == \"\" ) "
                 . "{ window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n";
             }

class/rating.php

Doc Comments +3 added lines

@@ -65,6 +65,9 @@
         						'method' => 'getRateList'));
     }
 
+    /**
+     * @param string $key
+     */
     function getVar($key, $format = 's') {
         if ($format == 's' && in_array($key, array('name', 'dirname'))) {
             return call_user_func(array($this,$key));

Indentation +55 added lines, -55 removed lines

@@ -28,7 +28,7 @@ 
 // -------------------------------------------------------------------------//
 
 if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
+	die("XOOPS root path not defined");
 }
 
 include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobject.php";
@@ -38,8 +38,8 @@ 
 
 	var $_modulePlugin=false;
 
-    function SmartobjectRating() {
-        $this->quickInitVar('ratingid', XOBJ_DTYPE_INT, true);
+	function SmartobjectRating() {
+		$this->quickInitVar('ratingid', XOBJ_DTYPE_INT, true);
 		$this->quickInitVar('dirname', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_DIRNAME);
 		$this->quickInitVar('item', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_ITEM);
 		$this->quickInitVar('itemid', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_ITEMID);
@@ -49,47 +49,47 @@ 
 
 		$this->initNonPersistableVar('name', XOBJ_DTYPE_TXTBOX, 'user', _CO_SOBJECT_RATING_NAME);
 
-        $this->setControl('dirname', array(
-        						'handler' => 'rating',
-        						'method' => 'getModuleList',
+		$this->setControl('dirname', array(
+								'handler' => 'rating',
+								'method' => 'getModuleList',
 								'onSelect' => 'submit'));
 
-        $this->setControl('item', array(
-        						'object' => &$this,
-        						'method' => 'getItemList'));
+		$this->setControl('item', array(
+								'object' => &$this,
+								'method' => 'getItemList'));
 
-        $this->setControl('uid', 'user');
+		$this->setControl('uid', 'user');
 
-        $this->setControl('rate', array(
-        						'handler' => 'rating',
-        						'method' => 'getRateList'));
-    }
+		$this->setControl('rate', array(
+								'handler' => 'rating',
+								'method' => 'getRateList'));
+	}
 
-    function getVar($key, $format = 's') {
-        if ($format == 's' && in_array($key, array('name', 'dirname'))) {
-            return call_user_func(array($this,$key));
-        }
-        return parent::getVar($key, $format);
-    }
+	function getVar($key, $format = 's') {
+		if ($format == 's' && in_array($key, array('name', 'dirname'))) {
+			return call_user_func(array($this,$key));
+		}
+		return parent::getVar($key, $format);
+	}
 
-    function name() {
-        $ret = smart_getLinkedUnameFromId($this->getVar('uid', 'e'), true, array());
+	function name() {
+		$ret = smart_getLinkedUnameFromId($this->getVar('uid', 'e'), true, array());
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    function dirname() {
-    	global $smartobject_rating_handler;
-    	$moduleArray = $smartobject_rating_handler->getModuleList();
-        return $moduleArray[$this->getVar('dirname', 'n')];
-    }
+	function dirname() {
+		global $smartobject_rating_handler;
+		$moduleArray = $smartobject_rating_handler->getModuleList();
+		return $moduleArray[$this->getVar('dirname', 'n')];
+	}
 
-    function getItemList() {
-    	$plugin = $this->getModulePlugin();
-    	return $plugin->getItemList();
-    }
+	function getItemList() {
+		$plugin = $this->getModulePlugin();
+		return $plugin->getItemList();
+	}
 
-    function getItemValue() {
+	function getItemValue() {
 		$moduleUrl = XOOPS_URL . '/modules/' . $this->getVar('dirname', 'n') . '/';
 		$plugin = $this->getModulePlugin();
 		$pluginItemInfo = $plugin->getItemInfo($this->getVar('item'));
@@ -99,19 +99,19 @@ 
 		$itemPath = sprintf($pluginItemInfo['url'], $this->getVar('itemid'));
 		$ret = '<a href="' . $moduleUrl . $itemPath . '">' . $pluginItemInfo['caption'] . '</a>';
 		return $ret;
-    }
+	}
 
-    function getRateValue() {
-    	return $this->getVar('rate');
-    }
+	function getRateValue() {
+		return $this->getVar('rate');
+	}
 
-    function getModulePlugin() {
+	function getModulePlugin() {
 		if (!$this->_modulePlugin) {
 			global $smartobject_rating_handler;
 			$this->_modulePlugin = $smartobject_rating_handler->pluginsObject->getPlugin($this->getVar('dirname', 'n'));
 		}
 		return $this->_modulePlugin;
-    }
+	}
 }
 class SmartobjectRatingHandler extends SmartPersistableObjectHandler {
 
@@ -119,18 +119,18 @@ 
 	var $_moduleList=false;
 	var $pluginsObject;
 
-    function SmartobjectRatingHandler($db) {
-        $this->SmartPersistableObjectHandler($db, 'rating', 'ratingid', 'rate', '', 'smartobject');
+	function SmartobjectRatingHandler($db) {
+		$this->SmartPersistableObjectHandler($db, 'rating', 'ratingid', 'rate', '', 'smartobject');
 		$this->generalSQL = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->db->prefix('users') . ' AS user ON ' . $this->_itemname . '.uid=user.uid';
 
-        $this->_rateOptions[1] = 1;
-        $this->_rateOptions[2] = 2;
-        $this->_rateOptions[3] = 3;
-        $this->_rateOptions[4] = 4;
-        $this->_rateOptions[5] = 5;
+		$this->_rateOptions[1] = 1;
+		$this->_rateOptions[2] = 2;
+		$this->_rateOptions[3] = 3;
+		$this->_rateOptions[4] = 4;
+		$this->_rateOptions[5] = 5;
 
-        $this->pluginsObject = new SmartPluginHandler();
-    }
+		$this->pluginsObject = new SmartPluginHandler();
+	}
 
 	function getModuleList() {
 		if (!$this->_moduleList) {
@@ -151,12 +151,12 @@ 
 		$sql = "SELECT AVG(rate), COUNT(ratingid) FROM " . $this->table . " WHERE itemid=$itemid AND dirname='$dirname' AND item='$item' GROUP BY itemid";
 		$result = $this->db->query($sql);
 		if (!$result) {
-            return 0;
-        }
-        list($average, $sum) = $this->db->fetchRow($result);
-        $ret['average'] = isset($average) ? $average : 0;
-        $ret['sum'] = isset($sum) ? $sum : 0;
-        return $ret;
+			return 0;
+		}
+		list($average, $sum) = $this->db->fetchRow($result);
+		$ret['average'] = isset($average) ? $average : 0;
+		$ret['sum'] = isset($sum) ? $sum : 0;
+		return $ret;
 	}
 	function already_rated($item, $itemid, $dirname, $uid){
 

Spacing +11 added lines, -11 removed lines

@@ -31,12 +31,12 @@ 
     die("XOOPS root path not defined");
 }
 
-include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobject.php";
-include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartplugins.php";
+include_once XOOPS_ROOT_PATH . "/modules/smartobject/class/smartobject.php";
+include_once XOOPS_ROOT_PATH . "/modules/smartobject/class/smartplugins.php";
 
 class SmartobjectRating extends SmartObject {
 
-	var $_modulePlugin=false;
+	var $_modulePlugin = false;
 
     function SmartobjectRating() {
         $this->quickInitVar('ratingid', XOBJ_DTYPE_INT, true);
@@ -67,7 +67,7 @@ 
 
     function getVar($key, $format = 's') {
         if ($format == 's' && in_array($key, array('name', 'dirname'))) {
-            return call_user_func(array($this,$key));
+            return call_user_func(array($this, $key));
         }
         return parent::getVar($key, $format);
     }
@@ -115,8 +115,8 @@ 
 }
 class SmartobjectRatingHandler extends SmartPersistableObjectHandler {
 
-	var $_rateOptions=array();
-	var $_moduleList=false;
+	var $_rateOptions = array();
+	var $_moduleList = false;
 	var $pluginsObject;
 
     function SmartobjectRatingHandler($db) {
@@ -158,19 +158,19 @@ 
         $ret['sum'] = isset($sum) ? $sum : 0;
         return $ret;
 	}
-	function already_rated($item, $itemid, $dirname, $uid){
+	function already_rated($item, $itemid, $dirname, $uid) {
 
 		$criteria = new CriteriaCompo();
-		$criteria->add(new Criteria('item',$item ));
-		$criteria->add(new Criteria('itemid',$itemid ));
+		$criteria->add(new Criteria('item', $item));
+		$criteria->add(new Criteria('itemid', $itemid));
 		$criteria->add(new Criteria('dirname', $dirname));
 		$criteria->add(new Criteria('user.uid', $uid));
 
 		$ret = $this->getObjects($criteria);
 
-		if(!$ret){
+		if (!$ret) {
 			return false;
-		}else{
+		} else {
 			return $ret[0];
 		}
 

Braces +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 
 		if(!$ret){
 			return false;
-		}else{
+		} else{
 			return $ret[0];
 		}
 

class/smartdbupdater.php

Doc Comments +8 added lines, -1 removed lines

@@ -129,6 +129,10 @@ 
         }
         return $fields;
     }
+
+    /**
+     * @param string $field
+     */
     function fieldExists($field) {
         $existingFields = $this->getExistingFieldsArray();
         return isset ($existingFields[$field]);
@@ -541,7 +545,7 @@ 
     /**
      * Use to update a table
      *
-     * @param object $table {@link SmartDbTable} that will be updated
+     * @param SmartDbTable $table {@link SmartDbTable} that will be updated
      *
      * @see SmartDbTable
      *
@@ -601,6 +605,9 @@ 
         return $ret;
     }
 
+    /**
+     * @return string
+     */
     function getFieldDefaultFromVar($var, $key = false) {
         if ($var['value']) {
             return $var['value'];

Indentation +730 added lines, -730 removed lines

@@ -1,756 +1,756 @@
 <?php
 /**
- * Contains the classes for updating database tables
- *
- * @license GNU
- * @author marcan <marcan@smartfactory.ca>
- * @version $Id: smartdbupdater.php 799 2008-02-04 22:14:27Z malanciault $
- * @link http://www.smartfactory.ca The SmartFactory
- * @package SmartObject
- */
+	 * Contains the classes for updating database tables
+	 *
+	 * @license GNU
+	 * @author marcan <marcan@smartfactory.ca>
+	 * @version $Id: smartdbupdater.php 799 2008-02-04 22:14:27Z malanciault $
+	 * @link http://www.smartfactory.ca The SmartFactory
+	 * @package SmartObject
+	 */
 /**
- * SmartDbTable class
- *
- * Information about an individual table
- *
- * @package SmartObject
- * @author marcan <marcan@smartfactory.ca>
- * @link http://www.smartfactory.ca The SmartFactory
- */
+	 * SmartDbTable class
+	 *
+	 * Information about an individual table
+	 *
+	 * @package SmartObject
+	 * @author marcan <marcan@smartfactory.ca>
+	 * @link http://www.smartfactory.ca The SmartFactory
+	 */
 if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
+	die("XOOPS root path not defined");
 }
 if (!defined("SMARTOBJECT_ROOT_PATH")) {
-    include_once (XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
+	include_once (XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
 }
 /**
- * Include the language constants for the SmartObjectDBUpdater
- */
+	 * Include the language constants for the SmartObjectDBUpdater
+	 */
 global $xoopsConfig;
 $common_file = SMARTOBJECT_ROOT_PATH . "language/" . $xoopsConfig['language'] . "/smartdbupdater.php";
 if (!file_exists($common_file)) {
-    $common_file = SMARTOBJECT_ROOT_PATH . "language/english/smartdbupdater.php";
+	$common_file = SMARTOBJECT_ROOT_PATH . "language/english/smartdbupdater.php";
 }
 include ($common_file);
 class SmartDbTable {
-    /**
-     * @var string $_name name of the table
-     */
-    var $_name;
-    /**
-     * @var string $_structure structure of the table
-     */
-    var $_structure;
-
-    /**
-     * @var array $_data containing valued of each records to be added
-     */
-    var $_data;
-
-    /**
-     * @var array $_alteredFields containing fields to be altered
-     */
-    var $_alteredFields;
-
-    /**
-     * @var array $_newFields containing new fields to be added
-     */
-    var $_newFields;
-
-    /**
-     * @var array $_dropedFields containing fields to be droped
-     */
-    var $_dropedFields;
-
-    /**
-     * @var array $_flagForDrop flag table to drop it
-     */
-    var $_flagForDrop = false;
-
-    /**
-     * @var array $_updatedFields containing fields which values will be updated
-     */
-    var $_updatedFields;
-
-    /**
-     * @var array $_updatedFields containing fields which values will be updated
-     */ //felix
-    var $_updatedWhere;
-
-    var $_existingFieldsArray=false;
-
-    /**
-     * Constructor
-     *
-     * @param string $name name of the table
-     *
-     */
-    function SmartDbTable($name) {
-        $this->_name = $name;
-        $this->_data = array ();
-    }
-
-    /**
-     * Return the table name, prefixed with site table prefix
-     *
-     * @return string table name
-     *
-     */
-    function name() {
-        global $xoopsDB;
-        return $xoopsDB->prefix($this->_name);
-    }
-
-    /**
-     * Checks if the table already exists in the database
-     *
-     * @return bool TRUE if it exists, FALSE if not
-     *
-     */
-    function exists() {
-        return smart_TableExists($this->_name);
-    }
-
-    function getExistingFieldsArray() {
-
-        global $xoopsDB;
-        $result = $xoopsDB->query("SHOW COLUMNS FROM " . $this->name());
-        while ($existing_field = $xoopsDB->fetchArray($result)) {
-            $fields[$existing_field['Field']] = $existing_field['Type'];
-            if ($existing_field['Null'] != "YES") {
-                $fields[$existing_field['Field']] .= " NOT NULL";
-            }
-            if ($existing_field['Extra']) {
-                $fields[$existing_field['Field']] .= " " . $existing_field['Extra'];
-            }
-            if (!($existing_field['Default'] === NULL) && ($existing_field['Default'] || $existing_field['Default'] == '' || $existing_field['Default'] == 0)) {
-                $fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
-            }
-        }
-        return $fields;
-    }
-    function fieldExists($field) {
-        $existingFields = $this->getExistingFieldsArray();
-        return isset ($existingFields[$field]);
-    }
-    /**
-     * Set the table structure
-     *
-     * Example :
-     *
-     *     	$table->setStructure("`transactionid` int(11) NOT NULL auto_increment,
-     * 				  `date` int(11) NOT NULL default '0',
-     * 				  `status` int(1) NOT NULL default '-1',
-     * 				  `itemid` int(11) NOT NULL default '0',
-     * 				  `uid` int(11) NOT NULL default '0',
-     * 				  `price` float NOT NULL default '0',
-     * 				  `currency` varchar(100) NOT NULL default '',
-     * 				  PRIMARY KEY  (`transactionid`)");
-     *
-     * @param  string $structure table structure
-     *
-     */
-    function setStructure($structure) {
-        $this->_structure = $structure;
-    }
-    /**
-     * Return the table structure
-     *
-     * @return string table structure
-     *
-     */
-    function getStructure() {
-        return sprintf($this->_structure, $this->name());
-    }
-    /**
-     * Add values of a record to be added
-     *
-     * @param string $data values of a record
-     *
-     */
-    function setData($data) {
-        $this->_data[] = $data;
-    }
-
-    /**
-     * Get the data array
-     *
-     * @return array containing the records values to be added
-     *
-     */
-    function getData() {
-        return $this->_data;
-    }
-    /**
-     * Use to insert data in a table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    function addData() {
-        global $xoopsDB;
-        foreach ($this->getData() as $data) {
-            $query = sprintf('INSERT INTO %s VALUES (%s)', $this->name(), $data);
-            $ret = $xoopsDB->query($query);
-            if (!$ret) {
-                echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . "<br />";
-            } else {
-                echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . "<br />";
-            }
-        }
-        return $ret;
-    }
-    /**
-     * Add a field to be added
-     *
-     * @param string $name name of the field
-     * @param string $properties properties of the field
-     *
-     */
-    function addAlteredField($name, $properties, $newname=false, $showerror = true) {
-        $field['name'] = $name;
-        $field['properties'] = $properties;
-        $field['showerror'] = $showerror;
-        $field['newname'] = $newname;
-        $this->_alteredFields[] = $field;
-    }
-    /**
-     * Invert values 0 to 1 and 1 to 0
-     *
-     * @param string $name name of the field
-     * @param string $old old propertie
-     * @param string $new new propertie
-     *
-     */ //felix
-    function addUpdatedWhere($name, $newValue, $oldValue) {
-        $field['name'] = $name;
-        $field['value'] = $newValue;
-        $field['where'] = $oldValue;
-        $this->_updatedWhere[] = $field;
-    }
-    /**
-     * Add new field of a record to be added
-     *
-     * @param string $name name of the field
-     * @param string $properties properties of the field
-     *
-     */
-    function addNewField($name, $properties) {
-        $field['name'] = $name;
-        $field['properties'] = $properties;
-        $this->_newFields[] = $field;
-    }
-    /**
-     * Get fields that need to be altered
-     *
-     * @return array fields that need to be altered
-     *
-     */
-    function getAlteredFields() {
-        return $this->_alteredFields;
-    }
-    /**
-     * Add field for which the value will be updated
-     *
-     * @param string $name name of the field
-     * @param string $value value to be set
-     *
-     */
-    function addUpdatedField($name, $value) {
-        $field['name'] = $name;
-        $field['value'] = $value;
-        $this->_updatedFields[] = $field;
-    }
-    /**
-     * Get new fields to be added
-     *
-     * @return array fields to be added
-     *
-     */
-    function getNewFields() {
-        return $this->_newFields;
-    }
-    /**
-     * Get fields which values need to be updated
-     *
-     * @return array fields which values need to be updated
-     *
-     */
-    function getUpdatedFields() {
-        return $this->_updatedFields;
-    }
-    /**
-     * Get fields which values need to be updated
-     *
-     * @return array fields which values need to be updated
-     *
-     */ //felix
-    function getUpdatedWhere() {
-        return $this->_updatedWhere;
-    }
-    /**
-     * Add values of a record to be added
-     *
-     * @param string $name name of the field
-     *
-     */
-    function addDropedField($name) {
-        $this->_dropedFields[] = $name;
-    }
-    /**
-     * Get fields that need to be droped
-     *
-     * @return array fields that need to be droped
-     *
-     */
-    function getDropedFields() {
-        return $this->_dropedFields;
-    }
-    /**
-     * Set the flag to drop the table
-     *
-     */
-    function setFlagForDrop() {
-        $this->_flagForDrop = true;
-    }
-    /**
-     * Use to create a table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    function createTable() {
-        global $xoopsDB;
-        $query = $this->getStructure();
-        $query = "CREATE TABLE `" . $this->name() . "` (" . $query . ") ENGINE=MyISAM COMMENT='The SmartFactory <www.smartfactory.ca>'";
-        //xoops_debug($query);
-        $ret = $xoopsDB->query($query);
-        if (!$ret) {
-            echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . " (" . $xoopsDB->error(). ")<br />";
-
-        } else {
-            echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . "<br />";
-        }
-        return $ret;
-    }
-    /**
-     * Use to drop a table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    function dropTable() {
-        global $xoopsDB;
-        $query = sprintf("DROP TABLE %s", $this->name());
-        $ret = $xoopsDB->query($query);
-        if (!$ret) {
-            echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . " (" . $xoopsDB->error(). ")<br />";
-            return false;
-        } else {
-            echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . "<br />";
-            return true;
-        }
-    }
-    /**
-     * Use to alter a table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    function alterTable() {
-        global $xoopsDB;
-        $ret = true;
-
-        foreach ($this->getAlteredFields() as $alteredField) {
-            if (!$alteredField['newname']) {
-                $alteredField['newname'] = $alteredField['name'];
-            }
-
-            $query = sprintf("ALTER TABLE `%s` CHANGE `%s` `%s` %s", $this->name(), $alteredField['name'], $alteredField['newname'], $alteredField['properties']);
-            $ret = $ret && $xoopsDB->query($query);
-            if ($alteredField['showerror']) {
-                if (!$ret) {
-                    echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . " (" . $xoopsDB->error(). ")<br />";
-                } else {
-                    echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . "<br />";
-                }
-            }
-        }
-
-        return $ret;
-    }
-    /**
-     * Use to add new fileds in the table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    function addNewFields() {
-        global $xoopsDB;
-        $ret = true;
-        foreach ($this->getNewFields() as $newField) {
-            $query = sprintf("ALTER TABLE `%s` ADD `%s` %s", $this->name(), $newField['name'], $newField['properties']);
-            //echo $query;
-            $ret = $ret && $xoopsDB->query($query);
-            if (!$ret) {
-                echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . "<br />";
-            } else {
-                echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . "<br />";
-            }
-        }
-        return $ret;
-    }
-    /**
-     * Use to update fields values
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    function updateFieldsValues() {
-        global $xoopsDB;
-        $ret = true;
-        foreach ($this->getUpdatedFields() as $updatedField) {
-            $query = sprintf("UPDATE %s SET %s = %s", $this->name(), $updatedField['name'], $updatedField['value']);
-            $ret = $ret && $xoopsDB->query($query);
-            if (!$ret) {
-                echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . " (" . $xoopsDB->error(). ")<br />";
-            } else {
-                echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . "<br />";
-            }
-        }
-        return $ret;
-    }
-    /**
-     * Use to update fields values
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */ //felix
-    function updateWhereValues() {
-        global $xoopsDB;
-        $ret = true;
-        foreach ($this->getUpdatedWhere() as $updatedWhere) {
-            $query = sprintf("UPDATE %s SET %s = %s WHERE %s  %s", $this->name(), $updatedWhere['name'], $updatedWhere['value'], $updatedWhere['name'], $updatedWhere['where']);
-            //echo $query."<br>";
-            $ret = $ret && $xoopsDB->query($query);
-            if (!$ret) {
-                echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . " (" . $xoopsDB->error(). ")<br />";
-            } else {
-                echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . "<br />";
-            }
-        }
-        return $ret;
-    }
-    /**
-     * Use to drop fields
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    function dropFields() {
-        global $xoopsDB;
-        $ret = true;
-        foreach ($this->getdropedFields() as $dropedField) {
-            $query = sprintf("ALTER TABLE %s DROP %s", $this->name(), $dropedField);
-            $ret = $ret && $xoopsDB->query($query);
-            if (!$ret) {
-                echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_DROPFIELD_ERR, $dropedField, $this->name()) . " (" . $xoopsDB->error(). ")<br />";
-            } else {
-                echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_DROPFIELD, $dropedField, $this->name()) . "<br />";
-            }
-        }
-        return $ret;
-    }
+	/**
+	 * @var string $_name name of the table
+	 */
+	var $_name;
+	/**
+	 * @var string $_structure structure of the table
+	 */
+	var $_structure;
+
+	/**
+	 * @var array $_data containing valued of each records to be added
+	 */
+	var $_data;
+
+	/**
+	 * @var array $_alteredFields containing fields to be altered
+	 */
+	var $_alteredFields;
+
+	/**
+	 * @var array $_newFields containing new fields to be added
+	 */
+	var $_newFields;
+
+	/**
+	 * @var array $_dropedFields containing fields to be droped
+	 */
+	var $_dropedFields;
+
+	/**
+	 * @var array $_flagForDrop flag table to drop it
+	 */
+	var $_flagForDrop = false;
+
+	/**
+	 * @var array $_updatedFields containing fields which values will be updated
+	 */
+	var $_updatedFields;
+
+	/**
+	 * @var array $_updatedFields containing fields which values will be updated
+	 */ //felix
+	var $_updatedWhere;
+
+	var $_existingFieldsArray=false;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $name name of the table
+	 *
+	 */
+	function SmartDbTable($name) {
+		$this->_name = $name;
+		$this->_data = array ();
+	}
+
+	/**
+	 * Return the table name, prefixed with site table prefix
+	 *
+	 * @return string table name
+	 *
+	 */
+	function name() {
+		global $xoopsDB;
+		return $xoopsDB->prefix($this->_name);
+	}
+
+	/**
+	 * Checks if the table already exists in the database
+	 *
+	 * @return bool TRUE if it exists, FALSE if not
+	 *
+	 */
+	function exists() {
+		return smart_TableExists($this->_name);
+	}
+
+	function getExistingFieldsArray() {
+
+		global $xoopsDB;
+		$result = $xoopsDB->query("SHOW COLUMNS FROM " . $this->name());
+		while ($existing_field = $xoopsDB->fetchArray($result)) {
+			$fields[$existing_field['Field']] = $existing_field['Type'];
+			if ($existing_field['Null'] != "YES") {
+				$fields[$existing_field['Field']] .= " NOT NULL";
+			}
+			if ($existing_field['Extra']) {
+				$fields[$existing_field['Field']] .= " " . $existing_field['Extra'];
+			}
+			if (!($existing_field['Default'] === NULL) && ($existing_field['Default'] || $existing_field['Default'] == '' || $existing_field['Default'] == 0)) {
+				$fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
+			}
+		}
+		return $fields;
+	}
+	function fieldExists($field) {
+		$existingFields = $this->getExistingFieldsArray();
+		return isset ($existingFields[$field]);
+	}
+	/**
+	 * Set the table structure
+	 *
+	 * Example :
+	 *
+	 *     	$table->setStructure("`transactionid` int(11) NOT NULL auto_increment,
+	 * 				  `date` int(11) NOT NULL default '0',
+	 * 				  `status` int(1) NOT NULL default '-1',
+	 * 				  `itemid` int(11) NOT NULL default '0',
+	 * 				  `uid` int(11) NOT NULL default '0',
+	 * 				  `price` float NOT NULL default '0',
+	 * 				  `currency` varchar(100) NOT NULL default '',
+	 * 				  PRIMARY KEY  (`transactionid`)");
+	 *
+	 * @param  string $structure table structure
+	 *
+	 */
+	function setStructure($structure) {
+		$this->_structure = $structure;
+	}
+	/**
+	 * Return the table structure
+	 *
+	 * @return string table structure
+	 *
+	 */
+	function getStructure() {
+		return sprintf($this->_structure, $this->name());
+	}
+	/**
+	 * Add values of a record to be added
+	 *
+	 * @param string $data values of a record
+	 *
+	 */
+	function setData($data) {
+		$this->_data[] = $data;
+	}
+
+	/**
+	 * Get the data array
+	 *
+	 * @return array containing the records values to be added
+	 *
+	 */
+	function getData() {
+		return $this->_data;
+	}
+	/**
+	 * Use to insert data in a table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	function addData() {
+		global $xoopsDB;
+		foreach ($this->getData() as $data) {
+			$query = sprintf('INSERT INTO %s VALUES (%s)', $this->name(), $data);
+			$ret = $xoopsDB->query($query);
+			if (!$ret) {
+				echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . "<br />";
+			} else {
+				echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . "<br />";
+			}
+		}
+		return $ret;
+	}
+	/**
+	 * Add a field to be added
+	 *
+	 * @param string $name name of the field
+	 * @param string $properties properties of the field
+	 *
+	 */
+	function addAlteredField($name, $properties, $newname=false, $showerror = true) {
+		$field['name'] = $name;
+		$field['properties'] = $properties;
+		$field['showerror'] = $showerror;
+		$field['newname'] = $newname;
+		$this->_alteredFields[] = $field;
+	}
+	/**
+	 * Invert values 0 to 1 and 1 to 0
+	 *
+	 * @param string $name name of the field
+	 * @param string $old old propertie
+	 * @param string $new new propertie
+	 *
+	 */ //felix
+	function addUpdatedWhere($name, $newValue, $oldValue) {
+		$field['name'] = $name;
+		$field['value'] = $newValue;
+		$field['where'] = $oldValue;
+		$this->_updatedWhere[] = $field;
+	}
+	/**
+	 * Add new field of a record to be added
+	 *
+	 * @param string $name name of the field
+	 * @param string $properties properties of the field
+	 *
+	 */
+	function addNewField($name, $properties) {
+		$field['name'] = $name;
+		$field['properties'] = $properties;
+		$this->_newFields[] = $field;
+	}
+	/**
+	 * Get fields that need to be altered
+	 *
+	 * @return array fields that need to be altered
+	 *
+	 */
+	function getAlteredFields() {
+		return $this->_alteredFields;
+	}
+	/**
+	 * Add field for which the value will be updated
+	 *
+	 * @param string $name name of the field
+	 * @param string $value value to be set
+	 *
+	 */
+	function addUpdatedField($name, $value) {
+		$field['name'] = $name;
+		$field['value'] = $value;
+		$this->_updatedFields[] = $field;
+	}
+	/**
+	 * Get new fields to be added
+	 *
+	 * @return array fields to be added
+	 *
+	 */
+	function getNewFields() {
+		return $this->_newFields;
+	}
+	/**
+	 * Get fields which values need to be updated
+	 *
+	 * @return array fields which values need to be updated
+	 *
+	 */
+	function getUpdatedFields() {
+		return $this->_updatedFields;
+	}
+	/**
+	 * Get fields which values need to be updated
+	 *
+	 * @return array fields which values need to be updated
+	 *
+	 */ //felix
+	function getUpdatedWhere() {
+		return $this->_updatedWhere;
+	}
+	/**
+	 * Add values of a record to be added
+	 *
+	 * @param string $name name of the field
+	 *
+	 */
+	function addDropedField($name) {
+		$this->_dropedFields[] = $name;
+	}
+	/**
+	 * Get fields that need to be droped
+	 *
+	 * @return array fields that need to be droped
+	 *
+	 */
+	function getDropedFields() {
+		return $this->_dropedFields;
+	}
+	/**
+	 * Set the flag to drop the table
+	 *
+	 */
+	function setFlagForDrop() {
+		$this->_flagForDrop = true;
+	}
+	/**
+	 * Use to create a table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	function createTable() {
+		global $xoopsDB;
+		$query = $this->getStructure();
+		$query = "CREATE TABLE `" . $this->name() . "` (" . $query . ") ENGINE=MyISAM COMMENT='The SmartFactory <www.smartfactory.ca>'";
+		//xoops_debug($query);
+		$ret = $xoopsDB->query($query);
+		if (!$ret) {
+			echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . " (" . $xoopsDB->error(). ")<br />";
+
+		} else {
+			echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . "<br />";
+		}
+		return $ret;
+	}
+	/**
+	 * Use to drop a table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	function dropTable() {
+		global $xoopsDB;
+		$query = sprintf("DROP TABLE %s", $this->name());
+		$ret = $xoopsDB->query($query);
+		if (!$ret) {
+			echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . " (" . $xoopsDB->error(). ")<br />";
+			return false;
+		} else {
+			echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . "<br />";
+			return true;
+		}
+	}
+	/**
+	 * Use to alter a table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	function alterTable() {
+		global $xoopsDB;
+		$ret = true;
+
+		foreach ($this->getAlteredFields() as $alteredField) {
+			if (!$alteredField['newname']) {
+				$alteredField['newname'] = $alteredField['name'];
+			}
+
+			$query = sprintf("ALTER TABLE `%s` CHANGE `%s` `%s` %s", $this->name(), $alteredField['name'], $alteredField['newname'], $alteredField['properties']);
+			$ret = $ret && $xoopsDB->query($query);
+			if ($alteredField['showerror']) {
+				if (!$ret) {
+					echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . " (" . $xoopsDB->error(). ")<br />";
+				} else {
+					echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . "<br />";
+				}
+			}
+		}
+
+		return $ret;
+	}
+	/**
+	 * Use to add new fileds in the table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	function addNewFields() {
+		global $xoopsDB;
+		$ret = true;
+		foreach ($this->getNewFields() as $newField) {
+			$query = sprintf("ALTER TABLE `%s` ADD `%s` %s", $this->name(), $newField['name'], $newField['properties']);
+			//echo $query;
+			$ret = $ret && $xoopsDB->query($query);
+			if (!$ret) {
+				echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . "<br />";
+			} else {
+				echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . "<br />";
+			}
+		}
+		return $ret;
+	}
+	/**
+	 * Use to update fields values
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	function updateFieldsValues() {
+		global $xoopsDB;
+		$ret = true;
+		foreach ($this->getUpdatedFields() as $updatedField) {
+			$query = sprintf("UPDATE %s SET %s = %s", $this->name(), $updatedField['name'], $updatedField['value']);
+			$ret = $ret && $xoopsDB->query($query);
+			if (!$ret) {
+				echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . " (" . $xoopsDB->error(). ")<br />";
+			} else {
+				echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . "<br />";
+			}
+		}
+		return $ret;
+	}
+	/**
+	 * Use to update fields values
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */ //felix
+	function updateWhereValues() {
+		global $xoopsDB;
+		$ret = true;
+		foreach ($this->getUpdatedWhere() as $updatedWhere) {
+			$query = sprintf("UPDATE %s SET %s = %s WHERE %s  %s", $this->name(), $updatedWhere['name'], $updatedWhere['value'], $updatedWhere['name'], $updatedWhere['where']);
+			//echo $query."<br>";
+			$ret = $ret && $xoopsDB->query($query);
+			if (!$ret) {
+				echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . " (" . $xoopsDB->error(). ")<br />";
+			} else {
+				echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . "<br />";
+			}
+		}
+		return $ret;
+	}
+	/**
+	 * Use to drop fields
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	function dropFields() {
+		global $xoopsDB;
+		$ret = true;
+		foreach ($this->getdropedFields() as $dropedField) {
+			$query = sprintf("ALTER TABLE %s DROP %s", $this->name(), $dropedField);
+			$ret = $ret && $xoopsDB->query($query);
+			if (!$ret) {
+				echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_DROPFIELD_ERR, $dropedField, $this->name()) . " (" . $xoopsDB->error(). ")<br />";
+			} else {
+				echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_DROPFIELD, $dropedField, $this->name()) . "<br />";
+			}
+		}
+		return $ret;
+	}
 }
 /**
- * SmartobjectDbupdater class
- *
- * Class performing the database update for the module
- *
- * @package SmartObject
- * @author marcan <marcan@smartfactory.ca>
- * @link http://www.smartfactory.ca The SmartFactory
- */
+	 * SmartobjectDbupdater class
+	 *
+	 * Class performing the database update for the module
+	 *
+	 * @package SmartObject
+	 * @author marcan <marcan@smartfactory.ca>
+	 * @link http://www.smartfactory.ca The SmartFactory
+	 */
 class SmartobjectDbupdater {
 
-    var $_dbTypesArray;
-
-    function SmartobjectDbupdater() {
-        $this->_dbTypesArray[XOBJ_DTYPE_TXTBOX] = 'varchar(255)';
-        $this->_dbTypesArray[XOBJ_DTYPE_TXTAREA] = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_INT] = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_URL] = 'varchar(255)';
-        $this->_dbTypesArray[XOBJ_DTYPE_EMAIL] = 'varchar(255)';
-        $this->_dbTypesArray[XOBJ_DTYPE_ARRAY] = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_OTHER] = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_SOURCE] = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_STIME] = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_MTIME] = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_LTIME] = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_SIMPLE_ARRAY] = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_CURRENCY] = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_FLOAT] = 'float';
-        $this->_dbTypesArray[XOBJ_DTYPE_TIME_ONLY] = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_URLLINK] = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_FILE] = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_IMAGE] = 'varchar(255)';
-    }
-    /**
-     * Use to execute a general query
-     *
-     * @param string $query query that will be executed
-     * @param string $goodmsg message displayed on success
-     * @param string $badmsg message displayed on error
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    function runQuery($query, $goodmsg, $badmsg) {
-        global $xoopsDB;
-        $ret = $xoopsDB->query($query);
-        if (!$ret) {
-            echo "&nbsp;&nbsp;$badmsg<br />";
-            return false;
-        } else {
-            echo "&nbsp;&nbsp;$goodmsg<br />";
-            return true;
-        }
-    }
-    /**
-     * Use to rename a table
-     *
-     * @param string $from name of the table to rename
-     * @param string $to new name of the renamed table
-     *
-     * @return bool true if success, false if an error occured
-     */
-    function renameTable($from, $to) {
-        global $xoopsDB;
-        $from = $xoopsDB->prefix($from);
-        $to = $xoopsDB->prefix($to);
-        $query = sprintf("ALTER TABLE %s RENAME %s", $from, $to);
-        $ret = $xoopsDB->query($query);
-        if (!$ret) {
-            echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . "<br />";
-            return false;
-        } else {
-            echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . "<br />";
-            return true;
-        }
-    }
-    /**
-     * Use to update a table
-     *
-     * @param object $table {@link SmartDbTable} that will be updated
-     *
-     * @see SmartDbTable
-     *
-     * @return bool true if success, false if an error occured
-     */
-    function updateTable($table) {
-        global $xoopsDB;
-        $ret = true;
-        // If table has a structure, create the table
-        if ($table->getStructure()) {
-            $ret = $table->createTable() && $ret;
-        }
-        // If table is flag for drop, drop it
-        if ($table->_flagForDrop) {
-            $ret = $table->dropTable() && $ret;
-        }
-        // If table has data, insert it
-        if ($table->getData()) {
-            $ret = $table->addData() && $ret;
-        }
-        // If table has new fields to be added, add them
-        if ($table->getNewFields()) {
-            $ret = $table->addNewFields() && $ret;
-        }
-        // If table has altered field, alter the table
-        if ($table->getAlteredFields()) {
-            $ret = $table->alterTable() && $ret;
-        }
-        // If table has updated field values, update the table
-        if ($table->getUpdatedFields()) {
-            $ret = $table->updateFieldsValues($table) && $ret;
-        }
-        // If table has droped field, alter the table
-        if ($table->getDropedFields()) {
-            $ret = $table->dropFields($table) && $ret;
-        }
-        //felix
-        // If table has updated field values, update the table
-        if ($table->getUpdatedWhere()) {
-            $ret = $table->UpdateWhereValues($table) && $ret;
-        }
-        return $ret;
-    }
-
-    function automaticUpgrade($module, $item) {
-        if (is_array($item)) {
-            foreach($item as $v) {
-                $this->upgradeObjectItem($module, $v);
-            }
-        } else {
-            $this->upgradeObjectItem($module, $item);
-        }
-    }
-
-    function getFieldTypeFromVar($var) {
-        $ret = isset($this->_dbTypesArray[$var['data_type']]) ? $this->_dbTypesArray[$var['data_type']] : 'text';
-        return $ret;
-    }
-
-    function getFieldDefaultFromVar($var, $key = false) {
-        if ($var['value']) {
-            return $var['value'];
-        } else {
-            if (in_array($var['data_type'], array(
-            XOBJ_DTYPE_INT,
-            XOBJ_DTYPE_STIME,
-            XOBJ_DTYPE_MTIME,
-            XOBJ_DTYPE_LTIME,
-            XOBJ_DTYPE_TIME_ONLY,
-            XOBJ_DTYPE_URLLINK,
-            XOBJ_DTYPE_FILE
-            ))) {
-                return '0';
-            } else {
-                return '';
-            }
-        }
-    }
-
-    function upgradeObjectItem($module, $item) {
-        $module_handler = xoops_getModuleHandler($item, $module);
-        if (!$module_handler) {
-            return false;
-        }
-
-        $table = new SmartDbTable($module . '_' . $item);
-        $object = $module_handler->create();
-        $objectVars = $object->getVars();
-
-        if (!$table->exists()) {
-            // table was never created, let's do it
-            $structure = "";
-            foreach($objectVars as $key=>$var) {
-                if ($var['persistent']) {
-                    $type = $this->getFieldTypeFromVar($var);
-                    if ($key == $module_handler->keyName) {
-                        $extra = "auto_increment";
-                    } else {
-                        $default =  $this->getFieldDefaultFromVar($var);
-                        $extra = "default '$default'
+	var $_dbTypesArray;
+
+	function SmartobjectDbupdater() {
+		$this->_dbTypesArray[XOBJ_DTYPE_TXTBOX] = 'varchar(255)';
+		$this->_dbTypesArray[XOBJ_DTYPE_TXTAREA] = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_INT] = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_URL] = 'varchar(255)';
+		$this->_dbTypesArray[XOBJ_DTYPE_EMAIL] = 'varchar(255)';
+		$this->_dbTypesArray[XOBJ_DTYPE_ARRAY] = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_OTHER] = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_SOURCE] = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_STIME] = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_MTIME] = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_LTIME] = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_SIMPLE_ARRAY] = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_CURRENCY] = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_FLOAT] = 'float';
+		$this->_dbTypesArray[XOBJ_DTYPE_TIME_ONLY] = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_URLLINK] = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_FILE] = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_IMAGE] = 'varchar(255)';
+	}
+	/**
+	 * Use to execute a general query
+	 *
+	 * @param string $query query that will be executed
+	 * @param string $goodmsg message displayed on success
+	 * @param string $badmsg message displayed on error
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	function runQuery($query, $goodmsg, $badmsg) {
+		global $xoopsDB;
+		$ret = $xoopsDB->query($query);
+		if (!$ret) {
+			echo "&nbsp;&nbsp;$badmsg<br />";
+			return false;
+		} else {
+			echo "&nbsp;&nbsp;$goodmsg<br />";
+			return true;
+		}
+	}
+	/**
+	 * Use to rename a table
+	 *
+	 * @param string $from name of the table to rename
+	 * @param string $to new name of the renamed table
+	 *
+	 * @return bool true if success, false if an error occured
+	 */
+	function renameTable($from, $to) {
+		global $xoopsDB;
+		$from = $xoopsDB->prefix($from);
+		$to = $xoopsDB->prefix($to);
+		$query = sprintf("ALTER TABLE %s RENAME %s", $from, $to);
+		$ret = $xoopsDB->query($query);
+		if (!$ret) {
+			echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . "<br />";
+			return false;
+		} else {
+			echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . "<br />";
+			return true;
+		}
+	}
+	/**
+	 * Use to update a table
+	 *
+	 * @param object $table {@link SmartDbTable} that will be updated
+	 *
+	 * @see SmartDbTable
+	 *
+	 * @return bool true if success, false if an error occured
+	 */
+	function updateTable($table) {
+		global $xoopsDB;
+		$ret = true;
+		// If table has a structure, create the table
+		if ($table->getStructure()) {
+			$ret = $table->createTable() && $ret;
+		}
+		// If table is flag for drop, drop it
+		if ($table->_flagForDrop) {
+			$ret = $table->dropTable() && $ret;
+		}
+		// If table has data, insert it
+		if ($table->getData()) {
+			$ret = $table->addData() && $ret;
+		}
+		// If table has new fields to be added, add them
+		if ($table->getNewFields()) {
+			$ret = $table->addNewFields() && $ret;
+		}
+		// If table has altered field, alter the table
+		if ($table->getAlteredFields()) {
+			$ret = $table->alterTable() && $ret;
+		}
+		// If table has updated field values, update the table
+		if ($table->getUpdatedFields()) {
+			$ret = $table->updateFieldsValues($table) && $ret;
+		}
+		// If table has droped field, alter the table
+		if ($table->getDropedFields()) {
+			$ret = $table->dropFields($table) && $ret;
+		}
+		//felix
+		// If table has updated field values, update the table
+		if ($table->getUpdatedWhere()) {
+			$ret = $table->UpdateWhereValues($table) && $ret;
+		}
+		return $ret;
+	}
+
+	function automaticUpgrade($module, $item) {
+		if (is_array($item)) {
+			foreach($item as $v) {
+				$this->upgradeObjectItem($module, $v);
+			}
+		} else {
+			$this->upgradeObjectItem($module, $item);
+		}
+	}
+
+	function getFieldTypeFromVar($var) {
+		$ret = isset($this->_dbTypesArray[$var['data_type']]) ? $this->_dbTypesArray[$var['data_type']] : 'text';
+		return $ret;
+	}
+
+	function getFieldDefaultFromVar($var, $key = false) {
+		if ($var['value']) {
+			return $var['value'];
+		} else {
+			if (in_array($var['data_type'], array(
+			XOBJ_DTYPE_INT,
+			XOBJ_DTYPE_STIME,
+			XOBJ_DTYPE_MTIME,
+			XOBJ_DTYPE_LTIME,
+			XOBJ_DTYPE_TIME_ONLY,
+			XOBJ_DTYPE_URLLINK,
+			XOBJ_DTYPE_FILE
+			))) {
+				return '0';
+			} else {
+				return '';
+			}
+		}
+	}
+
+	function upgradeObjectItem($module, $item) {
+		$module_handler = xoops_getModuleHandler($item, $module);
+		if (!$module_handler) {
+			return false;
+		}
+
+		$table = new SmartDbTable($module . '_' . $item);
+		$object = $module_handler->create();
+		$objectVars = $object->getVars();
+
+		if (!$table->exists()) {
+			// table was never created, let's do it
+			$structure = "";
+			foreach($objectVars as $key=>$var) {
+				if ($var['persistent']) {
+					$type = $this->getFieldTypeFromVar($var);
+					if ($key == $module_handler->keyName) {
+						$extra = "auto_increment";
+					} else {
+						$default =  $this->getFieldDefaultFromVar($var);
+						$extra = "default '$default'
 ";
-                    }
-                    $structure .= "`$key` $type not null $extra,
+					}
+					$structure .= "`$key` $type not null $extra,
 ";
-                }
-            }
-            $structure .= "PRIMARY KEY  (`" . $module_handler->keyName . "`)
+				}
+			}
+			$structure .= "PRIMARY KEY  (`" . $module_handler->keyName . "`)
 ";
-            $table->setStructure($structure);
-            if (!$this->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        } else {
-            $existingFieldsArray = $table->getExistingFieldsArray();
-            foreach($objectVars as $key=>$var) {
-                if ($var['persistent']) {
-                    if (!isset($existingFieldsArray[$key])) {
-                        // the fiels does not exist, let's create it
-                        $type = $this->getFieldTypeFromVar($var);
-                        $default =  $this->getFieldDefaultFromVar($var);
-                        $table->addNewField($key, "$type not null default '$default'");
-                    } else {
-                        // if field already exists, let's check if the definition is correct
-                        $definition =  strtolower($existingFieldsArray[$key]);
-                        $type = $this->getFieldTypeFromVar($var);
-                        if ($key == $module_handler->keyName) {
-                            $extra = "auto_increment";
-                        } else {
-                            $default =  $this->getFieldDefaultFromVar($var, $key);
-                            $extra = "default '$default'";
-                        }
-                        $actual_definition = "$type not null $extra";
-                        if ($definition != $actual_definition) {
-                            $table->addAlteredField($key, $actual_definition);
-                        }
-                    }
-                }
-            }
-
-            // check to see if there are some unused fields left in the table
-            foreach ($existingFieldsArray as $key=>$v) {
-                if (!isset($objectVars[$key]) || !$objectVars[$key]['persistent']) {
-                    $table->addDropedField($key);
-                }
-            }
-
-            if (!$this->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-    }
-    function moduleUpgrade(&$module) {
-        $dirname = $module->getVar('dirname');
-
-        ob_start();
-
-        $table = new SmartDbTable($dirname . '_meta');
-        if (!$table->exists()) {
-            $table->setStructure("
+			$table->setStructure($structure);
+			if (!$this->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		} else {
+			$existingFieldsArray = $table->getExistingFieldsArray();
+			foreach($objectVars as $key=>$var) {
+				if ($var['persistent']) {
+					if (!isset($existingFieldsArray[$key])) {
+						// the fiels does not exist, let's create it
+						$type = $this->getFieldTypeFromVar($var);
+						$default =  $this->getFieldDefaultFromVar($var);
+						$table->addNewField($key, "$type not null default '$default'");
+					} else {
+						// if field already exists, let's check if the definition is correct
+						$definition =  strtolower($existingFieldsArray[$key]);
+						$type = $this->getFieldTypeFromVar($var);
+						if ($key == $module_handler->keyName) {
+							$extra = "auto_increment";
+						} else {
+							$default =  $this->getFieldDefaultFromVar($var, $key);
+							$extra = "default '$default'";
+						}
+						$actual_definition = "$type not null $extra";
+						if ($definition != $actual_definition) {
+							$table->addAlteredField($key, $actual_definition);
+						}
+					}
+				}
+			}
+
+			// check to see if there are some unused fields left in the table
+			foreach ($existingFieldsArray as $key=>$v) {
+				if (!isset($objectVars[$key]) || !$objectVars[$key]['persistent']) {
+					$table->addDropedField($key);
+				}
+			}
+
+			if (!$this->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+	}
+	function moduleUpgrade(&$module) {
+		$dirname = $module->getVar('dirname');
+
+		ob_start();
+
+		$table = new SmartDbTable($dirname . '_meta');
+		if (!$table->exists()) {
+			$table->setStructure("
 			  `metakey` varchar(50) NOT NULL default '',
 			  `metavalue` varchar(255) NOT NULL default '',
 			  PRIMARY KEY (`metakey`)");
-            $table->setData("'version',0");
-            if (!$this->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-
-        $dbVersion  = smart_GetMeta('version', $dirname);
-        if (!$dbVersion) {
-            $dbVersion = 0;
-        }
-        $newDbVersion = constant(strtoupper($dirname . '_db_version')) ? constant(strtoupper($dirname . '_db_version')) : 0;
-        echo 'Database version : ' . $dbVersion . '<br />';
-        echo 'New database version : ' . $newDbVersion . '<br />';
-
-        if ($newDbVersion > $dbVersion) {
-            for($i=$dbVersion+1;$i<=$newDbVersion; $i++) {
-                $upgrade_function = $dirname . '_db_upgrade_' . $i;
-                if (function_exists($upgrade_function)) {
-                    $upgrade_function();
-                }
-            }
-        }
-
-        echo "<code>" . _SDU_UPDATE_UPDATING_DATABASE . "<br />";
-
-        // if there is a function to execute for this DB version, let's do it
-        //$function_
-
-        $module_info = smart_getModuleInfo($dirname);
-        $this->automaticUpgrade($dirname, $module_info->modinfo['object_items']);
-
-        echo "</code>";
-
-        $feedback = ob_get_clean();
-        if (method_exists($module, "setMessage")) {
-            $module->setMessage($feedback);
-        } else {
-            echo $feedback;
-        }
-        smart_SetMeta("version", $newDbVersion, $dirname); //Set meta version to current
-        return true;
-    }
+			$table->setData("'version',0");
+			if (!$this->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+
+		$dbVersion  = smart_GetMeta('version', $dirname);
+		if (!$dbVersion) {
+			$dbVersion = 0;
+		}
+		$newDbVersion = constant(strtoupper($dirname . '_db_version')) ? constant(strtoupper($dirname . '_db_version')) : 0;
+		echo 'Database version : ' . $dbVersion . '<br />';
+		echo 'New database version : ' . $newDbVersion . '<br />';
+
+		if ($newDbVersion > $dbVersion) {
+			for($i=$dbVersion+1;$i<=$newDbVersion; $i++) {
+				$upgrade_function = $dirname . '_db_upgrade_' . $i;
+				if (function_exists($upgrade_function)) {
+					$upgrade_function();
+				}
+			}
+		}
+
+		echo "<code>" . _SDU_UPDATE_UPDATING_DATABASE . "<br />";
+
+		// if there is a function to execute for this DB version, let's do it
+		//$function_
+
+		$module_info = smart_getModuleInfo($dirname);
+		$this->automaticUpgrade($dirname, $module_info->modinfo['object_items']);
+
+		echo "</code>";
+
+		$feedback = ob_get_clean();
+		if (method_exists($module, "setMessage")) {
+			$module->setMessage($feedback);
+		} else {
+			echo $feedback;
+		}
+		smart_SetMeta("version", $newDbVersion, $dirname); //Set meta version to current
+		return true;
+	}
 }
 ?>
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -77,7 +77,7 @@ 
      */ //felix
     var $_updatedWhere;
 
-    var $_existingFieldsArray=false;
+    var $_existingFieldsArray = false;
 
     /**
      * Constructor
@@ -87,7 +87,7 @@ 
      */
     function SmartDbTable($name) {
         $this->_name = $name;
-        $this->_data = array ();
+        $this->_data = array();
     }
 
     /**
@@ -207,7 +207,7 @@ 
      * @param string $properties properties of the field
      *
      */
-    function addAlteredField($name, $properties, $newname=false, $showerror = true) {
+    function addAlteredField($name, $properties, $newname = false, $showerror = true) {
         $field['name'] = $name;
         $field['properties'] = $properties;
         $field['showerror'] = $showerror;
@@ -326,7 +326,7 @@ 
         //xoops_debug($query);
         $ret = $xoopsDB->query($query);
         if (!$ret) {
-            echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . " (" . $xoopsDB->error(). ")<br />";
+            echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . " (" . $xoopsDB->error() . ")<br />";
 
         } else {
             echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . "<br />";
@@ -344,7 +344,7 @@ 
         $query = sprintf("DROP TABLE %s", $this->name());
         $ret = $xoopsDB->query($query);
         if (!$ret) {
-            echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . " (" . $xoopsDB->error(). ")<br />";
+            echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . " (" . $xoopsDB->error() . ")<br />";
             return false;
         } else {
             echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . "<br />";
@@ -370,7 +370,7 @@ 
             $ret = $ret && $xoopsDB->query($query);
             if ($alteredField['showerror']) {
                 if (!$ret) {
-                    echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . " (" . $xoopsDB->error(). ")<br />";
+                    echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . " (" . $xoopsDB->error() . ")<br />";
                 } else {
                     echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . "<br />";
                 }
@@ -413,7 +413,7 @@ 
             $query = sprintf("UPDATE %s SET %s = %s", $this->name(), $updatedField['name'], $updatedField['value']);
             $ret = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . " (" . $xoopsDB->error(). ")<br />";
+                echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . " (" . $xoopsDB->error() . ")<br />";
             } else {
                 echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . "<br />";
             }
@@ -434,7 +434,7 @@ 
             //echo $query."<br>";
             $ret = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . " (" . $xoopsDB->error(). ")<br />";
+                echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . " (" . $xoopsDB->error() . ")<br />";
             } else {
                 echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . "<br />";
             }
@@ -454,7 +454,7 @@ 
             $query = sprintf("ALTER TABLE %s DROP %s", $this->name(), $dropedField);
             $ret = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_DROPFIELD_ERR, $dropedField, $this->name()) . " (" . $xoopsDB->error(). ")<br />";
+                echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_DROPFIELD_ERR, $dropedField, $this->name()) . " (" . $xoopsDB->error() . ")<br />";
             } else {
                 echo "&nbsp;&nbsp;" . sprintf(_SDU_MSG_DROPFIELD, $dropedField, $this->name()) . "<br />";
             }
@@ -588,7 +588,7 @@ 
 
     function automaticUpgrade($module, $item) {
         if (is_array($item)) {
-            foreach($item as $v) {
+            foreach ($item as $v) {
                 $this->upgradeObjectItem($module, $v);
             }
         } else {
@@ -634,13 +634,13 @@ 
         if (!$table->exists()) {
             // table was never created, let's do it
             $structure = "";
-            foreach($objectVars as $key=>$var) {
+            foreach ($objectVars as $key=>$var) {
                 if ($var['persistent']) {
                     $type = $this->getFieldTypeFromVar($var);
                     if ($key == $module_handler->keyName) {
                         $extra = "auto_increment";
                     } else {
-                        $default =  $this->getFieldDefaultFromVar($var);
+                        $default = $this->getFieldDefaultFromVar($var);
                         $extra = "default '$default'
 ";
                     }
@@ -658,21 +658,21 @@ 
             }
         } else {
             $existingFieldsArray = $table->getExistingFieldsArray();
-            foreach($objectVars as $key=>$var) {
+            foreach ($objectVars as $key=>$var) {
                 if ($var['persistent']) {
                     if (!isset($existingFieldsArray[$key])) {
                         // the fiels does not exist, let's create it
                         $type = $this->getFieldTypeFromVar($var);
-                        $default =  $this->getFieldDefaultFromVar($var);
+                        $default = $this->getFieldDefaultFromVar($var);
                         $table->addNewField($key, "$type not null default '$default'");
                     } else {
                         // if field already exists, let's check if the definition is correct
-                        $definition =  strtolower($existingFieldsArray[$key]);
+                        $definition = strtolower($existingFieldsArray[$key]);
                         $type = $this->getFieldTypeFromVar($var);
                         if ($key == $module_handler->keyName) {
                             $extra = "auto_increment";
                         } else {
-                            $default =  $this->getFieldDefaultFromVar($var, $key);
+                            $default = $this->getFieldDefaultFromVar($var, $key);
                             $extra = "default '$default'";
                         }
                         $actual_definition = "$type not null $extra";
@@ -716,7 +716,7 @@ 
             }
         }
 
-        $dbVersion  = smart_GetMeta('version', $dirname);
+        $dbVersion = smart_GetMeta('version', $dirname);
         if (!$dbVersion) {
             $dbVersion = 0;
         }
@@ -725,7 +725,7 @@ 
         echo 'New database version : ' . $newDbVersion . '<br />';
 
         if ($newDbVersion > $dbVersion) {
-            for($i=$dbVersion+1;$i<=$newDbVersion; $i++) {
+            for ($i = $dbVersion + 1; $i <= $newDbVersion; $i++) {
                 $upgrade_function = $dirname . '_db_upgrade_' . $i;
                 if (function_exists($upgrade_function)) {
                     $upgrade_function();

class/smartexport.php

Doc Comments +7 added lines

@@ -177,6 +177,10 @@ 
 		return implode($separator, $ret);
 
 	}
+
+	/**
+	 * @param false|string $trimFunction
+	 */
 	function valToCsvHelper($val, $separator, $trimFunction) {
 		if ($trimFunction)
 			$val = $trimFunction ($val);
@@ -221,6 +225,9 @@ 
 		$this->saveExportFile($exportFileData);
 	}
 
+	/**
+	 * @param string $content
+	 */
 	function saveExportFile($content) {
 		switch ($this->format) {
 			case 'csv':

Indentation +22 added lines, -22 removed lines

@@ -246,37 +246,37 @@
 			trigger_error('Unable to write in ' . $fullFileName, E_USER_WARNING);
 		} else {
 			$mimeType = 'text/csv';
-		    $file = strrev($this->filename);
-		    $temp_name = strtolower(strrev(substr($file,0,strpos($file,"--"))) );
+			$file = strrev($this->filename);
+			$temp_name = strtolower(strrev(substr($file,0,strpos($file,"--"))) );
 			if ($temp_name == '') {
 				$file_name = $this->filename;
 			} else {
 				$file_name = $temp_name;
 			}
-		    $fullFileName = $this->filepath . stripslashes(trim($this->filename));
+			$fullFileName = $this->filepath . stripslashes(trim($this->filename));
 
-		    if(ini_get('zlib.output_compression')) {
-		        ini_set('zlib.output_compression', 'Off');
-		    }
+			if(ini_get('zlib.output_compression')) {
+				ini_set('zlib.output_compression', 'Off');
+			}
 
-		    header("Pragma: public");
-		    header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-		    header("Cache-Control: private",false);
-		    header("Content-Transfer-Encoding: binary");
-		    if(isset($mimeType)) {
-		        header("Content-Type: " . $mimeType);
-		    }
+			header("Pragma: public");
+			header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+			header("Cache-Control: private",false);
+			header("Content-Transfer-Encoding: binary");
+			if(isset($mimeType)) {
+				header("Content-Type: " . $mimeType);
+			}
 
-		    header("Content-Disposition: attachment; filename=" . $file_name);
+			header("Content-Disposition: attachment; filename=" . $file_name);
 
-		    if(isset($mimeType) && strstr($mimeType, "text/")) {
-		        $fp = fopen($fullFileName, "r");
-		    }
-		    else {
-		        $fp = fopen($fullFileName, "rb");
-		    }
-		    fpassthru($fp);
-		    exit();
+			if(isset($mimeType) && strstr($mimeType, "text/")) {
+				$fp = fopen($fullFileName, "r");
+			}
+			else {
+				$fp = fopen($fullFileName, "rb");
+			}
+			fpassthru($fp);
+			exit();
 		}
 		fclose($handle);
 	}

Spacing +19 added lines, -19 removed lines

@@ -27,7 +27,7 @@ 
 	var $filename;
 	var $filepath;
 	var	$options;
-	var $outputMethods=false;
+	var $outputMethods = false;
 	var $notDisplayFields;
 
 	/**
@@ -41,7 +41,7 @@ 
 	 * @param string $format format of the ouputed export. Currently only supports CSV
 	 * @param array $options options of the format to be exported in
 	 */
-	function SmartObjectExport(&$objectHandler, $criteria=null, $fields=false, $filename=false, $filepath=false, $format='csv', $options=false) {
+	function SmartObjectExport(&$objectHandler, $criteria = null, $fields = false, $filename = false, $filepath = false, $format = 'csv', $options = false) {
 		$this->handler = $objectHandler;
 		$this->criteria = $criteria;
 		$this->fields = $fields;
@@ -101,17 +101,17 @@ 
 	/*
 	 * Set an array of fields that we don't want in export
 	 */
-	 function setNotDisplayFields($fields){
-	 	if(!$this->notDisplayFields){
-	 		if(is_array($fields)){
+	 function setNotDisplayFields($fields) {
+	 	if (!$this->notDisplayFields) {
+	 		if (is_array($fields)) {
 	 			$this->notDisplayFields = $fields;
-	 		}else{
+	 		} else {
 	 			$this->notDisplayFields = array($fields);
 	 		}
-	 	}else{
-	 		if(is_array($fields)){
+	 	} else {
+	 		if (is_array($fields)) {
 	 			$this->notDisplayFields = array_merge($this->notDisplayFields, $fields);
-	 		}else{
+	 		} else {
 	 			$this->notDisplayFields[] = $fields;
 	 		}
 	 	}
@@ -144,7 +144,7 @@ 
 	 * @param string $filepath path where the file will be saved
 	 * @param array $options options of the format to be exported in
 	 */
-	function SmartExportRenderer($data, $filename=false, $filepath=false, $format='csv', $options=array('separator'=>';')) {
+	function SmartExportRenderer($data, $filename = false, $filepath = false, $format = 'csv', $options = array('separator'=>';')) {
 		$this->data = $data;
 		$this->format = $format;
 		$this->filename = $filename;
@@ -169,8 +169,8 @@ 
 				$trimFunction = 'trim';
 				break;
 		}
-		$ret = array ();
-		foreach($dataArray as $key=>$field){
+		$ret = array();
+		foreach ($dataArray as $key=>$field) {
 			$ret[$key] = $this->valToCsvHelper($field, $separator, $trimFunction);
 		}
 
@@ -179,7 +179,7 @@ 
 	}
 	function valToCsvHelper($val, $separator, $trimFunction) {
 		if ($trimFunction)
-			$val = $trimFunction ($val);
+			$val = $trimFunction($val);
 		//If there is a separator (;) or a quote (") or a linebreak in the string, we need to quote it.
 		$needQuote = FALSE;
 		do {
@@ -213,7 +213,7 @@ 
 				$firstRow = implode($separator, $this->data['columnsHeaders']);
 				$exportFileData .= $firstRow . "\r\n";
 
-				foreach($this->data['rows'] as $cols) {
+				foreach ($this->data['rows'] as $cols) {
 					$exportFileData .= $this->arrayToCsvString($cols, $separator) . "\r\n";
 				}
 			break;
@@ -247,7 +247,7 @@ 
 		} else {
 			$mimeType = 'text/csv';
 		    $file = strrev($this->filename);
-		    $temp_name = strtolower(strrev(substr($file,0,strpos($file,"--"))) );
+		    $temp_name = strtolower(strrev(substr($file, 0, strpos($file, "--"))));
 			if ($temp_name == '') {
 				$file_name = $this->filename;
 			} else {
@@ -255,21 +255,21 @@ 
 			}
 		    $fullFileName = $this->filepath . stripslashes(trim($this->filename));
 
-		    if(ini_get('zlib.output_compression')) {
+		    if (ini_get('zlib.output_compression')) {
 		        ini_set('zlib.output_compression', 'Off');
 		    }
 
 		    header("Pragma: public");
 		    header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-		    header("Cache-Control: private",false);
+		    header("Cache-Control: private", false);
 		    header("Content-Transfer-Encoding: binary");
-		    if(isset($mimeType)) {
+		    if (isset($mimeType)) {
 		        header("Content-Type: " . $mimeType);
 		    }
 
 		    header("Content-Disposition: attachment; filename=" . $file_name);
 
-		    if(isset($mimeType) && strstr($mimeType, "text/")) {
+		    if (isset($mimeType) && strstr($mimeType, "text/")) {
 		        $fp = fopen($fullFileName, "r");
 		    }
 		    else {

Braces +10 added lines, -9 removed lines

@@ -105,13 +105,13 @@ 
 	 	if(!$this->notDisplayFields){
 	 		if(is_array($fields)){
 	 			$this->notDisplayFields = $fields;
-	 		}else{
+	 		} else{
 	 			$this->notDisplayFields = array($fields);
 	 		}
-	 	}else{
+	 	} else{
 	 		if(is_array($fields)){
 	 			$this->notDisplayFields = array_merge($this->notDisplayFields, $fields);
-	 		}else{
+	 		} else{
 	 			$this->notDisplayFields[] = $fields;
 	 		}
 	 	}
@@ -153,8 +153,9 @@ 
 	}
 
 	function arrayToCsvString($dataArray, $separator, $trim = 'both', $removeEmptyLines = TRUE) {
-		if (!is_array($dataArray) || empty ($dataArray))
-			return '';
+		if (!is_array($dataArray) || empty ($dataArray)) {
+					return '';
+		}
 		switch ($trim) {
 			case 'none' :
 				$trimFunction = FALSE;
@@ -178,8 +179,9 @@ 
 
 	}
 	function valToCsvHelper($val, $separator, $trimFunction) {
-		if ($trimFunction)
-			$val = $trimFunction ($val);
+		if ($trimFunction) {
+					$val = $trimFunction ($val);
+		}
 		//If there is a separator (;) or a quote (") or a linebreak in the string, we need to quote it.
 		$needQuote = FALSE;
 		do {
@@ -271,8 +273,7 @@ 
 
 		    if(isset($mimeType) && strstr($mimeType, "text/")) {
 		        $fp = fopen($fullFileName, "r");
-		    }
-		    else {
+		    } else {
 		        $fp = fopen($fullFileName, "rb");
 		    }
 		    fpassthru($fp);