mambax7 / smartobject

class/member.php

Indentation +200 added lines, -200 removed lines

@@ -46,227 +46,227 @@
  */
 class SmartobjectMemberHandler extends XoopsMemberHandler
 {
-    /**
-     * constructor
-     * @param XoopsDatabase $db
-     */
-    public function __construct(XoopsDatabase $db)
-    {
-        parent::__construct($db);
-        $this->_uHandler = xoops_getModuleHandler('user', 'smartobject');
-    }
+	/**
+	 * constructor
+	 * @param XoopsDatabase $db
+	 */
+	public function __construct(XoopsDatabase $db)
+	{
+		parent::__construct($db);
+		$this->_uHandler = xoops_getModuleHandler('user', 'smartobject');
+	}
 
-    /**
-     * @param       $userObj
-     * @param  bool $groups
-     * @param  bool $notifyUser
-     * @param  bool $password
-     * @return bool
-     */
-    public function addAndActivateUser($userObj, $groups = false, $notifyUser = true, &$password = false)
-    {
-        $email = $userObj->getVar('email');
-        if (!$userObj->getVar('email') || $email === '') {
-            $userObj->setErrors(_CO_SOBJECT_USER_NEED_EMAIL);
+	/**
+	 * @param       $userObj
+	 * @param  bool $groups
+	 * @param  bool $notifyUser
+	 * @param  bool $password
+	 * @return bool
+	 */
+	public function addAndActivateUser($userObj, $groups = false, $notifyUser = true, &$password = false)
+	{
+		$email = $userObj->getVar('email');
+		if (!$userObj->getVar('email') || $email === '') {
+			$userObj->setErrors(_CO_SOBJECT_USER_NEED_EMAIL);
 
-            return false;
-        }
+			return false;
+		}
 
-        $password = $userObj->getVar('pass');
-        // randomly generating the password if not already set
-        if ('' === $password) {
-            $password = substr(md5(uniqid(mt_rand(), 1)), 0, 6);
-        }
-        $userObj->setVar('pass', md5($password));
+		$password = $userObj->getVar('pass');
+		// randomly generating the password if not already set
+		if ('' === $password) {
+			$password = substr(md5(uniqid(mt_rand(), 1)), 0, 6);
+		}
+		$userObj->setVar('pass', md5($password));
 
-        // if no username is set, let's generate one
-        $unamecount = 20;
-        $uname      = $userObj->getVar('uname');
-        if (!$uname || $uname === '') {
-            $usernames = $this->genUserNames($email, $unamecount);
-            $newuser   = false;
-            $i         = 0;
-            while ($newuser === false) {
-                $crit  = new Criteria('uname', $usernames[$i]);
-                $count = $this->getUserCount($crit);
-                if ($count == 0) {
-                    $newuser = true;
-                } else {
-                    //Move to next username
-                    ++$i;
-                    if ($i == $unamecount) {
-                        //Get next batch of usernames to try, reset counter
-                        $usernames = $this->genUserNames($email, $unamecount);
-                        $i         = 0;
-                    }
-                }
-            }
-        }
+		// if no username is set, let's generate one
+		$unamecount = 20;
+		$uname      = $userObj->getVar('uname');
+		if (!$uname || $uname === '') {
+			$usernames = $this->genUserNames($email, $unamecount);
+			$newuser   = false;
+			$i         = 0;
+			while ($newuser === false) {
+				$crit  = new Criteria('uname', $usernames[$i]);
+				$count = $this->getUserCount($crit);
+				if ($count == 0) {
+					$newuser = true;
+				} else {
+					//Move to next username
+					++$i;
+					if ($i == $unamecount) {
+						//Get next batch of usernames to try, reset counter
+						$usernames = $this->genUserNames($email, $unamecount);
+						$i         = 0;
+					}
+				}
+			}
+		}
 
-        global $xoopsConfig;
+		global $xoopsConfig;
 
-        $configHandler   = xoops_getHandler('config');
-        $xoopsConfigUser = $configHandler->getConfigsByCat(XOOPS_CONF_USER);
-        switch ($xoopsConfigUser['activation_type']) {
-            case 0:
-                $level           = 0;
-                $mailtemplate    = 'smartmail_activate_user.tpl';
-                $aInfoMessages[] = sprintf(_NL_MA_NEW_USER_NEED_ACT, $user_email);
-                break;
-            case 1:
-                $level           = 1;
-                $mailtemplate    = 'smartmail_auto_activate_user.tpl';
-                $aInfoMessages[] = sprintf(_NL_MA_NEW_USER_AUTO_ACT, $user_email);
-                break;
-            case 2:
-            default:
-                $level           = 0;
-                $mailtemplate    = 'smartmail_admin_activate_user.tpl';
-                $aInfoMessages[] = sprintf(_NL_MA_NEW_USER_ADMIN_ACT, $user_email);
-        }
+		$configHandler   = xoops_getHandler('config');
+		$xoopsConfigUser = $configHandler->getConfigsByCat(XOOPS_CONF_USER);
+		switch ($xoopsConfigUser['activation_type']) {
+			case 0:
+				$level           = 0;
+				$mailtemplate    = 'smartmail_activate_user.tpl';
+				$aInfoMessages[] = sprintf(_NL_MA_NEW_USER_NEED_ACT, $user_email);
+				break;
+			case 1:
+				$level           = 1;
+				$mailtemplate    = 'smartmail_auto_activate_user.tpl';
+				$aInfoMessages[] = sprintf(_NL_MA_NEW_USER_AUTO_ACT, $user_email);
+				break;
+			case 2:
+			default:
+				$level           = 0;
+				$mailtemplate    = 'smartmail_admin_activate_user.tpl';
+				$aInfoMessages[] = sprintf(_NL_MA_NEW_USER_ADMIN_ACT, $user_email);
+		}
 
-        $userObj->setVar('uname', $usernames[$i]);
-        $userObj->setVar('user_avatar', 'blank.gif');
-        $userObj->setVar('user_regdate', time());
-        $userObj->setVar('timezone_offset', $xoopsConfig['default_TZ']);
-        $actkey = substr(md5(uniqid(mt_rand(), 1)), 0, 8);
-        $userObj->setVar('actkey', $actkey);
-        $userObj->setVar('email', $email);
-        $userObj->setVar('notify_method', 2);
-        $userObj->setVar('level', $userObj);
+		$userObj->setVar('uname', $usernames[$i]);
+		$userObj->setVar('user_avatar', 'blank.gif');
+		$userObj->setVar('user_regdate', time());
+		$userObj->setVar('timezone_offset', $xoopsConfig['default_TZ']);
+		$actkey = substr(md5(uniqid(mt_rand(), 1)), 0, 8);
+		$userObj->setVar('actkey', $actkey);
+		$userObj->setVar('email', $email);
+		$userObj->setVar('notify_method', 2);
+		$userObj->setVar('level', $userObj);
 
-        if ($this->insertUser($userObj)) {
+		if ($this->insertUser($userObj)) {
 
-            // if $groups=false, Add the user to Registered Users group
-            if (!$groups) {
-                $this->addUserToGroup(XOOPS_GROUP_USERS, $userObj->getVar('uid'));
-            } else {
-                foreach ($groups as $groupid) {
-                    $this->addUserToGroup($groupid, $userObj->getVar('uid'));
-                }
-            }
-        } else {
-            return false;
-        }
+			// if $groups=false, Add the user to Registered Users group
+			if (!$groups) {
+				$this->addUserToGroup(XOOPS_GROUP_USERS, $userObj->getVar('uid'));
+			} else {
+				foreach ($groups as $groupid) {
+					$this->addUserToGroup($groupid, $userObj->getVar('uid'));
+				}
+			}
+		} else {
+			return false;
+		}
 
-        if ($notifyUser) {
-            // send some notifications
-            $xoopsMailer =& getMailer();
-            $xoopsMailer->useMail();
-            $xoopsMailer->setTemplateDir(SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/mail_template');
-            $xoopsMailer->setTemplate('smartobject_notify_user_added_by_admin.tpl');
-            $xoopsMailer->assign('XOOPS_USER_PASSWORD', $password);
-            $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
-            $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
-            $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
-            $xoopsMailer->assign('NAME', $userObj->getVar('name'));
-            $xoopsMailer->assign('UNAME', $userObj->getVar('uname'));
-            $xoopsMailer->setToUsers($userObj);
-            $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
-            $xoopsMailer->setFromName($xoopsConfig['sitename']);
-            $xoopsMailer->setSubject(sprintf(_CO_SOBJECT_NEW_USER_NOTIFICATION_SUBJECT, $xoopsConfig['sitename']));
+		if ($notifyUser) {
+			// send some notifications
+			$xoopsMailer =& getMailer();
+			$xoopsMailer->useMail();
+			$xoopsMailer->setTemplateDir(SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/mail_template');
+			$xoopsMailer->setTemplate('smartobject_notify_user_added_by_admin.tpl');
+			$xoopsMailer->assign('XOOPS_USER_PASSWORD', $password);
+			$xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
+			$xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
+			$xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
+			$xoopsMailer->assign('NAME', $userObj->getVar('name'));
+			$xoopsMailer->assign('UNAME', $userObj->getVar('uname'));
+			$xoopsMailer->setToUsers($userObj);
+			$xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+			$xoopsMailer->setFromName($xoopsConfig['sitename']);
+			$xoopsMailer->setSubject(sprintf(_CO_SOBJECT_NEW_USER_NOTIFICATION_SUBJECT, $xoopsConfig['sitename']));
 
-            if (!$xoopsMailer->send(true)) {
-                /**
-                 * @todo trap error if email was not sent
-                 */
-                $xoopsMailer->getErrors(true);
-            }
-        }
+			if (!$xoopsMailer->send(true)) {
+				/**
+				 * @todo trap error if email was not sent
+				 */
+				$xoopsMailer->getErrors(true);
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Generates an array of usernames
-     *
-     * @param  string $email email of user
-     * @param  int    $count number of names to generate
-     * @return array  $names
-     * @internal param string $name name of user
-     * @author   xHelp Team
-     *
-     * @access   public
-     */
-    public function genUserNames($email, $count = 20)
-    {
-        $name = substr($email, 0, strpos($email, '@')); //Take the email adress without domain as username
+	/**
+	 * Generates an array of usernames
+	 *
+	 * @param  string $email email of user
+	 * @param  int    $count number of names to generate
+	 * @return array  $names
+	 * @internal param string $name name of user
+	 * @author   xHelp Team
+	 *
+	 * @access   public
+	 */
+	public function genUserNames($email, $count = 20)
+	{
+		$name = substr($email, 0, strpos($email, '@')); //Take the email adress without domain as username
 
-        $names  = array();
-        $userid = explode('@', $email);
+		$names  = array();
+		$userid = explode('@', $email);
 
-        $basename    = '';
-        $hasbasename = false;
-        $emailname   = $userid[0];
+		$basename    = '';
+		$hasbasename = false;
+		$emailname   = $userid[0];
 
-        $names[] = $emailname;
+		$names[] = $emailname;
 
-        if (strlen($name) > 0) {
-            $name = explode(' ', trim($name));
-            if (count($name) > 1) {
-                $basename = strtolower(substr($name[0], 0, 1) . $name[count($name) - 1]);
-            } else {
-                $basename = strtolower($name[0]);
-            }
-            $basename = xoops_substr($basename, 0, 60, '');
-            //Prevent Duplication of Email Username and Name
-            if (!in_array($basename, $names)) {
-                $names[]     = $basename;
-                $hasbasename = true;
-            }
-        }
+		if (strlen($name) > 0) {
+			$name = explode(' ', trim($name));
+			if (count($name) > 1) {
+				$basename = strtolower(substr($name[0], 0, 1) . $name[count($name) - 1]);
+			} else {
+				$basename = strtolower($name[0]);
+			}
+			$basename = xoops_substr($basename, 0, 60, '');
+			//Prevent Duplication of Email Username and Name
+			if (!in_array($basename, $names)) {
+				$names[]     = $basename;
+				$hasbasename = true;
+			}
+		}
 
-        $i          = count($names);
-        $onbasename = 1;
-        while ($i < $count) {
-            $num = $this->genRandNumber();
-            if ($onbasename < 0 && $hasbasename) {
-                $names[] = xoops_substr($basename, 0, 58, '') . $num;
-            } else {
-                $names[] = xoops_substr($emailname, 0, 58, '') . $num;
-            }
-            $i          = count($names);
-            $onbasename = ~$onbasename;
-            $num        = '';
-        }
+		$i          = count($names);
+		$onbasename = 1;
+		while ($i < $count) {
+			$num = $this->genRandNumber();
+			if ($onbasename < 0 && $hasbasename) {
+				$names[] = xoops_substr($basename, 0, 58, '') . $num;
+			} else {
+				$names[] = xoops_substr($emailname, 0, 58, '') . $num;
+			}
+			$i          = count($names);
+			$onbasename = ~$onbasename;
+			$num        = '';
+		}
 
-        return $names;
-    }
+		return $names;
+	}
 
-    /**
-     * Creates a random number with a specified number of $digits
-     *
-     * @param  int    $digits number of digits
-     * @return return int random number
-     * @author xHelp Team
-     *
-     * @access public
-     */
-    public function genRandNumber($digits = 2)
-    {
-        $this->initRand();
-        $tmp = array();
+	/**
+	 * Creates a random number with a specified number of $digits
+	 *
+	 * @param  int    $digits number of digits
+	 * @return return int random number
+	 * @author xHelp Team
+	 *
+	 * @access public
+	 */
+	public function genRandNumber($digits = 2)
+	{
+		$this->initRand();
+		$tmp = array();
 
-        for ($i = 0; $i < $digits; ++$i) {
-            $tmp[$i] = (mt_rand() % 9);
-        }
+		for ($i = 0; $i < $digits; ++$i) {
+			$tmp[$i] = (mt_rand() % 9);
+		}
 
-        return implode('', $tmp);
-    }
+		return implode('', $tmp);
+	}
 
-    /**
-     * Gives the random number generator a seed to start from
-     *
-     * @return void
-     *
-     * @access public
-     */
-    public function initRand()
-    {
-        static $randCalled = false;
-        if (!$randCalled) {
-            mt_srand((double)microtime() * 1000000);
-            $randCalled = true;
-        }
-    }
+	/**
+	 * Gives the random number generator a seed to start from
+	 *
+	 * @return void
+	 *
+	 * @access public
+	 */
+	public function initRand()
+	{
+		static $randCalled = false;
+		if (!$randCalled) {
+			mt_srand((double)microtime() * 1000000);
+			$randCalled = true;
+		}
+	}
 }

class/smartmlobject.php

Indentation +142 added lines, -142 removed lines

@@ -24,82 +24,82 @@ 
  */
 class SmartMlObject extends SmartObject
 {
-    /**
-     * SmartMlObject constructor.
-     */
-    public function __construct()
-    {
-        $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...
-     */
-    // 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.
-     */
-    public function stripMultilanguageFields()
-    {
-        $objectVars    =& $this->getVars();
-        $newObjectVars = array();
-        foreach ($objectVars as $key => $var) {
-            if (!$var['multilingual']) {
-                $newObjectVars[$key] = $var;
-            }
-        }
-        $this->vars = $newObjectVars;
-    }
-
-    public 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.
-     */
-    public 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');
-            }
-        }
-    }
-
-    /**
-     * @param  bool   $onlyUrl
-     * @param  bool   $withimage
-     * @return string
-     */
-    public function getEditLanguageLink($onlyUrl = false, $withimage = true)
-    {
-        $controller = new SmartObjectController($this->handler);
-
-        return $controller->getEditLanguageLink($this, $onlyUrl, $withimage);
-    }
+	/**
+	 * SmartMlObject constructor.
+	 */
+	public function __construct()
+	{
+		$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...
+	 */
+	// 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.
+	 */
+	public function stripMultilanguageFields()
+	{
+		$objectVars    =& $this->getVars();
+		$newObjectVars = array();
+		foreach ($objectVars as $key => $var) {
+			if (!$var['multilingual']) {
+				$newObjectVars[$key] = $var;
+			}
+		}
+		$this->vars = $newObjectVars;
+	}
+
+	public 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.
+	 */
+	public 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');
+			}
+		}
+	}
+
+	/**
+	 * @param  bool   $onlyUrl
+	 * @param  bool   $withimage
+	 * @return string
+	 */
+	public function getEditLanguageLink($onlyUrl = false, $withimage = true)
+	{
+		$controller = new SmartObjectController($this->handler);
+
+		return $controller->getEditLanguageLink($this, $onlyUrl, $withimage);
+	}
 }
 
 /**
@@ -107,70 +107,70 @@ 
  */
 class SmartPersistableMlObjectHandler extends SmartPersistableObjectHandler
 {
-    /**
-     * @param  null  $criteria
-     * @param  bool  $id_as_key
-     * @param  bool  $as_object
-     * @param  bool  $debug
-     * @param  bool  $language
-     * @return array
-     */
-    public function getObjects($criteria = null, $id_as_key = false, $as_object = true, $debug = false, $language = false)
-    {
-        // Create the first part of the SQL query to join the "_text" table
-        $sql = 'SELECT * FROM ' .
-               $this->table .
-               ' AS ' .
-               $this->_itemname .
-               ' INNER JOIN ' .
-               $this->table .
-               '_text AS ' .
-               $this->_itemname .
-               '_text ON ' .
-               $this->_itemname .
-               '.' .
-               $this->keyName .
-               '=' .
-               $this->_itemname .
-               '_text.' .
-               $this->keyName;
-
-        if ($language) {
-            // If a language was specified, then let's create a WHERE clause to only return the objects associated with this language
-
-            // if no criteria was previously created, let's create it
-            if (!$criteria) {
-                $criteria = new CriteriaCompo();
-            }
-            $criteria->add(new Criteria('language', $language));
-
-            return parent::getObjects($criteria, $id_as_key, $as_object, $debug, $sql);
-        }
-
-        return parent::getObjects($criteria, $id_as_key, $as_object, $debug, $sql);
-    }
-
-    /**
-     * @param  mixed $id
-     * @param  bool  $language
-     * @param  bool  $as_object
-     * @param  bool  $debug
-     * @return mixed
-     */
-    public function &get($id, $language = false, $as_object = true, $debug = false)
-    {
-        if (!$language) {
-            return parent::get($id, $as_object, $debug);
-        } else {
-            $criteria = new CriteriaCompo();
-            $criteria->add(new Criteria('language', $language));
-
-            return parent::get($id, $as_object, $debug, $criteria);
-        }
-    }
-
-    public function changeTableNameForML()
-    {
-        $this->table = $this->db->prefix($this->_moduleName . '_' . $this->_itemname . '_text');
-    }
+	/**
+	 * @param  null  $criteria
+	 * @param  bool  $id_as_key
+	 * @param  bool  $as_object
+	 * @param  bool  $debug
+	 * @param  bool  $language
+	 * @return array
+	 */
+	public function getObjects($criteria = null, $id_as_key = false, $as_object = true, $debug = false, $language = false)
+	{
+		// Create the first part of the SQL query to join the "_text" table
+		$sql = 'SELECT * FROM ' .
+			   $this->table .
+			   ' AS ' .
+			   $this->_itemname .
+			   ' INNER JOIN ' .
+			   $this->table .
+			   '_text AS ' .
+			   $this->_itemname .
+			   '_text ON ' .
+			   $this->_itemname .
+			   '.' .
+			   $this->keyName .
+			   '=' .
+			   $this->_itemname .
+			   '_text.' .
+			   $this->keyName;
+
+		if ($language) {
+			// If a language was specified, then let's create a WHERE clause to only return the objects associated with this language
+
+			// if no criteria was previously created, let's create it
+			if (!$criteria) {
+				$criteria = new CriteriaCompo();
+			}
+			$criteria->add(new Criteria('language', $language));
+
+			return parent::getObjects($criteria, $id_as_key, $as_object, $debug, $sql);
+		}
+
+		return parent::getObjects($criteria, $id_as_key, $as_object, $debug, $sql);
+	}
+
+	/**
+	 * @param  mixed $id
+	 * @param  bool  $language
+	 * @param  bool  $as_object
+	 * @param  bool  $debug
+	 * @return mixed
+	 */
+	public function &get($id, $language = false, $as_object = true, $debug = false)
+	{
+		if (!$language) {
+			return parent::get($id, $as_object, $debug);
+		} else {
+			$criteria = new CriteriaCompo();
+			$criteria->add(new Criteria('language', $language));
+
+			return parent::get($id, $as_object, $debug, $criteria);
+		}
+	}
+
+	public function changeTableNameForML()
+	{
+		$this->table = $this->db->prefix($this->_moduleName . '_' . $this->_itemname . '_text');
+	}
 }

class/file.php

Indentation +16 added lines, -16 removed lines

@@ -8,14 +8,14 @@ 
  */
 class SmartobjectFile extends SmartobjectBasedUrl
 {
-    /**
-     * SmartobjectFile constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->quickInitVar('fileid', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_DIRNAME);
-    }
+	/**
+	 * SmartobjectFile constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->quickInitVar('fileid', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_DIRNAME);
+	}
 }
 
 /**
@@ -23,12 +23,12 @@ 
  */
 class SmartobjectFileHandler extends SmartPersistableObjectHandler
 {
-    /**
-     * SmartobjectFileHandler constructor.
-     * @param XoopsDatabase $db
-     */
-    public function __construct(XoopsDatabase $db)
-    {
-        parent::__construct($db, 'file', 'fileid', 'caption', 'desc', 'smartobject');
-    }
+	/**
+	 * SmartobjectFileHandler constructor.
+	 * @param XoopsDatabase $db
+	 */
+	public function __construct(XoopsDatabase $db)
+	{
+		parent::__construct($db, 'file', 'fileid', 'caption', 'desc', 'smartobject');
+	}
 }

class/currency.php

Indentation +127 added lines, -127 removed lines

@@ -37,115 +37,115 @@ 
  */
 class SmartobjectCurrency extends SmartObject
 {
-    public $_modulePlugin = false;
-
-    /**
-     * SmartobjectCurrency constructor.
-     */
-    public function __construct()
-    {
-        $this->quickInitVar('currencyid', XOBJ_DTYPE_INT, true);
-        $this->quickInitVar('iso4217', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CURRENCY_ISO4217, _CO_SOBJECT_CURRENCY_ISO4217_DSC);
-        $this->quickInitVar('name', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CURRENCY_NAME);
-        $this->quickInitVar('symbol', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CURRENCY_SYMBOL);
-        $this->quickInitVar('rate', XOBJ_DTYPE_FLOAT, true, _CO_SOBJECT_CURRENCY_RATE, '', '1.0');
-        $this->quickInitVar('default_currency', XOBJ_DTYPE_INT, false, _CO_SOBJECT_CURRENCY_DEFAULT, '', false);
-
-        $this->setControl('symbol', array(
-            'name'      => 'text',
-            'size'      => '15',
-            'maxlength' => '15'
-        ));
-
-        $this->setControl('iso4217', array(
-            'name'      => 'text',
-            'size'      => '5',
-            'maxlength' => '5'
-        ));
-
-        $this->setControl('rate', array(
-            'name'      => 'text',
-            'size'      => '5',
-            'maxlength' => '5'
-        ));
-
-        $this->setControl('rate', array(
-            'name'      => 'text',
-            'size'      => '5',
-            'maxlength' => '5'
-        ));
-
-        $this->hideFieldFromForm('default_currency');
-    }
-
-    /**
-     * @param  string $key
-     * @param  string $format
-     * @return mixed
-     */
-    public function getVar($key, $format = 's')
-    {
-        if ($format === 's' && in_array($key, array('rate', 'default_currency'))) {
-            //            return call_user_func(array($this, $key));
-            return $this->{$key}();
-        }
-
-        return parent::getVar($key, $format);
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCurrencyLink()
-    {
-        $ret = $this->getVar('name', 'e');
-
-        return $ret;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCode()
-    {
-        $ret = $this->getVar('iso4217', 'e');
-
-        return $ret;
-    }
-
-    /**
-     * @return float|int|mixed|string
-     */
-    public function rate()
-    {
-        return smart_currency($this->getVar('rate', 'e'));
-    }
-
-    /**
-     * @return string
-     */
-    public function defaultCurrency()
-    {
-        if ($this->getVar('default_currency', 'e') === true) {
-            return _YES;
-        } else {
-            return _NO;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultCurrencyControl()
-    {
-        $radio_box = '<input name="default_currency" value="' . $this->getVar('currencyid') . '" type="radio"';
-        if ($this->getVar('default_currency', 'e')) {
-            $radio_box .= 'checked="checked"';
-        }
-        $radio_box .= '>';
-
-        return $radio_box;
-    }
+	public $_modulePlugin = false;
+
+	/**
+	 * SmartobjectCurrency constructor.
+	 */
+	public function __construct()
+	{
+		$this->quickInitVar('currencyid', XOBJ_DTYPE_INT, true);
+		$this->quickInitVar('iso4217', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CURRENCY_ISO4217, _CO_SOBJECT_CURRENCY_ISO4217_DSC);
+		$this->quickInitVar('name', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CURRENCY_NAME);
+		$this->quickInitVar('symbol', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CURRENCY_SYMBOL);
+		$this->quickInitVar('rate', XOBJ_DTYPE_FLOAT, true, _CO_SOBJECT_CURRENCY_RATE, '', '1.0');
+		$this->quickInitVar('default_currency', XOBJ_DTYPE_INT, false, _CO_SOBJECT_CURRENCY_DEFAULT, '', false);
+
+		$this->setControl('symbol', array(
+			'name'      => 'text',
+			'size'      => '15',
+			'maxlength' => '15'
+		));
+
+		$this->setControl('iso4217', array(
+			'name'      => 'text',
+			'size'      => '5',
+			'maxlength' => '5'
+		));
+
+		$this->setControl('rate', array(
+			'name'      => 'text',
+			'size'      => '5',
+			'maxlength' => '5'
+		));
+
+		$this->setControl('rate', array(
+			'name'      => 'text',
+			'size'      => '5',
+			'maxlength' => '5'
+		));
+
+		$this->hideFieldFromForm('default_currency');
+	}
+
+	/**
+	 * @param  string $key
+	 * @param  string $format
+	 * @return mixed
+	 */
+	public function getVar($key, $format = 's')
+	{
+		if ($format === 's' && in_array($key, array('rate', 'default_currency'))) {
+			//            return call_user_func(array($this, $key));
+			return $this->{$key}();
+		}
+
+		return parent::getVar($key, $format);
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getCurrencyLink()
+	{
+		$ret = $this->getVar('name', 'e');
+
+		return $ret;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getCode()
+	{
+		$ret = $this->getVar('iso4217', 'e');
+
+		return $ret;
+	}
+
+	/**
+	 * @return float|int|mixed|string
+	 */
+	public function rate()
+	{
+		return smart_currency($this->getVar('rate', 'e'));
+	}
+
+	/**
+	 * @return string
+	 */
+	public function defaultCurrency()
+	{
+		if ($this->getVar('default_currency', 'e') === true) {
+			return _YES;
+		} else {
+			return _NO;
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDefaultCurrencyControl()
+	{
+		$radio_box = '<input name="default_currency" value="' . $this->getVar('currencyid') . '" type="radio"';
+		if ($this->getVar('default_currency', 'e')) {
+			$radio_box .= 'checked="checked"';
+		}
+		$radio_box .= '>';
+
+		return $radio_box;
+	}
 }
 
 /**
@@ -153,22 +153,22 @@ 
  */
 class SmartObjectCurrencyHandler extends SmartPersistableObjectHandler
 {
-    /**
-     * SmartObjectCurrencyHandler constructor.
-     * @param XoopsDatabase $db
-     */
-    public function __construct(XoopsDatabase $db)
-    {
-        parent::__construct($db, 'currency', 'currencyid', 'name', '', 'smartobject');
-    }
-
-    /**
-     * @return array
-     */
-    public function getCurrencies()
-    {
-        $currenciesObj = $this->getObjects(null, true);
-
-        return $currenciesObj;
-    }
+	/**
+	 * SmartObjectCurrencyHandler constructor.
+	 * @param XoopsDatabase $db
+	 */
+	public function __construct(XoopsDatabase $db)
+	{
+		parent::__construct($db, 'currency', 'currencyid', 'name', '', 'smartobject');
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getCurrencies()
+	{
+		$currenciesObj = $this->getObjects(null, true);
+
+		return $currenciesObj;
+	}
 }

class/smartobjecthandler.php

Indentation +966 added lines, -966 removed lines

@@ -25,970 +25,970 @@
  */
 class SmartPersistableObjectHandler extends XoopsObjectHandler
 {
-    public $_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
-     */
-    public $table;
-
-    /**
-     * Name of the table key that uniquely identify each {@link SmartObject}
-     *
-     * For example: "categoryid"
-     * @var string
-     */
-    public $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
-     */
-    public $className;
-
-    /**
-     * Name of the field which properly identify the {@link SmartObject}
-     *
-     * For example: "name" (this will be the category's name)
-     * @var string
-     */
-    public $identifierName;
-
-    /**
-     * Name of the field which will be use as a summary for the object
-     *
-     * For example: "summary"
-     * @var string
-     */
-    public $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
-     */
-    public $_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
-     */
-    public $_modulePath;
-
-    public $_moduleUrl;
-
-    public $_moduleName;
-
-    public $_uploadUrl;
-
-    public $_uploadPath;
-
-    public $_allowedMimeTypes = 0;
-
-    public $_maxFileSize = 1000000;
-
-    public $_maxWidth = 500;
-
-    public $_maxHeight = 500;
-
-    public $highlightFields = array();
-
-    /**
-     * Array containing the events name and functions
-     *
-     * @var array
-     */
-    public $eventArray = array();
-
-    /**
-     * Array containing the permissions that this handler will manage on the objects
-     *
-     * @var array
-     */
-    public $permissionsArray = false;
-
-    public $generalSQL = false;
-
-    public $_eventHooks     = array();
-    public $_disabledEvents = array();
-
-    /**
-     * Constructor - called from child classes
-     *
-     * @param XoopsDatabase $db           {@link XoopsDatabase}
-     *                                           object
-     * @param                      $itemname
-     * @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                      $summaryName
-     * @param                      $modulename
-     * @internal param string $tablename Name of the table use to store this <a href='psi_element://SmartObject'>SmartObject</a>
-     * @internal param Name $string of the class derived from <a href='psi_element://SmartObject'>SmartObject</a> and which this handler is handling and which this handler is handling
-     * @internal param string $page Page name use to basically manage and display the <a href='psi_element://SmartObject'>SmartObject</a>
-     * @internal param string $moduleName name of the module
-     */
-    public function __construct(XoopsDatabase $db, $itemname, $keyname, $idenfierName, $summaryName, $modulename)
-    {
-        parent::__construct($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 . '/';
-    }
-
-    /**
-     * @param $event
-     * @param $method
-     */
-    public 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 bool|string $description description of the control that will be displayed in the form
-     */
-    public 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
-        );
-    }
-
-    /**
-     * @param $criteria
-     * @param $perm_name
-     * @return bool
-     */
-    public function setGrantedObjectsCriteria(&$criteria, $perm_name)
-    {
-        $smartPermissionsHandler = new SmartobjectPermissionHandler($this);
-        $grantedItems            = $smartPermissionsHandler->getGrantedItems($perm_name);
-        if (count($grantedItems) > 0) {
-            $criteria->add(new Criteria($this->keyName, '(' . implode(', ', $grantedItems) . ')', 'IN'));
-
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * @param bool $_uploadPath
-     * @param bool $_allowedMimeTypes
-     * @param bool $_maxFileSize
-     * @param bool $_maxWidth
-     * @param bool $_maxHeight
-     */
-    public function setUploaderConfig($_uploadPath = false, $_allowedMimeTypes = false, $_maxFileSize = false, $_maxWidth = false, $_maxHeight = false)
-    {
-        $this->_uploadPath       = $_uploadPath ?: $this->_uploadPath;
-        $this->_allowedMimeTypes = $_allowedMimeTypes ?: $this->_allowedMimeTypes;
-        $this->_maxFileSize      = $_maxFileSize ?: $this->_maxFileSize;
-        $this->_maxWidth         = $_maxWidth ?: $this->_maxWidth;
-        $this->_maxHeight        = $_maxHeight ?: $this->_maxHeight;
-    }
-
-    /**
-     * create a new {@link SmartObject}
-     *
-     * @param bool $isNew Flag the new objects as "new"?
-     *
-     * @return SmartObject {@link SmartObject}
-     */
-    public 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;
-    }
-
-    /**
-     * @return string
-     */
-    public function getImageUrl()
-    {
-        return $this->_uploadUrl . $this->_itemname . '/';
-    }
-
-    /**
-     * @return string
-     */
-    public 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
-     * @param  bool  $debug
-     * @param  bool  $criteria
-     * @return mixed reference to the <a href='psi_element://SmartObject'>SmartObject</a>, FALSE if failed
-     *                         FALSE if failed
-     */
-    public function get($id, $as_object = true, $debug = false, $criteria = false)
-    {
-        if (!$criteria) {
-            $criteria = new CriteriaCompo();
-        }
-        if (is_array($this->keyName)) {
-            for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
-                /**
-                 * In some situations, the $id is not an INTEGER. SmartObjectTag is an example.
-                 * Is the fact that we removed the (int)() 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, (int)($id), '=', $this->_itemname);
-            /**
-             * In some situations, the $id is not an INTEGER. SmartObjectTag is an example.
-             * Is the fact that we removed the (int)() 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
-     */
-    public function &getD($id, $as_object = true)
-    {
-        return $this->get($id, $as_object, true);
-    }
-
-    /**
-     * retrieve objects from the database
-     *
-     * @param CriteriaElement $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?
-     *
-     * @param  bool  $sql
-     * @param  bool  $debug
-     * @return array
-     */
-    public function getObjects(CriteriaElement $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);
-    }
-
-    /**
-     * @param        $sql
-     * @param        $criteria
-     * @param  bool  $force
-     * @param  bool  $debug
-     * @return array
-     */
-    public 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 (false !== ($myrow = $this->db->fetchArray($result))) {
-            $ret[] = $myrow;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * retrieve objects with debug mode - so will show the query
-     *
-     * @param CriteriaElement $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?
-     *
-     * @param  bool  $sql
-     * @return array
-     */
-    public function getObjectsD(CriteriaElement $criteria = null, $id_as_key = false, $as_object = true, $sql = false)
-    {
-        return $this->getObjects($criteria, $id_as_key, $as_object, $sql, true);
-    }
-
-    /**
-     * @param $arrayObjects
-     * @return array|bool
-     */
-    public 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
-     */
-    public function convertResultSet($result, $id_as_key = false, $as_object = true)
-    {
-        $ret = array();
-        while (false !== ($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;
-    }
-
-    /**
-     * @param  null  $criteria
-     * @param  int   $limit
-     * @param  int   $start
-     * @return array
-     */
-    public 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 CriteriaElement $criteria {@link CriteriaElement} conditions to be met
-     * @param int    $limit    Max number of objects to fetch
-     * @param int    $start    Which record to start at
-     *
-     * @param  bool  $debug
-     * @return array
-     */
-    public function getList(CriteriaElement $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 (false !== ($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  CriteriaElement $criteria {@link CriteriaElement} to match
-     * @return int    count of objects
-     */
-    public function getCount(CriteriaElement $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 (false !== (list($id, $count) = $this->db->fetchRow($result))) {
-                $ret[$id] = $count;
-            }
-
-            return $ret;
-        }
-    }
-
-    /**
-     * delete an object from the database
-     *
-     * @param  XoopsObject $obj   reference to the object to delete
-     * @param  bool        $force
-     * @return bool        FALSE if failed.
-     */
-    public function delete(XoopsObject $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, $iMax = count($this->keyName); $i < $iMax; ++$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;
-    }
-
-    /**
-     * @param $event
-     */
-    public function disableEvent($event)
-    {
-        if (is_array($event)) {
-            foreach ($event as $v) {
-                $this->_disabledEvents[] = $v;
-            }
-        } else {
-            $this->_disabledEvents[] = $event;
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function getPermissions()
-    {
-        return $this->permissionsArray;
-    }
-
-    /**
-     * insert a new object in the database
-     *
-     * @param  XoopsObject $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
-     * @param  bool        $debug
-     * @return bool        FALSE if failed, TRUE if already present and unchanged or successful
-     */
-    public function insert(XoopsObject $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
-            $smartobjectMetagen = 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', $smartobjectMetagen->_keywords);
-                }
-
-                if (!$obj->meta_description()) {
-                    $obj->setVar('meta_description', $smartobjectMetagen->_meta_description);
-                }
-            }
-
-            // Auto create short_url if empty
-            if (!$obj->short_url()) {
-                $obj->setVar('short_url', $smartobjectMetagen->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] = (int)$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, $iMax = count($this->keyName); $i < $iMax; ++$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;
-    }
-
-    /**
-     * @param       $obj
-     * @param  bool $force
-     * @param  bool $checkObject
-     * @param  bool $debug
-     * @return bool
-     */
-    public 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 CriteriaElement $criteria   {@link CriteriaElement}
-     *
-     * @param  bool $force
-     * @return bool
-     */
-    public function updateAll($fieldname, $fieldvalue, CriteriaElement $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  CriteriaElement $criteria {@link CriteriaElement} with conditions to meet
-     * @return bool
-     */
-
-    public function deleteAll(CriteriaElement $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;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getModuleInfo()
-    {
-        return smart_getModuleInfo($this->_moduleName);
-    }
-
-    /**
-     * @return bool
-     */
-    public function getModuleConfig()
-    {
-        return smart_getModuleConfig($this->_moduleName);
-    }
-
-    /**
-     * @return string
-     */
-    public function getModuleItemString()
-    {
-        $ret = $this->_moduleName . '_' . $this->_itemname;
-
-        return $ret;
-    }
-
-    /**
-     * @param $object
-     */
-    public 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         $executeEventObj
-     * @return mixed  result of the execution of the function or FALSE if the function was not executed
-     * @internal param object $obj $object on which is performed the event
-     */
-    public 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;
-    }
-
-    /**
-     * @param  bool   $withprefix
-     * @return string
-     */
-    public function getIdentifierName($withprefix = true)
-    {
-        if ($withprefix) {
-            return $this->_itemname . '.' . $this->identifierName;
-        } else {
-            return $this->identifierName;
-        }
-    }
+	public $_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
+	 */
+	public $table;
+
+	/**
+	 * Name of the table key that uniquely identify each {@link SmartObject}
+	 *
+	 * For example: "categoryid"
+	 * @var string
+	 */
+	public $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
+	 */
+	public $className;
+
+	/**
+	 * Name of the field which properly identify the {@link SmartObject}
+	 *
+	 * For example: "name" (this will be the category's name)
+	 * @var string
+	 */
+	public $identifierName;
+
+	/**
+	 * Name of the field which will be use as a summary for the object
+	 *
+	 * For example: "summary"
+	 * @var string
+	 */
+	public $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
+	 */
+	public $_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
+	 */
+	public $_modulePath;
+
+	public $_moduleUrl;
+
+	public $_moduleName;
+
+	public $_uploadUrl;
+
+	public $_uploadPath;
+
+	public $_allowedMimeTypes = 0;
+
+	public $_maxFileSize = 1000000;
+
+	public $_maxWidth = 500;
+
+	public $_maxHeight = 500;
+
+	public $highlightFields = array();
+
+	/**
+	 * Array containing the events name and functions
+	 *
+	 * @var array
+	 */
+	public $eventArray = array();
+
+	/**
+	 * Array containing the permissions that this handler will manage on the objects
+	 *
+	 * @var array
+	 */
+	public $permissionsArray = false;
+
+	public $generalSQL = false;
+
+	public $_eventHooks     = array();
+	public $_disabledEvents = array();
+
+	/**
+	 * Constructor - called from child classes
+	 *
+	 * @param XoopsDatabase $db           {@link XoopsDatabase}
+	 *                                           object
+	 * @param                      $itemname
+	 * @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                      $summaryName
+	 * @param                      $modulename
+	 * @internal param string $tablename Name of the table use to store this <a href='psi_element://SmartObject'>SmartObject</a>
+	 * @internal param Name $string of the class derived from <a href='psi_element://SmartObject'>SmartObject</a> and which this handler is handling and which this handler is handling
+	 * @internal param string $page Page name use to basically manage and display the <a href='psi_element://SmartObject'>SmartObject</a>
+	 * @internal param string $moduleName name of the module
+	 */
+	public function __construct(XoopsDatabase $db, $itemname, $keyname, $idenfierName, $summaryName, $modulename)
+	{
+		parent::__construct($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 . '/';
+	}
+
+	/**
+	 * @param $event
+	 * @param $method
+	 */
+	public 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 bool|string $description description of the control that will be displayed in the form
+	 */
+	public 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
+		);
+	}
+
+	/**
+	 * @param $criteria
+	 * @param $perm_name
+	 * @return bool
+	 */
+	public function setGrantedObjectsCriteria(&$criteria, $perm_name)
+	{
+		$smartPermissionsHandler = new SmartobjectPermissionHandler($this);
+		$grantedItems            = $smartPermissionsHandler->getGrantedItems($perm_name);
+		if (count($grantedItems) > 0) {
+			$criteria->add(new Criteria($this->keyName, '(' . implode(', ', $grantedItems) . ')', 'IN'));
+
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * @param bool $_uploadPath
+	 * @param bool $_allowedMimeTypes
+	 * @param bool $_maxFileSize
+	 * @param bool $_maxWidth
+	 * @param bool $_maxHeight
+	 */
+	public function setUploaderConfig($_uploadPath = false, $_allowedMimeTypes = false, $_maxFileSize = false, $_maxWidth = false, $_maxHeight = false)
+	{
+		$this->_uploadPath       = $_uploadPath ?: $this->_uploadPath;
+		$this->_allowedMimeTypes = $_allowedMimeTypes ?: $this->_allowedMimeTypes;
+		$this->_maxFileSize      = $_maxFileSize ?: $this->_maxFileSize;
+		$this->_maxWidth         = $_maxWidth ?: $this->_maxWidth;
+		$this->_maxHeight        = $_maxHeight ?: $this->_maxHeight;
+	}
+
+	/**
+	 * create a new {@link SmartObject}
+	 *
+	 * @param bool $isNew Flag the new objects as "new"?
+	 *
+	 * @return SmartObject {@link SmartObject}
+	 */
+	public 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;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getImageUrl()
+	{
+		return $this->_uploadUrl . $this->_itemname . '/';
+	}
+
+	/**
+	 * @return string
+	 */
+	public 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
+	 * @param  bool  $debug
+	 * @param  bool  $criteria
+	 * @return mixed reference to the <a href='psi_element://SmartObject'>SmartObject</a>, FALSE if failed
+	 *                         FALSE if failed
+	 */
+	public function get($id, $as_object = true, $debug = false, $criteria = false)
+	{
+		if (!$criteria) {
+			$criteria = new CriteriaCompo();
+		}
+		if (is_array($this->keyName)) {
+			for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
+				/**
+				 * In some situations, the $id is not an INTEGER. SmartObjectTag is an example.
+				 * Is the fact that we removed the (int)() 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, (int)($id), '=', $this->_itemname);
+			/**
+			 * In some situations, the $id is not an INTEGER. SmartObjectTag is an example.
+			 * Is the fact that we removed the (int)() 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
+	 */
+	public function &getD($id, $as_object = true)
+	{
+		return $this->get($id, $as_object, true);
+	}
+
+	/**
+	 * retrieve objects from the database
+	 *
+	 * @param CriteriaElement $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?
+	 *
+	 * @param  bool  $sql
+	 * @param  bool  $debug
+	 * @return array
+	 */
+	public function getObjects(CriteriaElement $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);
+	}
+
+	/**
+	 * @param        $sql
+	 * @param        $criteria
+	 * @param  bool  $force
+	 * @param  bool  $debug
+	 * @return array
+	 */
+	public 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 (false !== ($myrow = $this->db->fetchArray($result))) {
+			$ret[] = $myrow;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * retrieve objects with debug mode - so will show the query
+	 *
+	 * @param CriteriaElement $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?
+	 *
+	 * @param  bool  $sql
+	 * @return array
+	 */
+	public function getObjectsD(CriteriaElement $criteria = null, $id_as_key = false, $as_object = true, $sql = false)
+	{
+		return $this->getObjects($criteria, $id_as_key, $as_object, $sql, true);
+	}
+
+	/**
+	 * @param $arrayObjects
+	 * @return array|bool
+	 */
+	public 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
+	 */
+	public function convertResultSet($result, $id_as_key = false, $as_object = true)
+	{
+		$ret = array();
+		while (false !== ($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;
+	}
+
+	/**
+	 * @param  null  $criteria
+	 * @param  int   $limit
+	 * @param  int   $start
+	 * @return array
+	 */
+	public 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 CriteriaElement $criteria {@link CriteriaElement} conditions to be met
+	 * @param int    $limit    Max number of objects to fetch
+	 * @param int    $start    Which record to start at
+	 *
+	 * @param  bool  $debug
+	 * @return array
+	 */
+	public function getList(CriteriaElement $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 (false !== ($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  CriteriaElement $criteria {@link CriteriaElement} to match
+	 * @return int    count of objects
+	 */
+	public function getCount(CriteriaElement $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 (false !== (list($id, $count) = $this->db->fetchRow($result))) {
+				$ret[$id] = $count;
+			}
+
+			return $ret;
+		}
+	}
+
+	/**
+	 * delete an object from the database
+	 *
+	 * @param  XoopsObject $obj   reference to the object to delete
+	 * @param  bool        $force
+	 * @return bool        FALSE if failed.
+	 */
+	public function delete(XoopsObject $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, $iMax = count($this->keyName); $i < $iMax; ++$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;
+	}
+
+	/**
+	 * @param $event
+	 */
+	public function disableEvent($event)
+	{
+		if (is_array($event)) {
+			foreach ($event as $v) {
+				$this->_disabledEvents[] = $v;
+			}
+		} else {
+			$this->_disabledEvents[] = $event;
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getPermissions()
+	{
+		return $this->permissionsArray;
+	}
+
+	/**
+	 * insert a new object in the database
+	 *
+	 * @param  XoopsObject $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
+	 * @param  bool        $debug
+	 * @return bool        FALSE if failed, TRUE if already present and unchanged or successful
+	 */
+	public function insert(XoopsObject $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
+			$smartobjectMetagen = 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', $smartobjectMetagen->_keywords);
+				}
+
+				if (!$obj->meta_description()) {
+					$obj->setVar('meta_description', $smartobjectMetagen->_meta_description);
+				}
+			}
+
+			// Auto create short_url if empty
+			if (!$obj->short_url()) {
+				$obj->setVar('short_url', $smartobjectMetagen->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] = (int)$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, $iMax = count($this->keyName); $i < $iMax; ++$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;
+	}
+
+	/**
+	 * @param       $obj
+	 * @param  bool $force
+	 * @param  bool $checkObject
+	 * @param  bool $debug
+	 * @return bool
+	 */
+	public 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 CriteriaElement $criteria   {@link CriteriaElement}
+	 *
+	 * @param  bool $force
+	 * @return bool
+	 */
+	public function updateAll($fieldname, $fieldvalue, CriteriaElement $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  CriteriaElement $criteria {@link CriteriaElement} with conditions to meet
+	 * @return bool
+	 */
+
+	public function deleteAll(CriteriaElement $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;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getModuleInfo()
+	{
+		return smart_getModuleInfo($this->_moduleName);
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getModuleConfig()
+	{
+		return smart_getModuleConfig($this->_moduleName);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getModuleItemString()
+	{
+		$ret = $this->_moduleName . '_' . $this->_itemname;
+
+		return $ret;
+	}
+
+	/**
+	 * @param $object
+	 */
+	public 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         $executeEventObj
+	 * @return mixed  result of the execution of the function or FALSE if the function was not executed
+	 * @internal param object $obj $object on which is performed the event
+	 */
+	public 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;
+	}
+
+	/**
+	 * @param  bool   $withprefix
+	 * @return string
+	 */
+	public function getIdentifierName($withprefix = true)
+	{
+		if ($withprefix) {
+			return $this->_itemname . '.' . $this->identifierName;
+		} else {
+			return $this->identifierName;
+		}
+	}
 }

class/smartobjecttreetable.php

Indentation +149 added lines, -149 removed lines

@@ -22,153 +22,153 @@
  */
 class SmartObjectTreeTable extends SmartObjectTable
 {
-    /**
-     * SmartObjectTreeTable constructor.
-     * @param SmartPersistableObjectHandler $objectHandler
-     * @param bool   $criteria
-     * @param array  $actions
-     * @param bool   $userSide
-     */
-    public function __construct(SmartPersistableObjectHandler $objectHandler, $criteria = false, $actions = array('edit', 'delete'), $userSide = false)
-    {
-        $this->SmartObjectTable($objectHandler, $criteria, $actions, $userSide);
-        $this->_isTree = true;
-    }
-
-    /**
-     * Get children objects given a specific parentid
-     *
-     * @var    int   $parentid id of the parent which children we want to retreive
-     * @return array of SmartObject
-     */
-    public function getChildrenOf($parentid = 0)
-    {
-        return isset($this->_objects[$parentid]) ? $this->_objects[$parentid] : false;
-    }
-
-    /**
-     * @param     $object
-     * @param int $level
-     */
-    public function createTableRow($object, $level = 0)
-    {
-        $aObject = array();
-
-        $i = 0;
-
-        $aColumns        = array();
-        $doWeHaveActions = false;
-
-        foreach ($this->_columns as $column) {
-            $aColumn = array();
-
-            if ($i == 0) {
-                $class = 'head';
-            } elseif ($i % 2 == 0) {
-                $class = 'even';
-            } else {
-                $class = 'odd';
-            }
-
-            if ($column->_customMethodForValue && method_exists($object, $column->_customMethodForValue)) {
-                $method = $column->_customMethodForValue;
-                $value  = $object->$method();
-            } else {
-                /**
-                 * If the column is the identifier, then put a link on it
-                 */
-                if ($column->getKeyName() == $this->_objectHandler->identifierName) {
-                    $value = $object->getItemLink();
-                } else {
-                    $value = $object->getVar($column->getKeyName());
-                }
-            }
-
-            $space = '';
-            if ($column->getKeyName() == $this->_objectHandler->identifierName) {
-                for ($i = 0; $i < $level; ++$i) {
-                    $space .= '--';
-                }
-            }
-
-            if ($space !== '') {
-                $space .= '&nbsp;';
-            }
-
-            $aColumn['value'] = $space . $value;
-            $aColumn['class'] = $class;
-            $aColumn['width'] = $column->getWidth();
-            $aColumn['align'] = $column->getAlign();
-            $aColumn['key']   = $column->getKeyName();
-
-            $aColumns[] = $aColumn;
-            ++$i;
-        }
-
-        $aObject['columns'] = $aColumns;
-
-        $class            = $class === 'even' ? 'odd' : 'even';
-        $aObject['class'] = $class;
-
-        $actions = array();
-
-        // Adding the custom actions if any
-        foreach ($this->_custom_actions as $action) {
-            if (method_exists($object, $action)) {
-                $actions[] = $object->$action();
-            }
-        }
-
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($this->_objectHandler);
-
-        if (in_array('edit', $this->_actions)) {
-            $actions[] = $controller->getEditItemLink($object, false, true);
-        }
-        if (in_array('delete', $this->_actions)) {
-            $actions[] = $controller->getDeleteItemLink($object, false, true);
-        }
-        $aObject['actions'] = $actions;
-
-        $this->_tpl->assign('smartobject_actions_column_width', count($actions) * 30);
-        $aObject['id']     = $object->id();
-        $this->_aObjects[] = $aObject;
-
-        $childrenObjects = $this->getChildrenOf($object->id());
-
-        $this->_hasActions = $this->_hasActions ? true : count($actions) > 0;
-
-        if ($childrenObjects) {
-            ++$level;
-            foreach ($childrenObjects as $subObject) {
-                $this->createTableRow($subObject, $level);
-            }
-        }
-    }
-
-    public function createTableRows()
-    {
-        $this->_aObjects = array();
-
-        if (count($this->_objects) > 0) {
-            foreach ($this->getChildrenOf() as $object) {
-                $this->createTableRow($object);
-            }
-
-            $this->_tpl->assign('smartobject_objects', $this->_aObjects);
-        } else {
-            $colspan = count($this->_columns) + 1;
-            $this->_tpl->assign('smartobject_colspan', $colspan);
-        }
-    }
-
-    /**
-     * @return mixed
-     */
-    public function fetchObjects()
-    {
-        $ret = $this->_objectHandler->getObjects($this->_criteria, 'parentid');
-
-        return $ret;
-    }
+	/**
+	 * SmartObjectTreeTable constructor.
+	 * @param SmartPersistableObjectHandler $objectHandler
+	 * @param bool   $criteria
+	 * @param array  $actions
+	 * @param bool   $userSide
+	 */
+	public function __construct(SmartPersistableObjectHandler $objectHandler, $criteria = false, $actions = array('edit', 'delete'), $userSide = false)
+	{
+		$this->SmartObjectTable($objectHandler, $criteria, $actions, $userSide);
+		$this->_isTree = true;
+	}
+
+	/**
+	 * Get children objects given a specific parentid
+	 *
+	 * @var    int   $parentid id of the parent which children we want to retreive
+	 * @return array of SmartObject
+	 */
+	public function getChildrenOf($parentid = 0)
+	{
+		return isset($this->_objects[$parentid]) ? $this->_objects[$parentid] : false;
+	}
+
+	/**
+	 * @param     $object
+	 * @param int $level
+	 */
+	public function createTableRow($object, $level = 0)
+	{
+		$aObject = array();
+
+		$i = 0;
+
+		$aColumns        = array();
+		$doWeHaveActions = false;
+
+		foreach ($this->_columns as $column) {
+			$aColumn = array();
+
+			if ($i == 0) {
+				$class = 'head';
+			} elseif ($i % 2 == 0) {
+				$class = 'even';
+			} else {
+				$class = 'odd';
+			}
+
+			if ($column->_customMethodForValue && method_exists($object, $column->_customMethodForValue)) {
+				$method = $column->_customMethodForValue;
+				$value  = $object->$method();
+			} else {
+				/**
+				 * If the column is the identifier, then put a link on it
+				 */
+				if ($column->getKeyName() == $this->_objectHandler->identifierName) {
+					$value = $object->getItemLink();
+				} else {
+					$value = $object->getVar($column->getKeyName());
+				}
+			}
+
+			$space = '';
+			if ($column->getKeyName() == $this->_objectHandler->identifierName) {
+				for ($i = 0; $i < $level; ++$i) {
+					$space .= '--';
+				}
+			}
+
+			if ($space !== '') {
+				$space .= '&nbsp;';
+			}
+
+			$aColumn['value'] = $space . $value;
+			$aColumn['class'] = $class;
+			$aColumn['width'] = $column->getWidth();
+			$aColumn['align'] = $column->getAlign();
+			$aColumn['key']   = $column->getKeyName();
+
+			$aColumns[] = $aColumn;
+			++$i;
+		}
+
+		$aObject['columns'] = $aColumns;
+
+		$class            = $class === 'even' ? 'odd' : 'even';
+		$aObject['class'] = $class;
+
+		$actions = array();
+
+		// Adding the custom actions if any
+		foreach ($this->_custom_actions as $action) {
+			if (method_exists($object, $action)) {
+				$actions[] = $object->$action();
+			}
+		}
+
+		include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($this->_objectHandler);
+
+		if (in_array('edit', $this->_actions)) {
+			$actions[] = $controller->getEditItemLink($object, false, true);
+		}
+		if (in_array('delete', $this->_actions)) {
+			$actions[] = $controller->getDeleteItemLink($object, false, true);
+		}
+		$aObject['actions'] = $actions;
+
+		$this->_tpl->assign('smartobject_actions_column_width', count($actions) * 30);
+		$aObject['id']     = $object->id();
+		$this->_aObjects[] = $aObject;
+
+		$childrenObjects = $this->getChildrenOf($object->id());
+
+		$this->_hasActions = $this->_hasActions ? true : count($actions) > 0;
+
+		if ($childrenObjects) {
+			++$level;
+			foreach ($childrenObjects as $subObject) {
+				$this->createTableRow($subObject, $level);
+			}
+		}
+	}
+
+	public function createTableRows()
+	{
+		$this->_aObjects = array();
+
+		if (count($this->_objects) > 0) {
+			foreach ($this->getChildrenOf() as $object) {
+				$this->createTableRow($object);
+			}
+
+			$this->_tpl->assign('smartobject_objects', $this->_aObjects);
+		} else {
+			$colspan = count($this->_columns) + 1;
+			$this->_tpl->assign('smartobject_colspan', $colspan);
+		}
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function fetchObjects()
+	{
+		$ret = $this->_objectHandler->getObjects($this->_criteria, 'parentid');
+
+		return $ret;
+	}
 }

class/smartobjectlink.php

Indentation +166 added lines, -166 removed lines

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

class/customtag.php

Indentation +246 added lines, -246 removed lines

@@ -36,208 +36,208 @@ 
  */
 class SmartobjectCustomtag extends SmartObject
 {
-    public $content = false;
-
-    /**
-     * SmartobjectCustomtag constructor.
-     */
-    public function __construct()
-    {
-        $this->quickInitVar('customtagid', XOBJ_DTYPE_INT, true);
-        $this->quickInitVar('name', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CUSTOMTAG_NAME, _CO_SOBJECT_CUSTOMTAG_NAME_DSC);
-        $this->quickInitVar('description', XOBJ_DTYPE_TXTAREA, false, _CO_SOBJECT_CUSTOMTAG_DESCRIPTION, _CO_SOBJECT_CUSTOMTAG_DESCRIPTION_DSC);
-        $this->quickInitVar('content', XOBJ_DTYPE_TXTAREA, true, _CO_SOBJECT_CUSTOMTAG_CONTENT, _CO_SOBJECT_CUSTOMTAG_CONTENT_DSC);
-        $this->quickInitVar('language', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CUSTOMTAG_LANGUAGE, _CO_SOBJECT_CUSTOMTAG_LANGUAGE_DSC);
-
-        $this->initNonPersistableVar('dohtml', XOBJ_DTYPE_INT, 'class', 'dohtml', '', true);
-        $this->initNonPersistableVar('doimage', XOBJ_DTYPE_INT, 'class', 'doimage', '', true);
-        $this->initNonPersistableVar('doxcode', XOBJ_DTYPE_INT, 'class', 'doxcode', '', true);
-        $this->initNonPersistableVar('dosmiley', XOBJ_DTYPE_INT, 'class', 'dosmiley', '', true);
-
-        $this->setControl('content', array(
-            'name'        => 'textarea',
-            'form_editor' => 'textarea',
-            'form_rows'   => 25
-        ));
-        $this->setControl('language', array(
-            'name' => 'language',
-            'all'  => true
-        ));
-    }
-
-    /**
-     * @param  string $key
-     * @param  string $format
-     * @return mixed
-     */
-    public function getVar($key, $format = 's')
-    {
-        if ($format === 's' && in_array($key, array())) {
-            //            return call_user_func(array($this, $key));
-            return $this->{$key}();
-        }
-
-        return parent::getVar($key, $format);
-    }
-
-    /**
-     * @return bool|mixed
-     */
-    public function render()
-    {
-        if (!$this->content) {
-            $ret           = $this->getVar('content');
-            $this->content = $ret;
-        }
-
-        return $this->content;
-    }
-
-    /**
-     * @return bool|mixed|string
-     */
-    public function renderWithPhp()
-    {
-        if (!$this->content) {
-            $ret           = $this->getVar('content');
-            $this->content = $ret;
-        } else {
-            $ret = $this->content;
-        }
-
-        // check for PHP if we are not on admin side
-        if (!defined('XOOPS_CPFUNC_LOADED') && !(strpos($ret, '[php]') === false)) {
-            $ret = str_replace('[php]', '', $ret);
-            // we have PHP code, let's evaluate
-            eval($ret);
-
-            return '';
-        }
-
-        return $this->content;
-    }
-
-    /**
-     * @return string
-     */
-    public function getXoopsCode()
-    {
-        $ret = '[customtag]' . $this->getVar('tag', 'n') . '[/customtag]';
-
-        return $ret;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCloneLink()
-    {
-        $ret = '<a href="' .
-               SMARTOBJECT_URL .
-               'admin/customtag.php?op=clone&customtagid=' .
-               $this->id() .
-               '"><img src="' .
-               SMARTOBJECT_IMAGES_ACTIONS_URL .
-               'editcopy.png" style="vertical-align: middle;" alt="' .
-               _CO_SOBJECT_CUSTOMTAG_CLONE .
-               '" title="' .
-               _CO_SOBJECT_CUSTOMTAG_CLONE .
-               '" /></a>';
-
-        return $ret;
-    }
-
-    /**
-     * @param $var
-     * @return bool
-     */
-    public function emptyString($var)
-    {
-        return (strlen($var) > 0);
-    }
-
-    /**
-     * @return mixed|string
-     */
-    public function generateTag()
-    {
-        $title = rawurlencode(strtolower($this->getVar('description', 'e')));
-        $title = xoops_substr($title, 0, 10, '');
-        // Transformation des ponctuations
-        $pattern = array(
-            '/%09/', // Tab
-            '/%20/', // Space
-            '/%21/', // !
-            '/%22/', // "
-            '/%23/', // #
-            '/%25/', // %
-            '/%26/', // &
-            '/%27/', // '
-            '/%28/', // (
-            '/%29/', // )
-            '/%2C/', // ,
-            '/%2F/', // /
-            '/%3A/', // :
-            '/%3B/', // ;
-            '/%3C/', // <
-            '/%3D/', // =
-            '/%3E/', // >
-            '/%3F/', // ?
-            '/%40/', // @
-            '/%5B/', // [
-            '/%5C/', // \
-            '/%5D/', // ]
-            '/%5E/', // ^
-            '/%7B/', // {
-            '/%7C/', // |
-            '/%7D/', // }
-            '/%7E/', // ~
-            "/\./" // .
-        );
-        $rep_pat = array('-', '-', '-', '-', '-', '-100', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-at-', '-', '-', '-', '-', '-', '-', '-', '-', '-');
-        $title   = preg_replace($pattern, $rep_pat, $title);
-
-        // Transformation des caract�res accentu�s
-        $pattern = array(
-            '/%B0/', // °
-            '/%E8/', // è
-            '/%E9/', // é
-            '/%EA/', // ê
-            '/%EB/', // ë
-            '/%E7/', // ç
-            '/%E0/', // à
-            '/%E2/', // â
-            '/%E4/', // ä
-            '/%EE/', // î
-            '/%EF/', // ï
-            '/%F9/', // ù
-            '/%FC/', // ü
-            '/%FB/', // û
-            '/%F4/', // ô
-            '/%F6/', // ö
-        );
-        $rep_pat = array('-', 'e', 'e', 'e', 'e', 'c', 'a', 'a', 'a', 'i', 'i', 'u', 'u', 'u', 'o', 'o');
-        $title   = preg_replace($pattern, $rep_pat, $title);
-
-        $tableau = explode('-', $title); // Transforme la chaine de caract�res en tableau
-        $tableau = array_filter($tableau, array($this, 'emptyString')); // Supprime les chaines vides du tableau
-        $title   = implode('-', $tableau); // Transforme un tableau en chaine de caract�res s�par� par un tiret
-
-        $title .= time();
-        $title = md5($title);
-
-        return $title;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCustomtagName()
-    {
-        $ret = $this->getVar('name');
-
-        return $ret;
-    }
+	public $content = false;
+
+	/**
+	 * SmartobjectCustomtag constructor.
+	 */
+	public function __construct()
+	{
+		$this->quickInitVar('customtagid', XOBJ_DTYPE_INT, true);
+		$this->quickInitVar('name', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CUSTOMTAG_NAME, _CO_SOBJECT_CUSTOMTAG_NAME_DSC);
+		$this->quickInitVar('description', XOBJ_DTYPE_TXTAREA, false, _CO_SOBJECT_CUSTOMTAG_DESCRIPTION, _CO_SOBJECT_CUSTOMTAG_DESCRIPTION_DSC);
+		$this->quickInitVar('content', XOBJ_DTYPE_TXTAREA, true, _CO_SOBJECT_CUSTOMTAG_CONTENT, _CO_SOBJECT_CUSTOMTAG_CONTENT_DSC);
+		$this->quickInitVar('language', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CUSTOMTAG_LANGUAGE, _CO_SOBJECT_CUSTOMTAG_LANGUAGE_DSC);
+
+		$this->initNonPersistableVar('dohtml', XOBJ_DTYPE_INT, 'class', 'dohtml', '', true);
+		$this->initNonPersistableVar('doimage', XOBJ_DTYPE_INT, 'class', 'doimage', '', true);
+		$this->initNonPersistableVar('doxcode', XOBJ_DTYPE_INT, 'class', 'doxcode', '', true);
+		$this->initNonPersistableVar('dosmiley', XOBJ_DTYPE_INT, 'class', 'dosmiley', '', true);
+
+		$this->setControl('content', array(
+			'name'        => 'textarea',
+			'form_editor' => 'textarea',
+			'form_rows'   => 25
+		));
+		$this->setControl('language', array(
+			'name' => 'language',
+			'all'  => true
+		));
+	}
+
+	/**
+	 * @param  string $key
+	 * @param  string $format
+	 * @return mixed
+	 */
+	public function getVar($key, $format = 's')
+	{
+		if ($format === 's' && in_array($key, array())) {
+			//            return call_user_func(array($this, $key));
+			return $this->{$key}();
+		}
+
+		return parent::getVar($key, $format);
+	}
+
+	/**
+	 * @return bool|mixed
+	 */
+	public function render()
+	{
+		if (!$this->content) {
+			$ret           = $this->getVar('content');
+			$this->content = $ret;
+		}
+
+		return $this->content;
+	}
+
+	/**
+	 * @return bool|mixed|string
+	 */
+	public function renderWithPhp()
+	{
+		if (!$this->content) {
+			$ret           = $this->getVar('content');
+			$this->content = $ret;
+		} else {
+			$ret = $this->content;
+		}
+
+		// check for PHP if we are not on admin side
+		if (!defined('XOOPS_CPFUNC_LOADED') && !(strpos($ret, '[php]') === false)) {
+			$ret = str_replace('[php]', '', $ret);
+			// we have PHP code, let's evaluate
+			eval($ret);
+
+			return '';
+		}
+
+		return $this->content;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getXoopsCode()
+	{
+		$ret = '[customtag]' . $this->getVar('tag', 'n') . '[/customtag]';
+
+		return $ret;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getCloneLink()
+	{
+		$ret = '<a href="' .
+			   SMARTOBJECT_URL .
+			   'admin/customtag.php?op=clone&customtagid=' .
+			   $this->id() .
+			   '"><img src="' .
+			   SMARTOBJECT_IMAGES_ACTIONS_URL .
+			   'editcopy.png" style="vertical-align: middle;" alt="' .
+			   _CO_SOBJECT_CUSTOMTAG_CLONE .
+			   '" title="' .
+			   _CO_SOBJECT_CUSTOMTAG_CLONE .
+			   '" /></a>';
+
+		return $ret;
+	}
+
+	/**
+	 * @param $var
+	 * @return bool
+	 */
+	public function emptyString($var)
+	{
+		return (strlen($var) > 0);
+	}
+
+	/**
+	 * @return mixed|string
+	 */
+	public function generateTag()
+	{
+		$title = rawurlencode(strtolower($this->getVar('description', 'e')));
+		$title = xoops_substr($title, 0, 10, '');
+		// Transformation des ponctuations
+		$pattern = array(
+			'/%09/', // Tab
+			'/%20/', // Space
+			'/%21/', // !
+			'/%22/', // "
+			'/%23/', // #
+			'/%25/', // %
+			'/%26/', // &
+			'/%27/', // '
+			'/%28/', // (
+			'/%29/', // )
+			'/%2C/', // ,
+			'/%2F/', // /
+			'/%3A/', // :
+			'/%3B/', // ;
+			'/%3C/', // <
+			'/%3D/', // =
+			'/%3E/', // >
+			'/%3F/', // ?
+			'/%40/', // @
+			'/%5B/', // [
+			'/%5C/', // \
+			'/%5D/', // ]
+			'/%5E/', // ^
+			'/%7B/', // {
+			'/%7C/', // |
+			'/%7D/', // }
+			'/%7E/', // ~
+			"/\./" // .
+		);
+		$rep_pat = array('-', '-', '-', '-', '-', '-100', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-at-', '-', '-', '-', '-', '-', '-', '-', '-', '-');
+		$title   = preg_replace($pattern, $rep_pat, $title);
+
+		// Transformation des caract�res accentu�s
+		$pattern = array(
+			'/%B0/', // °
+			'/%E8/', // è
+			'/%E9/', // é
+			'/%EA/', // ê
+			'/%EB/', // ë
+			'/%E7/', // ç
+			'/%E0/', // à
+			'/%E2/', // â
+			'/%E4/', // ä
+			'/%EE/', // î
+			'/%EF/', // ï
+			'/%F9/', // ù
+			'/%FC/', // ü
+			'/%FB/', // û
+			'/%F4/', // ô
+			'/%F6/', // ö
+		);
+		$rep_pat = array('-', 'e', 'e', 'e', 'e', 'c', 'a', 'a', 'a', 'i', 'i', 'u', 'u', 'u', 'o', 'o');
+		$title   = preg_replace($pattern, $rep_pat, $title);
+
+		$tableau = explode('-', $title); // Transforme la chaine de caract�res en tableau
+		$tableau = array_filter($tableau, array($this, 'emptyString')); // Supprime les chaines vides du tableau
+		$title   = implode('-', $tableau); // Transforme un tableau en chaine de caract�res s�par� par un tiret
+
+		$title .= time();
+		$title = md5($title);
+
+		return $title;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getCustomtagName()
+	{
+		$ret = $this->getVar('name');
+
+		return $ret;
+	}
 }
 
 /**
@@ -245,48 +245,48 @@ 
  */
 class SmartobjectCustomtagHandler extends SmartPersistableObjectHandler
 {
-    public $objects = false;
-
-    /**
-     * SmartobjectCustomtagHandler constructor.
-     * @param XoopsDatabase $db
-     */
-    public function __construct(XoopsDatabase $db)
-    {
-        parent::__construct($db, 'customtag', 'customtagid', 'name', 'description', 'smartobject');
-        $this->addPermission('view', _CO_SOBJECT_CUSTOMTAG_PERMISSION_VIEW, _CO_SOBJECT_CUSTOMTAG_PERMISSION_VIEW_DSC);
-    }
-
-    /**
-     * @return array|bool
-     */
-    public function getCustomtagsByName()
-    {
-        if (!$this->objects) {
-            global $xoopsConfig;
-
-            $ret = array();
-
-            $criteria = new CriteriaCompo();
-
-            $criteria_language = new CriteriaCompo();
-            $criteria_language->add(new Criteria('language', $xoopsConfig['language']));
-            $criteria_language->add(new Criteria('language', 'all'), 'OR');
-            $criteria->add($criteria_language);
-
-            $smartobjectPermissionsHandler = new SmartObjectPermissionHandler($this);
-            $granted_ids                   = $smartobjectPermissionsHandler->getGrantedItems('view');
-
-            if ($granted_ids && count($granted_ids) > 0) {
-                $criteria->add(new Criteria('customtagid', '(' . implode(', ', $granted_ids) . ')', 'IN'));
-                $customtagsObj = $this->getObjects($criteria, true);
-                foreach ($customtagsObj as $customtagObj) {
-                    $ret[$customtagObj->getVar('name')] = $customtagObj;
-                }
-            }
-            $this->objects = $ret;
-        }
-
-        return $this->objects;
-    }
+	public $objects = false;
+
+	/**
+	 * SmartobjectCustomtagHandler constructor.
+	 * @param XoopsDatabase $db
+	 */
+	public function __construct(XoopsDatabase $db)
+	{
+		parent::__construct($db, 'customtag', 'customtagid', 'name', 'description', 'smartobject');
+		$this->addPermission('view', _CO_SOBJECT_CUSTOMTAG_PERMISSION_VIEW, _CO_SOBJECT_CUSTOMTAG_PERMISSION_VIEW_DSC);
+	}
+
+	/**
+	 * @return array|bool
+	 */
+	public function getCustomtagsByName()
+	{
+		if (!$this->objects) {
+			global $xoopsConfig;
+
+			$ret = array();
+
+			$criteria = new CriteriaCompo();
+
+			$criteria_language = new CriteriaCompo();
+			$criteria_language->add(new Criteria('language', $xoopsConfig['language']));
+			$criteria_language->add(new Criteria('language', 'all'), 'OR');
+			$criteria->add($criteria_language);
+
+			$smartobjectPermissionsHandler = new SmartObjectPermissionHandler($this);
+			$granted_ids                   = $smartobjectPermissionsHandler->getGrantedItems('view');
+
+			if ($granted_ids && count($granted_ids) > 0) {
+				$criteria->add(new Criteria('customtagid', '(' . implode(', ', $granted_ids) . ')', 'IN'));
+				$customtagsObj = $this->getObjects($criteria, true);
+				foreach ($customtagsObj as $customtagObj) {
+					$ret[$customtagObj->getVar('name')] = $customtagObj;
+				}
+			}
+			$this->objects = $ret;
+		}
+
+		return $this->objects;
+	}
 }

class/smartobjectabout.php

Indentation +160 added lines, -160 removed lines

@@ -19,164 +19,164 @@
  */
 class SmartobjectAbout
 {
-    public $_lang_aboutTitle;
-    public $_lang_author_info;
-    public $_lang_developer_lead;
-    public $_lang_developer_contributor;
-    public $_lang_developer_website;
-    public $_lang_developer_email;
-    public $_lang_developer_credits;
-    public $_lang_module_info;
-    public $_lang_module_status;
-    public $_lang_module_release_date;
-    public $_lang_module_demo;
-    public $_lang_module_support;
-    public $_lang_module_bug;
-    public $_lang_module_submit_bug;
-    public $_lang_module_feature;
-    public $_lang_module_submit_feature;
-    public $_lang_module_disclaimer;
-    public $_lang_author_word;
-    public $_lang_version_history;
-    public $_lang_by;
-    public $_tpl;
-
-    /**
-     * SmartobjectAbout constructor.
-     * @param string $aboutTitle
-     */
-    public function __construct($aboutTitle = 'About')
-    {
-        global $xoopsModule, $xoopsConfig;
-
-        $fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
-        if (file_exists($fileName)) {
-            include_once $fileName;
-        } else {
-            include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
-        }
-        $this->_aboutTitle = $aboutTitle;
-
-        $this->_lang_developer_contributor = _CO_SOBJECT_DEVELOPER_CONTRIBUTOR;
-        $this->_lang_developer_website     = _CO_SOBJECT_DEVELOPER_WEBSITE;
-        $this->_lang_developer_email       = _CO_SOBJECT_DEVELOPER_EMAIL;
-        $this->_lang_developer_credits     = _CO_SOBJECT_DEVELOPER_CREDITS;
-        $this->_lang_module_info           = _CO_SOBJECT_MODULE_INFO;
-        $this->_lang_module_status         = _CO_SOBJECT_MODULE_STATUS;
-        $this->_lang_module_release_date   = _CO_SOBJECT_MODULE_RELEASE_DATE;
-        $this->_lang_module_demo           = _CO_SOBJECT_MODULE_DEMO;
-        $this->_lang_module_support        = _CO_SOBJECT_MODULE_SUPPORT;
-        $this->_lang_module_bug            = _CO_SOBJECT_MODULE_BUG;
-        $this->_lang_module_submit_bug     = _CO_SOBJECT_MODULE_SUBMIT_BUG;
-        $this->_lang_module_feature        = _CO_SOBJECT_MODULE_FEATURE;
-        $this->_lang_module_submit_feature = _CO_SOBJECT_MODULE_SUBMIT_FEATURE;
-        $this->_lang_module_disclaimer     = _CO_SOBJECT_MODULE_DISCLAIMER;
-        $this->_lang_author_word           = _CO_SOBJECT_AUTHOR_WORD;
-        $this->_lang_version_history       = _CO_SOBJECT_VERSION_HISTORY;
-    }
-
-    /**
-     * @param $value
-     * @return mixed
-     */
-    public function sanitize($value)
-    {
-        $myts = MyTextSanitizer::getInstance();
-
-        return $myts->displayTarea($value, 1);
-    }
-
-    public function render()
-    {
-        /**
-         * @todo move the output to a template
-         * @todo make the output XHTML compliant
-         */
-
-        $myts = MyTextSanitizer::getInstance();
-
-        global $xoopsModule;
-
-        smart_xoops_cp_header();
-
-        $moduleHandler = xoops_getHandler('module');
-        $versioninfo   = $moduleHandler->get($xoopsModule->getVar('mid'));
-
-        //smart_adminMenu(-1, $this->_aboutTitle . " " . $versioninfo->getInfo('name'));
-
-        include_once XOOPS_ROOT_PATH . '/class/template.php';
-
-        // ---
-        // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
-        //      $this->_tpl =& new XoopsTpl();
-        $this->_tpl = new XoopsTpl();
-        // ---
-
-        $this->_tpl->assign('module_url', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/');
-        $this->_tpl->assign('module_image', $versioninfo->getInfo('image'));
-        $this->_tpl->assign('module_name', $versioninfo->getInfo('name'));
-        $this->_tpl->assign('module_version', $versioninfo->getInfo('version'));
-        $this->_tpl->assign('module_status_version', $versioninfo->getInfo('status_version'));
-
-        // Left headings...
-        if ($versioninfo->getInfo('author_realname') !== '') {
-            $author_name = $versioninfo->getInfo('author') . ' (' . $versioninfo->getInfo('author_realname') . ')';
-        } else {
-            $author_name = $versioninfo->getInfo('author');
-        }
-        $this->_tpl->assign('module_author_name', $author_name);
-
-        $this->_tpl->assign('module_license', $versioninfo->getInfo('license'));
-
-        $this->_tpl->assign('module_credits', $versioninfo->getInfo('credits'));
-
-        // Developers Information
-        $this->_tpl->assign('module_developer_lead', $versioninfo->getInfo('developer_lead'));
-        $this->_tpl->assign('module_developer_contributor', $versioninfo->getInfo('developer_contributor'));
-        $this->_tpl->assign('module_developer_website_url', $versioninfo->getInfo('developer_website_url'));
-        $this->_tpl->assign('module_developer_website_name', $versioninfo->getInfo('developer_website_name'));
-        $this->_tpl->assign('module_developer_email', $versioninfo->getInfo('developer_email'));
-
-        $people = $versioninfo->getInfo('people');
-        if ($people) {
-            $this->_tpl->assign('module_people_developers', isset($people['developers']) ? array_map(array($this, 'sanitize'), $people['developers']) : false);
-            $this->_tpl->assign('module_people_testers', isset($people['testers']) ? array_map(array($this, 'sanitize'), $people['testers']) : false);
-            $this->_tpl->assign('module_people_translators', isset($people['translators']) ? array_map(array($this, 'sanitize'), $people['translators']) : false);
-            $this->_tpl->assign('module_people_documenters', isset($people['documenters']) ? array_map(array($this, 'sanitize'), $people['documenters']) : false);
-            $this->_tpl->assign('module_people_other', isset($people['other']) ? array_map(array($this, 'sanitize'), $people['other']) : false);
-        }
-        //$this->_tpl->assign('module_developers', $versioninfo->getInfo('developer_email'));
-
-        // Module Development information
-        $this->_tpl->assign('module_date', $versioninfo->getInfo('date'));
-        $this->_tpl->assign('module_status', $versioninfo->getInfo('status'));
-        $this->_tpl->assign('module_demo_site_url', $versioninfo->getInfo('demo_site_url'));
-        $this->_tpl->assign('module_demo_site_name', $versioninfo->getInfo('demo_site_name'));
-        $this->_tpl->assign('module_support_site_url', $versioninfo->getInfo('support_site_url'));
-        $this->_tpl->assign('module_support_site_name', $versioninfo->getInfo('support_site_name'));
-        $this->_tpl->assign('module_submit_bug', $versioninfo->getInfo('submit_bug'));
-        $this->_tpl->assign('module_submit_feature', $versioninfo->getInfo('submit_feature'));
-
-        // Warning
-        $this->_tpl->assign('module_warning', $this->sanitize($versioninfo->getInfo('warning')));
-
-        // Author's note
-        $this->_tpl->assign('module_author_word', $versioninfo->getInfo('author_word'));
-
-        // For changelog thanks to 3Dev
-        global $xoopsModule;
-        $filename = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/changelog.txt';
-        if (is_file($filename)) {
-            $filesize = filesize($filename);
-            $handle   = fopen($filename, 'r');
-            $this->_tpl->assign('module_version_history', $myts->displayTarea(fread($handle, $filesize), true));
-            fclose($handle);
-        }
-
-        $this->_tpl->display('db:smartobject_about.tpl');
-
-        smart_modFooter();
-
-        xoops_cp_footer();
-    }
+	public $_lang_aboutTitle;
+	public $_lang_author_info;
+	public $_lang_developer_lead;
+	public $_lang_developer_contributor;
+	public $_lang_developer_website;
+	public $_lang_developer_email;
+	public $_lang_developer_credits;
+	public $_lang_module_info;
+	public $_lang_module_status;
+	public $_lang_module_release_date;
+	public $_lang_module_demo;
+	public $_lang_module_support;
+	public $_lang_module_bug;
+	public $_lang_module_submit_bug;
+	public $_lang_module_feature;
+	public $_lang_module_submit_feature;
+	public $_lang_module_disclaimer;
+	public $_lang_author_word;
+	public $_lang_version_history;
+	public $_lang_by;
+	public $_tpl;
+
+	/**
+	 * SmartobjectAbout constructor.
+	 * @param string $aboutTitle
+	 */
+	public function __construct($aboutTitle = 'About')
+	{
+		global $xoopsModule, $xoopsConfig;
+
+		$fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
+		if (file_exists($fileName)) {
+			include_once $fileName;
+		} else {
+			include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
+		}
+		$this->_aboutTitle = $aboutTitle;
+
+		$this->_lang_developer_contributor = _CO_SOBJECT_DEVELOPER_CONTRIBUTOR;
+		$this->_lang_developer_website     = _CO_SOBJECT_DEVELOPER_WEBSITE;
+		$this->_lang_developer_email       = _CO_SOBJECT_DEVELOPER_EMAIL;
+		$this->_lang_developer_credits     = _CO_SOBJECT_DEVELOPER_CREDITS;
+		$this->_lang_module_info           = _CO_SOBJECT_MODULE_INFO;
+		$this->_lang_module_status         = _CO_SOBJECT_MODULE_STATUS;
+		$this->_lang_module_release_date   = _CO_SOBJECT_MODULE_RELEASE_DATE;
+		$this->_lang_module_demo           = _CO_SOBJECT_MODULE_DEMO;
+		$this->_lang_module_support        = _CO_SOBJECT_MODULE_SUPPORT;
+		$this->_lang_module_bug            = _CO_SOBJECT_MODULE_BUG;
+		$this->_lang_module_submit_bug     = _CO_SOBJECT_MODULE_SUBMIT_BUG;
+		$this->_lang_module_feature        = _CO_SOBJECT_MODULE_FEATURE;
+		$this->_lang_module_submit_feature = _CO_SOBJECT_MODULE_SUBMIT_FEATURE;
+		$this->_lang_module_disclaimer     = _CO_SOBJECT_MODULE_DISCLAIMER;
+		$this->_lang_author_word           = _CO_SOBJECT_AUTHOR_WORD;
+		$this->_lang_version_history       = _CO_SOBJECT_VERSION_HISTORY;
+	}
+
+	/**
+	 * @param $value
+	 * @return mixed
+	 */
+	public function sanitize($value)
+	{
+		$myts = MyTextSanitizer::getInstance();
+
+		return $myts->displayTarea($value, 1);
+	}
+
+	public function render()
+	{
+		/**
+		 * @todo move the output to a template
+		 * @todo make the output XHTML compliant
+		 */
+
+		$myts = MyTextSanitizer::getInstance();
+
+		global $xoopsModule;
+
+		smart_xoops_cp_header();
+
+		$moduleHandler = xoops_getHandler('module');
+		$versioninfo   = $moduleHandler->get($xoopsModule->getVar('mid'));
+
+		//smart_adminMenu(-1, $this->_aboutTitle . " " . $versioninfo->getInfo('name'));
+
+		include_once XOOPS_ROOT_PATH . '/class/template.php';
+
+		// ---
+		// 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
+		//      $this->_tpl =& new XoopsTpl();
+		$this->_tpl = new XoopsTpl();
+		// ---
+
+		$this->_tpl->assign('module_url', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/');
+		$this->_tpl->assign('module_image', $versioninfo->getInfo('image'));
+		$this->_tpl->assign('module_name', $versioninfo->getInfo('name'));
+		$this->_tpl->assign('module_version', $versioninfo->getInfo('version'));
+		$this->_tpl->assign('module_status_version', $versioninfo->getInfo('status_version'));
+
+		// Left headings...
+		if ($versioninfo->getInfo('author_realname') !== '') {
+			$author_name = $versioninfo->getInfo('author') . ' (' . $versioninfo->getInfo('author_realname') . ')';
+		} else {
+			$author_name = $versioninfo->getInfo('author');
+		}
+		$this->_tpl->assign('module_author_name', $author_name);
+
+		$this->_tpl->assign('module_license', $versioninfo->getInfo('license'));
+
+		$this->_tpl->assign('module_credits', $versioninfo->getInfo('credits'));
+
+		// Developers Information
+		$this->_tpl->assign('module_developer_lead', $versioninfo->getInfo('developer_lead'));
+		$this->_tpl->assign('module_developer_contributor', $versioninfo->getInfo('developer_contributor'));
+		$this->_tpl->assign('module_developer_website_url', $versioninfo->getInfo('developer_website_url'));
+		$this->_tpl->assign('module_developer_website_name', $versioninfo->getInfo('developer_website_name'));
+		$this->_tpl->assign('module_developer_email', $versioninfo->getInfo('developer_email'));
+
+		$people = $versioninfo->getInfo('people');
+		if ($people) {
+			$this->_tpl->assign('module_people_developers', isset($people['developers']) ? array_map(array($this, 'sanitize'), $people['developers']) : false);
+			$this->_tpl->assign('module_people_testers', isset($people['testers']) ? array_map(array($this, 'sanitize'), $people['testers']) : false);
+			$this->_tpl->assign('module_people_translators', isset($people['translators']) ? array_map(array($this, 'sanitize'), $people['translators']) : false);
+			$this->_tpl->assign('module_people_documenters', isset($people['documenters']) ? array_map(array($this, 'sanitize'), $people['documenters']) : false);
+			$this->_tpl->assign('module_people_other', isset($people['other']) ? array_map(array($this, 'sanitize'), $people['other']) : false);
+		}
+		//$this->_tpl->assign('module_developers', $versioninfo->getInfo('developer_email'));
+
+		// Module Development information
+		$this->_tpl->assign('module_date', $versioninfo->getInfo('date'));
+		$this->_tpl->assign('module_status', $versioninfo->getInfo('status'));
+		$this->_tpl->assign('module_demo_site_url', $versioninfo->getInfo('demo_site_url'));
+		$this->_tpl->assign('module_demo_site_name', $versioninfo->getInfo('demo_site_name'));
+		$this->_tpl->assign('module_support_site_url', $versioninfo->getInfo('support_site_url'));
+		$this->_tpl->assign('module_support_site_name', $versioninfo->getInfo('support_site_name'));
+		$this->_tpl->assign('module_submit_bug', $versioninfo->getInfo('submit_bug'));
+		$this->_tpl->assign('module_submit_feature', $versioninfo->getInfo('submit_feature'));
+
+		// Warning
+		$this->_tpl->assign('module_warning', $this->sanitize($versioninfo->getInfo('warning')));
+
+		// Author's note
+		$this->_tpl->assign('module_author_word', $versioninfo->getInfo('author_word'));
+
+		// For changelog thanks to 3Dev
+		global $xoopsModule;
+		$filename = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/changelog.txt';
+		if (is_file($filename)) {
+			$filesize = filesize($filename);
+			$handle   = fopen($filename, 'r');
+			$this->_tpl->assign('module_version_history', $myts->displayTarea(fread($handle, $filesize), true));
+			fclose($handle);
+		}
+
+		$this->_tpl->display('db:smartobject_about.tpl');
+
+		smart_modFooter();
+
+		xoops_cp_footer();
+	}
 }