mambax7 / smartobject

class/smartobject.php

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)) {

class/smarthookhandler.php

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/smartobjectsregistry.php

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;

class/smartuploader.php

Indentation +62 added lines, -62 removed lines

@@ -29,27 +29,27 @@ 
 // Project: The XOOPS Project                                                //
 // ------------------------------------------------------------------------- //
 /**
- * !
- * Example
- *
- * include_once 'uploader.php';
- * $allowed_mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png');
- * $maxfilesize = 50000;
- * $maxfilewidth = 120;
- * $maxfileheight = 120;
- * $uploader = new SmartUploader('/home/xoops/uploads', $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
- * if ($uploader->fetchMedia($HTTP_POST_VARS['uploade_file_name'])) {
- * if (!$uploader->upload()) {
- * echo $uploader->getErrors();
- * } else {
- * echo '<h4>File uploaded successfully!</h4>'
- * echo 'Saved as: ' . $uploader->getSavedFileName() . '<br />';
- * echo 'Full path: ' . $uploader->getSavedDestination();
- * }
- * } else {
- * echo $uploader->getErrors();
- * }
- */
+	 * !
+	 * Example
+	 *
+	 * include_once 'uploader.php';
+	 * $allowed_mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png');
+	 * $maxfilesize = 50000;
+	 * $maxfilewidth = 120;
+	 * $maxfileheight = 120;
+	 * $uploader = new SmartUploader('/home/xoops/uploads', $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
+	 * if ($uploader->fetchMedia($HTTP_POST_VARS['uploade_file_name'])) {
+	 * if (!$uploader->upload()) {
+	 * echo $uploader->getErrors();
+	 * } else {
+	 * echo '<h4>File uploaded successfully!</h4>'
+	 * echo 'Saved as: ' . $uploader->getSavedFileName() . '<br />';
+	 * echo 'Full path: ' . $uploader->getSavedDestination();
+	 * }
+	 * } else {
+	 * echo $uploader->getErrors();
+	 * }
+	 */
 
 /**
  * Upload Media files
@@ -88,49 +88,49 @@ 
 class SmartUploader extends XoopsMediaUploader
 {
 
-    var $ext;
-    var $dimension;
+	var $ext;
+	var $dimension;
 
-    /**
-     * No admin check for uploads
-     */
-    var $noadmin_sizecheck;
-    /**
-     * Constructor
-     *
-     * @param string $uploadDir
-     * @param array $allowedMimeTypes
-     * @param int $maxFileSize
-     * @param int $maxWidth
-     * @param int $maxHeight
-     * @param int $cmodvalue
-     */
-    function SmartUploader($uploadDir, $allowedMimeTypes = 0, $maxFileSize, $maxWidth = 0, $maxHeight = 0)
-    {
-        $this->XoopsMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize, $maxWidth, $maxHeight);
-    }
+	/**
+	 * No admin check for uploads
+	 */
+	var $noadmin_sizecheck;
+	/**
+	 * Constructor
+	 *
+	 * @param string $uploadDir
+	 * @param array $allowedMimeTypes
+	 * @param int $maxFileSize
+	 * @param int $maxWidth
+	 * @param int $maxHeight
+	 * @param int $cmodvalue
+	 */
+	function SmartUploader($uploadDir, $allowedMimeTypes = 0, $maxFileSize, $maxWidth = 0, $maxHeight = 0)
+	{
+		$this->XoopsMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize, $maxWidth, $maxHeight);
+	}
 
-    function noAdminSizeCheck($value)
-    {
-        $this->noadmin_sizecheck = $value;
-    }
+	function noAdminSizeCheck($value)
+	{
+		$this->noadmin_sizecheck = $value;
+	}
 
-    /**
-     * Is the file the right size?
-     *
-     * @return bool
-     */
-    function checkMaxFileSize()
-    {
-        if ($this->noadmin_sizecheck)
-        {
-            return true;
-        }
-        if ($this->mediaSize > $this->maxFileSize)
-        {
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Is the file the right size?
+	 *
+	 * @return bool
+	 */
+	function checkMaxFileSize()
+	{
+		if ($this->noadmin_sizecheck)
+		{
+			return true;
+		}
+		if ($this->mediaSize > $this->maxFileSize)
+		{
+			return false;
+		}
+		return true;
+	}
 }
 ?>
\ No newline at end of file

class/smartplugins.php

Indentation +3 added lines, -3 removed lines

@@ -17,10 +17,10 @@
 
 	function getItemList() {
 		$itemsArray = $this->_infoArray['items'];
-    	foreach ($itemsArray as $k=>$v) {
+		foreach ($itemsArray as $k=>$v) {
 			$ret[$k] = $v['caption'];
-    	}
-    	return $ret;
+		}
+		return $ret;
 	}
 
 	function getItem() {

class/smartobjecttag.php

Indentation +10 added lines, -10 removed lines

@@ -28,25 +28,25 @@
 // -------------------------------------------------------------------------//
 
 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/smartmlobject.php";
 class SmartobjectTag extends SmartMlObject {
 
-    function SmartobjectTag() {
+	function SmartobjectTag() {
 		$this->initVar('tagid', XOBJ_DTYPE_INT, '', true);
-        $this->initVar('name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_TAG_TAGID_CAPTION, _CO_SOBJECT_TAG_TAGID_DSC, true);
-        $this->initVar('description', XOBJ_DTYPE_TXTAREA, '', true, null, '', false, _CO_SOBJECT_TAG_DESCRIPTION_CAPTION, _CO_SOBJECT_TAG_DESCRIPTION_DSC);
-        $this->initVar('value', XOBJ_DTYPE_TXTAREA, '', true, null, '', true, _CO_SOBJECT_TAG_VALUE_CAPTION, _CO_SOBJECT_TAG_VALUE_DSC);
+		$this->initVar('name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_TAG_TAGID_CAPTION, _CO_SOBJECT_TAG_TAGID_DSC, true);
+		$this->initVar('description', XOBJ_DTYPE_TXTAREA, '', true, null, '', false, _CO_SOBJECT_TAG_DESCRIPTION_CAPTION, _CO_SOBJECT_TAG_DESCRIPTION_DSC);
+		$this->initVar('value', XOBJ_DTYPE_TXTAREA, '', true, null, '', true, _CO_SOBJECT_TAG_VALUE_CAPTION, _CO_SOBJECT_TAG_VALUE_DSC);
 
 		// call parent constructor to get Multilanguage field initiated
-        $this->SmartMlObject();
-    }
+		$this->SmartMlObject();
+	}
 }
 class SmartobjectTagHandler extends SmartPersistableMlObjectHandler {
-    function SmartobjectTagHandler($db) {
-        $this->SmartPersistableObjectHandler($db, 'tag', 'tagid', 'name', 'description', 'smartobject');
-    }
+	function SmartobjectTagHandler($db) {
+		$this->SmartPersistableObjectHandler($db, 'tag', 'tagid', 'name', 'description', 'smartobject');
+	}
 
 	function getLanguages() {
 		include_once XOOPS_ROOT_PATH."/class/xoopslists.php";

class/smartmlobject.php

Indentation +67 added lines, -67 removed lines

@@ -16,78 +16,78 @@
 }
 include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobject.php";
 /**
- * SmartObject base Multilanguage-enabled class
- *
- * Base class representing a single SmartObject with multilanguages capabilities
- *
- * @package SmartObject
- * @author marcan <marcan@smartfactory.ca>
- * @link http://smartfactory.ca The SmartFactory
- */
+	 * SmartObject base Multilanguage-enabled class
+	 *
+	 * Base class representing a single SmartObject with multilanguages capabilities
+	 *
+	 * @package SmartObject
+	 * @author marcan <marcan@smartfactory.ca>
+	 * @link http://smartfactory.ca The SmartFactory
+	 */
 class SmartMlObject extends SmartObject {
-    function SmartMlObject() {
-        $this->initVar('language', XOBJ_DTYPE_TXTBOX, 'english', false, null, "", true, _CO_SOBJECT_LANGUAGE_CAPTION, _CO_SOBJECT_LANGUAGE_DSC, true, true);
+	function SmartMlObject() {
+		$this->initVar('language', XOBJ_DTYPE_TXTBOX, 'english', false, null, "", true, _CO_SOBJECT_LANGUAGE_CAPTION, _CO_SOBJECT_LANGUAGE_DSC, true, true);
 		$this->setControl('language', 'language');
-    }
+	}
 
-    /**
-     * If object is not new, change the control of the not-multilanguage fields
-     *
-     * We need to intercept this function from SmartObject because if the object is not new...
-     */
+	/**
+	 * If object is not new, change the control of the not-multilanguage fields
+	 *
+	 * We need to intercept this function from SmartObject because if the object is not new...
+	 */
    // function getForm() {
 
-    //}
-
-    /**
-     * Strip Multilanguage Fields
-     *
-     * Get rid of all the multilanguage fields to have an object with only global fields.
-     * This will be usefull when creating the ML object for the first time. Then we will be able
-     * to create translations.
-     */
-     function stripMultilanguageFields() {
-     	$objectVars = $this->getVars();
-     	$newObjectVars = array();
-     	foreach($objectVars as $key=>$var) {
-     		if (!$var['multilingual']) {
-     			$newObjectVars[$key] = $var;
-     		}
-     	}
-     	$this->vars = $newObjectVars;
-     }
-
-     function stripNonMultilanguageFields() {
-     	$objectVars = $this->getVars();
-     	$newObjectVars = array();
-     	foreach($objectVars as $key=>$var) {
-     		if ($var['multilingual'] || $key == $this->handler->keyName) {
-     			$newObjectVars[$key] = $var;
-     		}
-     	}
-     	$this->vars = $newObjectVars;
-     }
-
-     /**
-      * Make non multilanguage fields read only
-      *
-      * This is used when we are creating/editing a translation.
-      * We only want to edit the multilanguag fields, not the global one.
-      */
-     function makeNonMLFieldReadOnly() {
-     	foreach($this->getVars() as $key=>$var) {
-     		//if (($key == 'language') || (!$var['multilingual'] && $key <> $this->handler->keyName)) {
-     		if ((!$var['multilingual'] && $key <> $this->handler->keyName)) {
-     			$this->setControl($key, 'label');
-     		}
-     	}
-     }
-
-    function getEditLanguageLink($onlyUrl=false, $withimage=true)
-    {
-    	$controller = new SmartObjectController($this->handler);
-    	return $controller->getEditLanguageLink($this, $onlyUrl, $withimage);
-    }
+	//}
+
+	/**
+	 * Strip Multilanguage Fields
+	 *
+	 * Get rid of all the multilanguage fields to have an object with only global fields.
+	 * This will be usefull when creating the ML object for the first time. Then we will be able
+	 * to create translations.
+	 */
+	 function stripMultilanguageFields() {
+	 	$objectVars = $this->getVars();
+	 	$newObjectVars = array();
+	 	foreach($objectVars as $key=>$var) {
+	 		if (!$var['multilingual']) {
+	 			$newObjectVars[$key] = $var;
+	 		}
+	 	}
+	 	$this->vars = $newObjectVars;
+	 }
+
+	 function stripNonMultilanguageFields() {
+	 	$objectVars = $this->getVars();
+	 	$newObjectVars = array();
+	 	foreach($objectVars as $key=>$var) {
+	 		if ($var['multilingual'] || $key == $this->handler->keyName) {
+	 			$newObjectVars[$key] = $var;
+	 		}
+	 	}
+	 	$this->vars = $newObjectVars;
+	 }
+
+	 /**
+	  * Make non multilanguage fields read only
+	  *
+	  * This is used when we are creating/editing a translation.
+	  * We only want to edit the multilanguag fields, not the global one.
+	  */
+	 function makeNonMLFieldReadOnly() {
+	 	foreach($this->getVars() as $key=>$var) {
+	 		//if (($key == 'language') || (!$var['multilingual'] && $key <> $this->handler->keyName)) {
+	 		if ((!$var['multilingual'] && $key <> $this->handler->keyName)) {
+	 			$this->setControl($key, 'label');
+	 		}
+	 	}
+	 }
+
+	function getEditLanguageLink($onlyUrl=false, $withimage=true)
+	{
+		$controller = new SmartObjectController($this->handler);
+		return $controller->getEditLanguageLink($this, $onlyUrl, $withimage);
+	}
 
 }
 

class/smartobjecthandler.php

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;
+		}
+	}
 }
 
 

class/smartaddto.php

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  */
 
 if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
+	die("XOOPS root path not defined");
 }
 
 class SmartAddTo {