mambax7 / smartobject

class/smarthookhandler.php

Doc Comments +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	/**
 	 * Access the only instance of this class
      *
-     * @return	object
+     * @return	SmartHookHandler
      *
      * @static
      * @staticvar   object

Indentation +11 added lines, -11 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
+	die("XOOPS root path not defined");
 }
 
 class SmartHookHandler {
 
-    function SmartHookHandler() {
+	function SmartHookHandler() {
 
-    }
+	}
 
 	/**
 	 * Access the only instance of this class
-     *
-     * @return	object
-     *
-     * @static
-     * @staticvar   object
+	 *
+	 * @return	object
+	 *
+	 * @static
+	 * @staticvar   object
 	 */
 	function &getInstance()
 	{
@@ -26,8 +26,8 @@ 
 		return $instance;
 	}
 
-    function executeHook($hook_name) {
-    	$lower_hook_name = strtolower($hook_name);
+	function executeHook($hook_name) {
+		$lower_hook_name = strtolower($hook_name);
 		$filename = SMARTOBJECT_ROOT_PATH . 'include/custom_code/' . $lower_hook_name . '.php';
 		if (file_exists($filename)) {
 			include_once($filename);
@@ -36,7 +36,7 @@ 
 				$function();
 			}
 		}
-    }
+	}
 
 }
 ?>
\ No newline at end of file

class/smartmetagen.php

Doc Comments +13 added lines

@@ -156,17 +156,26 @@ 
         $this->_title = $ret;
     }
 
+    /**
+     * @param string|boolean $keywords
+     */
     function setKeywords($keywords)
     {
         $this->_keywords = $keywords;
     }
 
+    /**
+     * @param boolean $categoryPath
+     */
     function setCategoryPath($categoryPath)
     {
         $categoryPath = $this->html2text($categoryPath);
         $this->_categoryPath = $categoryPath;
     }
 
+    /**
+     * @param boolean $description
+     */
     function setDescription($description)
     {
         if (!$description) {
@@ -217,6 +226,10 @@ 
         return $ret;
     }
 
+    /**
+     * @param string $text
+     * @param integer $minChar
+     */
     function findMetaKeywords($text, $minChar)
     {
         $keywords = array();

class/smartobject.php

Doc Comments +20 added lines, -4 removed lines

@@ -68,7 +68,7 @@ 
 	/**
 	* Checks if the user has a specific access on this object
 	*
-	* @param string $gperm_name name of the permission to test
+	* @param string $perm_name name of the permission to test
 	* @return boolean : TRUE if user has access, false if not
 	**/
 	function accessGranted($perm_name) {
@@ -127,6 +127,9 @@ 
         'readonly' => false));
     }
 
+    /**
+     * @param string $key
+     */
     function initNonPersistableVar($key, $data_type, $itemName=false, $form_caption='', $sortby=false, $value='', $displayOnForm=false, $required=false) {
 		$this->initVar($key, $data_type, $value, $required, null, '', false, $form_caption, '', $sortby, false, $displayOnForm);
 		$this->vars[$key]['itemName'] = $itemName;
@@ -145,13 +148,16 @@ 
     * @param bool $required set to TRUE if this variable needs to have a value set before storing the object in the table
     * @param string $form_caption caption of this variable in a {@link SmartobjectForm} and title of a column in a  {@link SmartObjectTable}
     * @param string $form_dsc description of this variable in a {@link SmartobjectForm}
-    * @param mixed $value default value of this variable
+    * @param string|false $value default value of this variable
     */
 	function quickInitVar($key, $data_type, $required=false, $form_caption='', $form_dsc='', $value = null) {
 		$maxlength = $data_type == 'XOBJ_DTYPE_TXTBOX' ? 255 : null;
 		$this->initVar($key, $data_type, $value, $required, $maxlength, '', false, $form_caption, $form_dsc, false, true, true);
 	}
 
+    /**
+     * @param string $varname
+     */
     function initCommonVar($varname, $displayOnForm=true, $default='notdefined') {
 
     	switch ($varname) {
@@ -393,8 +399,8 @@ 
     /**
      * add an error
      *
-     * @param string $value error to add
      * @access public
+     * @param string $err_str
      */
     function setErrors($err_str, $prefix=false)
     {
@@ -585,10 +591,17 @@ 
 		$this->vars[$key]['data_type'] = $newType;
 	}
 
+	/**
+	 * @param string $info
+	 * @param boolean $value
+	 */
 	function setVarInfo($key, $info, $value) {
 		$this->vars[$key][$info] = $value;
 	}
 
+	/**
+	 * @param string $key
+	 */
 	function getValueFor($key, $editor=true) {
     	global $xoopsModuleConfig;
 
@@ -759,7 +772,7 @@ 
     * @access public
     * @param string $key key of the object's variable to be returned
     * @param string $format format to use for the output
-    * @return mixed formatted value of the variable
+    * @return string formatted value of the variable
     */
     function getVar($key, $format = 's')
     {
@@ -1035,6 +1048,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $key
+	 */
 	function hideFieldFromForm($key) {
 		if (is_array($key)) {
 			foreach($key as $v) {

Indentation +791 added lines, -793 removed lines

@@ -5,16 +5,14 @@ 
  *
  * @license GNU
  * @author marcan <marcan@smartfactory.ca>
-
  * @version $Id: smartobject.php 1409 2008-04-02 20:48:27Z malanciault $
-
  * @link http://smartfactory.ca The SmartFactory
  * @package SmartObject
  * @subpackage SmartObjectCore
  */
 
 if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
+	die("XOOPS root path not defined");
 }
 
 include_once XOOPS_ROOT_PATH . "/modules/smartobject/include/common.php";
@@ -42,35 +40,35 @@ 
  */
 class SmartObject extends XoopsObject {
 
-    var $_image_path;
-    var $_image_url;
+	var $_image_path;
+	var $_image_url;
 
-    var $seoEnabled = false;
-    var $titleField;
-    var $summaryField=false;
+	var $seoEnabled = false;
+	var $titleField;
+	var $summaryField=false;
 
-    /**
+	/**
 	 * Reference to the handler managing this object
 	 *
 	 * @var object reference to {@link SmartPersistableObjectHandler}
 	 */
-    var $handler;
+	var $handler;
 
-    /**
+	/**
 	 * References to control objects, managing the form fields of this object
 	 */
-    var $controls = array();
+	var $controls = array();
 
-    function SmartObject(&$handler) {
-    	$this->handler = $handler;
-    }
+	function SmartObject(&$handler) {
+		$this->handler = $handler;
+	}
 
 	/**
-	* Checks if the user has a specific access on this object
-	*
-	* @param string $gperm_name name of the permission to test
-	* @return boolean : TRUE if user has access, false if not
-	**/
+	 * Checks if the user has a specific access on this object
+	 *
+	 * @param string $gperm_name name of the permission to test
+	 * @return boolean : TRUE if user has access, false if not
+	 **/
 	function accessGranted($perm_name) {
 		$smartpermissions_handler = new SmartobjectPermissionHandler($this->handler);
 		return $smartpermissions_handler->accessGranted($perm_name, $this->id());
@@ -83,295 +81,295 @@ 
 		$this->initVar('close_section_' . $section_name, XOBJ_DTYPE_FORM_SECTION_CLOSE, '', false, null, '', false, '', '', false, false, true);
 	}
 
-    /**
-    *
-    * @param string $key key of this field. This needs to be the name of the field in the related database table
-    * @param int $data_type  set to one of XOBJ_DTYPE_XXX constants (set to XOBJ_DTYPE_OTHER if no data type ckecking nor text sanitizing is required)
-    * @param mixed $value default value of this variable
-    * @param bool $required set to TRUE if this variable needs to have a value set before storing the object in the table
-    * @param int $maxlength maximum length of this variable, for XOBJ_DTYPE_TXTBOX type only
-    * @param string $options does this data have any select options?
-    * @param bool $multilingual is this field needs to support multilingual features (NOT YET IMPLEMENTED...)
-    * @param string $form_caption caption of this variable in a {@link SmartobjectForm} and title of a column in a  {@link SmartObjectTable}
-    * @param string $form_dsc description of this variable in a {@link SmartobjectForm}
-    * @param bool $sortby set to TRUE to make this field used to sort objects in SmartObjectTable
-    * @param bool $persistent set to FALSE if this field is not to be saved in the database
-    */
-    function initVar($key, $data_type, $value = null, $required = false, $maxlength = null, $options = '', $multilingual=false, $form_caption='', $form_dsc='', $sortby=false, $persistent=true, $displayOnForm=true) {
-        //url_ is reserved for files.
-        if (substr($key, 0,4) == 'url_' ) {
-	        trigger_error("Cannot use variable starting with 'url_'.");
-	    }
-        parent::initVar($key, $data_type, $value, $required, $maxlength, $options);
-        if ($this->handler && (!$form_caption || $form_caption == '')) {
-        	$dyn_form_caption = strtoupper('_CO_' . $this->handler->_moduleName . '_' . $this->handler->_itemname . '_' . $key);
-        	if (defined($dyn_form_caption)) {
+	/**
+	 *
+	 * @param string $key key of this field. This needs to be the name of the field in the related database table
+	 * @param int $data_type  set to one of XOBJ_DTYPE_XXX constants (set to XOBJ_DTYPE_OTHER if no data type ckecking nor text sanitizing is required)
+	 * @param mixed $value default value of this variable
+	 * @param bool $required set to TRUE if this variable needs to have a value set before storing the object in the table
+	 * @param int $maxlength maximum length of this variable, for XOBJ_DTYPE_TXTBOX type only
+	 * @param string $options does this data have any select options?
+	 * @param bool $multilingual is this field needs to support multilingual features (NOT YET IMPLEMENTED...)
+	 * @param string $form_caption caption of this variable in a {@link SmartobjectForm} and title of a column in a  {@link SmartObjectTable}
+	 * @param string $form_dsc description of this variable in a {@link SmartobjectForm}
+	 * @param bool $sortby set to TRUE to make this field used to sort objects in SmartObjectTable
+	 * @param bool $persistent set to FALSE if this field is not to be saved in the database
+	 */
+	function initVar($key, $data_type, $value = null, $required = false, $maxlength = null, $options = '', $multilingual=false, $form_caption='', $form_dsc='', $sortby=false, $persistent=true, $displayOnForm=true) {
+		//url_ is reserved for files.
+		if (substr($key, 0,4) == 'url_' ) {
+			trigger_error("Cannot use variable starting with 'url_'.");
+		}
+		parent::initVar($key, $data_type, $value, $required, $maxlength, $options);
+		if ($this->handler && (!$form_caption || $form_caption == '')) {
+			$dyn_form_caption = strtoupper('_CO_' . $this->handler->_moduleName . '_' . $this->handler->_itemname . '_' . $key);
+			if (defined($dyn_form_caption)) {
 				$form_caption = constant($dyn_form_caption);
-        	}
-        }
-        if ($this->handler && (!$form_dsc || $form_dsc == '')) {
-        	$dyn_form_dsc = strtoupper('_CO_' . $this->handler->_moduleName . '_' . $this->handler->_itemname . '_' . $key . '_DSC');
-        	if (defined($dyn_form_dsc)) {
+			}
+		}
+		if ($this->handler && (!$form_dsc || $form_dsc == '')) {
+			$dyn_form_dsc = strtoupper('_CO_' . $this->handler->_moduleName . '_' . $this->handler->_itemname . '_' . $key . '_DSC');
+			if (defined($dyn_form_dsc)) {
 				$form_dsc = constant($dyn_form_dsc);
-        	}
-        }
+			}
+		}
 
 
-        $this->vars[$key] = array_merge($this->vars[$key], array('multilingual' => $multilingual,
-        'form_caption' => $form_caption,
-        'form_dsc' => $form_dsc,
-        'sortby' => $sortby,
-        'persistent' => $persistent,
-        'displayOnForm' => $displayOnForm,
-        'displayOnSingleView' => true,
-        'readonly' => false));
-    }
+		$this->vars[$key] = array_merge($this->vars[$key], array('multilingual' => $multilingual,
+		'form_caption' => $form_caption,
+		'form_dsc' => $form_dsc,
+		'sortby' => $sortby,
+		'persistent' => $persistent,
+		'displayOnForm' => $displayOnForm,
+		'displayOnSingleView' => true,
+		'readonly' => false));
+	}
 
-    function initNonPersistableVar($key, $data_type, $itemName=false, $form_caption='', $sortby=false, $value='', $displayOnForm=false, $required=false) {
+	function initNonPersistableVar($key, $data_type, $itemName=false, $form_caption='', $sortby=false, $value='', $displayOnForm=false, $required=false) {
 		$this->initVar($key, $data_type, $value, $required, null, '', false, $form_caption, '', $sortby, false, $displayOnForm);
 		$this->vars[$key]['itemName'] = $itemName;
-    }
+	}
 
 	/**
-	* Quickly initiate a var
-	*
-	* Since many vars do have the same config, let's use this method with some of these configuration as a convention ;-)
-	*
-	* - $maxlength = 0 unless $data_type is a TEXTBOX, then $maxlength will be 255
-	* - all other vars are NULL or '' depending of the parameter
-	*
-    * @param string $key key of this field. This needs to be the name of the field in the related database table
-    * @param int $data_type  set to one of XOBJ_DTYPE_XXX constants (set to XOBJ_DTYPE_OTHER if no data type ckecking nor text sanitizing is required)
-    * @param bool $required set to TRUE if this variable needs to have a value set before storing the object in the table
-    * @param string $form_caption caption of this variable in a {@link SmartobjectForm} and title of a column in a  {@link SmartObjectTable}
-    * @param string $form_dsc description of this variable in a {@link SmartobjectForm}
-    * @param mixed $value default value of this variable
-    */
+	 * Quickly initiate a var
+	 *
+	 * Since many vars do have the same config, let's use this method with some of these configuration as a convention ;-)
+	 *
+	 * - $maxlength = 0 unless $data_type is a TEXTBOX, then $maxlength will be 255
+	 * - all other vars are NULL or '' depending of the parameter
+	 *
+	 * @param string $key key of this field. This needs to be the name of the field in the related database table
+	 * @param int $data_type  set to one of XOBJ_DTYPE_XXX constants (set to XOBJ_DTYPE_OTHER if no data type ckecking nor text sanitizing is required)
+	 * @param bool $required set to TRUE if this variable needs to have a value set before storing the object in the table
+	 * @param string $form_caption caption of this variable in a {@link SmartobjectForm} and title of a column in a  {@link SmartObjectTable}
+	 * @param string $form_dsc description of this variable in a {@link SmartobjectForm}
+	 * @param mixed $value default value of this variable
+	 */
 	function quickInitVar($key, $data_type, $required=false, $form_caption='', $form_dsc='', $value = null) {
 		$maxlength = $data_type == 'XOBJ_DTYPE_TXTBOX' ? 255 : null;
 		$this->initVar($key, $data_type, $value, $required, $maxlength, '', false, $form_caption, $form_dsc, false, true, true);
 	}
 
-    function initCommonVar($varname, $displayOnForm=true, $default='notdefined') {
-
-    	switch ($varname) {
-            case "dohtml":
-            	$value = $default != 'notdefined' ? $default : true;
-                $this->initVar($varname, XOBJ_DTYPE_INT, $value, false, null, "", false, _CO_SOBJECT_DOHTML_FORM_CAPTION, '', false, true, $displayOnForm);
-                $this->setControl($varname, "yesno");
-                break;
-
-            case "dobr":
-            	$value = ($default === 'notdefined') ? true : $default;
-                $this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, "", false, _CO_SOBJECT_DOBR_FORM_CAPTION, '', false, true, $displayOnForm);
-                $this->setControl($varname, "yesno");
-                break;
-
-            case "doimage":
-            	$value = $default != 'notdefined' ? $default : true;
-                $this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, "", false, _CO_SOBJECT_DOIMAGE_FORM_CAPTION, '', false, true, $displayOnForm);
-                $this->setControl($varname, "yesno");
-                break;
-
-            case "dosmiley":
-            	$value = $default != 'notdefined' ? $default : true;
-                $this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, "", false, _CO_SOBJECT_DOSMILEY_FORM_CAPTION, '', false, true, $displayOnForm);
-                $this->setControl($varname, "yesno");
-                break;
-
-            case "doxcode":
-            	$value = $default != 'notdefined' ? $default : true;
-                $this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, "", false, _CO_SOBJECT_DOXCODE_FORM_CAPTION, '', false, true, $displayOnForm);
-                $this->setControl($varname, "yesno");
-                break;
-
-            case "meta_keywords":
-            	$value = $default != 'notdefined' ? $default : '';
-                $this->initVar($varname, XOBJ_DTYPE_TXTAREA, $value, false, null, '', false, _CO_SOBJECT_META_KEYWORDS, _CO_SOBJECT_META_KEYWORDS_DSC, false, true, $displayOnForm);
-        		$this->setControl('meta_keywords', array(
+	function initCommonVar($varname, $displayOnForm=true, $default='notdefined') {
+
+		switch ($varname) {
+			case "dohtml":
+				$value = $default != 'notdefined' ? $default : true;
+				$this->initVar($varname, XOBJ_DTYPE_INT, $value, false, null, "", false, _CO_SOBJECT_DOHTML_FORM_CAPTION, '', false, true, $displayOnForm);
+				$this->setControl($varname, "yesno");
+				break;
+
+			case "dobr":
+				$value = ($default === 'notdefined') ? true : $default;
+				$this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, "", false, _CO_SOBJECT_DOBR_FORM_CAPTION, '', false, true, $displayOnForm);
+				$this->setControl($varname, "yesno");
+				break;
+
+			case "doimage":
+				$value = $default != 'notdefined' ? $default : true;
+				$this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, "", false, _CO_SOBJECT_DOIMAGE_FORM_CAPTION, '', false, true, $displayOnForm);
+				$this->setControl($varname, "yesno");
+				break;
+
+			case "dosmiley":
+				$value = $default != 'notdefined' ? $default : true;
+				$this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, "", false, _CO_SOBJECT_DOSMILEY_FORM_CAPTION, '', false, true, $displayOnForm);
+				$this->setControl($varname, "yesno");
+				break;
+
+			case "doxcode":
+				$value = $default != 'notdefined' ? $default : true;
+				$this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, "", false, _CO_SOBJECT_DOXCODE_FORM_CAPTION, '', false, true, $displayOnForm);
+				$this->setControl($varname, "yesno");
+				break;
+
+			case "meta_keywords":
+				$value = $default != 'notdefined' ? $default : '';
+				$this->initVar($varname, XOBJ_DTYPE_TXTAREA, $value, false, null, '', false, _CO_SOBJECT_META_KEYWORDS, _CO_SOBJECT_META_KEYWORDS_DSC, false, true, $displayOnForm);
+				$this->setControl('meta_keywords', array(
 										'name' => 'textarea',
-                                        'form_editor'=>'textarea'
-                                        ));
-                break;
-
-            case "meta_description":
-            	$value = $default != 'notdefined' ? $default : '';
-                $this->initVar($varname, XOBJ_DTYPE_TXTAREA, $value, false, null, '', false, _CO_SOBJECT_META_DESCRIPTION, _CO_SOBJECT_META_DESCRIPTION_DSC, false, true, $displayOnForm);
-        		$this->setControl('meta_description', array(
+										'form_editor'=>'textarea'
+										));
+				break;
+
+			case "meta_description":
+				$value = $default != 'notdefined' ? $default : '';
+				$this->initVar($varname, XOBJ_DTYPE_TXTAREA, $value, false, null, '', false, _CO_SOBJECT_META_DESCRIPTION, _CO_SOBJECT_META_DESCRIPTION_DSC, false, true, $displayOnForm);
+				$this->setControl('meta_description', array(
 										'name' => 'textarea',
-                                        'form_editor'=>'textarea'
-                                        ));
-                break;
-
-            case "short_url":
-            	$value = $default != 'notdefined' ? $default : '';
-                $this->initVar($varname, XOBJ_DTYPE_TXTBOX,$value, false, null, "", false, _CO_SOBJECT_SHORT_URL, _CO_SOBJECT_SHORT_URL_DSC, false, true, $displayOnForm);
-                break;
-
-            case "hierarchy_path":
-            	$value = $default != 'notdefined' ? $default : '';
-                $this->initVar($varname, XOBJ_DTYPE_ARRAY, $value, false, null, "", false, _CO_SOBJECT_HIERARCHY_PATH, _CO_SOBJECT_HIERARCHY_PATH_DSC, false, true, $displayOnForm);
-                break;
-
-            case "counter":
-            	$value = $default != 'notdefined' ? $default : 0;
-                $this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, '', false, _CO_SOBJECT_COUNTER_FORM_CAPTION, '', false, true, $displayOnForm);
-                break;
-
-            case "weight":
-            	$value = $default != 'notdefined' ? $default : 0;
-                $this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, '', false, _CO_SOBJECT_WEIGHT_FORM_CAPTION, '', true, true, $displayOnForm);
-                break;
-            case "custom_css":
-            	$value = $default != 'notdefined' ? $default : '';
-                $this->initVar($varname, XOBJ_DTYPE_TXTAREA, $value, false, null, '', false, _CO_SOBJECT_CUSTOM_CSS, _CO_SOBJECT_CUSTOM_CSS_DSC, false, true, $displayOnForm);
-        		$this->setControl('custom_css', array(
+										'form_editor'=>'textarea'
+										));
+				break;
+
+			case "short_url":
+				$value = $default != 'notdefined' ? $default : '';
+				$this->initVar($varname, XOBJ_DTYPE_TXTBOX,$value, false, null, "", false, _CO_SOBJECT_SHORT_URL, _CO_SOBJECT_SHORT_URL_DSC, false, true, $displayOnForm);
+				break;
+
+			case "hierarchy_path":
+				$value = $default != 'notdefined' ? $default : '';
+				$this->initVar($varname, XOBJ_DTYPE_ARRAY, $value, false, null, "", false, _CO_SOBJECT_HIERARCHY_PATH, _CO_SOBJECT_HIERARCHY_PATH_DSC, false, true, $displayOnForm);
+				break;
+
+			case "counter":
+				$value = $default != 'notdefined' ? $default : 0;
+				$this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, '', false, _CO_SOBJECT_COUNTER_FORM_CAPTION, '', false, true, $displayOnForm);
+				break;
+
+			case "weight":
+				$value = $default != 'notdefined' ? $default : 0;
+				$this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, '', false, _CO_SOBJECT_WEIGHT_FORM_CAPTION, '', true, true, $displayOnForm);
+				break;
+			case "custom_css":
+				$value = $default != 'notdefined' ? $default : '';
+				$this->initVar($varname, XOBJ_DTYPE_TXTAREA, $value, false, null, '', false, _CO_SOBJECT_CUSTOM_CSS, _CO_SOBJECT_CUSTOM_CSS_DSC, false, true, $displayOnForm);
+				$this->setControl('custom_css', array(
 									'name' => 'textarea',
 									'form_editor'=>'textarea',
 									));
-                break;
-        }
+				break;
+		}
 		$this->hideFieldFromSingleView($varname);
-    }
-
-    /**
-     * Set control information for an instance variable
-     *
-     * The $options parameter can be a string or an array. Using a string
-     * is the quickest way :
-     *
-     * $this->setControl('date', 'date_time');
-     *
-     * This will create a date and time selectbox for the 'date' var on the
-     * form to edit or create this item.
-     *
-     * Here are the currently supported controls :
+	}
+
+	/**
+	 * Set control information for an instance variable
+	 *
+	 * The $options parameter can be a string or an array. Using a string
+	 * is the quickest way :
+	 *
+	 * $this->setControl('date', 'date_time');
+	 *
+	 * This will create a date and time selectbox for the 'date' var on the
+	 * form to edit or create this item.
+	 *
+	 * Here are the currently supported controls :
+	 *
+	 * 		- color
+	 * 		- country
+	 * 		- date_time
+	 * 		- date
+	 * 		- email
+	 * 		- group
+	 * 		- group_multi
+	 * 		- image
+	 * 		- imageupload
+	 * 		- label
+	 * 		- language
+	 * 		- parentcategory
+	 * 		- password
+	 * 		- select_multi
+	 * 		- select
+	 * 		- text
+	 * 		- textarea
+	 * 		- theme
+	 * 		- theme_multi
+	 * 		- timezone
+	 * 		- user
+	 * 		- user_multi
+	 * 		- yesno
+	 *
+	 * Now, using an array as $options, you can customize what information to
+	 * use in the control. For example, if one needs to display a select box for
+	 * the user to choose the status of an item. We only need to tell SmartObject
+	 * what method to execute within what handler to retreive the options of the
+	 * selectbox.
+	 *
+	 * $this->setControl('status', array('name' => false,
+	 * 	                                 'itemHandler' => 'item',
+	 *                                   'method' => 'getStatus',
+	 *                                   'module' => 'smartshop'));
+	 *
+	 * In this example, the array elements are the following :
+	 * 		- name : false, as we don't need to set a special control here.
+	 * 				 we will use the default control related to the object type (defined in initVar)
+	 * 		- itemHandler : name of the object for which we will use the handler
+	 * 		- method : name of the method of this handler that we will execute
+	 * 		- module : name of the module from wich the handler is
+	 *
+	 * So in this example, SmartObject will create a selectbox for the variable 'status' and it will
+	 * populate this selectbox with the result from SmartshopItemHandler::getStatus()
+	 *
+	 * Another example of the use of $options as an array is for TextArea :
+	 *
+	 * $this->setControl('body', array('name' => 'textarea',
+	 *                                   'form_editor' => 'default'));
+	 *
+	 * In this example, SmartObject will create a TextArea for the variable 'body'. And it will use
+	 * the 'default' editor, providing it is defined in the module
+	 * preferences : $xoopsModuleConfig['default_editor']
+	 *
+	 * Of course, you can force the use of a specific editor :
+	 *
+	 * $this->setControl('body', array('name' => 'textarea',
+	 *                                   'form_editor' => 'koivi'));
+	 *
+	 * Here is a list of supported editor :
+	 * 		- tiny : TinyEditor
+	 * 		- dhtmltextarea : XOOPS DHTML Area
+	 * 		- fckeditor	: FCKEditor
+	 * 		- inbetween : InBetween
+	 * 		- koivi : Koivi
+	 * 		- spaw : Spaw WYSIWYG Editor
+	 * 		- htmlarea : HTMLArea
+	 * 		- textarea : basic textarea with no options
+	 *
+	 * @param string $var name of the variable for which we want to set a control
+	 * @param array $options
+	 */
+	function setControl($var, $options=array()) {
+		if (isset($this->controls[$var])) {
+			unset($this->controls[$var]);
+		}
+		if (is_string($options)) {
+			$options = array('name' => $options);
+		}
+		$this->controls[$var] = $options;
+	}
+
+	/**
+	 * Get control information for an instance variable
 	 *
-     * 		- color
-     * 		- country
-     * 		- date_time
-     * 		- date
-     * 		- email
-     * 		- group
-     * 		- group_multi
-     * 		- image
-     * 		- imageupload
-     * 		- label
-     * 		- language
-     * 		- parentcategory
-     * 		- password
-     * 		- select_multi
-     * 		- select
-     * 		- text
-     * 		- textarea
-     * 		- theme
-     * 		- theme_multi
-     * 		- timezone
-     * 		- user
-     * 		- user_multi
-     * 		- yesno
-     *
-     * Now, using an array as $options, you can customize what information to
-     * use in the control. For example, if one needs to display a select box for
-     * the user to choose the status of an item. We only need to tell SmartObject
-     * what method to execute within what handler to retreive the options of the
-     * selectbox.
-     *
-     * $this->setControl('status', array('name' => false,
-     * 	                                 'itemHandler' => 'item',
-     *                                   'method' => 'getStatus',
-     *                                   'module' => 'smartshop'));
-     *
-     * In this example, the array elements are the following :
-     * 		- name : false, as we don't need to set a special control here.
-     * 				 we will use the default control related to the object type (defined in initVar)
-     * 		- itemHandler : name of the object for which we will use the handler
-     * 		- method : name of the method of this handler that we will execute
-     * 		- module : name of the module from wich the handler is
-     *
-     * So in this example, SmartObject will create a selectbox for the variable 'status' and it will
-     * populate this selectbox with the result from SmartshopItemHandler::getStatus()
-     *
-     * Another example of the use of $options as an array is for TextArea :
-     *
-     * $this->setControl('body', array('name' => 'textarea',
-     *                                   'form_editor' => 'default'));
-     *
-     * In this example, SmartObject will create a TextArea for the variable 'body'. And it will use
-     * the 'default' editor, providing it is defined in the module
-     * preferences : $xoopsModuleConfig['default_editor']
-     *
-     * Of course, you can force the use of a specific editor :
-     *
-     * $this->setControl('body', array('name' => 'textarea',
-     *                                   'form_editor' => 'koivi'));
-     *
-     * Here is a list of supported editor :
-     * 		- tiny : TinyEditor
-     * 		- dhtmltextarea : XOOPS DHTML Area
-     * 		- fckeditor	: FCKEditor
-     * 		- inbetween : InBetween
-     * 		- koivi : Koivi
-     * 		- spaw : Spaw WYSIWYG Editor
-     * 		- htmlarea : HTMLArea
-     * 		- textarea : basic textarea with no options
-     *
-     * @param string $var name of the variable for which we want to set a control
-     * @param array $options
-     */
-    function setControl($var, $options=array()) {
-        if (isset($this->controls[$var])) {
-        	unset($this->controls[$var]);
-        }
-        if (is_string($options)) {
-            $options = array('name' => $options);
-        }
-        $this->controls[$var] = $options;
-    }
-
-    /**
-     * Get control information for an instance variable
-     *
-     * @param string $var
-     */
-    function getControl($var) {
-        return isset($this->controls[$var]) ? $this->controls[$var] : false;
-    }
-
-    /**
-    * Create the form for this object
-    *
-    * @return a {@link SmartobjectForm} object for this object
-    *
-    * @see SmartObjectForm::SmartObjectForm()
-    */
-    function getForm($form_caption, $form_name, $form_action=false, $submit_button_caption = _CO_SOBJECT_SUBMIT, $cancel_js_action=false, $captcha=false)
-    {
-        include_once SMARTOBJECT_ROOT_PATH . "class/form/smartobjectform.php";
-        $form = new SmartobjectForm($this, $form_name, $form_caption, $form_action, null, $submit_button_caption, $cancel_js_action, $captcha);
-
-        return $form;
-    }
-
-    function toArray()
-    {
-        $ret = array();
-        $vars = $this->getVars();
-        foreach ($vars as $key=>$var) {
-            $value = $this->getVar($key);
-            $ret[$key] = $value;
-        }
-        if ($this->handler->identifierName != "") {
-        	$controller = new SmartObjectController($this->handler);
-        	/**
-	    	 * Addition of some automatic value
-	    	 */
-        	$ret['itemLink'] = $controller->getItemLink($this);
-        	$ret['itemUrl'] = $controller->getItemLink($this, true);
-        	$ret['editItemLink'] = $controller->getEditItemLink($this, false, true);
-        	$ret['deleteItemLink'] = $controller->getDeleteItemLink($this, false, true);
-        	$ret['printAndMailLink'] = $controller->getPrintAndMailLink($this);
-        }
+	 * @param string $var
+	 */
+	function getControl($var) {
+		return isset($this->controls[$var]) ? $this->controls[$var] : false;
+	}
+
+	/**
+	 * Create the form for this object
+	 *
+	 * @return a {@link SmartobjectForm} object for this object
+	 *
+	 * @see SmartObjectForm::SmartObjectForm()
+	 */
+	function getForm($form_caption, $form_name, $form_action=false, $submit_button_caption = _CO_SOBJECT_SUBMIT, $cancel_js_action=false, $captcha=false)
+	{
+		include_once SMARTOBJECT_ROOT_PATH . "class/form/smartobjectform.php";
+		$form = new SmartobjectForm($this, $form_name, $form_caption, $form_action, null, $submit_button_caption, $cancel_js_action, $captcha);
+
+		return $form;
+	}
+
+	function toArray()
+	{
+		$ret = array();
+		$vars = $this->getVars();
+		foreach ($vars as $key=>$var) {
+			$value = $this->getVar($key);
+			$ret[$key] = $value;
+		}
+		if ($this->handler->identifierName != "") {
+			$controller = new SmartObjectController($this->handler);
+			/**
+			 * Addition of some automatic value
+			 */
+			$ret['itemLink'] = $controller->getItemLink($this);
+			$ret['itemUrl'] = $controller->getItemLink($this, true);
+			$ret['editItemLink'] = $controller->getEditItemLink($this, false, true);
+			$ret['deleteItemLink'] = $controller->getDeleteItemLink($this, false, true);
+			$ret['printAndMailLink'] = $controller->getPrintAndMailLink($this);
+		}
 
 		// Hightlighting searched words
 		include_once(SMARTOBJECT_ROOT_PATH . 'class/smarthighlighter.php');
@@ -387,64 +385,64 @@ 
 			}
 		}
 
-        return $ret;
-    }
-
-    /**
-     * add an error
-     *
-     * @param string $value error to add
-     * @access public
-     */
-    function setErrors($err_str, $prefix=false)
-    {
-    	if (is_array($err_str)) {
-            foreach($err_str as $str) {
-                $this->setErrors($str, $prefix);
-            }
-        } else {
-        	if ($prefix) {
-        		$err_str = "[" . $prefix . "] " . $err_str;
-        	}
-            parent::setErrors($err_str);
-        }
-    }
-
-    function setFieldAsRequired($field, $required=true) {
-    	if (is_array($field)) {
+		return $ret;
+	}
+
+	/**
+	 * add an error
+	 *
+	 * @param string $value error to add
+	 * @access public
+	 */
+	function setErrors($err_str, $prefix=false)
+	{
+		if (is_array($err_str)) {
+			foreach($err_str as $str) {
+				$this->setErrors($str, $prefix);
+			}
+		} else {
+			if ($prefix) {
+				$err_str = "[" . $prefix . "] " . $err_str;
+			}
+			parent::setErrors($err_str);
+		}
+	}
+
+	function setFieldAsRequired($field, $required=true) {
+		if (is_array($field)) {
 			foreach($field as $v) {
 				$this->doSetFieldAsRequired($v, $required);
 			}
-    	} else {
-    		$this->doSetFieldAsRequired($field, $required);
-    	}
-    }
+		} else {
+			$this->doSetFieldAsRequired($field, $required);
+		}
+	}
 
-    function setFieldForSorting($field) {
-    	if (is_array($field)) {
+	function setFieldForSorting($field) {
+		if (is_array($field)) {
 			foreach($field as $v) {
 				$this->doSetFieldForSorting($v);
 			}
-    	} else {
-    		$this->doSetFieldForSorting($field);
-    	}
-    }
-
-    function hasError() {
-    	return count($this->_errors) > 0;
-    }
-
-    function setImageDir($url, $path)
-    {
-        $this->_image_url = $url;
-        $this->_image_path = $path;
-    }
-
-    /**
-     * Retreive the group that have been granted access to a specific permission for this object
-     *
-     * @return string $group_perm name of the permission
-     */
+		} else {
+			$this->doSetFieldForSorting($field);
+		}
+	}
+
+	function hasError() {
+		return count($this->_errors) > 0;
+	}
+
+	function setImageDir($url, $path)
+	{
+		$this->_image_url = $url;
+		$this->_image_path = $path;
+	}
+
+	/**
+	 * Retreive the group that have been granted access to a specific permission for this object
+	 *
+	 * @return string $group_perm name of the permission
+	 */
 	function getGroupPerm($group_perm) {
 		if (!$this->handler->getPermissions()) {
 			$this->setError("Trying to access a permission that does not exists for thisobject's handler");
@@ -461,25 +459,25 @@ 
 		}
 	}
 
-    function getImageDir($path=false)
-    {
-        if ($path) {
-            return $this->_image_path;
-        } else {
-            return $this->_image_url;
-        }
-    }
+	function getImageDir($path=false)
+	{
+		if ($path) {
+			return $this->_image_path;
+		} else {
+			return $this->_image_url;
+		}
+	}
 
 	function getUploadDir($path=false)
-    {
-        if ($path) {
-            return $this->_image_path;
-        } else {
-            return $this->_image_url;
-        }
-    }
-
-    function getVarInfo($key = '', $info = '') {
+	{
+		if ($path) {
+			return $this->_image_path;
+		} else {
+			return $this->_image_url;
+		}
+	}
+
+	function getVarInfo($key = '', $info = '') {
 		if (isset($this->vars[$key][$info])) {
 			return $this->vars[$key][$info];
 		}elseif ($info == '' && isset($this->vars[$key])) {
@@ -489,80 +487,80 @@ 
 		}
 	}
 
-    /**
-     * Get the id of the object
-     *
-     * @return int id of this object
-     */
-    function id() {
-    	return $this->getVar($this->handler->keyName, 'e');
-    }
-
-    /**
-     * Return the value of the title field of this object
-     *
-     * @return string
-     */
-    function title($format='s')
-    {
-        return $this->getVar($this->handler->identifierName, $format);
-    }
-
-    /**
-     * Return the value of the title field of this object
-     *
-     * @return string
-     */
-    function summary()
-    {
-        if ($this->handler->summaryName) {
-            return $this->getVar($this->handler->summaryName);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Retreive the object admin side link, displayijng a SingleView page
-     *
-     * @param bool $onlyUrl wether or not to return a simple URL or a full <a> link
-     * @return string user side link to the object
-     */
-    function getAdminViewItemLink($onlyUrl=false)
-    {
-    	$controller = new SmartObjectController($this->handler);
-    	return $controller->getAdminViewItemLink($this, $onlyUrl);
-    }
-
-    /**
-     * Retreive the object user side link
-     *
-     * @param bool $onlyUrl wether or not to return a simple URL or a full <a> link
-     * @return string user side link to the object
-     */
-    function getItemLink($onlyUrl=false)
-    {
-    	$controller = new SmartObjectController($this->handler);
-    	return $controller->getItemLink($this, $onlyUrl);
-    }
-
-    function getEditItemLink($onlyUrl=false, $withimage=true, $userSide=false)
-    {
-    	$controller = new SmartObjectController($this->handler);
-    	return $controller->getEditItemLink($this, $onlyUrl, $withimage, $userSide);
-    }
-
-    function getDeleteItemLink($onlyUrl=false, $withimage=false, $userSide=false)
-    {
-    	$controller = new SmartObjectController($this->handler);
-    	return $controller->getDeleteItemLink($this, $onlyUrl, $withimage, $userSide);
-    }
-
-    function getPrintAndMailLink()
-    {
-    	$controller = new SmartObjectController($this->handler);
-    	return $controller->getPrintAndMailLink($this);
-    }
+	/**
+	 * Get the id of the object
+	 *
+	 * @return int id of this object
+	 */
+	function id() {
+		return $this->getVar($this->handler->keyName, 'e');
+	}
+
+	/**
+	 * Return the value of the title field of this object
+	 *
+	 * @return string
+	 */
+	function title($format='s')
+	{
+		return $this->getVar($this->handler->identifierName, $format);
+	}
+
+	/**
+	 * Return the value of the title field of this object
+	 *
+	 * @return string
+	 */
+	function summary()
+	{
+		if ($this->handler->summaryName) {
+			return $this->getVar($this->handler->summaryName);
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Retreive the object admin side link, displayijng a SingleView page
+	 *
+	 * @param bool $onlyUrl wether or not to return a simple URL or a full <a> link
+	 * @return string user side link to the object
+	 */
+	function getAdminViewItemLink($onlyUrl=false)
+	{
+		$controller = new SmartObjectController($this->handler);
+		return $controller->getAdminViewItemLink($this, $onlyUrl);
+	}
+
+	/**
+	 * Retreive the object user side link
+	 *
+	 * @param bool $onlyUrl wether or not to return a simple URL or a full <a> link
+	 * @return string user side link to the object
+	 */
+	function getItemLink($onlyUrl=false)
+	{
+		$controller = new SmartObjectController($this->handler);
+		return $controller->getItemLink($this, $onlyUrl);
+	}
+
+	function getEditItemLink($onlyUrl=false, $withimage=true, $userSide=false)
+	{
+		$controller = new SmartObjectController($this->handler);
+		return $controller->getEditItemLink($this, $onlyUrl, $withimage, $userSide);
+	}
+
+	function getDeleteItemLink($onlyUrl=false, $withimage=false, $userSide=false)
+	{
+		$controller = new SmartObjectController($this->handler);
+		return $controller->getDeleteItemLink($this, $onlyUrl, $withimage, $userSide);
+	}
+
+	function getPrintAndMailLink()
+	{
+		$controller = new SmartObjectController($this->handler);
+		return $controller->getPrintAndMailLink($this);
+	}
 
 	function getFieldsForSorting($sortsel) {
 		$ret = array();
@@ -590,12 +588,12 @@ 
 	}
 
 	function getValueFor($key, $editor=true) {
-    	global $xoopsModuleConfig;
+		global $xoopsModuleConfig;
 
-    	$ret = $this->getVar($key, 'n');
-    	$myts = MyTextSanitizer::getInstance();
+		$ret = $this->getVar($key, 'n');
+		$myts = MyTextSanitizer::getInstance();
 
-    	$control = isset($this->controls[$key]) ? $this->controls[$key] : false;
+		$control = isset($this->controls[$key]) ? $this->controls[$key] : false;
 		$form_editor = isset($control['form_editor']) ? $control['form_editor'] : 'textarea';
 
 		$html = isset($this->vars['dohtml']) ? $this->getVar('dohtml') : true;
@@ -605,7 +603,7 @@ 
 		$br = isset($this->vars['dobr']) ? $this->getVar('dobr') : true;
 		$formatML = true;
 
-    	if ($form_editor == 'default') {
+		if ($form_editor == 'default') {
 			global $xoopsModuleConfig;
 			$form_editor = isset($xoopsModuleConfig['default_editor']) ? $xoopsModuleConfig['default_editor'] : 'textarea';
 		}
@@ -626,260 +624,260 @@ 
 		}
 	}
 
-    /**
-     * clean values of all variables of the object for storage.
-     * also add slashes whereever needed
-     *
-     * We had to put this method in the SmartObject because the XOBJ_DTYPE_ARRAY does not work properly
-     * at least on PHP 5.1. So we have created a new type XOBJ_DTYPE_SIMPLE_ARRAY to handle 1 level array
-     * as a string separated by |
-     *
-     * @return bool true if successful
-     * @access public
-     */
-    function cleanVars()
-    {
-        $ts =& MyTextSanitizer::getInstance();
-        $existing_errors = $this->getErrors();
-        $this->_errors = array();
-        foreach ($this->vars as $k => $v) {
+	/**
+	 * clean values of all variables of the object for storage.
+	 * also add slashes whereever needed
+	 *
+	 * We had to put this method in the SmartObject because the XOBJ_DTYPE_ARRAY does not work properly
+	 * at least on PHP 5.1. So we have created a new type XOBJ_DTYPE_SIMPLE_ARRAY to handle 1 level array
+	 * as a string separated by |
+	 *
+	 * @return bool true if successful
+	 * @access public
+	 */
+	function cleanVars()
+	{
+		$ts =& MyTextSanitizer::getInstance();
+		$existing_errors = $this->getErrors();
+		$this->_errors = array();
+		foreach ($this->vars as $k => $v) {
 			$cleanv = $v['value'];
-            if (!$v['changed']) {
-            } else {
-                $cleanv = is_string($cleanv) ? trim($cleanv) : $cleanv;
-                switch ($v['data_type']) {
-                case XOBJ_DTYPE_TXTBOX:
-                    if ($v['required'] && $cleanv != '0' && $cleanv == '') {
-                        $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
-                        continue;
-                    }
-                    if (isset($v['maxlength']) && strlen($cleanv) > intval($v['maxlength'])) {
-                        $this->setErrors( sprintf( _XOBJ_ERR_SHORTERTHAN, $k, intval( $v['maxlength'] ) ) );
-                        continue;
-                    }
-                    if (!$v['not_gpc']) {
-                        $cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
-                    } else {
-                        $cleanv = $ts->censorString($cleanv);
-                    }
-                    break;
-                case XOBJ_DTYPE_TXTAREA:
-                    if ($v['required'] && $cleanv != '0' && $cleanv == '') {
-                        $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
-                        continue;
-                    }
-                    if (!$v['not_gpc']) {
-                        $cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
-                    } else {
-                        $cleanv = $ts->censorString($cleanv);
-                    }
-                    break;
-                case XOBJ_DTYPE_SOURCE:
-                    if (!$v['not_gpc']) {
-                        $cleanv = $ts->stripSlashesGPC($cleanv);
-                    } else {
-                        $cleanv = $cleanv;
-                    }
-                    break;
-                case XOBJ_DTYPE_INT:
-                case XOBJ_DTYPE_TIME_ONLY:
-                    $cleanv = intval($cleanv);
-                    break;
-
-                case XOBJ_DTYPE_CURRENCY:
-                    $cleanv = smart_currency($cleanv);
-                    break;
-
-                case XOBJ_DTYPE_FLOAT:
-                    $cleanv = smart_float($cleanv);
-                    break;
-
-                case XOBJ_DTYPE_EMAIL:
-                    if ($v['required'] && $cleanv == '') {
-                        $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
-                        continue;
-                    }
-                    if ($cleanv != '' && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$cleanv)) {
-                        $this->setErrors("Invalid Email");
-                        continue;
-                    }
-                    if (!$v['not_gpc']) {
-                        $cleanv = $ts->stripSlashesGPC($cleanv);
-                    }
-                    break;
-                case XOBJ_DTYPE_URL:
-                    if ($v['required'] && $cleanv == '') {
-                        $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
-                        continue;
-                    }
-                    if ($cleanv != '' && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
-                        $cleanv = 'http://' . $cleanv;
-                    }
-                    if (!$v['not_gpc']) {
-                        $cleanv =& $ts->stripSlashesGPC($cleanv);
-                    }
-                    break;
-                case XOBJ_DTYPE_SIMPLE_ARRAY:
-                    $cleanv = implode('|', $cleanv);
-                    break;
-                case XOBJ_DTYPE_ARRAY:
-                    $cleanv = serialize($cleanv);
-                    break;
-                case XOBJ_DTYPE_STIME:
-                case XOBJ_DTYPE_MTIME:
-                case XOBJ_DTYPE_LTIME:
-                    $cleanv = !is_string($cleanv) ? intval($cleanv) : strtotime($cleanv);
-                    if (!($cleanv > 0)) {
-                    	$cleanv = strtotime($cleanv);
-                    }
-                    break;
-                default:
-                    break;
-                }
-            }
-            $this->cleanVars[$k] =& $cleanv;
-            unset($cleanv);
-        }
-        if (count($this->_errors) > 0) {
-	        $this->_errors = array_merge($existing_errors, $this->_errors);
-            return false;
-        }
-	    $this->_errors = array_merge($existing_errors, $this->_errors);
-        $this->unsetDirty();
-        return true;
-    }
-
-    /**
-    * returns a specific variable for the object in a proper format
-    *
-    * We had to put this method in the SmartObject because the XOBJ_DTYPE_ARRAY does not work properly
-    * at least on PHP 5.1. So we have created a new type XOBJ_DTYPE_SIMPLE_ARRAY to handle 1 level array
-    * as a string separated by |
-    *
-    * @access public
-    * @param string $key key of the object's variable to be returned
-    * @param string $format format to use for the output
-    * @return mixed formatted value of the variable
-    */
-    function getVar($key, $format = 's')
-    {
-    	global $myts;
-
-        $ret = $this->vars[$key]['value'];
-
-        switch ($this->vars[$key]['data_type']) {
-
-        case XOBJ_DTYPE_TXTBOX:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-            	// ML Hack by marcan
-                $ts =& MyTextSanitizer::getInstance();
-                $ret = $ts->htmlSpecialChars($ret);
-
-                if (method_exists($myts, 'formatForML')) {
-                	return $ts->formatForML($ret);
-                } else {
-                	return $ret;
-                }
-            	break 1;
-            	// End of ML Hack by marcan
-
-            case 'clean':
+			if (!$v['changed']) {
+			} else {
+				$cleanv = is_string($cleanv) ? trim($cleanv) : $cleanv;
+				switch ($v['data_type']) {
+				case XOBJ_DTYPE_TXTBOX:
+					if ($v['required'] && $cleanv != '0' && $cleanv == '') {
+						$this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
+						continue;
+					}
+					if (isset($v['maxlength']) && strlen($cleanv) > intval($v['maxlength'])) {
+						$this->setErrors( sprintf( _XOBJ_ERR_SHORTERTHAN, $k, intval( $v['maxlength'] ) ) );
+						continue;
+					}
+					if (!$v['not_gpc']) {
+						$cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
+					} else {
+						$cleanv = $ts->censorString($cleanv);
+					}
+					break;
+				case XOBJ_DTYPE_TXTAREA:
+					if ($v['required'] && $cleanv != '0' && $cleanv == '') {
+						$this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
+						continue;
+					}
+					if (!$v['not_gpc']) {
+						$cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
+					} else {
+						$cleanv = $ts->censorString($cleanv);
+					}
+					break;
+				case XOBJ_DTYPE_SOURCE:
+					if (!$v['not_gpc']) {
+						$cleanv = $ts->stripSlashesGPC($cleanv);
+					} else {
+						$cleanv = $cleanv;
+					}
+					break;
+				case XOBJ_DTYPE_INT:
+				case XOBJ_DTYPE_TIME_ONLY:
+					$cleanv = intval($cleanv);
+					break;
+
+				case XOBJ_DTYPE_CURRENCY:
+					$cleanv = smart_currency($cleanv);
+					break;
+
+				case XOBJ_DTYPE_FLOAT:
+					$cleanv = smart_float($cleanv);
+					break;
+
+				case XOBJ_DTYPE_EMAIL:
+					if ($v['required'] && $cleanv == '') {
+						$this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
+						continue;
+					}
+					if ($cleanv != '' && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$cleanv)) {
+						$this->setErrors("Invalid Email");
+						continue;
+					}
+					if (!$v['not_gpc']) {
+						$cleanv = $ts->stripSlashesGPC($cleanv);
+					}
+					break;
+				case XOBJ_DTYPE_URL:
+					if ($v['required'] && $cleanv == '') {
+						$this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
+						continue;
+					}
+					if ($cleanv != '' && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
+						$cleanv = 'http://' . $cleanv;
+					}
+					if (!$v['not_gpc']) {
+						$cleanv =& $ts->stripSlashesGPC($cleanv);
+					}
+					break;
+				case XOBJ_DTYPE_SIMPLE_ARRAY:
+					$cleanv = implode('|', $cleanv);
+					break;
+				case XOBJ_DTYPE_ARRAY:
+					$cleanv = serialize($cleanv);
+					break;
+				case XOBJ_DTYPE_STIME:
+				case XOBJ_DTYPE_MTIME:
+				case XOBJ_DTYPE_LTIME:
+					$cleanv = !is_string($cleanv) ? intval($cleanv) : strtotime($cleanv);
+					if (!($cleanv > 0)) {
+						$cleanv = strtotime($cleanv);
+					}
+					break;
+				default:
+					break;
+				}
+			}
+			$this->cleanVars[$k] =& $cleanv;
+			unset($cleanv);
+		}
+		if (count($this->_errors) > 0) {
+			$this->_errors = array_merge($existing_errors, $this->_errors);
+			return false;
+		}
+		$this->_errors = array_merge($existing_errors, $this->_errors);
+		$this->unsetDirty();
+		return true;
+	}
+
+	/**
+	 * returns a specific variable for the object in a proper format
+	 *
+	 * We had to put this method in the SmartObject because the XOBJ_DTYPE_ARRAY does not work properly
+	 * at least on PHP 5.1. So we have created a new type XOBJ_DTYPE_SIMPLE_ARRAY to handle 1 level array
+	 * as a string separated by |
+	 *
+	 * @access public
+	 * @param string $key key of the object's variable to be returned
+	 * @param string $format format to use for the output
+	 * @return mixed formatted value of the variable
+	 */
+	function getVar($key, $format = 's')
+	{
+		global $myts;
+
+		$ret = $this->vars[$key]['value'];
+
+		switch ($this->vars[$key]['data_type']) {
+
+		case XOBJ_DTYPE_TXTBOX:
+			switch (strtolower($format)) {
+			case 's':
+			case 'show':
+				// ML Hack by marcan
+				$ts =& MyTextSanitizer::getInstance();
+				$ret = $ts->htmlSpecialChars($ret);
+
+				if (method_exists($myts, 'formatForML')) {
+					return $ts->formatForML($ret);
+				} else {
+					return $ret;
+				}
+				break 1;
+				// End of ML Hack by marcan
+
+			case 'clean':
 				$ts =& MyTextSanitizer::getInstance();
 
 				$ret = smart_html2text($ret);
 				$ret = smart_purifyText($ret);
 
-                if (method_exists($myts, 'formatForML')) {
-                	return $ts->formatForML($ret);
-                } else {
-                	return $ret;
-                }
-            	break 1;
-            	// End of ML Hack by marcan
-
-            case 'e':
-            case 'edit':
-                $ts =& MyTextSanitizer::getInstance();
-                return $ts->htmlSpecialChars($ret);
-                break 1;
-            case 'p':
-            case 'preview':
-            case 'f':
-            case 'formpreview':
-                $ts =& MyTextSanitizer::getInstance();
-                return $ts->htmlSpecialChars($ts->stripSlashesGPC($ret));
-                break 1;
-            case 'n':
-            case 'none':
-            default:
-                break 1;
-            }
-            break;
-        case XOBJ_DTYPE_LTIME:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-            case 'p':
-            case 'preview':
-            case 'f':
-            case 'formpreview':
-                $ret = formatTimestamp($ret, _DATESTRING);
-                return $ret;
-            	break 1;
-            case 'n':
-            case 'none':
-            case 'e':
-            case 'edit':
-                break 1;
-            default:
-                break 1;
-            }
-            break;
-        case XOBJ_DTYPE_STIME:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-            case 'p':
-            case 'preview':
-            case 'f':
-            case 'formpreview':
-                $ret = formatTimestamp($ret, _SHORTDATESTRING);
-                return $ret;
-            	break 1;
-            case 'n':
-            case 'none':
-            case 'e':
-            case 'edit':
-                break 1;
-            default:
-                break 1;
-            }
-            break;
-        case XOBJ_DTYPE_TIME_ONLY:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-            case 'p':
-            case 'preview':
-            case 'f':
-            case 'formpreview':
-                $ret = formatTimestamp($ret, 'G:i');
-                return $ret;
-            	break 1;
-            case 'n':
-            case 'none':
-            case 'e':
-            case 'edit':
-                break 1;
-            default:
-                break 1;
-            }
-            break;
-
-        case XOBJ_DTYPE_CURRENCY:
-	        $decimal_section_original = strstr($ret, '.');
+				if (method_exists($myts, 'formatForML')) {
+					return $ts->formatForML($ret);
+				} else {
+					return $ret;
+				}
+				break 1;
+				// End of ML Hack by marcan
+
+			case 'e':
+			case 'edit':
+				$ts =& MyTextSanitizer::getInstance();
+				return $ts->htmlSpecialChars($ret);
+				break 1;
+			case 'p':
+			case 'preview':
+			case 'f':
+			case 'formpreview':
+				$ts =& MyTextSanitizer::getInstance();
+				return $ts->htmlSpecialChars($ts->stripSlashesGPC($ret));
+				break 1;
+			case 'n':
+			case 'none':
+			default:
+				break 1;
+			}
+			break;
+		case XOBJ_DTYPE_LTIME:
+			switch (strtolower($format)) {
+			case 's':
+			case 'show':
+			case 'p':
+			case 'preview':
+			case 'f':
+			case 'formpreview':
+				$ret = formatTimestamp($ret, _DATESTRING);
+				return $ret;
+				break 1;
+			case 'n':
+			case 'none':
+			case 'e':
+			case 'edit':
+				break 1;
+			default:
+				break 1;
+			}
+			break;
+		case XOBJ_DTYPE_STIME:
+			switch (strtolower($format)) {
+			case 's':
+			case 'show':
+			case 'p':
+			case 'preview':
+			case 'f':
+			case 'formpreview':
+				$ret = formatTimestamp($ret, _SHORTDATESTRING);
+				return $ret;
+				break 1;
+			case 'n':
+			case 'none':
+			case 'e':
+			case 'edit':
+				break 1;
+			default:
+				break 1;
+			}
+			break;
+		case XOBJ_DTYPE_TIME_ONLY:
+			switch (strtolower($format)) {
+			case 's':
+			case 'show':
+			case 'p':
+			case 'preview':
+			case 'f':
+			case 'formpreview':
+				$ret = formatTimestamp($ret, 'G:i');
+				return $ret;
+				break 1;
+			case 'n':
+			case 'none':
+			case 'e':
+			case 'edit':
+				break 1;
+			default:
+				break 1;
+			}
+			break;
+
+		case XOBJ_DTYPE_CURRENCY:
+			$decimal_section_original = strstr($ret, '.');
 			$decimal_section = $decimal_section_original;
 			if ($decimal_section) {
 				if (strlen($decimal_section) == 1) {
@@ -893,118 +891,118 @@ 
 			}
 		break;
 
-        case XOBJ_DTYPE_TXTAREA:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-                $ts =& MyTextSanitizer::getInstance();
-                $html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
+		case XOBJ_DTYPE_TXTAREA:
+			switch (strtolower($format)) {
+			case 's':
+			case 'show':
+				$ts =& MyTextSanitizer::getInstance();
+				$html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
 
-                $xcode = (!isset($this->vars['doxcode']['value']) || $this->vars['doxcode']['value'] == 1) ? 1 : 0;
+				$xcode = (!isset($this->vars['doxcode']['value']) || $this->vars['doxcode']['value'] == 1) ? 1 : 0;
 
-                $smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
-                $image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
-                $br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
+				$smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
+				$image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
+				$br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
 
 				/**
-		 		 * Hack by marcan <INBOX> for SCSPRO
+				 * Hack by marcan <INBOX> for SCSPRO
 				 * Setting mastop as the main editor
-		 		 */
-                if (defined('XOOPS_EDITOR_IS_HTML')) {
-                	$br = false;
-                }
+				 */
+				if (defined('XOOPS_EDITOR_IS_HTML')) {
+					$br = false;
+				}
 				/**
-		 		 * Hack by marcan <INBOX> for SCSPRO
+				 * Hack by marcan <INBOX> for SCSPRO
 				 * Setting mastop as the main editor
-		 		 */
-
-                return $ts->displayTarea($ret, $html, $smiley, $xcode, $image, $br);
-                break 1;
-            case 'e':
-            case 'edit':
-                return htmlspecialchars($ret, ENT_QUOTES);
-                break 1;
-            case 'p':
-            case 'preview':
-                $ts =& MyTextSanitizer::getInstance();
-                $html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
-                $xcode = (!isset($this->vars['doxcode']['value']) || $this->vars['doxcode']['value'] == 1) ? 1 : 0;
-                $smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
-                $image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
-                $br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
-                return $ts->previewTarea($ret, $html, $smiley, $xcode, $image, $br);
-                break 1;
-            case 'f':
-            case 'formpreview':
-                $ts =& MyTextSanitizer::getInstance();
-                return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
-                break 1;
-            case 'n':
-            case 'none':
-            default:
-                break 1;
-            }
-            break;
-        case XOBJ_DTYPE_SIMPLE_ARRAY:
-            $ret =& explode('|', $ret);
-            break;
-        case XOBJ_DTYPE_ARRAY:
-            $ret =& unserialize($ret);
-            break;
-        case XOBJ_DTYPE_SOURCE:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-                break 1;
-            case 'e':
-            case 'edit':
-                return htmlspecialchars($ret, ENT_QUOTES);
-                break 1;
-            case 'p':
-            case 'preview':
-                $ts =& MyTextSanitizer::getInstance();
-                return $ts->stripSlashesGPC($ret);
-                break 1;
-            case 'f':
-            case 'formpreview':
-                $ts =& MyTextSanitizer::getInstance();
-                return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
-                break 1;
-            case 'n':
-            case 'none':
-            default:
-                break 1;
-            }
-            break;
-        default:
-            if ($this->vars[$key]['options'] != '' && $ret != '') {
-                switch (strtolower($format)) {
-                case 's':
-                case 'show':
+				 */
+
+				return $ts->displayTarea($ret, $html, $smiley, $xcode, $image, $br);
+				break 1;
+			case 'e':
+			case 'edit':
+				return htmlspecialchars($ret, ENT_QUOTES);
+				break 1;
+			case 'p':
+			case 'preview':
+				$ts =& MyTextSanitizer::getInstance();
+				$html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
+				$xcode = (!isset($this->vars['doxcode']['value']) || $this->vars['doxcode']['value'] == 1) ? 1 : 0;
+				$smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
+				$image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
+				$br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
+				return $ts->previewTarea($ret, $html, $smiley, $xcode, $image, $br);
+				break 1;
+			case 'f':
+			case 'formpreview':
+				$ts =& MyTextSanitizer::getInstance();
+				return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
+				break 1;
+			case 'n':
+			case 'none':
+			default:
+				break 1;
+			}
+			break;
+		case XOBJ_DTYPE_SIMPLE_ARRAY:
+			$ret =& explode('|', $ret);
+			break;
+		case XOBJ_DTYPE_ARRAY:
+			$ret =& unserialize($ret);
+			break;
+		case XOBJ_DTYPE_SOURCE:
+			switch (strtolower($format)) {
+			case 's':
+			case 'show':
+				break 1;
+			case 'e':
+			case 'edit':
+				return htmlspecialchars($ret, ENT_QUOTES);
+				break 1;
+			case 'p':
+			case 'preview':
+				$ts =& MyTextSanitizer::getInstance();
+				return $ts->stripSlashesGPC($ret);
+				break 1;
+			case 'f':
+			case 'formpreview':
+				$ts =& MyTextSanitizer::getInstance();
+				return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
+				break 1;
+			case 'n':
+			case 'none':
+			default:
+				break 1;
+			}
+			break;
+		default:
+			if ($this->vars[$key]['options'] != '' && $ret != '') {
+				switch (strtolower($format)) {
+				case 's':
+				case 'show':
 					$selected = explode('|', $ret);
-                    $options = explode('|', $this->vars[$key]['options']);
-                    $i = 1;
-                    $ret = array();
-                    foreach ($options as $op) {
-                        if (in_array($i, $selected)) {
-                            $ret[] = $op;
-                        }
-                        $i++;
-                    }
-                    return implode(', ', $ret);
-                case 'e':
-                case 'edit':
-                    $ret = explode('|', $ret);
-                    break 1;
-                default:
-                    break 1;
-                }
-
-            }
-            break;
-        }
-        return $ret;
-    }
+					$options = explode('|', $this->vars[$key]['options']);
+					$i = 1;
+					$ret = array();
+					foreach ($options as $op) {
+						if (in_array($i, $selected)) {
+							$ret[] = $op;
+						}
+						$i++;
+					}
+					return implode(', ', $ret);
+				case 'e':
+				case 'edit':
+					$ret = explode('|', $ret);
+					break 1;
+				default:
+					break 1;
+				}
+
+			}
+			break;
+		}
+		return $ret;
+	}
 
 	function doMakeFieldreadOnly($key) {
 		if (isset($this->vars[$key])) {
@@ -1068,7 +1066,7 @@ 
 	 * @param bool $userSide for futur use, to do something different on the user side
 	 * @return content of the template if $fetchOnly or nothing if !$fetchOnly
 	 */
-    function displaySingleObject($fetchOnly=false, $userSide=false, $actions=array(), $headerAsRow=true) {
+	function displaySingleObject($fetchOnly=false, $userSide=false, $actions=array(), $headerAsRow=true) {
 		include_once SMARTOBJECT_ROOT_PATH."class/smartobjectsingleview.php";
 		$singleview = new SmartObjectSingleView($this, $userSide, $actions, $headerAsRow);
 		// add all fields mark as displayOnSingleView except the keyid
@@ -1085,7 +1083,7 @@ 
 		}else {
 			$singleview->render($fetchOnly);
 		}
-    }
+	}
 
 	function doDisplayFieldOnSingleView($key) {
 		if (isset($this->vars[$key])) {
@@ -1093,13 +1091,13 @@ 
 		}
 	}
 
-    function doSetFieldAsRequired($field, $required=true) {
+	function doSetFieldAsRequired($field, $required=true) {
 		$this->setVarInfo($field, 'required', $required);
-    }
+	}
 
-    function doSetFieldForSorting($field) {
+	function doSetFieldForSorting($field) {
 		$this->setVarInfo($field, 'sortby', true);
-    }
+	}
 
 	function showFieldOnForm($key) {
 		if (is_array($key)) {

Switch Indentation +298 added lines, -298 removed lines

@@ -648,93 +648,93 @@ 
             } else {
                 $cleanv = is_string($cleanv) ? trim($cleanv) : $cleanv;
                 switch ($v['data_type']) {
-                case XOBJ_DTYPE_TXTBOX:
-                    if ($v['required'] && $cleanv != '0' && $cleanv == '') {
-                        $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
-                        continue;
-                    }
-                    if (isset($v['maxlength']) && strlen($cleanv) > intval($v['maxlength'])) {
-                        $this->setErrors( sprintf( _XOBJ_ERR_SHORTERTHAN, $k, intval( $v['maxlength'] ) ) );
-                        continue;
-                    }
-                    if (!$v['not_gpc']) {
-                        $cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
-                    } else {
-                        $cleanv = $ts->censorString($cleanv);
-                    }
-                    break;
-                case XOBJ_DTYPE_TXTAREA:
-                    if ($v['required'] && $cleanv != '0' && $cleanv == '') {
-                        $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
-                        continue;
-                    }
-                    if (!$v['not_gpc']) {
-                        $cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
-                    } else {
-                        $cleanv = $ts->censorString($cleanv);
-                    }
-                    break;
-                case XOBJ_DTYPE_SOURCE:
-                    if (!$v['not_gpc']) {
-                        $cleanv = $ts->stripSlashesGPC($cleanv);
-                    } else {
-                        $cleanv = $cleanv;
-                    }
-                    break;
-                case XOBJ_DTYPE_INT:
-                case XOBJ_DTYPE_TIME_ONLY:
-                    $cleanv = intval($cleanv);
-                    break;
-
-                case XOBJ_DTYPE_CURRENCY:
-                    $cleanv = smart_currency($cleanv);
-                    break;
-
-                case XOBJ_DTYPE_FLOAT:
-                    $cleanv = smart_float($cleanv);
-                    break;
-
-                case XOBJ_DTYPE_EMAIL:
-                    if ($v['required'] && $cleanv == '') {
-                        $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
-                        continue;
-                    }
-                    if ($cleanv != '' && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$cleanv)) {
-                        $this->setErrors("Invalid Email");
-                        continue;
-                    }
-                    if (!$v['not_gpc']) {
-                        $cleanv = $ts->stripSlashesGPC($cleanv);
-                    }
-                    break;
-                case XOBJ_DTYPE_URL:
-                    if ($v['required'] && $cleanv == '') {
-                        $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
-                        continue;
-                    }
-                    if ($cleanv != '' && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
-                        $cleanv = 'http://' . $cleanv;
-                    }
-                    if (!$v['not_gpc']) {
-                        $cleanv =& $ts->stripSlashesGPC($cleanv);
-                    }
-                    break;
-                case XOBJ_DTYPE_SIMPLE_ARRAY:
-                    $cleanv = implode('|', $cleanv);
-                    break;
-                case XOBJ_DTYPE_ARRAY:
-                    $cleanv = serialize($cleanv);
-                    break;
-                case XOBJ_DTYPE_STIME:
-                case XOBJ_DTYPE_MTIME:
-                case XOBJ_DTYPE_LTIME:
-                    $cleanv = !is_string($cleanv) ? intval($cleanv) : strtotime($cleanv);
-                    if (!($cleanv > 0)) {
-                    	$cleanv = strtotime($cleanv);
-                    }
-                    break;
-                default:
-                    break;
+                	case XOBJ_DTYPE_TXTBOX:
+                    	if ($v['required'] && $cleanv != '0' && $cleanv == '') {
+                        	$this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
+                        	continue;
+                    	}
+                    	if (isset($v['maxlength']) && strlen($cleanv) > intval($v['maxlength'])) {
+                        	$this->setErrors( sprintf( _XOBJ_ERR_SHORTERTHAN, $k, intval( $v['maxlength'] ) ) );
+                        	continue;
+                    	}
+                    	if (!$v['not_gpc']) {
+                        	$cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
+                    	} else {
+                        	$cleanv = $ts->censorString($cleanv);
+                    	}
+                    	break;
+                	case XOBJ_DTYPE_TXTAREA:
+                    	if ($v['required'] && $cleanv != '0' && $cleanv == '') {
+                        	$this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
+                        	continue;
+                    	}
+                    	if (!$v['not_gpc']) {
+                        	$cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
+                    	} else {
+                        	$cleanv = $ts->censorString($cleanv);
+                    	}
+                    	break;
+                	case XOBJ_DTYPE_SOURCE:
+                    	if (!$v['not_gpc']) {
+                        	$cleanv = $ts->stripSlashesGPC($cleanv);
+                    	} else {
+                        	$cleanv = $cleanv;
+                    	}
+                    	break;
+                	case XOBJ_DTYPE_INT:
+                	case XOBJ_DTYPE_TIME_ONLY:
+                    	$cleanv = intval($cleanv);
+                    	break;
+
+                	case XOBJ_DTYPE_CURRENCY:
+                    	$cleanv = smart_currency($cleanv);
+                    	break;
+
+                	case XOBJ_DTYPE_FLOAT:
+                    	$cleanv = smart_float($cleanv);
+                    	break;
+
+                	case XOBJ_DTYPE_EMAIL:
+                    	if ($v['required'] && $cleanv == '') {
+                        	$this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
+                        	continue;
+                    	}
+                    	if ($cleanv != '' && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$cleanv)) {
+                        	$this->setErrors("Invalid Email");
+                        	continue;
+                    	}
+                    	if (!$v['not_gpc']) {
+                        	$cleanv = $ts->stripSlashesGPC($cleanv);
+                    	}
+                    	break;
+                	case XOBJ_DTYPE_URL:
+                    	if ($v['required'] && $cleanv == '') {
+                        	$this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
+                        	continue;
+                    	}
+                    	if ($cleanv != '' && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
+                        	$cleanv = 'http://' . $cleanv;
+                    	}
+                    	if (!$v['not_gpc']) {
+                        	$cleanv =& $ts->stripSlashesGPC($cleanv);
+                    	}
+                    	break;
+                	case XOBJ_DTYPE_SIMPLE_ARRAY:
+                    	$cleanv = implode('|', $cleanv);
+                    	break;
+                	case XOBJ_DTYPE_ARRAY:
+                    	$cleanv = serialize($cleanv);
+                    	break;
+                	case XOBJ_DTYPE_STIME:
+                	case XOBJ_DTYPE_MTIME:
+                	case XOBJ_DTYPE_LTIME:
+                    	$cleanv = !is_string($cleanv) ? intval($cleanv) : strtotime($cleanv);
+                    	if (!($cleanv > 0)) {
+                    		$cleanv = strtotime($cleanv);
+                    	}
+                    	break;
+                	default:
+                    	break;
                 }
             }
             $this->cleanVars[$k] =& $cleanv;
@@ -769,236 +769,236 @@ 
 
         switch ($this->vars[$key]['data_type']) {
 
-        case XOBJ_DTYPE_TXTBOX:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-            	// ML Hack by marcan
-                $ts =& MyTextSanitizer::getInstance();
-                $ret = $ts->htmlSpecialChars($ret);
-
-                if (method_exists($myts, 'formatForML')) {
-                	return $ts->formatForML($ret);
-                } else {
-                	return $ret;
-                }
-            	break 1;
-            	// End of ML Hack by marcan
-
-            case 'clean':
-				$ts =& MyTextSanitizer::getInstance();
-
-				$ret = smart_html2text($ret);
-				$ret = smart_purifyText($ret);
-
-                if (method_exists($myts, 'formatForML')) {
-                	return $ts->formatForML($ret);
-                } else {
-                	return $ret;
-                }
-            	break 1;
-            	// End of ML Hack by marcan
-
-            case 'e':
-            case 'edit':
-                $ts =& MyTextSanitizer::getInstance();
-                return $ts->htmlSpecialChars($ret);
-                break 1;
-            case 'p':
-            case 'preview':
-            case 'f':
-            case 'formpreview':
-                $ts =& MyTextSanitizer::getInstance();
-                return $ts->htmlSpecialChars($ts->stripSlashesGPC($ret));
-                break 1;
-            case 'n':
-            case 'none':
-            default:
-                break 1;
-            }
+        	case XOBJ_DTYPE_TXTBOX:
+            	switch (strtolower($format)) {
+            		case 's':
+            		case 'show':
+            			// ML Hack by marcan
+                		$ts =& MyTextSanitizer::getInstance();
+                		$ret = $ts->htmlSpecialChars($ret);
+
+                		if (method_exists($myts, 'formatForML')) {
+                			return $ts->formatForML($ret);
+                		} else {
+                			return $ret;
+                		}
+            			break 1;
+            			// End of ML Hack by marcan
+
+            		case 'clean':
+						$ts =& MyTextSanitizer::getInstance();
+
+						$ret = smart_html2text($ret);
+						$ret = smart_purifyText($ret);
+
+                		if (method_exists($myts, 'formatForML')) {
+                			return $ts->formatForML($ret);
+                		} else {
+                			return $ret;
+                		}
+            			break 1;
+            			// End of ML Hack by marcan
+
+            		case 'e':
+            		case 'edit':
+                		$ts =& MyTextSanitizer::getInstance();
+                		return $ts->htmlSpecialChars($ret);
+                		break 1;
+            		case 'p':
+            		case 'preview':
+            		case 'f':
+            		case 'formpreview':
+                		$ts =& MyTextSanitizer::getInstance();
+                		return $ts->htmlSpecialChars($ts->stripSlashesGPC($ret));
+                		break 1;
+            		case 'n':
+            		case 'none':
+            		default:
+                		break 1;
+            	}
             break;
-        case XOBJ_DTYPE_LTIME:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-            case 'p':
-            case 'preview':
-            case 'f':
-            case 'formpreview':
-                $ret = formatTimestamp($ret, _DATESTRING);
-                return $ret;
-            	break 1;
-            case 'n':
-            case 'none':
-            case 'e':
-            case 'edit':
-                break 1;
-            default:
-                break 1;
-            }
+        	case XOBJ_DTYPE_LTIME:
+            	switch (strtolower($format)) {
+            		case 's':
+            		case 'show':
+            		case 'p':
+            		case 'preview':
+            		case 'f':
+            		case 'formpreview':
+                		$ret = formatTimestamp($ret, _DATESTRING);
+                		return $ret;
+            			break 1;
+            		case 'n':
+            		case 'none':
+            		case 'e':
+            		case 'edit':
+                		break 1;
+            		default:
+                		break 1;
+            	}
             break;
-        case XOBJ_DTYPE_STIME:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-            case 'p':
-            case 'preview':
-            case 'f':
-            case 'formpreview':
-                $ret = formatTimestamp($ret, _SHORTDATESTRING);
-                return $ret;
-            	break 1;
-            case 'n':
-            case 'none':
-            case 'e':
-            case 'edit':
-                break 1;
-            default:
-                break 1;
-            }
+        	case XOBJ_DTYPE_STIME:
+            	switch (strtolower($format)) {
+            		case 's':
+            		case 'show':
+            		case 'p':
+            		case 'preview':
+            		case 'f':
+            		case 'formpreview':
+                		$ret = formatTimestamp($ret, _SHORTDATESTRING);
+                		return $ret;
+            			break 1;
+            		case 'n':
+            		case 'none':
+            		case 'e':
+            		case 'edit':
+                		break 1;
+            		default:
+                		break 1;
+            	}
             break;
-        case XOBJ_DTYPE_TIME_ONLY:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-            case 'p':
-            case 'preview':
-            case 'f':
-            case 'formpreview':
-                $ret = formatTimestamp($ret, 'G:i');
-                return $ret;
-            	break 1;
-            case 'n':
-            case 'none':
-            case 'e':
-            case 'edit':
-                break 1;
-            default:
-                break 1;
-            }
+        	case XOBJ_DTYPE_TIME_ONLY:
+            	switch (strtolower($format)) {
+            		case 's':
+            		case 'show':
+            		case 'p':
+            		case 'preview':
+            		case 'f':
+            		case 'formpreview':
+                		$ret = formatTimestamp($ret, 'G:i');
+                		return $ret;
+            			break 1;
+            		case 'n':
+            		case 'none':
+            		case 'e':
+            		case 'edit':
+                		break 1;
+            		default:
+                		break 1;
+            	}
             break;
 
-        case XOBJ_DTYPE_CURRENCY:
-	        $decimal_section_original = strstr($ret, '.');
-			$decimal_section = $decimal_section_original;
-			if ($decimal_section) {
-				if (strlen($decimal_section) == 1) {
-					$decimal_section = '.00';
-				} elseif(strlen($decimal_section) == 2) {
-					$decimal_section = $decimal_section . '0';
+        	case XOBJ_DTYPE_CURRENCY:
+	        	$decimal_section_original = strstr($ret, '.');
+				$decimal_section = $decimal_section_original;
+				if ($decimal_section) {
+					if (strlen($decimal_section) == 1) {
+						$decimal_section = '.00';
+					} elseif(strlen($decimal_section) == 2) {
+						$decimal_section = $decimal_section . '0';
+					}
+					$ret = str_replace($decimal_section_original, $decimal_section, $ret);
+				} else {
+					$ret = $ret . '.00';
 				}
-				$ret = str_replace($decimal_section_original, $decimal_section, $ret);
-			} else {
-				$ret = $ret . '.00';
-			}
-		break;
+			break;
 
-        case XOBJ_DTYPE_TXTAREA:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-                $ts =& MyTextSanitizer::getInstance();
-                $html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
+        	case XOBJ_DTYPE_TXTAREA:
+            	switch (strtolower($format)) {
+            		case 's':
+            		case 'show':
+                		$ts =& MyTextSanitizer::getInstance();
+                		$html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
 
-                $xcode = (!isset($this->vars['doxcode']['value']) || $this->vars['doxcode']['value'] == 1) ? 1 : 0;
+                		$xcode = (!isset($this->vars['doxcode']['value']) || $this->vars['doxcode']['value'] == 1) ? 1 : 0;
 
-                $smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
-                $image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
-                $br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
+                		$smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
+                		$image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
+                		$br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
 
-				/**
+						/**
 		 		 * Hack by marcan <INBOX> for SCSPRO
 				 * Setting mastop as the main editor
 		 		 */
-                if (defined('XOOPS_EDITOR_IS_HTML')) {
-                	$br = false;
-                }
-				/**
+                		if (defined('XOOPS_EDITOR_IS_HTML')) {
+                			$br = false;
+                		}
+						/**
 		 		 * Hack by marcan <INBOX> for SCSPRO
 				 * Setting mastop as the main editor
 		 		 */
 
-                return $ts->displayTarea($ret, $html, $smiley, $xcode, $image, $br);
-                break 1;
-            case 'e':
-            case 'edit':
-                return htmlspecialchars($ret, ENT_QUOTES);
-                break 1;
-            case 'p':
-            case 'preview':
-                $ts =& MyTextSanitizer::getInstance();
-                $html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
-                $xcode = (!isset($this->vars['doxcode']['value']) || $this->vars['doxcode']['value'] == 1) ? 1 : 0;
-                $smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
-                $image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
-                $br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
-                return $ts->previewTarea($ret, $html, $smiley, $xcode, $image, $br);
-                break 1;
-            case 'f':
-            case 'formpreview':
-                $ts =& MyTextSanitizer::getInstance();
-                return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
-                break 1;
-            case 'n':
-            case 'none':
-            default:
-                break 1;
-            }
+                		return $ts->displayTarea($ret, $html, $smiley, $xcode, $image, $br);
+                		break 1;
+            		case 'e':
+            		case 'edit':
+                		return htmlspecialchars($ret, ENT_QUOTES);
+                		break 1;
+            		case 'p':
+            		case 'preview':
+                		$ts =& MyTextSanitizer::getInstance();
+                		$html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
+                		$xcode = (!isset($this->vars['doxcode']['value']) || $this->vars['doxcode']['value'] == 1) ? 1 : 0;
+                		$smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
+                		$image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
+                		$br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
+                		return $ts->previewTarea($ret, $html, $smiley, $xcode, $image, $br);
+                		break 1;
+            		case 'f':
+            		case 'formpreview':
+                		$ts =& MyTextSanitizer::getInstance();
+                		return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
+                		break 1;
+            		case 'n':
+            		case 'none':
+            		default:
+                		break 1;
+            	}
             break;
-        case XOBJ_DTYPE_SIMPLE_ARRAY:
-            $ret =& explode('|', $ret);
+        	case XOBJ_DTYPE_SIMPLE_ARRAY:
+            	$ret =& explode('|', $ret);
+            	break;
+        	case XOBJ_DTYPE_ARRAY:
+            	$ret =& unserialize($ret);
+            	break;
+        	case XOBJ_DTYPE_SOURCE:
+            	switch (strtolower($format)) {
+            		case 's':
+            		case 'show':
+                		break 1;
+            		case 'e':
+            		case 'edit':
+                		return htmlspecialchars($ret, ENT_QUOTES);
+                		break 1;
+            		case 'p':
+            		case 'preview':
+                		$ts =& MyTextSanitizer::getInstance();
+                		return $ts->stripSlashesGPC($ret);
+                		break 1;
+            		case 'f':
+            		case 'formpreview':
+                		$ts =& MyTextSanitizer::getInstance();
+                		return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
+                		break 1;
+            		case 'n':
+            		case 'none':
+            		default:
+                		break 1;
+            	}
             break;
-        case XOBJ_DTYPE_ARRAY:
-            $ret =& unserialize($ret);
-            break;
-        case XOBJ_DTYPE_SOURCE:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-                break 1;
-            case 'e':
-            case 'edit':
-                return htmlspecialchars($ret, ENT_QUOTES);
-                break 1;
-            case 'p':
-            case 'preview':
-                $ts =& MyTextSanitizer::getInstance();
-                return $ts->stripSlashesGPC($ret);
-                break 1;
-            case 'f':
-            case 'formpreview':
-                $ts =& MyTextSanitizer::getInstance();
-                return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
-                break 1;
-            case 'n':
-            case 'none':
-            default:
-                break 1;
-            }
-            break;
-        default:
-            if ($this->vars[$key]['options'] != '' && $ret != '') {
-                switch (strtolower($format)) {
-                case 's':
-                case 'show':
-					$selected = explode('|', $ret);
-                    $options = explode('|', $this->vars[$key]['options']);
-                    $i = 1;
-                    $ret = array();
-                    foreach ($options as $op) {
-                        if (in_array($i, $selected)) {
-                            $ret[] = $op;
-                        }
-                        $i++;
-                    }
-                    return implode(', ', $ret);
-                case 'e':
-                case 'edit':
-                    $ret = explode('|', $ret);
-                    break 1;
-                default:
-                    break 1;
-                }
+        	default:
+            	if ($this->vars[$key]['options'] != '' && $ret != '') {
+                	switch (strtolower($format)) {
+                		case 's':
+                		case 'show':
+							$selected = explode('|', $ret);
+                    		$options = explode('|', $this->vars[$key]['options']);
+                    		$i = 1;
+                    		$ret = array();
+                    		foreach ($options as $op) {
+                        		if (in_array($i, $selected)) {
+                            		$ret[] = $op;
+                        		}
+                        		$i++;
+                    		}
+                    		return implode(', ', $ret);
+                		case 'e':
+                		case 'edit':
+                    		$ret = explode('|', $ret);
+                    		break 1;
+                		default:
+                    		break 1;
+                	}
 
             }
             break;

Spacing +76 added lines, -76 removed lines

@@ -47,7 +47,7 @@ 
 
     var $seoEnabled = false;
     var $titleField;
-    var $summaryField=false;
+    var $summaryField = false;
 
     /**
 	 * Reference to the handler managing this object
@@ -75,7 +75,7 @@ 
 		$smartpermissions_handler = new SmartobjectPermissionHandler($this->handler);
 		return $smartpermissions_handler->accessGranted($perm_name, $this->id());
 	}
-	function addFormSection($section_name, $value=false, $hide=false) {
+	function addFormSection($section_name, $value = false, $hide = false) {
 		$this->initVar($section_name, XOBJ_DTYPE_FORM_SECTION, $value, false, null, '', false, '', '', false, false, true);
 		$this->vars[$section_name]['hide'] = $hide;
 	}
@@ -97,9 +97,9 @@ 
     * @param bool $sortby set to TRUE to make this field used to sort objects in SmartObjectTable
     * @param bool $persistent set to FALSE if this field is not to be saved in the database
     */
-    function initVar($key, $data_type, $value = null, $required = false, $maxlength = null, $options = '', $multilingual=false, $form_caption='', $form_dsc='', $sortby=false, $persistent=true, $displayOnForm=true) {
+    function initVar($key, $data_type, $value = null, $required = false, $maxlength = null, $options = '', $multilingual = false, $form_caption = '', $form_dsc = '', $sortby = false, $persistent = true, $displayOnForm = true) {
         //url_ is reserved for files.
-        if (substr($key, 0,4) == 'url_' ) {
+        if (substr($key, 0, 4) == 'url_') {
 	        trigger_error("Cannot use variable starting with 'url_'.");
 	    }
         parent::initVar($key, $data_type, $value, $required, $maxlength, $options);
@@ -127,7 +127,7 @@ 
         'readonly' => false));
     }
 
-    function initNonPersistableVar($key, $data_type, $itemName=false, $form_caption='', $sortby=false, $value='', $displayOnForm=false, $required=false) {
+    function initNonPersistableVar($key, $data_type, $itemName = false, $form_caption = '', $sortby = false, $value = '', $displayOnForm = false, $required = false) {
 		$this->initVar($key, $data_type, $value, $required, null, '', false, $form_caption, '', $sortby, false, $displayOnForm);
 		$this->vars[$key]['itemName'] = $itemName;
     }
@@ -147,12 +147,12 @@ 
     * @param string $form_dsc description of this variable in a {@link SmartobjectForm}
     * @param mixed $value default value of this variable
     */
-	function quickInitVar($key, $data_type, $required=false, $form_caption='', $form_dsc='', $value = null) {
+	function quickInitVar($key, $data_type, $required = false, $form_caption = '', $form_dsc = '', $value = null) {
 		$maxlength = $data_type == 'XOBJ_DTYPE_TXTBOX' ? 255 : null;
 		$this->initVar($key, $data_type, $value, $required, $maxlength, '', false, $form_caption, $form_dsc, false, true, true);
 	}
 
-    function initCommonVar($varname, $displayOnForm=true, $default='notdefined') {
+    function initCommonVar($varname, $displayOnForm = true, $default = 'notdefined') {
 
     	switch ($varname) {
             case "dohtml":
@@ -163,25 +163,25 @@ 
 
             case "dobr":
             	$value = ($default === 'notdefined') ? true : $default;
-                $this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, "", false, _CO_SOBJECT_DOBR_FORM_CAPTION, '', false, true, $displayOnForm);
+                $this->initVar($varname, XOBJ_DTYPE_INT, $value, false, null, "", false, _CO_SOBJECT_DOBR_FORM_CAPTION, '', false, true, $displayOnForm);
                 $this->setControl($varname, "yesno");
                 break;
 
             case "doimage":
             	$value = $default != 'notdefined' ? $default : true;
-                $this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, "", false, _CO_SOBJECT_DOIMAGE_FORM_CAPTION, '', false, true, $displayOnForm);
+                $this->initVar($varname, XOBJ_DTYPE_INT, $value, false, null, "", false, _CO_SOBJECT_DOIMAGE_FORM_CAPTION, '', false, true, $displayOnForm);
                 $this->setControl($varname, "yesno");
                 break;
 
             case "dosmiley":
             	$value = $default != 'notdefined' ? $default : true;
-                $this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, "", false, _CO_SOBJECT_DOSMILEY_FORM_CAPTION, '', false, true, $displayOnForm);
+                $this->initVar($varname, XOBJ_DTYPE_INT, $value, false, null, "", false, _CO_SOBJECT_DOSMILEY_FORM_CAPTION, '', false, true, $displayOnForm);
                 $this->setControl($varname, "yesno");
                 break;
 
             case "doxcode":
             	$value = $default != 'notdefined' ? $default : true;
-                $this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, "", false, _CO_SOBJECT_DOXCODE_FORM_CAPTION, '', false, true, $displayOnForm);
+                $this->initVar($varname, XOBJ_DTYPE_INT, $value, false, null, "", false, _CO_SOBJECT_DOXCODE_FORM_CAPTION, '', false, true, $displayOnForm);
                 $this->setControl($varname, "yesno");
                 break;
 
@@ -205,7 +205,7 @@ 
 
             case "short_url":
             	$value = $default != 'notdefined' ? $default : '';
-                $this->initVar($varname, XOBJ_DTYPE_TXTBOX,$value, false, null, "", false, _CO_SOBJECT_SHORT_URL, _CO_SOBJECT_SHORT_URL_DSC, false, true, $displayOnForm);
+                $this->initVar($varname, XOBJ_DTYPE_TXTBOX, $value, false, null, "", false, _CO_SOBJECT_SHORT_URL, _CO_SOBJECT_SHORT_URL_DSC, false, true, $displayOnForm);
                 break;
 
             case "hierarchy_path":
@@ -215,12 +215,12 @@ 
 
             case "counter":
             	$value = $default != 'notdefined' ? $default : 0;
-                $this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, '', false, _CO_SOBJECT_COUNTER_FORM_CAPTION, '', false, true, $displayOnForm);
+                $this->initVar($varname, XOBJ_DTYPE_INT, $value, false, null, '', false, _CO_SOBJECT_COUNTER_FORM_CAPTION, '', false, true, $displayOnForm);
                 break;
 
             case "weight":
             	$value = $default != 'notdefined' ? $default : 0;
-                $this->initVar($varname, XOBJ_DTYPE_INT,$value, false, null, '', false, _CO_SOBJECT_WEIGHT_FORM_CAPTION, '', true, true, $displayOnForm);
+                $this->initVar($varname, XOBJ_DTYPE_INT, $value, false, null, '', false, _CO_SOBJECT_WEIGHT_FORM_CAPTION, '', true, true, $displayOnForm);
                 break;
             case "custom_css":
             	$value = $default != 'notdefined' ? $default : '';
@@ -319,7 +319,7 @@ 
      * @param string $var name of the variable for which we want to set a control
      * @param array $options
      */
-    function setControl($var, $options=array()) {
+    function setControl($var, $options = array()) {
         if (isset($this->controls[$var])) {
         	unset($this->controls[$var]);
         }
@@ -345,7 +345,7 @@ 
     *
     * @see SmartObjectForm::SmartObjectForm()
     */
-    function getForm($form_caption, $form_name, $form_action=false, $submit_button_caption = _CO_SOBJECT_SUBMIT, $cancel_js_action=false, $captcha=false)
+    function getForm($form_caption, $form_name, $form_action = false, $submit_button_caption = _CO_SOBJECT_SUBMIT, $cancel_js_action = false, $captcha = false)
     {
         include_once SMARTOBJECT_ROOT_PATH . "class/form/smartobjectform.php";
         $form = new SmartobjectForm($this, $form_name, $form_caption, $form_action, null, $submit_button_caption, $cancel_js_action, $captcha);
@@ -377,12 +377,12 @@ 
 		include_once(SMARTOBJECT_ROOT_PATH . 'class/smarthighlighter.php');
 		$highlight = smart_getConfig('module_search_highlighter', false, true);
 
-		if($highlight && isset($_GET['keywords']))
+		if ($highlight && isset($_GET['keywords']))
 		{
-			$myts =& MyTextSanitizer::getInstance();
-			$keywords=$myts->htmlSpecialChars(trim(urldecode($_GET['keywords'])));
-			$h= new SmartHighlighter ($keywords, true , 'smart_highlighter');
-			foreach($this->handler->highlightFields as $field) {
+			$myts = & MyTextSanitizer::getInstance();
+			$keywords = $myts->htmlSpecialChars(trim(urldecode($_GET['keywords'])));
+			$h = new SmartHighlighter($keywords, true, 'smart_highlighter');
+			foreach ($this->handler->highlightFields as $field) {
 				$ret[$field] = $h->highlight($ret[$field]);
 			}
 		}
@@ -396,10 +396,10 @@ 
      * @param string $value error to add
      * @access public
      */
-    function setErrors($err_str, $prefix=false)
+    function setErrors($err_str, $prefix = false)
     {
     	if (is_array($err_str)) {
-            foreach($err_str as $str) {
+            foreach ($err_str as $str) {
                 $this->setErrors($str, $prefix);
             }
         } else {
@@ -410,9 +410,9 @@ 
         }
     }
 
-    function setFieldAsRequired($field, $required=true) {
+    function setFieldAsRequired($field, $required = true) {
     	if (is_array($field)) {
-			foreach($field as $v) {
+			foreach ($field as $v) {
 				$this->doSetFieldAsRequired($v, $required);
 			}
     	} else {
@@ -422,7 +422,7 @@ 
 
     function setFieldForSorting($field) {
     	if (is_array($field)) {
-			foreach($field as $v) {
+			foreach ($field as $v) {
 				$this->doSetFieldForSorting($v);
 			}
     	} else {
@@ -461,7 +461,7 @@ 
 		}
 	}
 
-    function getImageDir($path=false)
+    function getImageDir($path = false)
     {
         if ($path) {
             return $this->_image_path;
@@ -470,7 +470,7 @@ 
         }
     }
 
-	function getUploadDir($path=false)
+	function getUploadDir($path = false)
     {
         if ($path) {
             return $this->_image_path;
@@ -484,7 +484,7 @@ 
 			return $this->vars[$key][$info];
 		}elseif ($info == '' && isset($this->vars[$key])) {
 			return $this->vars[$key];
-		}  else {
+		} else {
 			return $this->vars;
 		}
 	}
@@ -503,7 +503,7 @@ 
      *
      * @return string
      */
-    function title($format='s')
+    function title($format = 's')
     {
         return $this->getVar($this->handler->identifierName, $format);
     }
@@ -528,7 +528,7 @@ 
      * @param bool $onlyUrl wether or not to return a simple URL or a full <a> link
      * @return string user side link to the object
      */
-    function getAdminViewItemLink($onlyUrl=false)
+    function getAdminViewItemLink($onlyUrl = false)
     {
     	$controller = new SmartObjectController($this->handler);
     	return $controller->getAdminViewItemLink($this, $onlyUrl);
@@ -540,19 +540,19 @@ 
      * @param bool $onlyUrl wether or not to return a simple URL or a full <a> link
      * @return string user side link to the object
      */
-    function getItemLink($onlyUrl=false)
+    function getItemLink($onlyUrl = false)
     {
     	$controller = new SmartObjectController($this->handler);
     	return $controller->getItemLink($this, $onlyUrl);
     }
 
-    function getEditItemLink($onlyUrl=false, $withimage=true, $userSide=false)
+    function getEditItemLink($onlyUrl = false, $withimage = true, $userSide = false)
     {
     	$controller = new SmartObjectController($this->handler);
     	return $controller->getEditItemLink($this, $onlyUrl, $withimage, $userSide);
     }
 
-    function getDeleteItemLink($onlyUrl=false, $withimage=false, $userSide=false)
+    function getDeleteItemLink($onlyUrl = false, $withimage = false, $userSide = false)
     {
     	$controller = new SmartObjectController($this->handler);
     	return $controller->getDeleteItemLink($this, $onlyUrl, $withimage, $userSide);
@@ -567,7 +567,7 @@ 
 	function getFieldsForSorting($sortsel) {
 		$ret = array();
 
-		foreach($this->vars as $key=>$field_info) {
+		foreach ($this->vars as $key=>$field_info) {
 			if ($field_info['sortby']) {
 				$ret[$key]['caption'] = $field_info['form_caption'];
 				$ret[$key]['selected'] = $key == $sortsel ? "selected='selected'" : '';
@@ -589,7 +589,7 @@ 
 		$this->vars[$key][$info] = $value;
 	}
 
-	function getValueFor($key, $editor=true) {
+	function getValueFor($key, $editor = true) {
     	global $xoopsModuleConfig;
 
     	$ret = $this->getVar($key, 'n');
@@ -639,7 +639,7 @@ 
      */
     function cleanVars()
     {
-        $ts =& MyTextSanitizer::getInstance();
+        $ts = & MyTextSanitizer::getInstance();
         $existing_errors = $this->getErrors();
         $this->_errors = array();
         foreach ($this->vars as $k => $v) {
@@ -650,11 +650,11 @@ 
                 switch ($v['data_type']) {
                 case XOBJ_DTYPE_TXTBOX:
                     if ($v['required'] && $cleanv != '0' && $cleanv == '') {
-                        $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
+                        $this->setErrors(sprintf(_XOBJ_ERR_REQUIRED, $k));
                         continue;
                     }
                     if (isset($v['maxlength']) && strlen($cleanv) > intval($v['maxlength'])) {
-                        $this->setErrors( sprintf( _XOBJ_ERR_SHORTERTHAN, $k, intval( $v['maxlength'] ) ) );
+                        $this->setErrors(sprintf(_XOBJ_ERR_SHORTERTHAN, $k, intval($v['maxlength'])));
                         continue;
                     }
                     if (!$v['not_gpc']) {
@@ -665,7 +665,7 @@ 
                     break;
                 case XOBJ_DTYPE_TXTAREA:
                     if ($v['required'] && $cleanv != '0' && $cleanv == '') {
-                        $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
+                        $this->setErrors(sprintf(_XOBJ_ERR_REQUIRED, $k));
                         continue;
                     }
                     if (!$v['not_gpc']) {
@@ -696,10 +696,10 @@ 
 
                 case XOBJ_DTYPE_EMAIL:
                     if ($v['required'] && $cleanv == '') {
-                        $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
+                        $this->setErrors(sprintf(_XOBJ_ERR_REQUIRED, $k));
                         continue;
                     }
-                    if ($cleanv != '' && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$cleanv)) {
+                    if ($cleanv != '' && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i", $cleanv)) {
                         $this->setErrors("Invalid Email");
                         continue;
                     }
@@ -709,14 +709,14 @@ 
                     break;
                 case XOBJ_DTYPE_URL:
                     if ($v['required'] && $cleanv == '') {
-                        $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
+                        $this->setErrors(sprintf(_XOBJ_ERR_REQUIRED, $k));
                         continue;
                     }
                     if ($cleanv != '' && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
                         $cleanv = 'http://' . $cleanv;
                     }
                     if (!$v['not_gpc']) {
-                        $cleanv =& $ts->stripSlashesGPC($cleanv);
+                        $cleanv = & $ts->stripSlashesGPC($cleanv);
                     }
                     break;
                 case XOBJ_DTYPE_SIMPLE_ARRAY:
@@ -737,7 +737,7 @@ 
                     break;
                 }
             }
-            $this->cleanVars[$k] =& $cleanv;
+            $this->cleanVars[$k] = & $cleanv;
             unset($cleanv);
         }
         if (count($this->_errors) > 0) {
@@ -774,7 +774,7 @@ 
             case 's':
             case 'show':
             	// ML Hack by marcan
-                $ts =& MyTextSanitizer::getInstance();
+                $ts = & MyTextSanitizer::getInstance();
                 $ret = $ts->htmlSpecialChars($ret);
 
                 if (method_exists($myts, 'formatForML')) {
@@ -786,7 +786,7 @@ 
             	// End of ML Hack by marcan
 
             case 'clean':
-				$ts =& MyTextSanitizer::getInstance();
+				$ts = & MyTextSanitizer::getInstance();
 
 				$ret = smart_html2text($ret);
 				$ret = smart_purifyText($ret);
@@ -801,14 +801,14 @@ 
 
             case 'e':
             case 'edit':
-                $ts =& MyTextSanitizer::getInstance();
+                $ts = & MyTextSanitizer::getInstance();
                 return $ts->htmlSpecialChars($ret);
                 break 1;
             case 'p':
             case 'preview':
             case 'f':
             case 'formpreview':
-                $ts =& MyTextSanitizer::getInstance();
+                $ts = & MyTextSanitizer::getInstance();
                 return $ts->htmlSpecialChars($ts->stripSlashesGPC($ret));
                 break 1;
             case 'n':
@@ -884,7 +884,7 @@ 
 			if ($decimal_section) {
 				if (strlen($decimal_section) == 1) {
 					$decimal_section = '.00';
-				} elseif(strlen($decimal_section) == 2) {
+				} elseif (strlen($decimal_section) == 2) {
 					$decimal_section = $decimal_section . '0';
 				}
 				$ret = str_replace($decimal_section_original, $decimal_section, $ret);
@@ -897,7 +897,7 @@ 
             switch (strtolower($format)) {
             case 's':
             case 'show':
-                $ts =& MyTextSanitizer::getInstance();
+                $ts = & MyTextSanitizer::getInstance();
                 $html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
 
                 $xcode = (!isset($this->vars['doxcode']['value']) || $this->vars['doxcode']['value'] == 1) ? 1 : 0;
@@ -926,7 +926,7 @@ 
                 break 1;
             case 'p':
             case 'preview':
-                $ts =& MyTextSanitizer::getInstance();
+                $ts = & MyTextSanitizer::getInstance();
                 $html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
                 $xcode = (!isset($this->vars['doxcode']['value']) || $this->vars['doxcode']['value'] == 1) ? 1 : 0;
                 $smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
@@ -936,7 +936,7 @@ 
                 break 1;
             case 'f':
             case 'formpreview':
-                $ts =& MyTextSanitizer::getInstance();
+                $ts = & MyTextSanitizer::getInstance();
                 return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
                 break 1;
             case 'n':
@@ -946,10 +946,10 @@ 
             }
             break;
         case XOBJ_DTYPE_SIMPLE_ARRAY:
-            $ret =& explode('|', $ret);
+            $ret = & explode('|', $ret);
             break;
         case XOBJ_DTYPE_ARRAY:
-            $ret =& unserialize($ret);
+            $ret = & unserialize($ret);
             break;
         case XOBJ_DTYPE_SOURCE:
             switch (strtolower($format)) {
@@ -962,12 +962,12 @@ 
                 break 1;
             case 'p':
             case 'preview':
-                $ts =& MyTextSanitizer::getInstance();
+                $ts = & MyTextSanitizer::getInstance();
                 return $ts->stripSlashesGPC($ret);
                 break 1;
             case 'f':
             case 'formpreview':
-                $ts =& MyTextSanitizer::getInstance();
+                $ts = & MyTextSanitizer::getInstance();
                 return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
                 break 1;
             case 'n':
@@ -1015,7 +1015,7 @@ 
 
 	function makeFieldReadOnly($key) {
 		if (is_array($key)) {
-			foreach($key as $v) {
+			foreach ($key as $v) {
 				$this->doMakeFieldreadOnly($v);
 			}
 		} else {
@@ -1037,7 +1037,7 @@ 
 
 	function hideFieldFromForm($key) {
 		if (is_array($key)) {
-			foreach($key as $v) {
+			foreach ($key as $v) {
 				$this->doHideFieldFromForm($v);
 			}
 		} else {
@@ -1047,7 +1047,7 @@ 
 
 	function hideFieldFromSingleView($key) {
 		if (is_array($key)) {
-			foreach($key as $v) {
+			foreach ($key as $v) {
 				$this->doHideFieldFromSingleView($v);
 			}
 		} else {
@@ -1068,11 +1068,11 @@ 
 	 * @param bool $userSide for futur use, to do something different on the user side
 	 * @return content of the template if $fetchOnly or nothing if !$fetchOnly
 	 */
-    function displaySingleObject($fetchOnly=false, $userSide=false, $actions=array(), $headerAsRow=true) {
-		include_once SMARTOBJECT_ROOT_PATH."class/smartobjectsingleview.php";
+    function displaySingleObject($fetchOnly = false, $userSide = false, $actions = array(), $headerAsRow = true) {
+		include_once SMARTOBJECT_ROOT_PATH . "class/smartobjectsingleview.php";
 		$singleview = new SmartObjectSingleView($this, $userSide, $actions, $headerAsRow);
 		// add all fields mark as displayOnSingleView except the keyid
-		foreach($this->vars as $key=>$var) {
+		foreach ($this->vars as $key=>$var) {
 			if ($key != $this->handler->keyName && $var['displayOnSingleView']) {
 				$is_header = ($key == $this->handler->identifierName);
 				$singleview->addRow(new SmartObjectRow($key, false, $is_header));
@@ -1080,9 +1080,9 @@ 
 		}
 
 		if ($fetchOnly) {
-			$ret = $singleview->render($fetchOnly);;
+			$ret = $singleview->render($fetchOnly); ;
 			return $ret;
-		}else {
+		} else {
 			$singleview->render($fetchOnly);
 		}
     }
@@ -1093,7 +1093,7 @@ 
 		}
 	}
 
-    function doSetFieldAsRequired($field, $required=true) {
+    function doSetFieldAsRequired($field, $required = true) {
 		$this->setVarInfo($field, 'required', $required);
     }
 
@@ -1103,7 +1103,7 @@ 
 
 	function showFieldOnForm($key) {
 		if (is_array($key)) {
-			foreach($key as $v) {
+			foreach ($key as $v) {
 				$this->doShowFieldOnForm($v);
 			}
 		} else {
@@ -1113,7 +1113,7 @@ 
 
 	function displayFieldOnSingleView($key) {
 		if (is_array($key)) {
-			foreach($key as $v) {
+			foreach ($key as $v) {
 				$this->doDisplayFieldOnSingleView($v);
 			}
 		} else {
@@ -1121,7 +1121,7 @@ 
 		}
 	}
 
-	function doSetAdvancedFormFields($key){
+	function doSetAdvancedFormFields($key) {
 		if (isset($this->vars[$key])) {
 			$this->vars[$key]['advancedform'] = true;
 		}
@@ -1129,7 +1129,7 @@ 
 
 	function setAdvancedFormFields($key) {
 		if (is_array($key)) {
-			foreach($key as $v) {
+			foreach ($key as $v) {
 				$this->doSetAdvancedFormFields($v);
 			}
 		} else {
@@ -1137,12 +1137,12 @@ 
 		}
 	}
 
-	function getUrlLinkObj($key){
+	function getUrlLinkObj($key) {
 		$smartobject_linkurl_handler = xoops_getModuleHandler('urllink', 'smartobject');
 		$urllinkid = $this->getVar($key) != null ? $this->getVar($key) : 0;
-		if($urllinkid != 0){
+		if ($urllinkid != 0) {
 			return  $smartobject_linkurl_handler->get($urllinkid);
-		}else{
+		} else {
 			return $smartobject_linkurl_handler->create();
 		}
 	}
@@ -1152,12 +1152,12 @@ 
 		return $smartobject_linkurl_handler->insert($urlLinkObj);
 	}
 
-	function getFileObj($key){
+	function getFileObj($key) {
 		$smartobject_file_handler = xoops_getModuleHandler('file', 'smartobject');
 		$fileid = $this->getVar($key) != null ? $this->getVar($key) : 0;
-		if($fileid != 0){
+		if ($fileid != 0) {
 			return  $smartobject_file_handler->get($fileid);
-		}else{
+		} else {
 			return $smartobject_file_handler->create();
 		}
 	}

Braces +32 added lines, -14 removed lines

@@ -21,15 +21,33 @@ 
 
 include_once SMARTOBJECT_ROOT_PATH . "class/smartobjectcontroller.php";
 
-if (!defined('XOBJ_DTYPE_SIMPLE_ARRAY')) define('XOBJ_DTYPE_SIMPLE_ARRAY', 101);
-if (!defined('XOBJ_DTYPE_CURRENCY')) define('XOBJ_DTYPE_CURRENCY', 200);
-if (!defined('XOBJ_DTYPE_FLOAT')) define('XOBJ_DTYPE_FLOAT', 201);
-if (!defined('XOBJ_DTYPE_TIME_ONLY')) define('XOBJ_DTYPE_TIME_ONLY', 202);
-if (!defined('XOBJ_DTYPE_URLLINK')) define('XOBJ_DTYPE_URLLINK', 203);
-if (!defined('XOBJ_DTYPE_FILE')) define('XOBJ_DTYPE_FILE', 204);
-if (!defined('XOBJ_DTYPE_IMAGE')) define('XOBJ_DTYPE_IMAGE', 205);
-if (!defined('XOBJ_DTYPE_FORM_SECTION')) define('XOBJ_DTYPE_FORM_SECTION', 210);
-if (!defined('XOBJ_DTYPE_FORM_SECTION_CLOSE')) define('XOBJ_DTYPE_FORM_SECTION_CLOSE', 211);
+if (!defined('XOBJ_DTYPE_SIMPLE_ARRAY')) {
+	define('XOBJ_DTYPE_SIMPLE_ARRAY', 101);
+}
+if (!defined('XOBJ_DTYPE_CURRENCY')) {
+	define('XOBJ_DTYPE_CURRENCY', 200);
+}
+if (!defined('XOBJ_DTYPE_FLOAT')) {
+	define('XOBJ_DTYPE_FLOAT', 201);
+}
+if (!defined('XOBJ_DTYPE_TIME_ONLY')) {
+	define('XOBJ_DTYPE_TIME_ONLY', 202);
+}
+if (!defined('XOBJ_DTYPE_URLLINK')) {
+	define('XOBJ_DTYPE_URLLINK', 203);
+}
+if (!defined('XOBJ_DTYPE_FILE')) {
+	define('XOBJ_DTYPE_FILE', 204);
+}
+if (!defined('XOBJ_DTYPE_IMAGE')) {
+	define('XOBJ_DTYPE_IMAGE', 205);
+}
+if (!defined('XOBJ_DTYPE_FORM_SECTION')) {
+	define('XOBJ_DTYPE_FORM_SECTION', 210);
+}
+if (!defined('XOBJ_DTYPE_FORM_SECTION_CLOSE')) {
+	define('XOBJ_DTYPE_FORM_SECTION_CLOSE', 211);
+}
 
 /**
  * SmartObject base class
@@ -482,9 +500,9 @@ 
     function getVarInfo($key = '', $info = '') {
 		if (isset($this->vars[$key][$info])) {
 			return $this->vars[$key][$info];
-		}elseif ($info == '' && isset($this->vars[$key])) {
+		} elseif ($info == '' && isset($this->vars[$key])) {
 			return $this->vars[$key];
-		}  else {
+		} else {
 			return $this->vars;
 		}
 	}
@@ -1082,7 +1100,7 @@ 
 		if ($fetchOnly) {
 			$ret = $singleview->render($fetchOnly);;
 			return $ret;
-		}else {
+		} else {
 			$singleview->render($fetchOnly);
 		}
     }
@@ -1142,7 +1160,7 @@ 
 		$urllinkid = $this->getVar($key) != null ? $this->getVar($key) : 0;
 		if($urllinkid != 0){
 			return  $smartobject_linkurl_handler->get($urllinkid);
-		}else{
+		} else{
 			return $smartobject_linkurl_handler->create();
 		}
 	}
@@ -1157,7 +1175,7 @@ 
 		$fileid = $this->getVar($key) != null ? $this->getVar($key) : 0;
 		if($fileid != 0){
 			return  $smartobject_file_handler->get($fileid);
-		}else{
+		} else{
 			return $smartobject_file_handler->create();
 		}
 	}

class/smartobjectcontroller.php

Doc Comments +14 added lines, -7 removed lines

@@ -111,6 +111,11 @@ 
     	}
     }
 
+    /**
+     * @param integer $objectid
+     * @param string $created_success_msg
+     * @param string $modified_success_msg
+     */
     function &doStoreFromDefaultForm(&$smartObj, $objectid, $created_success_msg, $modified_success_msg, $redirect_page=false, $debug=false)
     {
     	global $smart_previous_page;
@@ -193,10 +198,7 @@ 
      *
      * @param string $created_success_msg message to display if new object was created
      * @param string $modified_success_msg message to display if object was successfully edited
-     * @param string $created_redir_page redirect page after creating the object
-     * @param string $modified_redir_page redirect page after editing the object
      * @param string $redirect_page redirect page, if not set, then we backup once
-     * @param bool $exit if set to TRUE then the script ends
      * @return bool
      */
     function &storeFromDefaultForm($created_success_msg, $modified_success_msg, $redirect_page=false, $debug=false, $x_param = false)
@@ -261,8 +263,7 @@ 
     /**
      * Handles deletion of an object which keyid is passed as a GET param
      *
-     * @param string $redir_page redirect page after deleting the object
-     * @return bool
+     * @return boolean|null
      */
     function handleObjectDeletion($confirm_msg = false, $op='del', $userSide=false)
     {
@@ -338,7 +339,7 @@ 
     /**
      * Retreive the object admin side link for a {@link SmartObjectSingleView} page
      *
-     * @param object $smartObj reference to the object from which we want the user side link
+     * @param SmartObject $smartObj reference to the object from which we want the user side link
      * @param bool $onlyUrl wether or not to return a simple URL or a full <a> link
      * @return string admin side link to the object
      */
@@ -358,7 +359,7 @@ 
     /**
      * Retreive the object user side link
      *
-     * @param object $smartObj reference to the object from which we want the user side link
+     * @param SmartObject $smartObj reference to the object from which we want the user side link
      * @param bool $onlyUrl wether or not to return a simple URL or a full <a> link
      * @return string user side link to the object
      */
@@ -391,6 +392,9 @@ 
     	return $ret;
     }
 
+    /**
+     * @param SmartMlObject $smartObj
+     */
     function getEditLanguageLink($smartObj, $onlyUrl=false, $withimage=true)
     {
     	$ret = $this->handler->_moduleUrl . "admin/" . $this->handler->_page . "?op=mod&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName) . "&language=" . $smartObj->getVar('language');
@@ -432,6 +436,9 @@ 
     	return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . "</a>";
     }
 
+    /**
+     * @param SmartObject $smartObj
+     */
     function getPrintAndMailLink($smartObj) {
     	global $xoopsConfig;
 

Indentation +208 added lines, -208 removed lines

@@ -31,93 +31,93 @@ 
 include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobjecthandler.php";
 
 class SmartObjectController {
-    var $handler;
-    function SmartObjectController($handler) {
-        $this->handler=$handler;
-    }
-
-    function postDataToObject(&$smartObj) {
-    	foreach(array_keys($smartObj->vars) as $key) {
-    		switch ($smartObj->vars[$key]['data_type']) {
-    			case XOBJ_DTYPE_IMAGE:
-	    			if(isset($_POST['url_'.$key]) && $_POST['url_'.$key] !=''){
-	    				$oldFile = $smartObj->getUploadDir(true).$smartObj->getVar($key, 'e');
-	    				$smartObj->setVar($key, $_POST['url_'.$key]);
-	    				if(file_exists($oldFile)){
-		    				unlink($oldFile);
-		    			}
-	    			}
-	    			if(isset($_POST['delete_'.$key]) && $_POST['delete_'.$key] == '1'){
-	    				$oldFile = $smartObj->getUploadDir(true).$smartObj->getVar($key, 'e');
-	    				$smartObj->setVar($key, '');
-	    				if(file_exists($oldFile)){
-		    				unlink($oldFile);
-		    			}
-	    			}
-    			break;
-
-    			case XOBJ_DTYPE_URLLINK:
-	    			$linkObj = $smartObj->getUrlLinkObj($key);
-	    			$linkObj->setVar('caption', $_POST['caption_'.$key]);
-	    			$linkObj->setVar('description', $_POST['desc_'.$key]);
-	    			$linkObj->setVar('target', $_POST['target_'.$key]);
-	    			$linkObj->setVar('url', $_POST['url_'.$key]);
-	    			if($linkObj->getVar('url') != '' ){
-	    				$smartObj->storeUrlLinkObj($linkObj);
-	    			}
-	    			//todo: catch errors
-	    			$smartObj->setVar($key, $linkObj->getVar('urllinkid'));
-    			break;
-
-    			case XOBJ_DTYPE_FILE:
-	    			if(!isset($_FILES['upload_'.$key]['name']) || $_FILES['upload_'.$key]['name'] == ''){
-	    				$fileObj = $smartObj->getFileObj($key);
-		    			$fileObj->setVar('caption', $_POST['caption_'.$key]);
-		    			$fileObj->setVar('description', $_POST['desc_'.$key]);
-		    			$fileObj->setVar('url', $_POST['url_'.$key]);
-		    			if(!($fileObj->getVar('url') == '' && $fileObj->getVar('url') == '' && $fileObj->getVar('url') == '')){
-		    				$res = $smartObj->storeFileObj($fileObj);
+	var $handler;
+	function SmartObjectController($handler) {
+		$this->handler=$handler;
+	}
+
+	function postDataToObject(&$smartObj) {
+		foreach(array_keys($smartObj->vars) as $key) {
+			switch ($smartObj->vars[$key]['data_type']) {
+				case XOBJ_DTYPE_IMAGE:
+					if(isset($_POST['url_'.$key]) && $_POST['url_'.$key] !=''){
+						$oldFile = $smartObj->getUploadDir(true).$smartObj->getVar($key, 'e');
+						$smartObj->setVar($key, $_POST['url_'.$key]);
+						if(file_exists($oldFile)){
+							unlink($oldFile);
+						}
+					}
+					if(isset($_POST['delete_'.$key]) && $_POST['delete_'.$key] == '1'){
+						$oldFile = $smartObj->getUploadDir(true).$smartObj->getVar($key, 'e');
+						$smartObj->setVar($key, '');
+						if(file_exists($oldFile)){
+							unlink($oldFile);
+						}
+					}
+				break;
+
+				case XOBJ_DTYPE_URLLINK:
+					$linkObj = $smartObj->getUrlLinkObj($key);
+					$linkObj->setVar('caption', $_POST['caption_'.$key]);
+					$linkObj->setVar('description', $_POST['desc_'.$key]);
+					$linkObj->setVar('target', $_POST['target_'.$key]);
+					$linkObj->setVar('url', $_POST['url_'.$key]);
+					if($linkObj->getVar('url') != '' ){
+						$smartObj->storeUrlLinkObj($linkObj);
+					}
+					//todo: catch errors
+					$smartObj->setVar($key, $linkObj->getVar('urllinkid'));
+				break;
+
+				case XOBJ_DTYPE_FILE:
+					if(!isset($_FILES['upload_'.$key]['name']) || $_FILES['upload_'.$key]['name'] == ''){
+						$fileObj = $smartObj->getFileObj($key);
+						$fileObj->setVar('caption', $_POST['caption_'.$key]);
+						$fileObj->setVar('description', $_POST['desc_'.$key]);
+						$fileObj->setVar('url', $_POST['url_'.$key]);
+						if(!($fileObj->getVar('url') == '' && $fileObj->getVar('url') == '' && $fileObj->getVar('url') == '')){
+							$res = $smartObj->storeFileObj($fileObj);
 							if($res){
-			    				$smartObj->setVar($key, $fileObj->getVar('fileid'));
+								$smartObj->setVar($key, $fileObj->getVar('fileid'));
 							}else{
 								//error setted, but no error message (to be improved)
 								$smartObj->setErrors($fileObj->getErrors());
 							}
-		    			}
-	    			}
-    			break;
-
-    			case XOBJ_DTYPE_STIME:
-    			case XOBJ_DTYPE_MTIME:
-    			case XOBJ_DTYPE_LTIME:
-	    			// check if this field's value is available in the POST array
-	    			if (is_array($_POST[$key]) && isset($_POST[$key]['date']))  {
-	    				$value = strtotime($_POST[$key]['date']) + $_POST[$key]['time'];
-	    			}else {
-	    				$value = strtotime($_POST[$key]);
-	    				//if strtotime returns false, the value is already a time stamp
-	    				if(!$value){
-	    					$value = intval($_POST[$key]);
-	    				}
-	    			}	
-	    			$smartObj->setVar($key, $value);
+						}
+					}
+				break;
+
+				case XOBJ_DTYPE_STIME:
+				case XOBJ_DTYPE_MTIME:
+				case XOBJ_DTYPE_LTIME:
+					// check if this field's value is available in the POST array
+					if (is_array($_POST[$key]) && isset($_POST[$key]['date']))  {
+						$value = strtotime($_POST[$key]['date']) + $_POST[$key]['time'];
+					}else {
+						$value = strtotime($_POST[$key]);
+						//if strtotime returns false, the value is already a time stamp
+						if(!$value){
+							$value = intval($_POST[$key]);
+						}
+					}	
+					$smartObj->setVar($key, $value);
 	     			
-    			break;
+				break;
 
-    			default:
+				default:
 					$smartObj->setVar($key, $_POST[$key]);
-    			break;
-    		}
-    	}
-    }
+				break;
+			}
+		}
+	}
 
-    function &doStoreFromDefaultForm(&$smartObj, $objectid, $created_success_msg, $modified_success_msg, $redirect_page=false, $debug=false)
-    {
-    	global $smart_previous_page;
+	function &doStoreFromDefaultForm(&$smartObj, $objectid, $created_success_msg, $modified_success_msg, $redirect_page=false, $debug=false)
+	{
+		global $smart_previous_page;
 
 		$this->postDataToObject($smartObj);
 
-    	if ($smartObj->isNew()) {
+		if ($smartObj->isNew()) {
 			$redirect_msg = $created_success_msg;
 		} else {
 			$redirect_msg = $modified_success_msg;
@@ -125,7 +125,7 @@ 
 
 		// Check if there were uploaded files
 		if (isset($_POST['smart_upload_image']) || isset($_POST['smart_upload_file'])) {
-		    include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartuploader.php";
+			include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartuploader.php";
 			$uploaderObj = new SmartUploader($smartObj->getImageDir(true), $this->handler->_allowedMimeTypes, $this->handler->_maxFileSize, $this->handler->_maxWidth, $this->handler->_maxHeight);
 			foreach ($_FILES as $name=>$file_array) {
 				if (isset ($file_array['name']) && $file_array['name'] != "" && in_array(str_replace('upload_', '', $name), array_keys($smartObj->vars))) {
@@ -137,16 +137,16 @@ 
 							$uploadedArray[] = $related_field;
 							//si c'est un fichier Rich
 							if($smartObj->vars[$related_field]['data_type'] == XOBJ_DTYPE_FILE) {
-				    			$object_fileurl = $smartObj->getUploadDir();
-				    			$fileObj = $smartObj->getFileObj($related_field);
-				    			$fileObj->setVar('url', $object_fileurl.$uploaderObj->getSavedFileName());
-				    			$fileObj->setVar('caption', $_POST['caption_'.$related_field]);
-	    						$fileObj->setVar('description', $_POST['desc_'.$related_field]);
-	    			   			$smartObj->storeFileObj($fileObj);
-    							//todo : catch errors
-				    			$smartObj->setVar($related_field, $fileObj->getVar('fileid'));
-
-				    		}else{
+								$object_fileurl = $smartObj->getUploadDir();
+								$fileObj = $smartObj->getFileObj($related_field);
+								$fileObj->setVar('url', $object_fileurl.$uploaderObj->getSavedFileName());
+								$fileObj->setVar('caption', $_POST['caption_'.$related_field]);
+								$fileObj->setVar('description', $_POST['desc_'.$related_field]);
+					   			$smartObj->storeFileObj($fileObj);
+								//todo : catch errors
+								$smartObj->setVar($related_field, $fileObj->getVar('fileid'));
+
+							}else{
 								$old_file = $smartObj->getUploadDir(true).$smartObj->getVar($related_field);
 								unlink($old_file);
 								$smartObj->setVar($related_field, $uploaderObj->getSavedFileName());
@@ -186,36 +186,36 @@ 
 
 			redirect_header($redirect_page, 2, $redirect_msg);
 		}
-    }
-
-    /**
-     * Store the object in the database autmatically from a form sending POST data
-     *
-     * @param string $created_success_msg message to display if new object was created
-     * @param string $modified_success_msg message to display if object was successfully edited
-     * @param string $created_redir_page redirect page after creating the object
-     * @param string $modified_redir_page redirect page after editing the object
-     * @param string $redirect_page redirect page, if not set, then we backup once
-     * @param bool $exit if set to TRUE then the script ends
-     * @return bool
-     */
-    function &storeFromDefaultForm($created_success_msg, $modified_success_msg, $redirect_page=false, $debug=false, $x_param = false)
-    {
-    	$objectid = (isset($_POST[$this->handler->keyName])) ? intval($_POST[$this->handler->keyName]) : 0;
-    	if ($debug) {
-    		if($x_param){
-    			$smartObj = $this->handler->getD($objectid, true,  $x_param);
-    		}else{
-    			$smartObj = $this->handler->getD($objectid);
-    		}
-
-    	} else {
-    		if($x_param){
-    			$smartObj = $this->handler->get($objectid, true, false, false, $x_param);
-    		}else{
-    			$smartObj = $this->handler->get($objectid);
-    		}
-    	}
+	}
+
+	/**
+	 * Store the object in the database autmatically from a form sending POST data
+	 *
+	 * @param string $created_success_msg message to display if new object was created
+	 * @param string $modified_success_msg message to display if object was successfully edited
+	 * @param string $created_redir_page redirect page after creating the object
+	 * @param string $modified_redir_page redirect page after editing the object
+	 * @param string $redirect_page redirect page, if not set, then we backup once
+	 * @param bool $exit if set to TRUE then the script ends
+	 * @return bool
+	 */
+	function &storeFromDefaultForm($created_success_msg, $modified_success_msg, $redirect_page=false, $debug=false, $x_param = false)
+	{
+		$objectid = (isset($_POST[$this->handler->keyName])) ? intval($_POST[$this->handler->keyName]) : 0;
+		if ($debug) {
+			if($x_param){
+				$smartObj = $this->handler->getD($objectid, true,  $x_param);
+			}else{
+				$smartObj = $this->handler->getD($objectid);
+			}
+
+		} else {
+			if($x_param){
+				$smartObj = $this->handler->get($objectid, true, false, false, $x_param);
+			}else{
+				$smartObj = $this->handler->get($objectid);
+			}
+		}
 
 
 		// if handler is the Multilanguage handler, we will need to treat this for multilanguage
@@ -245,31 +245,31 @@ 
 		} else {
 			return $this->doStoreFromDefaultForm($smartObj, $objectid, $created_success_msg, $modified_success_msg, $redirect_page, $debug);
 		}
-    }
-
-    function &storeSmartObjectD() {
-    	return $this->storeSmartObject(true);
-    }
-
-    function &storeSmartObject($debug=false, $xparam = false)
-    {
-    	$ret =& $this->storeFromDefaultForm('', '', null, $debug, $xparam);
-
-    	return $ret;
-    }
-
-    /**
-     * Handles deletion of an object which keyid is passed as a GET param
-     *
-     * @param string $redir_page redirect page after deleting the object
-     * @return bool
-     */
-    function handleObjectDeletion($confirm_msg = false, $op='del', $userSide=false)
-    {
+	}
+
+	function &storeSmartObjectD() {
+		return $this->storeSmartObject(true);
+	}
+
+	function &storeSmartObject($debug=false, $xparam = false)
+	{
+		$ret =& $this->storeFromDefaultForm('', '', null, $debug, $xparam);
+
+		return $ret;
+	}
+
+	/**
+	 * Handles deletion of an object which keyid is passed as a GET param
+	 *
+	 * @param string $redir_page redirect page after deleting the object
+	 * @return bool
+	 */
+	function handleObjectDeletion($confirm_msg = false, $op='del', $userSide=false)
+	{
 		global $smart_previous_page;
 
-    	$objectid = (isset($_REQUEST[$this->handler->keyName])) ? intval($_REQUEST[$this->handler->keyName]) : 0;
-    	$smartObj = $this->handler->get($objectid);
+		$objectid = (isset($_REQUEST[$this->handler->keyName])) ? intval($_REQUEST[$this->handler->keyName]) : 0;
+		$smartObj = $this->handler->get($objectid);
 
 		if ($smartObj->isNew()) {
 			redirect_header("javascript:history.go(-1)", 3, _CO_SOBJECT_NOT_SELECTED);
@@ -300,13 +300,13 @@ 
 
 		}
 		exit();
-    }
+	}
 
-    function handleObjectDeletionFromUserSide($confirm_msg = false, $op='del') {
+	function handleObjectDeletionFromUserSide($confirm_msg = false, $op='del') {
 		global $smart_previous_page, $xoopsTpl;
 
-    	$objectid = (isset($_REQUEST[$this->handler->keyName])) ? intval($_REQUEST[$this->handler->keyName]) : 0;
-    	$smartObj = $this->handler->get($objectid);
+		$objectid = (isset($_REQUEST[$this->handler->keyName])) ? intval($_REQUEST[$this->handler->keyName]) : 0;
+		$smartObj = $this->handler->get($objectid);
 
 		if ($smartObj->isNew()) {
 			redirect_header("javascript:history.go(-1)", 3, _CO_SOBJECT_NOT_SELECTED);
@@ -333,18 +333,18 @@ 
 			$smartobject_delete_confirm = ob_get_clean();
 			$xoopsTpl->assign('smartobject_delete_confirm', $smartobject_delete_confirm);
 		}
-    }
-
-    /**
-     * Retreive the object admin side link for a {@link SmartObjectSingleView} page
-     *
-     * @param object $smartObj reference to the object from which we want the user side link
-     * @param bool $onlyUrl wether or not to return a simple URL or a full <a> link
-     * @return string admin side link to the object
-     */
-    function getAdminViewItemLink($smartObj, $onlyUrl=false, $withimage=false)
-    {
-    	$ret = $this->handler->_moduleUrl . "admin/" . $this->handler->_page . "?op=view&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
+	}
+
+	/**
+	 * Retreive the object admin side link for a {@link SmartObjectSingleView} page
+	 *
+	 * @param object $smartObj reference to the object from which we want the user side link
+	 * @param bool $onlyUrl wether or not to return a simple URL or a full <a> link
+	 * @return string admin side link to the object
+	 */
+	function getAdminViewItemLink($smartObj, $onlyUrl=false, $withimage=false)
+	{
+		$ret = $this->handler->_moduleUrl . "admin/" . $this->handler->_page . "?op=view&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
 		if ($onlyUrl) {
 			return $ret;
 		}
@@ -352,48 +352,48 @@ 
 			return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "viewmag.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_ADMIN_VIEW . "'  title='" . _CO_SOBJECT_ADMIN_VIEW . "'/></a>";
 		}
 
-    	return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . "</a>";
-    }
-
-    /**
-     * Retreive the object user side link
-     *
-     * @param object $smartObj reference to the object from which we want the user side link
-     * @param bool $onlyUrl wether or not to return a simple URL or a full <a> link
-     * @return string user side link to the object
-     */
-    function getItemLink(&$smartObj, $onlyUrl=false)
-    {
-        $seoMode = smart_getModuleModeSEO($this->handler->_moduleName);
-        $seoModuleName = smart_getModuleNameForSEO($this->handler->_moduleName);
-
-        /**
-         * $seoIncludeId feature is not finished yet, so let's put it always to true
-         */
-        //$seoIncludeId = smart_getModuleIncludeIdSEO($this->handler->_moduleName);
+		return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . "</a>";
+	}
+
+	/**
+	 * Retreive the object user side link
+	 *
+	 * @param object $smartObj reference to the object from which we want the user side link
+	 * @param bool $onlyUrl wether or not to return a simple URL or a full <a> link
+	 * @return string user side link to the object
+	 */
+	function getItemLink(&$smartObj, $onlyUrl=false)
+	{
+		$seoMode = smart_getModuleModeSEO($this->handler->_moduleName);
+		$seoModuleName = smart_getModuleNameForSEO($this->handler->_moduleName);
+
+		/**
+		 * $seoIncludeId feature is not finished yet, so let's put it always to true
+		 */
+		//$seoIncludeId = smart_getModuleIncludeIdSEO($this->handler->_moduleName);
 		$seoIncludeId = true;
 
-        if ($seoMode == 'rewrite') {
-	    	$ret = XOOPS_URL . '/' . $seoModuleName .
+		if ($seoMode == 'rewrite') {
+			$ret = XOOPS_URL . '/' . $seoModuleName .
 				'.' . $this->handler->_itemname .
 				($seoIncludeId ? '.'	. $smartObj->getVar($this->handler->keyName) : ''). '/' . $smartObj->getVar('short_url') . '.html';
-        } else if ($seoMode == 'pathinfo') {
-	    	$ret = SMARTOBJECT_URL . 'seo.php/' . $seoModuleName .
+		} else if ($seoMode == 'pathinfo') {
+			$ret = SMARTOBJECT_URL . 'seo.php/' . $seoModuleName .
 				'.' . $this->handler->_itemname .
 				($seoIncludeId ? '.'	. $smartObj->getVar($this->handler->keyName) : ''). '/' . $smartObj->getVar('short_url') . '.html';
-        } else {
-    		$ret = $this->handler->_moduleUrl . $this->handler->_page . "?" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
-        }
+		} else {
+			$ret = $this->handler->_moduleUrl . $this->handler->_page . "?" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
+		}
 
 		if (!$onlyUrl) {
 			$ret = "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . "</a>";
 		}
-    	return $ret;
-    }
+		return $ret;
+	}
 
-    function getEditLanguageLink($smartObj, $onlyUrl=false, $withimage=true)
-    {
-    	$ret = $this->handler->_moduleUrl . "admin/" . $this->handler->_page . "?op=mod&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName) . "&language=" . $smartObj->getVar('language');
+	function getEditLanguageLink($smartObj, $onlyUrl=false, $withimage=true)
+	{
+		$ret = $this->handler->_moduleUrl . "admin/" . $this->handler->_page . "?op=mod&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName) . "&language=" . $smartObj->getVar('language');
 		if ($onlyUrl) {
 			return $ret;
 		}
@@ -401,13 +401,13 @@ 
 			return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "wizard.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_LANGUAGE_MODIFY . "'  title='" . _CO_SOBJECT_LANGUAGE_MODIFY . "'/></a>";
 		}
 
-    	return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . "</a>";
-    }
+		return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . "</a>";
+	}
 
-    function getEditItemLink($smartObj, $onlyUrl=false, $withimage=true, $userSide=false)
-    {
-    	$admin_side = $userSide ? '' : 'admin/';
-    	$ret = $this->handler->_moduleUrl . $admin_side . $this->handler->_page . "?op=mod&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
+	function getEditItemLink($smartObj, $onlyUrl=false, $withimage=true, $userSide=false)
+	{
+		$admin_side = $userSide ? '' : 'admin/';
+		$ret = $this->handler->_moduleUrl . $admin_side . $this->handler->_page . "?op=mod&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
 		if ($onlyUrl) {
 			return $ret;
 		}
@@ -415,13 +415,13 @@ 
 			return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "edit.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_MODIFY . "'  title='" . _CO_SOBJECT_MODIFY . "'/></a>";
 		}
 
-    	return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . "</a>";
-    }
+		return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . "</a>";
+	}
 
-    function getDeleteItemLink($smartObj, $onlyUrl=false, $withimage=true, $userSide=false)
-    {
-    	$admin_side = $userSide ? '' : 'admin/';
-    	$ret = $this->handler->_moduleUrl . $admin_side . $this->handler->_page . "?op=del&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
+	function getDeleteItemLink($smartObj, $onlyUrl=false, $withimage=true, $userSide=false)
+	{
+		$admin_side = $userSide ? '' : 'admin/';
+		$ret = $this->handler->_moduleUrl . $admin_side . $this->handler->_page . "?op=del&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
 		if ($onlyUrl) {
 			return $ret;
 		}
@@ -429,13 +429,13 @@ 
 			return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "editdelete.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_DELETE . "'  title='" . _CO_SOBJECT_DELETE . "'/></a>";
 		}
 
-    	return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . "</a>";
-    }
+		return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . "</a>";
+	}
 
-    function getPrintAndMailLink($smartObj) {
-    	global $xoopsConfig;
+	function getPrintAndMailLink($smartObj) {
+		global $xoopsConfig;
 
-    	$printlink = $this->handler->_moduleUrl . "print.php?" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
+		$printlink = $this->handler->_moduleUrl . "print.php?" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
 		$js = "javascript:openWithSelfMain('" . $printlink . "', 'smartpopup', 700, 519);";
 		$printlink = '<a href="' . $js . '"><img  src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'fileprint.png" alt="" style="vertical-align: middle;"/></a>';
 
@@ -446,10 +446,10 @@ 
 
 		$ret = '<span id="smartobject_print_button">' . $printlink . "&nbsp;</span>" . '<span id="smartobject_mail_button">' . $friendlink . '</span>';
 		return $ret;
-    }
+	}
 
-    function getModuleItemString() {
-    	$ret = $this->handler->_moduleName . '_' . $this->handler->_itemname;
-    	return $ret;
-    }
+	function getModuleItemString() {
+		$ret = $this->handler->_moduleName . '_' . $this->handler->_itemname;
+		return $ret;
+	}
 }
\ No newline at end of file

Spacing +64 added lines, -64 removed lines

@@ -27,30 +27,30 @@ 
  * @credit Jan Keller Pedersen <mithrandir@xoops.org> - IDG Danmark A/S <www.idg.dk>
  * @link http://smartfactory.ca The SmartFactory
  */
-include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobject.php";
-include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobjecthandler.php";
+include_once XOOPS_ROOT_PATH . "/modules/smartobject/class/smartobject.php";
+include_once XOOPS_ROOT_PATH . "/modules/smartobject/class/smartobjecthandler.php";
 
 class SmartObjectController {
     var $handler;
     function SmartObjectController($handler) {
-        $this->handler=$handler;
+        $this->handler = $handler;
     }
 
     function postDataToObject(&$smartObj) {
-    	foreach(array_keys($smartObj->vars) as $key) {
+    	foreach (array_keys($smartObj->vars) as $key) {
     		switch ($smartObj->vars[$key]['data_type']) {
     			case XOBJ_DTYPE_IMAGE:
-	    			if(isset($_POST['url_'.$key]) && $_POST['url_'.$key] !=''){
-	    				$oldFile = $smartObj->getUploadDir(true).$smartObj->getVar($key, 'e');
-	    				$smartObj->setVar($key, $_POST['url_'.$key]);
-	    				if(file_exists($oldFile)){
+	    			if (isset($_POST['url_' . $key]) && $_POST['url_' . $key] != '') {
+	    				$oldFile = $smartObj->getUploadDir(true) . $smartObj->getVar($key, 'e');
+	    				$smartObj->setVar($key, $_POST['url_' . $key]);
+	    				if (file_exists($oldFile)) {
 		    				unlink($oldFile);
 		    			}
 	    			}
-	    			if(isset($_POST['delete_'.$key]) && $_POST['delete_'.$key] == '1'){
-	    				$oldFile = $smartObj->getUploadDir(true).$smartObj->getVar($key, 'e');
+	    			if (isset($_POST['delete_' . $key]) && $_POST['delete_' . $key] == '1') {
+	    				$oldFile = $smartObj->getUploadDir(true) . $smartObj->getVar($key, 'e');
 	    				$smartObj->setVar($key, '');
-	    				if(file_exists($oldFile)){
+	    				if (file_exists($oldFile)) {
 		    				unlink($oldFile);
 		    			}
 	    			}
@@ -58,11 +58,11 @@ 
 
     			case XOBJ_DTYPE_URLLINK:
 	    			$linkObj = $smartObj->getUrlLinkObj($key);
-	    			$linkObj->setVar('caption', $_POST['caption_'.$key]);
-	    			$linkObj->setVar('description', $_POST['desc_'.$key]);
-	    			$linkObj->setVar('target', $_POST['target_'.$key]);
-	    			$linkObj->setVar('url', $_POST['url_'.$key]);
-	    			if($linkObj->getVar('url') != '' ){
+	    			$linkObj->setVar('caption', $_POST['caption_' . $key]);
+	    			$linkObj->setVar('description', $_POST['desc_' . $key]);
+	    			$linkObj->setVar('target', $_POST['target_' . $key]);
+	    			$linkObj->setVar('url', $_POST['url_' . $key]);
+	    			if ($linkObj->getVar('url') != '') {
 	    				$smartObj->storeUrlLinkObj($linkObj);
 	    			}
 	    			//todo: catch errors
@@ -70,16 +70,16 @@ 
     			break;
 
     			case XOBJ_DTYPE_FILE:
-	    			if(!isset($_FILES['upload_'.$key]['name']) || $_FILES['upload_'.$key]['name'] == ''){
+	    			if (!isset($_FILES['upload_' . $key]['name']) || $_FILES['upload_' . $key]['name'] == '') {
 	    				$fileObj = $smartObj->getFileObj($key);
-		    			$fileObj->setVar('caption', $_POST['caption_'.$key]);
-		    			$fileObj->setVar('description', $_POST['desc_'.$key]);
-		    			$fileObj->setVar('url', $_POST['url_'.$key]);
-		    			if(!($fileObj->getVar('url') == '' && $fileObj->getVar('url') == '' && $fileObj->getVar('url') == '')){
+		    			$fileObj->setVar('caption', $_POST['caption_' . $key]);
+		    			$fileObj->setVar('description', $_POST['desc_' . $key]);
+		    			$fileObj->setVar('url', $_POST['url_' . $key]);
+		    			if (!($fileObj->getVar('url') == '' && $fileObj->getVar('url') == '' && $fileObj->getVar('url') == '')) {
 		    				$res = $smartObj->storeFileObj($fileObj);
-							if($res){
+							if ($res) {
 			    				$smartObj->setVar($key, $fileObj->getVar('fileid'));
-							}else{
+							} else {
 								//error setted, but no error message (to be improved)
 								$smartObj->setErrors($fileObj->getErrors());
 							}
@@ -91,12 +91,12 @@ 
     			case XOBJ_DTYPE_MTIME:
     			case XOBJ_DTYPE_LTIME:
 	    			// check if this field's value is available in the POST array
-	    			if (is_array($_POST[$key]) && isset($_POST[$key]['date']))  {
+	    			if (is_array($_POST[$key]) && isset($_POST[$key]['date'])) {
 	    				$value = strtotime($_POST[$key]['date']) + $_POST[$key]['time'];
-	    			}else {
+	    			} else {
 	    				$value = strtotime($_POST[$key]);
 	    				//if strtotime returns false, the value is already a time stamp
-	    				if(!$value){
+	    				if (!$value) {
 	    					$value = intval($_POST[$key]);
 	    				}
 	    			}	
@@ -111,7 +111,7 @@ 
     	}
     }
 
-    function &doStoreFromDefaultForm(&$smartObj, $objectid, $created_success_msg, $modified_success_msg, $redirect_page=false, $debug=false)
+    function &doStoreFromDefaultForm(&$smartObj, $objectid, $created_success_msg, $modified_success_msg, $redirect_page = false, $debug = false)
     {
     	global $smart_previous_page;
 
@@ -125,29 +125,29 @@ 
 
 		// Check if there were uploaded files
 		if (isset($_POST['smart_upload_image']) || isset($_POST['smart_upload_file'])) {
-		    include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartuploader.php";
+		    include_once XOOPS_ROOT_PATH . "/modules/smartobject/class/smartuploader.php";
 			$uploaderObj = new SmartUploader($smartObj->getImageDir(true), $this->handler->_allowedMimeTypes, $this->handler->_maxFileSize, $this->handler->_maxWidth, $this->handler->_maxHeight);
 			foreach ($_FILES as $name=>$file_array) {
 				if (isset ($file_array['name']) && $file_array['name'] != "" && in_array(str_replace('upload_', '', $name), array_keys($smartObj->vars))) {
 					if ($uploaderObj->fetchMedia($name)) {
-						$uploaderObj->setTargetFileName(time()."_". $uploaderObj->getMediaName());
+						$uploaderObj->setTargetFileName(time() . "_" . $uploaderObj->getMediaName());
 						if ($uploaderObj->upload()) {
 							// Find the related field in the SmartObject
 							$related_field = str_replace('upload_', '', $name);
 							$uploadedArray[] = $related_field;
 							//si c'est un fichier Rich
-							if($smartObj->vars[$related_field]['data_type'] == XOBJ_DTYPE_FILE) {
+							if ($smartObj->vars[$related_field]['data_type'] == XOBJ_DTYPE_FILE) {
 				    			$object_fileurl = $smartObj->getUploadDir();
 				    			$fileObj = $smartObj->getFileObj($related_field);
-				    			$fileObj->setVar('url', $object_fileurl.$uploaderObj->getSavedFileName());
-				    			$fileObj->setVar('caption', $_POST['caption_'.$related_field]);
-	    						$fileObj->setVar('description', $_POST['desc_'.$related_field]);
+				    			$fileObj->setVar('url', $object_fileurl . $uploaderObj->getSavedFileName());
+				    			$fileObj->setVar('caption', $_POST['caption_' . $related_field]);
+	    						$fileObj->setVar('description', $_POST['desc_' . $related_field]);
 	    			   			$smartObj->storeFileObj($fileObj);
     							//todo : catch errors
 				    			$smartObj->setVar($related_field, $fileObj->getVar('fileid'));
 
-				    		}else{
-								$old_file = $smartObj->getUploadDir(true).$smartObj->getVar($related_field);
+				    		} else {
+								$old_file = $smartObj->getUploadDir(true) . $smartObj->getVar($related_field);
 								unlink($old_file);
 								$smartObj->setVar($related_field, $uploaderObj->getSavedFileName());
 							}
@@ -178,7 +178,7 @@ 
 		if ($redirect_page === null) {
 			return $smartObj;
 		} else {
-			if ( !$storeResult ) {
+			if (!$storeResult) {
 				redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $smartObj->getHtmlErrors());
 			}
 
@@ -199,20 +199,20 @@ 
      * @param bool $exit if set to TRUE then the script ends
      * @return bool
      */
-    function &storeFromDefaultForm($created_success_msg, $modified_success_msg, $redirect_page=false, $debug=false, $x_param = false)
+    function &storeFromDefaultForm($created_success_msg, $modified_success_msg, $redirect_page = false, $debug = false, $x_param = false)
     {
     	$objectid = (isset($_POST[$this->handler->keyName])) ? intval($_POST[$this->handler->keyName]) : 0;
     	if ($debug) {
-    		if($x_param){
-    			$smartObj = $this->handler->getD($objectid, true,  $x_param);
-    		}else{
+    		if ($x_param) {
+    			$smartObj = $this->handler->getD($objectid, true, $x_param);
+    		} else {
     			$smartObj = $this->handler->getD($objectid);
     		}
 
     	} else {
-    		if($x_param){
+    		if ($x_param) {
     			$smartObj = $this->handler->get($objectid, true, false, false, $x_param);
-    		}else{
+    		} else {
     			$smartObj = $this->handler->get($objectid);
     		}
     	}
@@ -225,7 +225,7 @@ 
 				// This is a new object. We need to store the meta data and then the language data
 				// First, we will get rid of the multilanguage data to only store the meta data
 				$smartObj->stripMultilanguageFields();
-				$newObject =& $this->doStoreFromDefaultForm($smartObj, $objectid, $created_success_msg, $modified_success_msg, $redirect_page, $debug);
+				$newObject = & $this->doStoreFromDefaultForm($smartObj, $objectid, $created_success_msg, $modified_success_msg, $redirect_page, $debug);
 				/**
 				 * @todo we need to trap potential errors here
 				 */
@@ -238,7 +238,7 @@ 
 
 				$smartObj->setVar($this->handler->keyName, $newObject->getVar($this->handler->keyName));
 				$this->handler->changeTableNameForML();
-				$ret =& $this->doStoreFromDefaultForm($smartObj, $objectid, $created_success_msg, $modified_success_msg, $redirect_page, $debug);
+				$ret = & $this->doStoreFromDefaultForm($smartObj, $objectid, $created_success_msg, $modified_success_msg, $redirect_page, $debug);
 
 				return $ret;
 			}
@@ -251,9 +251,9 @@ 
     	return $this->storeSmartObject(true);
     }
 
-    function &storeSmartObject($debug=false, $xparam = false)
+    function &storeSmartObject($debug = false, $xparam = false)
     {
-    	$ret =& $this->storeFromDefaultForm('', '', null, $debug, $xparam);
+    	$ret = & $this->storeFromDefaultForm('', '', null, $debug, $xparam);
 
     	return $ret;
     }
@@ -264,7 +264,7 @@ 
      * @param string $redir_page redirect page after deleting the object
      * @return bool
      */
-    function handleObjectDeletion($confirm_msg = false, $op='del', $userSide=false)
+    function handleObjectDeletion($confirm_msg = false, $op = 'del', $userSide = false)
     {
 		global $smart_previous_page;
 
@@ -278,7 +278,7 @@ 
 
 		$confirm = (isset($_POST['confirm'])) ? $_POST['confirm'] : 0;
 		if ($confirm) {
-			if( !$this->handler->delete($smartObj)) {
+			if (!$this->handler->delete($smartObj)) {
 				redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_ERROR . $smartObj->getHtmlErrors());
 				exit;
 			}
@@ -294,7 +294,7 @@ 
 				$confirm_msg = _CO_SOBJECT_DELETE_CONFIRM;
 			}
 
-			xoops_confirm(array('op' => $op, $this->handler->keyName => $smartObj->getVar($this->handler->keyName), 'confirm' => 1, 'redirect_page' => $smart_previous_page), xoops_getenv('PHP_SELF'), sprintf($confirm_msg , $smartObj->getVar($this->handler->identifierName)), _CO_SOBJECT_DELETE);
+			xoops_confirm(array('op' => $op, $this->handler->keyName => $smartObj->getVar($this->handler->keyName), 'confirm' => 1, 'redirect_page' => $smart_previous_page), xoops_getenv('PHP_SELF'), sprintf($confirm_msg, $smartObj->getVar($this->handler->identifierName)), _CO_SOBJECT_DELETE);
 
 			xoops_cp_footer();
 
@@ -302,7 +302,7 @@ 
 		exit();
     }
 
-    function handleObjectDeletionFromUserSide($confirm_msg = false, $op='del') {
+    function handleObjectDeletionFromUserSide($confirm_msg = false, $op = 'del') {
 		global $smart_previous_page, $xoopsTpl;
 
     	$objectid = (isset($_REQUEST[$this->handler->keyName])) ? intval($_REQUEST[$this->handler->keyName]) : 0;
@@ -315,7 +315,7 @@ 
 
 		$confirm = (isset($_POST['confirm'])) ? $_POST['confirm'] : 0;
 		if ($confirm) {
-			if( !$this->handler->delete($smartObj)) {
+			if (!$this->handler->delete($smartObj)) {
 				redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_ERROR . $smartObj->getHtmlErrors());
 				exit;
 			}
@@ -329,7 +329,7 @@ 
 			}
 
 			ob_start();
-			xoops_confirm(array('op' => $op, $this->handler->keyName => $smartObj->getVar($this->handler->keyName), 'confirm' => 1, 'redirect_page' => $smart_previous_page), xoops_getenv('PHP_SELF'), sprintf($confirm_msg , $smartObj->getVar($this->handler->identifierName)), _CO_SOBJECT_DELETE);
+			xoops_confirm(array('op' => $op, $this->handler->keyName => $smartObj->getVar($this->handler->keyName), 'confirm' => 1, 'redirect_page' => $smart_previous_page), xoops_getenv('PHP_SELF'), sprintf($confirm_msg, $smartObj->getVar($this->handler->identifierName)), _CO_SOBJECT_DELETE);
 			$smartobject_delete_confirm = ob_get_clean();
 			$xoopsTpl->assign('smartobject_delete_confirm', $smartobject_delete_confirm);
 		}
@@ -342,13 +342,13 @@ 
      * @param bool $onlyUrl wether or not to return a simple URL or a full <a> link
      * @return string admin side link to the object
      */
-    function getAdminViewItemLink($smartObj, $onlyUrl=false, $withimage=false)
+    function getAdminViewItemLink($smartObj, $onlyUrl = false, $withimage = false)
     {
     	$ret = $this->handler->_moduleUrl . "admin/" . $this->handler->_page . "?op=view&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
 		if ($onlyUrl) {
 			return $ret;
 		}
-		elseif($withimage) {
+		elseif ($withimage) {
 			return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "viewmag.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_ADMIN_VIEW . "'  title='" . _CO_SOBJECT_ADMIN_VIEW . "'/></a>";
 		}
 
@@ -362,7 +362,7 @@ 
      * @param bool $onlyUrl wether or not to return a simple URL or a full <a> link
      * @return string user side link to the object
      */
-    function getItemLink(&$smartObj, $onlyUrl=false)
+    function getItemLink(&$smartObj, $onlyUrl = false)
     {
         $seoMode = smart_getModuleModeSEO($this->handler->_moduleName);
         $seoModuleName = smart_getModuleNameForSEO($this->handler->_moduleName);
@@ -376,11 +376,11 @@ 
         if ($seoMode == 'rewrite') {
 	    	$ret = XOOPS_URL . '/' . $seoModuleName .
 				'.' . $this->handler->_itemname .
-				($seoIncludeId ? '.'	. $smartObj->getVar($this->handler->keyName) : ''). '/' . $smartObj->getVar('short_url') . '.html';
+				($seoIncludeId ? '.' . $smartObj->getVar($this->handler->keyName) : '') . '/' . $smartObj->getVar('short_url') . '.html';
         } else if ($seoMode == 'pathinfo') {
 	    	$ret = SMARTOBJECT_URL . 'seo.php/' . $seoModuleName .
 				'.' . $this->handler->_itemname .
-				($seoIncludeId ? '.'	. $smartObj->getVar($this->handler->keyName) : ''). '/' . $smartObj->getVar('short_url') . '.html';
+				($seoIncludeId ? '.' . $smartObj->getVar($this->handler->keyName) : '') . '/' . $smartObj->getVar('short_url') . '.html';
         } else {
     		$ret = $this->handler->_moduleUrl . $this->handler->_page . "?" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
         }
@@ -391,41 +391,41 @@ 
     	return $ret;
     }
 
-    function getEditLanguageLink($smartObj, $onlyUrl=false, $withimage=true)
+    function getEditLanguageLink($smartObj, $onlyUrl = false, $withimage = true)
     {
     	$ret = $this->handler->_moduleUrl . "admin/" . $this->handler->_page . "?op=mod&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName) . "&language=" . $smartObj->getVar('language');
 		if ($onlyUrl) {
 			return $ret;
 		}
-		elseif($withimage) {
+		elseif ($withimage) {
 			return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "wizard.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_LANGUAGE_MODIFY . "'  title='" . _CO_SOBJECT_LANGUAGE_MODIFY . "'/></a>";
 		}
 
     	return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . "</a>";
     }
 
-    function getEditItemLink($smartObj, $onlyUrl=false, $withimage=true, $userSide=false)
+    function getEditItemLink($smartObj, $onlyUrl = false, $withimage = true, $userSide = false)
     {
     	$admin_side = $userSide ? '' : 'admin/';
     	$ret = $this->handler->_moduleUrl . $admin_side . $this->handler->_page . "?op=mod&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
 		if ($onlyUrl) {
 			return $ret;
 		}
-		elseif($withimage) {
+		elseif ($withimage) {
 			return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "edit.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_MODIFY . "'  title='" . _CO_SOBJECT_MODIFY . "'/></a>";
 		}
 
     	return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . "</a>";
     }
 
-    function getDeleteItemLink($smartObj, $onlyUrl=false, $withimage=true, $userSide=false)
+    function getDeleteItemLink($smartObj, $onlyUrl = false, $withimage = true, $userSide = false)
     {
     	$admin_side = $userSide ? '' : 'admin/';
     	$ret = $this->handler->_moduleUrl . $admin_side . $this->handler->_page . "?op=del&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
 		if ($onlyUrl) {
 			return $ret;
 		}
-		elseif($withimage) {
+		elseif ($withimage) {
 			return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "editdelete.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_DELETE . "'  title='" . _CO_SOBJECT_DELETE . "'/></a>";
 		}
 
@@ -442,7 +442,7 @@ 
 		$smartModule = smart_getModuleInfo($smartObj->handler->_moduleName);
 		$link = smart_getCurrentPage();
 		$mid = $smartModule->getVar('mid');
-		$friendlink = "<a href=\"javascript:openWithSelfMain('".SMARTOBJECT_URL."sendlink.php?link=" . $link . "&amp;mid=" . $mid . "', ',',',',',','sendmessage', 674, 500);\"><img src=\"".SMARTOBJECT_IMAGES_ACTIONS_URL . "mail_send.png\"  alt=\"" . _CO_SOBJECT_EMAIL . "\" title=\"" . _CO_SOBJECT_EMAIL . "\" style=\"vertical-align: middle;\"/></a>";
+		$friendlink = "<a href=\"javascript:openWithSelfMain('" . SMARTOBJECT_URL . "sendlink.php?link=" . $link . "&amp;mid=" . $mid . "', ',',',',',','sendmessage', 674, 500);\"><img src=\"" . SMARTOBJECT_IMAGES_ACTIONS_URL . "mail_send.png\"  alt=\"" . _CO_SOBJECT_EMAIL . "\" title=\"" . _CO_SOBJECT_EMAIL . "\" style=\"vertical-align: middle;\"/></a>";
 
 		$ret = '<span id="smartobject_print_button">' . $printlink . "&nbsp;</span>" . '<span id="smartobject_mail_button">' . $friendlink . '</span>';
 		return $ret;

Braces +9 added lines, -13 removed lines

@@ -79,7 +79,7 @@ 
 		    				$res = $smartObj->storeFileObj($fileObj);
 							if($res){
 			    				$smartObj->setVar($key, $fileObj->getVar('fileid'));
-							}else{
+							} else{
 								//error setted, but no error message (to be improved)
 								$smartObj->setErrors($fileObj->getErrors());
 							}
@@ -93,7 +93,7 @@ 
 	    			// check if this field's value is available in the POST array
 	    			if (is_array($_POST[$key]) && isset($_POST[$key]['date']))  {
 	    				$value = strtotime($_POST[$key]['date']) + $_POST[$key]['time'];
-	    			}else {
+	    			} else {
 	    				$value = strtotime($_POST[$key]);
 	    				//if strtotime returns false, the value is already a time stamp
 	    				if(!$value){
@@ -146,7 +146,7 @@ 
     							//todo : catch errors
 				    			$smartObj->setVar($related_field, $fileObj->getVar('fileid'));
 
-				    		}else{
+				    		} else{
 								$old_file = $smartObj->getUploadDir(true).$smartObj->getVar($related_field);
 								unlink($old_file);
 								$smartObj->setVar($related_field, $uploaderObj->getSavedFileName());
@@ -205,14 +205,14 @@ 
     	if ($debug) {
     		if($x_param){
     			$smartObj = $this->handler->getD($objectid, true,  $x_param);
-    		}else{
+    		} else{
     			$smartObj = $this->handler->getD($objectid);
     		}
 
     	} else {
     		if($x_param){
     			$smartObj = $this->handler->get($objectid, true, false, false, $x_param);
-    		}else{
+    		} else{
     			$smartObj = $this->handler->get($objectid);
     		}
     	}
@@ -347,8 +347,7 @@ 
     	$ret = $this->handler->_moduleUrl . "admin/" . $this->handler->_page . "?op=view&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
 		if ($onlyUrl) {
 			return $ret;
-		}
-		elseif($withimage) {
+		} elseif($withimage) {
 			return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "viewmag.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_ADMIN_VIEW . "'  title='" . _CO_SOBJECT_ADMIN_VIEW . "'/></a>";
 		}
 
@@ -396,8 +395,7 @@ 
     	$ret = $this->handler->_moduleUrl . "admin/" . $this->handler->_page . "?op=mod&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName) . "&language=" . $smartObj->getVar('language');
 		if ($onlyUrl) {
 			return $ret;
-		}
-		elseif($withimage) {
+		} elseif($withimage) {
 			return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "wizard.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_LANGUAGE_MODIFY . "'  title='" . _CO_SOBJECT_LANGUAGE_MODIFY . "'/></a>";
 		}
 
@@ -410,8 +408,7 @@ 
     	$ret = $this->handler->_moduleUrl . $admin_side . $this->handler->_page . "?op=mod&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
 		if ($onlyUrl) {
 			return $ret;
-		}
-		elseif($withimage) {
+		} elseif($withimage) {
 			return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "edit.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_MODIFY . "'  title='" . _CO_SOBJECT_MODIFY . "'/></a>";
 		}
 
@@ -424,8 +421,7 @@ 
     	$ret = $this->handler->_moduleUrl . $admin_side . $this->handler->_page . "?op=del&" . $this->handler->keyName . "=" . $smartObj->getVar($this->handler->keyName);
 		if ($onlyUrl) {
 			return $ret;
-		}
-		elseif($withimage) {
+		} elseif($withimage) {
 			return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "editdelete.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_DELETE . "'  title='" . _CO_SOBJECT_DELETE . "'/></a>";
 		}
 

class/smartobjecthandler.php

Doc Comments +9 added lines, -4 removed lines

@@ -136,12 +136,12 @@ 
      * Constructor - called from child classes
      *
      * @param object $db {@link XoopsDatabase} object
-     * @param string $tablename Name of the table use to store this {@link SmartObject}
+     * @param string $itemname Name of the table use to store this {@link SmartObject}
      * @param string Name of the class derived from {@link SmartObject} and which this handler is handling
      * @param string $keyname Name of the table key that uniquely identify each {@link SmartObject}
      * @param string $idenfierName Name of the field which properly identify the {@link SmartObject}
-     * @param string $page Page name use to basically manage and display the {@link SmartObject}
-     * @param string $moduleName name of the module
+     * @param string $modulename name of the module
+     * @param string $summaryName
      */
     function SmartPersistableObjectHandler(&$db, $itemname, $keyname, $idenfierName, $summaryName, $modulename) {
 
@@ -184,6 +184,9 @@ 
         );
     }
 
+    /**
+     * @param boolean $perm_name
+     */
     function setGrantedObjectsCriteria(&$criteria, $perm_name) {
         $smartpermissions_handler = new SmartobjectPermissionHandler($this);
         $grantedItems = $smartpermissions_handler->getGrantedItems($perm_name);
@@ -335,6 +338,9 @@ 
         return $this->convertResultSet($result, $id_as_key, $as_object);
     }
 
+    /**
+     * @param string $sql
+     */
     function query($sql, $criteria, $force=false, $debug=false)
     {
         $ret = array();
@@ -848,7 +854,6 @@ 
      * This method will check if the function is available
      *
      * @param string $event name of the event
-     * @param object $obj $object on which is performed the event
      * @return mixed result of the execution of the function or FALSE if the function was not executed
      */
     function executeEvent($event, &$executeEventObj) {

Indentation +847 added lines, -847 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
+	die("XOOPS root path not defined");
 }
 
 
@@ -30,855 +30,855 @@ 
 
 class SmartPersistableObjectHandler extends XoopsObjectHandler {
 
-    var $_itemname;
-
-    /**
-     * Name of the table use to store this {@link SmartObject}
-     *
-     * Note that the name of the table needs to be free of the database prefix.
-     * For example "smartsection_categories"
-     * @var string
-     */
-    var $table;
-
-    /**
-     * Name of the table key that uniquely identify each {@link SmartObject}
-     *
-     * For example : "categoryid"
-     * @var string
-     */
-    var $keyName;
-
-    /**
-     * Name of the class derived from {@link SmartObject} and which this handler is handling
-     *
-     * Note that this string needs to be lowercase
-     *
-     * For example : "smartsectioncategory"
-     * @var string
-     */
-    var $className;
-
-    /**
-     * Name of the field which properly identify the {@link SmartObject}
-     *
-     * For example : "name" (this will be the category's name)
-     * @var string
-     */
-    var $identifierName;
-
-    /**
-     * Name of the field which will be use as a summary for the object
-     *
-     * For example : "summary"
-     * @var string
-     */
-    var $summaryName;
-
-    /**
-     * Page name use to basically manage and display the {@link SmartObject}
-     *
-     * This page needs to be the same in user side and admin side
-     *
-     * For example category.php - we will deduct smartsection/category.php as well as smartsection/admin/category.php
-     * @todo this could probably be automatically deducted from the class name - for example, the class SmartsectionCategory will have "category.php" as it's managing page
-     * @var string
-     */
-    var $_page;
-
-    /**
-     * Full path of the module using this {@link SmartObject}
-     *
-     * <code>XOOPS_URL . "/modules/smartsection/"</code>
-     * @todo this could probably be automatically deducted from the class name as it is always prefixed with the module name
-     * @var string
-     */
-    var $_modulePath;
-
-    var $_moduleUrl;
-
-    var $_moduleName;
-
-    var $_uploadUrl;
-
-    var $_uploadPath;
-
-    var $_allowedMimeTypes = 0;
-
-    var $_maxFileSize = 1000000;
-
-    var $_maxWidth = 500;
-
-    var $_maxHeight = 500;
-
-    var $highlightFields = array();
-
-    /**
-     * Array containing the events name and functions
-     *
-     * @var array
-     */
-    var $eventArray = array();
-
-    /**
-     * Array containing the permissions that this handler will manage on the objects
-     *
-     * @var array
-     */
-    var $permissionsArray = false;
-
-    var $generalSQL=false;
-
-    var $_eventHooks=array();
-    var $_disabledEvents=array();
-
-    /**
-     * Constructor - called from child classes
-     *
-     * @param object $db {@link XoopsDatabase} object
-     * @param string $tablename Name of the table use to store this {@link SmartObject}
-     * @param string Name of the class derived from {@link SmartObject} and which this handler is handling
-     * @param string $keyname Name of the table key that uniquely identify each {@link SmartObject}
-     * @param string $idenfierName Name of the field which properly identify the {@link SmartObject}
-     * @param string $page Page name use to basically manage and display the {@link SmartObject}
-     * @param string $moduleName name of the module
-     */
-    function SmartPersistableObjectHandler(&$db, $itemname, $keyname, $idenfierName, $summaryName, $modulename) {
-
-        $this->XoopsObjectHandler($db);
-
-        $this->_itemname = $itemname;
-        $this->_moduleName = $modulename;
-        $this->table = $db->prefix($modulename . "_" . $itemname);
-        $this->keyName = $keyname;
-        $this->className = ucfirst($modulename) . ucfirst($itemname);
-        $this->identifierName = $idenfierName;
-        $this->summaryName = $summaryName;
-        $this->_page = $itemname . ".php";
-        $this->_modulePath = XOOPS_ROOT_PATH . "/modules/" . $this->_moduleName . "/";
-        $this->_moduleUrl = XOOPS_URL . "/modules/" . $this->_moduleName . "/";
-        $this->_uploadPath = XOOPS_UPLOAD_PATH . "/" . $this->_moduleName . "/";
-        $this->_uploadUrl = XOOPS_UPLOAD_URL . "/" . $this->_moduleName . "/";
-    }
-
-    function addEventHook($event, $method) {
-        $this->_eventHooks[$event] = $method;
-    }
-
-    /**
-     * Add a permission that this handler will manage for its objects
-     *
-     * Example : $this->addPermission('view', _AM_SSHOP_CAT_PERM_READ, _AM_SSHOP_CAT_PERM_READ_DSC);
-     *
-     * @param string $perm_name name of the permission
-     * @param string $caption caption of the control that will be displayed in the form
-     * @param string $description description of the control that will be displayed in the form
-     */
-    function addPermission($perm_name, $caption, $description=false) {
-        include_once(SMARTOBJECT_ROOT_PATH . 'class/smartobjectpermission.php');
-
-        $this->permissionsArray[] = array(
+	var $_itemname;
+
+	/**
+	 * Name of the table use to store this {@link SmartObject}
+	 *
+	 * Note that the name of the table needs to be free of the database prefix.
+	 * For example "smartsection_categories"
+	 * @var string
+	 */
+	var $table;
+
+	/**
+	 * Name of the table key that uniquely identify each {@link SmartObject}
+	 *
+	 * For example : "categoryid"
+	 * @var string
+	 */
+	var $keyName;
+
+	/**
+	 * Name of the class derived from {@link SmartObject} and which this handler is handling
+	 *
+	 * Note that this string needs to be lowercase
+	 *
+	 * For example : "smartsectioncategory"
+	 * @var string
+	 */
+	var $className;
+
+	/**
+	 * Name of the field which properly identify the {@link SmartObject}
+	 *
+	 * For example : "name" (this will be the category's name)
+	 * @var string
+	 */
+	var $identifierName;
+
+	/**
+	 * Name of the field which will be use as a summary for the object
+	 *
+	 * For example : "summary"
+	 * @var string
+	 */
+	var $summaryName;
+
+	/**
+	 * Page name use to basically manage and display the {@link SmartObject}
+	 *
+	 * This page needs to be the same in user side and admin side
+	 *
+	 * For example category.php - we will deduct smartsection/category.php as well as smartsection/admin/category.php
+	 * @todo this could probably be automatically deducted from the class name - for example, the class SmartsectionCategory will have "category.php" as it's managing page
+	 * @var string
+	 */
+	var $_page;
+
+	/**
+	 * Full path of the module using this {@link SmartObject}
+	 *
+	 * <code>XOOPS_URL . "/modules/smartsection/"</code>
+	 * @todo this could probably be automatically deducted from the class name as it is always prefixed with the module name
+	 * @var string
+	 */
+	var $_modulePath;
+
+	var $_moduleUrl;
+
+	var $_moduleName;
+
+	var $_uploadUrl;
+
+	var $_uploadPath;
+
+	var $_allowedMimeTypes = 0;
+
+	var $_maxFileSize = 1000000;
+
+	var $_maxWidth = 500;
+
+	var $_maxHeight = 500;
+
+	var $highlightFields = array();
+
+	/**
+	 * Array containing the events name and functions
+	 *
+	 * @var array
+	 */
+	var $eventArray = array();
+
+	/**
+	 * Array containing the permissions that this handler will manage on the objects
+	 *
+	 * @var array
+	 */
+	var $permissionsArray = false;
+
+	var $generalSQL=false;
+
+	var $_eventHooks=array();
+	var $_disabledEvents=array();
+
+	/**
+	 * Constructor - called from child classes
+	 *
+	 * @param object $db {@link XoopsDatabase} object
+	 * @param string $tablename Name of the table use to store this {@link SmartObject}
+	 * @param string Name of the class derived from {@link SmartObject} and which this handler is handling
+	 * @param string $keyname Name of the table key that uniquely identify each {@link SmartObject}
+	 * @param string $idenfierName Name of the field which properly identify the {@link SmartObject}
+	 * @param string $page Page name use to basically manage and display the {@link SmartObject}
+	 * @param string $moduleName name of the module
+	 */
+	function SmartPersistableObjectHandler(&$db, $itemname, $keyname, $idenfierName, $summaryName, $modulename) {
+
+		$this->XoopsObjectHandler($db);
+
+		$this->_itemname = $itemname;
+		$this->_moduleName = $modulename;
+		$this->table = $db->prefix($modulename . "_" . $itemname);
+		$this->keyName = $keyname;
+		$this->className = ucfirst($modulename) . ucfirst($itemname);
+		$this->identifierName = $idenfierName;
+		$this->summaryName = $summaryName;
+		$this->_page = $itemname . ".php";
+		$this->_modulePath = XOOPS_ROOT_PATH . "/modules/" . $this->_moduleName . "/";
+		$this->_moduleUrl = XOOPS_URL . "/modules/" . $this->_moduleName . "/";
+		$this->_uploadPath = XOOPS_UPLOAD_PATH . "/" . $this->_moduleName . "/";
+		$this->_uploadUrl = XOOPS_UPLOAD_URL . "/" . $this->_moduleName . "/";
+	}
+
+	function addEventHook($event, $method) {
+		$this->_eventHooks[$event] = $method;
+	}
+
+	/**
+	 * Add a permission that this handler will manage for its objects
+	 *
+	 * Example : $this->addPermission('view', _AM_SSHOP_CAT_PERM_READ, _AM_SSHOP_CAT_PERM_READ_DSC);
+	 *
+	 * @param string $perm_name name of the permission
+	 * @param string $caption caption of the control that will be displayed in the form
+	 * @param string $description description of the control that will be displayed in the form
+	 */
+	function addPermission($perm_name, $caption, $description=false) {
+		include_once(SMARTOBJECT_ROOT_PATH . 'class/smartobjectpermission.php');
+
+		$this->permissionsArray[] = array(
    			'perm_name' => $perm_name,
    			'caption' => $caption,
    			'description' => $description
-        );
-    }
-
-    function setGrantedObjectsCriteria(&$criteria, $perm_name) {
-        $smartpermissions_handler = new SmartobjectPermissionHandler($this);
-        $grantedItems = $smartpermissions_handler->getGrantedItems($perm_name);
-        if (count($grantedItems) > 0) {
-            $criteria->add(new Criteria($this->keyName, '(' . implode(', ', $grantedItems) . ')', 'IN'));
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function setUploaderConfig($_uploadPath=false, $_allowedMimeTypes=false, $_maxFileSize=false, $_maxWidth=false, $_maxHeight=false) {
-        $this->_uploadPath = $_uploadPath ? $_uploadPath : $this->_uploadPath;
-        $this->_allowedMimeTypes = $_allowedMimeTypes ? $_allowedMimeTypes : $this->_allowedMimeTypes;
-        $this->_maxFileSize = $_maxFileSize ? $_maxFileSize : $this->_maxFileSize;
-        $this->_maxWidth = $_maxWidth ? $_maxWidth : $this->_maxWidth;
-        $this->_maxHeight = $_maxHeight ? $_maxHeight : $this->_maxHeight;
-    }
-
-    /**
-     * create a new {@link SmartObject}
-     *
-     * @param bool $isNew Flag the new objects as "new"?
-     *
-     * @return object {@link SmartObject}
-     */
-    function &create($isNew = true) {
-        $obj = new $this->className($this);
-        $obj->setImageDir($this->getImageUrl(), $this->getImagePath());
-        if (!$obj->handler) {
-            $obj->handler =& $this;
-        }
-
-        if ($isNew === true) {
-            $obj->setNew();
-        }
-        return $obj;
-    }
-
-    function getImageUrl() {
-        return $this->_uploadUrl . $this->_itemname . "/";
-    }
-
-    function getImagePath() {
-        $dir = $this->_uploadPath . $this->_itemname;
-        if (!file_exists($dir)) {
-            smart_admin_mkdir($dir);
-        }
-        return $dir . "/";
-    }
-
-    /**
-     * retrieve a {@link SmartObject}
-     *
-     * @param mixed $id ID of the object - or array of ids for joint keys. Joint keys MUST be given in the same order as in the constructor
-     * @param bool $as_object whether to return an object or an array
-     * @return mixed reference to the {@link SmartObject}, FALSE if failed
-     */
-    function &get($id, $as_object = true, $debug=false, $criteria=false) {
-        if (!$criteria) {
-            $criteria = new CriteriaCompo();
-        }
-        if (is_array($this->keyName)) {
-            for ($i = 0; $i < count($this->keyName); $i++) {
-                /**
-                 * In some situations, the $id is not an INTEGER. SmartObjectTag is an example.
-                 * Is the fact that we removed the intval() represents a security risk ?
-                 */
-                //$criteria->add(new Criteria($this->keyName[$i], ($id[$i]), '=', $this->_itemname));
-                $criteria->add(new Criteria($this->keyName[$i], $id[$i], '=', $this->_itemname));
-            }
-        }
-        else {
-            //$criteria = new Criteria($this->keyName, intval($id), '=', $this->_itemname);
-            /**
-            * In some situations, the $id is not an INTEGER. SmartObjectTag is an example.
-            * Is the fact that we removed the intval() represents a security risk ?
-            */
-            $criteria->add(new Criteria($this->keyName, $id, '=', $this->_itemname));
-        }
-        $criteria->setLimit(1);
-        if ($debug) {
-            $obj_array = $this->getObjectsD($criteria, false, $as_object);
-        } else {
-            $obj_array = $this->getObjects($criteria, false, $as_object);
-            //patch : weird bug of indexing by id even if id_as_key = false;
-            if(!isset($obj_array[0]) && is_object($obj_array[$id])){
-                $obj_array[0] = $obj_array[$id];
-                unset($obj_array[$id]);
-                $obj_array[0]->unsetNew();
-            }
-        }
-
-        if (count($obj_array) != 1) {
-            $obj = $this->create();
-            return $obj;
-        }
-
-        return $obj_array[0];
-    }
-
-    /**
-     * retrieve a {@link SmartObject}
-     *
-     * @param mixed $id ID of the object - or array of ids for joint keys. Joint keys MUST be given in the same order as in the constructor
-     * @param bool $as_object whether to return an object or an array
-     * @return mixed reference to the {@link SmartObject}, FALSE if failed
-     */
-    function &getD($id, $as_object = true) {
-        return $this->get($id, $as_object, true);
-    }
-
-    /**
-     * retrieve objects from the database
-     *
-     * @param object $criteria {@link CriteriaElement} conditions to be met
-     * @param bool $id_as_key use the ID as key for the array?
-     * @param bool $as_object return an array of objects?
-     *
-     * @return array
-     */
-    function getObjects($criteria = null, $id_as_key = false, $as_object = true, $sql=false, $debug=false)
-    {
-        $ret = array();
-        $limit = $start = 0;
-
-        if ($this->generalSQL) {
-            $sql = $this->generalSQL;
-        } elseif(!$sql) {
-            $sql = 'SELECT * FROM '.$this->table . " AS " . $this->_itemname;
-        }
-
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' '.$criteria->renderWhere();
-            if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
-            }
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-        if ($debug) {
-            xoops_debug($sql);
-        }
-
-        $result = $this->db->query($sql, $limit, $start);
-        if (!$result) {
-            return $ret;
-        }
-        return $this->convertResultSet($result, $id_as_key, $as_object);
-    }
-
-    function query($sql, $criteria, $force=false, $debug=false)
-    {
-        $ret = array();
-
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' '.$criteria->renderWhere();
-            if ($criteria->groupby) {
-                $sql .= $criteria->getGroupby();
-            }
-            if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
-            }
-
-        }
-        if ($debug) {
-            xoops_debug($sql);
-        }
-
-        if ($force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-
-        if (!$result) {
-            return $ret;
-        }
-
-        while ($myrow = $this->db->fetchArray($result)) {
-            $ret[] = $myrow;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * retrieve objects with debug mode - so will show the query
-     *
-     * @param object $criteria {@link CriteriaElement} conditions to be met
-     * @param bool $id_as_key use the ID as key for the array?
-     * @param bool $as_object return an array of objects?
-     *
-     * @return array
-     */
-    function getObjectsD($criteria = null, $id_as_key = false, $as_object = true, $sql = false)
-    {
-        return $this->getObjects($criteria, $id_as_key, $as_object, $sql, true);
-    }
-
-    function getObjectsAsArray($arrayObjects) {
-        $ret = array();
-        foreach ($arrayObjects as $key => $object) {
-            $ret[$key] = $object->toArray();
-        }
-        if (count($ret > 0)) {
-            return $ret;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Convert a database resultset to a returnable array
-     *
-     * @param object $result database resultset
-     * @param bool $id_as_key - should NOT be used with joint keys
-     * @param bool $as_object
-     *
-     * @return array
-     */
-    function convertResultSet($result, $id_as_key = false, $as_object = true) {
-        $ret = array();
-        while ($myrow = $this->db->fetchArray($result)) {
-
-            $obj =& $this->create(false);
-            $obj->assignVars($myrow);
-            if (!$id_as_key) {
-                if ($as_object) {
-                    $ret[] =& $obj;
-                }
-                else {
-                    $ret[] = $obj->toArray();
-                }
-            } else {
-                if ($as_object) {
-                    $value =& $obj;
-                }
-                else {
-                    $value = $obj->toArray();
-                }
-                if ($id_as_key === 'parentid') {
-                    $ret[$obj->getVar('parentid', 'e')][$obj->getVar($this->keyName)] =& $value;
-                } else {
-                    $ret[$obj->getVar($this->keyName)] = $value;
-                }
-            }
-            unset($obj);
-        }
-
-        return $ret;
-    }
-
-    function getListD($criteria = null, $limit = 0, $start = 0) {
-        return $this->getList($criteria, $limit, $start, true);
-    }
-
-    /**
-     * Retrieve a list of objects as arrays - DON'T USE WITH JOINT KEYS
-     *
-     * @param object $criteria {@link CriteriaElement} conditions to be met
-     * @param int   $limit      Max number of objects to fetch
-     * @param int   $start      Which record to start at
-     *
-     * @return array
-     */
-    function getList($criteria = null, $limit = 0, $start = 0, $debug=false) {
-        $ret = array();
-        if ($criteria == null) {
-            $criteria = new CriteriaCompo();
-        }
-
-        if ($criteria->getSort() == '') {
-            $criteria->setSort($this->getIdentifierName());
-        }
-
-        $sql = 'SELECT '.(is_array($this->keyName) ? implode(', ', $this->keyName) : $this->keyName) ;
-        if(!empty($this->identifierName)){
-            $sql .= ', '.$this->getIdentifierName();
-        }
-        $sql .= ' FROM '.$this->table . " AS " . $this->_itemname;
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' '.$criteria->renderWhere();
-            if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
-            }
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-
-        if ($debug) {
-            xoops_debug($sql);
-        }
-
-        $result = $this->db->query($sql, $limit, $start);
-        if (!$result) {
-            return $ret;
-        }
-
-        $myts =& MyTextSanitizer::getInstance();
-        while ($myrow = $this->db->fetchArray($result)) {
-            //identifiers should be textboxes, so sanitize them like that
-            $ret[$myrow[$this->keyName]] = empty($this->identifierName)?1:$myts->displayTarea($myrow[$this->identifierName]);
-        }
-        return $ret;
-    }
-
-    /**
-     * count objects matching a condition
-     *
-     * @param object $criteria {@link CriteriaElement} to match
-     * @return int count of objects
-     */
-    function getCount($criteria = null)
-    {
-        $field = "";
-        $groupby = false;
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            if ($criteria->groupby != "") {
-                $groupby = true;
-                $field = $criteria->groupby.", "; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
-            }
-        }
-        /**
-         * if we have a generalSQL, lets used this one.
-         * This needs to be improved...
-         */
-        if ($this->generalSQL) {
-            $sql = $this->generalSQL;
-            $sql = str_replace('SELECT *', 'SELECT COUNT(*)', $sql);
-        } else {
-            $sql = 'SELECT '.$field.'COUNT(*) FROM '.$this->table . ' AS ' . $this->_itemname;
-        }
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' '.$criteria->renderWhere();
-            if ($criteria->groupby != "") {
-                $sql .= $criteria->getGroupby();
-            }
-        }
-
-        $result = $this->db->query($sql);
-        if (!$result) {
-            return 0;
-        }
-        if ($groupby == false) {
-            list($count) = $this->db->fetchRow($result);
-            return $count;
-        }
-        else {
-            $ret = array();
-            while (list($id, $count) = $this->db->fetchRow($result)) {
-                $ret[$id] = $count;
-            }
-            return $ret;
-        }
-    }
-
-    /**
-     * delete an object from the database
-     *
-     * @param object $obj reference to the object to delete
-     * @param bool $force
-     * @return bool FALSE if failed.
-     */
-    function delete(&$obj, $force = false)
-    {
-        $eventResult = $this->executeEvent('beforeDelete', $obj);
-        if (!$eventResult) {
-            $obj->setErrors("An error occured during the BeforeDelete event");
-            return false;
-        }
-
-        if (is_array($this->keyName)) {
-            $clause = array();
-            for ($i = 0; $i < count($this->keyName); $i++) {
-                $clause[] = $this->keyName[$i]." = ".$obj->getVar($this->keyName[$i]);
-            }
-            $whereclause = implode(" AND ", $clause);
-        }
-        else {
-            $whereclause = $this->keyName." = ".$obj->getVar($this->keyName);
-        }
-        $sql = "DELETE FROM ".$this->table . " WHERE ".$whereclause;
-        if (false != $force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-        if (!$result) {
-            return false;
-        }
-
-        $eventResult = $this->executeEvent('afterDelete', $obj);
-        if (!$eventResult) {
-            $obj->setErrors("An error occured during the AfterDelete event");
-            return false;
-        }
-        return true;
-    }
-
-    function disableEvent($event) {
-        if (is_array($event)) {
-            foreach($event as $v) {
-                $this->_disabledEvents[] = $v;
-            }
-        } else {
-            $this->_disabledEvents[] = $event;
-        }
-    }
-
-    function getPermissions() {
-        return $this->permissionsArray;
-    }
-
-    /**
-     * insert a new object in the database
-     *
-     * @param object $obj reference to the object
-     * @param bool $force whether to force the query execution despite security settings
-     * @param bool $checkObject check if the object is dirty and clean the attributes
-     * @return bool FALSE if failed, TRUE if already present and unchanged or successful
-     */
-    function insert(&$obj, $force = false, $checkObject = true, $debug=false)
-    {
-        if ($checkObject != false) {
-            if (!is_object($obj)) {
-                return false;
-            }
-            /**
-             * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
-             */
-            if (!is_a($obj, $this->className)) {
-                $obj->setError(get_class($obj)." Differs from ".$this->className);
-                return false;
-            }
-            if (!$obj->isDirty()) {
-                $obj->setErrors("Not dirty"); //will usually not be outputted as errors are not displayed when the method returns true, but it can be helpful when troubleshooting code - Mith
-                return true;
-            }
-        }
-
-        if ($obj->seoEnabled) {
-            // Auto create meta tags if empty
-            $smartobject_metagen = new SmartMetagen($obj->title(), $obj->getVar('meta_keywords'), $obj->summary());
-
-            if (!$obj->getVar('meta_keywords') || !$obj->getVar('meta_description')) {
-
-                if (!$obj->meta_keywords()) {
-                    $obj->setVar('meta_keywords', $smartobject_metagen->_keywords);
-                }
-
-                if (!$obj->meta_description()) {
-                    $obj->setVar('meta_description', $smartobject_metagen->_meta_description);
-                }
-            }
-
-            // Auto create short_url if empty
-            if (!$obj->short_url()) {
-                $obj->setVar('short_url', $smartobject_metagen->generateSeoTitle($obj->title('n'), false));
-            }
-        }
-
-        $eventResult = $this->executeEvent('beforeSave', $obj);
-        if (!$eventResult) {
-            $obj->setErrors("An error occured during the BeforeSave event");
-            return false;
-        }
-
-        if ($obj->isNew()) {
-            $eventResult = $this->executeEvent('beforeInsert', $obj);
-            if (!$eventResult) {
-                $obj->setErrors("An error occured during the BeforeInsert event");
-                return false;
-            }
-
-        }	else {
-            $eventResult = $this->executeEvent('beforeUpdate', $obj);
-            if (!$eventResult) {
-                $obj->setErrors("An error occured during the BeforeUpdate event");
-                return false;
-            }
-        }
-        if (!$obj->cleanVars()) {
-            $obj->setErrors('Variables were not cleaned properly.');
-            return false;
-        }
-        $fieldsToStoreInDB = array();
-        foreach ($obj->cleanVars as $k => $v) {
-            if ($obj->vars[$k]['data_type'] == XOBJ_DTYPE_INT) {
-                $cleanvars[$k] = intval($v);
-            } elseif (is_array($v) ) {
-                $cleanvars[ $k ] = $this->db->quoteString( implode( ',', $v ) );
-            } else {
-                $cleanvars[$k] = $this->db->quoteString($v);
-            }
-            if ($obj->vars[$k]['persistent']) {
-                $fieldsToStoreInDB[$k] = $cleanvars[$k];
-            }
-
-        }
-        if ($obj->isNew()) {
-            if (!is_array($this->keyName)) {
-                if ($cleanvars[$this->keyName] < 1) {
-                    $cleanvars[$this->keyName] = $this->db->genId($this->table.'_'.$this->keyName.'_seq');
-                }
-            }
-
-            $sql = "INSERT INTO ".$this->table." (".implode(',', array_keys($fieldsToStoreInDB)).") VALUES (".implode(',', array_values($fieldsToStoreInDB)) .")";
-
-        } else {
-
-            $sql = "UPDATE ".$this->table." SET";
-            foreach ($fieldsToStoreInDB as $key => $value) {
-                if ((!is_array($this->keyName) && $key == $this->keyName) || (is_array($this->keyName) && in_array($key, $this->keyName))) {
-                    continue;
-                }
-                if (isset($notfirst) ) {
-                    $sql .= ",";
-                }
-                $sql .= " ".$key." = ".$value;
-                $notfirst = true;
-            }
-            if (is_array($this->keyName)) {
-                $whereclause = "";
-                for ($i = 0; $i < count($this->keyName); $i++) {
-                    if ($i > 0) {
-                        $whereclause .= " AND ";
-                    }
-                    $whereclause .= $this->keyName[$i]." = ".$obj->getVar($this->keyName[$i]);
-                }
-            }
-            else {
-                $whereclause = $this->keyName." = ".$obj->getVar($this->keyName);
-            }
-            $sql .= " WHERE ".$whereclause;
-        }
-
-        if ($debug) {
-            xoops_debug($sql);
-        }
-
-        if (false != $force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-
-        if (!$result) {
-            $obj->setErrors($this->db->error());
-            return false;
-        }
-
-        if ($obj->isNew() && !is_array($this->keyName)) {
-            $obj->assignVar($this->keyName, $this->db->getInsertId());
-        }
-        $eventResult = $this->executeEvent('afterSave', $obj);
-        if (!$eventResult) {
-            $obj->setErrors("An error occured during the AfterSave event");
-            return false;
-        }
-
-        if ($obj->isNew()) {
-            $obj->unsetNew();
-            $eventResult = $this->executeEvent('afterInsert', $obj);
-            if (!$eventResult) {
-                $obj->setErrors("An error occured during the AfterInsert event");
-                return false;
-            }
-        } else {
-            $eventResult = $this->executeEvent('afterUpdate', $obj);
-            if (!$eventResult) {
-                $obj->setErrors("An error occured during the AfterUpdate event");
-                return false;
-            }
-        }
-        return true;
-    }
-
-    function insertD(&$obj, $force = false, $checkObject = true, $debug=false)
-    {
-        return $this->insert($obj, $force, $checkObject, true);
-    }
-
-    /**
-     * Change a value for objects with a certain criteria
-     *
-     * @param   string  $fieldname  Name of the field
-     * @param   string  $fieldvalue Value to write
-     * @param   object  $criteria   {@link CriteriaElement}
-     *
-     * @return  bool
-     **/
-    function updateAll($fieldname, $fieldvalue, $criteria = null, $force = false)
-    {
-        $set_clause = $fieldname . ' = ';
-        if ( is_numeric( $fieldvalue ) ) {
-            $set_clause .=  $fieldvalue;
-        } elseif ( is_array( $fieldvalue ) ) {
-            $set_clause .= $this->db->quoteString( implode( ',', $fieldvalue ) );
-        } else {
-            $set_clause .= $this->db->quoteString( $fieldvalue );
-        }
-        $sql = 'UPDATE '.$this->table.' SET '.$set_clause;
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' '.$criteria->renderWhere();
-        }
-        if (false != $force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-        if (!$result) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * delete all objects meeting the conditions
-     *
-     * @param object $criteria {@link CriteriaElement} with conditions to meet
-     * @return bool
-     */
-
-    function deleteAll($criteria = null)
-    {
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql = 'DELETE FROM '.$this->table;
-            $sql .= ' '.$criteria->renderWhere();
-            if (!$this->db->query($sql)) {
-                return false;
-            }
-            $rows = $this->db->getAffectedRows();
-            return $rows > 0 ? $rows : true;
-        }
-        return false;
-    }
-
-    function getModuleInfo() {
-        return smart_getModuleInfo($this->_moduleName);
-    }
-
-    function getModuleConfig() {
-        return smart_getModuleConfig($this->_moduleName);
-    }
-
-    function getModuleItemString() {
-        $ret = $this->_moduleName . '_' . $this->_itemname;
-        return $ret;
-    }
-
-    function updateCounter($object) {
-        if (isset($object->vars['counter'])) {
-            $new_counter = $object->getVar('counter') + 1;
-            $sql = 'UPDATE ' . $this->table . ' SET counter=' . $new_counter . ' WHERE ' . $this->keyName . '=' . $object->id();
-            $this->query($sql, null, true);
-        }
-    }
-
-    /**
-     * Execute the function associated with an event
-     * This method will check if the function is available
-     *
-     * @param string $event name of the event
-     * @param object $obj $object on which is performed the event
-     * @return mixed result of the execution of the function or FALSE if the function was not executed
-     */
-    function executeEvent($event, &$executeEventObj) {
-        if (!in_array($event, $this->_disabledEvents)) {
-            if (method_exists($this, $event)) {
-                $ret = $this->$event($executeEventObj);
-            } else {
-                // check to see if there is a hook for this event
-                if (isset($this->_eventHooks[$event])) {
-                    $method = $this->_eventHooks[$event];
-                    // check to see if the method specified by this hook exists
-                    if (method_exists($this, $method)) {
-                        $ret = $this->$method($executeEventObj);
-
-                    }
-                }
-                $ret = true;
-            }
-            return $ret;
-        }
-        return true;
-    }
-
-    function getIdentifierName($withprefix=true) {
-        if ($withprefix) {
-            return $this->_itemname . "." . $this->identifierName;
-        } else {
-            return $this->identifierName;
-        }
-    }
+		);
+	}
+
+	function setGrantedObjectsCriteria(&$criteria, $perm_name) {
+		$smartpermissions_handler = new SmartobjectPermissionHandler($this);
+		$grantedItems = $smartpermissions_handler->getGrantedItems($perm_name);
+		if (count($grantedItems) > 0) {
+			$criteria->add(new Criteria($this->keyName, '(' . implode(', ', $grantedItems) . ')', 'IN'));
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	function setUploaderConfig($_uploadPath=false, $_allowedMimeTypes=false, $_maxFileSize=false, $_maxWidth=false, $_maxHeight=false) {
+		$this->_uploadPath = $_uploadPath ? $_uploadPath : $this->_uploadPath;
+		$this->_allowedMimeTypes = $_allowedMimeTypes ? $_allowedMimeTypes : $this->_allowedMimeTypes;
+		$this->_maxFileSize = $_maxFileSize ? $_maxFileSize : $this->_maxFileSize;
+		$this->_maxWidth = $_maxWidth ? $_maxWidth : $this->_maxWidth;
+		$this->_maxHeight = $_maxHeight ? $_maxHeight : $this->_maxHeight;
+	}
+
+	/**
+	 * create a new {@link SmartObject}
+	 *
+	 * @param bool $isNew Flag the new objects as "new"?
+	 *
+	 * @return object {@link SmartObject}
+	 */
+	function &create($isNew = true) {
+		$obj = new $this->className($this);
+		$obj->setImageDir($this->getImageUrl(), $this->getImagePath());
+		if (!$obj->handler) {
+			$obj->handler =& $this;
+		}
+
+		if ($isNew === true) {
+			$obj->setNew();
+		}
+		return $obj;
+	}
+
+	function getImageUrl() {
+		return $this->_uploadUrl . $this->_itemname . "/";
+	}
+
+	function getImagePath() {
+		$dir = $this->_uploadPath . $this->_itemname;
+		if (!file_exists($dir)) {
+			smart_admin_mkdir($dir);
+		}
+		return $dir . "/";
+	}
+
+	/**
+	 * retrieve a {@link SmartObject}
+	 *
+	 * @param mixed $id ID of the object - or array of ids for joint keys. Joint keys MUST be given in the same order as in the constructor
+	 * @param bool $as_object whether to return an object or an array
+	 * @return mixed reference to the {@link SmartObject}, FALSE if failed
+	 */
+	function &get($id, $as_object = true, $debug=false, $criteria=false) {
+		if (!$criteria) {
+			$criteria = new CriteriaCompo();
+		}
+		if (is_array($this->keyName)) {
+			for ($i = 0; $i < count($this->keyName); $i++) {
+				/**
+				 * In some situations, the $id is not an INTEGER. SmartObjectTag is an example.
+				 * Is the fact that we removed the intval() represents a security risk ?
+				 */
+				//$criteria->add(new Criteria($this->keyName[$i], ($id[$i]), '=', $this->_itemname));
+				$criteria->add(new Criteria($this->keyName[$i], $id[$i], '=', $this->_itemname));
+			}
+		}
+		else {
+			//$criteria = new Criteria($this->keyName, intval($id), '=', $this->_itemname);
+			/**
+			 * In some situations, the $id is not an INTEGER. SmartObjectTag is an example.
+			 * Is the fact that we removed the intval() represents a security risk ?
+			 */
+			$criteria->add(new Criteria($this->keyName, $id, '=', $this->_itemname));
+		}
+		$criteria->setLimit(1);
+		if ($debug) {
+			$obj_array = $this->getObjectsD($criteria, false, $as_object);
+		} else {
+			$obj_array = $this->getObjects($criteria, false, $as_object);
+			//patch : weird bug of indexing by id even if id_as_key = false;
+			if(!isset($obj_array[0]) && is_object($obj_array[$id])){
+				$obj_array[0] = $obj_array[$id];
+				unset($obj_array[$id]);
+				$obj_array[0]->unsetNew();
+			}
+		}
+
+		if (count($obj_array) != 1) {
+			$obj = $this->create();
+			return $obj;
+		}
+
+		return $obj_array[0];
+	}
+
+	/**
+	 * retrieve a {@link SmartObject}
+	 *
+	 * @param mixed $id ID of the object - or array of ids for joint keys. Joint keys MUST be given in the same order as in the constructor
+	 * @param bool $as_object whether to return an object or an array
+	 * @return mixed reference to the {@link SmartObject}, FALSE if failed
+	 */
+	function &getD($id, $as_object = true) {
+		return $this->get($id, $as_object, true);
+	}
+
+	/**
+	 * retrieve objects from the database
+	 *
+	 * @param object $criteria {@link CriteriaElement} conditions to be met
+	 * @param bool $id_as_key use the ID as key for the array?
+	 * @param bool $as_object return an array of objects?
+	 *
+	 * @return array
+	 */
+	function getObjects($criteria = null, $id_as_key = false, $as_object = true, $sql=false, $debug=false)
+	{
+		$ret = array();
+		$limit = $start = 0;
+
+		if ($this->generalSQL) {
+			$sql = $this->generalSQL;
+		} elseif(!$sql) {
+			$sql = 'SELECT * FROM '.$this->table . " AS " . $this->_itemname;
+		}
+
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' '.$criteria->renderWhere();
+			if ($criteria->getSort() != '') {
+				$sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
+			}
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+		if ($debug) {
+			xoops_debug($sql);
+		}
+
+		$result = $this->db->query($sql, $limit, $start);
+		if (!$result) {
+			return $ret;
+		}
+		return $this->convertResultSet($result, $id_as_key, $as_object);
+	}
+
+	function query($sql, $criteria, $force=false, $debug=false)
+	{
+		$ret = array();
+
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' '.$criteria->renderWhere();
+			if ($criteria->groupby) {
+				$sql .= $criteria->getGroupby();
+			}
+			if ($criteria->getSort() != '') {
+				$sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
+			}
+
+		}
+		if ($debug) {
+			xoops_debug($sql);
+		}
+
+		if ($force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+
+		if (!$result) {
+			return $ret;
+		}
+
+		while ($myrow = $this->db->fetchArray($result)) {
+			$ret[] = $myrow;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * retrieve objects with debug mode - so will show the query
+	 *
+	 * @param object $criteria {@link CriteriaElement} conditions to be met
+	 * @param bool $id_as_key use the ID as key for the array?
+	 * @param bool $as_object return an array of objects?
+	 *
+	 * @return array
+	 */
+	function getObjectsD($criteria = null, $id_as_key = false, $as_object = true, $sql = false)
+	{
+		return $this->getObjects($criteria, $id_as_key, $as_object, $sql, true);
+	}
+
+	function getObjectsAsArray($arrayObjects) {
+		$ret = array();
+		foreach ($arrayObjects as $key => $object) {
+			$ret[$key] = $object->toArray();
+		}
+		if (count($ret > 0)) {
+			return $ret;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Convert a database resultset to a returnable array
+	 *
+	 * @param object $result database resultset
+	 * @param bool $id_as_key - should NOT be used with joint keys
+	 * @param bool $as_object
+	 *
+	 * @return array
+	 */
+	function convertResultSet($result, $id_as_key = false, $as_object = true) {
+		$ret = array();
+		while ($myrow = $this->db->fetchArray($result)) {
+
+			$obj =& $this->create(false);
+			$obj->assignVars($myrow);
+			if (!$id_as_key) {
+				if ($as_object) {
+					$ret[] =& $obj;
+				}
+				else {
+					$ret[] = $obj->toArray();
+				}
+			} else {
+				if ($as_object) {
+					$value =& $obj;
+				}
+				else {
+					$value = $obj->toArray();
+				}
+				if ($id_as_key === 'parentid') {
+					$ret[$obj->getVar('parentid', 'e')][$obj->getVar($this->keyName)] =& $value;
+				} else {
+					$ret[$obj->getVar($this->keyName)] = $value;
+				}
+			}
+			unset($obj);
+		}
+
+		return $ret;
+	}
+
+	function getListD($criteria = null, $limit = 0, $start = 0) {
+		return $this->getList($criteria, $limit, $start, true);
+	}
+
+	/**
+	 * Retrieve a list of objects as arrays - DON'T USE WITH JOINT KEYS
+	 *
+	 * @param object $criteria {@link CriteriaElement} conditions to be met
+	 * @param int   $limit      Max number of objects to fetch
+	 * @param int   $start      Which record to start at
+	 *
+	 * @return array
+	 */
+	function getList($criteria = null, $limit = 0, $start = 0, $debug=false) {
+		$ret = array();
+		if ($criteria == null) {
+			$criteria = new CriteriaCompo();
+		}
+
+		if ($criteria->getSort() == '') {
+			$criteria->setSort($this->getIdentifierName());
+		}
+
+		$sql = 'SELECT '.(is_array($this->keyName) ? implode(', ', $this->keyName) : $this->keyName) ;
+		if(!empty($this->identifierName)){
+			$sql .= ', '.$this->getIdentifierName();
+		}
+		$sql .= ' FROM '.$this->table . " AS " . $this->_itemname;
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' '.$criteria->renderWhere();
+			if ($criteria->getSort() != '') {
+				$sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
+			}
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+
+		if ($debug) {
+			xoops_debug($sql);
+		}
+
+		$result = $this->db->query($sql, $limit, $start);
+		if (!$result) {
+			return $ret;
+		}
+
+		$myts =& MyTextSanitizer::getInstance();
+		while ($myrow = $this->db->fetchArray($result)) {
+			//identifiers should be textboxes, so sanitize them like that
+			$ret[$myrow[$this->keyName]] = empty($this->identifierName)?1:$myts->displayTarea($myrow[$this->identifierName]);
+		}
+		return $ret;
+	}
+
+	/**
+	 * count objects matching a condition
+	 *
+	 * @param object $criteria {@link CriteriaElement} to match
+	 * @return int count of objects
+	 */
+	function getCount($criteria = null)
+	{
+		$field = "";
+		$groupby = false;
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			if ($criteria->groupby != "") {
+				$groupby = true;
+				$field = $criteria->groupby.", "; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
+			}
+		}
+		/**
+		 * if we have a generalSQL, lets used this one.
+		 * This needs to be improved...
+		 */
+		if ($this->generalSQL) {
+			$sql = $this->generalSQL;
+			$sql = str_replace('SELECT *', 'SELECT COUNT(*)', $sql);
+		} else {
+			$sql = 'SELECT '.$field.'COUNT(*) FROM '.$this->table . ' AS ' . $this->_itemname;
+		}
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' '.$criteria->renderWhere();
+			if ($criteria->groupby != "") {
+				$sql .= $criteria->getGroupby();
+			}
+		}
+
+		$result = $this->db->query($sql);
+		if (!$result) {
+			return 0;
+		}
+		if ($groupby == false) {
+			list($count) = $this->db->fetchRow($result);
+			return $count;
+		}
+		else {
+			$ret = array();
+			while (list($id, $count) = $this->db->fetchRow($result)) {
+				$ret[$id] = $count;
+			}
+			return $ret;
+		}
+	}
+
+	/**
+	 * delete an object from the database
+	 *
+	 * @param object $obj reference to the object to delete
+	 * @param bool $force
+	 * @return bool FALSE if failed.
+	 */
+	function delete(&$obj, $force = false)
+	{
+		$eventResult = $this->executeEvent('beforeDelete', $obj);
+		if (!$eventResult) {
+			$obj->setErrors("An error occured during the BeforeDelete event");
+			return false;
+		}
+
+		if (is_array($this->keyName)) {
+			$clause = array();
+			for ($i = 0; $i < count($this->keyName); $i++) {
+				$clause[] = $this->keyName[$i]." = ".$obj->getVar($this->keyName[$i]);
+			}
+			$whereclause = implode(" AND ", $clause);
+		}
+		else {
+			$whereclause = $this->keyName." = ".$obj->getVar($this->keyName);
+		}
+		$sql = "DELETE FROM ".$this->table . " WHERE ".$whereclause;
+		if (false != $force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+		if (!$result) {
+			return false;
+		}
+
+		$eventResult = $this->executeEvent('afterDelete', $obj);
+		if (!$eventResult) {
+			$obj->setErrors("An error occured during the AfterDelete event");
+			return false;
+		}
+		return true;
+	}
+
+	function disableEvent($event) {
+		if (is_array($event)) {
+			foreach($event as $v) {
+				$this->_disabledEvents[] = $v;
+			}
+		} else {
+			$this->_disabledEvents[] = $event;
+		}
+	}
+
+	function getPermissions() {
+		return $this->permissionsArray;
+	}
+
+	/**
+	 * insert a new object in the database
+	 *
+	 * @param object $obj reference to the object
+	 * @param bool $force whether to force the query execution despite security settings
+	 * @param bool $checkObject check if the object is dirty and clean the attributes
+	 * @return bool FALSE if failed, TRUE if already present and unchanged or successful
+	 */
+	function insert(&$obj, $force = false, $checkObject = true, $debug=false)
+	{
+		if ($checkObject != false) {
+			if (!is_object($obj)) {
+				return false;
+			}
+			/**
+			 * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
+			 */
+			if (!is_a($obj, $this->className)) {
+				$obj->setError(get_class($obj)." Differs from ".$this->className);
+				return false;
+			}
+			if (!$obj->isDirty()) {
+				$obj->setErrors("Not dirty"); //will usually not be outputted as errors are not displayed when the method returns true, but it can be helpful when troubleshooting code - Mith
+				return true;
+			}
+		}
+
+		if ($obj->seoEnabled) {
+			// Auto create meta tags if empty
+			$smartobject_metagen = new SmartMetagen($obj->title(), $obj->getVar('meta_keywords'), $obj->summary());
+
+			if (!$obj->getVar('meta_keywords') || !$obj->getVar('meta_description')) {
+
+				if (!$obj->meta_keywords()) {
+					$obj->setVar('meta_keywords', $smartobject_metagen->_keywords);
+				}
+
+				if (!$obj->meta_description()) {
+					$obj->setVar('meta_description', $smartobject_metagen->_meta_description);
+				}
+			}
+
+			// Auto create short_url if empty
+			if (!$obj->short_url()) {
+				$obj->setVar('short_url', $smartobject_metagen->generateSeoTitle($obj->title('n'), false));
+			}
+		}
+
+		$eventResult = $this->executeEvent('beforeSave', $obj);
+		if (!$eventResult) {
+			$obj->setErrors("An error occured during the BeforeSave event");
+			return false;
+		}
+
+		if ($obj->isNew()) {
+			$eventResult = $this->executeEvent('beforeInsert', $obj);
+			if (!$eventResult) {
+				$obj->setErrors("An error occured during the BeforeInsert event");
+				return false;
+			}
+
+		}	else {
+			$eventResult = $this->executeEvent('beforeUpdate', $obj);
+			if (!$eventResult) {
+				$obj->setErrors("An error occured during the BeforeUpdate event");
+				return false;
+			}
+		}
+		if (!$obj->cleanVars()) {
+			$obj->setErrors('Variables were not cleaned properly.');
+			return false;
+		}
+		$fieldsToStoreInDB = array();
+		foreach ($obj->cleanVars as $k => $v) {
+			if ($obj->vars[$k]['data_type'] == XOBJ_DTYPE_INT) {
+				$cleanvars[$k] = intval($v);
+			} elseif (is_array($v) ) {
+				$cleanvars[ $k ] = $this->db->quoteString( implode( ',', $v ) );
+			} else {
+				$cleanvars[$k] = $this->db->quoteString($v);
+			}
+			if ($obj->vars[$k]['persistent']) {
+				$fieldsToStoreInDB[$k] = $cleanvars[$k];
+			}
+
+		}
+		if ($obj->isNew()) {
+			if (!is_array($this->keyName)) {
+				if ($cleanvars[$this->keyName] < 1) {
+					$cleanvars[$this->keyName] = $this->db->genId($this->table.'_'.$this->keyName.'_seq');
+				}
+			}
+
+			$sql = "INSERT INTO ".$this->table." (".implode(',', array_keys($fieldsToStoreInDB)).") VALUES (".implode(',', array_values($fieldsToStoreInDB)) .")";
+
+		} else {
+
+			$sql = "UPDATE ".$this->table." SET";
+			foreach ($fieldsToStoreInDB as $key => $value) {
+				if ((!is_array($this->keyName) && $key == $this->keyName) || (is_array($this->keyName) && in_array($key, $this->keyName))) {
+					continue;
+				}
+				if (isset($notfirst) ) {
+					$sql .= ",";
+				}
+				$sql .= " ".$key." = ".$value;
+				$notfirst = true;
+			}
+			if (is_array($this->keyName)) {
+				$whereclause = "";
+				for ($i = 0; $i < count($this->keyName); $i++) {
+					if ($i > 0) {
+						$whereclause .= " AND ";
+					}
+					$whereclause .= $this->keyName[$i]." = ".$obj->getVar($this->keyName[$i]);
+				}
+			}
+			else {
+				$whereclause = $this->keyName." = ".$obj->getVar($this->keyName);
+			}
+			$sql .= " WHERE ".$whereclause;
+		}
+
+		if ($debug) {
+			xoops_debug($sql);
+		}
+
+		if (false != $force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+
+		if (!$result) {
+			$obj->setErrors($this->db->error());
+			return false;
+		}
+
+		if ($obj->isNew() && !is_array($this->keyName)) {
+			$obj->assignVar($this->keyName, $this->db->getInsertId());
+		}
+		$eventResult = $this->executeEvent('afterSave', $obj);
+		if (!$eventResult) {
+			$obj->setErrors("An error occured during the AfterSave event");
+			return false;
+		}
+
+		if ($obj->isNew()) {
+			$obj->unsetNew();
+			$eventResult = $this->executeEvent('afterInsert', $obj);
+			if (!$eventResult) {
+				$obj->setErrors("An error occured during the AfterInsert event");
+				return false;
+			}
+		} else {
+			$eventResult = $this->executeEvent('afterUpdate', $obj);
+			if (!$eventResult) {
+				$obj->setErrors("An error occured during the AfterUpdate event");
+				return false;
+			}
+		}
+		return true;
+	}
+
+	function insertD(&$obj, $force = false, $checkObject = true, $debug=false)
+	{
+		return $this->insert($obj, $force, $checkObject, true);
+	}
+
+	/**
+	 * Change a value for objects with a certain criteria
+	 *
+	 * @param   string  $fieldname  Name of the field
+	 * @param   string  $fieldvalue Value to write
+	 * @param   object  $criteria   {@link CriteriaElement}
+	 *
+	 * @return  bool
+	 **/
+	function updateAll($fieldname, $fieldvalue, $criteria = null, $force = false)
+	{
+		$set_clause = $fieldname . ' = ';
+		if ( is_numeric( $fieldvalue ) ) {
+			$set_clause .=  $fieldvalue;
+		} elseif ( is_array( $fieldvalue ) ) {
+			$set_clause .= $this->db->quoteString( implode( ',', $fieldvalue ) );
+		} else {
+			$set_clause .= $this->db->quoteString( $fieldvalue );
+		}
+		$sql = 'UPDATE '.$this->table.' SET '.$set_clause;
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' '.$criteria->renderWhere();
+		}
+		if (false != $force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+		if (!$result) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * delete all objects meeting the conditions
+	 *
+	 * @param object $criteria {@link CriteriaElement} with conditions to meet
+	 * @return bool
+	 */
+
+	function deleteAll($criteria = null)
+	{
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql = 'DELETE FROM '.$this->table;
+			$sql .= ' '.$criteria->renderWhere();
+			if (!$this->db->query($sql)) {
+				return false;
+			}
+			$rows = $this->db->getAffectedRows();
+			return $rows > 0 ? $rows : true;
+		}
+		return false;
+	}
+
+	function getModuleInfo() {
+		return smart_getModuleInfo($this->_moduleName);
+	}
+
+	function getModuleConfig() {
+		return smart_getModuleConfig($this->_moduleName);
+	}
+
+	function getModuleItemString() {
+		$ret = $this->_moduleName . '_' . $this->_itemname;
+		return $ret;
+	}
+
+	function updateCounter($object) {
+		if (isset($object->vars['counter'])) {
+			$new_counter = $object->getVar('counter') + 1;
+			$sql = 'UPDATE ' . $this->table . ' SET counter=' . $new_counter . ' WHERE ' . $this->keyName . '=' . $object->id();
+			$this->query($sql, null, true);
+		}
+	}
+
+	/**
+	 * Execute the function associated with an event
+	 * This method will check if the function is available
+	 *
+	 * @param string $event name of the event
+	 * @param object $obj $object on which is performed the event
+	 * @return mixed result of the execution of the function or FALSE if the function was not executed
+	 */
+	function executeEvent($event, &$executeEventObj) {
+		if (!in_array($event, $this->_disabledEvents)) {
+			if (method_exists($this, $event)) {
+				$ret = $this->$event($executeEventObj);
+			} else {
+				// check to see if there is a hook for this event
+				if (isset($this->_eventHooks[$event])) {
+					$method = $this->_eventHooks[$event];
+					// check to see if the method specified by this hook exists
+					if (method_exists($this, $method)) {
+						$ret = $this->$method($executeEventObj);
+
+					}
+				}
+				$ret = true;
+			}
+			return $ret;
+		}
+		return true;
+	}
+
+	function getIdentifierName($withprefix=true) {
+		if ($withprefix) {
+			return $this->_itemname . "." . $this->identifierName;
+		} else {
+			return $this->identifierName;
+		}
+	}
 }
 
 

Spacing +60 added lines, -60 removed lines

@@ -127,10 +127,10 @@ 
      */
     var $permissionsArray = false;
 
-    var $generalSQL=false;
+    var $generalSQL = false;
 
-    var $_eventHooks=array();
-    var $_disabledEvents=array();
+    var $_eventHooks = array();
+    var $_disabledEvents = array();
 
     /**
      * Constructor - called from child classes
@@ -174,7 +174,7 @@ 
      * @param string $caption caption of the control that will be displayed in the form
      * @param string $description description of the control that will be displayed in the form
      */
-    function addPermission($perm_name, $caption, $description=false) {
+    function addPermission($perm_name, $caption, $description = false) {
         include_once(SMARTOBJECT_ROOT_PATH . 'class/smartobjectpermission.php');
 
         $this->permissionsArray[] = array(
@@ -195,7 +195,7 @@ 
         }
     }
 
-    function setUploaderConfig($_uploadPath=false, $_allowedMimeTypes=false, $_maxFileSize=false, $_maxWidth=false, $_maxHeight=false) {
+    function setUploaderConfig($_uploadPath = false, $_allowedMimeTypes = false, $_maxFileSize = false, $_maxWidth = false, $_maxHeight = false) {
         $this->_uploadPath = $_uploadPath ? $_uploadPath : $this->_uploadPath;
         $this->_allowedMimeTypes = $_allowedMimeTypes ? $_allowedMimeTypes : $this->_allowedMimeTypes;
         $this->_maxFileSize = $_maxFileSize ? $_maxFileSize : $this->_maxFileSize;
@@ -214,7 +214,7 @@ 
         $obj = new $this->className($this);
         $obj->setImageDir($this->getImageUrl(), $this->getImagePath());
         if (!$obj->handler) {
-            $obj->handler =& $this;
+            $obj->handler = & $this;
         }
 
         if ($isNew === true) {
@@ -242,7 +242,7 @@ 
      * @param bool $as_object whether to return an object or an array
      * @return mixed reference to the {@link SmartObject}, FALSE if failed
      */
-    function &get($id, $as_object = true, $debug=false, $criteria=false) {
+    function &get($id, $as_object = true, $debug = false, $criteria = false) {
         if (!$criteria) {
             $criteria = new CriteriaCompo();
         }
@@ -270,7 +270,7 @@ 
         } else {
             $obj_array = $this->getObjects($criteria, false, $as_object);
             //patch : weird bug of indexing by id even if id_as_key = false;
-            if(!isset($obj_array[0]) && is_object($obj_array[$id])){
+            if (!isset($obj_array[0]) && is_object($obj_array[$id])) {
                 $obj_array[0] = $obj_array[$id];
                 unset($obj_array[$id]);
                 $obj_array[0]->unsetNew();
@@ -305,21 +305,21 @@ 
      *
      * @return array
      */
-    function getObjects($criteria = null, $id_as_key = false, $as_object = true, $sql=false, $debug=false)
+    function getObjects($criteria = null, $id_as_key = false, $as_object = true, $sql = false, $debug = false)
     {
         $ret = array();
         $limit = $start = 0;
 
         if ($this->generalSQL) {
             $sql = $this->generalSQL;
-        } elseif(!$sql) {
-            $sql = 'SELECT * FROM '.$this->table . " AS " . $this->_itemname;
+        } elseif (!$sql) {
+            $sql = 'SELECT * FROM ' . $this->table . " AS " . $this->_itemname;
         }
 
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' '.$criteria->renderWhere();
+            $sql .= ' ' . $criteria->renderWhere();
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
+                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -335,17 +335,17 @@ 
         return $this->convertResultSet($result, $id_as_key, $as_object);
     }
 
-    function query($sql, $criteria, $force=false, $debug=false)
+    function query($sql, $criteria, $force = false, $debug = false)
     {
         $ret = array();
 
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' '.$criteria->renderWhere();
+            $sql .= ' ' . $criteria->renderWhere();
             if ($criteria->groupby) {
                 $sql .= $criteria->getGroupby();
             }
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
+                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
             }
 
         }
@@ -409,24 +409,24 @@ 
         $ret = array();
         while ($myrow = $this->db->fetchArray($result)) {
 
-            $obj =& $this->create(false);
+            $obj = & $this->create(false);
             $obj->assignVars($myrow);
             if (!$id_as_key) {
                 if ($as_object) {
-                    $ret[] =& $obj;
+                    $ret[] = & $obj;
                 }
                 else {
                     $ret[] = $obj->toArray();
                 }
             } else {
                 if ($as_object) {
-                    $value =& $obj;
+                    $value = & $obj;
                 }
                 else {
                     $value = $obj->toArray();
                 }
                 if ($id_as_key === 'parentid') {
-                    $ret[$obj->getVar('parentid', 'e')][$obj->getVar($this->keyName)] =& $value;
+                    $ret[$obj->getVar('parentid', 'e')][$obj->getVar($this->keyName)] = & $value;
                 } else {
                     $ret[$obj->getVar($this->keyName)] = $value;
                 }
@@ -450,7 +450,7 @@ 
      *
      * @return array
      */
-    function getList($criteria = null, $limit = 0, $start = 0, $debug=false) {
+    function getList($criteria = null, $limit = 0, $start = 0, $debug = false) {
         $ret = array();
         if ($criteria == null) {
             $criteria = new CriteriaCompo();
@@ -460,15 +460,15 @@ 
             $criteria->setSort($this->getIdentifierName());
         }
 
-        $sql = 'SELECT '.(is_array($this->keyName) ? implode(', ', $this->keyName) : $this->keyName) ;
-        if(!empty($this->identifierName)){
-            $sql .= ', '.$this->getIdentifierName();
+        $sql = 'SELECT ' . (is_array($this->keyName) ? implode(', ', $this->keyName) : $this->keyName);
+        if (!empty($this->identifierName)) {
+            $sql .= ', ' . $this->getIdentifierName();
         }
-        $sql .= ' FROM '.$this->table . " AS " . $this->_itemname;
+        $sql .= ' FROM ' . $this->table . " AS " . $this->_itemname;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' '.$criteria->renderWhere();
+            $sql .= ' ' . $criteria->renderWhere();
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
+                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -483,10 +483,10 @@ 
             return $ret;
         }
 
-        $myts =& MyTextSanitizer::getInstance();
+        $myts = & MyTextSanitizer::getInstance();
         while ($myrow = $this->db->fetchArray($result)) {
             //identifiers should be textboxes, so sanitize them like that
-            $ret[$myrow[$this->keyName]] = empty($this->identifierName)?1:$myts->displayTarea($myrow[$this->identifierName]);
+            $ret[$myrow[$this->keyName]] = empty($this->identifierName) ? 1 : $myts->displayTarea($myrow[$this->identifierName]);
         }
         return $ret;
     }
@@ -504,7 +504,7 @@ 
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             if ($criteria->groupby != "") {
                 $groupby = true;
-                $field = $criteria->groupby.", "; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
+                $field = $criteria->groupby . ", "; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
             }
         }
         /**
@@ -515,10 +515,10 @@ 
             $sql = $this->generalSQL;
             $sql = str_replace('SELECT *', 'SELECT COUNT(*)', $sql);
         } else {
-            $sql = 'SELECT '.$field.'COUNT(*) FROM '.$this->table . ' AS ' . $this->_itemname;
+            $sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table . ' AS ' . $this->_itemname;
         }
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' '.$criteria->renderWhere();
+            $sql .= ' ' . $criteria->renderWhere();
             if ($criteria->groupby != "") {
                 $sql .= $criteria->getGroupby();
             }
@@ -559,14 +559,14 @@ 
         if (is_array($this->keyName)) {
             $clause = array();
             for ($i = 0; $i < count($this->keyName); $i++) {
-                $clause[] = $this->keyName[$i]." = ".$obj->getVar($this->keyName[$i]);
+                $clause[] = $this->keyName[$i] . " = " . $obj->getVar($this->keyName[$i]);
             }
             $whereclause = implode(" AND ", $clause);
         }
         else {
-            $whereclause = $this->keyName." = ".$obj->getVar($this->keyName);
+            $whereclause = $this->keyName . " = " . $obj->getVar($this->keyName);
         }
-        $sql = "DELETE FROM ".$this->table . " WHERE ".$whereclause;
+        $sql = "DELETE FROM " . $this->table . " WHERE " . $whereclause;
         if (false != $force) {
             $result = $this->db->queryF($sql);
         } else {
@@ -586,7 +586,7 @@ 
 
     function disableEvent($event) {
         if (is_array($event)) {
-            foreach($event as $v) {
+            foreach ($event as $v) {
                 $this->_disabledEvents[] = $v;
             }
         } else {
@@ -606,7 +606,7 @@ 
      * @param bool $checkObject check if the object is dirty and clean the attributes
      * @return bool FALSE if failed, TRUE if already present and unchanged or successful
      */
-    function insert(&$obj, $force = false, $checkObject = true, $debug=false)
+    function insert(&$obj, $force = false, $checkObject = true, $debug = false)
     {
         if ($checkObject != false) {
             if (!is_object($obj)) {
@@ -616,7 +616,7 @@ 
              * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
              */
             if (!is_a($obj, $this->className)) {
-                $obj->setError(get_class($obj)." Differs from ".$this->className);
+                $obj->setError(get_class($obj) . " Differs from " . $this->className);
                 return false;
             }
             if (!$obj->isDirty()) {
@@ -659,7 +659,7 @@ 
                 return false;
             }
 
-        }	else {
+        } else {
             $eventResult = $this->executeEvent('beforeUpdate', $obj);
             if (!$eventResult) {
                 $obj->setErrors("An error occured during the BeforeUpdate event");
@@ -674,8 +674,8 @@ 
         foreach ($obj->cleanVars as $k => $v) {
             if ($obj->vars[$k]['data_type'] == XOBJ_DTYPE_INT) {
                 $cleanvars[$k] = intval($v);
-            } elseif (is_array($v) ) {
-                $cleanvars[ $k ] = $this->db->quoteString( implode( ',', $v ) );
+            } elseif (is_array($v)) {
+                $cleanvars[$k] = $this->db->quoteString(implode(',', $v));
             } else {
                 $cleanvars[$k] = $this->db->quoteString($v);
             }
@@ -687,23 +687,23 @@ 
         if ($obj->isNew()) {
             if (!is_array($this->keyName)) {
                 if ($cleanvars[$this->keyName] < 1) {
-                    $cleanvars[$this->keyName] = $this->db->genId($this->table.'_'.$this->keyName.'_seq');
+                    $cleanvars[$this->keyName] = $this->db->genId($this->table . '_' . $this->keyName . '_seq');
                 }
             }
 
-            $sql = "INSERT INTO ".$this->table." (".implode(',', array_keys($fieldsToStoreInDB)).") VALUES (".implode(',', array_values($fieldsToStoreInDB)) .")";
+            $sql = "INSERT INTO " . $this->table . " (" . implode(',', array_keys($fieldsToStoreInDB)) . ") VALUES (" . implode(',', array_values($fieldsToStoreInDB)) . ")";
 
         } else {
 
-            $sql = "UPDATE ".$this->table." SET";
+            $sql = "UPDATE " . $this->table . " SET";
             foreach ($fieldsToStoreInDB as $key => $value) {
                 if ((!is_array($this->keyName) && $key == $this->keyName) || (is_array($this->keyName) && in_array($key, $this->keyName))) {
                     continue;
                 }
-                if (isset($notfirst) ) {
+                if (isset($notfirst)) {
                     $sql .= ",";
                 }
-                $sql .= " ".$key." = ".$value;
+                $sql .= " " . $key . " = " . $value;
                 $notfirst = true;
             }
             if (is_array($this->keyName)) {
@@ -712,13 +712,13 @@ 
                     if ($i > 0) {
                         $whereclause .= " AND ";
                     }
-                    $whereclause .= $this->keyName[$i]." = ".$obj->getVar($this->keyName[$i]);
+                    $whereclause .= $this->keyName[$i] . " = " . $obj->getVar($this->keyName[$i]);
                 }
             }
             else {
-                $whereclause = $this->keyName." = ".$obj->getVar($this->keyName);
+                $whereclause = $this->keyName . " = " . $obj->getVar($this->keyName);
             }
-            $sql .= " WHERE ".$whereclause;
+            $sql .= " WHERE " . $whereclause;
         }
 
         if ($debug) {
@@ -762,7 +762,7 @@ 
         return true;
     }
 
-    function insertD(&$obj, $force = false, $checkObject = true, $debug=false)
+    function insertD(&$obj, $force = false, $checkObject = true, $debug = false)
     {
         return $this->insert($obj, $force, $checkObject, true);
     }
@@ -779,16 +779,16 @@ 
     function updateAll($fieldname, $fieldvalue, $criteria = null, $force = false)
     {
         $set_clause = $fieldname . ' = ';
-        if ( is_numeric( $fieldvalue ) ) {
-            $set_clause .=  $fieldvalue;
-        } elseif ( is_array( $fieldvalue ) ) {
-            $set_clause .= $this->db->quoteString( implode( ',', $fieldvalue ) );
+        if (is_numeric($fieldvalue)) {
+            $set_clause .= $fieldvalue;
+        } elseif (is_array($fieldvalue)) {
+            $set_clause .= $this->db->quoteString(implode(',', $fieldvalue));
         } else {
-            $set_clause .= $this->db->quoteString( $fieldvalue );
+            $set_clause .= $this->db->quoteString($fieldvalue);
         }
-        $sql = 'UPDATE '.$this->table.' SET '.$set_clause;
+        $sql = 'UPDATE ' . $this->table . ' SET ' . $set_clause;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' '.$criteria->renderWhere();
+            $sql .= ' ' . $criteria->renderWhere();
         }
         if (false != $force) {
             $result = $this->db->queryF($sql);
@@ -811,8 +811,8 @@ 
     function deleteAll($criteria = null)
     {
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql = 'DELETE FROM '.$this->table;
-            $sql .= ' '.$criteria->renderWhere();
+            $sql = 'DELETE FROM ' . $this->table;
+            $sql .= ' ' . $criteria->renderWhere();
             if (!$this->db->query($sql)) {
                 return false;
             }
@@ -872,7 +872,7 @@ 
         return true;
     }
 
-    function getIdentifierName($withprefix=true) {
+    function getIdentifierName($withprefix = true) {
         if ($withprefix) {
             return $this->_itemname . "." . $this->identifierName;
         } else {

Braces +7 added lines, -13 removed lines

@@ -255,8 +255,7 @@ 
                 //$criteria->add(new Criteria($this->keyName[$i], ($id[$i]), '=', $this->_itemname));
                 $criteria->add(new Criteria($this->keyName[$i], $id[$i], '=', $this->_itemname));
             }
-        }
-        else {
+        } else {
             //$criteria = new Criteria($this->keyName, intval($id), '=', $this->_itemname);
             /**
             * In some situations, the $id is not an INTEGER. SmartObjectTag is an example.
@@ -414,15 +413,13 @@ 
             if (!$id_as_key) {
                 if ($as_object) {
                     $ret[] =& $obj;
-                }
-                else {
+                } else {
                     $ret[] = $obj->toArray();
                 }
             } else {
                 if ($as_object) {
                     $value =& $obj;
-                }
-                else {
+                } else {
                     $value = $obj->toArray();
                 }
                 if ($id_as_key === 'parentid') {
@@ -531,8 +528,7 @@ 
         if ($groupby == false) {
             list($count) = $this->db->fetchRow($result);
             return $count;
-        }
-        else {
+        } else {
             $ret = array();
             while (list($id, $count) = $this->db->fetchRow($result)) {
                 $ret[$id] = $count;
@@ -562,8 +558,7 @@ 
                 $clause[] = $this->keyName[$i]." = ".$obj->getVar($this->keyName[$i]);
             }
             $whereclause = implode(" AND ", $clause);
-        }
-        else {
+        } else {
             $whereclause = $this->keyName." = ".$obj->getVar($this->keyName);
         }
         $sql = "DELETE FROM ".$this->table . " WHERE ".$whereclause;
@@ -659,7 +654,7 @@ 
                 return false;
             }
 
-        }	else {
+        } else {
             $eventResult = $this->executeEvent('beforeUpdate', $obj);
             if (!$eventResult) {
                 $obj->setErrors("An error occured during the BeforeUpdate event");
@@ -714,8 +709,7 @@ 
                     }
                     $whereclause .= $this->keyName[$i]." = ".$obj->getVar($this->keyName[$i]);
                 }
-            }
-            else {
+            } else {
                 $whereclause = $this->keyName." = ".$obj->getVar($this->keyName);
             }
             $sql .= " WHERE ".$whereclause;

class/smartobjectlink.php

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
     * @access public
     * @param string $key key of the object's variable to be returned
     * @param string $format format to use for the output
-    * @return mixed formatted value of the variable
+    * @return integer formatted value of the variable
     */
     function getVar($key, $format = 's') {
         if ($format == 's' && in_array($key, array('from_uid', 'to_uid', 'date', 'link'))) {

Indentation +86 added lines, -86 removed lines

@@ -28,120 +28,120 @@
 // -------------------------------------------------------------------------//
 
 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";
 class SmartobjectLink extends SmartObject {
 
-    function SmartobjectLink() {
-        $this->initVar('linkid', XOBJ_DTYPE_INT, '', true);
-        $this->initVar('date', XOBJ_DTYPE_INT, 0, false, null,'', false, _CO_SOBJECT_LINK_DATE, '', true, true, false);
-        $this->initVar('from_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_FROM_UID, _CO_SOBJECT_LINK_FROM_UID_DSC);
-        $this->initVar('from_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_EMAIL, _CO_SOBJECT_LINK_FROM_EMAIL_DSC, true);
-        $this->initVar('from_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_NAME, _CO_SOBJECT_LINK_FROM_NAME_DSC, true);
-        $this->initVar('to_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_TO_UID, _CO_SOBJECT_LINK_TO_UID_DSC);
-        $this->initVar('to_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_TO_EMAIL, _CO_SOBJECT_LINK_TO_EMAIL_DSC, true);
-        $this->initVar('to_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_TO_NAME, _CO_SOBJECT_LINK_TO_NAME_DSC, true);
-        $this->initVar('link', XOBJ_DTYPE_TXTBOX, '', false, 255, '', false, _CO_SOBJECT_LINK_LINK, _CO_SOBJECT_LINK_LINK_DSC, true);
+	function SmartobjectLink() {
+		$this->initVar('linkid', XOBJ_DTYPE_INT, '', true);
+		$this->initVar('date', XOBJ_DTYPE_INT, 0, false, null,'', false, _CO_SOBJECT_LINK_DATE, '', true, true, false);
+		$this->initVar('from_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_FROM_UID, _CO_SOBJECT_LINK_FROM_UID_DSC);
+		$this->initVar('from_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_EMAIL, _CO_SOBJECT_LINK_FROM_EMAIL_DSC, true);
+		$this->initVar('from_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_NAME, _CO_SOBJECT_LINK_FROM_NAME_DSC, true);
+		$this->initVar('to_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_TO_UID, _CO_SOBJECT_LINK_TO_UID_DSC);
+		$this->initVar('to_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_TO_EMAIL, _CO_SOBJECT_LINK_TO_EMAIL_DSC, true);
+		$this->initVar('to_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_TO_NAME, _CO_SOBJECT_LINK_TO_NAME_DSC, true);
+		$this->initVar('link', XOBJ_DTYPE_TXTBOX, '', false, 255, '', false, _CO_SOBJECT_LINK_LINK, _CO_SOBJECT_LINK_LINK_DSC, true);
 		$this->initVar('subject', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_SUBJECT, _CO_SOBJECT_LINK_SUBJECT_DSC, true);
 		$this->initVar('body', XOBJ_DTYPE_TXTAREA, '', true, null, '', false, _CO_SOBJECT_LINK_BODY, _CO_SOBJECT_LINK_BODY_DSC);
-        $this->initVar('mid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_MID, _CO_SOBJECT_LINK_MID_DSC);
-        $this->initVar('mid_name', XOBJ_DTYPE_TXTBOX, '', false, 255, '', false, _CO_SOBJECT_LINK_MID_NAME, _CO_SOBJECT_LINK_MID_NAME_DSC, true);
-    }
-
-
-    /**
-    * returns a specific variable for the object in a proper format
-    *
-    * @access public
-    * @param string $key key of the object's variable to be returned
-    * @param string $format format to use for the output
-    * @return mixed formatted value of the variable
-    */
-    function getVar($key, $format = 's') {
-        if ($format == 's' && in_array($key, array('from_uid', 'to_uid', 'date', 'link'))) {
-            return call_user_func(array($this,$key));
-        }
-        return parent::getVar($key, $format);
-    }
-
-    function from_uid() {
-        $ret = smart_getLinkedUnameFromId($this->getVar('from_uid', 'e'), 1, null, true);
-        return $ret;
-    }
-
-    function to_uid($withContact=false) {
-  	    $ret = smart_getLinkedUnameFromId($this->getVar('to_uid', 'e'), 1, null, true);
-        return $ret;
-    }
-
-    function date() {
-        $ret = formatTimestamp($this->getVar('date','e'));
-        return $ret;
-    }
-
-    function link($full=false) {
-        $ret = $this->getVar('link','e');
-        if ($full) {
-        	$myts = MyTextSanitizer::getInstance();
-        	$ret = $myts->displayTarea($ret);
-        	return $ret;
-        } else {
-        	$ret = '<a href="' . $ret . '" alt="' . $this->getVar('link','e') . '" title="' . $this->getVar('link','e') . '">' .  _AM_SOBJECT_SENT_LINKS_GOTO . '</a>';
-        	return $ret;
-        }
-    }
-
-    function getViewItemLink() {
+		$this->initVar('mid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_MID, _CO_SOBJECT_LINK_MID_DSC);
+		$this->initVar('mid_name', XOBJ_DTYPE_TXTBOX, '', false, 255, '', false, _CO_SOBJECT_LINK_MID_NAME, _CO_SOBJECT_LINK_MID_NAME_DSC, true);
+	}
+
+
+	/**
+	 * returns a specific variable for the object in a proper format
+	 *
+	 * @access public
+	 * @param string $key key of the object's variable to be returned
+	 * @param string $format format to use for the output
+	 * @return mixed formatted value of the variable
+	 */
+	function getVar($key, $format = 's') {
+		if ($format == 's' && in_array($key, array('from_uid', 'to_uid', 'date', 'link'))) {
+			return call_user_func(array($this,$key));
+		}
+		return parent::getVar($key, $format);
+	}
+
+	function from_uid() {
+		$ret = smart_getLinkedUnameFromId($this->getVar('from_uid', 'e'), 1, null, true);
+		return $ret;
+	}
+
+	function to_uid($withContact=false) {
+  		$ret = smart_getLinkedUnameFromId($this->getVar('to_uid', 'e'), 1, null, true);
+		return $ret;
+	}
+
+	function date() {
+		$ret = formatTimestamp($this->getVar('date','e'));
+		return $ret;
+	}
+
+	function link($full=false) {
+		$ret = $this->getVar('link','e');
+		if ($full) {
+			$myts = MyTextSanitizer::getInstance();
+			$ret = $myts->displayTarea($ret);
+			return $ret;
+		} else {
+			$ret = '<a href="' . $ret . '" alt="' . $this->getVar('link','e') . '" title="' . $this->getVar('link','e') . '">' .  _AM_SOBJECT_SENT_LINKS_GOTO . '</a>';
+			return $ret;
+		}
+	}
+
+	function getViewItemLink() {
 		$ret = '<a href="' . SMARTOBJECT_URL . 'admin/link.php?op=view&linkid=' . $this->getVar('linkid') . '"><img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'mail_find.png" alt="' . _AM_SOBJECT_SENT_LINK_VIEW . '" title="' . _AM_SOBJECT_SENT_LINK_VIEW . '" /></a>';
 		return $ret;
-    }
+	}
 
-    function getFromInfo() {
-    	// check if from_uid represent a user
+	function getFromInfo() {
+		// check if from_uid represent a user
 
-    	if ($this->getVar('from_uid')) {
+		if ($this->getVar('from_uid')) {
 			$user = smart_getLinkedUnameFromId($this->getVar('from_uid'));
 			if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
 				$user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
 			}
-    	} else {
-    		$user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
-    	}
+		} else {
+			$user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
+		}
 
-    	return $user;
+		return $user;
 
-    }
+	}
 
-    function toArray() {
-    	$ret = parent::toArray();
-    	$ret['fromInfo'] = $this->getFromInfo();
-    	$ret['toInfo'] = $this->getToInfo();
-    	$ret['fullLink'] = $this->link(true);
-    	return $ret;
-    }
+	function toArray() {
+		$ret = parent::toArray();
+		$ret['fromInfo'] = $this->getFromInfo();
+		$ret['toInfo'] = $this->getToInfo();
+		$ret['fullLink'] = $this->link(true);
+		return $ret;
+	}
 
-    function getToInfo() {
-    	// check if from_uid represent a user
+	function getToInfo() {
+		// check if from_uid represent a user
 
-    	if ($this->getVar('to_uid')) {
+		if ($this->getVar('to_uid')) {
 			$user = smart_getLinkedUnameFromId($this->getVar('to_uid'));
 			if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
 				$user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
 			}
-    	} else {
-    		$user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
-    	}
+		} else {
+			$user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
+		}
 
-    	return $user;
+		return $user;
 
-    }
+	}
 }
 class SmartobjectLinkHandler extends SmartPersistableObjectHandler {
-    function SmartobjectLinkHandler($db) {
+	function SmartobjectLinkHandler($db) {
 
-        $this->SmartPersistableObjectHandler($db, 'link', 'linkid', 'subject', 'body', 'smartobject');
-    }
+		$this->SmartPersistableObjectHandler($db, 'link', 'linkid', 'subject', 'body', 'smartobject');
+	}
 
 }
 ?>
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -30,12 +30,12 @@ 
 if (!defined("XOOPS_ROOT_PATH")) {
     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";
 class SmartobjectLink extends SmartObject {
 
     function SmartobjectLink() {
         $this->initVar('linkid', XOBJ_DTYPE_INT, '', true);
-        $this->initVar('date', XOBJ_DTYPE_INT, 0, false, null,'', false, _CO_SOBJECT_LINK_DATE, '', true, true, false);
+        $this->initVar('date', XOBJ_DTYPE_INT, 0, false, null, '', false, _CO_SOBJECT_LINK_DATE, '', true, true, false);
         $this->initVar('from_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_FROM_UID, _CO_SOBJECT_LINK_FROM_UID_DSC);
         $this->initVar('from_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_EMAIL, _CO_SOBJECT_LINK_FROM_EMAIL_DSC, true);
         $this->initVar('from_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_NAME, _CO_SOBJECT_LINK_FROM_NAME_DSC, true);
@@ -60,7 +60,7 @@ 
     */
     function getVar($key, $format = 's') {
         if ($format == 's' && in_array($key, array('from_uid', 'to_uid', 'date', 'link'))) {
-            return call_user_func(array($this,$key));
+            return call_user_func(array($this, $key));
         }
         return parent::getVar($key, $format);
     }
@@ -70,24 +70,24 @@ 
         return $ret;
     }
 
-    function to_uid($withContact=false) {
+    function to_uid($withContact = false) {
   	    $ret = smart_getLinkedUnameFromId($this->getVar('to_uid', 'e'), 1, null, true);
         return $ret;
     }
 
     function date() {
-        $ret = formatTimestamp($this->getVar('date','e'));
+        $ret = formatTimestamp($this->getVar('date', 'e'));
         return $ret;
     }
 
-    function link($full=false) {
-        $ret = $this->getVar('link','e');
+    function link($full = false) {
+        $ret = $this->getVar('link', 'e');
         if ($full) {
         	$myts = MyTextSanitizer::getInstance();
         	$ret = $myts->displayTarea($ret);
         	return $ret;
         } else {
-        	$ret = '<a href="' . $ret . '" alt="' . $this->getVar('link','e') . '" title="' . $this->getVar('link','e') . '">' .  _AM_SOBJECT_SENT_LINKS_GOTO . '</a>';
+        	$ret = '<a href="' . $ret . '" alt="' . $this->getVar('link', 'e') . '" title="' . $this->getVar('link', 'e') . '">' . _AM_SOBJECT_SENT_LINKS_GOTO . '</a>';
         	return $ret;
         }
     }

class/smartobjectpermission.php

Doc Comments -1 removed lines

@@ -126,7 +126,6 @@
      *  saveCategory_Permissions()
      *
      * @param array $groups : group with granted permission
-     * @param integer $categoryID : categoryID on which we are setting permissions for Categories and Forums
      * @param string $perm_name : name of the permission
      * @return boolean : TRUE if the no errors occured
      **/

Indentation +169 added lines, -169 removed lines

@@ -8,17 +8,17 @@ 
  * Licence: GNU
  */
 if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
+	die("XOOPS root path not defined");
 }
 
 class SmartobjectPermissionHandler extends XoopsObjectHandler
 {
-    var $handler;
-    function SmartObjectPermissionHandler($handler) {
-        $this->handler=$handler;
-    }
+	var $handler;
+	function SmartObjectPermissionHandler($handler) {
+		$this->handler=$handler;
+	}
 
-    /*
+	/*
      * Returns permissions for a certain type
      *
      * @param string $type "global", "forum" or "topic" (should perhaps have "post" as well - but I don't know)
@@ -26,62 +26,62 @@ 
      *
      * @return array
      */
-    function getGrantedGroups($gperm_name, $id = null) {
-        static $groups;
-
-        if (!isset($groups[$gperm_name]) || ($id != null && !isset($groups[$gperm_name][$id]))) {
-            $smartModule =& $this->handler->getModuleInfo();
-            //Get group permissions handler
-            $gperm_handler =& xoops_gethandler('groupperm');
-
-            //Get groups allowed for an item id
-            $allowedgroups = $gperm_handler->getGroupIds($gperm_name, $id, $smartModule->getVar('mid'));
-            $groups[$gperm_name][$id] = $allowedgroups;
-        }
-        //Return the permission array
-        return isset($groups[$gperm_name][$id]) ? $groups[$gperm_name][$id] : array();
-    }
-
-    function getGrantedGroupsForIds($item_ids_array, $gperm_name=false) {
-
-        static $groups;
-
-        if ($gperm_name){
-            if (isset($groups[$gperm_name])) {
-                return $groups[$gperm_name];
-            }
-        } else {
-            // if !$gperm_name then we will fetch all permissions in the module so we don't need them again
-            return $groups;
-        }
-
-        $smartModule =& $this->handler->getModuleInfo();
-
-        $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('gperm_modid', $smartModule->getVar('mid')));
-
-        if ($gperm_name) {
-            $criteria->add(new Criteria('gperm_name', $gperm_name));
-        }
-
-        //Get group permissions handler
-        $gperm_handler =& xoops_gethandler('groupperm');
-
-        $permissionsObj = $gperm_handler->getObjects($criteria);
-
-        foreach ($permissionsObj as $permissionObj) {
-            $groups[$permissionObj->getVar('gperm_name')][$permissionObj->getVar('gperm_itemid')][] = $permissionObj->getVar('gperm_groupid');
-        }
-
-        //Return the permission array
-        if ($gperm_name) {
-            return isset($groups[$gperm_name]) ? $groups[$gperm_name] : array();
-        } else {
-            return isset($groups) ? $groups : array();
-        }
-    }
-
-    /*
+	function getGrantedGroups($gperm_name, $id = null) {
+		static $groups;
+
+		if (!isset($groups[$gperm_name]) || ($id != null && !isset($groups[$gperm_name][$id]))) {
+			$smartModule =& $this->handler->getModuleInfo();
+			//Get group permissions handler
+			$gperm_handler =& xoops_gethandler('groupperm');
+
+			//Get groups allowed for an item id
+			$allowedgroups = $gperm_handler->getGroupIds($gperm_name, $id, $smartModule->getVar('mid'));
+			$groups[$gperm_name][$id] = $allowedgroups;
+		}
+		//Return the permission array
+		return isset($groups[$gperm_name][$id]) ? $groups[$gperm_name][$id] : array();
+	}
+
+	function getGrantedGroupsForIds($item_ids_array, $gperm_name=false) {
+
+		static $groups;
+
+		if ($gperm_name){
+			if (isset($groups[$gperm_name])) {
+				return $groups[$gperm_name];
+			}
+		} else {
+			// if !$gperm_name then we will fetch all permissions in the module so we don't need them again
+			return $groups;
+		}
+
+		$smartModule =& $this->handler->getModuleInfo();
+
+		$criteria = new CriteriaCompo();
+		$criteria->add(new Criteria('gperm_modid', $smartModule->getVar('mid')));
+
+		if ($gperm_name) {
+			$criteria->add(new Criteria('gperm_name', $gperm_name));
+		}
+
+		//Get group permissions handler
+		$gperm_handler =& xoops_gethandler('groupperm');
+
+		$permissionsObj = $gperm_handler->getObjects($criteria);
+
+		foreach ($permissionsObj as $permissionObj) {
+			$groups[$permissionObj->getVar('gperm_name')][$permissionObj->getVar('gperm_itemid')][] = $permissionObj->getVar('gperm_groupid');
+		}
+
+		//Return the permission array
+		if ($gperm_name) {
+			return isset($groups[$gperm_name]) ? $groups[$gperm_name] : array();
+		} else {
+			return isset($groups) ? $groups : array();
+		}
+	}
+
+	/*
      * Returns permissions for a certain type
      *
      * @param string $type "global", "forum" or "topic" (should perhaps have "post" as well - but I don't know)
@@ -89,112 +89,112 @@ 
      *
      * @return array
      */
-    function getGrantedItems($gperm_name, $id = null) {
-        global $xoopsUser;
-        static $permissions;
-
-        if (!isset($permissions[$gperm_name]) || ($id != null && !isset($permissions[$gperm_name][$id]))) {
-
-            $smartModule =& $this->handler->getModuleInfo();
-
-            if (is_object($smartModule)) {
-
-                //Get group permissions handler
-                $gperm_handler =& xoops_gethandler('groupperm');
-
-                //Get user's groups
-                $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
-
-                //Get all allowed item ids in this module and for this user's groups
-                $userpermissions =& $gperm_handler->getItemIds($gperm_name, $groups, $smartModule->getVar('mid'));
-                $permissions[$gperm_name] = $userpermissions;
-            }
-        }
-        //Return the permission array
-        return isset($permissions[$gperm_name]) ? $permissions[$gperm_name] : array();
-    }
-
-    function storeAllPermissionsForId($id) {
-        foreach ($this->handler->getPermissions() as $permission) {
-            $this->saveItem_Permissions($_POST[$permission['perm_name']], $id, $permission['perm_name']);
-        }
-    }
-
-    /**
-     * Saves permissions for the selected category
-     *
-     *  saveCategory_Permissions()
-     *
-     * @param array $groups : group with granted permission
-     * @param integer $categoryID : categoryID on which we are setting permissions for Categories and Forums
-     * @param string $perm_name : name of the permission
-     * @return boolean : TRUE if the no errors occured
-     **/
-
-    function saveItem_Permissions($groups, $itemid, $perm_name)
-    {
-        $smartModule =& $this->handler->getModuleInfo();
-
-        $result = true;
-        $module_id = $smartModule->getVar('mid');
-        $gperm_handler =& xoops_gethandler('groupperm');
-
-        // First, if the permissions are already there, delete them
-        $gperm_handler->deleteByModule($module_id, $perm_name, $itemid);
-        //echo "itemid : $itemid - perm : $perm_name - modid : $module_id";
-        //exit;
-        // Save the new permissions
-
-        if (count($groups) > 0) {
-            foreach ($groups as $group_id) {
-                $gperm_handler->addRight($perm_name, $itemid, $group_id, $module_id);
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Delete all permission for a specific item
-     *
-     *  deletePermissions()
-     *
-     * @param integer $itemid : id of the item for which to delete the permissions
-     * @return boolean : TRUE if the no errors occured
-     **/
-    function deletePermissions($itemid, $gperm_name)
-    {
-        global $xoopsModule;
-
-        $smartModule =& smartsection_getModuleInfo();
-
-        $result = true;
-        $module_id = $smartModule->getVar('mid')   ;
-        $gperm_handler =& xoops_gethandler('groupperm');
-
-
-        $gperm_handler->deleteByModule($module_id, $gperm_name, $itemid);
-
-        return $result;
-    }
-
-    /**
-     * Checks if the user has access to a specific permission on a given object
-     *
-     * @param string $gperm_name name of the permission to test
-     * @param int $gperm_itemid id of the object to check
-     * @return boolean : TRUE if user has access, FALSE if not
-     **/
-    function accessGranted($gperm_name, $gperm_itemid) {
-        global $xoopsUser;
-
-        $gperm_groupid = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
-        $smartModule =& $this->handler->getModuleInfo();
-        $gperm_modid = $smartModule->getVar('mid')   ;
-
-        //Get group permissions handler
-        $gperm_handler =& xoops_gethandler('groupperm');
-
-        return $gperm_handler->checkRight($gperm_name, $gperm_itemid, $gperm_groupid, $gperm_modid);
-    }
+	function getGrantedItems($gperm_name, $id = null) {
+		global $xoopsUser;
+		static $permissions;
+
+		if (!isset($permissions[$gperm_name]) || ($id != null && !isset($permissions[$gperm_name][$id]))) {
+
+			$smartModule =& $this->handler->getModuleInfo();
+
+			if (is_object($smartModule)) {
+
+				//Get group permissions handler
+				$gperm_handler =& xoops_gethandler('groupperm');
+
+				//Get user's groups
+				$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
+
+				//Get all allowed item ids in this module and for this user's groups
+				$userpermissions =& $gperm_handler->getItemIds($gperm_name, $groups, $smartModule->getVar('mid'));
+				$permissions[$gperm_name] = $userpermissions;
+			}
+		}
+		//Return the permission array
+		return isset($permissions[$gperm_name]) ? $permissions[$gperm_name] : array();
+	}
+
+	function storeAllPermissionsForId($id) {
+		foreach ($this->handler->getPermissions() as $permission) {
+			$this->saveItem_Permissions($_POST[$permission['perm_name']], $id, $permission['perm_name']);
+		}
+	}
+
+	/**
+	 * Saves permissions for the selected category
+	 *
+	 *  saveCategory_Permissions()
+	 *
+	 * @param array $groups : group with granted permission
+	 * @param integer $categoryID : categoryID on which we are setting permissions for Categories and Forums
+	 * @param string $perm_name : name of the permission
+	 * @return boolean : TRUE if the no errors occured
+	 **/
+
+	function saveItem_Permissions($groups, $itemid, $perm_name)
+	{
+		$smartModule =& $this->handler->getModuleInfo();
+
+		$result = true;
+		$module_id = $smartModule->getVar('mid');
+		$gperm_handler =& xoops_gethandler('groupperm');
+
+		// First, if the permissions are already there, delete them
+		$gperm_handler->deleteByModule($module_id, $perm_name, $itemid);
+		//echo "itemid : $itemid - perm : $perm_name - modid : $module_id";
+		//exit;
+		// Save the new permissions
+
+		if (count($groups) > 0) {
+			foreach ($groups as $group_id) {
+				$gperm_handler->addRight($perm_name, $itemid, $group_id, $module_id);
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Delete all permission for a specific item
+	 *
+	 *  deletePermissions()
+	 *
+	 * @param integer $itemid : id of the item for which to delete the permissions
+	 * @return boolean : TRUE if the no errors occured
+	 **/
+	function deletePermissions($itemid, $gperm_name)
+	{
+		global $xoopsModule;
+
+		$smartModule =& smartsection_getModuleInfo();
+
+		$result = true;
+		$module_id = $smartModule->getVar('mid')   ;
+		$gperm_handler =& xoops_gethandler('groupperm');
+
+
+		$gperm_handler->deleteByModule($module_id, $gperm_name, $itemid);
+
+		return $result;
+	}
+
+	/**
+	 * Checks if the user has access to a specific permission on a given object
+	 *
+	 * @param string $gperm_name name of the permission to test
+	 * @param int $gperm_itemid id of the object to check
+	 * @return boolean : TRUE if user has access, FALSE if not
+	 **/
+	function accessGranted($gperm_name, $gperm_itemid) {
+		global $xoopsUser;
+
+		$gperm_groupid = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
+		$smartModule =& $this->handler->getModuleInfo();
+		$gperm_modid = $smartModule->getVar('mid')   ;
+
+		//Get group permissions handler
+		$gperm_handler =& xoops_gethandler('groupperm');
+
+		return $gperm_handler->checkRight($gperm_name, $gperm_itemid, $gperm_groupid, $gperm_modid);
+	}
 }
 ?>

Spacing +18 added lines, -18 removed lines

@@ -15,7 +15,7 @@ 
 {
     var $handler;
     function SmartObjectPermissionHandler($handler) {
-        $this->handler=$handler;
+        $this->handler = $handler;
     }
 
     /*
@@ -30,9 +30,9 @@ 
         static $groups;
 
         if (!isset($groups[$gperm_name]) || ($id != null && !isset($groups[$gperm_name][$id]))) {
-            $smartModule =& $this->handler->getModuleInfo();
+            $smartModule = & $this->handler->getModuleInfo();
             //Get group permissions handler
-            $gperm_handler =& xoops_gethandler('groupperm');
+            $gperm_handler = & xoops_gethandler('groupperm');
 
             //Get groups allowed for an item id
             $allowedgroups = $gperm_handler->getGroupIds($gperm_name, $id, $smartModule->getVar('mid'));
@@ -42,11 +42,11 @@ 
         return isset($groups[$gperm_name][$id]) ? $groups[$gperm_name][$id] : array();
     }
 
-    function getGrantedGroupsForIds($item_ids_array, $gperm_name=false) {
+    function getGrantedGroupsForIds($item_ids_array, $gperm_name = false) {
 
         static $groups;
 
-        if ($gperm_name){
+        if ($gperm_name) {
             if (isset($groups[$gperm_name])) {
                 return $groups[$gperm_name];
             }
@@ -55,7 +55,7 @@ 
             return $groups;
         }
 
-        $smartModule =& $this->handler->getModuleInfo();
+        $smartModule = & $this->handler->getModuleInfo();
 
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('gperm_modid', $smartModule->getVar('mid')));
@@ -65,7 +65,7 @@ 
         }
 
         //Get group permissions handler
-        $gperm_handler =& xoops_gethandler('groupperm');
+        $gperm_handler = & xoops_gethandler('groupperm');
 
         $permissionsObj = $gperm_handler->getObjects($criteria);
 
@@ -95,18 +95,18 @@ 
 
         if (!isset($permissions[$gperm_name]) || ($id != null && !isset($permissions[$gperm_name][$id]))) {
 
-            $smartModule =& $this->handler->getModuleInfo();
+            $smartModule = & $this->handler->getModuleInfo();
 
             if (is_object($smartModule)) {
 
                 //Get group permissions handler
-                $gperm_handler =& xoops_gethandler('groupperm');
+                $gperm_handler = & xoops_gethandler('groupperm');
 
                 //Get user's groups
                 $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
 
                 //Get all allowed item ids in this module and for this user's groups
-                $userpermissions =& $gperm_handler->getItemIds($gperm_name, $groups, $smartModule->getVar('mid'));
+                $userpermissions = & $gperm_handler->getItemIds($gperm_name, $groups, $smartModule->getVar('mid'));
                 $permissions[$gperm_name] = $userpermissions;
             }
         }
@@ -133,11 +133,11 @@ 
 
     function saveItem_Permissions($groups, $itemid, $perm_name)
     {
-        $smartModule =& $this->handler->getModuleInfo();
+        $smartModule = & $this->handler->getModuleInfo();
 
         $result = true;
         $module_id = $smartModule->getVar('mid');
-        $gperm_handler =& xoops_gethandler('groupperm');
+        $gperm_handler = & xoops_gethandler('groupperm');
 
         // First, if the permissions are already there, delete them
         $gperm_handler->deleteByModule($module_id, $perm_name, $itemid);
@@ -165,11 +165,11 @@ 
     {
         global $xoopsModule;
 
-        $smartModule =& smartsection_getModuleInfo();
+        $smartModule = & smartsection_getModuleInfo();
 
         $result = true;
-        $module_id = $smartModule->getVar('mid')   ;
-        $gperm_handler =& xoops_gethandler('groupperm');
+        $module_id = $smartModule->getVar('mid');
+        $gperm_handler = & xoops_gethandler('groupperm');
 
 
         $gperm_handler->deleteByModule($module_id, $gperm_name, $itemid);
@@ -188,11 +188,11 @@ 
         global $xoopsUser;
 
         $gperm_groupid = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
-        $smartModule =& $this->handler->getModuleInfo();
-        $gperm_modid = $smartModule->getVar('mid')   ;
+        $smartModule = & $this->handler->getModuleInfo();
+        $gperm_modid = $smartModule->getVar('mid');
 
         //Get group permissions handler
-        $gperm_handler =& xoops_gethandler('groupperm');
+        $gperm_handler = & xoops_gethandler('groupperm');
 
         return $gperm_handler->checkRight($gperm_name, $gperm_itemid, $gperm_groupid, $gperm_modid);
     }

class/smartobjectsingleview.php

Doc Comments +4 added lines

@@ -66,6 +66,7 @@ 
 
     /**
      * Constructor
+     * @param SmartObject $object
      */
     function SmartObjectSingleView(&$object, $userSide=false, $actions=array(), $headerAsRow=true)
     {
@@ -75,6 +76,9 @@ 
         $this->_headerAsRow = $headerAsRow;
     }
 
+    /**
+     * @param SmartObjectRow $rowObj
+     */
     function addRow($rowObj) {
         $this->_rows[] = $rowObj;
     }

Indentation +92 added lines, -94 removed lines

@@ -5,9 +5,7 @@ 
  *
  * @license GNU
  * @author marcan <marcan@smartfactory.ca>
-
  * @version $Id: smartobjectsingleview.php 839 2008-02-10 02:40:13Z malanciault $
-
  * @link http://smartfactory.ca The SmartFactory
  * @package SmartObject
  */
@@ -24,26 +22,26 @@ 
  */
 class SmartObjectRow {
 
-    var $_keyname;
-    var $_align;
-    var $_customMethodForValue;
-    var $_header;
-    var $_class;
-
-    function SmartObjectRow($keyname, $customMethodForValue=false, $header=false, $class=false) {
-        $this->_keyname = $keyname;
-        $this->_customMethodForValue = $customMethodForValue;
-        $this->_header = $header;
-        $this->_class = $class;
-    }
-
-    function getKeyName() {
-        return $this->_keyname;
-    }
-
-    function isHeader() {
-        return $this->_header;
-    }
+	var $_keyname;
+	var $_align;
+	var $_customMethodForValue;
+	var $_header;
+	var $_class;
+
+	function SmartObjectRow($keyname, $customMethodForValue=false, $header=false, $class=false) {
+		$this->_keyname = $keyname;
+		$this->_customMethodForValue = $customMethodForValue;
+		$this->_header = $header;
+		$this->_class = $class;
+	}
+
+	function getKeyName() {
+		return $this->_keyname;
+	}
+
+	function isHeader() {
+		return $this->_header;
+	}
 }
 
 /**
@@ -57,78 +55,78 @@ 
  */
 class SmartObjectSingleView {
 
-    var $_object;
-    var $_userSide;
-    var $_tpl;
-    var $_rows;
-    var $_actions;
-    var $_headerAsRow=true;
-
-    /**
-     * Constructor
-     */
-    function SmartObjectSingleView(&$object, $userSide=false, $actions=array(), $headerAsRow=true)
-    {
-        $this->_object = $object;
-        $this->_userSide = $userSide;
-        $this->_actions = $actions;
-        $this->_headerAsRow = $headerAsRow;
-    }
-
-    function addRow($rowObj) {
-        $this->_rows[] = $rowObj;
-    }
-
-    function render($fetchOnly=false, $debug=false)
-    {
-        include_once XOOPS_ROOT_PATH . '/class/template.php';
-
-        $this->_tpl = new XoopsTpl();
-        $vars = $this->_object->vars;
-        $smartobject_object_array = array();
-
-        foreach ($this->_rows as $row) {
-            $key = $row->getKeyName();
-            if ($row->_customMethodForValue && method_exists($this->_object, $row->_customMethodForValue)) {
-                $method = $row->_customMethodForValue;
-                $value = $this->_object->$method();
-            } else {
-                $value = $this->_object->getVar($row->getKeyName());
-            }
-            if ($row->isHeader()) {
-                $this->_tpl->assign('smartobject_single_view_header_caption', $this->_object->vars[$key]['form_caption']);
-                $this->_tpl->assign('smartobject_single_view_header_value', $value);
-            } else {
-                $smartobject_object_array[$key]['value'] = $value;
-                $smartobject_object_array[$key]['header'] = $row->isHeader();
-                $smartobject_object_array[$key]['caption'] = $this->_object->vars[$key]['form_caption'];
-            }
-        }
-        $action_row = '';
-        if (in_array('edit', $this->_actions)) {
-            $action_row .= $this->_object->getEditItemLink(false, true, true);
-        }
-        if (in_array('delete', $this->_actions)) {
-            $action_row .= $this->_object->getDeleteItemLink(false, true, true);
-        }
-        if ($action_row) {
-            $smartobject_object_array['zaction']['value'] = $action_row;
-            $smartobject_object_array['zaction']['caption'] = _CO_SOBJECT_ACTIONS;
-        }
-
-        $this->_tpl->assign('smartobject_header_as_row', $this->_headerAsRow);
-        $this->_tpl->assign('smartobject_object_array', $smartobject_object_array);
-
-        if ($fetchOnly) {
-            return $this->_tpl->fetch( 'db:smartobject_singleview_display.html' );
-        } else {
-            $this->_tpl->display( 'db:smartobject_singleview_display.html' );
-        }
-    }
-
-    function fetch($debug=false) {
-        return $this->render(true, $debug);
-    }
+	var $_object;
+	var $_userSide;
+	var $_tpl;
+	var $_rows;
+	var $_actions;
+	var $_headerAsRow=true;
+
+	/**
+	 * Constructor
+	 */
+	function SmartObjectSingleView(&$object, $userSide=false, $actions=array(), $headerAsRow=true)
+	{
+		$this->_object = $object;
+		$this->_userSide = $userSide;
+		$this->_actions = $actions;
+		$this->_headerAsRow = $headerAsRow;
+	}
+
+	function addRow($rowObj) {
+		$this->_rows[] = $rowObj;
+	}
+
+	function render($fetchOnly=false, $debug=false)
+	{
+		include_once XOOPS_ROOT_PATH . '/class/template.php';
+
+		$this->_tpl = new XoopsTpl();
+		$vars = $this->_object->vars;
+		$smartobject_object_array = array();
+
+		foreach ($this->_rows as $row) {
+			$key = $row->getKeyName();
+			if ($row->_customMethodForValue && method_exists($this->_object, $row->_customMethodForValue)) {
+				$method = $row->_customMethodForValue;
+				$value = $this->_object->$method();
+			} else {
+				$value = $this->_object->getVar($row->getKeyName());
+			}
+			if ($row->isHeader()) {
+				$this->_tpl->assign('smartobject_single_view_header_caption', $this->_object->vars[$key]['form_caption']);
+				$this->_tpl->assign('smartobject_single_view_header_value', $value);
+			} else {
+				$smartobject_object_array[$key]['value'] = $value;
+				$smartobject_object_array[$key]['header'] = $row->isHeader();
+				$smartobject_object_array[$key]['caption'] = $this->_object->vars[$key]['form_caption'];
+			}
+		}
+		$action_row = '';
+		if (in_array('edit', $this->_actions)) {
+			$action_row .= $this->_object->getEditItemLink(false, true, true);
+		}
+		if (in_array('delete', $this->_actions)) {
+			$action_row .= $this->_object->getDeleteItemLink(false, true, true);
+		}
+		if ($action_row) {
+			$smartobject_object_array['zaction']['value'] = $action_row;
+			$smartobject_object_array['zaction']['caption'] = _CO_SOBJECT_ACTIONS;
+		}
+
+		$this->_tpl->assign('smartobject_header_as_row', $this->_headerAsRow);
+		$this->_tpl->assign('smartobject_object_array', $smartobject_object_array);
+
+		if ($fetchOnly) {
+			return $this->_tpl->fetch( 'db:smartobject_singleview_display.html' );
+		} else {
+			$this->_tpl->display( 'db:smartobject_singleview_display.html' );
+		}
+	}
+
+	function fetch($debug=false) {
+		return $this->render(true, $debug);
+	}
 }
 
 ?>
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -30,7 +30,7 @@ 
     var $_header;
     var $_class;
 
-    function SmartObjectRow($keyname, $customMethodForValue=false, $header=false, $class=false) {
+    function SmartObjectRow($keyname, $customMethodForValue = false, $header = false, $class = false) {
         $this->_keyname = $keyname;
         $this->_customMethodForValue = $customMethodForValue;
         $this->_header = $header;
@@ -62,12 +62,12 @@ 
     var $_tpl;
     var $_rows;
     var $_actions;
-    var $_headerAsRow=true;
+    var $_headerAsRow = true;
 
     /**
      * Constructor
      */
-    function SmartObjectSingleView(&$object, $userSide=false, $actions=array(), $headerAsRow=true)
+    function SmartObjectSingleView(&$object, $userSide = false, $actions = array(), $headerAsRow = true)
     {
         $this->_object = $object;
         $this->_userSide = $userSide;
@@ -79,7 +79,7 @@ 
         $this->_rows[] = $rowObj;
     }
 
-    function render($fetchOnly=false, $debug=false)
+    function render($fetchOnly = false, $debug = false)
     {
         include_once XOOPS_ROOT_PATH . '/class/template.php';
 
@@ -120,13 +120,13 @@ 
         $this->_tpl->assign('smartobject_object_array', $smartobject_object_array);
 
         if ($fetchOnly) {
-            return $this->_tpl->fetch( 'db:smartobject_singleview_display.html' );
+            return $this->_tpl->fetch('db:smartobject_singleview_display.html');
         } else {
-            $this->_tpl->display( 'db:smartobject_singleview_display.html' );
+            $this->_tpl->display('db:smartobject_singleview_display.html');
         }
     }
 
-    function fetch($debug=false) {
+    function fetch($debug = false) {
         return $this->render(true, $debug);
     }
 }

class/smartobjectsregistry.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	/**
 	 * Access the only instance of this class
      *
-     * @return	object
+     * @return	SmartObjectsRegistry
      *
      * @static
      * @staticvar   object

Indentation +42 added lines, -42 removed lines

@@ -19,11 +19,11 @@ 
 
 	/**
 	 * Access the only instance of this class
-     *
-     * @return	object
-     *
-     * @static
-     * @staticvar   object
+	 *
+	 * @return	object
+	 *
+	 * @static
+	 * @staticvar   object
 	 */
 	function &getInstance()
 	{
@@ -35,13 +35,13 @@ 
 	}
 
 	/**
-    * Adding objects to the registry
-    *
-    * @param SmartPersistableObjectHandler $handler of the objects to add
-    * @param CriteriaCompo $criteria to pass to the getObjects method of the handler (with id_as_key)
-    *
-    * @return FALSE if an error occured
-    */
+	 * Adding objects to the registry
+	 *
+	 * @param SmartPersistableObjectHandler $handler of the objects to add
+	 * @param CriteriaCompo $criteria to pass to the getObjects method of the handler (with id_as_key)
+	 *
+	 * @return FALSE if an error occured
+	 */
 	function addObjectsFromHandler(&$handler, $criteria=false) {
 		if (method_exists($handler, 'getObjects')) {
 			$objects = $handler->getObjects($criteria, true);
@@ -53,15 +53,15 @@ 
 	}
 
 	/**
-    * Adding objects to the registry from an item name
-    * This method will fetch the handler of the item / module and call the addObjectsFromHandler
-    *
-    * @param string $item name of the item
-    * @param string $modulename name of the module
-    * @param CriteriaCompo $criteria to pass to the getObjects method of the handler (with id_as_key)
-    *
-    * @return FALSE if an error occured
-    */
+	 * Adding objects to the registry from an item name
+	 * This method will fetch the handler of the item / module and call the addObjectsFromHandler
+	 *
+	 * @param string $item name of the item
+	 * @param string $modulename name of the module
+	 * @param CriteriaCompo $criteria to pass to the getObjects method of the handler (with id_as_key)
+	 *
+	 * @return FALSE if an error occured
+	 */
 	function addObjectsFromItemName($item, $modulename=false, $criteria=false) {
 		if (!$modulename) {
 			global $xoopsModule;
@@ -83,13 +83,13 @@ 
 	}
 
 	/**
-    * Fetching objects from the registry
-    *
-    * @param string $itemname
-    * @param string $modulename
-    *
-    * @return the requested objects or FALSE if they don't exists in the registry
-    */
+	 * Fetching objects from the registry
+	 *
+	 * @param string $itemname
+	 * @param string $modulename
+	 *
+	 * @return the requested objects or FALSE if they don't exists in the registry
+	 */
 	function getObjects($itemname, $modulename) {
 		if (!$modulename) {
 			global $xoopsModule;
@@ -113,13 +113,13 @@ 
 	}
 
 	/**
-    * Fetching objects from the registry, as a list : objectid => identifier
-    *
-    * @param string $itemname
-    * @param string $modulename
-    *
-    * @return the requested objects or FALSE if they don't exists in the registry
-    */
+	 * Fetching objects from the registry, as a list : objectid => identifier
+	 *
+	 * @param string $itemname
+	 * @param string $modulename
+	 *
+	 * @return the requested objects or FALSE if they don't exists in the registry
+	 */
 	function getList($itemname, $modulename) {
 		if (!$modulename) {
 			global $xoopsModule;
@@ -143,13 +143,13 @@ 
 	}
 
 	/**
-    * Retreive a single object
-    *
-    * @param string $itemname
-    * @param string $key
-    *
-    * @return the requestd object or FALSE if they don't exists in the registry
-    */
+	 * Retreive a single object
+	 *
+	 * @param string $itemname
+	 * @param string $key
+	 *
+	 * @return the requestd object or FALSE if they don't exists in the registry
+	 */
 	function getSingleObject($itemname, $key, $modulename=false) {
 		if (!$modulename) {
 			global $xoopsModule;

Spacing +3 added lines, -3 removed lines

@@ -42,7 +42,7 @@ 
     *
     * @return FALSE if an error occured
     */
-	function addObjectsFromHandler(&$handler, $criteria=false) {
+	function addObjectsFromHandler(&$handler, $criteria = false) {
 		if (method_exists($handler, 'getObjects')) {
 			$objects = $handler->getObjects($criteria, true);
 			$this->_registryArray['objects'][$handler->_moduleName][$handler->_itemname] = $objects;
@@ -62,7 +62,7 @@ 
     *
     * @return FALSE if an error occured
     */
-	function addObjectsFromItemName($item, $modulename=false, $criteria=false) {
+	function addObjectsFromItemName($item, $modulename = false, $criteria = false) {
 		if (!$modulename) {
 			global $xoopsModule;
 			if (!is_object($xoopsModule)) {
@@ -150,7 +150,7 @@ 
     *
     * @return the requestd object or FALSE if they don't exists in the registry
     */
-	function getSingleObject($itemname, $key, $modulename=false) {
+	function getSingleObject($itemname, $key, $modulename = false) {
 		if (!$modulename) {
 			global $xoopsModule;
 			if (!is_object($xoopsModule)) {