mambax7 / references

xoops_version.php

Indentation +38 added lines, -38 removed lines

@@ -46,8 +46,8 @@ 
 $modversion['min_xoops']           = '2.5.8';
 $modversion['min_admin']           = '1.2';
 $modversion['min_db']              = array(
-    'mysql'  => '5.0.7',
-    'mysqli' => '5.0.7'
+	'mysql'  => '5.0.7',
+	'mysqli' => '5.0.7'
 );
 
 // ****************************************************************************
@@ -102,13 +102,13 @@ 
  *                  $options[3] - min font size (px or %)
  */
 $modversion['blocks'][] = array(
-    'file'        => 'references_block_tag.php',
-    'name'        => _MI_REFERENCES_BNAME3,
-    'description' => 'Show tag cloud',
-    'show_func'   => 'references_tag_block_cloud_show',
-    'edit_func'   => 'references_tag_block_cloud_edit',
-    'options'     => '100|0|150|80',
-    'template'    => 'references_tag_block_cloud.tpl'
+	'file'        => 'references_block_tag.php',
+	'name'        => _MI_REFERENCES_BNAME3,
+	'description' => 'Show tag cloud',
+	'show_func'   => 'references_tag_block_cloud_show',
+	'edit_func'   => 'references_tag_block_cloud_edit',
+	'options'     => '100|0|150|80',
+	'template'    => 'references_tag_block_cloud.tpl'
 );
 
 /*
@@ -118,13 +118,13 @@ 
  *                  $options[2] - sort: a - alphabet; c - count; t - time
  */
 $modversion['blocks'][] = array(
-    'file'        => 'references_block_tag.php',
-    'name'        => _MI_REFERENCES_BNAME4,
-    'description' => 'Show top tags',
-    'show_func'   => 'references_tag_block_top_show',
-    'edit_func'   => 'references_tag_block_top_edit',
-    'options'     => '50|30|c',
-    'template'    => 'references_tag_block_top.tpl'
+	'file'        => 'references_block_tag.php',
+	'name'        => _MI_REFERENCES_BNAME4,
+	'description' => 'Show top tags',
+	'show_func'   => 'references_tag_block_top_show',
+	'edit_func'   => 'references_tag_block_top_edit',
+	'options'     => '50|30|c',
+	'template'    => 'references_tag_block_top.tpl'
 );
 
 // ****************************************************************************
@@ -161,9 +161,9 @@ 
 
 require_once XOOPS_ROOT_PATH . '/modules/references/class/references_utils.php';
 if (references_utils::getModuleOption('use_rss')) {
-    ++$cptm;
-    $modversion['sub'][$cptm]['name'] = _MI_REFERENCES_SMENU1;
-    $modversion['sub'][$cptm]['url']  = 'rss.php';
+	++$cptm;
+	$modversion['sub'][$cptm]['name'] = _MI_REFERENCES_SMENU1;
+	$modversion['sub'][$cptm]['url']  = 'rss.php';
 }
 
 // ****************************************************************************
@@ -204,16 +204,16 @@ 
  * Editor to use
  */
 if (!defined('REFERENCES_MAINTAIN')) {
-    ++$cpto;
-    $modversion['config'][$cpto]['name']        = 'form_options';
-    $modversion['config'][$cpto]['title']       = '_MI_REFERENCES_OPTION2';
-    $modversion['config'][$cpto]['description'] = '';
-    $modversion['config'][$cpto]['formtype']    = 'select';
-    $modversion['config'][$cpto]['valuetype']   = 'text';
-    $modversion['config'][$cpto]['default']     = 'dhtmltextarea';
-    xoops_load('xoopseditorhandler');
-    $editor_handler                         = XoopsEditorHandler::getInstance();
-    $modversion['config'][$cpto]['options'] = array_flip($editor_handler->getList());
+	++$cpto;
+	$modversion['config'][$cpto]['name']        = 'form_options';
+	$modversion['config'][$cpto]['title']       = '_MI_REFERENCES_OPTION2';
+	$modversion['config'][$cpto]['description'] = '';
+	$modversion['config'][$cpto]['formtype']    = 'select';
+	$modversion['config'][$cpto]['valuetype']   = 'text';
+	$modversion['config'][$cpto]['default']     = 'dhtmltextarea';
+	xoops_load('xoopseditorhandler');
+	$editor_handler                         = XoopsEditorHandler::getInstance();
+	$modversion['config'][$cpto]['options'] = array_flip($editor_handler->getList());
 }
 
 /**
@@ -370,8 +370,8 @@ 
 $modversion['config'][$cpto]['formtype']    = 'select';
 $modversion['config'][$cpto]['valuetype']   = 'text';
 $modversion['config'][$cpto]['options']     = array(
-    _MI_REFERENCES_SORT_DATE   => 'article_timestamp',
-    _MI_REFERENCES_SORT_WEIGHT => 'article_weight'
+	_MI_REFERENCES_SORT_DATE   => 'article_timestamp',
+	_MI_REFERENCES_SORT_WEIGHT => 'article_weight'
 );
 $modversion['config'][$cpto]['default']     = 'article_timestamp';
 
@@ -385,8 +385,8 @@ 
 $modversion['config'][$cpto]['formtype']    = 'select';
 $modversion['config'][$cpto]['valuetype']   = 'text';
 $modversion['config'][$cpto]['options']     = array(
-    _MI_REFERENCES_SORT_ASC  => 'ASC',
-    _MI_REFERENCES_SORT_DESC => 'DESC'
+	_MI_REFERENCES_SORT_ASC  => 'ASC',
+	_MI_REFERENCES_SORT_DESC => 'DESC'
 );
 $modversion['config'][$cpto]['default']     = 'DESC';
 
@@ -400,9 +400,9 @@ 
 $modversion['config'][$cpto]['formtype']    = 'select';
 $modversion['config'][$cpto]['valuetype']   = 'text';
 $modversion['config'][$cpto]['options']     = array(
-    _MI_REFERENCES_SORT_DATE   => 'article_timestamp',
-    _MI_REFERENCES_SORT_WEIGHT => 'article_weight',
-    _MI_REFERENCES_SORT_TITLE  => 'article_title'
+	_MI_REFERENCES_SORT_DATE   => 'article_timestamp',
+	_MI_REFERENCES_SORT_WEIGHT => 'article_weight',
+	_MI_REFERENCES_SORT_TITLE  => 'article_title'
 );
 $modversion['config'][$cpto]['default']     = 'article_weight';
 
@@ -416,8 +416,8 @@ 
 $modversion['config'][$cpto]['formtype']    = 'select';
 $modversion['config'][$cpto]['valuetype']   = 'text';
 $modversion['config'][$cpto]['options']     = array(
-    _MI_REFERENCES_SORT_ASC  => 'ASC',
-    _MI_REFERENCES_SORT_DESC => 'DESC'
+	_MI_REFERENCES_SORT_ASC  => 'ASC',
+	_MI_REFERENCES_SORT_DESC => 'DESC'
 );
 $modversion['config'][$cpto]['default']     = 'ASC';
 

include/common.php

Indentation +21 added lines, -21 removed lines

@@ -21,17 +21,17 @@ 
 defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
 if (!defined('REFERENCES_DIRNAME')) {
-    define('REFERENCES_DIRNAME', 'references');
-    define('REFERENCES_URL', XOOPS_URL . '/modules/' . REFERENCES_DIRNAME . '/');
-    define('REFERENCES_PATH', XOOPS_ROOT_PATH . '/modules/' . REFERENCES_DIRNAME . '/');
-    define('REFERENCES_IMAGES_URL', REFERENCES_URL . 'assets/images/');        // Les images du module (l'url)
-    define('REFERENCES_IMAGES_PATH', REFERENCES_PATH . 'assets/images/');    // Les images du module (le chemin)
-    define('REFERENCES_CLASS_PATH', REFERENCES_PATH . 'class/');
-    define('REFERENCES_PLUGINS_PATH', REFERENCES_PATH . 'plugins/');
-    define('REFERENCES_PLUGINS_URL', REFERENCES_URL . 'plugins/');
-    define('REFERENCES_JS_URL', REFERENCES_URL . 'js/');
-    define('REFERENCES_TEXTFILE1', 'references_index.tpl');
-    define('REFERENCES_PERM_READ', 'references_view');    // Nom de la permission de lire
+	define('REFERENCES_DIRNAME', 'references');
+	define('REFERENCES_URL', XOOPS_URL . '/modules/' . REFERENCES_DIRNAME . '/');
+	define('REFERENCES_PATH', XOOPS_ROOT_PATH . '/modules/' . REFERENCES_DIRNAME . '/');
+	define('REFERENCES_IMAGES_URL', REFERENCES_URL . 'assets/images/');        // Les images du module (l'url)
+	define('REFERENCES_IMAGES_PATH', REFERENCES_PATH . 'assets/images/');    // Les images du module (le chemin)
+	define('REFERENCES_CLASS_PATH', REFERENCES_PATH . 'class/');
+	define('REFERENCES_PLUGINS_PATH', REFERENCES_PATH . 'plugins/');
+	define('REFERENCES_PLUGINS_URL', REFERENCES_URL . 'plugins/');
+	define('REFERENCES_JS_URL', REFERENCES_URL . 'js/');
+	define('REFERENCES_TEXTFILE1', 'references_index.tpl');
+	define('REFERENCES_PERM_READ', 'references_view');    // Nom de la permission de lire
 }
 
 // Chargement des handler et des autres classes
@@ -55,15 +55,15 @@ 
 
 // Définition des images
 if (!defined('_REFERENCES_EDIT')) {
-    global $xoopsConfig;
-    if (isset($xoopsConfig) && file_exists(REFERENCES_PATH . 'language/' . $xoopsConfig['language'] . '/main.php')) {
-        require REFERENCES_PATH . 'language/' . $xoopsConfig['language'] . '/main.php';
-    } else {
-        require REFERENCES_PATH . 'language/english/main.php';
-    }
+	global $xoopsConfig;
+	if (isset($xoopsConfig) && file_exists(REFERENCES_PATH . 'language/' . $xoopsConfig['language'] . '/main.php')) {
+		require REFERENCES_PATH . 'language/' . $xoopsConfig['language'] . '/main.php';
+	} else {
+		require REFERENCES_PATH . 'language/english/main.php';
+	}
 
-    $icones = array(
-        'edit'   => "<img src='" . REFERENCES_IMAGES_URL . "edit.gif' alt='" . _REFERENCES_EDIT . "' align='middle' />",
-        'delete' => "<img src='" . REFERENCES_IMAGES_URL . "delete.gif' alt='" . _REFERENCES_DELETE . "' align='middle' />"
-    );
+	$icones = array(
+		'edit'   => "<img src='" . REFERENCES_IMAGES_URL . "edit.gif' alt='" . _REFERENCES_EDIT . "' align='middle' />",
+		'delete' => "<img src='" . REFERENCES_IMAGES_URL . "delete.gif' alt='" . _REFERENCES_DELETE . "' align='middle' />"
+	);
 }

include/search.inc.php

Indentation +57 added lines, -57 removed lines

@@ -22,66 +22,66 @@
 
 function references_search($queryarray, $andor, $limit, $offset, $userid)
 {
-    global $xoopsDB;
-    include XOOPS_ROOT_PATH . '/modules/references/include/common.php';
+	global $xoopsDB;
+	include XOOPS_ROOT_PATH . '/modules/references/include/common.php';
 
-    // Recherche dans les articles
-    $sql = 'SELECT article_id, article_title, article_text, article_timestamp, article_author FROM ' . $xoopsDB->prefix('references_articles') . ' WHERE (article_online = ' . REFERENCES_STATUS_ONLINE . ')';
-    // Permissions
-    $handlers    = references_handler::getInstance();
-    $permissions = $handlers->h_references_articles->getPermissionsCategoriesCriteria()->renderWhere();
-    $sql .= ' AND (' . trim(str_replace('WHERE ', '', $permissions)) . ')';
-    // *****
+	// Recherche dans les articles
+	$sql = 'SELECT article_id, article_title, article_text, article_timestamp, article_author FROM ' . $xoopsDB->prefix('references_articles') . ' WHERE (article_online = ' . REFERENCES_STATUS_ONLINE . ')';
+	// Permissions
+	$handlers    = references_handler::getInstance();
+	$permissions = $handlers->h_references_articles->getPermissionsCategoriesCriteria()->renderWhere();
+	$sql .= ' AND (' . trim(str_replace('WHERE ', '', $permissions)) . ')';
+	// *****
 
-    // Auteur
-    if ($userid != 0) {
-        $sql .= ' AND (article_author = ' . $userid . ') ';
-    }
+	// Auteur
+	if ($userid != 0) {
+		$sql .= ' AND (article_author = ' . $userid . ') ';
+	}
 
-    $tmpObject = new references_articles();
-    $datas     = $tmpObject->getVars();
-    $tblFields = array();
-    $cnt       = 0;
-    foreach ($datas as $key => $value) {
-        if ($value['data_type'] == XOBJ_DTYPE_TXTBOX || $value['data_type'] == XOBJ_DTYPE_TXTAREA) {
-            if ($cnt == 0) {
-                $tblFields[] = $key;
-            } else {
-                $tblFields[] = ' OR ' . $key;
-            }
-            ++$cnt;
-        }
-    }
+	$tmpObject = new references_articles();
+	$datas     = $tmpObject->getVars();
+	$tblFields = array();
+	$cnt       = 0;
+	foreach ($datas as $key => $value) {
+		if ($value['data_type'] == XOBJ_DTYPE_TXTBOX || $value['data_type'] == XOBJ_DTYPE_TXTAREA) {
+			if ($cnt == 0) {
+				$tblFields[] = $key;
+			} else {
+				$tblFields[] = ' OR ' . $key;
+			}
+			++$cnt;
+		}
+	}
 
-    $count = count($queryarray);
-    $more  = '';
-    if (is_array($queryarray) && $count > 0) {
-        $cnt = 0;
-        $sql .= ' AND (';
-        $more = ')';
-        foreach ($queryarray as $oneQuery) {
-            $sql .= '(';
-            $cond = " LIKE '%" . $oneQuery . "%' ";
-            $sql .= implode($cond, $tblFields) . $cond . ')';
-            ++$cnt;
-            if ($cnt != $count) {
-                $sql .= ' ' . $andor . ' ';
-            }
-        }
-    }
-    $sql .= $more . ' ORDER BY article_timestamp DESC';
-    $i      = 0;
-    $ret    = array();
-    $myts   = MyTextSanitizer::getInstance();
-    $result = $xoopsDB->query($sql, $limit, $offset);
-    while ($myrow = $xoopsDB->fetchArray($result)) {
-        $ret[$i]['image'] = 'assets/images/newspaper.png';
-        $ret[$i]['link']  = REFERENCES_URL . 'reference.php?article_id=' . $myrow['article_id'];
-        $ret[$i]['title'] = $myts->htmlSpecialChars($myrow['article_title']);
-        $ret[$i]['time']  = $myrow['article_timestamp'];
-        $ret[$i]['uid']   = $myrow['article_author'];
-        ++$i;
-    }
+	$count = count($queryarray);
+	$more  = '';
+	if (is_array($queryarray) && $count > 0) {
+		$cnt = 0;
+		$sql .= ' AND (';
+		$more = ')';
+		foreach ($queryarray as $oneQuery) {
+			$sql .= '(';
+			$cond = " LIKE '%" . $oneQuery . "%' ";
+			$sql .= implode($cond, $tblFields) . $cond . ')';
+			++$cnt;
+			if ($cnt != $count) {
+				$sql .= ' ' . $andor . ' ';
+			}
+		}
+	}
+	$sql .= $more . ' ORDER BY article_timestamp DESC';
+	$i      = 0;
+	$ret    = array();
+	$myts   = MyTextSanitizer::getInstance();
+	$result = $xoopsDB->query($sql, $limit, $offset);
+	while ($myrow = $xoopsDB->fetchArray($result)) {
+		$ret[$i]['image'] = 'assets/images/newspaper.png';
+		$ret[$i]['link']  = REFERENCES_URL . 'reference.php?article_id=' . $myrow['article_id'];
+		$ret[$i]['title'] = $myts->htmlSpecialChars($myrow['article_title']);
+		$ret[$i]['time']  = $myrow['article_timestamp'];
+		$ret[$i]['uid']   = $myrow['article_author'];
+		++$i;
+	}
 
-    return $ret;
+	return $ret;
 }

plugins/actions/twitter/plugins.php

Indentation +104 added lines, -104 removed lines

@@ -28,111 +28,111 @@
  */
 class referencesTwitterAction extends references_action
 {
-    public function registerEvents()
-    {
-        /**
-         * La liste des évènements traités par le plugin se présente sous la forme d'un tableau compposé comme ceci :
-         *
-         * Indice    Signification
-         * ----------------------
-         *    0        Evènement sur lequel se raccrocher (voir class/references_plugins.php::EVENT_ON_PRODUCT_CREATE
-         *    1        Priorité du plugin (de 1 à 5)
-         *    2        Script Php à inclure
-         *    3        Classe à instancier
-         *    4        Méthode à appeler
-         */
-        $events   = array();
-        $events[] = array(
-            references_plugins::EVENT_ON_REFERENCE_CREATE,
-            references_plugins::EVENT_PRIORITY_1,
-            basename(__FILE__),
-            __CLASS__,
-            'fireNewReference'
-        );
-        $events[] = array(
-            references_plugins::EVENT_ON_CATEGORY_CREATE,
-            references_plugins::EVENT_PRIORITY_1,
-            basename(__FILE__),
-            __CLASS__,
-            'fireNewCategory'
-        );
-        return $events;
-    }
+	public function registerEvents()
+	{
+		/**
+		 * La liste des évènements traités par le plugin se présente sous la forme d'un tableau compposé comme ceci :
+		 *
+		 * Indice    Signification
+		 * ----------------------
+		 *    0        Evènement sur lequel se raccrocher (voir class/references_plugins.php::EVENT_ON_PRODUCT_CREATE
+		 *    1        Priorité du plugin (de 1 à 5)
+		 *    2        Script Php à inclure
+		 *    3        Classe à instancier
+		 *    4        Méthode à appeler
+		 */
+		$events   = array();
+		$events[] = array(
+			references_plugins::EVENT_ON_REFERENCE_CREATE,
+			references_plugins::EVENT_PRIORITY_1,
+			basename(__FILE__),
+			__CLASS__,
+			'fireNewReference'
+		);
+		$events[] = array(
+			references_plugins::EVENT_ON_CATEGORY_CREATE,
+			references_plugins::EVENT_PRIORITY_1,
+			basename(__FILE__),
+			__CLASS__,
+			'fireNewCategory'
+		);
+		return $events;
+	}
 
-    /**
-     * Méthode générique chargée d'envoyer un texte sur un compte twitter avec une url
-     *
-     * @param string $textToSend Le texte à envoyer
-     * @param string $mask       Le masque à utiliser
-     * @param string $elementUrl L'url de l'élément concerné
-     * @return string                Le texte qui a été envoyé à twitter
-     */
-    private function sendTextToTwitter($textToSend, $mask, $elementUrl)
-    {
-        if (!defined('REFERENCES_TWITTER_PLUGIN_PATH')) {
-            define('REFERENCES_TWITTER_PLUGIN_PATH', REFERENCES_PLUGINS_PATH . 'actions' . DIRECTORY_SEPARATOR . 'twitter' . DIRECTORY_SEPARATOR);
-        }
-        require_once REFERENCES_TWITTER_PLUGIN_PATH . 'config.php';
-        //require_once REFERENCES_TWITTER_PLUGIN_PATH.'twitter.php';
-        require_once REFERENCES_TWITTER_PLUGIN_PATH . 'Twitter.class.php';
-        require_once REFERENCES_TWITTER_PLUGIN_PATH . 'bitly.class.php';
-        if (REFERENCES_BITLY_LOGIN == '') {
-            return '';
-        }
-        $sentText    = '';
-        $bitly       = new Bitly(REFERENCES_BITLY_LOGIN, REFERENCES_BITLY_API_KEY);
-        $shortUrl    = $bitly->shortenSingle($elementUrl);
-        $searches    = array('[itemname]', '[url]');
-        $replaces    = array($textToSend, $shortUrl);
-        $sentText    = str_replace($searches, $replaces, $mask);
-        $totalLength = strlen($sentText);
-        if ($totalLength > REFERENCES_TWITTER_TWIT_MAX_LENGTH) {
-            $tooLongOf = $totalLength - REFERENCES_TWITTER_TWIT_MAX_LENGTH;
-            $searches  = array('[itemname]', '[url]');
-            $replaces  = array(substr($textToSend, 0, strlen($textToSend) - $tooLongOf), $shortUrl);
-            $sentText  = str_replace($searches, $replaces, $mask);
-        }
-        if (trim($sentText) != '') {
-            //          $twitter = new Twitter(REFERENCES_TWITTER_USERNAME, REFERENCES_TWITTER_PASSWORD);
-            //          $twitter->setUserAgent('references');
-            //          $twitter->updateStatus($sentText);
-            $tweet = new Twitter(REFERENCES_TWITTER_USERNAME, REFERENCES_TWITTER_PASSWORD);
-            $tweet->update($sentText);
-        }
-        return $sentText;
-    }
+	/**
+	 * Méthode générique chargée d'envoyer un texte sur un compte twitter avec une url
+	 *
+	 * @param string $textToSend Le texte à envoyer
+	 * @param string $mask       Le masque à utiliser
+	 * @param string $elementUrl L'url de l'élément concerné
+	 * @return string                Le texte qui a été envoyé à twitter
+	 */
+	private function sendTextToTwitter($textToSend, $mask, $elementUrl)
+	{
+		if (!defined('REFERENCES_TWITTER_PLUGIN_PATH')) {
+			define('REFERENCES_TWITTER_PLUGIN_PATH', REFERENCES_PLUGINS_PATH . 'actions' . DIRECTORY_SEPARATOR . 'twitter' . DIRECTORY_SEPARATOR);
+		}
+		require_once REFERENCES_TWITTER_PLUGIN_PATH . 'config.php';
+		//require_once REFERENCES_TWITTER_PLUGIN_PATH.'twitter.php';
+		require_once REFERENCES_TWITTER_PLUGIN_PATH . 'Twitter.class.php';
+		require_once REFERENCES_TWITTER_PLUGIN_PATH . 'bitly.class.php';
+		if (REFERENCES_BITLY_LOGIN == '') {
+			return '';
+		}
+		$sentText    = '';
+		$bitly       = new Bitly(REFERENCES_BITLY_LOGIN, REFERENCES_BITLY_API_KEY);
+		$shortUrl    = $bitly->shortenSingle($elementUrl);
+		$searches    = array('[itemname]', '[url]');
+		$replaces    = array($textToSend, $shortUrl);
+		$sentText    = str_replace($searches, $replaces, $mask);
+		$totalLength = strlen($sentText);
+		if ($totalLength > REFERENCES_TWITTER_TWIT_MAX_LENGTH) {
+			$tooLongOf = $totalLength - REFERENCES_TWITTER_TWIT_MAX_LENGTH;
+			$searches  = array('[itemname]', '[url]');
+			$replaces  = array(substr($textToSend, 0, strlen($textToSend) - $tooLongOf), $shortUrl);
+			$sentText  = str_replace($searches, $replaces, $mask);
+		}
+		if (trim($sentText) != '') {
+			//          $twitter = new Twitter(REFERENCES_TWITTER_USERNAME, REFERENCES_TWITTER_PASSWORD);
+			//          $twitter->setUserAgent('references');
+			//          $twitter->updateStatus($sentText);
+			$tweet = new Twitter(REFERENCES_TWITTER_USERNAME, REFERENCES_TWITTER_PASSWORD);
+			$tweet->update($sentText);
+		}
+		return $sentText;
+	}
 
-    /**
-     * Méthode appelée pour indiquer qu'une nouvelle référence a été publié
-     *
-     * @param object $parameters La référence qui vient d'être publiée
-     * @return void
-     */
-    public function fireNewReference($parameters)
-    {
-        if (!defined('REFERENCES_TWITTER_PLUGIN_PATH')) {
-            define('REFERENCES_TWITTER_PLUGIN_PATH', REFERENCES_PLUGINS_PATH . 'actions' . DIRECTORY_SEPARATOR . 'twitter' . DIRECTORY_SEPARATOR);
-        }
-        require_once REFERENCES_TWITTER_PLUGIN_PATH . 'config.php';
-        $reference = $parameters['reference'];
-        $this->sendTextToTwitter(utf8_encode($reference->getVar('article_title', 'n')), utf8_encode(REFERENCES_TWITTER_NEW_REFERENCE_INTRO), $reference->getUrl());
-    }
+	/**
+	 * Méthode appelée pour indiquer qu'une nouvelle référence a été publié
+	 *
+	 * @param object $parameters La référence qui vient d'être publiée
+	 * @return void
+	 */
+	public function fireNewReference($parameters)
+	{
+		if (!defined('REFERENCES_TWITTER_PLUGIN_PATH')) {
+			define('REFERENCES_TWITTER_PLUGIN_PATH', REFERENCES_PLUGINS_PATH . 'actions' . DIRECTORY_SEPARATOR . 'twitter' . DIRECTORY_SEPARATOR);
+		}
+		require_once REFERENCES_TWITTER_PLUGIN_PATH . 'config.php';
+		$reference = $parameters['reference'];
+		$this->sendTextToTwitter(utf8_encode($reference->getVar('article_title', 'n')), utf8_encode(REFERENCES_TWITTER_NEW_REFERENCE_INTRO), $reference->getUrl());
+	}
 
-    /**
-     * Méthode appelée pour indiquer qu'une nouvelle catégorie de références a été créée
-     *
-     * @param object $parameters La catégorie qui vient d'être publiée
-     * @return void
-     */
-    public function fireNewCategory($parameters)
-    {
-        if (!defined('REFERENCES_TWITTER_PLUGIN_PATH')) {
-            define('REFERENCES_TWITTER_PLUGIN_PATH', REFERENCES_PLUGINS_PATH . 'actions' . DIRECTORY_SEPARATOR . 'twitter' . DIRECTORY_SEPARATOR);
-        }
-        require_once REFERENCES_TWITTER_PLUGIN_PATH . 'config.php';
-        if (trim(REFERENCES_TWITTER_NEW_CATEGORY_INTRO) != '') {
-            $category = $parameters['category'];
-            $this->sendTextToTwitter(utf8_encode($category->getVar('category_title', 'n')), utf8_encode(REFERENCES_TWITTER_NEW_CATEGORY_INTRO), $category->getUrl());
-        }
-    }
+	/**
+	 * Méthode appelée pour indiquer qu'une nouvelle catégorie de références a été créée
+	 *
+	 * @param object $parameters La catégorie qui vient d'être publiée
+	 * @return void
+	 */
+	public function fireNewCategory($parameters)
+	{
+		if (!defined('REFERENCES_TWITTER_PLUGIN_PATH')) {
+			define('REFERENCES_TWITTER_PLUGIN_PATH', REFERENCES_PLUGINS_PATH . 'actions' . DIRECTORY_SEPARATOR . 'twitter' . DIRECTORY_SEPARATOR);
+		}
+		require_once REFERENCES_TWITTER_PLUGIN_PATH . 'config.php';
+		if (trim(REFERENCES_TWITTER_NEW_CATEGORY_INTRO) != '') {
+			$category = $parameters['category'];
+			$this->sendTextToTwitter(utf8_encode($category->getVar('category_title', 'n')), utf8_encode(REFERENCES_TWITTER_NEW_CATEGORY_INTRO), $category->getUrl());
+		}
+	}
 }

plugins/models/references_action.php

Indentation +5 added lines, -5 removed lines

@@ -26,9 +26,9 @@
 
 abstract class references_action
 {
-    /**
-     * Retourne la liste des évènements traités par le plugin
-     * @return array
-     */
-    abstract public function registerEvents();
+	/**
+	 * Retourne la liste des évènements traités par le plugin
+	 * @return array
+	 */
+	abstract public function registerEvents();
 }

plugins/models/references_filter.php

Indentation +5 added lines, -5 removed lines

@@ -26,9 +26,9 @@
 
 abstract class references_filter
 {
-    /**
-     * Retourne la liste des évènements traités par le plugin
-     * @return array
-     */
-    abstract public function registerEvents();
+	/**
+	 * Retourne la liste des évènements traités par le plugin
+	 * @return array
+	 */
+	abstract public function registerEvents();
 }

class/references_articles.php

Indentation +603 added lines, -603 removed lines

@@ -22,7 +22,7 @@ 
 
 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';
 }
 
 define('REFERENCES_STATUS_ONLINE', 1);    // Articles en ligne
@@ -30,610 +30,610 @@ 
 
 class references_articles extends references_Object
 {
-    public function __construct()
-    {
-        $this->initVar('article_id', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('article_category_id', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('article_timestamp', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('article_weight', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('article_date', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_title', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_text', XOBJ_DTYPE_TXTAREA, null, false);
-        $this->initVar('article_externalurl', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture1', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture1_text', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture2', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture2_text', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture3', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture3_text', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture4', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture4_text', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture5', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture5_text', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture6', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture6_text', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture7', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture7_text', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture8', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture8_text', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture9', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture9_text', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture10', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_picture10_text', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_author', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('article_online', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('article_attached_file', XOBJ_DTYPE_TXTBOX, null, false);
-        $this->initVar('article_readmore', XOBJ_DTYPE_TXTAREA, null, false);
-
-        // Pour autoriser le html
-        $this->initVar('dohtml', XOBJ_DTYPE_INT, 1, false);
-    }
-
-    /**
-     * Indique si l'article en cours est visible
-     *
-     * @return boolean
-     */
-    public function isArticleOnline()
-    {
-        return $this->getVar('article_online') == REFERENCES_STATUS_ONLINE ? true : false;
-    }
-
-    /**
-     * Retourne une image qui indique si l'article est en ligne ou pas
-     *
-     * @return string
-     */
-    public function getOnlinePicture()
-    {
-        if ($this->isArticleOnline()) {
-            return REFERENCES_IMAGES_URL . 'status_online.png';
-        } else {
-            return REFERENCES_IMAGES_URL . 'status_offline.png';
-        }
-    }
-
-    /**
-     * 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('article_title'));
-    }
-
-    /**
-     * Indique si une image de l'article existe
-     *
-     * @param integer $indice L'indice de l'image recherchée
-     * @return boolean Vrai si l'image existe sinon faux
-     */
-    public function pictureExists($indice)
-    {
-        $return    = false;
-        $fieldName = 'article_picture' . $indice;
-        if (xoops_trim($this->getVar($fieldName)) != '' && file_exists(references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . $this->getVar($fieldName))) {
-            $return = true;
-        }
-
-        return $return;
-    }
-
-    /**
-     * Supprime l'image associée à un article
-     *
-     * @param integer $indice L'indice de l'image recherchée
-     * @return void
-     */
-    public function deletePicture($indice)
-    {
-        $fieldName = 'article_picture' . $indice;
-        if ($this->pictureExists($indice)) {
-            @unlink(references_utils::getModuleOption('images_path') . references_utils::getModuleOption('images_path') . $this->getVar($fieldName));
-        }
-        $this->setVar($fieldName, '');
-    }
-
-    /**
-     * Retourne l'URL de l'image de l'article courant
-     *
-     * @param integer $indice L'indice de l'image recherchée
-     * @return string  L'URL
-     */
-    public function getPictureUrl($indice)
-    {
-        $fieldName = 'article_picture' . $indice;
-        if (xoops_trim($this->getVar($fieldName)) != '' && $this->pictureExists($indice)) {
-            return references_utils::getModuleOption('images_url') . '/' . $this->getVar($fieldName);
-        } else {
-            return REFERENCES_IMAGES_URL . 'blank.gif';
-        }
-    }
-
-    /**
-     * Retourne le chemin de l'image de l'article courante
-     *
-     * @param integer $indice L'indice de l'image recherchée
-     * @return string  Le chemin
-     */
-    public function getPicturePath($indice)
-    {
-        $fieldName = 'article_picture' . $indice;
-        if (xoops_trim($this->getVar($fieldName)) != '') {
-            return references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . $this->getVar($fieldName);
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Indique si la vignette de l'image de l'article existe
-     *
-     * @param integer $indice L'indice de l'image recherchée
-     * @return boolean Vrai si l'image existe sinon faux
-     */
-    public function thumbExists($indice)
-    {
-        $fieldName = 'article_picture' . $indice;
-        $return    = false;
-        if (xoops_trim($this->getVar($fieldName)) != '' && file_exists(references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . REFERENCES_THUMBS_PREFIX . $this->getVar($fieldName))) {
-            $return = true;
-        }
-
-        return $return;
-    }
-
-    /**
-     * Retourne l'URL de la vignette de l'article
-     *
-     * @param integer $indice L'indice de l'image recherchée
-     * @return string  L'URL
-     */
-    public function getThumbUrl($indice)
-    {
-        $fieldName = 'article_picture' . $indice;
-        if (xoops_trim($this->getVar($fieldName)) != '') {
-            return references_utils::getModuleOption('images_url') . '/' . REFERENCES_THUMBS_PREFIX . $this->getVar($fieldName);
-        } else {
-            return REFERENCES_IMAGES_URL . 'blank.gif';
-        }
-    }
-
-    /**
-     * Retourne le chemin de la vignette de l'annonce
-     *
-     * @param integer $indice L'indice de l'image recherchée
-     * @return string  L'URL
-     */
-    public function getThumbPath($indice)
-    {
-        $fieldName = 'article_picture' . $indice;
-        if (xoops_trim($this->getVar($fieldName)) != '') {
-            return references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . REFERENCES_THUMBS_PREFIX . $this->getVar($fieldName);
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Indique si le fichier attaché à un article existe
-     *
-     * @return boolean
-     */
-    public function attachmentExists()
-    {
-        $return = false;
-        if (xoops_trim($this->getVar('article_attached_file')) != '' && file_exists(references_utils::getModuleOption('attached_path') . DIRECTORY_SEPARATOR . $this->getVar('article_attached_file'))) {
-            $return = true;
-        }
-
-        return $return;
-    }
-
-    /**
-     * Retourne l'URL du fichier attaché
-     *
-     * @return string    L'url du fichier attaché sinon une chaine vide
-     */
-    public function getAttachmentUrl()
-    {
-        if (xoops_trim($this->getVar('article_attached_file')) != '' && $this->attachmentExists()) {
-            return references_utils::getModuleOption('attached_url') . '/' . $this->getVar('article_attached_file');
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Retourne le chemin du fichier attaché
-     *
-     * @return string    Le chemin du fichier attaché sinon une chaine vide
-     */
-    public function getAttachmentPath()
-    {
-        if (xoops_trim($this->getVar('article_attached_file')) != '' && $this->attachmentExists()) {
-            return references_utils::getModuleOption('attached_path') . DIRECTORY_SEPARATOR . $this->getVar('article_attached_file');
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Supprime le fichier attaché à un article
-     */
-    public function deleteAttachment()
-    {
-        if ($this->attachmentExists()) {
-            @unlink(references_utils::getModuleOption('attached_path') . DIRECTORY_SEPARATOR . $this->getVar('article_attached_file'));
-        }
-        $this->setVar('article_attached_file', '');
-    }
-
-    /**
-     * Supprime la miniature associée à l'article
-     *
-     * @param integer $indice L'indice de l'image recherchée
-     * @return void
-     */
-    public function deleteThumb($indice)
-    {
-        $fieldName = 'article_picture' . $indice;
-        if ($this->thumbExists($indice)) {
-            @unlink(references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . REFERENCES_THUMBS_PREFIX . $this->getVar($fieldName));
-        }
-    }
-
-    /**
-     * Supprime l'image (et vignette) d'un article (raccourcis)
-     *
-     * @return void
-     */
-    public function deletePicturesAndThumbs()
-    {
-        for ($i = 1; $i <= 10; ++$i) {
-            $this->deleteThumb($i);
-            $this->deletePicture($i);
-        }
-    }
-
-    /**
-     * Retourne le timestamp de création formaté
-     *
-     * @return string
-     */
-    public function getFormatedTimeStamp()
-    {
-        return formatTimestamp($this->getVar('article_timestamp'), 's');
-    }
-
-    /**
-     * Indique s'il existe au moins une image pour l'article
-     *
-     * @return boolean
-     */
-    public function isThereAPicture()
-    {
-        for ($i = 1; $i <= 10; ++$i) {
-            if ($this->pictureExists($i)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Inidique s'il existe au moins une vignette pour l'article
-     *
-     * @return boolean
-     */
-    public function isThereAThumb()
-    {
-        for ($i = 1; $i <= 10; ++$i) {
-            if ($this->thumbExists($i)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Retourne l'url pour atteindre l'élément
-     *
-     * @param bool $shortVersion
-     * @return string
-     */
-    public function getUrl($shortVersion = false)
-    {
-        if (!$shortVersion) {
-            return REFERENCES_URL . 'reference.php?article_id=' . $this->getVar('article_id');
-        } else {
-            return 'reference.php?article_id=' . $this->getVar('article_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);
-        $hrefTitle                 = $this->getHrefTitle();
-        $ret['article_href_title'] = $hrefTitle;
-        $ret['article_url']        = $this->getUrl();
-        // Indique si une annonce est expirée
-        $ret['article_is_online'] = $this->isArticleOnline();
-        if ($this->isThereAPicture()) {
-            $ret['article_picture_exists'] = true;
-            for ($i = 1; $i <= 10; ++$i) {
-                if ($this->pictureExists($i)) {
-                    $ret['article_picture_url' . $i]  = $this->getPictureUrl($i);
-                    $ret['article_picture_path' . $i] = $this->getPicturePath($i);
-                    $ret['article_pictures_urls'][]   = $this->getPictureUrl($i);
-                    $ret['article_pictures_paths'][]  = $this->getPicturePath($i);
-                    $fieldName                        = 'article_picture' . $i . '_text';
-                    if (xoops_trim($this->getVar($fieldName)) != '') {
-                        $ret['article_pictures_texts'][] = references_utils::makeHrefTitle($this->getVar($fieldName));
-                    } else {
-                        $ret['article_pictures_texts'][] = $hrefTitle;
-                    }
-                }
-            }
-        } else {
-            $ret['article_picture_exists'] = false;
-        }
-        $ret['article_short_text'] = references_utils::truncate_tagsafe($this->getVar('article_text'), REFERENCES_SHORTEN_TEXT);
-
-        if ($this->attachmentExists()) {
-            $ret['article_attachment_exists'] = true;
-            $ret['article_attachment_url']    = $this->getAttachmentUrl();
-            $ret['article_attachment_path']   = $this->getAttachmentPath();
-        } else {
-            $ret['attachment_exists'] = false;
-        }
-
-        if ($this->isThereAThumb()) {
-            $ret['article_thumb_exists'] = true;
-            for ($i = 1; $i <= 10; ++$i) {
-                if ($this->thumbExists($i)) {
-                    $ret['article_thumb_url' . $i]  = $this->getThumbUrl($i);
-                    $ret['article_thumb_path' . $i] = $this->getThumbPath($i);
-                    $ret['article_thumbs_urls'][]   = $this->getThumbUrl($i);
-                    $ret['article_thumbs_paths'][]  = $this->getThumbPath($i);
-                }
-            }
-        } else {
-            $ret['article_thumb_exists'] = false;
-        }
-
-        $ret['article_timestamp_formated'] = $this->getFormatedTimeStamp();
-
-        return $ret;
-    }
+	public function __construct()
+	{
+		$this->initVar('article_id', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('article_category_id', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('article_timestamp', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('article_weight', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('article_date', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_title', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_text', XOBJ_DTYPE_TXTAREA, null, false);
+		$this->initVar('article_externalurl', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture1', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture1_text', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture2', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture2_text', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture3', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture3_text', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture4', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture4_text', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture5', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture5_text', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture6', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture6_text', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture7', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture7_text', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture8', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture8_text', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture9', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture9_text', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture10', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_picture10_text', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_author', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('article_online', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('article_attached_file', XOBJ_DTYPE_TXTBOX, null, false);
+		$this->initVar('article_readmore', XOBJ_DTYPE_TXTAREA, null, false);
+
+		// Pour autoriser le html
+		$this->initVar('dohtml', XOBJ_DTYPE_INT, 1, false);
+	}
+
+	/**
+	 * Indique si l'article en cours est visible
+	 *
+	 * @return boolean
+	 */
+	public function isArticleOnline()
+	{
+		return $this->getVar('article_online') == REFERENCES_STATUS_ONLINE ? true : false;
+	}
+
+	/**
+	 * Retourne une image qui indique si l'article est en ligne ou pas
+	 *
+	 * @return string
+	 */
+	public function getOnlinePicture()
+	{
+		if ($this->isArticleOnline()) {
+			return REFERENCES_IMAGES_URL . 'status_online.png';
+		} else {
+			return REFERENCES_IMAGES_URL . 'status_offline.png';
+		}
+	}
+
+	/**
+	 * 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('article_title'));
+	}
+
+	/**
+	 * Indique si une image de l'article existe
+	 *
+	 * @param integer $indice L'indice de l'image recherchée
+	 * @return boolean Vrai si l'image existe sinon faux
+	 */
+	public function pictureExists($indice)
+	{
+		$return    = false;
+		$fieldName = 'article_picture' . $indice;
+		if (xoops_trim($this->getVar($fieldName)) != '' && file_exists(references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . $this->getVar($fieldName))) {
+			$return = true;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Supprime l'image associée à un article
+	 *
+	 * @param integer $indice L'indice de l'image recherchée
+	 * @return void
+	 */
+	public function deletePicture($indice)
+	{
+		$fieldName = 'article_picture' . $indice;
+		if ($this->pictureExists($indice)) {
+			@unlink(references_utils::getModuleOption('images_path') . references_utils::getModuleOption('images_path') . $this->getVar($fieldName));
+		}
+		$this->setVar($fieldName, '');
+	}
+
+	/**
+	 * Retourne l'URL de l'image de l'article courant
+	 *
+	 * @param integer $indice L'indice de l'image recherchée
+	 * @return string  L'URL
+	 */
+	public function getPictureUrl($indice)
+	{
+		$fieldName = 'article_picture' . $indice;
+		if (xoops_trim($this->getVar($fieldName)) != '' && $this->pictureExists($indice)) {
+			return references_utils::getModuleOption('images_url') . '/' . $this->getVar($fieldName);
+		} else {
+			return REFERENCES_IMAGES_URL . 'blank.gif';
+		}
+	}
+
+	/**
+	 * Retourne le chemin de l'image de l'article courante
+	 *
+	 * @param integer $indice L'indice de l'image recherchée
+	 * @return string  Le chemin
+	 */
+	public function getPicturePath($indice)
+	{
+		$fieldName = 'article_picture' . $indice;
+		if (xoops_trim($this->getVar($fieldName)) != '') {
+			return references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . $this->getVar($fieldName);
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * Indique si la vignette de l'image de l'article existe
+	 *
+	 * @param integer $indice L'indice de l'image recherchée
+	 * @return boolean Vrai si l'image existe sinon faux
+	 */
+	public function thumbExists($indice)
+	{
+		$fieldName = 'article_picture' . $indice;
+		$return    = false;
+		if (xoops_trim($this->getVar($fieldName)) != '' && file_exists(references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . REFERENCES_THUMBS_PREFIX . $this->getVar($fieldName))) {
+			$return = true;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Retourne l'URL de la vignette de l'article
+	 *
+	 * @param integer $indice L'indice de l'image recherchée
+	 * @return string  L'URL
+	 */
+	public function getThumbUrl($indice)
+	{
+		$fieldName = 'article_picture' . $indice;
+		if (xoops_trim($this->getVar($fieldName)) != '') {
+			return references_utils::getModuleOption('images_url') . '/' . REFERENCES_THUMBS_PREFIX . $this->getVar($fieldName);
+		} else {
+			return REFERENCES_IMAGES_URL . 'blank.gif';
+		}
+	}
+
+	/**
+	 * Retourne le chemin de la vignette de l'annonce
+	 *
+	 * @param integer $indice L'indice de l'image recherchée
+	 * @return string  L'URL
+	 */
+	public function getThumbPath($indice)
+	{
+		$fieldName = 'article_picture' . $indice;
+		if (xoops_trim($this->getVar($fieldName)) != '') {
+			return references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . REFERENCES_THUMBS_PREFIX . $this->getVar($fieldName);
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * Indique si le fichier attaché à un article existe
+	 *
+	 * @return boolean
+	 */
+	public function attachmentExists()
+	{
+		$return = false;
+		if (xoops_trim($this->getVar('article_attached_file')) != '' && file_exists(references_utils::getModuleOption('attached_path') . DIRECTORY_SEPARATOR . $this->getVar('article_attached_file'))) {
+			$return = true;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Retourne l'URL du fichier attaché
+	 *
+	 * @return string    L'url du fichier attaché sinon une chaine vide
+	 */
+	public function getAttachmentUrl()
+	{
+		if (xoops_trim($this->getVar('article_attached_file')) != '' && $this->attachmentExists()) {
+			return references_utils::getModuleOption('attached_url') . '/' . $this->getVar('article_attached_file');
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * Retourne le chemin du fichier attaché
+	 *
+	 * @return string    Le chemin du fichier attaché sinon une chaine vide
+	 */
+	public function getAttachmentPath()
+	{
+		if (xoops_trim($this->getVar('article_attached_file')) != '' && $this->attachmentExists()) {
+			return references_utils::getModuleOption('attached_path') . DIRECTORY_SEPARATOR . $this->getVar('article_attached_file');
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * Supprime le fichier attaché à un article
+	 */
+	public function deleteAttachment()
+	{
+		if ($this->attachmentExists()) {
+			@unlink(references_utils::getModuleOption('attached_path') . DIRECTORY_SEPARATOR . $this->getVar('article_attached_file'));
+		}
+		$this->setVar('article_attached_file', '');
+	}
+
+	/**
+	 * Supprime la miniature associée à l'article
+	 *
+	 * @param integer $indice L'indice de l'image recherchée
+	 * @return void
+	 */
+	public function deleteThumb($indice)
+	{
+		$fieldName = 'article_picture' . $indice;
+		if ($this->thumbExists($indice)) {
+			@unlink(references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . REFERENCES_THUMBS_PREFIX . $this->getVar($fieldName));
+		}
+	}
+
+	/**
+	 * Supprime l'image (et vignette) d'un article (raccourcis)
+	 *
+	 * @return void
+	 */
+	public function deletePicturesAndThumbs()
+	{
+		for ($i = 1; $i <= 10; ++$i) {
+			$this->deleteThumb($i);
+			$this->deletePicture($i);
+		}
+	}
+
+	/**
+	 * Retourne le timestamp de création formaté
+	 *
+	 * @return string
+	 */
+	public function getFormatedTimeStamp()
+	{
+		return formatTimestamp($this->getVar('article_timestamp'), 's');
+	}
+
+	/**
+	 * Indique s'il existe au moins une image pour l'article
+	 *
+	 * @return boolean
+	 */
+	public function isThereAPicture()
+	{
+		for ($i = 1; $i <= 10; ++$i) {
+			if ($this->pictureExists($i)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Inidique s'il existe au moins une vignette pour l'article
+	 *
+	 * @return boolean
+	 */
+	public function isThereAThumb()
+	{
+		for ($i = 1; $i <= 10; ++$i) {
+			if ($this->thumbExists($i)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Retourne l'url pour atteindre l'élément
+	 *
+	 * @param bool $shortVersion
+	 * @return string
+	 */
+	public function getUrl($shortVersion = false)
+	{
+		if (!$shortVersion) {
+			return REFERENCES_URL . 'reference.php?article_id=' . $this->getVar('article_id');
+		} else {
+			return 'reference.php?article_id=' . $this->getVar('article_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);
+		$hrefTitle                 = $this->getHrefTitle();
+		$ret['article_href_title'] = $hrefTitle;
+		$ret['article_url']        = $this->getUrl();
+		// Indique si une annonce est expirée
+		$ret['article_is_online'] = $this->isArticleOnline();
+		if ($this->isThereAPicture()) {
+			$ret['article_picture_exists'] = true;
+			for ($i = 1; $i <= 10; ++$i) {
+				if ($this->pictureExists($i)) {
+					$ret['article_picture_url' . $i]  = $this->getPictureUrl($i);
+					$ret['article_picture_path' . $i] = $this->getPicturePath($i);
+					$ret['article_pictures_urls'][]   = $this->getPictureUrl($i);
+					$ret['article_pictures_paths'][]  = $this->getPicturePath($i);
+					$fieldName                        = 'article_picture' . $i . '_text';
+					if (xoops_trim($this->getVar($fieldName)) != '') {
+						$ret['article_pictures_texts'][] = references_utils::makeHrefTitle($this->getVar($fieldName));
+					} else {
+						$ret['article_pictures_texts'][] = $hrefTitle;
+					}
+				}
+			}
+		} else {
+			$ret['article_picture_exists'] = false;
+		}
+		$ret['article_short_text'] = references_utils::truncate_tagsafe($this->getVar('article_text'), REFERENCES_SHORTEN_TEXT);
+
+		if ($this->attachmentExists()) {
+			$ret['article_attachment_exists'] = true;
+			$ret['article_attachment_url']    = $this->getAttachmentUrl();
+			$ret['article_attachment_path']   = $this->getAttachmentPath();
+		} else {
+			$ret['attachment_exists'] = false;
+		}
+
+		if ($this->isThereAThumb()) {
+			$ret['article_thumb_exists'] = true;
+			for ($i = 1; $i <= 10; ++$i) {
+				if ($this->thumbExists($i)) {
+					$ret['article_thumb_url' . $i]  = $this->getThumbUrl($i);
+					$ret['article_thumb_path' . $i] = $this->getThumbPath($i);
+					$ret['article_thumbs_urls'][]   = $this->getThumbUrl($i);
+					$ret['article_thumbs_paths'][]  = $this->getThumbPath($i);
+				}
+			}
+		} else {
+			$ret['article_thumb_exists'] = false;
+		}
+
+		$ret['article_timestamp_formated'] = $this->getFormatedTimeStamp();
+
+		return $ret;
+	}
 }
 
 class ReferencesReferences_articlesHandler extends references_XoopsPersistableObjectHandler
 {
-    public function __construct($db)
-    {    //                         Table                   Classe                Id            Descr.
-        parent::__construct($db, 'references_articles', 'references_articles', 'article_id', 'article_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 (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('article_category_id', '(' . implode(',', $categories) . ')', 'IN');
-        } else {    // Ne peut rien voir
-            $permissions[$permissionsType] = new Criteria('article_category_id', '0', '=');
-        }
-
-        return $permissions[$permissionsType];
-    }
-
-    /**
-     * Retourne les articles récents en tenant compte des permissions de consultation sur 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
-     * @param  boolean $onlyOnline Uniquement les articles en ligne ?
-     * @param integer  $categoryId Identifiant d'une catégorie à laquelle se limiter
-     * @return array   Objets de type references_articles
-     */
-    public function getRecentArticles($start = 0, $limit = 0, $sort = 'article_timestamp', $order = 'DESC', $onlyOnline = true, $categoryId = 0)
-    {
-        $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('article_id', 0, '<>'));
-        $criteria->add($this->getPermissionsCategoriesCriteria());
-        if ($onlyOnline) {
-            $criteria->add(new Criteria('article_online', REFERENCES_STATUS_ONLINE, '='));
-        }
-        if (is_array($categoryId) && count($categoryId) > 0) {
-            $criteria->add(new Criteria('article_category_id', '(' . implode(',', $categoryId) . ')', 'IN'));
-        } elseif ($categoryId > 0) {
-            $criteria->add(new Criteria('article_category_id', $categoryId, '='));
-        }
-        $criteria->setStart($start);
-        $criteria->setSort($sort);
-        $criteria->setOrder($order);
-        $criteria->setLimit($limit);
-
-        return $this->getObjects($criteria);
-    }
-
-    /**
-     * Retourne le nombre total d'articles en ligne
-     *
-     * @return integer
-     */
-    public function getOnlineArticlesCount()
-    {
-        return $this->getCount(new Criteria('article_online', REFERENCES_STATUS_ONLINE, '='));
-    }
-
-    /**
-     * Notification de la publication d'une nouvelle référence
-     *
-     * @param object|references_articles $article L'annonce pour laquelle on fait la notification
-     * @return bool
-     */
-    public function notifyNewArticle(references_articles $article)
-    {
-        $plugins = references_plugins::getInstance();
-        $plugins->fireAction(references_plugins::EVENT_ON_REFERENCE_CREATE, new references_parameters(array('reference' => $article)));
-
-        return true;
-    }
-
-    /**
-     * Effectue la suppression d'un article (et de ses images et fichier attaché)
-     *
-     * @param references_articles $article L'article à supprimer
-     * @return boolean    Le résultat de la suppression
-     */
-    public function deleteArticle(references_articles $article)
-    {
-        $article->deletePicturesAndThumbs();
-        $article->deleteAttachment();
-
-        return $this->delete($article, true);
-    }
-
-    /**
-     * Retourne la liste des catégories uniques utilisées par les références
-     *
-     */
-    public function getDistinctCategoriesIds()
-    {
-        $ret = array();
-        $sql = 'SELECT distinct(article_category_id) FROM ' . $this->table;
-        $sql .= ' ' . $this->getPermissionsCategoriesCriteria()->renderWhere();    // Permissions
-        $sql .= ' GROUP BY article_category_id ORDER BY article_category_id';
-        $result = $this->db->query($sql);
-        if (!$result) {
-            return $ret;
-        }
-        while ($row = $this->db->fetchArray($result)) {
-            $ret[$row['article_category_id']] = $row['article_category_id'];
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Passe un article en ligne
-     *
-     * @param  references_articles $article
-     * @return boolean
-     */
-    public function onlineArticle(references_articles $article)
-    {
-        $article->setVar('article_online', REFERENCES_STATUS_ONLINE);
-
-        return $this->insert($article, true);
-    }
-
-    /**
-     * Passe un article hors ligne
-     *
-     * @param  references_articles $article
-     * @return boolean
-     */
-    public function offlineArticle(references_articles $article)
-    {
-        $article->setVar('article_online', REFERENCES_STATUS_OFFLINE);
-
-        return $this->insert($article, true);
-    }
-
-    /**
-     * Indique si une référence est visible d'un utilisateur
-     *
-     * @param object|references_articles $article L'article à controler
-     * @param integer                    $uid     L'id de l'utilisateur à controler
-     * @return bool
-     */
-    public function userCanSeeReference(references_articles $article, $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, $article->article_category_id, references_utils::getMemberGroups($uid), $currentModule->getVar('mid'));
-    }
-
-    /**
-     * Remonte un article d'un cran dans l'ordre global des articles
-     *
-     * @param  integer $currentId    L'ID de l'article courant dont on souhaite remonter l'ordre
-     * @param integer  $currentOrder L'ordre de l'élément courant à remonter
-     * @return void
-     */
-    public function moveUp($currentId, $currentOrder)
-    {
-        $sql_plus = 'SELECT article_id FROM ' . $this->table . ' WHERE article_weight = ' . ((int)$currentOrder - 1);
-        $res_plus = $this->db->query($sql_plus);
-        if ($this->db->getRowsNum($res_plus) == 0) {
-            return;
-        }
-        $row_plus = $this->db->fetchArray($res_plus);
-
-        $upd1 = 'UPDATE ' . $this->table . ' SET article_weight = (article_weight + 1) WHERE article_id = ' . $row_plus['article_id'];
-        $this->db->queryF($upd1);
-
-        $upd2 = 'UPDATE ' . $this->table . ' SET article_weight = (article_weight - 1) WHERE article_id = ' . (int)$currentId;
-        $this->db->queryF($upd2);
-        $this->forceCacheClean();
-    }
-
-    /**
-     * Descend un article d'un cran dans l'ordre global des articles
-     *
-     * @param  integer $currentId    L'Id de l'article courant dont on souhaite descendre l'ordre
-     * @param integer  $currentOrder L'orde de l'élément courant à remonter
-     * @return void
-     */
-    public function moveDown($currentId, $currentOrder)
-    {
-        $sql_moins = 'SELECT article_id FROM ' . $this->table . ' WHERE article_weight = ' . ((int)$currentOrder + 1);
-        $res_moins = $this->db->query($sql_moins);
-        if ($this->db->getRowsNum($res_moins) == 0) {
-            return;
-        }
-
-        $row_moins = $this->db->fetchArray($res_moins);
-        $upd1      = 'UPDATE ' . $this->table . ' SET article_weight = (article_weight - 1) WHERE article_id = ' . $row_moins['article_id'];
-        $this->db->queryF($upd1);
-
-        $upd2 = 'UPDATE ' . $this->table . ' SET article_weight =( article_weight + 1) WHERE article_id = ' . (int)$currentId;
-        $this->db->queryF($upd2);
-        $this->forceCacheClean();
-    }
+	public function __construct($db)
+	{    //                         Table                   Classe                Id            Descr.
+		parent::__construct($db, 'references_articles', 'references_articles', 'article_id', 'article_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 (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('article_category_id', '(' . implode(',', $categories) . ')', 'IN');
+		} else {    // Ne peut rien voir
+			$permissions[$permissionsType] = new Criteria('article_category_id', '0', '=');
+		}
+
+		return $permissions[$permissionsType];
+	}
+
+	/**
+	 * Retourne les articles récents en tenant compte des permissions de consultation sur 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
+	 * @param  boolean $onlyOnline Uniquement les articles en ligne ?
+	 * @param integer  $categoryId Identifiant d'une catégorie à laquelle se limiter
+	 * @return array   Objets de type references_articles
+	 */
+	public function getRecentArticles($start = 0, $limit = 0, $sort = 'article_timestamp', $order = 'DESC', $onlyOnline = true, $categoryId = 0)
+	{
+		$criteria = new CriteriaCompo();
+		$criteria->add(new Criteria('article_id', 0, '<>'));
+		$criteria->add($this->getPermissionsCategoriesCriteria());
+		if ($onlyOnline) {
+			$criteria->add(new Criteria('article_online', REFERENCES_STATUS_ONLINE, '='));
+		}
+		if (is_array($categoryId) && count($categoryId) > 0) {
+			$criteria->add(new Criteria('article_category_id', '(' . implode(',', $categoryId) . ')', 'IN'));
+		} elseif ($categoryId > 0) {
+			$criteria->add(new Criteria('article_category_id', $categoryId, '='));
+		}
+		$criteria->setStart($start);
+		$criteria->setSort($sort);
+		$criteria->setOrder($order);
+		$criteria->setLimit($limit);
+
+		return $this->getObjects($criteria);
+	}
+
+	/**
+	 * Retourne le nombre total d'articles en ligne
+	 *
+	 * @return integer
+	 */
+	public function getOnlineArticlesCount()
+	{
+		return $this->getCount(new Criteria('article_online', REFERENCES_STATUS_ONLINE, '='));
+	}
+
+	/**
+	 * Notification de la publication d'une nouvelle référence
+	 *
+	 * @param object|references_articles $article L'annonce pour laquelle on fait la notification
+	 * @return bool
+	 */
+	public function notifyNewArticle(references_articles $article)
+	{
+		$plugins = references_plugins::getInstance();
+		$plugins->fireAction(references_plugins::EVENT_ON_REFERENCE_CREATE, new references_parameters(array('reference' => $article)));
+
+		return true;
+	}
+
+	/**
+	 * Effectue la suppression d'un article (et de ses images et fichier attaché)
+	 *
+	 * @param references_articles $article L'article à supprimer
+	 * @return boolean    Le résultat de la suppression
+	 */
+	public function deleteArticle(references_articles $article)
+	{
+		$article->deletePicturesAndThumbs();
+		$article->deleteAttachment();
+
+		return $this->delete($article, true);
+	}
+
+	/**
+	 * Retourne la liste des catégories uniques utilisées par les références
+	 *
+	 */
+	public function getDistinctCategoriesIds()
+	{
+		$ret = array();
+		$sql = 'SELECT distinct(article_category_id) FROM ' . $this->table;
+		$sql .= ' ' . $this->getPermissionsCategoriesCriteria()->renderWhere();    // Permissions
+		$sql .= ' GROUP BY article_category_id ORDER BY article_category_id';
+		$result = $this->db->query($sql);
+		if (!$result) {
+			return $ret;
+		}
+		while ($row = $this->db->fetchArray($result)) {
+			$ret[$row['article_category_id']] = $row['article_category_id'];
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Passe un article en ligne
+	 *
+	 * @param  references_articles $article
+	 * @return boolean
+	 */
+	public function onlineArticle(references_articles $article)
+	{
+		$article->setVar('article_online', REFERENCES_STATUS_ONLINE);
+
+		return $this->insert($article, true);
+	}
+
+	/**
+	 * Passe un article hors ligne
+	 *
+	 * @param  references_articles $article
+	 * @return boolean
+	 */
+	public function offlineArticle(references_articles $article)
+	{
+		$article->setVar('article_online', REFERENCES_STATUS_OFFLINE);
+
+		return $this->insert($article, true);
+	}
+
+	/**
+	 * Indique si une référence est visible d'un utilisateur
+	 *
+	 * @param object|references_articles $article L'article à controler
+	 * @param integer                    $uid     L'id de l'utilisateur à controler
+	 * @return bool
+	 */
+	public function userCanSeeReference(references_articles $article, $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, $article->article_category_id, references_utils::getMemberGroups($uid), $currentModule->getVar('mid'));
+	}
+
+	/**
+	 * Remonte un article d'un cran dans l'ordre global des articles
+	 *
+	 * @param  integer $currentId    L'ID de l'article courant dont on souhaite remonter l'ordre
+	 * @param integer  $currentOrder L'ordre de l'élément courant à remonter
+	 * @return void
+	 */
+	public function moveUp($currentId, $currentOrder)
+	{
+		$sql_plus = 'SELECT article_id FROM ' . $this->table . ' WHERE article_weight = ' . ((int)$currentOrder - 1);
+		$res_plus = $this->db->query($sql_plus);
+		if ($this->db->getRowsNum($res_plus) == 0) {
+			return;
+		}
+		$row_plus = $this->db->fetchArray($res_plus);
+
+		$upd1 = 'UPDATE ' . $this->table . ' SET article_weight = (article_weight + 1) WHERE article_id = ' . $row_plus['article_id'];
+		$this->db->queryF($upd1);
+
+		$upd2 = 'UPDATE ' . $this->table . ' SET article_weight = (article_weight - 1) WHERE article_id = ' . (int)$currentId;
+		$this->db->queryF($upd2);
+		$this->forceCacheClean();
+	}
+
+	/**
+	 * Descend un article d'un cran dans l'ordre global des articles
+	 *
+	 * @param  integer $currentId    L'Id de l'article courant dont on souhaite descendre l'ordre
+	 * @param integer  $currentOrder L'orde de l'élément courant à remonter
+	 * @return void
+	 */
+	public function moveDown($currentId, $currentOrder)
+	{
+		$sql_moins = 'SELECT article_id FROM ' . $this->table . ' WHERE article_weight = ' . ((int)$currentOrder + 1);
+		$res_moins = $this->db->query($sql_moins);
+		if ($this->db->getRowsNum($res_moins) == 0) {
+			return;
+		}
+
+		$row_moins = $this->db->fetchArray($res_moins);
+		$upd1      = 'UPDATE ' . $this->table . ' SET article_weight = (article_weight - 1) WHERE article_id = ' . $row_moins['article_id'];
+		$this->db->queryF($upd1);
+
+		$upd2 = 'UPDATE ' . $this->table . ' SET article_weight =( article_weight + 1) WHERE article_id = ' . (int)$currentId;
+		$this->db->queryF($upd2);
+		$this->forceCacheClean();
+	}
 }

class/references_categories.php

Indentation +183 added lines, -183 removed lines

@@ -22,195 +22,195 @@
 
 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'));
+	}
 }

class/PersistableObjectHandler.php

Indentation +808 added lines, -808 removed lines

@@ -25,44 +25,44 @@ 
 
 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);
+	}
 }
 
 /**
@@ -73,778 +73,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();
+	}
 }