mambax7 / references

class/PersistableObjectHandler.php

Indentation +809 added lines, -809 removed lines

@@ -22,49 +22,49 @@ 
  */
 
 if (!defined('XOOPS_ROOT_PATH')) {
-    die('XOOPS root path not defined');
+	die('XOOPS root path not defined');
 }
 
 class references_Object extends XoopsObject
 {
-    public function toArray($format = 's')
-    {
-        $ret = array();
-        foreach ($this->vars as $k => $v) {
-            $ret[$k] = $this->getVar($k, $format);
-        }
-
-        return $ret;
-    }
-
-    // TODO: Rajouter une méthode intsert() et delete()
-
-    /**
-     * Permet de valoriser un champ de la table comme si c'était une propriété de la classe
-     *
-     * @example $enregistrement->nom_du_champ = 'ma chaine'
-     *
-     * @param string $key   Le nom du champ à traiter
-     * @param mixed  $value La valeur à lui attribuer
-     * @return void
-     */
-    public function __set($key, $value)
-    {
-        return $this->setVar($key, $value);
-    }
-
-    /**
-     * Permet d'accéder aux champs de la table comme à des propriétés de la classe
-     *
-     * @example echo $enregistrement->nom_du_champ;
-     *
-     * @param string $key Le nom du champ que l'on souhaite récupérer
-     * @return mixed
-     */
-    public function __get($key)
-    {
-        return $this->getVar($key);
-    }
+	public function toArray($format = 's')
+	{
+		$ret = array();
+		foreach ($this->vars as $k => $v) {
+			$ret[$k] = $this->getVar($k, $format);
+		}
+
+		return $ret;
+	}
+
+	// TODO: Rajouter une méthode intsert() et delete()
+
+	/**
+	 * Permet de valoriser un champ de la table comme si c'était une propriété de la classe
+	 *
+	 * @example $enregistrement->nom_du_champ = 'ma chaine'
+	 *
+	 * @param string $key   Le nom du champ à traiter
+	 * @param mixed  $value La valeur à lui attribuer
+	 * @return void
+	 */
+	public function __set($key, $value)
+	{
+		return $this->setVar($key, $value);
+	}
+
+	/**
+	 * Permet d'accéder aux champs de la table comme à des propriétés de la classe
+	 *
+	 * @example echo $enregistrement->nom_du_champ;
+	 *
+	 * @param string $key Le nom du champ que l'on souhaite récupérer
+	 * @return mixed
+	 */
+	public function __get($key)
+	{
+		return $this->getVar($key);
+	}
 }
 
 /**
@@ -75,778 +75,778 @@ 
  */
 class references_XoopsPersistableObjectHandler extends XoopsObjectHandler
 {
-    /**#@+
+	/**#@+
      * Information about the class, the handler is managing
      *
      * @var string
      */
-    public    $table;
-    public    $keyName;
-    public    $className;
-    public    $identifierName;
-    protected $cacheOptions = array();
-    /**#@-*/
-
-    /**
-     * Constructor - called from child classes
-     * @param object $db           {@link XoopsDatabase} object
-     * @param string $tablename    Name of database table
-     * @param string $classname    Name of Class, this handler is managing
-     * @param string $keyname      Name of the property, holding the key
-     * @param string $idenfierName Name of the property, holding the label
-     * @param array  $cacheOptions Optional, options for the cache
-     *
-     */
-    public function __construct(&$db, $tablename, $classname, $keyname, $idenfierName = '', $cacheOptions = null)
-    {
-        parent::__construct($db);
-        $this->table     = $db->prefix($tablename);
-        $this->keyName   = $keyname;
-        $this->className = $classname;
-        if (trim($idenfierName) != '') {
-            $this->identifierName = $idenfierName;
-        }
-        // To diable cache, add this line after the first one : 'caching' => false,
-        if (is_null($cacheOptions)) {
-            $this->setCachingOptions(array('cacheDir' => REFERENCES_CACHE_PATH, 'lifeTime' => null, 'automaticSerialization' => true, 'fileNameProtection' => false));
-        } else {
-            $this->setCachingOptions($cacheOptions);
-        }
-    }
-
-    public function setCachingOptions($cacheOptions)
-    {
-        $this->cacheOptions = $cacheOptions;
-    }
-
-    /**
-     * Generates a unique ID for a Sql Query
-     *
-     * @param  string  $query The SQL query for which we want a unidque ID
-     * @param  integer $start Which record to start at
-     * @param  integer $limit Max number of objects to fetch
-     * @return string  An MD5 of the query
-     */
-    protected function _getIdForCache($query, $start, $limit)
-    {
-        $id = md5($query . '-' . (string)$start . '-' . (string)$limit);
-
-        return $id;
-    }
-
-    /**
-     * create a new object
-     *
-     * @param bool $isNew Flag the new objects as "new"?
-     *
-     * @return object
-     */
-    public function &create($isNew = true)
-    {
-        $obj = new $this->className();
-        if ($isNew === true) {
-            $obj->setNew();
-        }
-
-        return $obj;
-    }
-
-    /**
-     * retrieve an object
-     *
-     * @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 object, FALSE if failed
-     */
-    public function &get($id, $as_object = true)
-    {
-        if (is_array($this->keyName)) {
-            $criteria = new CriteriaCompo();
-            $vnb      = count($this->keyName);
-            for ($i = 0; $i < $vnb; ++$i) {
-                $criteria->add(new Criteria($this->keyName[$i], (int)$id[$i]));
-            }
-        } else {
-            $criteria = new Criteria($this->keyName, (int)$id);
-        }
-        $criteria->setLimit(1);
-        $obj_array =& $this->getObjects($criteria, false, $as_object);
-        if (count($obj_array) != 1) {
-            $ret = null;
-        } else {
-            $ret =& $obj_array[0];
-        }
-
-        return $ret;
-    }
-
-    /**
-     * retrieve objects from the database
-     *
-     * @param null|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 string               $fields
-     * @param bool                 $autoSort
-     * @return array
-     */
-    public function &getObjects(CriteriaElement $criteria = null, $id_as_key = false, $as_object = true, $fields = '*', $autoSort = true)
-    {
-        require_once __DIR__ . '/lite.php';
-        $ret   = array();
-        $limit = $start = 0;
-        $sql   = 'SELECT ' . $fields . ' FROM ' . $this->table;
-        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();
-            } elseif ($this->identifierName != '' && $autoSort) {
-                $sql .= ' ORDER BY ' . $this->identifierName;
-            }
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-        $Cache_Lite = new references_Cache_Lite($this->cacheOptions);
-        $id         = $this->_getIdForCache($sql, $start, $limit);
-        $cacheData  = $Cache_Lite->get($id);
-        if ($cacheData === false) {
-            $result = $this->db->query($sql, $limit, $start);
-            if (!$result) {
-                return $ret;
-            }
-            $ret = $this->convertResultSet($result, $id_as_key, $as_object, $fields);
-            $Cache_Lite->save($ret);
-
-            return $ret;
-        } else {
-            return $cacheData;
-        }
-    }
-
-    /**
-     * Convert a database resultset to a returnable array
-     *
-     * @param object  $result    database resultset
-     * @param boolean $id_as_key - should NOT be used with joint keys
-     * @param boolean $as_object
-     * @param string  $fields    Requested fields from the query
-     *
-     * @return array
-     */
-    protected function convertResultSet($result, $id_as_key = false, $as_object = true, $fields = '*')
-    {
-        $ret = array();
-        while ($myrow = $this->db->fetchArray($result)) {
-            $obj =& $this->create(false);
-            $obj->assignVars($myrow);
-            if (!$id_as_key) {
-                if ($as_object) {
-                    $ret[] =& $obj;
-                } else {
-                    $row     = array();
-                    $vars    = $obj->getVars();
-                    $tbl_tmp = array_keys($vars);
-                    foreach ($tbl_tmp as $i) {
-                        $row[$i] = $obj->getVar($i);
-                    }
-                    $ret[] = $row;
-                }
-            } else {
-                if ($as_object) {
-                    if ($fields === '*') {
-                        $ret[$myrow[$this->keyName]] =& $obj;
-                    } else {
-                        $ret[] =& $obj;
-                    }
-                } else {
-                    $row     = array();
-                    $vars    = $obj->getVars();
-                    $tbl_tmp = array_keys($vars);
-                    foreach ($tbl_tmp as $i) {
-                        $row[$i] = $obj->getVar($i);
-                    }
-                    $ret[$myrow[$this->keyName]] = $row;
-                }
-            }
-            unset($obj);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * get IDs of objects matching a condition
-     *
-     * @param  object $criteria {@link CriteriaElement} to match
-     * @return array  of object IDs
-     */
-    public function getIds($criteria = null)
-    {
-        require_once __DIR__ . '/lite.php';
-        $limit = $start = 0;
-
-        $Cache_Lite = new references_Cache_Lite($this->cacheOptions);
-        $sql        = 'SELECT ' . $this->keyName . ' FROM ' . $this->table;
-        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();
-            } elseif ($this->identifierName != '') {
-                $sql .= ' ORDER BY ' . $this->identifierName;
-            }
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-
-        $id        = $this->_getIdForCache($sql, $start, $limit);
-        $cacheData = $Cache_Lite->get($id);
-        if ($cacheData === false) {
-            $result = $this->db->query($sql, $limit, $start);
-            $ret    = array();
-            while ($myrow = $this->db->fetchArray($result)) {
-                $ret[] = $myrow[$this->keyName];
-            }
-            $Cache_Lite->save($ret);
-
-            return $ret;
-        } else {
-            return $cacheData;
-        }
-    }
-
-    /**
-     * Retrieve a list of objects as arrays - DON'T USE WITH JOINT KEYS
-     *
-     * @param object $criteria {@link CriteriaElement} conditions to be met
-     * @return array
-     */
-    public function getList($criteria = null)
-    {
-        require_once __DIR__ . '/lite.php';
-        $limit      = $start = 0;
-        $Cache_Lite = new references_Cache_Lite($this->cacheOptions);
-
-        $ret = array();
-
-        $sql = 'SELECT ' . $this->keyName;
-        if (!empty($this->identifierName)) {
-            $sql .= ', ' . $this->identifierName;
-        }
-        $sql .= ' FROM ' . $this->table;
-        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();
-            } elseif ($this->identifierName != '') {
-                $sql .= ' ORDER BY ' . $this->identifierName;
-            }
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-
-        $id        = $this->_getIdForCache($sql, $start, $limit);
-        $cacheData = $Cache_Lite->get($id);
-        if ($cacheData === false) {
-            $result = $this->db->query($sql, $limit, $start);
-            if (!$result) {
-                $Cache_Lite->save($ret);
-
-                return $ret;
-            }
-
-            $myts = MyTextSanitizer::getInstance();
-            while ($myrow = $this->db->fetchArray($result)) {
-                //identifiers should be textboxes, so sanitize them like that
-                $ret[$myrow[$this->keyName]] = empty($this->identifierName) ? 1 : $myts->htmlSpecialChars($myrow[$this->identifierName]);
-            }
-            $Cache_Lite->save($ret);
-
-            return $ret;
-        } else {
-            return $cacheData;
-        }
-    }
-
-    /**
-     * Retourne des éléments selon leur ID
-     *
-     * @param array $ids Les ID des éléments à retrouver
-     * @param null  $additionnal
-     * @return array Tableau d'objets
-     */
-    public function getItemsFromIds($ids, $additionnal = null)
-    {
-        $ret = array();
-        if (is_array($ids) && count($ids) > 0) {
-            $criteria = new CriteriaCompo();
-            $criteria->add(new Criteria($this->keyName, '(' . implode(',', $ids) . ')', 'IN'));
-            if (!is_null($additionnal)) {
-                $criteria->add($additionnal);
-            }
-            $ret =& $this->getObjects($criteria, true);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * count objects matching a condition
-     *
-     * @param  object $criteria {@link CriteriaElement} to match
-     * @return int    count of objects
-     */
-    public function getCount($criteria = null)
-    {
-        $field   = '';
-        $groupby = false;
-        $limit   = $start = 0;
-        require_once __DIR__ . '/lite.php';
-
-        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
-            }
-        }
-        $sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table;
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-            if ($criteria->groupby != '') {
-                $sql .= $criteria->getGroupby();
-            }
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-        $Cache_Lite = new references_Cache_Lite($this->cacheOptions);
-        $id         = $this->_getIdForCache($sql, $start, $limit);
-        $cacheData  = $Cache_Lite->get($id);
-        if ($cacheData === false) {
-            $result = $this->db->query($sql, $limit, $start);
-            if (!$result) {
-                $ret = 0;
-                $Cache_Lite->save($ret);
-
-                return $ret;
-            }
-            if ($groupby == false) {
-                list($count) = $this->db->fetchRow($result);
-                $Cache_Lite->save($count);
-
-                return $count;
-            } else {
-                $ret = array();
-                while (list($id, $count) = $this->db->fetchRow($result)) {
-                    $ret[$id] = $count;
-                }
-                $Cache_Lite->save($ret);
-
-                return $ret;
-            }
-        } else {
-            return $cacheData;
-        }
-    }
-
-    /**
-     * Retourne le total d'un champ
-     *
-     * @param  string $field    Le champ dont on veut calculer le total
-     * @param  object $criteria {@link CriteriaElement} to match
-     * @return integer le total
-     */
-    public function getSum($field, $criteria = null)
-    {
-        $limit = $start = 0;
-        require_once __DIR__ . '/lite.php';
-
-        $sql = 'SELECT Sum(' . $field . ') as cpt FROM ' . $this->table;
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-            if ($criteria->groupby != '') {
-                $sql .= $criteria->getGroupby();
-            }
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-        $Cache_Lite = new references_Cache_Lite($this->cacheOptions);
-        $id         = $this->_getIdForCache($sql, $start, $limit);
-        $cacheData  = $Cache_Lite->get($id);
-        if ($cacheData === false) {
-            $result = $this->db->query($sql, $limit, $start);
-            if (!$result) {
-                $ret = 0;
-                $Cache_Lite->save($ret);
-
-                return $ret;
-            }
-            $row   = $this->db->fetchArray($result);
-            $count = $row['cpt'];
-            $Cache_Lite->save($count);
-
-            return $count;
-        } else {
-            return $cacheData;
-        }
-    }
-
-    /**
-     * 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)
-    {
-        if (is_array($this->keyName)) {
-            $clause = array();
-            $vnb    = count($this->keyName);
-            for ($i = 0; $i < $vnb; ++$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);
-        }
-        // Clear cache
-        $this->forceCacheClean();
-
-        if (!$result) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Quickly insert a record like this $myobject_handler->quickInsert('field1' => field1value, 'field2' => $field2value)
-     *
-     * @param  array $vars  Array containing the fields name and value
-     * @param  bool  $force whether to force the query execution despite security settings
-     * @return bool  @link insert's value
-     */
-    public function quickInsert($vars = null, $force = true)
-    {
-        $object = $this->create(true);
-        $object->setVars($vars);
-        $retval =& $this->insert($object, $force);
-        unset($object);
-
-        // Clear cache
-        $this->forceCacheClean();
-
-        return $retval;
-    }
-
-    /**
-     * 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         $ignoreInsert
-     * @return bool FALSE if failed, TRUE if already present and unchanged or successful
-     */
-
-    public function insert(XoopsObject $obj, $force = false, $checkObject = true, $ignoreInsert = false)
-    {
-        if ($checkObject != false) {
-            if (!is_object($obj)) {
-                trigger_error('Error, not object');
-
-                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->setErrors(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->cleanVars()) {
-            foreach ($obj->getErrors() as $oneerror) {
-                trigger_error($oneerror);
-            }
-
-            return false;
-        }
-        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 (isset($cleanvars['dohtml'])) {        // Modification Herv� to be able to use dohtml
-            unset($cleanvars['dohtml']);
-        }
-        if ($obj->isNew()) {
-            if (!is_array($this->keyName)) {
-                if ($cleanvars[$this->keyName] < 1) {
-                    $cleanvars[$this->keyName] = $this->db->genId($this->table . '_' . $this->keyName . '_seq');
-                }
-            }
-            $ignore = '';
-            if ($ignoreInsert) {
-                $ignore = 'IGNORE';
-            }
-            $sql = "INSERT $ignore INTO " . $this->table . ' (' . implode(',', array_keys($cleanvars)) . ') VALUES (' . implode(',', array_values($cleanvars)) . ')';
-        } else {
-            $sql = 'UPDATE ' . $this->table . ' SET';
-            foreach ($cleanvars 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 = '';
-                $vnb         = count($this->keyName);
-                for ($i = 0; $i < $vnb; ++$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 (false != $force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-
-        // Clear cache
-        $this->forceCacheClean();
-
-        if (!$result) {
-            return false;
-        }
-        if ($obj->isNew() && !is_array($this->keyName)) {
-            $obj->assignVar($this->keyName, $this->db->getInsertId());
-        }
-
-        return true;
-    }
-
-    /**
-     * Change a value for objects with a certain criteria
-     *
-     * @param string $fieldname  Name of the field
-     * @param string $fieldvalue Value to write
-     * @param object $criteria   {@link CriteriaElement}
-     *
-     * @param bool   $force
-     * @return bool
-     */
-    public function updateAll($fieldname, $fieldvalue, $criteria = null, $force = false)
-    {
-        $set_clause = $fieldname . ' = ';
-        if (is_numeric($fieldvalue)) {
-            $set_clause .= $fieldvalue;
-        } elseif (is_array($fieldvalue)) {
-            $set_clause .= $this->db->quoteString(implode(',', $fieldvalue));
-        } else {
-            $set_clause .= $this->db->quoteString($fieldvalue);
-        }
-        $sql = 'UPDATE ' . $this->table . ' SET ' . $set_clause;
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-        }
-        if ($force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-
-        // Clear cache
-        $this->forceCacheClean();
-
-        if (!$result) {
-            return false;
-        }
-
-        return true;
-    }
-
-    //  check if target object is attempting to use duplicated info
-    public function isDuplicated(&$obj, $field = '', $error = '')
-    {
-        if (empty($field)) {
-            return false;
-        }
-        $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria($field, $obj->getVar($field)));
-        //  one more condition if target object exisits in database
-        if (!$obj->isNew()) {
-            $criteria->add(new Criteria($this->_key, $obj->getVar($this->_key), '!='));
-        }
-        if ($this->getCount($criteria)) {
-            $obj->setErrors($error);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * delete all objects meeting the conditions
-     *
-     * @param  object $criteria {@link CriteriaElement} with conditions to meet
-     * @return bool
-     */
-    public function deleteAll($criteria = null)
-    {
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql = 'DELETE FROM ' . $this->table;
-            $sql .= ' ' . $criteria->renderWhere();
-            if (!$this->db->queryF($sql)) {
-                return false;
-            }
-            $rows = $this->db->getAffectedRows();
-
-            // Clear cache
-            $this->forceCacheClean();
-
-            return $rows > 0 ? $rows : true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Compare two objects and returns, in an array, the differences
-     *
-     * @param  XoopsObject $old_object The first object to compare
-     * @param  XoopsObject $new_object The new object
-     * @return array       differences  key = fieldname, value = array('old_value', 'new_value')
-     */
-    public function compareObjects($old_object, $new_object)
-    {
-        $ret       = array();
-        $vars_name = array_keys($old_object->getVars());
-        foreach ($vars_name as $one_var) {
-            if ($old_object->getVar($one_var, 'f') == $new_object->getVar($one_var, 'f')) {
-            } else {
-                $ret[$one_var] = array($old_object->getVar($one_var), $new_object->getVar($one_var));
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Get distincted values of a field in the table
-     *
-     * @param  string $field    Field's name
-     * @param  object $criteria {@link CriteriaElement} conditions to be met
-     * @param  string $format   Format in wich we want the datas
-     * @return array  containing the distinct values
-     */
-    public function getDistincts($field, $criteria = null, $format = 's')
-    {
-        require_once __DIR__ . '/lite.php';
-        $limit = $start = 0;
-        $sql   = 'SELECT ' . $this->keyName . ', ' . $field . ' FROM ' . $this->table;
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-        $sql .= ' GROUP BY ' . $field . ' ORDER BY ' . $field;
-
-        $Cache_Lite = new references_Cache_Lite($this->cacheOptions);
-        $id         = $this->_getIdForCache($sql, $start, $limit);
-        $cacheData  = $Cache_Lite->get($id);
-        if ($cacheData === false) {
-            $result = $this->db->query($sql, $limit, $start);
-            $ret    = array();
-            $obj    = new $this->className();
-            while ($myrow = $this->db->fetchArray($result)) {
-                $obj->setVar($field, $myrow[$field]);
-                $ret[$myrow[$this->keyName]] = $obj->getVar($field, $format);
-            }
-            $Cache_Lite->save($ret);
-
-            return $ret;
-        } else {
-            return $cacheData;
-        }
-    }
-
-    /**
-     * A generic shortcut to getObjects
-     *
-     * @author Herve Thouzard - Instant Zero
-     *
-     * @param  integer $start   Starting position
-     * @param  integer $limit   Maximum count of elements to return
-     * @param  string  $sort    Field to use for the sort
-     * @param  string  $order   Sort order
-     * @param  boolean $idAsKey Do we have to return an array whoses keys are the record's ID ?
-     * @return array   Array of current objects
-     */
-    public function getItems($start = 0, $limit = 0, $sort = '', $order = 'ASC', $idAsKey = true)
-    {
-        if (trim($order) == '') {
-            if (isset($this->identifierName) && trim($this->identifierName) != '') {
-                $order = $this->identifierName;
-            } else {
-                $order = $this->keyName;
-            }
-        }
-        $items   = array();
-        $critere = new Criteria($this->keyName, 0, '<>');
-        $critere->setLimit($limit);
-        $critere->setStart($start);
-        $critere->setSort($sort);
-        $critere->setOrder($order);
-        $items =& $this->getObjects($critere, $idAsKey);
-
-        return $items;
-    }
-
-    /**
-     * Forces the cache to be cleaned
-     */
-    public function forceCacheClean()
-    {
-        require_once __DIR__ . '/lite.php';
-        $Cache_Lite = new references_Cache_Lite($this->cacheOptions);
-        $Cache_Lite->clean();
-    }
+	public    $table;
+	public    $keyName;
+	public    $className;
+	public    $identifierName;
+	protected $cacheOptions = array();
+	/**#@-*/
+
+	/**
+	 * Constructor - called from child classes
+	 * @param object $db           {@link XoopsDatabase} object
+	 * @param string $tablename    Name of database table
+	 * @param string $classname    Name of Class, this handler is managing
+	 * @param string $keyname      Name of the property, holding the key
+	 * @param string $idenfierName Name of the property, holding the label
+	 * @param array  $cacheOptions Optional, options for the cache
+	 *
+	 */
+	public function __construct(&$db, $tablename, $classname, $keyname, $idenfierName = '', $cacheOptions = null)
+	{
+		parent::__construct($db);
+		$this->table     = $db->prefix($tablename);
+		$this->keyName   = $keyname;
+		$this->className = $classname;
+		if (trim($idenfierName) != '') {
+			$this->identifierName = $idenfierName;
+		}
+		// To diable cache, add this line after the first one : 'caching' => false,
+		if (is_null($cacheOptions)) {
+			$this->setCachingOptions(array('cacheDir' => REFERENCES_CACHE_PATH, 'lifeTime' => null, 'automaticSerialization' => true, 'fileNameProtection' => false));
+		} else {
+			$this->setCachingOptions($cacheOptions);
+		}
+	}
+
+	public function setCachingOptions($cacheOptions)
+	{
+		$this->cacheOptions = $cacheOptions;
+	}
+
+	/**
+	 * Generates a unique ID for a Sql Query
+	 *
+	 * @param  string  $query The SQL query for which we want a unidque ID
+	 * @param  integer $start Which record to start at
+	 * @param  integer $limit Max number of objects to fetch
+	 * @return string  An MD5 of the query
+	 */
+	protected function _getIdForCache($query, $start, $limit)
+	{
+		$id = md5($query . '-' . (string)$start . '-' . (string)$limit);
+
+		return $id;
+	}
+
+	/**
+	 * create a new object
+	 *
+	 * @param bool $isNew Flag the new objects as "new"?
+	 *
+	 * @return object
+	 */
+	public function &create($isNew = true)
+	{
+		$obj = new $this->className();
+		if ($isNew === true) {
+			$obj->setNew();
+		}
+
+		return $obj;
+	}
+
+	/**
+	 * retrieve an object
+	 *
+	 * @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 object, FALSE if failed
+	 */
+	public function &get($id, $as_object = true)
+	{
+		if (is_array($this->keyName)) {
+			$criteria = new CriteriaCompo();
+			$vnb      = count($this->keyName);
+			for ($i = 0; $i < $vnb; ++$i) {
+				$criteria->add(new Criteria($this->keyName[$i], (int)$id[$i]));
+			}
+		} else {
+			$criteria = new Criteria($this->keyName, (int)$id);
+		}
+		$criteria->setLimit(1);
+		$obj_array =& $this->getObjects($criteria, false, $as_object);
+		if (count($obj_array) != 1) {
+			$ret = null;
+		} else {
+			$ret =& $obj_array[0];
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * retrieve objects from the database
+	 *
+	 * @param null|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 string               $fields
+	 * @param bool                 $autoSort
+	 * @return array
+	 */
+	public function &getObjects(CriteriaElement $criteria = null, $id_as_key = false, $as_object = true, $fields = '*', $autoSort = true)
+	{
+		require_once __DIR__ . '/lite.php';
+		$ret   = array();
+		$limit = $start = 0;
+		$sql   = 'SELECT ' . $fields . ' FROM ' . $this->table;
+		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();
+			} elseif ($this->identifierName != '' && $autoSort) {
+				$sql .= ' ORDER BY ' . $this->identifierName;
+			}
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+		$Cache_Lite = new references_Cache_Lite($this->cacheOptions);
+		$id         = $this->_getIdForCache($sql, $start, $limit);
+		$cacheData  = $Cache_Lite->get($id);
+		if ($cacheData === false) {
+			$result = $this->db->query($sql, $limit, $start);
+			if (!$result) {
+				return $ret;
+			}
+			$ret = $this->convertResultSet($result, $id_as_key, $as_object, $fields);
+			$Cache_Lite->save($ret);
+
+			return $ret;
+		} else {
+			return $cacheData;
+		}
+	}
+
+	/**
+	 * Convert a database resultset to a returnable array
+	 *
+	 * @param object  $result    database resultset
+	 * @param boolean $id_as_key - should NOT be used with joint keys
+	 * @param boolean $as_object
+	 * @param string  $fields    Requested fields from the query
+	 *
+	 * @return array
+	 */
+	protected function convertResultSet($result, $id_as_key = false, $as_object = true, $fields = '*')
+	{
+		$ret = array();
+		while ($myrow = $this->db->fetchArray($result)) {
+			$obj =& $this->create(false);
+			$obj->assignVars($myrow);
+			if (!$id_as_key) {
+				if ($as_object) {
+					$ret[] =& $obj;
+				} else {
+					$row     = array();
+					$vars    = $obj->getVars();
+					$tbl_tmp = array_keys($vars);
+					foreach ($tbl_tmp as $i) {
+						$row[$i] = $obj->getVar($i);
+					}
+					$ret[] = $row;
+				}
+			} else {
+				if ($as_object) {
+					if ($fields === '*') {
+						$ret[$myrow[$this->keyName]] =& $obj;
+					} else {
+						$ret[] =& $obj;
+					}
+				} else {
+					$row     = array();
+					$vars    = $obj->getVars();
+					$tbl_tmp = array_keys($vars);
+					foreach ($tbl_tmp as $i) {
+						$row[$i] = $obj->getVar($i);
+					}
+					$ret[$myrow[$this->keyName]] = $row;
+				}
+			}
+			unset($obj);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * get IDs of objects matching a condition
+	 *
+	 * @param  object $criteria {@link CriteriaElement} to match
+	 * @return array  of object IDs
+	 */
+	public function getIds($criteria = null)
+	{
+		require_once __DIR__ . '/lite.php';
+		$limit = $start = 0;
+
+		$Cache_Lite = new references_Cache_Lite($this->cacheOptions);
+		$sql        = 'SELECT ' . $this->keyName . ' FROM ' . $this->table;
+		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();
+			} elseif ($this->identifierName != '') {
+				$sql .= ' ORDER BY ' . $this->identifierName;
+			}
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+
+		$id        = $this->_getIdForCache($sql, $start, $limit);
+		$cacheData = $Cache_Lite->get($id);
+		if ($cacheData === false) {
+			$result = $this->db->query($sql, $limit, $start);
+			$ret    = array();
+			while ($myrow = $this->db->fetchArray($result)) {
+				$ret[] = $myrow[$this->keyName];
+			}
+			$Cache_Lite->save($ret);
+
+			return $ret;
+		} else {
+			return $cacheData;
+		}
+	}
+
+	/**
+	 * Retrieve a list of objects as arrays - DON'T USE WITH JOINT KEYS
+	 *
+	 * @param object $criteria {@link CriteriaElement} conditions to be met
+	 * @return array
+	 */
+	public function getList($criteria = null)
+	{
+		require_once __DIR__ . '/lite.php';
+		$limit      = $start = 0;
+		$Cache_Lite = new references_Cache_Lite($this->cacheOptions);
+
+		$ret = array();
+
+		$sql = 'SELECT ' . $this->keyName;
+		if (!empty($this->identifierName)) {
+			$sql .= ', ' . $this->identifierName;
+		}
+		$sql .= ' FROM ' . $this->table;
+		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();
+			} elseif ($this->identifierName != '') {
+				$sql .= ' ORDER BY ' . $this->identifierName;
+			}
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+
+		$id        = $this->_getIdForCache($sql, $start, $limit);
+		$cacheData = $Cache_Lite->get($id);
+		if ($cacheData === false) {
+			$result = $this->db->query($sql, $limit, $start);
+			if (!$result) {
+				$Cache_Lite->save($ret);
+
+				return $ret;
+			}
+
+			$myts = MyTextSanitizer::getInstance();
+			while ($myrow = $this->db->fetchArray($result)) {
+				//identifiers should be textboxes, so sanitize them like that
+				$ret[$myrow[$this->keyName]] = empty($this->identifierName) ? 1 : $myts->htmlSpecialChars($myrow[$this->identifierName]);
+			}
+			$Cache_Lite->save($ret);
+
+			return $ret;
+		} else {
+			return $cacheData;
+		}
+	}
+
+	/**
+	 * Retourne des éléments selon leur ID
+	 *
+	 * @param array $ids Les ID des éléments à retrouver
+	 * @param null  $additionnal
+	 * @return array Tableau d'objets
+	 */
+	public function getItemsFromIds($ids, $additionnal = null)
+	{
+		$ret = array();
+		if (is_array($ids) && count($ids) > 0) {
+			$criteria = new CriteriaCompo();
+			$criteria->add(new Criteria($this->keyName, '(' . implode(',', $ids) . ')', 'IN'));
+			if (!is_null($additionnal)) {
+				$criteria->add($additionnal);
+			}
+			$ret =& $this->getObjects($criteria, true);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * count objects matching a condition
+	 *
+	 * @param  object $criteria {@link CriteriaElement} to match
+	 * @return int    count of objects
+	 */
+	public function getCount($criteria = null)
+	{
+		$field   = '';
+		$groupby = false;
+		$limit   = $start = 0;
+		require_once __DIR__ . '/lite.php';
+
+		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
+			}
+		}
+		$sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table;
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+			if ($criteria->groupby != '') {
+				$sql .= $criteria->getGroupby();
+			}
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+		$Cache_Lite = new references_Cache_Lite($this->cacheOptions);
+		$id         = $this->_getIdForCache($sql, $start, $limit);
+		$cacheData  = $Cache_Lite->get($id);
+		if ($cacheData === false) {
+			$result = $this->db->query($sql, $limit, $start);
+			if (!$result) {
+				$ret = 0;
+				$Cache_Lite->save($ret);
+
+				return $ret;
+			}
+			if ($groupby == false) {
+				list($count) = $this->db->fetchRow($result);
+				$Cache_Lite->save($count);
+
+				return $count;
+			} else {
+				$ret = array();
+				while (list($id, $count) = $this->db->fetchRow($result)) {
+					$ret[$id] = $count;
+				}
+				$Cache_Lite->save($ret);
+
+				return $ret;
+			}
+		} else {
+			return $cacheData;
+		}
+	}
+
+	/**
+	 * Retourne le total d'un champ
+	 *
+	 * @param  string $field    Le champ dont on veut calculer le total
+	 * @param  object $criteria {@link CriteriaElement} to match
+	 * @return integer le total
+	 */
+	public function getSum($field, $criteria = null)
+	{
+		$limit = $start = 0;
+		require_once __DIR__ . '/lite.php';
+
+		$sql = 'SELECT Sum(' . $field . ') as cpt FROM ' . $this->table;
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+			if ($criteria->groupby != '') {
+				$sql .= $criteria->getGroupby();
+			}
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+		$Cache_Lite = new references_Cache_Lite($this->cacheOptions);
+		$id         = $this->_getIdForCache($sql, $start, $limit);
+		$cacheData  = $Cache_Lite->get($id);
+		if ($cacheData === false) {
+			$result = $this->db->query($sql, $limit, $start);
+			if (!$result) {
+				$ret = 0;
+				$Cache_Lite->save($ret);
+
+				return $ret;
+			}
+			$row   = $this->db->fetchArray($result);
+			$count = $row['cpt'];
+			$Cache_Lite->save($count);
+
+			return $count;
+		} else {
+			return $cacheData;
+		}
+	}
+
+	/**
+	 * 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)
+	{
+		if (is_array($this->keyName)) {
+			$clause = array();
+			$vnb    = count($this->keyName);
+			for ($i = 0; $i < $vnb; ++$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);
+		}
+		// Clear cache
+		$this->forceCacheClean();
+
+		if (!$result) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Quickly insert a record like this $myobject_handler->quickInsert('field1' => field1value, 'field2' => $field2value)
+	 *
+	 * @param  array $vars  Array containing the fields name and value
+	 * @param  bool  $force whether to force the query execution despite security settings
+	 * @return bool  @link insert's value
+	 */
+	public function quickInsert($vars = null, $force = true)
+	{
+		$object = $this->create(true);
+		$object->setVars($vars);
+		$retval =& $this->insert($object, $force);
+		unset($object);
+
+		// Clear cache
+		$this->forceCacheClean();
+
+		return $retval;
+	}
+
+	/**
+	 * 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         $ignoreInsert
+	 * @return bool FALSE if failed, TRUE if already present and unchanged or successful
+	 */
+
+	public function insert(XoopsObject $obj, $force = false, $checkObject = true, $ignoreInsert = false)
+	{
+		if ($checkObject != false) {
+			if (!is_object($obj)) {
+				trigger_error('Error, not object');
+
+				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->setErrors(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->cleanVars()) {
+			foreach ($obj->getErrors() as $oneerror) {
+				trigger_error($oneerror);
+			}
+
+			return false;
+		}
+		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 (isset($cleanvars['dohtml'])) {        // Modification Herv� to be able to use dohtml
+			unset($cleanvars['dohtml']);
+		}
+		if ($obj->isNew()) {
+			if (!is_array($this->keyName)) {
+				if ($cleanvars[$this->keyName] < 1) {
+					$cleanvars[$this->keyName] = $this->db->genId($this->table . '_' . $this->keyName . '_seq');
+				}
+			}
+			$ignore = '';
+			if ($ignoreInsert) {
+				$ignore = 'IGNORE';
+			}
+			$sql = "INSERT $ignore INTO " . $this->table . ' (' . implode(',', array_keys($cleanvars)) . ') VALUES (' . implode(',', array_values($cleanvars)) . ')';
+		} else {
+			$sql = 'UPDATE ' . $this->table . ' SET';
+			foreach ($cleanvars 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 = '';
+				$vnb         = count($this->keyName);
+				for ($i = 0; $i < $vnb; ++$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 (false != $force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+
+		// Clear cache
+		$this->forceCacheClean();
+
+		if (!$result) {
+			return false;
+		}
+		if ($obj->isNew() && !is_array($this->keyName)) {
+			$obj->assignVar($this->keyName, $this->db->getInsertId());
+		}
+
+		return true;
+	}
+
+	/**
+	 * Change a value for objects with a certain criteria
+	 *
+	 * @param string $fieldname  Name of the field
+	 * @param string $fieldvalue Value to write
+	 * @param object $criteria   {@link CriteriaElement}
+	 *
+	 * @param bool   $force
+	 * @return bool
+	 */
+	public function updateAll($fieldname, $fieldvalue, $criteria = null, $force = false)
+	{
+		$set_clause = $fieldname . ' = ';
+		if (is_numeric($fieldvalue)) {
+			$set_clause .= $fieldvalue;
+		} elseif (is_array($fieldvalue)) {
+			$set_clause .= $this->db->quoteString(implode(',', $fieldvalue));
+		} else {
+			$set_clause .= $this->db->quoteString($fieldvalue);
+		}
+		$sql = 'UPDATE ' . $this->table . ' SET ' . $set_clause;
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+		}
+		if ($force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+
+		// Clear cache
+		$this->forceCacheClean();
+
+		if (!$result) {
+			return false;
+		}
+
+		return true;
+	}
+
+	//  check if target object is attempting to use duplicated info
+	public function isDuplicated(&$obj, $field = '', $error = '')
+	{
+		if (empty($field)) {
+			return false;
+		}
+		$criteria = new CriteriaCompo();
+		$criteria->add(new Criteria($field, $obj->getVar($field)));
+		//  one more condition if target object exisits in database
+		if (!$obj->isNew()) {
+			$criteria->add(new Criteria($this->_key, $obj->getVar($this->_key), '!='));
+		}
+		if ($this->getCount($criteria)) {
+			$obj->setErrors($error);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * delete all objects meeting the conditions
+	 *
+	 * @param  object $criteria {@link CriteriaElement} with conditions to meet
+	 * @return bool
+	 */
+	public function deleteAll($criteria = null)
+	{
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql = 'DELETE FROM ' . $this->table;
+			$sql .= ' ' . $criteria->renderWhere();
+			if (!$this->db->queryF($sql)) {
+				return false;
+			}
+			$rows = $this->db->getAffectedRows();
+
+			// Clear cache
+			$this->forceCacheClean();
+
+			return $rows > 0 ? $rows : true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Compare two objects and returns, in an array, the differences
+	 *
+	 * @param  XoopsObject $old_object The first object to compare
+	 * @param  XoopsObject $new_object The new object
+	 * @return array       differences  key = fieldname, value = array('old_value', 'new_value')
+	 */
+	public function compareObjects($old_object, $new_object)
+	{
+		$ret       = array();
+		$vars_name = array_keys($old_object->getVars());
+		foreach ($vars_name as $one_var) {
+			if ($old_object->getVar($one_var, 'f') == $new_object->getVar($one_var, 'f')) {
+			} else {
+				$ret[$one_var] = array($old_object->getVar($one_var), $new_object->getVar($one_var));
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Get distincted values of a field in the table
+	 *
+	 * @param  string $field    Field's name
+	 * @param  object $criteria {@link CriteriaElement} conditions to be met
+	 * @param  string $format   Format in wich we want the datas
+	 * @return array  containing the distinct values
+	 */
+	public function getDistincts($field, $criteria = null, $format = 's')
+	{
+		require_once __DIR__ . '/lite.php';
+		$limit = $start = 0;
+		$sql   = 'SELECT ' . $this->keyName . ', ' . $field . ' FROM ' . $this->table;
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+		$sql .= ' GROUP BY ' . $field . ' ORDER BY ' . $field;
+
+		$Cache_Lite = new references_Cache_Lite($this->cacheOptions);
+		$id         = $this->_getIdForCache($sql, $start, $limit);
+		$cacheData  = $Cache_Lite->get($id);
+		if ($cacheData === false) {
+			$result = $this->db->query($sql, $limit, $start);
+			$ret    = array();
+			$obj    = new $this->className();
+			while ($myrow = $this->db->fetchArray($result)) {
+				$obj->setVar($field, $myrow[$field]);
+				$ret[$myrow[$this->keyName]] = $obj->getVar($field, $format);
+			}
+			$Cache_Lite->save($ret);
+
+			return $ret;
+		} else {
+			return $cacheData;
+		}
+	}
+
+	/**
+	 * A generic shortcut to getObjects
+	 *
+	 * @author Herve Thouzard - Instant Zero
+	 *
+	 * @param  integer $start   Starting position
+	 * @param  integer $limit   Maximum count of elements to return
+	 * @param  string  $sort    Field to use for the sort
+	 * @param  string  $order   Sort order
+	 * @param  boolean $idAsKey Do we have to return an array whoses keys are the record's ID ?
+	 * @return array   Array of current objects
+	 */
+	public function getItems($start = 0, $limit = 0, $sort = '', $order = 'ASC', $idAsKey = true)
+	{
+		if (trim($order) == '') {
+			if (isset($this->identifierName) && trim($this->identifierName) != '') {
+				$order = $this->identifierName;
+			} else {
+				$order = $this->keyName;
+			}
+		}
+		$items   = array();
+		$critere = new Criteria($this->keyName, 0, '<>');
+		$critere->setLimit($limit);
+		$critere->setStart($start);
+		$critere->setSort($sort);
+		$critere->setOrder($order);
+		$items =& $this->getObjects($critere, $idAsKey);
+
+		return $items;
+	}
+
+	/**
+	 * Forces the cache to be cleaned
+	 */
+	public function forceCacheClean()
+	{
+		require_once __DIR__ . '/lite.php';
+		$Cache_Lite = new references_Cache_Lite($this->cacheOptions);
+		$Cache_Lite->clean();
+	}
 }

class/references_handlers.php

Indentation +27 added lines, -27 removed lines

@@ -24,34 +24,34 @@
  */
 class references_handler
 {
-    public         $h_references_articles   = null;
-    public         $h_references_categories = null;
-    private static $instance                = false;
+	public         $h_references_articles   = null;
+	public         $h_references_categories = null;
+	private static $instance                = false;
 
-    /**
-     * Singleton
-     */
-    private function __construct()
-    {
-        $handlersNames = array('references_articles', 'references_categories');
-        foreach ($handlersNames as $handlerName) {
-            $internalName        = 'h_' . $handlerName;
-            $this->$internalName = xoops_getModuleHandler($handlerName, REFERENCES_DIRNAME);
-        }
-    }
+	/**
+	 * Singleton
+	 */
+	private function __construct()
+	{
+		$handlersNames = array('references_articles', 'references_categories');
+		foreach ($handlersNames as $handlerName) {
+			$internalName        = 'h_' . $handlerName;
+			$this->$internalName = xoops_getModuleHandler($handlerName, REFERENCES_DIRNAME);
+		}
+	}
 
-    /**
-     * Retourne l'instance unique de la clanss
-     *
-     * @return object
-     */
-    public static function getInstance()
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static();
-        }
+	/**
+	 * Retourne l'instance unique de la clanss
+	 *
+	 * @return object
+	 */
+	public static function getInstance()
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static();
+		}
 
-        return $instance;
-    }
+		return $instance;
+	}
 }

class/registryfile.php

Indentation +57 added lines, -57 removed lines

@@ -21,68 +21,68 @@
  */
 class references_registryfile
 {
-    public $filename;    // Nom du fichier � traiter
+	public $filename;    // Nom du fichier � traiter
 
-    /**
-     * Access the only instance of this class
-     *
-     * @return object
-     *
-     * @static
-     * @staticvar   object
-     */
-    public static function getInstance()
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static();
-        }
+	/**
+	 * Access the only instance of this class
+	 *
+	 * @return object
+	 *
+	 * @static
+	 * @staticvar   object
+	 */
+	public static function getInstance()
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static();
+		}
 
-        return $instance;
-    }
+		return $instance;
+	}
 
-    public function __construct($fichier = null)
-    {
-        $this->setfile($fichier);
-    }
+	public function __construct($fichier = null)
+	{
+		$this->setfile($fichier);
+	}
 
-    public function setfile($fichier = null)
-    {
-        if ($fichier) {
-            $this->filename = XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . $fichier;
-        }
-    }
+	public function setfile($fichier = null)
+	{
+		if ($fichier) {
+			$this->filename = XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . $fichier;
+		}
+	}
 
-    public function getfile($fichier = null)
-    {
-        $fw = '';
-        if (!$fichier) {
-            $fw = $this->filename;
-        } else {
-            $fw = XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . $fichier;
-        }
-        if (file_exists($fw)) {
-            return file_get_contents($fw);
-        } else {
-            return '';
-        }
-    }
+	public function getfile($fichier = null)
+	{
+		$fw = '';
+		if (!$fichier) {
+			$fw = $this->filename;
+		} else {
+			$fw = XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . $fichier;
+		}
+		if (file_exists($fw)) {
+			return file_get_contents($fw);
+		} else {
+			return '';
+		}
+	}
 
-    public function savefile($content, $fichier = null)
-    {
-        $fw = '';
-        if (!$fichier) {
-            $fw = $this->filename;
-        } else {
-            $fw = XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . $fichier;
-        }
-        if (file_exists($fw)) {
-            @unlink($fw);
-        }
-        $fp = fopen($fw, 'w') || exit('Error, impossible to create the file ' . $this->filename);
-        fwrite($fp, $content);
-        fclose($fp);
+	public function savefile($content, $fichier = null)
+	{
+		$fw = '';
+		if (!$fichier) {
+			$fw = $this->filename;
+		} else {
+			$fw = XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . $fichier;
+		}
+		if (file_exists($fw)) {
+			@unlink($fw);
+		}
+		$fp = fopen($fw, 'w') || exit('Error, impossible to create the file ' . $this->filename);
+		fwrite($fp, $content);
+		fclose($fp);
 
-        return true;
-    }
+		return true;
+	}
 }

class/PEAR.php

Indentation +980 added lines, -980 removed lines

@@ -40,25 +40,25 @@ 
 define('references_PEAR_ERROR_EXCEPTION', 32);
 /**#@-*/
 define('references_PEAR_ZE2', function_exists('version_compare')
-                              && version_compare(zend_version(), '2-dev', 'ge'));
+							  && version_compare(zend_version(), '2-dev', 'ge'));
 
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-    define('references_OS_WINDOWS', true);
-    define('references_OS_UNIX', false);
-    define('references_PEAR_OS', 'Windows');
+	define('references_OS_WINDOWS', true);
+	define('references_OS_UNIX', false);
+	define('references_PEAR_OS', 'Windows');
 } else {
-    define('references_OS_WINDOWS', false);
-    define('references_OS_UNIX', true);
-    define('references_PEAR_OS', 'Unix'); // blatant assumption
+	define('references_OS_WINDOWS', false);
+	define('references_OS_UNIX', true);
+	define('references_PEAR_OS', 'Unix'); // blatant assumption
 }
 
 // instant backwards compatibility
 if (!defined('PATH_SEPARATOR')) {
-    if (references_OS_WINDOWS) {
-        define('PATH_SEPARATOR', ';');
-    } else {
-        define('PATH_SEPARATOR', ':');
-    }
+	if (references_OS_WINDOWS) {
+		define('PATH_SEPARATOR', ';');
+	} else {
+		define('PATH_SEPARATOR', ':');
+	}
 }
 
 $GLOBALS['_PEAR_default_error_mode']     = references_PEAR_ERROR_RETURN;
@@ -101,712 +101,712 @@ 
  */
 class references_PEAR
 {
-    // {{{ properties
-
-    /**
-     * Whether to enable internal debug messages.
-     *
-     * @var bool
-     * @access  private
-     */
-    public $_debug = false;
-
-    /**
-     * Default error mode for this object.
-     *
-     * @var int
-     * @access  private
-     */
-    public $_default_error_mode = null;
-
-    /**
-     * Default error options used for this object when error mode
-     * is references_PEAR_ERROR_TRIGGER.
-     *
-     * @var int
-     * @access  private
-     */
-    public $_default_error_options = null;
-
-    /**
-     * Default error handler (callback) for this object, if error mode is
-     * references_PEAR_ERROR_CALLBACK.
-     *
-     * @var string
-     * @access  private
-     */
-    public $_default_error_handler = '';
-
-    /**
-     * Which class to use for error objects.
-     *
-     * @var string
-     * @access  private
-     */
-    public $_error_class = 'PEAR_Error';
-
-    /**
-     * An array of expected errors.
-     *
-     * @var array
-     * @access  private
-     */
-    public $_expected_errors = array();
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * Constructor.  Registers this object in
-     * $_PEAR_destructor_object_list for destructor emulation if a
-     * destructor object exists.
-     *
-     * @param  string $error_class (optional) which class to use for
-     *                             error objects, defaults to PEAR_Error.
-     * @access public
-     */
-    public function __construct($error_class = null)
-    {
-        $classname = strtolower(get_class($this));
-        if ($this->_debug) {
-            print "PEAR constructor called, class=$classname\n";
-        }
-        if ($error_class !== null) {
-            $this->_error_class = $error_class;
-        }
-        while ($classname && strcasecmp($classname, 'pear')) {
-            $destructor = "_$classname";
-            if (method_exists($this, $destructor)) {
-                global $_PEAR_destructor_object_list;
-                $_PEAR_destructor_object_list[] = &$this;
-                if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-                    register_shutdown_function('references_PEAR_call_destructors');
-                    $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-                }
-                break;
-            } else {
-                $classname = get_parent_class($classname);
-            }
-        }
-    }
-
-    // }}}
-    // {{{ destructor
-
-    /**
-     * Destructor (the emulated type of...).  Does nothing right now,
-     * but is included for forward compatibility, so subclass
-     * destructors should always call it.
-     *
-     * See the note in the class desciption about output from
-     * destructors.
-     *
-     * @access public
-     * @return void
-     */
-    public function _PEAR()
-    {
-        if ($this->_debug) {
-            printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
-        }
-    }
-
-    // }}}
-    // {{{ getStaticProperty()
-
-    /**
-     * If you have a class that's mostly/entirely static, and you need static
-     * properties, you can use this method to simulate them. Eg. in your method(s)
-     * do this: $myVar = &references_PEAR::getStaticProperty('myclass', 'myVar');
-     * You MUST use a reference, or they will not persist!
-     *
-     * @access public
-     * @param  string $class The calling classname, to prevent clashes
-     * @param  string $var   The variable to retrieve.
-     * @return mixed   A reference to the variable. If not set it will be
-     *                       auto initialised to NULL.
-     */
-    public function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        if (!isset($properties[$class])) {
-            $properties[$class] = array();
-        }
-        if (!array_key_exists($var, $properties[$class])) {
-            $properties[$class][$var] = null;
-        }
-
-        return $properties[$class][$var];
-    }
-
-    // }}}
-    // {{{ registerShutdownFunc()
-
-    /**
-     * Use this function to register a shutdown method for static
-     * classes.
-     *
-     * @access public
-     * @param  mixed $func The function name (or array of class/method) to call
-     * @param  mixed $args The arguments to pass to the function
-     * @return void
-     */
-    public function registerShutdownFunc($func, $args = array())
-    {
-        // if we are called statically, there is a potential
-        // that no shutdown func is registered.  Bug #6445
-        if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-            register_shutdown_function('references__PEAR_call_destructors');
-            $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-        }
-        $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
-    }
-
-    // }}}
-    // {{{ isError()
-
-    /**
-     * Tell whether a value is a PEAR error.
-     *
-     * @param  mixed $data the value to test
-     * @param  int   $code if $data is an error object, return true
-     *                     only if $code is a string and
-     *                     $obj->getMessage() == $code or
-     *                     $code is an integer and $obj->getCode() == $code
-     * @access  public
-     * @return bool  true if parameter is an error
-     */
-    public function isError($data, $code = null)
-    {
-        if (is_a($data, 'PEAR_Error')) {
-            if (is_null($code)) {
-                return true;
-            } elseif (is_string($code)) {
-                return $data->getMessage() == $code;
-            } else {
-                return $data->getCode() == $code;
-            }
-        }
-
-        return false;
-    }
-
-    // }}}
-    // {{{ setErrorHandling()
-
-    /**
-     * Sets how errors generated by this object should be handled.
-     * Can be invoked both in objects and statically.  If called
-     * statically, setErrorHandling sets the default behaviour for all
-     * PEAR objects.  If called in an object, setErrorHandling sets
-     * the default behaviour for that object.
-     *
-     * @param int   $mode
-     *                       One of references_PEAR_ERROR_RETURN, references_PEAR_ERROR_PRINT,
-     *                       references_PEAR_ERROR_TRIGGER, references_PEAR_ERROR_DIE,
-     *                       references_PEAR_ERROR_CALLBACK or references_PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options
-     *                       When $mode is references_PEAR_ERROR_TRIGGER, this is the error level (one
-     *                       of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *
-     *        When $mode is references_PEAR_ERROR_CALLBACK, this parameter is expected
-     *        to be the callback function or method.  A callback
-     *        function is a string with the name of the function, a
-     *        callback method is an array of two elements: the element
-     *        at index 0 is the object, and the element at index 1 is
-     *        the name of the method to call in the object.
-     *
-     *        When $mode is references_PEAR_ERROR_PRINT or references_PEAR_ERROR_DIE, this is
-     *        a printf format string used when printing the error
-     *        message.
-     *
-     * @access public
-     * @return void
-     * @see    references_PEAR_ERROR_RETURN
-     * @see    references_PEAR_ERROR_PRINT
-     * @see    references_PEAR_ERROR_TRIGGER
-     * @see    references_PEAR_ERROR_DIE
-     * @see    references_PEAR_ERROR_CALLBACK
-     * @see    references_PEAR_ERROR_EXCEPTION
-     *
-     */
-
-    public function setErrorHandling($mode = null, $options = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $setmode    = &$this->_default_error_mode;
-            $setoptions = &$this->_default_error_options;
-        } else {
-            $setmode    = &$GLOBALS['_PEAR_default_error_mode'];
-            $setoptions = &$GLOBALS['_PEAR_default_error_options'];
-        }
-
-        switch ($mode) {
-            case references_PEAR_ERROR_EXCEPTION:
-            case references_PEAR_ERROR_RETURN:
-            case references_PEAR_ERROR_PRINT:
-            case references_PEAR_ERROR_TRIGGER:
-            case references_PEAR_ERROR_DIE:
-            case null:
-                $setmode    = $mode;
-                $setoptions = $options;
-                break;
-
-            case references_PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error('invalid error callback', E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error('invalid error mode', E_USER_WARNING);
-                break;
-        }
-    }
-
-    // }}}
-    // {{{ expectError()
-
-    /**
-     * This method is used to tell which errors you expect to get.
-     * Expected errors are always returned with error mode
-     * references_PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
-     * and this method pushes a new element onto it.  The list of
-     * expected errors are in effect until they are popped off the
-     * stack with the popExpect() method.
-     *
-     * Note that this method can not be called statically
-     *
-     * @param mixed $code a single error code or an array of error codes to expect
-     *
-     * @return int the new depth of the "expected errors" stack
-     * @access public
-     */
-    public function expectError($code = '*')
-    {
-        if (is_array($code)) {
-            array_push($this->_expected_errors, $code);
-        } else {
-            array_push($this->_expected_errors, array($code));
-        }
-
-        return count($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ popExpect()
-
-    /**
-     * This method pops one element off the expected error codes
-     * stack.
-     *
-     * @return array the list of error codes that were popped
-     */
-    public function popExpect()
-    {
-        return array_pop($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ _checkDelExpect()
-
-    /**
-     * This method checks unsets an error code if available
-     *
-     * @param mixed error code
-     * @return bool true if the error code was unset, false otherwise
-     * @access private
-     */
-    public function _checkDelExpect($error_code)
-    {
-        $deleted = false;
-
-        foreach ($this->_expected_errors as $key => $error_array) {
-            if (in_array($error_code, $error_array)) {
-                unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
-                $deleted = true;
-            }
-
-            // clean up empty arrays
-            if (0 == count($this->_expected_errors[$key])) {
-                unset($this->_expected_errors[$key]);
-            }
-        }
-
-        return $deleted;
-    }
-
-    // }}}
-    // {{{ delExpect()
-
-    /**
-     * This method deletes all occurences of the specified element from
-     * the expected error codes stack.
-     *
-     * @param  mixed $error_code error code that should be deleted
-     * @return mixed list of error codes that were deleted or error
-     * @access public
-     */
-    public function delExpect($error_code)
-    {
-        $deleted = false;
-
-        if (is_array($error_code) && (0 != count($error_code))) {
-            // $error_code is a non-empty array here;
-            // we walk through it trying to unset all
-            // values
-            foreach ($error_code as $key => $error) {
-                if ($this->_checkDelExpect($error)) {
-                    $deleted = true;
-                } else {
-                    $deleted = false;
-                }
-            }
-
-            return $deleted ? true : references_PEAR::raiseError('The expected error you submitted does not exist'); // IMPROVE ME
-        } elseif (!empty($error_code)) {
-            // $error_code comes alone, trying to unset it
-            if ($this->_checkDelExpect($error_code)) {
-                return true;
-            } else {
-                return references_PEAR::raiseError('The expected error you submitted does not exist'); // IMPROVE ME
-            }
-        } else {
-            // $error_code is empty
-            return references_PEAR::raiseError('The expected error you submitted is empty'); // IMPROVE ME
-        }
-    }
-
-    // }}}
-    // {{{ raiseError()
-
-    /**
-     * This method is a wrapper that returns an instance of the
-     * configured error class with this object's default error
-     * handling applied.  If the $mode and $options parameters are not
-     * specified, the object's defaults are used.
-     *
-     * @param mixed  $message     a text error message or a PEAR error object
-     *
-     * @param int    $code        a numeric error code (it is up to your class
-     *                            to define these if you want to use codes)
-     *
-     * @param int    $mode        One of references_PEAR_ERROR_RETURN, references_PEAR_ERROR_PRINT,
-     *                            references_PEAR_ERROR_TRIGGER, references_PEAR_ERROR_DIE,
-     *                            references_PEAR_ERROR_CALLBACK, references_PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed  $options     If $mode is references_PEAR_ERROR_TRIGGER, this parameter
-     *                            specifies the PHP-internal error level (one of
-     *                            E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *                            If $mode is references_PEAR_ERROR_CALLBACK, this
-     *                            parameter specifies the callback function or
-     *                            method.  In other error modes this parameter
-     *                            is ignored.
-     *
-     * @param string $userinfo    If you need to pass along for example debug
-     *                            information, this parameter is meant for that.
-     *
-     * @param string $error_class The returned error object will be
-     *                            instantiated from this class, if specified.
-     *
-     * @param bool   $skipmsg     If true, raiseError will only pass error codes,
-     *                            the error message parameter will be dropped.
-     *
-     * @access public
-     * @return object a PEAR error object
-     * @see    references_PEAR::setErrorHandling
-     * @since  PHP 4.0.5
-     */
-    public function &raiseError($message = null, $code = null, $mode = null, $options = null, $userinfo = null, $error_class = null, $skipmsg = false)
-    {
-        // The error is yet a PEAR error object
-        if (is_object($message)) {
-            $code                          = $message->getCode();
-            $userinfo                      = $message->getUserInfo();
-            $error_class                   = $message->getType();
-            $message->error_message_prefix = '';
-            $message                       = $message->getMessage();
-        }
-
-        if (isset($this) && isset($this->_expected_errors) && count($this->_expected_errors) > 0 && count($exp = end($this->_expected_errors))) {
-            if ($exp[0] === '*'
-                || (is_int(reset($exp)) && in_array($code, $exp))
-                || (is_string(reset($exp)) && in_array($message, $exp))
-            ) {
-                $mode = references_PEAR_ERROR_RETURN;
-            }
-        }
-        // No mode given, try global ones
-        if ($mode === null) {
-            // Class error handler
-            if (isset($this) && isset($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
-                // Global error handler
-            } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
-                $mode    = $GLOBALS['_PEAR_default_error_mode'];
-                $options = $GLOBALS['_PEAR_default_error_options'];
-            }
-        }
-
-        if ($error_class !== null) {
-            $ec = $error_class;
-        } elseif (isset($this) && isset($this->_error_class)) {
-            $ec = $this->_error_class;
-        } else {
-            $ec = 'references_PEAR_Error';
-        }
-        if ($skipmsg) {
-            $a = new $ec($code, $mode, $options, $userinfo);
-
-            return $a;
-        } else {
-            $a = new $ec($message, $code, $mode, $options, $userinfo);
-
-            return $a;
-        }
-    }
-
-    // }}}
-    // {{{ throwError()
-
-    /**
-     * Simpler form of raiseError with fewer options.  In most cases
-     * message, code and userinfo are enough.
-     *
-     * @param string $message
-     *
-     * @param null   $code
-     * @param null   $userinfo
-     * @return object
-     */
-    public function &throwError($message = null, $code = null, $userinfo = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $a = &$this->raiseError($message, $code, null, null, $userinfo);
-
-            return $a;
-        } else {
-            $a = &references_PEAR::raiseError($message, $code, null, null, $userinfo);
-
-            return $a;
-        }
-    }
-
-    // }}}
-    public function staticPushErrorHandling($mode, $options = null)
-    {
-        $stack       = &$GLOBALS['_PEAR_error_handler_stack'];
-        $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-        $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        $stack[]     = array($def_mode, $def_options);
-        switch ($mode) {
-            case references_PEAR_ERROR_EXCEPTION:
-            case references_PEAR_ERROR_RETURN:
-            case references_PEAR_ERROR_PRINT:
-            case references_PEAR_ERROR_TRIGGER:
-            case references_PEAR_ERROR_DIE:
-            case null:
-                $def_mode    = $mode;
-                $def_options = $options;
-                break;
-
-            case references_PEAR_ERROR_CALLBACK:
-                $def_mode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $def_options = $options;
-                } else {
-                    trigger_error('invalid error callback', E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error('invalid error mode', E_USER_WARNING);
-                break;
-        }
-        $stack[] = array($mode, $options);
-
-        return true;
-    }
-
-    public function staticPopErrorHandling()
-    {
-        $stack      = &$GLOBALS['_PEAR_error_handler_stack'];
-        $setmode    = &$GLOBALS['_PEAR_default_error_mode'];
-        $setoptions = &$GLOBALS['_PEAR_default_error_options'];
-        array_pop($stack);
-        list($mode, $options) = $stack[count($stack) - 1];
-        array_pop($stack);
-        switch ($mode) {
-            case references_PEAR_ERROR_EXCEPTION:
-            case references_PEAR_ERROR_RETURN:
-            case references_PEAR_ERROR_PRINT:
-            case references_PEAR_ERROR_TRIGGER:
-            case references_PEAR_ERROR_DIE:
-            case null:
-                $setmode    = $mode;
-                $setoptions = $options;
-                break;
-
-            case references_PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error('invalid error callback', E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error('invalid error mode', E_USER_WARNING);
-                break;
-        }
-
-        return true;
-    }
-
-    // {{{ pushErrorHandling()
-
-    /**
-     * Push a new error handler on top of the error handler options stack. With this
-     * you can easily override the actual error handler for some code and restore
-     * it later with popErrorHandling.
-     *
-     * @param mixed $mode    (same as setErrorHandling)
-     * @param mixed $options (same as setErrorHandling)
-     *
-     * @return bool Always true
-     *
-     * @see references_PEAR::setErrorHandling
-     */
-    public function pushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $def_mode    = &$this->_default_error_mode;
-            $def_options = &$this->_default_error_options;
-        } else {
-            $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-            $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        }
-        $stack[] = array($def_mode, $def_options);
-
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            references_PEAR::setErrorHandling($mode, $options);
-        }
-        $stack[] = array($mode, $options);
-
-        return true;
-    }
-
-    // }}}
-    // {{{ popErrorHandling()
-
-    /**
-     * Pop the last error handler used
-     *
-     * @return bool Always true
-     *
-     * @see references_PEAR::pushErrorHandling
-     */
-    public function popErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        array_pop($stack);
-        list($mode, $options) = $stack[count($stack) - 1];
-        array_pop($stack);
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            references_PEAR::setErrorHandling($mode, $options);
-        }
-
-        return true;
-    }
-
-    // }}}
-    // {{{ loadExtension()
-
-    /**
-     * OS independant PHP extension load. Remember to take care
-     * on the correct extension name for case sensitive OSes.
-     *
-     * @param string $ext The extension name
-     * @return bool Success or not on the dl() call
-     */
-    public function loadExtension($ext)
-    {
-        if (!extension_loaded($ext)) {
-            // if either returns true dl() will produce a FATAL error, stop that
-            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
-                return false;
-            }
-            if (references_OS_WINDOWS) {
-                $suffix = '.dll';
-            } elseif (PHP_OS === 'HP-UX') {
-                $suffix = '.sl';
-            } elseif (PHP_OS === 'AIX') {
-                $suffix = '.a';
-            } elseif (PHP_OS === 'OSX') {
-                $suffix = '.bundle';
-            } else {
-                $suffix = '.so';
-            }
-
-            return @dl('php_' . $ext . $suffix) || @dl($ext . $suffix);
-        }
-
-        return true;
-    }
-
-    // }}}
+	// {{{ properties
+
+	/**
+	 * Whether to enable internal debug messages.
+	 *
+	 * @var bool
+	 * @access  private
+	 */
+	public $_debug = false;
+
+	/**
+	 * Default error mode for this object.
+	 *
+	 * @var int
+	 * @access  private
+	 */
+	public $_default_error_mode = null;
+
+	/**
+	 * Default error options used for this object when error mode
+	 * is references_PEAR_ERROR_TRIGGER.
+	 *
+	 * @var int
+	 * @access  private
+	 */
+	public $_default_error_options = null;
+
+	/**
+	 * Default error handler (callback) for this object, if error mode is
+	 * references_PEAR_ERROR_CALLBACK.
+	 *
+	 * @var string
+	 * @access  private
+	 */
+	public $_default_error_handler = '';
+
+	/**
+	 * Which class to use for error objects.
+	 *
+	 * @var string
+	 * @access  private
+	 */
+	public $_error_class = 'PEAR_Error';
+
+	/**
+	 * An array of expected errors.
+	 *
+	 * @var array
+	 * @access  private
+	 */
+	public $_expected_errors = array();
+
+	// }}}
+
+	// {{{ constructor
+
+	/**
+	 * Constructor.  Registers this object in
+	 * $_PEAR_destructor_object_list for destructor emulation if a
+	 * destructor object exists.
+	 *
+	 * @param  string $error_class (optional) which class to use for
+	 *                             error objects, defaults to PEAR_Error.
+	 * @access public
+	 */
+	public function __construct($error_class = null)
+	{
+		$classname = strtolower(get_class($this));
+		if ($this->_debug) {
+			print "PEAR constructor called, class=$classname\n";
+		}
+		if ($error_class !== null) {
+			$this->_error_class = $error_class;
+		}
+		while ($classname && strcasecmp($classname, 'pear')) {
+			$destructor = "_$classname";
+			if (method_exists($this, $destructor)) {
+				global $_PEAR_destructor_object_list;
+				$_PEAR_destructor_object_list[] = &$this;
+				if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
+					register_shutdown_function('references_PEAR_call_destructors');
+					$GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
+				}
+				break;
+			} else {
+				$classname = get_parent_class($classname);
+			}
+		}
+	}
+
+	// }}}
+	// {{{ destructor
+
+	/**
+	 * Destructor (the emulated type of...).  Does nothing right now,
+	 * but is included for forward compatibility, so subclass
+	 * destructors should always call it.
+	 *
+	 * See the note in the class desciption about output from
+	 * destructors.
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function _PEAR()
+	{
+		if ($this->_debug) {
+			printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
+		}
+	}
+
+	// }}}
+	// {{{ getStaticProperty()
+
+	/**
+	 * If you have a class that's mostly/entirely static, and you need static
+	 * properties, you can use this method to simulate them. Eg. in your method(s)
+	 * do this: $myVar = &references_PEAR::getStaticProperty('myclass', 'myVar');
+	 * You MUST use a reference, or they will not persist!
+	 *
+	 * @access public
+	 * @param  string $class The calling classname, to prevent clashes
+	 * @param  string $var   The variable to retrieve.
+	 * @return mixed   A reference to the variable. If not set it will be
+	 *                       auto initialised to NULL.
+	 */
+	public function &getStaticProperty($class, $var)
+	{
+		static $properties;
+		if (!isset($properties[$class])) {
+			$properties[$class] = array();
+		}
+		if (!array_key_exists($var, $properties[$class])) {
+			$properties[$class][$var] = null;
+		}
+
+		return $properties[$class][$var];
+	}
+
+	// }}}
+	// {{{ registerShutdownFunc()
+
+	/**
+	 * Use this function to register a shutdown method for static
+	 * classes.
+	 *
+	 * @access public
+	 * @param  mixed $func The function name (or array of class/method) to call
+	 * @param  mixed $args The arguments to pass to the function
+	 * @return void
+	 */
+	public function registerShutdownFunc($func, $args = array())
+	{
+		// if we are called statically, there is a potential
+		// that no shutdown func is registered.  Bug #6445
+		if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
+			register_shutdown_function('references__PEAR_call_destructors');
+			$GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
+		}
+		$GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
+	}
+
+	// }}}
+	// {{{ isError()
+
+	/**
+	 * Tell whether a value is a PEAR error.
+	 *
+	 * @param  mixed $data the value to test
+	 * @param  int   $code if $data is an error object, return true
+	 *                     only if $code is a string and
+	 *                     $obj->getMessage() == $code or
+	 *                     $code is an integer and $obj->getCode() == $code
+	 * @access  public
+	 * @return bool  true if parameter is an error
+	 */
+	public function isError($data, $code = null)
+	{
+		if (is_a($data, 'PEAR_Error')) {
+			if (is_null($code)) {
+				return true;
+			} elseif (is_string($code)) {
+				return $data->getMessage() == $code;
+			} else {
+				return $data->getCode() == $code;
+			}
+		}
+
+		return false;
+	}
+
+	// }}}
+	// {{{ setErrorHandling()
+
+	/**
+	 * Sets how errors generated by this object should be handled.
+	 * Can be invoked both in objects and statically.  If called
+	 * statically, setErrorHandling sets the default behaviour for all
+	 * PEAR objects.  If called in an object, setErrorHandling sets
+	 * the default behaviour for that object.
+	 *
+	 * @param int   $mode
+	 *                       One of references_PEAR_ERROR_RETURN, references_PEAR_ERROR_PRINT,
+	 *                       references_PEAR_ERROR_TRIGGER, references_PEAR_ERROR_DIE,
+	 *                       references_PEAR_ERROR_CALLBACK or references_PEAR_ERROR_EXCEPTION.
+	 *
+	 * @param mixed $options
+	 *                       When $mode is references_PEAR_ERROR_TRIGGER, this is the error level (one
+	 *                       of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
+	 *
+	 *        When $mode is references_PEAR_ERROR_CALLBACK, this parameter is expected
+	 *        to be the callback function or method.  A callback
+	 *        function is a string with the name of the function, a
+	 *        callback method is an array of two elements: the element
+	 *        at index 0 is the object, and the element at index 1 is
+	 *        the name of the method to call in the object.
+	 *
+	 *        When $mode is references_PEAR_ERROR_PRINT or references_PEAR_ERROR_DIE, this is
+	 *        a printf format string used when printing the error
+	 *        message.
+	 *
+	 * @access public
+	 * @return void
+	 * @see    references_PEAR_ERROR_RETURN
+	 * @see    references_PEAR_ERROR_PRINT
+	 * @see    references_PEAR_ERROR_TRIGGER
+	 * @see    references_PEAR_ERROR_DIE
+	 * @see    references_PEAR_ERROR_CALLBACK
+	 * @see    references_PEAR_ERROR_EXCEPTION
+	 *
+	 */
+
+	public function setErrorHandling($mode = null, $options = null)
+	{
+		if (isset($this) && is_a($this, 'PEAR')) {
+			$setmode    = &$this->_default_error_mode;
+			$setoptions = &$this->_default_error_options;
+		} else {
+			$setmode    = &$GLOBALS['_PEAR_default_error_mode'];
+			$setoptions = &$GLOBALS['_PEAR_default_error_options'];
+		}
+
+		switch ($mode) {
+			case references_PEAR_ERROR_EXCEPTION:
+			case references_PEAR_ERROR_RETURN:
+			case references_PEAR_ERROR_PRINT:
+			case references_PEAR_ERROR_TRIGGER:
+			case references_PEAR_ERROR_DIE:
+			case null:
+				$setmode    = $mode;
+				$setoptions = $options;
+				break;
+
+			case references_PEAR_ERROR_CALLBACK:
+				$setmode = $mode;
+				// class/object method callback
+				if (is_callable($options)) {
+					$setoptions = $options;
+				} else {
+					trigger_error('invalid error callback', E_USER_WARNING);
+				}
+				break;
+
+			default:
+				trigger_error('invalid error mode', E_USER_WARNING);
+				break;
+		}
+	}
+
+	// }}}
+	// {{{ expectError()
+
+	/**
+	 * This method is used to tell which errors you expect to get.
+	 * Expected errors are always returned with error mode
+	 * references_PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
+	 * and this method pushes a new element onto it.  The list of
+	 * expected errors are in effect until they are popped off the
+	 * stack with the popExpect() method.
+	 *
+	 * Note that this method can not be called statically
+	 *
+	 * @param mixed $code a single error code or an array of error codes to expect
+	 *
+	 * @return int the new depth of the "expected errors" stack
+	 * @access public
+	 */
+	public function expectError($code = '*')
+	{
+		if (is_array($code)) {
+			array_push($this->_expected_errors, $code);
+		} else {
+			array_push($this->_expected_errors, array($code));
+		}
+
+		return count($this->_expected_errors);
+	}
+
+	// }}}
+	// {{{ popExpect()
+
+	/**
+	 * This method pops one element off the expected error codes
+	 * stack.
+	 *
+	 * @return array the list of error codes that were popped
+	 */
+	public function popExpect()
+	{
+		return array_pop($this->_expected_errors);
+	}
+
+	// }}}
+	// {{{ _checkDelExpect()
+
+	/**
+	 * This method checks unsets an error code if available
+	 *
+	 * @param mixed error code
+	 * @return bool true if the error code was unset, false otherwise
+	 * @access private
+	 */
+	public function _checkDelExpect($error_code)
+	{
+		$deleted = false;
+
+		foreach ($this->_expected_errors as $key => $error_array) {
+			if (in_array($error_code, $error_array)) {
+				unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
+				$deleted = true;
+			}
+
+			// clean up empty arrays
+			if (0 == count($this->_expected_errors[$key])) {
+				unset($this->_expected_errors[$key]);
+			}
+		}
+
+		return $deleted;
+	}
+
+	// }}}
+	// {{{ delExpect()
+
+	/**
+	 * This method deletes all occurences of the specified element from
+	 * the expected error codes stack.
+	 *
+	 * @param  mixed $error_code error code that should be deleted
+	 * @return mixed list of error codes that were deleted or error
+	 * @access public
+	 */
+	public function delExpect($error_code)
+	{
+		$deleted = false;
+
+		if (is_array($error_code) && (0 != count($error_code))) {
+			// $error_code is a non-empty array here;
+			// we walk through it trying to unset all
+			// values
+			foreach ($error_code as $key => $error) {
+				if ($this->_checkDelExpect($error)) {
+					$deleted = true;
+				} else {
+					$deleted = false;
+				}
+			}
+
+			return $deleted ? true : references_PEAR::raiseError('The expected error you submitted does not exist'); // IMPROVE ME
+		} elseif (!empty($error_code)) {
+			// $error_code comes alone, trying to unset it
+			if ($this->_checkDelExpect($error_code)) {
+				return true;
+			} else {
+				return references_PEAR::raiseError('The expected error you submitted does not exist'); // IMPROVE ME
+			}
+		} else {
+			// $error_code is empty
+			return references_PEAR::raiseError('The expected error you submitted is empty'); // IMPROVE ME
+		}
+	}
+
+	// }}}
+	// {{{ raiseError()
+
+	/**
+	 * This method is a wrapper that returns an instance of the
+	 * configured error class with this object's default error
+	 * handling applied.  If the $mode and $options parameters are not
+	 * specified, the object's defaults are used.
+	 *
+	 * @param mixed  $message     a text error message or a PEAR error object
+	 *
+	 * @param int    $code        a numeric error code (it is up to your class
+	 *                            to define these if you want to use codes)
+	 *
+	 * @param int    $mode        One of references_PEAR_ERROR_RETURN, references_PEAR_ERROR_PRINT,
+	 *                            references_PEAR_ERROR_TRIGGER, references_PEAR_ERROR_DIE,
+	 *                            references_PEAR_ERROR_CALLBACK, references_PEAR_ERROR_EXCEPTION.
+	 *
+	 * @param mixed  $options     If $mode is references_PEAR_ERROR_TRIGGER, this parameter
+	 *                            specifies the PHP-internal error level (one of
+	 *                            E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
+	 *                            If $mode is references_PEAR_ERROR_CALLBACK, this
+	 *                            parameter specifies the callback function or
+	 *                            method.  In other error modes this parameter
+	 *                            is ignored.
+	 *
+	 * @param string $userinfo    If you need to pass along for example debug
+	 *                            information, this parameter is meant for that.
+	 *
+	 * @param string $error_class The returned error object will be
+	 *                            instantiated from this class, if specified.
+	 *
+	 * @param bool   $skipmsg     If true, raiseError will only pass error codes,
+	 *                            the error message parameter will be dropped.
+	 *
+	 * @access public
+	 * @return object a PEAR error object
+	 * @see    references_PEAR::setErrorHandling
+	 * @since  PHP 4.0.5
+	 */
+	public function &raiseError($message = null, $code = null, $mode = null, $options = null, $userinfo = null, $error_class = null, $skipmsg = false)
+	{
+		// The error is yet a PEAR error object
+		if (is_object($message)) {
+			$code                          = $message->getCode();
+			$userinfo                      = $message->getUserInfo();
+			$error_class                   = $message->getType();
+			$message->error_message_prefix = '';
+			$message                       = $message->getMessage();
+		}
+
+		if (isset($this) && isset($this->_expected_errors) && count($this->_expected_errors) > 0 && count($exp = end($this->_expected_errors))) {
+			if ($exp[0] === '*'
+				|| (is_int(reset($exp)) && in_array($code, $exp))
+				|| (is_string(reset($exp)) && in_array($message, $exp))
+			) {
+				$mode = references_PEAR_ERROR_RETURN;
+			}
+		}
+		// No mode given, try global ones
+		if ($mode === null) {
+			// Class error handler
+			if (isset($this) && isset($this->_default_error_mode)) {
+				$mode    = $this->_default_error_mode;
+				$options = $this->_default_error_options;
+				// Global error handler
+			} elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
+				$mode    = $GLOBALS['_PEAR_default_error_mode'];
+				$options = $GLOBALS['_PEAR_default_error_options'];
+			}
+		}
+
+		if ($error_class !== null) {
+			$ec = $error_class;
+		} elseif (isset($this) && isset($this->_error_class)) {
+			$ec = $this->_error_class;
+		} else {
+			$ec = 'references_PEAR_Error';
+		}
+		if ($skipmsg) {
+			$a = new $ec($code, $mode, $options, $userinfo);
+
+			return $a;
+		} else {
+			$a = new $ec($message, $code, $mode, $options, $userinfo);
+
+			return $a;
+		}
+	}
+
+	// }}}
+	// {{{ throwError()
+
+	/**
+	 * Simpler form of raiseError with fewer options.  In most cases
+	 * message, code and userinfo are enough.
+	 *
+	 * @param string $message
+	 *
+	 * @param null   $code
+	 * @param null   $userinfo
+	 * @return object
+	 */
+	public function &throwError($message = null, $code = null, $userinfo = null)
+	{
+		if (isset($this) && is_a($this, 'PEAR')) {
+			$a = &$this->raiseError($message, $code, null, null, $userinfo);
+
+			return $a;
+		} else {
+			$a = &references_PEAR::raiseError($message, $code, null, null, $userinfo);
+
+			return $a;
+		}
+	}
+
+	// }}}
+	public function staticPushErrorHandling($mode, $options = null)
+	{
+		$stack       = &$GLOBALS['_PEAR_error_handler_stack'];
+		$def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
+		$def_options = &$GLOBALS['_PEAR_default_error_options'];
+		$stack[]     = array($def_mode, $def_options);
+		switch ($mode) {
+			case references_PEAR_ERROR_EXCEPTION:
+			case references_PEAR_ERROR_RETURN:
+			case references_PEAR_ERROR_PRINT:
+			case references_PEAR_ERROR_TRIGGER:
+			case references_PEAR_ERROR_DIE:
+			case null:
+				$def_mode    = $mode;
+				$def_options = $options;
+				break;
+
+			case references_PEAR_ERROR_CALLBACK:
+				$def_mode = $mode;
+				// class/object method callback
+				if (is_callable($options)) {
+					$def_options = $options;
+				} else {
+					trigger_error('invalid error callback', E_USER_WARNING);
+				}
+				break;
+
+			default:
+				trigger_error('invalid error mode', E_USER_WARNING);
+				break;
+		}
+		$stack[] = array($mode, $options);
+
+		return true;
+	}
+
+	public function staticPopErrorHandling()
+	{
+		$stack      = &$GLOBALS['_PEAR_error_handler_stack'];
+		$setmode    = &$GLOBALS['_PEAR_default_error_mode'];
+		$setoptions = &$GLOBALS['_PEAR_default_error_options'];
+		array_pop($stack);
+		list($mode, $options) = $stack[count($stack) - 1];
+		array_pop($stack);
+		switch ($mode) {
+			case references_PEAR_ERROR_EXCEPTION:
+			case references_PEAR_ERROR_RETURN:
+			case references_PEAR_ERROR_PRINT:
+			case references_PEAR_ERROR_TRIGGER:
+			case references_PEAR_ERROR_DIE:
+			case null:
+				$setmode    = $mode;
+				$setoptions = $options;
+				break;
+
+			case references_PEAR_ERROR_CALLBACK:
+				$setmode = $mode;
+				// class/object method callback
+				if (is_callable($options)) {
+					$setoptions = $options;
+				} else {
+					trigger_error('invalid error callback', E_USER_WARNING);
+				}
+				break;
+
+			default:
+				trigger_error('invalid error mode', E_USER_WARNING);
+				break;
+		}
+
+		return true;
+	}
+
+	// {{{ pushErrorHandling()
+
+	/**
+	 * Push a new error handler on top of the error handler options stack. With this
+	 * you can easily override the actual error handler for some code and restore
+	 * it later with popErrorHandling.
+	 *
+	 * @param mixed $mode    (same as setErrorHandling)
+	 * @param mixed $options (same as setErrorHandling)
+	 *
+	 * @return bool Always true
+	 *
+	 * @see references_PEAR::setErrorHandling
+	 */
+	public function pushErrorHandling($mode, $options = null)
+	{
+		$stack = &$GLOBALS['_PEAR_error_handler_stack'];
+		if (isset($this) && is_a($this, 'PEAR')) {
+			$def_mode    = &$this->_default_error_mode;
+			$def_options = &$this->_default_error_options;
+		} else {
+			$def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
+			$def_options = &$GLOBALS['_PEAR_default_error_options'];
+		}
+		$stack[] = array($def_mode, $def_options);
+
+		if (isset($this) && is_a($this, 'PEAR')) {
+			$this->setErrorHandling($mode, $options);
+		} else {
+			references_PEAR::setErrorHandling($mode, $options);
+		}
+		$stack[] = array($mode, $options);
+
+		return true;
+	}
+
+	// }}}
+	// {{{ popErrorHandling()
+
+	/**
+	 * Pop the last error handler used
+	 *
+	 * @return bool Always true
+	 *
+	 * @see references_PEAR::pushErrorHandling
+	 */
+	public function popErrorHandling()
+	{
+		$stack = &$GLOBALS['_PEAR_error_handler_stack'];
+		array_pop($stack);
+		list($mode, $options) = $stack[count($stack) - 1];
+		array_pop($stack);
+		if (isset($this) && is_a($this, 'PEAR')) {
+			$this->setErrorHandling($mode, $options);
+		} else {
+			references_PEAR::setErrorHandling($mode, $options);
+		}
+
+		return true;
+	}
+
+	// }}}
+	// {{{ loadExtension()
+
+	/**
+	 * OS independant PHP extension load. Remember to take care
+	 * on the correct extension name for case sensitive OSes.
+	 *
+	 * @param string $ext The extension name
+	 * @return bool Success or not on the dl() call
+	 */
+	public function loadExtension($ext)
+	{
+		if (!extension_loaded($ext)) {
+			// if either returns true dl() will produce a FATAL error, stop that
+			if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
+				return false;
+			}
+			if (references_OS_WINDOWS) {
+				$suffix = '.dll';
+			} elseif (PHP_OS === 'HP-UX') {
+				$suffix = '.sl';
+			} elseif (PHP_OS === 'AIX') {
+				$suffix = '.a';
+			} elseif (PHP_OS === 'OSX') {
+				$suffix = '.bundle';
+			} else {
+				$suffix = '.so';
+			}
+
+			return @dl('php_' . $ext . $suffix) || @dl($ext . $suffix);
+		}
+
+		return true;
+	}
+
+	// }}}
 }
 
 // {{{ _PEAR_call_destructors()
 
 function references_PEAR_call_destructors()
 {
-    global $_PEAR_destructor_object_list;
-    if (is_array($_PEAR_destructor_object_list)
-        && count($_PEAR_destructor_object_list)
-    ) {
-        reset($_PEAR_destructor_object_list);
-        if (references_PEAR::getStaticProperty('PEAR', 'destructlifo')) {
-            $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
-        }
-        while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
-            $classname = get_class($objref);
-            while ($classname) {
-                $destructor = "_$classname";
-                if (method_exists($objref, $destructor)) {
-                    $objref->$destructor();
-                    break;
-                } else {
-                    $classname = get_parent_class($classname);
-                }
-            }
-        }
-        // Empty the object list to ensure that destructors are
-        // not called more than once.
-        $_PEAR_destructor_object_list = array();
-    }
-
-    // Now call the shutdown functions
-    if (is_array($GLOBALS['_PEAR_shutdown_funcs']) and !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
-        foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
-            call_user_func_array($value[0], $value[1]);
-        }
-    }
+	global $_PEAR_destructor_object_list;
+	if (is_array($_PEAR_destructor_object_list)
+		&& count($_PEAR_destructor_object_list)
+	) {
+		reset($_PEAR_destructor_object_list);
+		if (references_PEAR::getStaticProperty('PEAR', 'destructlifo')) {
+			$_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
+		}
+		while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
+			$classname = get_class($objref);
+			while ($classname) {
+				$destructor = "_$classname";
+				if (method_exists($objref, $destructor)) {
+					$objref->$destructor();
+					break;
+				} else {
+					$classname = get_parent_class($classname);
+				}
+			}
+		}
+		// Empty the object list to ensure that destructors are
+		// not called more than once.
+		$_PEAR_destructor_object_list = array();
+	}
+
+	// Now call the shutdown functions
+	if (is_array($GLOBALS['_PEAR_shutdown_funcs']) and !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
+		foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
+			call_user_func_array($value[0], $value[1]);
+		}
+	}
 }
 
 // }}}
@@ -829,274 +829,274 @@ 
  */
 class references_PEAR_Error
 {
-    // {{{ properties
-
-    public $error_message_prefix = '';
-    public $mode                 = references_PEAR_ERROR_RETURN;
-    public $level                = E_USER_NOTICE;
-    public $code                 = -1;
-    public $message              = '';
-    public $userinfo             = '';
-    public $backtrace            = null;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Error constructor
-     *
-     * @param string $message  message
-     *
-     * @param int    $code     (optional) error code
-     *
-     * @param int    $mode     (optional) error mode, one of: references_PEAR_ERROR_RETURN,
-     *                         references_PEAR_ERROR_PRINT, references_PEAR_ERROR_DIE, references_PEAR_ERROR_TRIGGER,
-     *                         references_PEAR_ERROR_CALLBACK or references_PEAR_ERROR_EXCEPTION
-     *
-     * @param mixed  $options  (optional) error level, _OR_ in the case of
-     *                         references_PEAR_ERROR_CALLBACK, the callback function or object/method
-     *                         tuple.
-     *
-     * @param string $userinfo (optional) additional user/debug info
-     *
-     * @access public
-     *
-     */
-    public function __construct($message = 'unknown error', $code = null, $mode = null, $options = null, $userinfo = null)
-    {
-        if ($mode === null) {
-            $mode = references_PEAR_ERROR_RETURN;
-        }
-        $this->message  = $message;
-        $this->code     = $code;
-        $this->mode     = $mode;
-        $this->userinfo = $userinfo;
-        if (!references_PEAR::getStaticProperty('PEAR_Error', 'skiptrace')) {
-            $this->backtrace = debug_backtrace();
-            if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) {
-                unset($this->backtrace[0]['object']);
-            }
-        }
-        if ($mode & references_PEAR_ERROR_CALLBACK) {
-            $this->level    = E_USER_NOTICE;
-            $this->callback = $options;
-        } else {
-            if ($options === null) {
-                $options = E_USER_NOTICE;
-            }
-            $this->level    = $options;
-            $this->callback = null;
-        }
-        if ($this->mode & references_PEAR_ERROR_PRINT) {
-            if (is_null($options) || is_int($options)) {
-                $format = '%s';
-            } else {
-                $format = $options;
-            }
-            printf($format, $this->getMessage());
-        }
-        if ($this->mode & references_PEAR_ERROR_TRIGGER) {
-            trigger_error($this->getMessage(), $this->level);
-        }
-        if ($this->mode & references_PEAR_ERROR_DIE) {
-            $msg = $this->getMessage();
-            if (is_null($options) || is_int($options)) {
-                $format = '%s';
-                if (substr($msg, -1) !== "\n") {
-                    $msg .= "\n";
-                }
-            } else {
-                $format = $options;
-            }
-            die(sprintf($format, $msg));
-        }
-        if ($this->mode & references_PEAR_ERROR_CALLBACK) {
-            if (is_callable($this->callback)) {
-                call_user_func($this->callback, $this);
-            }
-        }
-        if ($this->mode & references_PEAR_ERROR_EXCEPTION) {
-            trigger_error('references_PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions', E_USER_WARNING);
-            eval('$e = new Exception($this->message, $this->code);throw($e);');
-        }
-    }
-
-    // }}}
-    // {{{ getMode()
-
-    /**
-     * Get the error mode from an error object.
-     *
-     * @return int error mode
-     * @access public
-     */
-    public function getMode()
-    {
-        return $this->mode;
-    }
-
-    // }}}
-    // {{{ getCallback()
-
-    /**
-     * Get the callback function/method from an error object.
-     *
-     * @return mixed callback function or object/method array
-     * @access public
-     */
-    public function getCallback()
-    {
-        return $this->callback;
-    }
-
-    // }}}
-    // {{{ getMessage()
-
-    /**
-     * Get the error message from an error object.
-     *
-     * @return string full error message
-     * @access public
-     */
-    public function getMessage()
-    {
-        return ($this->error_message_prefix . $this->message);
-    }
-
-    // }}}
-    // {{{ getCode()
-
-    /**
-     * Get error code from an error object
-     *
-     * @return int error code
-     * @access public
-     */
-    public function getCode()
-    {
-        return $this->code;
-    }
-
-    // }}}
-    // {{{ getType()
-
-    /**
-     * Get the name of this error/exception.
-     *
-     * @return string error/exception name (type)
-     * @access public
-     */
-    public function getType()
-    {
-        return get_class($this);
-    }
-
-    // }}}
-    // {{{ getUserInfo()
-
-    /**
-     * Get additional user-supplied information.
-     *
-     * @return string user-supplied information
-     * @access public
-     */
-    public function getUserInfo()
-    {
-        return $this->userinfo;
-    }
-
-    // }}}
-    // {{{ getDebugInfo()
-
-    /**
-     * Get additional debug information supplied by the application.
-     *
-     * @return string debug information
-     * @access public
-     */
-    public function getDebugInfo()
-    {
-        return $this->getUserInfo();
-    }
-
-    // }}}
-    // {{{ getBacktrace()
-
-    /**
-     * Get the call backtrace from where the error was generated.
-     * Supported with PHP 4.3.0 or newer.
-     *
-     * @param  int $frame (optional) what frame to fetch
-     * @return array Backtrace, or NULL if not available.
-     * @access public
-     */
-    public function getBacktrace($frame = null)
-    {
-        if (defined('PEAR_IGNORE_BACKTRACE')) {
-            return null;
-        }
-        if ($frame === null) {
-            return $this->backtrace;
-        }
-
-        return $this->backtrace[$frame];
-    }
-
-    // }}}
-    // {{{ addUserInfo()
-
-    public function addUserInfo($info)
-    {
-        if (empty($this->userinfo)) {
-            $this->userinfo = $info;
-        } else {
-            $this->userinfo .= " ** $info";
-        }
-    }
-
-    // }}}
-    // {{{ toString()
-
-    /**
-     * Make a string representation of this object.
-     *
-     * @return string a string with an object summary
-     * @access public
-     */
-    public function toString()
-    {
-        $modes  = array();
-        $levels = array(
-            E_USER_NOTICE  => 'notice',
-            E_USER_WARNING => 'warning',
-            E_USER_ERROR   => 'error'
-        );
-        if ($this->mode & references_PEAR_ERROR_CALLBACK) {
-            if (is_array($this->callback)) {
-                $callback = (is_object($this->callback[0]) ? strtolower(get_class($this->callback[0])) : $this->callback[0]) . '::' . $this->callback[1];
-            } else {
-                $callback = $this->callback;
-            }
-
-            return sprintf('[%s: message="%s" code=%d mode=callback ' . 'callback=%s prefix="%s" info="%s"]', strtolower(get_class($this)), $this->message, $this->code, $callback, $this->error_message_prefix, $this->userinfo);
-        }
-        if ($this->mode & references_PEAR_ERROR_PRINT) {
-            $modes[] = 'print';
-        }
-        if ($this->mode & references_PEAR_ERROR_TRIGGER) {
-            $modes[] = 'trigger';
-        }
-        if ($this->mode & references_PEAR_ERROR_DIE) {
-            $modes[] = 'die';
-        }
-        if ($this->mode & references_PEAR_ERROR_RETURN) {
-            $modes[] = 'return';
-        }
-
-        return sprintf('[%s: message="%s" code=%d mode=%s level=%s ' . 'prefix="%s" info="%s"]', strtolower(get_class($this)), $this->message, $this->code, implode('|', $modes), $levels[$this->level], $this->error_message_prefix, $this->userinfo);
-    }
-
-    // }}}
+	// {{{ properties
+
+	public $error_message_prefix = '';
+	public $mode                 = references_PEAR_ERROR_RETURN;
+	public $level                = E_USER_NOTICE;
+	public $code                 = -1;
+	public $message              = '';
+	public $userinfo             = '';
+	public $backtrace            = null;
+
+	// }}}
+	// {{{ constructor
+
+	/**
+	 * PEAR_Error constructor
+	 *
+	 * @param string $message  message
+	 *
+	 * @param int    $code     (optional) error code
+	 *
+	 * @param int    $mode     (optional) error mode, one of: references_PEAR_ERROR_RETURN,
+	 *                         references_PEAR_ERROR_PRINT, references_PEAR_ERROR_DIE, references_PEAR_ERROR_TRIGGER,
+	 *                         references_PEAR_ERROR_CALLBACK or references_PEAR_ERROR_EXCEPTION
+	 *
+	 * @param mixed  $options  (optional) error level, _OR_ in the case of
+	 *                         references_PEAR_ERROR_CALLBACK, the callback function or object/method
+	 *                         tuple.
+	 *
+	 * @param string $userinfo (optional) additional user/debug info
+	 *
+	 * @access public
+	 *
+	 */
+	public function __construct($message = 'unknown error', $code = null, $mode = null, $options = null, $userinfo = null)
+	{
+		if ($mode === null) {
+			$mode = references_PEAR_ERROR_RETURN;
+		}
+		$this->message  = $message;
+		$this->code     = $code;
+		$this->mode     = $mode;
+		$this->userinfo = $userinfo;
+		if (!references_PEAR::getStaticProperty('PEAR_Error', 'skiptrace')) {
+			$this->backtrace = debug_backtrace();
+			if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) {
+				unset($this->backtrace[0]['object']);
+			}
+		}
+		if ($mode & references_PEAR_ERROR_CALLBACK) {
+			$this->level    = E_USER_NOTICE;
+			$this->callback = $options;
+		} else {
+			if ($options === null) {
+				$options = E_USER_NOTICE;
+			}
+			$this->level    = $options;
+			$this->callback = null;
+		}
+		if ($this->mode & references_PEAR_ERROR_PRINT) {
+			if (is_null($options) || is_int($options)) {
+				$format = '%s';
+			} else {
+				$format = $options;
+			}
+			printf($format, $this->getMessage());
+		}
+		if ($this->mode & references_PEAR_ERROR_TRIGGER) {
+			trigger_error($this->getMessage(), $this->level);
+		}
+		if ($this->mode & references_PEAR_ERROR_DIE) {
+			$msg = $this->getMessage();
+			if (is_null($options) || is_int($options)) {
+				$format = '%s';
+				if (substr($msg, -1) !== "\n") {
+					$msg .= "\n";
+				}
+			} else {
+				$format = $options;
+			}
+			die(sprintf($format, $msg));
+		}
+		if ($this->mode & references_PEAR_ERROR_CALLBACK) {
+			if (is_callable($this->callback)) {
+				call_user_func($this->callback, $this);
+			}
+		}
+		if ($this->mode & references_PEAR_ERROR_EXCEPTION) {
+			trigger_error('references_PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions', E_USER_WARNING);
+			eval('$e = new Exception($this->message, $this->code);throw($e);');
+		}
+	}
+
+	// }}}
+	// {{{ getMode()
+
+	/**
+	 * Get the error mode from an error object.
+	 *
+	 * @return int error mode
+	 * @access public
+	 */
+	public function getMode()
+	{
+		return $this->mode;
+	}
+
+	// }}}
+	// {{{ getCallback()
+
+	/**
+	 * Get the callback function/method from an error object.
+	 *
+	 * @return mixed callback function or object/method array
+	 * @access public
+	 */
+	public function getCallback()
+	{
+		return $this->callback;
+	}
+
+	// }}}
+	// {{{ getMessage()
+
+	/**
+	 * Get the error message from an error object.
+	 *
+	 * @return string full error message
+	 * @access public
+	 */
+	public function getMessage()
+	{
+		return ($this->error_message_prefix . $this->message);
+	}
+
+	// }}}
+	// {{{ getCode()
+
+	/**
+	 * Get error code from an error object
+	 *
+	 * @return int error code
+	 * @access public
+	 */
+	public function getCode()
+	{
+		return $this->code;
+	}
+
+	// }}}
+	// {{{ getType()
+
+	/**
+	 * Get the name of this error/exception.
+	 *
+	 * @return string error/exception name (type)
+	 * @access public
+	 */
+	public function getType()
+	{
+		return get_class($this);
+	}
+
+	// }}}
+	// {{{ getUserInfo()
+
+	/**
+	 * Get additional user-supplied information.
+	 *
+	 * @return string user-supplied information
+	 * @access public
+	 */
+	public function getUserInfo()
+	{
+		return $this->userinfo;
+	}
+
+	// }}}
+	// {{{ getDebugInfo()
+
+	/**
+	 * Get additional debug information supplied by the application.
+	 *
+	 * @return string debug information
+	 * @access public
+	 */
+	public function getDebugInfo()
+	{
+		return $this->getUserInfo();
+	}
+
+	// }}}
+	// {{{ getBacktrace()
+
+	/**
+	 * Get the call backtrace from where the error was generated.
+	 * Supported with PHP 4.3.0 or newer.
+	 *
+	 * @param  int $frame (optional) what frame to fetch
+	 * @return array Backtrace, or NULL if not available.
+	 * @access public
+	 */
+	public function getBacktrace($frame = null)
+	{
+		if (defined('PEAR_IGNORE_BACKTRACE')) {
+			return null;
+		}
+		if ($frame === null) {
+			return $this->backtrace;
+		}
+
+		return $this->backtrace[$frame];
+	}
+
+	// }}}
+	// {{{ addUserInfo()
+
+	public function addUserInfo($info)
+	{
+		if (empty($this->userinfo)) {
+			$this->userinfo = $info;
+		} else {
+			$this->userinfo .= " ** $info";
+		}
+	}
+
+	// }}}
+	// {{{ toString()
+
+	/**
+	 * Make a string representation of this object.
+	 *
+	 * @return string a string with an object summary
+	 * @access public
+	 */
+	public function toString()
+	{
+		$modes  = array();
+		$levels = array(
+			E_USER_NOTICE  => 'notice',
+			E_USER_WARNING => 'warning',
+			E_USER_ERROR   => 'error'
+		);
+		if ($this->mode & references_PEAR_ERROR_CALLBACK) {
+			if (is_array($this->callback)) {
+				$callback = (is_object($this->callback[0]) ? strtolower(get_class($this->callback[0])) : $this->callback[0]) . '::' . $this->callback[1];
+			} else {
+				$callback = $this->callback;
+			}
+
+			return sprintf('[%s: message="%s" code=%d mode=callback ' . 'callback=%s prefix="%s" info="%s"]', strtolower(get_class($this)), $this->message, $this->code, $callback, $this->error_message_prefix, $this->userinfo);
+		}
+		if ($this->mode & references_PEAR_ERROR_PRINT) {
+			$modes[] = 'print';
+		}
+		if ($this->mode & references_PEAR_ERROR_TRIGGER) {
+			$modes[] = 'trigger';
+		}
+		if ($this->mode & references_PEAR_ERROR_DIE) {
+			$modes[] = 'die';
+		}
+		if ($this->mode & references_PEAR_ERROR_RETURN) {
+			$modes[] = 'return';
+		}
+
+		return sprintf('[%s: message="%s" code=%d mode=%s level=%s ' . 'prefix="%s" info="%s"]', strtolower(get_class($this)), $this->message, $this->code, implode('|', $modes), $levels[$this->level], $this->error_message_prefix, $this->userinfo);
+	}
+
+	// }}}
 }
 
 /*

class/references_parameters.php

Indentation +52 added lines, -52 removed lines

@@ -30,62 +30,62 @@
  */
 class references_parameters extends ArrayObject
 {
-    /**
-     * Permet de valoriser un indice de la classe comme si c'était une propriété de la classe
-     *
-     * @example $enregistrement->nom_du_champ = 'ma chaine'
-     *
-     * @param string $key   Le nom du champ à traiter
-     * @param mixed  $value La valeur à lui attribuer
-     * @return object
-     */
-    public function __set($key, $value)
-    {
-        parent::offsetSet($key, $value);
+	/**
+	 * Permet de valoriser un indice de la classe comme si c'était une propriété de la classe
+	 *
+	 * @example $enregistrement->nom_du_champ = 'ma chaine'
+	 *
+	 * @param string $key   Le nom du champ à traiter
+	 * @param mixed  $value La valeur à lui attribuer
+	 * @return object
+	 */
+	public function __set($key, $value)
+	{
+		parent::offsetSet($key, $value);
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * Valorisation d'un indice de la classe en utilisant un appel de fonction basé sur le principe suivant :
-     *      $maClasse->setLimit(10);
-     * Il est possible de chainer comme ceci : $maClasse->setStart(0)->setLimit(10);
-     *
-     * @param  string $method
-     * @param  mixed  $args
-     * @return object
-     */
-    public function __call($method, $args)
-    {
-        if (substr($method, 0, 3) === 'set') {
-            parent::offsetSet(strtolower(substr($method, 3, 1)) . substr($method, 4), $args[0]);
+	/**
+	 * Valorisation d'un indice de la classe en utilisant un appel de fonction basé sur le principe suivant :
+	 *      $maClasse->setLimit(10);
+	 * Il est possible de chainer comme ceci : $maClasse->setStart(0)->setLimit(10);
+	 *
+	 * @param  string $method
+	 * @param  mixed  $args
+	 * @return object
+	 */
+	public function __call($method, $args)
+	{
+		if (substr($method, 0, 3) === 'set') {
+			parent::offsetSet(strtolower(substr($method, 3, 1)) . substr($method, 4), $args[0]);
 
-            return $this;
-        } else {    // Affichage de la valeur
+			return $this;
+		} else {    // Affichage de la valeur
 
-            return parent::offsetGet($method);
-        }
-    }
+			return parent::offsetGet($method);
+		}
+	}
 
-    /**
-     * Méthode qui essaye de faire la même chose que la méthode extend() de jQuery
-     *
-     * On lui passe les valeurs par défaut que l'on attend et la méthode les compare avec les valeurs actuelles
-     * Si des valeurs manquent, elles sont ajoutées
-     *
-     * @param  references_parameters $defaultValues
-     * @return references_parameters
-     */
-    public function extend(self $defaultValues)
-    {
-        $result = new self;
-        $result = $this;
-        foreach ($defaultValues as $key => $value) {
-            if (!isset($result[$key])) {
-                $result[$key] = $value;
-            }
-        }
+	/**
+	 * Méthode qui essaye de faire la même chose que la méthode extend() de jQuery
+	 *
+	 * On lui passe les valeurs par défaut que l'on attend et la méthode les compare avec les valeurs actuelles
+	 * Si des valeurs manquent, elles sont ajoutées
+	 *
+	 * @param  references_parameters $defaultValues
+	 * @return references_parameters
+	 */
+	public function extend(self $defaultValues)
+	{
+		$result = new self;
+		$result = $this;
+		foreach ($defaultValues as $key => $value) {
+			if (!isset($result[$key])) {
+				$result[$key] = $value;
+			}
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 }

class/references_categories.php

Indentation +184 added lines, -184 removed lines

@@ -19,200 +19,200 @@
  * ****************************************************************************
  */
 if (!defined('XOOPS_ROOT_PATH')) {
-    die('XOOPS root path not defined');
+	die('XOOPS root path not defined');
 }
 
 require_once XOOPS_ROOT_PATH . '/kernel/object.php';
 if (!class_exists('references_XoopsPersistableObjectHandler')) {
-    require_once XOOPS_ROOT_PATH . '/modules/references/class/PersistableObjectHandler.php';
+	require_once XOOPS_ROOT_PATH . '/modules/references/class/PersistableObjectHandler.php';
 }
 
 class references_categories extends references_Object
 {
-    public function __construct()
-    {
-        $this->initVar('category_id', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('category_title', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('category_weight', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('category_description', XOBJ_DTYPE_TXTAREA, null, false);
-        // Pour autoriser le html
-        $this->initVar('dohtml', XOBJ_DTYPE_INT, 1, false);
-    }
-
-    /**
-     * Retourne la chaine de caractères qui peut être utilisée dans l'attribut href d'une balise html A.
-     *
-     * @return string
-     */
-    public function getHrefTitle()
-    {
-        return references_utils::makeHrefTitle($this->getVar('category_title'));
-    }
-
-    /**
-     * Retourne l'url à utiliser pour atteindre la catégorie
-     *
-     * @param bool $shortVersion
-     * @return string
-     */
-    public function getUrl($shortVersion = false)
-    {
-        if (!$shortVersion) {
-            return REFERENCES_URL . 'category.php?category_id=' . $this->getVar('category_id');
-        } else {
-            return 'category.php?category_id=' . $this->getVar('category_id');
-        }
-    }
-
-    /**
-     * Retourne les éléments de l'annnonce formatés pour affichage
-     *
-     * @param string $format Format à utiliser
-     * @return array
-     */
-    public function toArray($format = 's')
-    {
-        $ret                          = array();
-        $ret                          = parent::toArray($format);
-        $ret['category_href_title']   = $this->getHrefTitle();
-        $ret['category_url_rewrited'] = $this->getUrl();
-
-        return $ret;
-    }
+	public function __construct()
+	{
+		$this->initVar('category_id', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('category_title', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('category_weight', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('category_description', XOBJ_DTYPE_TXTAREA, null, false);
+		// Pour autoriser le html
+		$this->initVar('dohtml', XOBJ_DTYPE_INT, 1, false);
+	}
+
+	/**
+	 * Retourne la chaine de caractères qui peut être utilisée dans l'attribut href d'une balise html A.
+	 *
+	 * @return string
+	 */
+	public function getHrefTitle()
+	{
+		return references_utils::makeHrefTitle($this->getVar('category_title'));
+	}
+
+	/**
+	 * Retourne l'url à utiliser pour atteindre la catégorie
+	 *
+	 * @param bool $shortVersion
+	 * @return string
+	 */
+	public function getUrl($shortVersion = false)
+	{
+		if (!$shortVersion) {
+			return REFERENCES_URL . 'category.php?category_id=' . $this->getVar('category_id');
+		} else {
+			return 'category.php?category_id=' . $this->getVar('category_id');
+		}
+	}
+
+	/**
+	 * Retourne les éléments de l'annnonce formatés pour affichage
+	 *
+	 * @param string $format Format à utiliser
+	 * @return array
+	 */
+	public function toArray($format = 's')
+	{
+		$ret                          = array();
+		$ret                          = parent::toArray($format);
+		$ret['category_href_title']   = $this->getHrefTitle();
+		$ret['category_url_rewrited'] = $this->getUrl();
+
+		return $ret;
+	}
 }
 
 class ReferencesReferences_categoriesHandler extends references_XoopsPersistableObjectHandler
 {
-    public function __construct($db)
-    {    //                         Table                   Classe                    Id                Descr.
-        parent::__construct($db, 'references_categories', 'references_categories', 'category_id', 'category_title');
-    }
-
-    /**
-     * Retourne le crit�re � utiliser pour voir les cat�gories en respectant les permissions
-     *
-     * @param  string $permissionsType Type de permission (pour l'instant permission de voir)
-     * @return obejct de type Criteria
-     */
-    public function getPermissionsCategoriesCriteria($permissionsType = REFERENCES_PERM_READ)
-    {
-        global $xoopsUser;
-        static $permissions = array();
-        if (references_utils::isAdmin()) {
-            return new Criteria('category_id', '0', '>');
-        }
-        if (is_array($permissions) && array_key_exists($permissionsType, $permissions)) {
-            return $permissions[$permissionsType];
-        }
-        $categories    = array();
-        $currentModule = references_utils::getModule();
-        $groups        = is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
-        $gperm_handler = xoops_getHandler('groupperm');
-        $categories    = $gperm_handler->getItemIds($permissionsType, $groups, $currentModule->getVar('mid'));
-        if (is_array($categories) && count($categories) > 0) {
-            $permissions[$permissionsType] = new Criteria('category_id', '(' . implode(',', $categories) . ')', 'IN');
-        } else {    // Ne peut rien voir
-            $permissions[$permissionsType] = new Criteria('category_id', '0', '=');
-        }
-
-        return $permissions[$permissionsType];
-    }
-
-    /**
-     * Retourne les catégories
-     *
-     * @param integer $start Indice de début
-     * @param integer $limit Nombre d'objets à renvoyer
-     * @param  string $sort  Zone de tri
-     * @param  string $order Sens du tri
-     * @return array   Objets de type references_categories
-     */
-    public function getCategories($start = 0, $limit = 0, $sort = 'category_weight', $order = 'ASC')
-    {
-        $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('category_id', 0, '<>'));
-        $criteria->add($this->getPermissionsCategoriesCriteria());
-        $criteria->setStart($start);
-        $criteria->setSort($sort);
-        $criteria->setOrder($order);
-        $criteria->setLimit($limit);
-
-        return $this->getObjects($criteria, true);
-    }
-
-    /**
-     * Retourne la liste des catégories en tant que tableau
-     * @param integer $start Position de départ
-     * @param integer $limit Nombre maximum d'objets à retourner
-     * @param  string $sort  ordre de tri
-     * @param  string $order Sens du tri
-     * @return array
-     */
-    public function getListArray($start = 0, $limit = 0, $sort = 'category_weight', $order = 'ASC')
-    {
-        $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('category_id', 0, '<>'));
-        $criteria->add($this->getPermissionsCategoriesCriteria());
-        $criteria->setStart($start);
-        $criteria->setSort($sort);
-        $criteria->setOrder($order);
-        $criteria->setLimit($limit);
-
-        return $this->getList($criteria);
-    }
-
-    /**
-     * Retourne le sélecteur à utiliser pour voir la liste des catégies
-     *
-     * @param string  $selectName Le nom du sélecteur
-     * @param integer $selected   L'élément sélectionné
-     * @return string
-     */
-    public function getCategoriesSelect($selectName = 'categoriesSelect', $selected = 0)
-    {
-        $categories = array();
-        $ret        = '';
-        $categories = $this->getListArray(0, 0, 'category_weight ASC, category_title', 'ASC');
-        if (count($categories) == 0) {
-            return $ret;
-        }
-        $jump  = REFERENCES_URL . 'category.php?category_id=';
-        $extra = " onchange='location=\"" . $jump . "\"+this.options[this.selectedIndex].value'";
-
-        return references_utils::htmlSelect($selectName, $categories, $selected, true, '', false, 1, $extra);
-    }
-
-    /**
-     * Notification de la création d'une nouvelle catégorie
-     *
-     * @param object|references_categories $category
-     * @return bool
-     */
-    public function notifyNewCategory(references_categories $category)
-    {
-        $plugins = references_plugins::getInstance();
-        $plugins->fireAction(references_plugins::EVENT_ON_CATEGORY_CREATE, new references_parameters(array('category' => $category)));
-
-        return true;
-    }
-
-    /**
-     * Indique si une catégorie est visible d'un utilisateur
-     *
-     * @param object|references_categories $category La catégorie à controler
-     * @param integer                      $uid      L'id de l'utilisateur à controler
-     * @return bool
-     */
-    public function userCanSeeCategory(references_categories $category, $uid = 0)
-    {
-        global $xoopsUser;
-        if ($uid == 0) {
-            $uid = references_utils::getCurrentUserID();
-        }
-        $currentModule = references_utils::getModule();
-        $groups        = is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
-        $gperm_handler = xoops_getHandler('groupperm');
-
-        return $gperm_handler->checkRight(REFERENCES_PERM_READ, $category->category_id, references_utils::getMemberGroups($uid), $currentModule->getVar('mid'));
-    }
+	public function __construct($db)
+	{    //                         Table                   Classe                    Id                Descr.
+		parent::__construct($db, 'references_categories', 'references_categories', 'category_id', 'category_title');
+	}
+
+	/**
+	 * Retourne le crit�re � utiliser pour voir les cat�gories en respectant les permissions
+	 *
+	 * @param  string $permissionsType Type de permission (pour l'instant permission de voir)
+	 * @return obejct de type Criteria
+	 */
+	public function getPermissionsCategoriesCriteria($permissionsType = REFERENCES_PERM_READ)
+	{
+		global $xoopsUser;
+		static $permissions = array();
+		if (references_utils::isAdmin()) {
+			return new Criteria('category_id', '0', '>');
+		}
+		if (is_array($permissions) && array_key_exists($permissionsType, $permissions)) {
+			return $permissions[$permissionsType];
+		}
+		$categories    = array();
+		$currentModule = references_utils::getModule();
+		$groups        = is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
+		$gperm_handler = xoops_getHandler('groupperm');
+		$categories    = $gperm_handler->getItemIds($permissionsType, $groups, $currentModule->getVar('mid'));
+		if (is_array($categories) && count($categories) > 0) {
+			$permissions[$permissionsType] = new Criteria('category_id', '(' . implode(',', $categories) . ')', 'IN');
+		} else {    // Ne peut rien voir
+			$permissions[$permissionsType] = new Criteria('category_id', '0', '=');
+		}
+
+		return $permissions[$permissionsType];
+	}
+
+	/**
+	 * Retourne les catégories
+	 *
+	 * @param integer $start Indice de début
+	 * @param integer $limit Nombre d'objets à renvoyer
+	 * @param  string $sort  Zone de tri
+	 * @param  string $order Sens du tri
+	 * @return array   Objets de type references_categories
+	 */
+	public function getCategories($start = 0, $limit = 0, $sort = 'category_weight', $order = 'ASC')
+	{
+		$criteria = new CriteriaCompo();
+		$criteria->add(new Criteria('category_id', 0, '<>'));
+		$criteria->add($this->getPermissionsCategoriesCriteria());
+		$criteria->setStart($start);
+		$criteria->setSort($sort);
+		$criteria->setOrder($order);
+		$criteria->setLimit($limit);
+
+		return $this->getObjects($criteria, true);
+	}
+
+	/**
+	 * Retourne la liste des catégories en tant que tableau
+	 * @param integer $start Position de départ
+	 * @param integer $limit Nombre maximum d'objets à retourner
+	 * @param  string $sort  ordre de tri
+	 * @param  string $order Sens du tri
+	 * @return array
+	 */
+	public function getListArray($start = 0, $limit = 0, $sort = 'category_weight', $order = 'ASC')
+	{
+		$criteria = new CriteriaCompo();
+		$criteria->add(new Criteria('category_id', 0, '<>'));
+		$criteria->add($this->getPermissionsCategoriesCriteria());
+		$criteria->setStart($start);
+		$criteria->setSort($sort);
+		$criteria->setOrder($order);
+		$criteria->setLimit($limit);
+
+		return $this->getList($criteria);
+	}
+
+	/**
+	 * Retourne le sélecteur à utiliser pour voir la liste des catégies
+	 *
+	 * @param string  $selectName Le nom du sélecteur
+	 * @param integer $selected   L'élément sélectionné
+	 * @return string
+	 */
+	public function getCategoriesSelect($selectName = 'categoriesSelect', $selected = 0)
+	{
+		$categories = array();
+		$ret        = '';
+		$categories = $this->getListArray(0, 0, 'category_weight ASC, category_title', 'ASC');
+		if (count($categories) == 0) {
+			return $ret;
+		}
+		$jump  = REFERENCES_URL . 'category.php?category_id=';
+		$extra = " onchange='location=\"" . $jump . "\"+this.options[this.selectedIndex].value'";
+
+		return references_utils::htmlSelect($selectName, $categories, $selected, true, '', false, 1, $extra);
+	}
+
+	/**
+	 * Notification de la création d'une nouvelle catégorie
+	 *
+	 * @param object|references_categories $category
+	 * @return bool
+	 */
+	public function notifyNewCategory(references_categories $category)
+	{
+		$plugins = references_plugins::getInstance();
+		$plugins->fireAction(references_plugins::EVENT_ON_CATEGORY_CREATE, new references_parameters(array('category' => $category)));
+
+		return true;
+	}
+
+	/**
+	 * Indique si une catégorie est visible d'un utilisateur
+	 *
+	 * @param object|references_categories $category La catégorie à controler
+	 * @param integer                      $uid      L'id de l'utilisateur à controler
+	 * @return bool
+	 */
+	public function userCanSeeCategory(references_categories $category, $uid = 0)
+	{
+		global $xoopsUser;
+		if ($uid == 0) {
+			$uid = references_utils::getCurrentUserID();
+		}
+		$currentModule = references_utils::getModule();
+		$groups        = is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
+		$gperm_handler = xoops_getHandler('groupperm');
+
+		return $gperm_handler->checkRight(REFERENCES_PERM_READ, $category->category_id, references_utils::getMemberGroups($uid), $currentModule->getVar('mid'));
+	}
 }

category.php

Indentation +16 added lines, -16 removed lines

@@ -34,21 +34,21 @@ 
 
 $category_id = isset($_GET['category_id']) ? (int)$_GET['category_id'] : 0;
 if ($category_id == 0) {
-    header('Location: index.php', true, 301);
-    exit;
-    //references_utils::redirect('', 'index.php', 0);
+	header('Location: index.php', true, 301);
+	exit;
+	//references_utils::redirect('', 'index.php', 0);
 }
 // Chargement de la catégorie
 $category = null;
 $category = $h_references_categories->get($category_id);
 if (!is_object($category)) {
-    references_utils::redirect(_MD_REFERENCES_ERROR2, 'index.php', 4);
+	references_utils::redirect(_MD_REFERENCES_ERROR2, 'index.php', 4);
 }
 
 // Vérification des permissions
 $handlers = references_handler::getInstance();
 if (!$handlers->h_references_categories->userCanSeeCategory($category)) {
-    references_utils::redirect(_NOPERM, 'index.php', 4);
+	references_utils::redirect(_NOPERM, 'index.php', 4);
 }
 
 $xoopsTpl->assign('category', $category->toArray());
@@ -64,9 +64,9 @@ 
 $xoTheme->addScript(REFERENCES_JS_URL . 'js/mootools.js');
 $xoTheme->addScript(REFERENCES_JS_URL . 'js/mootools-1.2-more.js');
 if (isset($xoopsConfig) && file_exists(REFERENCES_PATH . 'language/' . $xoopsConfig['language'] . '/slimbox.js')) {
-    $xoTheme->addScript(REFERENCES_URL . 'language/' . $xoopsConfig['language'] . '/slimbox.js');
+	$xoTheme->addScript(REFERENCES_URL . 'language/' . $xoopsConfig['language'] . '/slimbox.js');
 } else {
-    $xoTheme->addScript(REFERENCES_JS_URL . 'js/slimbox.js');
+	$xoTheme->addScript(REFERENCES_JS_URL . 'js/slimbox.js');
 }
 
 $categoriesSelect = $h_references_categories->getCategoriesSelect('categoriesSelect', $category->getVar('category_id'));
@@ -78,15 +78,15 @@ 
 $xoopsTpl->assign('thumbsWidth', references_utils::getModuleOption('thumbs_width'));
 $xoopsTpl->assign('thumbsHeight', references_utils::getModuleOption('thumbs_height'));
 if ($limit > 0) {
-    $items          = array();
-    $items          = $h_references_articles->getRecentArticles($start, $limit, references_utils::getModuleOption('sort_field'), references_utils::getModuleOption('sort_order'), true, $category_id);
-    $categoryTitle  = $category->getVar('category_title');
-    $categoryWeight = $category->getVar('category_weight');
-    if (count($items) > 0) {
-        foreach ($items as $item) {
-            $xoopsTpl->append('articles', $item->toArray());
-        }
-    }
+	$items          = array();
+	$items          = $h_references_articles->getRecentArticles($start, $limit, references_utils::getModuleOption('sort_field'), references_utils::getModuleOption('sort_order'), true, $category_id);
+	$categoryTitle  = $category->getVar('category_title');
+	$categoryWeight = $category->getVar('category_weight');
+	if (count($items) > 0) {
+		foreach ($items as $item) {
+			$xoopsTpl->append('articles', $item->toArray());
+		}
+	}
 }
 $xoopsTpl->assign('isAdmin', references_utils::isAdmin());
 $title = $category->getVar('category_title', 'n') . ' - ' . $xoopsModule->name();

config.php

Indentation +18 added lines, -18 removed lines

@@ -19,27 +19,27 @@
  * ****************************************************************************
  */
 if (!defined('REFERENCES_CACHE_PATH')) {
-    // Le chemin du cache (il est conseillé de le mettre en dehors de la portée du web)
-    define('REFERENCES_CACHE_PATH', XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . REFERENCES_DIRNAME . '_cache' . DIRECTORY_SEPARATOR);
+	// Le chemin du cache (il est conseillé de le mettre en dehors de la portée du web)
+	define('REFERENCES_CACHE_PATH', XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . REFERENCES_DIRNAME . '_cache' . DIRECTORY_SEPARATOR);
 
-    // Thumbs / Vignettes prefixe
-    define('REFERENCES_THUMBS_PREFIX', 'thumb_');        // Thumbs prefix (when thumbs are automatically created)
+	// Thumbs / Vignettes prefixe
+	define('REFERENCES_THUMBS_PREFIX', 'thumb_');        // Thumbs prefix (when thumbs are automatically created)
 
-    // Short text length / Longueur des textes raccourcis
-    define('REFERENCES_SHORTEN_TEXT', '200');        // Characters count / Nombre de caract�res
+	// Short text length / Longueur des textes raccourcis
+	define('REFERENCES_SHORTEN_TEXT', '200');        // Characters count / Nombre de caract�res
 
-    define('REFERENCES_METAGEN_MAX_KEYWORDS', 40);
-    define('REFERENCES_METAGEN_KEYWORDS_ORDER', 0);
+	define('REFERENCES_METAGEN_MAX_KEYWORDS', 40);
+	define('REFERENCES_METAGEN_KEYWORDS_ORDER', 0);
 
-    // Automatically fill the manual date when creating a reference ? / Remplir automatiquement la date manuelle lorsqu'on crée une référence
-    define('REFERENCES_AUTO_FILL_MANUAL_DATE', true);
+	// Automatically fill the manual date when creating a reference ? / Remplir automatiquement la date manuelle lorsqu'on crée une référence
+	define('REFERENCES_AUTO_FILL_MANUAL_DATE', true);
 
-    /**
-     * Si la valeur est à false, alors dans les listes de recherche, côté admin, on recherche tout ce qui contient quelque chose.
-     * Par exemple si on tape "a", le module trouvera "abajour" et "cartable".
-     * Par contre si on met cette valeur à true alors le module cherchera tout ce qui commence par ...
-     * Par exemple si on tape "a", lemodule trouvera "abajour" MAIS PAS "cartable"
-     * PAR CONTRE "%a" trouvera tout ce qui contient la lettre a
-     */
-    define('REFERENCES_EXACT_SEARCH', true);
+	/**
+	 * Si la valeur est à false, alors dans les listes de recherche, côté admin, on recherche tout ce qui contient quelque chose.
+	 * Par exemple si on tape "a", le module trouvera "abajour" et "cartable".
+	 * Par contre si on met cette valeur à true alors le module cherchera tout ce qui commence par ...
+	 * Par exemple si on tape "a", lemodule trouvera "abajour" MAIS PAS "cartable"
+	 * PAR CONTRE "%a" trouvera tout ce qui contient la lettre a
+	 */
+	define('REFERENCES_EXACT_SEARCH', true);
 }

header.php

Indentation +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
  * ****************************************************************************
  */
 if (file_exists('../../mainfile.php')) {
-    require __DIR__ . '/../../mainfile.php';
+	require __DIR__ . '/../../mainfile.php';
 } elseif (file_exists('../../../mainfile.php')) {
-    require __DIR__ . '/../../../mainfile.php';
+	require __DIR__ . '/../../../mainfile.php';
 }
 require_once XOOPS_ROOT_PATH . '/modules/references/include/common.php';