mambax7 / references

include/notification.inc.php

Indentation +26 added lines, -26 removed lines

@@ -27,35 +27,35 @@
  */
 function references_notify_iteminfo($category, $item_id)
 {
-    global $xoopsModule, $xoopsModuleConfig, $xoopsConfig;
-    $item_id = (int)$item_id;
+	global $xoopsModule, $xoopsModuleConfig, $xoopsConfig;
+	$item_id = (int)$item_id;
 
-    if (empty($xoopsModule) || $xoopsModule->getVar('dirname') !== 'references') {
-        $module_handler = xoops_getHandler('module');
-        $module         = $module_handler->getByDirname('references');
-        $config_handler = xoops_getHandler('config');
-        $config         = $config_handler->getConfigsByCat(0, $module->getVar('mid'));
-    } else {
-        $module =& $xoopsModule;
-        $config =& $xoopsModuleConfig;
-    }
+	if (empty($xoopsModule) || $xoopsModule->getVar('dirname') !== 'references') {
+		$module_handler = xoops_getHandler('module');
+		$module         = $module_handler->getByDirname('references');
+		$config_handler = xoops_getHandler('config');
+		$config         = $config_handler->getConfigsByCat(0, $module->getVar('mid'));
+	} else {
+		$module =& $xoopsModule;
+		$config =& $xoopsModuleConfig;
+	}
 
-    if ($category === 'global') {
-        $item['name'] = '';
-        $item['url']  = '';
+	if ($category === 'global') {
+		$item['name'] = '';
+		$item['url']  = '';
 
-        return $item;
-    }
+		return $item;
+	}
 
-    if ($category === 'new_article') {
-        include REFERENCES_PATH . ' include/common.php';
-        $article = null;
-        $article = $h_references_articles->get($item_id);
-        if (is_object($article)) {
-            $item['name'] = $article->getVar('article_title');
-            $item['url']  = REFERENCES_URL;
-        }
+	if ($category === 'new_article') {
+		include REFERENCES_PATH . ' include/common.php';
+		$article = null;
+		$article = $h_references_articles->get($item_id);
+		if (is_object($article)) {
+			$item['name'] = $article->getVar('article_title');
+			$item['url']  = REFERENCES_URL;
+		}
 
-        return $item;
-    }
+		return $item;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
 function references_notify_iteminfo($category, $item_id)
 {
     global $xoopsModule, $xoopsModuleConfig, $xoopsConfig;
-    $item_id = (int)$item_id;
+    $item_id = (int) $item_id;
 
     if (empty($xoopsModule) || $xoopsModule->getVar('dirname') !== 'references') {
         $module_handler = xoops_getHandler('module');
@@ -36,8 +36,8 @@ 
         $config_handler = xoops_getHandler('config');
         $config         = $config_handler->getConfigsByCat(0, $module->getVar('mid'));
     } else {
-        $module =& $xoopsModule;
-        $config =& $xoopsModuleConfig;
+        $module = & $xoopsModule;
+        $config = & $xoopsModuleConfig;
     }
 
     if ($category === 'global') {
@@ -48,7 +48,7 @@ 
     }
 
     if ($category === 'new_article') {
-        include REFERENCES_PATH . ' include/common.php';
+        include REFERENCES_PATH.' include/common.php';
         $article = null;
         $article = $h_references_articles->get($item_id);
         if (is_object($article)) {

include/plugin.tag.php

Indentation +40 added lines, -40 removed lines

@@ -22,30 +22,30 @@ 
 
 function references_tag_iteminfo(&$items)
 {
-    $items_id = array();
-    foreach (array_keys($items) as $cat_id) {
-        foreach (array_keys($items[$cat_id]) as $item_id) {
-            $items_id[] = (int)$item_id;
-        }
-    }
-    include XOOPS_ROOT_PATH . '/modules/references/include/common.php';
-    $items_obj = $h_references_articles->getItemsFromIds($items_id);
+	$items_id = array();
+	foreach (array_keys($items) as $cat_id) {
+		foreach (array_keys($items[$cat_id]) as $item_id) {
+			$items_id[] = (int)$item_id;
+		}
+	}
+	include XOOPS_ROOT_PATH . '/modules/references/include/common.php';
+	$items_obj = $h_references_articles->getItemsFromIds($items_id);
 
-    foreach (array_keys($items) as $cat_id) {
-        foreach (array_keys($items[$cat_id]) as $item_id) {
-            $item_obj                 =& $items_obj[$item_id];
-            /** @noinspection SenselessCommaInArrayDefinitionInspection */
-            $items[$cat_id][$item_id] = array(
-                'title'   => $item_obj->getVar('article_title'),
-                'uid'     => $item_obj->getVar('article_author'),
-                'link'    => 'index.php',
-                'time'    => $item_obj->getVar('article_timestamp'),
-                'tags'    => '',
-                'content' => '',
-            );
-        }
-    }
-    unset($items_obj);
+	foreach (array_keys($items) as $cat_id) {
+		foreach (array_keys($items[$cat_id]) as $item_id) {
+			$item_obj                 =& $items_obj[$item_id];
+			/** @noinspection SenselessCommaInArrayDefinitionInspection */
+			$items[$cat_id][$item_id] = array(
+				'title'   => $item_obj->getVar('article_title'),
+				'uid'     => $item_obj->getVar('article_author'),
+				'link'    => 'index.php',
+				'time'    => $item_obj->getVar('article_timestamp'),
+				'tags'    => '',
+				'content' => '',
+			);
+		}
+	}
+	unset($items_obj);
 }
 
 /** Remove orphan tag-item links *
@@ -53,22 +53,22 @@ 
  */
 function references_tag_synchronization($mid)
 {
-    global $xoopsDB;
-    $item_handler_keyName = 'article_id';
-    $item_handler_table   = $xoopsDB->prefix('references_articles');
-    $link_handler         = xoops_getModuleHandler('link', 'tag');
-    $where                = "($item_handler_table.article_online = 1)";
-    $where1               = "($item_handler_table.article_online = 0)";
+	global $xoopsDB;
+	$item_handler_keyName = 'article_id';
+	$item_handler_table   = $xoopsDB->prefix('references_articles');
+	$link_handler         = xoops_getModuleHandler('link', 'tag');
+	$where                = "($item_handler_table.article_online = 1)";
+	$where1               = "($item_handler_table.article_online = 0)";
 
-    /* clear tag-item links */
-    if ($link_handler->mysql_major_version() >= 4):
-        $sql = " DELETE FROM {$link_handler->table}" . '   WHERE ' . "       tag_modid = {$mid}" . '       AND ' . '       ( tag_itemid NOT IN ' . "           ( SELECT DISTINCT {$item_handler_keyName} " . "               FROM {$item_handler_table} " . "               WHERE $where" . '           ) '
-               . '       )';
-    else:
-        $sql = " DELETE {$link_handler->table} FROM {$link_handler->table}" . "   LEFT JOIN {$item_handler_table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler_keyName} " . '   WHERE ' . "       tag_modid = {$mid}" . '       AND ' . "       ( aa.{$item_handler_keyName} IS NULL"
-               . "           OR $where1" . '       )';
-    endif;
-    if (!$link_handler->db->queryF($sql)) {
-        trigger_error($link_handler->db->error());
-    }
+	/* clear tag-item links */
+	if ($link_handler->mysql_major_version() >= 4):
+		$sql = " DELETE FROM {$link_handler->table}" . '   WHERE ' . "       tag_modid = {$mid}" . '       AND ' . '       ( tag_itemid NOT IN ' . "           ( SELECT DISTINCT {$item_handler_keyName} " . "               FROM {$item_handler_table} " . "               WHERE $where" . '           ) '
+			   . '       )';
+	else:
+		$sql = " DELETE {$link_handler->table} FROM {$link_handler->table}" . "   LEFT JOIN {$item_handler_table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler_keyName} " . '   WHERE ' . "       tag_modid = {$mid}" . '       AND ' . "       ( aa.{$item_handler_keyName} IS NULL"
+			   . "           OR $where1" . '       )';
+	endif;
+	if (!$link_handler->db->queryF($sql)) {
+		trigger_error($link_handler->db->error());
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -25,15 +25,15 @@ 
     $items_id = array();
     foreach (array_keys($items) as $cat_id) {
         foreach (array_keys($items[$cat_id]) as $item_id) {
-            $items_id[] = (int)$item_id;
+            $items_id[] = (int) $item_id;
         }
     }
-    include XOOPS_ROOT_PATH . '/modules/references/include/common.php';
+    include XOOPS_ROOT_PATH.'/modules/references/include/common.php';
     $items_obj = $h_references_articles->getItemsFromIds($items_id);
 
     foreach (array_keys($items) as $cat_id) {
         foreach (array_keys($items[$cat_id]) as $item_id) {
-            $item_obj                 =& $items_obj[$item_id];
+            $item_obj                 = & $items_obj[$item_id];
             /** @noinspection SenselessCommaInArrayDefinitionInspection */
             $items[$cat_id][$item_id] = array(
                 'title'   => $item_obj->getVar('article_title'),
@@ -62,11 +62,11 @@ 
 
     /* clear tag-item links */
     if ($link_handler->mysql_major_version() >= 4):
-        $sql = " DELETE FROM {$link_handler->table}" . '   WHERE ' . "       tag_modid = {$mid}" . '       AND ' . '       ( tag_itemid NOT IN ' . "           ( SELECT DISTINCT {$item_handler_keyName} " . "               FROM {$item_handler_table} " . "               WHERE $where" . '           ) '
+        $sql = " DELETE FROM {$link_handler->table}".'   WHERE '."       tag_modid = {$mid}".'       AND '.'       ( tag_itemid NOT IN '."           ( SELECT DISTINCT {$item_handler_keyName} "."               FROM {$item_handler_table} "."               WHERE $where".'           ) '
                . '       )';
     else:
-        $sql = " DELETE {$link_handler->table} FROM {$link_handler->table}" . "   LEFT JOIN {$item_handler_table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler_keyName} " . '   WHERE ' . "       tag_modid = {$mid}" . '       AND ' . "       ( aa.{$item_handler_keyName} IS NULL"
-               . "           OR $where1" . '       )';
+        $sql = " DELETE {$link_handler->table} FROM {$link_handler->table}"."   LEFT JOIN {$item_handler_table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler_keyName} ".'   WHERE '."       tag_modid = {$mid}".'       AND '."       ( aa.{$item_handler_keyName} IS NULL"
+               . "           OR $where1".'       )';
     endif;
     if (!$link_handler->db->queryF($sql)) {
         trigger_error($link_handler->db->error());

Braces +3 added lines, -1 removed lines

@@ -64,9 +64,11 @@
     if ($link_handler->mysql_major_version() >= 4):
         $sql = " DELETE FROM {$link_handler->table}" . '   WHERE ' . "       tag_modid = {$mid}" . '       AND ' . '       ( tag_itemid NOT IN ' . "           ( SELECT DISTINCT {$item_handler_keyName} " . "               FROM {$item_handler_table} " . "               WHERE $where" . '           ) '
                . '       )';
-    else:
+    else {
+    	:
         $sql = " DELETE {$link_handler->table} FROM {$link_handler->table}" . "   LEFT JOIN {$item_handler_table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler_keyName} " . '   WHERE ' . "       tag_modid = {$mid}" . '       AND ' . "       ( aa.{$item_handler_keyName} IS NULL"
                . "           OR $where1" . '       )';
+    }
     endif;
     if (!$link_handler->db->queryF($sql)) {
         trigger_error($link_handler->db->error());

include/search.inc.php

Spacing +10 added lines, -10 removed lines

@@ -25,19 +25,19 @@ 
 function references_search($queryarray, $andor, $limit, $offset, $userid)
 {
     global $xoopsDB;
-    include XOOPS_ROOT_PATH . '/modules/references/include/common.php';
+    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 . ')';
+    $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)) . ')';
+    $sql .= ' AND ('.trim(str_replace('WHERE ', '', $permissions)).')';
     // *****
 
     // Auteur
     if ($userid != 0) {
-        $sql .= ' AND (article_author = ' . $userid . ') ';
+        $sql .= ' AND (article_author = '.$userid.') ';
     }
 
     $tmpObject = new references_articles();
@@ -49,7 +49,7 @@ 
             if ($cnt == 0) {
                 $tblFields[] = $key;
             } else {
-                $tblFields[] = ' OR ' . $key;
+                $tblFields[] = ' OR '.$key;
             }
             ++$cnt;
         }
@@ -63,22 +63,22 @@ 
         $more = ')';
         foreach ($queryarray as $oneQuery) {
             $sql .= '(';
-            $cond = " LIKE '%" . $oneQuery . "%' ";
-            $sql .= implode($cond, $tblFields) . $cond . ')';
+            $cond = " LIKE '%".$oneQuery."%' ";
+            $sql .= implode($cond, $tblFields).$cond.')';
             ++$cnt;
             if ($cnt != $count) {
-                $sql .= ' ' . $andor . ' ';
+                $sql .= ' '.$andor.' ';
             }
         }
     }
-    $sql .= $more . ' ORDER BY article_timestamp DESC';
+    $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]['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'];

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

xoops_version.php

Spacing +7 added lines, -7 removed lines

@@ -81,7 +81,7 @@ 
 $modversion['blocks'][$cptb]['description'] = '';
 $modversion['blocks'][$cptb]['show_func']   = 'b_references_last_news_show';
 $modversion['blocks'][$cptb]['edit_func']   = 'b_references_last_news_edit';
-$modversion['blocks'][$cptb]['options']     = '10|';    // Nombre d'articles � afficher, cat�gories � afficher
+$modversion['blocks'][$cptb]['options']     = '10|'; // Nombre d'articles � afficher, cat�gories � afficher
 $modversion['blocks'][$cptb]['template']    = 'references_block_last_new.tpl';
 
 /**
@@ -93,7 +93,7 @@ 
 $modversion['blocks'][$cptb]['description'] = '';
 $modversion['blocks'][$cptb]['show_func']   = 'b_references_random_news_show';
 $modversion['blocks'][$cptb]['edit_func']   = 'b_references_random_news_edit';
-$modversion['blocks'][$cptb]['options']     = '5|';    // Number of items, categories to show
+$modversion['blocks'][$cptb]['options']     = '5|'; // Number of items, categories to show
 $modversion['blocks'][$cptb]['template']    = 'references_block_random_news.tpl';
 
 /*
@@ -161,7 +161,7 @@ 
 
 $cptm = 0;
 
-require_once XOOPS_ROOT_PATH . '/modules/references/class/references_utils.php';
+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;
@@ -375,7 +375,7 @@ 
     _MI_REFERENCES_SORT_DATE   => 'article_timestamp',
     _MI_REFERENCES_SORT_WEIGHT => 'article_weight'
 );
-$modversion['config'][$cpto]['default']     = 'article_timestamp';
+$modversion['config'][$cpto]['default'] = 'article_timestamp';
 
 /**
  * Sens du tri
@@ -390,7 +390,7 @@ 
     _MI_REFERENCES_SORT_ASC  => 'ASC',
     _MI_REFERENCES_SORT_DESC => 'DESC'
 );
-$modversion['config'][$cpto]['default']     = 'DESC';
+$modversion['config'][$cpto]['default'] = 'DESC';
 
 /**
  * Area to use to sort the references in admin
@@ -406,7 +406,7 @@ 
     _MI_REFERENCES_SORT_WEIGHT => 'article_weight',
     _MI_REFERENCES_SORT_TITLE  => 'article_title'
 );
-$modversion['config'][$cpto]['default']     = 'article_weight';
+$modversion['config'][$cpto]['default'] = 'article_weight';
 
 /**
  * Sens du tri
@@ -421,7 +421,7 @@ 
     _MI_REFERENCES_SORT_ASC  => 'ASC',
     _MI_REFERENCES_SORT_DESC => 'DESC'
 );
-$modversion['config'][$cpto]['default']     = 'ASC';
+$modversion['config'][$cpto]['default'] = 'ASC';
 
 // ****************************************************************************
 // Comments *******************************************************************

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';
 

admin/main.php

Indentation +635 added lines, -635 removed lines

@@ -30,15 +30,15 @@ 
 require_once REFERENCES_PATH . 'admin/dbupdate.php';
 
 if (!isset($op)) {
-    $op = 'default';
+	$op = 'default';
 }
 
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 } else {
-    if (isset($_GET['op'])) {
-        $op = $_GET['op'];
-    }
+	if (isset($_GET['op'])) {
+		$op = $_GET['op'];
+	}
 }
 
 // V???rification de l'existence et de l'???tat d'???criture des diff???rents r???pertoire de stockage et de cache
@@ -65,7 +65,7 @@ 
  */
 function show_footer()
 {
-    echo "<br><br><div align='center'><a href='http://www.instant-zero.com' target='_blank' title='Instant Zero'><img src='../assets/images/instantzero.gif' alt='Instant Zero' /></a></div>";
+	echo "<br><br><div align='center'><a href='http://www.instant-zero.com' target='_blank' title='Instant Zero'><img src='../assets/images/instantzero.gif' alt='Instant Zero' /></a></div>";
 }
 
 references_utils::loadLanguageFile('modinfo.php');
@@ -76,634 +76,634 @@ 
 // ******************************************************************************************************************************************
 switch ($op) {
 
-    // ****************************************************************************************************************
-    case 'default':    // Gestion des articles
-    case 'articles':
-        // ****************************************************************************************************************
-        xoops_cp_header();
-        // references_adminMenu(0);
-        $objet = 'articles';
-        $items = array();
-        if (isset($_GET['move'])) {
-            $id    = isset($_GET['id']) ? (int)$_GET['id'] : 0;
-            $ordre = isset($_GET['ordre']) ? (int)$_GET['ordre'] : 0;
-            if ($_GET['move'] === 'up' && $id > 0) {
-                $handlers->h_references_articles->moveUp($id, $ordre);
-            }
-            if ($_GET['move'] === 'down' && $id > 0) {
-                $handlers->h_references_articles->moveDown($id, $ordre);
-            }
-        }
-        $form = "<form method='post' action='$baseurl' name='frmadd$objet' id='frmadd$objet'><input type='hidden' name='op' id='op' value='add$objet' /><input type='submit' name='btngo' id='btngo' value='" . _AM_REFERENCES_ADD_ITEM . "' /></form>";
-        echo $form;
-        $categoriesList = $h_references_categories->getListArray();
-        $upText         = _AM_REFERENCES_UP;
-        $downText       = _AM_REFERENCES_DOWN;
-        $upImg          = "<a href='$baseurl?op=articles&move=up&id=%d&ordre=%d' title=\"$upText\"><img src='" . REFERENCES_IMAGES_URL . "up.png' alt=\"$upText\" /></a>";
-        $downImg        = "<a href='$baseurl?op=articles&move=down&id=%d&ordre=%d' title=\"$downText\"><img src='" . REFERENCES_IMAGES_URL . "down.png' alt=\"$downText\" /></a>";
-
-        $referencesFilter = new references_listFilter($h_references_articles, 'op', 'articles', 'start', $limit, $baseurl, $defaultSortField, $defaultSortOrder, true, REFERENCES_JS_URL);
-        $referencesFilter->initFilter('article_id', array('dataType' => references_listFilter::FILTER_DATA_NUMERIC, 'fieldType' => references_listFilter::FILTER_FIELD_TEXT, 'size' => 5, 'maxLength' => 10));
-        $referencesFilter->initFilter('article_title', array('dataType' => references_listFilter::FILTER_DATA_TEXT, 'fieldType' => references_listFilter::FILTER_FIELD_TEXT, 'size' => 35, 'maxLength' => 255, 'autoComplete' => true));
-        $referencesFilter->initFilter('article_weight', array('dataType' => references_listFilter::FILTER_DATA_NUMERIC, 'fieldType' => references_listFilter::FILTER_FIELD_TEXT, 'size' => 5, 'maxLength' => 10));
-
-        $referencesFilter->initFilter('article_category_id', array('dataType' => references_listFilter::FILTER_DATA_NUMERIC, 'fieldType' => references_listFilter::FILTER_FIELD_SELECT, 'values' => $categoriesList, 'withNull' => true, 'style' => 'width: 170px; max-width: 170px;'));
-        $referencesFilter->initFilter('article_online', array('dataType' => references_listFilter::FILTER_DATA_NUMERIC, 'fieldType' => references_listFilter::FILTER_FIELD_SELECT, 'values' => array(2 => _YES, 1 => _NO), 'withNull' => true, 'minusOne' => true));
-        $sortFields = array('article_id' => _AM_REFERENCES_ID, 'article_title' => _AM_REFERENCES_TITLE, 'article_weight' => _AM_REFERENCES_WEIGHT, 'article_category_id' => _AM_REFERENCES_CATEGORY, 'article_online' => _AM_REFERENCES_ONLINE);
-        $referencesFilter->setSortFields($sortFields);
-
-        $referencesFilter->filter();
-        $itemsCount = $referencesFilter->getCount();
-        references_utils::htitle(_MI_REFERENCES_ADMENU0 . ' (' . $itemsCount . ')', 4);
-
-        if ($itemsCount > $limit) {
-            $pagenav = $referencesFilter->getPager();
-        }
-
-        $items             = $referencesFilter->getObjects();
-        $visibleCountItems = count($items);
-        $counter           = 0;
-        $categories        = $h_references_categories->getListArray();
-        echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
-        echo "<tr>\n";
-        echo "<form method='post' action='$baseurl'>\n";
-        echo "<td colspan='4' align='right'>" . $referencesFilter->getSortPlaceHolderHtmlCode();
-        echo $referencesFilter->getClearFilterbutton();
-        echo "</td>\n";
-        echo "<td colspan='2' align='right'>";
-        if (isset($pagenav) && is_object($pagenav)) {
-            echo $pagenav->renderNav();
-        }
-        echo "</td>\n</tr>\n";
-
-        echo "<th align='center'>" . _AM_REFERENCES_ID . "</th><th align='center'>" . _AM_REFERENCES_TITLE . "</th><th align='center'>" . _AM_REFERENCES_WEIGHT . "</th><th align='center'>" . _AM_REFERENCES_CATEGORY . "</th><th align='center'>" . _AM_REFERENCES_ONLINE . "</th><th align='center'>"
-             . _AM_REFERENCES_MANUAL_DATE . "</th><th align='center'>" . _AM_REFERENCES_ACTION . '</th></tr>';
-        // Filtres ****************************************
-        echo "<tr>\n";
-        echo "<th align='center'>" . $referencesFilter->getFilterField('article_id') . "</th>\n";
-        echo "<th align='center'>" . $referencesFilter->getFilterField('article_title') . "</th>\n";
-        echo "<th align='center'>" . $referencesFilter->getFilterField('article_weight') . "</th>\n";
-        echo "<th align='center'>" . $referencesFilter->getFilterField('article_category_id') . "</th>\n";
-        echo "<th align='center'>" . $referencesFilter->getFilterField('article_online') . "</th>\n";
-        echo "<th align='center'>&nbsp;</th>\n";
-        echo "<th align='center'>" . $referencesFilter->getGoButton() . "</th></form></tr>\n";
-        // ************************************************
-        $class = '';
-        foreach ($items as $item) {
-            ++$counter;
-            $class         = ($class === 'even') ? 'odd' : 'even';
-            $id            = $item->getVar('article_id');
-            $action_edit   = "<a href='$baseurl?op=edit" . $objet . '&id=' . $id . "' title='" . _EDIT . "'>" . $icones['edit'] . '</a>';
-            $action_delete = "<a href='$baseurl?op=delete" . $objet . '&id=' . $id . "' title='" . _DELETE . "'" . $conf_msg . '>' . $icones['delete'] . '</a>';
-            $category      = isset($categories[$item->getVar('article_category_id')]) ? $categories[$item->getVar('article_category_id')] : '';
-            $up            = $down = '';
-            echo "<tr class='" . $class . "'>\n";
-            $ordre = $item->getVar('article_weight');
-            if ($counter == 1 && $visibleCountItems > 1) { // Premier ???l???ment
-                $down = sprintf($downImg, $id, $ordre);
-            }
-            if ($counter == $visibleCountItems && $visibleCountItems > 1) { // Dernier ???l???ment
-                $up = sprintf($upImg, $id, $ordre);
-            }
-            if ($counter > 1 & $counter < $visibleCountItems && $visibleCountItems > 1) { // Element dans le milieu
-                $up   = sprintf($upImg, $id, $ordre);
-                $down = sprintf($downImg, $id, $ordre);
-            }
-
-            echo "<td align='center'>" . $id . '</td>';
-            echo "<td align='left'><a target='_blank' href='" . $item->getUrl() . "'>" . $item->getVar('article_title') . '</a></td>';
-            echo "<td align='center'>" . $item->getVar('article_weight') . " $up $down</td>";
-            echo "<td align='center'>" . $category . '</td>';
-            if ($item->isArticleOnline()) {
-                $statusLink = "<a href='$baseurl?op=offline&id=$id' title='" . _AM_REFERENCES_GO_OFFLINE . "'><img src='" . REFERENCES_IMAGES_URL . "status_online.png' alt='" . _AM_REFERENCES_GO_OFFLINE . "' /></a>";
-            } else {
-                $statusLink = "<a href='$baseurl?op=online&id=$id' title='" . _AM_REFERENCES_GO_ONLINE . "'><img src='" . REFERENCES_IMAGES_URL . "status_offline.png' alt='" . _AM_REFERENCES_GO_ONLINE . "' /></a>";
-            }
-            echo "<td align='center'>" . $statusLink . '</td>';
-            echo "<td align='center'>" . $item->getVar('article_date') . '</td>';
-            echo "<td align='center'>" . $action_edit . ' ' . $action_delete . "</td>\n";
-            echo "<tr>\n";
-        }
-        $class = ($class === 'even') ? 'odd' : 'even';
-        echo "<tr class='" . $class . "'>\n";
-        echo "<td colspan='7' align='center'>" . $form . "</td>\n";
-        echo "</tr>\n";
-        echo "</table>\n";
-        echo $referencesFilter->getJavascriptInitCode();
-        if (isset($pagenav) && is_object($pagenav)) {
-            echo "<div align='center'>" . $pagenav->renderNav() . '</div>';
-        }
-        echo "<br><br>\n";
-        include_once __DIR__ . '/admin_footer.php';  //show_footer();
-        break;
-
-    // ****************************************************************************************************************
-    case 'addarticles':        // Ajout d'un article
-    case 'editarticles':    // Edition d'un article
-        // ****************************************************************************************************************
-        xoops_cp_header();
-        // references_adminMenu(0);
-        $object = 'articles';
-        if ($op == 'edit' . $object) {
-            $title = _AM_REFERENCES_EDIT_ARTICLE;
-            $id    = isset($_GET['id']) ? (int)$_GET['id'] : 0;
-            if (empty($id)) {
-                references_utils::redirect(_AM_REFERENCES_ERROR_1, $baseurl, 5);
-            }
-            // Item exits ?
-            $item = null;
-            $item = $h_references_articles->get($id);
-            if (!is_object($item)) {
-                references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl, 5);
-            }
-            $edit         = true;
-            $label_submit = _AM_REFERENCES_MODIFY;
-        } else {
-            $title = _AM_REFERENCES_ADD_ARTICLE;
-            $item  = $h_references_articles->create(true);
-            $item->setVar('article_online', true);
-            if (REFERENCES_AUTO_FILL_MANUAL_DATE) {
-                $item->setVar('article_date', formatTimestamp(time(), 's'));
-            }
-            $label_submit = _AM_REFERENCES_ADD;
-            $edit         = false;
-        }
-        $sform = new XoopsThemeForm($title, 'frmadd' . $object, $baseurl);
-        $sform->setExtra('enctype="multipart/form-data"');
-        $sform->addElement(new XoopsFormHidden('op', 'saveedit' . $object));
-        $sform->addElement(new XoopsFormHidden('article_id', $item->getVar('article_id')));
-        $categories     = $h_references_categories->getListArray();
-        $categoriesList = new XoopsFormSelect(_AM_REFERENCES_CATEGORY, 'article_category_id', $item->getVar('article_category_id', 'e'));
-        $categoriesList->addOptionArray($categories);
-        $sform->addElement($categoriesList, true);
-
-        $sform->addElement(new XoopsFormText(_AM_REFERENCES_TITLE, 'article_title', 50, 255, $item->getVar('article_title', 'e')), true);
-        $sform->addElement(new XoopsFormRadioYN(_AM_REFERENCES_ONLINE, 'article_online', $item->getVar('article_online', 'e')), true);
-        $sform->addElement(new XoopsFormText(_AM_REFERENCES_MANUAL_DATE, 'article_date', 30, 30, $item->getVar('article_date', 'e')), false);
-        $sform->addElement(new XoopsFormTextDateSelect(_AM_REFERENCES_DATE, 'article_timestamp', 15, $item->getVar('article_timestamp', 'e')));
-        $sform->addElement(new XoopsFormText(_AM_REFERENCES_WEIGHT, 'article_weight', 5, 5, $item->getVar('article_weight', 'e')), false);
-        $sform->addElement(new XoopsFormText(_AM_REFERENCES_URL, 'article_externalurl', 50, 255, $item->getVar('article_externalurl', 'e')), false);
-
-        $editor = references_utils::getWysiwygForm(_AM_REFERENCES_TEXT, 'article_text', $item->getVar('article_text', 'e'), 15, 60, 'article_text_hidden');
-        if ($editor) {
-            $sform->addElement($editor, false);
-        }
-
-        $editor1 = references_utils::getWysiwygForm(_AM_REFERENCES_TEXT_MORE, 'article_readmore', $item->getVar('article_readmore', 'e'), 15, 60, 'article_readmore_hidden');
-        if ($editor1) {
-            $sform->addElement($editor1, false);
-        }
-
-        if (references_utils::getModuleOption('use_tags') && references_utils::tagModuleExists()) {
-            require_once XOOPS_ROOT_PATH . '/modules/tag/include/formtag.php';
-            $sform->addElement(new XoopsFormTag('item_tag', 60, 255, $item->getVar('article_id'), 0));
-        }
-        // Images
-        for ($i = 1; $i <= 10; ++$i) {
-            if ($op == 'edit' . $object && $item->pictureExists($i)) {
-                $pictureTray = new XoopsFormElementTray(_AM_REFERENCES_CURRENT_PICTURE . ' ' . $i, '<br>');
-                $pictureTray->addElement(new XoopsFormLabel('', "<img src='" . $item->getPictureUrl($i) . "' alt='' border='0' />"));
-                $deleteCheckbox = new XoopsFormCheckBox('', 'delpicture' . $i);
-                $deleteCheckbox->addOption(1, _DELETE);
-                $pictureTray->addElement($deleteCheckbox);
-                $sform->addElement($pictureTray);
-                unset($pictureTray, $deleteCheckbox);
-            }
-            $sform->addElement(new XoopsFormFile(_AM_REFERENCES_IMAGE . ' ' . $i, 'attachedfile' . $i, references_utils::getModuleOption('maxuploadsize')), false);
-            $fieldName = 'article_picture' . $i . '_text';
-            $sform->addElement(new XoopsFormText(_AM_REFERENCES_PICTURE_TEXT . ' ' . $i, $fieldName, 50, 255, $item->getVar($fieldName)), false);
-        }
-
-        // Fichier attach???
-        if ($op == 'edit' . $object && $item->attachmentExists()) {
-            $attachedTray = new XoopsFormElementTray(_AM_REFERENCES_ATTACHED_FILE, '<br>');
-            $attachedTray->addElement(new XoopsFormLabel('', "<a href='" . $item->getAttachmentUrl() . "' target='_blank'>" . $item->getVar('article_attached_file') . '</a>'));
-            $deleteCheckbox = new XoopsFormCheckBox('', 'delattach');
-            $deleteCheckbox->addOption(1, _DELETE);
-            $attachedTray->addElement($deleteCheckbox);
-            $sform->addElement($attachedTray);
-            unset($attachedTray, $deleteCheckbox);
-        }
-        $sform->addElement(new XoopsFormFile(_AM_REFERENCES_ATTACHED_FILE, 'article_attached_file', references_utils::getModuleOption('maxuploadsize')), false);
-
-        $button_tray = new XoopsFormElementTray('', '');
-        $submit_btn  = new XoopsFormButton('', 'post', $label_submit, 'submit');
-        $button_tray->addElement($submit_btn);
-        $sform->addElement($button_tray);
-        $sform = references_utils::formMarkRequiredFields($sform);
-        $sform->display();
-        include_once __DIR__ . '/admin_footer.php';  //show_footer();
-        break;
-
-    // ****************************************************************************************************************
-    case 'saveeditarticles':    // Sauvegarde d'un article
-        // ****************************************************************************************************************
-        xoops_cp_header();
-        $id         = isset($_POST['article_id']) ? (int)$_POST['article_id'] : 0;
-        $opRedirect = 'articles';
-        if (!empty($id)) {
-            $edit = true;
-            $item = $h_references_articles->get($id);
-            if (!is_object($item)) {
-                references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl, 5);
-            }
-            $item->unsetNew();
-        } else {
-            $edit = false;
-            $item = $h_references_articles->create(true);
-        }
-
-        $item->setVars($_POST);
-
-        // Images
-        for ($i = 1; $i <= 10; ++$i) {
-            if (isset($_POST['delpicture' . $i]) && (int)$_POST['delpicture' . $i] == 1) {
-                $item->deletePicture($i);
-                $item->setVar('article_picture' . $i, '');
-            }
-
-            // Upload de l'image et cr???ation de la vignette
-            $destname = '';
-            $return   = references_utils::uploadFile($i - 1, references_utils::getModuleOption('images_path'));
-            if ($return === true) {
-                if (references_utils::getModuleOption('images_width') > 0 && references_utils::getModuleOption('images_height') > 0) {
-                    references_utils::createThumb(references_utils::getModuleOption('images_path') . '/' . basename($destname), references_utils::getModuleOption('images_path') . '/' . basename($destname), references_utils::getModuleOption('images_width'),
-                                                  references_utils::getModuleOption('images_height'), true);
-                }
-                $newDestName = references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . REFERENCES_THUMBS_PREFIX . basename($destname);
-                $retval      = references_utils::resizePicture(references_utils::getModuleOption('images_path') . '/' . basename($destname), $newDestName, $thumbs_width, $thumbs_height, true);
-                if ($retval == 1 || $retval == 3) {
-                    $item->setVar('article_picture' . $i, $destname);
-                }
-            } else {
-                if ($return !== false) {
-                    echo $return;
-                }
-            }
-        }
-
-        $timestamp = mktime(0, 0, 0, (int)substr($_POST['article_timestamp'], 5, 2), (int)substr($_POST['article_timestamp'], 8, 2), (int)substr($_POST['article_timestamp'], 0, 4));
-        $item->setVar('article_timestamp', $timestamp);
-
-        if (!$edit) {
-            $item->setVar('article_author', references_utils::getCurrentUserID());
-        }
-
-        // Suppression ???ventuelle du fichier attach???
-        if (isset($_POST['delattach']) && (int)$_POST['delattach'] == 1) {
-            $item->deleteAttachment();
-        }
-
-        $destname = '';
-        // Upload de la pi???ce jointe
-        $return = references_utils::uploadFile(10, references_utils::getModuleOption('attached_path'));
-        if ($return === true) {
-            $item->setVar('article_attached_file', $destname);
-        } else {
-            if ($return !== false) {
-                echo $return;
-            }
-        }
-
-        $res = $h_references_articles->insert($item);
-        if ($res) {
-            if (references_utils::getModuleOption('use_tags') && references_utils::tagModuleExists()) {
-                $tag_handler = xoops_getModuleHandler('tag', 'tag');
-                $tag_handler->updateByItem($_POST['item_tag'], $item->getVar('article_id'), $xoopsModule->getVar('dirname'), 0);
-            }
-            if (!$edit) {
-                $h_references_articles->notifyNewArticle($item);
-            }
-            references_utils::updateCache();
-            references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
-        } else {
-            references_utils::redirect(_AM_REFERENCES_SAVE_PB, $baseurl . '?op=' . $opRedirect, 5);
-        }
-        break;
-
-    // ****************************************************************************************************************
-    case 'offline':    // Mise hors ligne d'un article
-    case 'online':    // Mise en ligne d'un article
-        // ****************************************************************************************************************
-        xoops_cp_header();
-        $id = isset($_GET['id']) ? (int)$_GET['id'] : 0;
-        if (empty($id)) {
-            references_utils::redirect(_AM_REFERENCES_ERROR_1, $baseurl, 5);
-        }
-        $opRedirect = 'articles';
-        $item       = null;
-        $item       = $h_references_articles->get($id);
-        if (is_object($item)) {
-            if ($op === 'offline') {
-                $res = $h_references_articles->offlineArticle($item);
-            } else {
-                $res = $h_references_articles->onlineArticle($item);
-            }
-            if ($res) {
-                references_utils::updateCache();
-                references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
-            }
-        }
-        references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl . '?op=' . $opRedirect, 5);
-        break;
-
-    // ****************************************************************************************************************
-    case 'deletearticles':    // Suppression d'un article
-        // ****************************************************************************************************************
-        xoops_cp_header();
-        $id = isset($_GET['id']) ? (int)$_GET['id'] : 0;
-        if (empty($id)) {
-            references_utils::redirect(_AM_REFERENCES_ERROR_1, $baseurl, 5);
-        }
-        $opRedirect = 'articles';
-        $item       = null;
-        $item       = $h_references_articles->get($id);
-        if (is_object($item)) {
-            $res = $h_references_articles->deleteArticle($item, true);
-            if ($res) {
-                references_utils::updateCache();
-                references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
-            }
-        }
-        references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl . '?op=' . $opRedirect, 5);
-        break;
-
-    // ****************************************************************************************************************
-    case 'instant-zero';    // Publicit???
-        // ****************************************************************************************************************
-        xoops_cp_header();
-        // references_adminMenu(4);
-        echo "<iframe src='http://www.instant-zero.com/modules/liaise/?form_id=2' width='100%' height='600' frameborder='0'></iframe>";
-        include_once __DIR__ . '/admin_footer.php';  //show_footer();
-        break;
-
-    // ****************************************************************************************************************
-    case 'perms';    // Permissions
-        // ****************************************************************************************************************
-        xoops_cp_header();
-        // references_adminMenu(3);
-        require_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
-        $categories      = $handlers->h_references_categories->getCategories();
-        $permissionsForm = new XoopsGroupPermForm(_AM_REFERENCES_VIEWFORM, $xoopsModule->getVar('mid'), REFERENCES_PERM_READ, _AM_REFERENCES_VIEWFORM_DESC, 'admin/index.php?op=perms', 'true');
-        foreach ($categories as $category) {
-            $permissionsForm->addItem($category->category_id, $category->category_title, 0);
-        }
-        echo $permissionsForm->render();
-        echo "<br><br><br><br>\n";
-        unset($permissionsForm);
-        include_once __DIR__ . '/admin_footer.php';  //show_footer();
-        break;
-
-    // ****************************************************************************************************************
-    case 'texts':    // Gestion des textes
-        // ****************************************************************************************************************
-        xoops_cp_header();
-        // references_adminMenu(2);
-        require_once REFERENCES_PATH . 'class/registryfile.php';
-        $registry = new references_registryfile();
-
-        $sform = new XoopsThemeForm(_MI_REFERENCES_ADMENU1, 'frmatxt', $baseurl);
-        $sform->addElement(new XoopsFormHidden('op', 'savetexts'));
-        // Texte ??? afficher sur la page d'index du module
-        $editor1 = references_utils::getWysiwygForm(_AM_REFERENCES_TEXT1, 'text1', $registry->getfile(REFERENCES_TEXTFILE1), 5, 60, 'hometext1_hidden');
-        if ($editor1) {
-            $sform->addElement($editor1, false);
-        }
-        $button_tray = new XoopsFormElementTray('', '');
-        $submit_btn  = new XoopsFormButton('', 'post', _AM_REFERENCES_MODIFY, 'submit');
-        $button_tray->addElement($submit_btn);
-        $sform->addElement($button_tray);
-        $sform = references_utils::formMarkRequiredFields($sform);
-        $sform->display();
-        include_once __DIR__ . '/admin_footer.php';  //show_footer();
-        break;
-
-    // ****************************************************************************************************************
-    case 'savetexts':        // Sauvegarde des textes
-        // ****************************************************************************************************************
-        xoops_cp_header();
-        require_once REFERENCES_PATH . 'class/registryfile.php';
-        $registry = new references_registryfile();
-        $myts     = MyTextSanitizer::getInstance();
-        $registry->savefile($myts->stripSlashesGPC($_POST['text1']), REFERENCES_TEXTFILE1);
-        references_utils::updateCache();
-        references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=texts', 2);
-        break;
-
-    // ****************************************************************************************************************
-    case 'maintain':    // Maintenance des tables
-        // ****************************************************************************************************************
-        xoops_cp_header();
-        // references_adminMenu();
-        references_utils::maintainTablesCache();
-        references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl, 2);
-        break;
-
-    // ****************************************************************************************************************
-    case 'categories':    // Gestion des cat???gories
-        // ****************************************************************************************************************
-        xoops_cp_header();
-        // references_adminMenu(1);
-        $start = isset($_GET['start']) ? (int)$_GET['start'] : 0;
-        $objet = 'categories';
-        $items = array();
-        $form  = "<form method='post' action='$baseurl' name='frmadd$objet' id='frmadd$objet'><input type='hidden' name='op' id='op' value='add$objet' /><input type='submit' name='btngo' id='btngo' value='" . _AM_REFERENCES_ADD_ITEM . "' /></form>";
-        echo $form;
-        references_utils::htitle(_MI_REFERENCES_ADMENU2, 4);
-
-        $itemsCount = $h_references_categories->getCount();
-        if ($itemsCount > $limit) {
-            $pagenav = new XoopsPageNav($itemsCount, $limit, $start, 'start');
-        }
-
-        $items = $h_references_categories->getCategories($start, $limit);
-        if (isset($pagenav) && is_object($pagenav)) {
-            echo "<div align='right'>" . $pagenav->renderNav() . '</div>';
-        }
-        echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
-
-        echo "<tr><th align='center'>" . _AM_REFERENCES_ID . "</th><th align='center'>" . _AM_REFERENCES_TITLE . "</th><th align='center'>" . _AM_REFERENCES_CATEGORY_WEIGHT . "</th><th align='center'>" . _AM_REFERENCES_ACTION . '</th></tr>';
-
-        $class = '';
-        foreach ($items as $item) {
-            $class         = ($class === 'even') ? 'odd' : 'even';
-            $id            = $item->getVar('category_id');
-            $action_edit   = "<a href='$baseurl?op=edit" . $objet . '&id=' . $id . "' title='" . _EDIT . "'>" . $icones['edit'] . '</a>';
-            $action_delete = "<a href='$baseurl?op=delete" . $objet . '&id=' . $id . "' title='" . _DELETE . "'" . $conf_msg . '>' . $icones['delete'] . '</a>';
-
-            echo "<tr class='" . $class . "'>\n";
-            echo "<td align='center'>" . $id . '</td>';
-            echo "<td align='left'><a target='_blank' href='" . $item->getUrl() . "'>" . $item->getVar('category_title') . '</a></td>';
-            echo "<td align='right'>" . $item->getVar('category_weight') . '</td>';
-            echo "<td align='center'>" . $action_edit . ' ' . $action_delete . "</td>\n";
-            echo "<tr>\n";
-        }
-        $class = ($class === 'even') ? 'odd' : 'even';
-        echo "<tr class='" . $class . "'>\n";
-        echo "<td colspan='4' align='center'>" . $form . "</td>\n";
-        echo "</tr>\n";
-        echo "</table>\n";
-        if (isset($pagenav) && is_object($pagenav)) {
-            echo "<div align='center'>" . $pagenav->renderNav() . '</div>';
-        }
-        echo "<br><br>\n";
-        include_once __DIR__ . '/admin_footer.php';  //show_footer();
-        break;
-
-    // ****************************************************************************************************************
-    case 'addcategories':        // Ajout d'une cat???gorie
-    case 'editcategories':        // Edition d'une categories
-        // ****************************************************************************************************************
-        xoops_cp_header();
-        // references_adminMenu(1);
-        $object = 'categories';
-        if ($op == 'edit' . $object) {
-            $title = _AM_REFERENCES_EDIT_CATEGORY;
-            $id    = isset($_GET['id']) ? (int)$_GET['id'] : 0;
-            if (empty($id)) {
-                references_utils::redirect(_AM_REFERENCES_ERROR_1, $baseurl, 5);
-            }
-            // Item exits ?
-            $item = null;
-            $item = $h_references_categories->get($id);
-            if (!is_object($item)) {
-                references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl, 5);
-            }
-            $edit         = true;
-            $label_submit = _AM_REFERENCES_MODIFY;
-        } else {
-            $title        = _AM_REFERENCES_ADD_CATEGORY;
-            $item         = $h_references_categories->create(true);
-            $label_submit = _AM_REFERENCES_ADD;
-            $edit         = false;
-        }
-        $sform = new XoopsThemeForm($title, 'frmadd' . $object, $baseurl);
-        $sform->addElement(new XoopsFormHidden('op', 'saveedit' . $object));
-        $sform->addElement(new XoopsFormHidden('category_id', $item->getVar('category_id')));
-        $sform->addElement(new XoopsFormText(_AM_REFERENCES_TITLE, 'category_title', 50, 255, $item->getVar('category_title', 'e')), true);
-        $sform->addElement(new XoopsFormText(_AM_REFERENCES_CATEGORY_WEIGHT, 'category_weight', 10, 10, $item->getVar('category_weight', 'e')), true);
-        $editor = references_utils::getWysiwygForm(_AM_REFERENCES_DESCRIPTION, 'category_description', $item->getVar('category_description', 'e'), 15, 60, 'category_description_hidden');
-        if ($editor) {
-            $sform->addElement($editor, false);
-        }
-
-        // Permissions
-        $membersHandler = xoops_getHandler('member');
-        $allGroupsList  = $membersHandler->getGroupList();
-        $permHandler    = xoops_getHandler('groupperm');
-        $allGroupsIds   = array_keys($allGroupsList);
-
-        $groupsIds = array();
-        if ($edit) {
-            $groupsIds                 = $permHandler->getGroupIds(REFERENCES_PERM_READ, $item->getVar('category_id'), $xoopsModule->getVar('mid'));
-            $groupsIds                 = array_values($groupsIds);
-            $groupsThatCanViewCheckbox = new XoopsFormCheckBox(_AM_REFERENCES_VIEWFORM, 'groups_references_can_view[]', $groupsIds);
-        } else {
-            $groupsThatCanViewCheckbox = new XoopsFormCheckBox(_AM_REFERENCES_VIEWFORM, 'groups_references_can_view[]', $allGroupsIds);
-        }
-        $groupsThatCanViewCheckbox->addOptionArray($allGroupsList);
-        $sform->addElement($groupsThatCanViewCheckbox);
-        // *****
-
-        $button_tray = new XoopsFormElementTray('', '');
-        $submit_btn  = new XoopsFormButton('', 'post', $label_submit, 'submit');
-        $button_tray->addElement($submit_btn);
-        $sform->addElement($button_tray);
-        $sform = references_utils::formMarkRequiredFields($sform);
-        $sform->display();
-        include_once __DIR__ . '/admin_footer.php';  //show_footer();
-        break;
-
-    // ****************************************************************************************************************
-    case 'saveeditcategories':    // Sauvegarde d'une cat???gorie
-        // ****************************************************************************************************************
-        xoops_cp_header();
-        $id         = isset($_POST['category_id']) ? (int)$_POST['category_id'] : 0;
-        $opRedirect = 'categories';
-        if (!empty($id)) {
-            $edit = true;
-            $item = $h_references_categories->get($id);
-            if (!is_object($item)) {
-                references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl, 5);
-            }
-            $item->unsetNew();
-        } else {
-            $edit = false;
-            $item = $h_references_categories->create(true);
-        }
-
-        $item->setVars($_POST);
-
-        $res = $h_references_categories->insert($item);
-        if ($res) {
-            // Permissions
-            // Suppression des permissions actuelles
-            $gperm_handler = xoops_getHandler('groupperm');
-            $criteria      = new CriteriaCompo();
-            $criteria->add(new Criteria('gperm_itemid', $item->category_id, '='));
-            $criteria->add(new Criteria('gperm_modid', $xoopsModule->getVar('mid'), '='));
-            $criteria->add(new Criteria('gperm_name', REFERENCES_PERM_READ, '='));
-            $gperm_handler->deleteAll($criteria);
-            // Sauvegarde des nouvelles permissions, si elles existente
-            if (isset($_POST['groups_references_can_view'])) {
-                foreach ($_POST['groups_references_can_view'] as $groupId) {
-                    $gperm_handler->addRight(REFERENCES_PERM_READ, $item->category_id, $groupId, $xoopsModule->getVar('mid'));
-                }
-            }
-            // ****
-            if (!$edit) {
-                $h_references_categories->notifyNewCategory($item);
-            }
-            references_utils::updateCache();
-            references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
-        } else {
-            references_utils::redirect(_AM_REFERENCES_SAVE_PB, $baseurl . '?op=' . $opRedirect, 5);
-        }
-        break;
-
-    // ****************************************************************************************************************
-    case 'deletecategories':    // Suppression d'une cat???gorie
-        // ****************************************************************************************************************
-        xoops_cp_header();
-        $id = isset($_GET['id']) ? (int)$_GET['id'] : 0;
-        if (empty($id)) {
-            references_utils::redirect(_AM_REFERENCES_ERROR_1, $baseurl, 5);
-        }
-        $opRedirect = 'categories';
-        $item       = null;
-        $item       = $h_references_categories->get($id);
-        if (is_object($item)) {
-            $res = $h_references_categories->delete($item, true);
-            if ($res) {
-                references_utils::updateCache();
-                references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
-            }
-        }
-        references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl . '?op=' . $opRedirect, 5);
-        break;
-
-    // ****************************************************************************************************************
-    case 'autocomplete':    // Ajax, autocompl???tion
-        // ****************************************************************************************************************
-        if (!isset($xoopsUser) || !is_object($xoopsUser)) {
-            exit;
-        }
-        if (!references_utils::isAdmin()) {
-            exit;
-        }
-        error_reporting(0);
-        @$xoopsLogger->activated = false;
-        $handler = isset($_REQUEST['handler']) ? $_REQUEST['handler'] : '';
-        if ($handler != '') {
-            switch ($handler) {
-                case 'references_articles':
-                    $referencesFilter = new references_listFilter($h_references_articles, 'op', 'articles', 'start', $limit, $baseurl, 'article_title', 'ASC', true, REFERENCES_JS_URL);
-                    $referencesFilter->initFilter('article_title', array('dataType' => references_listFilter::FILTER_DATA_TEXT, 'fieldType' => references_listFilter::FILTER_FIELD_TEXT, 'size' => 35, 'maxLength' => 255, 'autoComplete' => true));
-                    echo utf8_encode($referencesFilter->autoComplete($_REQUEST['q'], $_REQUEST['limit'], $_REQUEST['field']));
-                    break;
-            }
-        }
-        exit;
-        break;
+	// ****************************************************************************************************************
+	case 'default':    // Gestion des articles
+	case 'articles':
+		// ****************************************************************************************************************
+		xoops_cp_header();
+		// references_adminMenu(0);
+		$objet = 'articles';
+		$items = array();
+		if (isset($_GET['move'])) {
+			$id    = isset($_GET['id']) ? (int)$_GET['id'] : 0;
+			$ordre = isset($_GET['ordre']) ? (int)$_GET['ordre'] : 0;
+			if ($_GET['move'] === 'up' && $id > 0) {
+				$handlers->h_references_articles->moveUp($id, $ordre);
+			}
+			if ($_GET['move'] === 'down' && $id > 0) {
+				$handlers->h_references_articles->moveDown($id, $ordre);
+			}
+		}
+		$form = "<form method='post' action='$baseurl' name='frmadd$objet' id='frmadd$objet'><input type='hidden' name='op' id='op' value='add$objet' /><input type='submit' name='btngo' id='btngo' value='" . _AM_REFERENCES_ADD_ITEM . "' /></form>";
+		echo $form;
+		$categoriesList = $h_references_categories->getListArray();
+		$upText         = _AM_REFERENCES_UP;
+		$downText       = _AM_REFERENCES_DOWN;
+		$upImg          = "<a href='$baseurl?op=articles&move=up&id=%d&ordre=%d' title=\"$upText\"><img src='" . REFERENCES_IMAGES_URL . "up.png' alt=\"$upText\" /></a>";
+		$downImg        = "<a href='$baseurl?op=articles&move=down&id=%d&ordre=%d' title=\"$downText\"><img src='" . REFERENCES_IMAGES_URL . "down.png' alt=\"$downText\" /></a>";
+
+		$referencesFilter = new references_listFilter($h_references_articles, 'op', 'articles', 'start', $limit, $baseurl, $defaultSortField, $defaultSortOrder, true, REFERENCES_JS_URL);
+		$referencesFilter->initFilter('article_id', array('dataType' => references_listFilter::FILTER_DATA_NUMERIC, 'fieldType' => references_listFilter::FILTER_FIELD_TEXT, 'size' => 5, 'maxLength' => 10));
+		$referencesFilter->initFilter('article_title', array('dataType' => references_listFilter::FILTER_DATA_TEXT, 'fieldType' => references_listFilter::FILTER_FIELD_TEXT, 'size' => 35, 'maxLength' => 255, 'autoComplete' => true));
+		$referencesFilter->initFilter('article_weight', array('dataType' => references_listFilter::FILTER_DATA_NUMERIC, 'fieldType' => references_listFilter::FILTER_FIELD_TEXT, 'size' => 5, 'maxLength' => 10));
+
+		$referencesFilter->initFilter('article_category_id', array('dataType' => references_listFilter::FILTER_DATA_NUMERIC, 'fieldType' => references_listFilter::FILTER_FIELD_SELECT, 'values' => $categoriesList, 'withNull' => true, 'style' => 'width: 170px; max-width: 170px;'));
+		$referencesFilter->initFilter('article_online', array('dataType' => references_listFilter::FILTER_DATA_NUMERIC, 'fieldType' => references_listFilter::FILTER_FIELD_SELECT, 'values' => array(2 => _YES, 1 => _NO), 'withNull' => true, 'minusOne' => true));
+		$sortFields = array('article_id' => _AM_REFERENCES_ID, 'article_title' => _AM_REFERENCES_TITLE, 'article_weight' => _AM_REFERENCES_WEIGHT, 'article_category_id' => _AM_REFERENCES_CATEGORY, 'article_online' => _AM_REFERENCES_ONLINE);
+		$referencesFilter->setSortFields($sortFields);
+
+		$referencesFilter->filter();
+		$itemsCount = $referencesFilter->getCount();
+		references_utils::htitle(_MI_REFERENCES_ADMENU0 . ' (' . $itemsCount . ')', 4);
+
+		if ($itemsCount > $limit) {
+			$pagenav = $referencesFilter->getPager();
+		}
+
+		$items             = $referencesFilter->getObjects();
+		$visibleCountItems = count($items);
+		$counter           = 0;
+		$categories        = $h_references_categories->getListArray();
+		echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
+		echo "<tr>\n";
+		echo "<form method='post' action='$baseurl'>\n";
+		echo "<td colspan='4' align='right'>" . $referencesFilter->getSortPlaceHolderHtmlCode();
+		echo $referencesFilter->getClearFilterbutton();
+		echo "</td>\n";
+		echo "<td colspan='2' align='right'>";
+		if (isset($pagenav) && is_object($pagenav)) {
+			echo $pagenav->renderNav();
+		}
+		echo "</td>\n</tr>\n";
+
+		echo "<th align='center'>" . _AM_REFERENCES_ID . "</th><th align='center'>" . _AM_REFERENCES_TITLE . "</th><th align='center'>" . _AM_REFERENCES_WEIGHT . "</th><th align='center'>" . _AM_REFERENCES_CATEGORY . "</th><th align='center'>" . _AM_REFERENCES_ONLINE . "</th><th align='center'>"
+			 . _AM_REFERENCES_MANUAL_DATE . "</th><th align='center'>" . _AM_REFERENCES_ACTION . '</th></tr>';
+		// Filtres ****************************************
+		echo "<tr>\n";
+		echo "<th align='center'>" . $referencesFilter->getFilterField('article_id') . "</th>\n";
+		echo "<th align='center'>" . $referencesFilter->getFilterField('article_title') . "</th>\n";
+		echo "<th align='center'>" . $referencesFilter->getFilterField('article_weight') . "</th>\n";
+		echo "<th align='center'>" . $referencesFilter->getFilterField('article_category_id') . "</th>\n";
+		echo "<th align='center'>" . $referencesFilter->getFilterField('article_online') . "</th>\n";
+		echo "<th align='center'>&nbsp;</th>\n";
+		echo "<th align='center'>" . $referencesFilter->getGoButton() . "</th></form></tr>\n";
+		// ************************************************
+		$class = '';
+		foreach ($items as $item) {
+			++$counter;
+			$class         = ($class === 'even') ? 'odd' : 'even';
+			$id            = $item->getVar('article_id');
+			$action_edit   = "<a href='$baseurl?op=edit" . $objet . '&id=' . $id . "' title='" . _EDIT . "'>" . $icones['edit'] . '</a>';
+			$action_delete = "<a href='$baseurl?op=delete" . $objet . '&id=' . $id . "' title='" . _DELETE . "'" . $conf_msg . '>' . $icones['delete'] . '</a>';
+			$category      = isset($categories[$item->getVar('article_category_id')]) ? $categories[$item->getVar('article_category_id')] : '';
+			$up            = $down = '';
+			echo "<tr class='" . $class . "'>\n";
+			$ordre = $item->getVar('article_weight');
+			if ($counter == 1 && $visibleCountItems > 1) { // Premier ???l???ment
+				$down = sprintf($downImg, $id, $ordre);
+			}
+			if ($counter == $visibleCountItems && $visibleCountItems > 1) { // Dernier ???l???ment
+				$up = sprintf($upImg, $id, $ordre);
+			}
+			if ($counter > 1 & $counter < $visibleCountItems && $visibleCountItems > 1) { // Element dans le milieu
+				$up   = sprintf($upImg, $id, $ordre);
+				$down = sprintf($downImg, $id, $ordre);
+			}
+
+			echo "<td align='center'>" . $id . '</td>';
+			echo "<td align='left'><a target='_blank' href='" . $item->getUrl() . "'>" . $item->getVar('article_title') . '</a></td>';
+			echo "<td align='center'>" . $item->getVar('article_weight') . " $up $down</td>";
+			echo "<td align='center'>" . $category . '</td>';
+			if ($item->isArticleOnline()) {
+				$statusLink = "<a href='$baseurl?op=offline&id=$id' title='" . _AM_REFERENCES_GO_OFFLINE . "'><img src='" . REFERENCES_IMAGES_URL . "status_online.png' alt='" . _AM_REFERENCES_GO_OFFLINE . "' /></a>";
+			} else {
+				$statusLink = "<a href='$baseurl?op=online&id=$id' title='" . _AM_REFERENCES_GO_ONLINE . "'><img src='" . REFERENCES_IMAGES_URL . "status_offline.png' alt='" . _AM_REFERENCES_GO_ONLINE . "' /></a>";
+			}
+			echo "<td align='center'>" . $statusLink . '</td>';
+			echo "<td align='center'>" . $item->getVar('article_date') . '</td>';
+			echo "<td align='center'>" . $action_edit . ' ' . $action_delete . "</td>\n";
+			echo "<tr>\n";
+		}
+		$class = ($class === 'even') ? 'odd' : 'even';
+		echo "<tr class='" . $class . "'>\n";
+		echo "<td colspan='7' align='center'>" . $form . "</td>\n";
+		echo "</tr>\n";
+		echo "</table>\n";
+		echo $referencesFilter->getJavascriptInitCode();
+		if (isset($pagenav) && is_object($pagenav)) {
+			echo "<div align='center'>" . $pagenav->renderNav() . '</div>';
+		}
+		echo "<br><br>\n";
+		include_once __DIR__ . '/admin_footer.php';  //show_footer();
+		break;
+
+	// ****************************************************************************************************************
+	case 'addarticles':        // Ajout d'un article
+	case 'editarticles':    // Edition d'un article
+		// ****************************************************************************************************************
+		xoops_cp_header();
+		// references_adminMenu(0);
+		$object = 'articles';
+		if ($op == 'edit' . $object) {
+			$title = _AM_REFERENCES_EDIT_ARTICLE;
+			$id    = isset($_GET['id']) ? (int)$_GET['id'] : 0;
+			if (empty($id)) {
+				references_utils::redirect(_AM_REFERENCES_ERROR_1, $baseurl, 5);
+			}
+			// Item exits ?
+			$item = null;
+			$item = $h_references_articles->get($id);
+			if (!is_object($item)) {
+				references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl, 5);
+			}
+			$edit         = true;
+			$label_submit = _AM_REFERENCES_MODIFY;
+		} else {
+			$title = _AM_REFERENCES_ADD_ARTICLE;
+			$item  = $h_references_articles->create(true);
+			$item->setVar('article_online', true);
+			if (REFERENCES_AUTO_FILL_MANUAL_DATE) {
+				$item->setVar('article_date', formatTimestamp(time(), 's'));
+			}
+			$label_submit = _AM_REFERENCES_ADD;
+			$edit         = false;
+		}
+		$sform = new XoopsThemeForm($title, 'frmadd' . $object, $baseurl);
+		$sform->setExtra('enctype="multipart/form-data"');
+		$sform->addElement(new XoopsFormHidden('op', 'saveedit' . $object));
+		$sform->addElement(new XoopsFormHidden('article_id', $item->getVar('article_id')));
+		$categories     = $h_references_categories->getListArray();
+		$categoriesList = new XoopsFormSelect(_AM_REFERENCES_CATEGORY, 'article_category_id', $item->getVar('article_category_id', 'e'));
+		$categoriesList->addOptionArray($categories);
+		$sform->addElement($categoriesList, true);
+
+		$sform->addElement(new XoopsFormText(_AM_REFERENCES_TITLE, 'article_title', 50, 255, $item->getVar('article_title', 'e')), true);
+		$sform->addElement(new XoopsFormRadioYN(_AM_REFERENCES_ONLINE, 'article_online', $item->getVar('article_online', 'e')), true);
+		$sform->addElement(new XoopsFormText(_AM_REFERENCES_MANUAL_DATE, 'article_date', 30, 30, $item->getVar('article_date', 'e')), false);
+		$sform->addElement(new XoopsFormTextDateSelect(_AM_REFERENCES_DATE, 'article_timestamp', 15, $item->getVar('article_timestamp', 'e')));
+		$sform->addElement(new XoopsFormText(_AM_REFERENCES_WEIGHT, 'article_weight', 5, 5, $item->getVar('article_weight', 'e')), false);
+		$sform->addElement(new XoopsFormText(_AM_REFERENCES_URL, 'article_externalurl', 50, 255, $item->getVar('article_externalurl', 'e')), false);
+
+		$editor = references_utils::getWysiwygForm(_AM_REFERENCES_TEXT, 'article_text', $item->getVar('article_text', 'e'), 15, 60, 'article_text_hidden');
+		if ($editor) {
+			$sform->addElement($editor, false);
+		}
+
+		$editor1 = references_utils::getWysiwygForm(_AM_REFERENCES_TEXT_MORE, 'article_readmore', $item->getVar('article_readmore', 'e'), 15, 60, 'article_readmore_hidden');
+		if ($editor1) {
+			$sform->addElement($editor1, false);
+		}
+
+		if (references_utils::getModuleOption('use_tags') && references_utils::tagModuleExists()) {
+			require_once XOOPS_ROOT_PATH . '/modules/tag/include/formtag.php';
+			$sform->addElement(new XoopsFormTag('item_tag', 60, 255, $item->getVar('article_id'), 0));
+		}
+		// Images
+		for ($i = 1; $i <= 10; ++$i) {
+			if ($op == 'edit' . $object && $item->pictureExists($i)) {
+				$pictureTray = new XoopsFormElementTray(_AM_REFERENCES_CURRENT_PICTURE . ' ' . $i, '<br>');
+				$pictureTray->addElement(new XoopsFormLabel('', "<img src='" . $item->getPictureUrl($i) . "' alt='' border='0' />"));
+				$deleteCheckbox = new XoopsFormCheckBox('', 'delpicture' . $i);
+				$deleteCheckbox->addOption(1, _DELETE);
+				$pictureTray->addElement($deleteCheckbox);
+				$sform->addElement($pictureTray);
+				unset($pictureTray, $deleteCheckbox);
+			}
+			$sform->addElement(new XoopsFormFile(_AM_REFERENCES_IMAGE . ' ' . $i, 'attachedfile' . $i, references_utils::getModuleOption('maxuploadsize')), false);
+			$fieldName = 'article_picture' . $i . '_text';
+			$sform->addElement(new XoopsFormText(_AM_REFERENCES_PICTURE_TEXT . ' ' . $i, $fieldName, 50, 255, $item->getVar($fieldName)), false);
+		}
+
+		// Fichier attach???
+		if ($op == 'edit' . $object && $item->attachmentExists()) {
+			$attachedTray = new XoopsFormElementTray(_AM_REFERENCES_ATTACHED_FILE, '<br>');
+			$attachedTray->addElement(new XoopsFormLabel('', "<a href='" . $item->getAttachmentUrl() . "' target='_blank'>" . $item->getVar('article_attached_file') . '</a>'));
+			$deleteCheckbox = new XoopsFormCheckBox('', 'delattach');
+			$deleteCheckbox->addOption(1, _DELETE);
+			$attachedTray->addElement($deleteCheckbox);
+			$sform->addElement($attachedTray);
+			unset($attachedTray, $deleteCheckbox);
+		}
+		$sform->addElement(new XoopsFormFile(_AM_REFERENCES_ATTACHED_FILE, 'article_attached_file', references_utils::getModuleOption('maxuploadsize')), false);
+
+		$button_tray = new XoopsFormElementTray('', '');
+		$submit_btn  = new XoopsFormButton('', 'post', $label_submit, 'submit');
+		$button_tray->addElement($submit_btn);
+		$sform->addElement($button_tray);
+		$sform = references_utils::formMarkRequiredFields($sform);
+		$sform->display();
+		include_once __DIR__ . '/admin_footer.php';  //show_footer();
+		break;
+
+	// ****************************************************************************************************************
+	case 'saveeditarticles':    // Sauvegarde d'un article
+		// ****************************************************************************************************************
+		xoops_cp_header();
+		$id         = isset($_POST['article_id']) ? (int)$_POST['article_id'] : 0;
+		$opRedirect = 'articles';
+		if (!empty($id)) {
+			$edit = true;
+			$item = $h_references_articles->get($id);
+			if (!is_object($item)) {
+				references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl, 5);
+			}
+			$item->unsetNew();
+		} else {
+			$edit = false;
+			$item = $h_references_articles->create(true);
+		}
+
+		$item->setVars($_POST);
+
+		// Images
+		for ($i = 1; $i <= 10; ++$i) {
+			if (isset($_POST['delpicture' . $i]) && (int)$_POST['delpicture' . $i] == 1) {
+				$item->deletePicture($i);
+				$item->setVar('article_picture' . $i, '');
+			}
+
+			// Upload de l'image et cr???ation de la vignette
+			$destname = '';
+			$return   = references_utils::uploadFile($i - 1, references_utils::getModuleOption('images_path'));
+			if ($return === true) {
+				if (references_utils::getModuleOption('images_width') > 0 && references_utils::getModuleOption('images_height') > 0) {
+					references_utils::createThumb(references_utils::getModuleOption('images_path') . '/' . basename($destname), references_utils::getModuleOption('images_path') . '/' . basename($destname), references_utils::getModuleOption('images_width'),
+												  references_utils::getModuleOption('images_height'), true);
+				}
+				$newDestName = references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . REFERENCES_THUMBS_PREFIX . basename($destname);
+				$retval      = references_utils::resizePicture(references_utils::getModuleOption('images_path') . '/' . basename($destname), $newDestName, $thumbs_width, $thumbs_height, true);
+				if ($retval == 1 || $retval == 3) {
+					$item->setVar('article_picture' . $i, $destname);
+				}
+			} else {
+				if ($return !== false) {
+					echo $return;
+				}
+			}
+		}
+
+		$timestamp = mktime(0, 0, 0, (int)substr($_POST['article_timestamp'], 5, 2), (int)substr($_POST['article_timestamp'], 8, 2), (int)substr($_POST['article_timestamp'], 0, 4));
+		$item->setVar('article_timestamp', $timestamp);
+
+		if (!$edit) {
+			$item->setVar('article_author', references_utils::getCurrentUserID());
+		}
+
+		// Suppression ???ventuelle du fichier attach???
+		if (isset($_POST['delattach']) && (int)$_POST['delattach'] == 1) {
+			$item->deleteAttachment();
+		}
+
+		$destname = '';
+		// Upload de la pi???ce jointe
+		$return = references_utils::uploadFile(10, references_utils::getModuleOption('attached_path'));
+		if ($return === true) {
+			$item->setVar('article_attached_file', $destname);
+		} else {
+			if ($return !== false) {
+				echo $return;
+			}
+		}
+
+		$res = $h_references_articles->insert($item);
+		if ($res) {
+			if (references_utils::getModuleOption('use_tags') && references_utils::tagModuleExists()) {
+				$tag_handler = xoops_getModuleHandler('tag', 'tag');
+				$tag_handler->updateByItem($_POST['item_tag'], $item->getVar('article_id'), $xoopsModule->getVar('dirname'), 0);
+			}
+			if (!$edit) {
+				$h_references_articles->notifyNewArticle($item);
+			}
+			references_utils::updateCache();
+			references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
+		} else {
+			references_utils::redirect(_AM_REFERENCES_SAVE_PB, $baseurl . '?op=' . $opRedirect, 5);
+		}
+		break;
+
+	// ****************************************************************************************************************
+	case 'offline':    // Mise hors ligne d'un article
+	case 'online':    // Mise en ligne d'un article
+		// ****************************************************************************************************************
+		xoops_cp_header();
+		$id = isset($_GET['id']) ? (int)$_GET['id'] : 0;
+		if (empty($id)) {
+			references_utils::redirect(_AM_REFERENCES_ERROR_1, $baseurl, 5);
+		}
+		$opRedirect = 'articles';
+		$item       = null;
+		$item       = $h_references_articles->get($id);
+		if (is_object($item)) {
+			if ($op === 'offline') {
+				$res = $h_references_articles->offlineArticle($item);
+			} else {
+				$res = $h_references_articles->onlineArticle($item);
+			}
+			if ($res) {
+				references_utils::updateCache();
+				references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
+			}
+		}
+		references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl . '?op=' . $opRedirect, 5);
+		break;
+
+	// ****************************************************************************************************************
+	case 'deletearticles':    // Suppression d'un article
+		// ****************************************************************************************************************
+		xoops_cp_header();
+		$id = isset($_GET['id']) ? (int)$_GET['id'] : 0;
+		if (empty($id)) {
+			references_utils::redirect(_AM_REFERENCES_ERROR_1, $baseurl, 5);
+		}
+		$opRedirect = 'articles';
+		$item       = null;
+		$item       = $h_references_articles->get($id);
+		if (is_object($item)) {
+			$res = $h_references_articles->deleteArticle($item, true);
+			if ($res) {
+				references_utils::updateCache();
+				references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
+			}
+		}
+		references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl . '?op=' . $opRedirect, 5);
+		break;
+
+	// ****************************************************************************************************************
+	case 'instant-zero';    // Publicit???
+		// ****************************************************************************************************************
+		xoops_cp_header();
+		// references_adminMenu(4);
+		echo "<iframe src='http://www.instant-zero.com/modules/liaise/?form_id=2' width='100%' height='600' frameborder='0'></iframe>";
+		include_once __DIR__ . '/admin_footer.php';  //show_footer();
+		break;
+
+	// ****************************************************************************************************************
+	case 'perms';    // Permissions
+		// ****************************************************************************************************************
+		xoops_cp_header();
+		// references_adminMenu(3);
+		require_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
+		$categories      = $handlers->h_references_categories->getCategories();
+		$permissionsForm = new XoopsGroupPermForm(_AM_REFERENCES_VIEWFORM, $xoopsModule->getVar('mid'), REFERENCES_PERM_READ, _AM_REFERENCES_VIEWFORM_DESC, 'admin/index.php?op=perms', 'true');
+		foreach ($categories as $category) {
+			$permissionsForm->addItem($category->category_id, $category->category_title, 0);
+		}
+		echo $permissionsForm->render();
+		echo "<br><br><br><br>\n";
+		unset($permissionsForm);
+		include_once __DIR__ . '/admin_footer.php';  //show_footer();
+		break;
+
+	// ****************************************************************************************************************
+	case 'texts':    // Gestion des textes
+		// ****************************************************************************************************************
+		xoops_cp_header();
+		// references_adminMenu(2);
+		require_once REFERENCES_PATH . 'class/registryfile.php';
+		$registry = new references_registryfile();
+
+		$sform = new XoopsThemeForm(_MI_REFERENCES_ADMENU1, 'frmatxt', $baseurl);
+		$sform->addElement(new XoopsFormHidden('op', 'savetexts'));
+		// Texte ??? afficher sur la page d'index du module
+		$editor1 = references_utils::getWysiwygForm(_AM_REFERENCES_TEXT1, 'text1', $registry->getfile(REFERENCES_TEXTFILE1), 5, 60, 'hometext1_hidden');
+		if ($editor1) {
+			$sform->addElement($editor1, false);
+		}
+		$button_tray = new XoopsFormElementTray('', '');
+		$submit_btn  = new XoopsFormButton('', 'post', _AM_REFERENCES_MODIFY, 'submit');
+		$button_tray->addElement($submit_btn);
+		$sform->addElement($button_tray);
+		$sform = references_utils::formMarkRequiredFields($sform);
+		$sform->display();
+		include_once __DIR__ . '/admin_footer.php';  //show_footer();
+		break;
+
+	// ****************************************************************************************************************
+	case 'savetexts':        // Sauvegarde des textes
+		// ****************************************************************************************************************
+		xoops_cp_header();
+		require_once REFERENCES_PATH . 'class/registryfile.php';
+		$registry = new references_registryfile();
+		$myts     = MyTextSanitizer::getInstance();
+		$registry->savefile($myts->stripSlashesGPC($_POST['text1']), REFERENCES_TEXTFILE1);
+		references_utils::updateCache();
+		references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=texts', 2);
+		break;
+
+	// ****************************************************************************************************************
+	case 'maintain':    // Maintenance des tables
+		// ****************************************************************************************************************
+		xoops_cp_header();
+		// references_adminMenu();
+		references_utils::maintainTablesCache();
+		references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl, 2);
+		break;
+
+	// ****************************************************************************************************************
+	case 'categories':    // Gestion des cat???gories
+		// ****************************************************************************************************************
+		xoops_cp_header();
+		// references_adminMenu(1);
+		$start = isset($_GET['start']) ? (int)$_GET['start'] : 0;
+		$objet = 'categories';
+		$items = array();
+		$form  = "<form method='post' action='$baseurl' name='frmadd$objet' id='frmadd$objet'><input type='hidden' name='op' id='op' value='add$objet' /><input type='submit' name='btngo' id='btngo' value='" . _AM_REFERENCES_ADD_ITEM . "' /></form>";
+		echo $form;
+		references_utils::htitle(_MI_REFERENCES_ADMENU2, 4);
+
+		$itemsCount = $h_references_categories->getCount();
+		if ($itemsCount > $limit) {
+			$pagenav = new XoopsPageNav($itemsCount, $limit, $start, 'start');
+		}
+
+		$items = $h_references_categories->getCategories($start, $limit);
+		if (isset($pagenav) && is_object($pagenav)) {
+			echo "<div align='right'>" . $pagenav->renderNav() . '</div>';
+		}
+		echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
+
+		echo "<tr><th align='center'>" . _AM_REFERENCES_ID . "</th><th align='center'>" . _AM_REFERENCES_TITLE . "</th><th align='center'>" . _AM_REFERENCES_CATEGORY_WEIGHT . "</th><th align='center'>" . _AM_REFERENCES_ACTION . '</th></tr>';
+
+		$class = '';
+		foreach ($items as $item) {
+			$class         = ($class === 'even') ? 'odd' : 'even';
+			$id            = $item->getVar('category_id');
+			$action_edit   = "<a href='$baseurl?op=edit" . $objet . '&id=' . $id . "' title='" . _EDIT . "'>" . $icones['edit'] . '</a>';
+			$action_delete = "<a href='$baseurl?op=delete" . $objet . '&id=' . $id . "' title='" . _DELETE . "'" . $conf_msg . '>' . $icones['delete'] . '</a>';
+
+			echo "<tr class='" . $class . "'>\n";
+			echo "<td align='center'>" . $id . '</td>';
+			echo "<td align='left'><a target='_blank' href='" . $item->getUrl() . "'>" . $item->getVar('category_title') . '</a></td>';
+			echo "<td align='right'>" . $item->getVar('category_weight') . '</td>';
+			echo "<td align='center'>" . $action_edit . ' ' . $action_delete . "</td>\n";
+			echo "<tr>\n";
+		}
+		$class = ($class === 'even') ? 'odd' : 'even';
+		echo "<tr class='" . $class . "'>\n";
+		echo "<td colspan='4' align='center'>" . $form . "</td>\n";
+		echo "</tr>\n";
+		echo "</table>\n";
+		if (isset($pagenav) && is_object($pagenav)) {
+			echo "<div align='center'>" . $pagenav->renderNav() . '</div>';
+		}
+		echo "<br><br>\n";
+		include_once __DIR__ . '/admin_footer.php';  //show_footer();
+		break;
+
+	// ****************************************************************************************************************
+	case 'addcategories':        // Ajout d'une cat???gorie
+	case 'editcategories':        // Edition d'une categories
+		// ****************************************************************************************************************
+		xoops_cp_header();
+		// references_adminMenu(1);
+		$object = 'categories';
+		if ($op == 'edit' . $object) {
+			$title = _AM_REFERENCES_EDIT_CATEGORY;
+			$id    = isset($_GET['id']) ? (int)$_GET['id'] : 0;
+			if (empty($id)) {
+				references_utils::redirect(_AM_REFERENCES_ERROR_1, $baseurl, 5);
+			}
+			// Item exits ?
+			$item = null;
+			$item = $h_references_categories->get($id);
+			if (!is_object($item)) {
+				references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl, 5);
+			}
+			$edit         = true;
+			$label_submit = _AM_REFERENCES_MODIFY;
+		} else {
+			$title        = _AM_REFERENCES_ADD_CATEGORY;
+			$item         = $h_references_categories->create(true);
+			$label_submit = _AM_REFERENCES_ADD;
+			$edit         = false;
+		}
+		$sform = new XoopsThemeForm($title, 'frmadd' . $object, $baseurl);
+		$sform->addElement(new XoopsFormHidden('op', 'saveedit' . $object));
+		$sform->addElement(new XoopsFormHidden('category_id', $item->getVar('category_id')));
+		$sform->addElement(new XoopsFormText(_AM_REFERENCES_TITLE, 'category_title', 50, 255, $item->getVar('category_title', 'e')), true);
+		$sform->addElement(new XoopsFormText(_AM_REFERENCES_CATEGORY_WEIGHT, 'category_weight', 10, 10, $item->getVar('category_weight', 'e')), true);
+		$editor = references_utils::getWysiwygForm(_AM_REFERENCES_DESCRIPTION, 'category_description', $item->getVar('category_description', 'e'), 15, 60, 'category_description_hidden');
+		if ($editor) {
+			$sform->addElement($editor, false);
+		}
+
+		// Permissions
+		$membersHandler = xoops_getHandler('member');
+		$allGroupsList  = $membersHandler->getGroupList();
+		$permHandler    = xoops_getHandler('groupperm');
+		$allGroupsIds   = array_keys($allGroupsList);
+
+		$groupsIds = array();
+		if ($edit) {
+			$groupsIds                 = $permHandler->getGroupIds(REFERENCES_PERM_READ, $item->getVar('category_id'), $xoopsModule->getVar('mid'));
+			$groupsIds                 = array_values($groupsIds);
+			$groupsThatCanViewCheckbox = new XoopsFormCheckBox(_AM_REFERENCES_VIEWFORM, 'groups_references_can_view[]', $groupsIds);
+		} else {
+			$groupsThatCanViewCheckbox = new XoopsFormCheckBox(_AM_REFERENCES_VIEWFORM, 'groups_references_can_view[]', $allGroupsIds);
+		}
+		$groupsThatCanViewCheckbox->addOptionArray($allGroupsList);
+		$sform->addElement($groupsThatCanViewCheckbox);
+		// *****
+
+		$button_tray = new XoopsFormElementTray('', '');
+		$submit_btn  = new XoopsFormButton('', 'post', $label_submit, 'submit');
+		$button_tray->addElement($submit_btn);
+		$sform->addElement($button_tray);
+		$sform = references_utils::formMarkRequiredFields($sform);
+		$sform->display();
+		include_once __DIR__ . '/admin_footer.php';  //show_footer();
+		break;
+
+	// ****************************************************************************************************************
+	case 'saveeditcategories':    // Sauvegarde d'une cat???gorie
+		// ****************************************************************************************************************
+		xoops_cp_header();
+		$id         = isset($_POST['category_id']) ? (int)$_POST['category_id'] : 0;
+		$opRedirect = 'categories';
+		if (!empty($id)) {
+			$edit = true;
+			$item = $h_references_categories->get($id);
+			if (!is_object($item)) {
+				references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl, 5);
+			}
+			$item->unsetNew();
+		} else {
+			$edit = false;
+			$item = $h_references_categories->create(true);
+		}
+
+		$item->setVars($_POST);
+
+		$res = $h_references_categories->insert($item);
+		if ($res) {
+			// Permissions
+			// Suppression des permissions actuelles
+			$gperm_handler = xoops_getHandler('groupperm');
+			$criteria      = new CriteriaCompo();
+			$criteria->add(new Criteria('gperm_itemid', $item->category_id, '='));
+			$criteria->add(new Criteria('gperm_modid', $xoopsModule->getVar('mid'), '='));
+			$criteria->add(new Criteria('gperm_name', REFERENCES_PERM_READ, '='));
+			$gperm_handler->deleteAll($criteria);
+			// Sauvegarde des nouvelles permissions, si elles existente
+			if (isset($_POST['groups_references_can_view'])) {
+				foreach ($_POST['groups_references_can_view'] as $groupId) {
+					$gperm_handler->addRight(REFERENCES_PERM_READ, $item->category_id, $groupId, $xoopsModule->getVar('mid'));
+				}
+			}
+			// ****
+			if (!$edit) {
+				$h_references_categories->notifyNewCategory($item);
+			}
+			references_utils::updateCache();
+			references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
+		} else {
+			references_utils::redirect(_AM_REFERENCES_SAVE_PB, $baseurl . '?op=' . $opRedirect, 5);
+		}
+		break;
+
+	// ****************************************************************************************************************
+	case 'deletecategories':    // Suppression d'une cat???gorie
+		// ****************************************************************************************************************
+		xoops_cp_header();
+		$id = isset($_GET['id']) ? (int)$_GET['id'] : 0;
+		if (empty($id)) {
+			references_utils::redirect(_AM_REFERENCES_ERROR_1, $baseurl, 5);
+		}
+		$opRedirect = 'categories';
+		$item       = null;
+		$item       = $h_references_categories->get($id);
+		if (is_object($item)) {
+			$res = $h_references_categories->delete($item, true);
+			if ($res) {
+				references_utils::updateCache();
+				references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
+			}
+		}
+		references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl . '?op=' . $opRedirect, 5);
+		break;
+
+	// ****************************************************************************************************************
+	case 'autocomplete':    // Ajax, autocompl???tion
+		// ****************************************************************************************************************
+		if (!isset($xoopsUser) || !is_object($xoopsUser)) {
+			exit;
+		}
+		if (!references_utils::isAdmin()) {
+			exit;
+		}
+		error_reporting(0);
+		@$xoopsLogger->activated = false;
+		$handler = isset($_REQUEST['handler']) ? $_REQUEST['handler'] : '';
+		if ($handler != '') {
+			switch ($handler) {
+				case 'references_articles':
+					$referencesFilter = new references_listFilter($h_references_articles, 'op', 'articles', 'start', $limit, $baseurl, 'article_title', 'ASC', true, REFERENCES_JS_URL);
+					$referencesFilter->initFilter('article_title', array('dataType' => references_listFilter::FILTER_DATA_TEXT, 'fieldType' => references_listFilter::FILTER_FIELD_TEXT, 'size' => 35, 'maxLength' => 255, 'autoComplete' => true));
+					echo utf8_encode($referencesFilter->autoComplete($_REQUEST['q'], $_REQUEST['limit'], $_REQUEST['field']));
+					break;
+			}
+		}
+		exit;
+		break;
 }
 xoops_cp_footer();

Spacing +110 added lines, -110 removed lines

@@ -19,15 +19,15 @@ 
  * ****************************************************************************
  */
 
-include_once __DIR__ . '/admin_header.php';
-require_once __DIR__ . '/../../../include/cp_header.php';
-require_once __DIR__ . '/../include/common.php';
+include_once __DIR__.'/admin_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
+require_once __DIR__.'/../include/common.php';
 
-require_once REFERENCES_PATH . 'admin/functions.php';
-require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-require_once REFERENCES_PATH . 'class/references_listFilter.php';
-require_once REFERENCES_PATH . 'admin/dbupdate.php';
+require_once REFERENCES_PATH.'admin/functions.php';
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+require_once REFERENCES_PATH.'class/references_listFilter.php';
+require_once REFERENCES_PATH.'admin/dbupdate.php';
 
 if (!isset($op)) {
     $op = 'default';
@@ -47,8 +47,8 @@ 
 references_utils::prepareFolder(references_utils::getModuleOption('images_path'));
 
 // Lecture de certains param???tres de l'application ********************************************************************
-$limit            = references_utils::getModuleOption('items_admin_page');    // Nombre maximum d'???l???ments ??? afficher
-$baseurl          = REFERENCES_URL . 'admin/' . basename(__FILE__);    // URL de ce script
+$limit            = references_utils::getModuleOption('items_admin_page'); // Nombre maximum d'???l???ments ??? afficher
+$baseurl          = REFERENCES_URL.'admin/'.basename(__FILE__); // URL de ce script
 $conf_msg         = references_utils::javascriptLinkConfirm(_AM_REFERENCES_CONF_DELITEM);
 $defaultSortField = references_utils::getModuleOption('admin_sort_field');
 $defaultSortOrder = references_utils::getModuleOption('admin_sort_order');
@@ -85,8 +85,8 @@ 
         $objet = 'articles';
         $items = array();
         if (isset($_GET['move'])) {
-            $id    = isset($_GET['id']) ? (int)$_GET['id'] : 0;
-            $ordre = isset($_GET['ordre']) ? (int)$_GET['ordre'] : 0;
+            $id    = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+            $ordre = isset($_GET['ordre']) ? (int) $_GET['ordre'] : 0;
             if ($_GET['move'] === 'up' && $id > 0) {
                 $handlers->h_references_articles->moveUp($id, $ordre);
             }
@@ -94,13 +94,13 @@ 
                 $handlers->h_references_articles->moveDown($id, $ordre);
             }
         }
-        $form = "<form method='post' action='$baseurl' name='frmadd$objet' id='frmadd$objet'><input type='hidden' name='op' id='op' value='add$objet' /><input type='submit' name='btngo' id='btngo' value='" . _AM_REFERENCES_ADD_ITEM . "' /></form>";
+        $form = "<form method='post' action='$baseurl' name='frmadd$objet' id='frmadd$objet'><input type='hidden' name='op' id='op' value='add$objet' /><input type='submit' name='btngo' id='btngo' value='"._AM_REFERENCES_ADD_ITEM."' /></form>";
         echo $form;
         $categoriesList = $h_references_categories->getListArray();
         $upText         = _AM_REFERENCES_UP;
         $downText       = _AM_REFERENCES_DOWN;
-        $upImg          = "<a href='$baseurl?op=articles&move=up&id=%d&ordre=%d' title=\"$upText\"><img src='" . REFERENCES_IMAGES_URL . "up.png' alt=\"$upText\" /></a>";
-        $downImg        = "<a href='$baseurl?op=articles&move=down&id=%d&ordre=%d' title=\"$downText\"><img src='" . REFERENCES_IMAGES_URL . "down.png' alt=\"$downText\" /></a>";
+        $upImg          = "<a href='$baseurl?op=articles&move=up&id=%d&ordre=%d' title=\"$upText\"><img src='".REFERENCES_IMAGES_URL."up.png' alt=\"$upText\" /></a>";
+        $downImg        = "<a href='$baseurl?op=articles&move=down&id=%d&ordre=%d' title=\"$downText\"><img src='".REFERENCES_IMAGES_URL."down.png' alt=\"$downText\" /></a>";
 
         $referencesFilter = new references_listFilter($h_references_articles, 'op', 'articles', 'start', $limit, $baseurl, $defaultSortField, $defaultSortOrder, true, REFERENCES_JS_URL);
         $referencesFilter->initFilter('article_id', array('dataType' => references_listFilter::FILTER_DATA_NUMERIC, 'fieldType' => references_listFilter::FILTER_FIELD_TEXT, 'size' => 5, 'maxLength' => 10));
@@ -114,7 +114,7 @@ 
 
         $referencesFilter->filter();
         $itemsCount = $referencesFilter->getCount();
-        references_utils::htitle(_MI_REFERENCES_ADMENU0 . ' (' . $itemsCount . ')', 4);
+        references_utils::htitle(_MI_REFERENCES_ADMENU0.' ('.$itemsCount.')', 4);
 
         if ($itemsCount > $limit) {
             $pagenav = $referencesFilter->getPager();
@@ -127,7 +127,7 @@ 
         echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
         echo "<tr>\n";
         echo "<form method='post' action='$baseurl'>\n";
-        echo "<td colspan='4' align='right'>" . $referencesFilter->getSortPlaceHolderHtmlCode();
+        echo "<td colspan='4' align='right'>".$referencesFilter->getSortPlaceHolderHtmlCode();
         echo $referencesFilter->getClearFilterbutton();
         echo "</td>\n";
         echo "<td colspan='2' align='right'>";
@@ -136,28 +136,28 @@ 
         }
         echo "</td>\n</tr>\n";
 
-        echo "<th align='center'>" . _AM_REFERENCES_ID . "</th><th align='center'>" . _AM_REFERENCES_TITLE . "</th><th align='center'>" . _AM_REFERENCES_WEIGHT . "</th><th align='center'>" . _AM_REFERENCES_CATEGORY . "</th><th align='center'>" . _AM_REFERENCES_ONLINE . "</th><th align='center'>"
-             . _AM_REFERENCES_MANUAL_DATE . "</th><th align='center'>" . _AM_REFERENCES_ACTION . '</th></tr>';
+        echo "<th align='center'>"._AM_REFERENCES_ID."</th><th align='center'>"._AM_REFERENCES_TITLE."</th><th align='center'>"._AM_REFERENCES_WEIGHT."</th><th align='center'>"._AM_REFERENCES_CATEGORY."</th><th align='center'>"._AM_REFERENCES_ONLINE."</th><th align='center'>"
+             . _AM_REFERENCES_MANUAL_DATE."</th><th align='center'>"._AM_REFERENCES_ACTION.'</th></tr>';
         // Filtres ****************************************
         echo "<tr>\n";
-        echo "<th align='center'>" . $referencesFilter->getFilterField('article_id') . "</th>\n";
-        echo "<th align='center'>" . $referencesFilter->getFilterField('article_title') . "</th>\n";
-        echo "<th align='center'>" . $referencesFilter->getFilterField('article_weight') . "</th>\n";
-        echo "<th align='center'>" . $referencesFilter->getFilterField('article_category_id') . "</th>\n";
-        echo "<th align='center'>" . $referencesFilter->getFilterField('article_online') . "</th>\n";
+        echo "<th align='center'>".$referencesFilter->getFilterField('article_id')."</th>\n";
+        echo "<th align='center'>".$referencesFilter->getFilterField('article_title')."</th>\n";
+        echo "<th align='center'>".$referencesFilter->getFilterField('article_weight')."</th>\n";
+        echo "<th align='center'>".$referencesFilter->getFilterField('article_category_id')."</th>\n";
+        echo "<th align='center'>".$referencesFilter->getFilterField('article_online')."</th>\n";
         echo "<th align='center'>&nbsp;</th>\n";
-        echo "<th align='center'>" . $referencesFilter->getGoButton() . "</th></form></tr>\n";
+        echo "<th align='center'>".$referencesFilter->getGoButton()."</th></form></tr>\n";
         // ************************************************
         $class = '';
         foreach ($items as $item) {
             ++$counter;
             $class         = ($class === 'even') ? 'odd' : 'even';
             $id            = $item->getVar('article_id');
-            $action_edit   = "<a href='$baseurl?op=edit" . $objet . '&id=' . $id . "' title='" . _EDIT . "'>" . $icones['edit'] . '</a>';
-            $action_delete = "<a href='$baseurl?op=delete" . $objet . '&id=' . $id . "' title='" . _DELETE . "'" . $conf_msg . '>' . $icones['delete'] . '</a>';
+            $action_edit   = "<a href='$baseurl?op=edit".$objet.'&id='.$id."' title='"._EDIT."'>".$icones['edit'].'</a>';
+            $action_delete = "<a href='$baseurl?op=delete".$objet.'&id='.$id."' title='"._DELETE."'".$conf_msg.'>'.$icones['delete'].'</a>';
             $category      = isset($categories[$item->getVar('article_category_id')]) ? $categories[$item->getVar('article_category_id')] : '';
             $up            = $down = '';
-            echo "<tr class='" . $class . "'>\n";
+            echo "<tr class='".$class."'>\n";
             $ordre = $item->getVar('article_weight');
             if ($counter == 1 && $visibleCountItems > 1) { // Premier ???l???ment
                 $down = sprintf($downImg, $id, $ordre);
@@ -165,36 +165,36 @@ 
             if ($counter == $visibleCountItems && $visibleCountItems > 1) { // Dernier ???l???ment
                 $up = sprintf($upImg, $id, $ordre);
             }
-            if ($counter > 1 & $counter < $visibleCountItems && $visibleCountItems > 1) { // Element dans le milieu
+            if ($counter > 1&$counter < $visibleCountItems && $visibleCountItems > 1) { // Element dans le milieu
                 $up   = sprintf($upImg, $id, $ordre);
                 $down = sprintf($downImg, $id, $ordre);
             }
 
-            echo "<td align='center'>" . $id . '</td>';
-            echo "<td align='left'><a target='_blank' href='" . $item->getUrl() . "'>" . $item->getVar('article_title') . '</a></td>';
-            echo "<td align='center'>" . $item->getVar('article_weight') . " $up $down</td>";
-            echo "<td align='center'>" . $category . '</td>';
+            echo "<td align='center'>".$id.'</td>';
+            echo "<td align='left'><a target='_blank' href='".$item->getUrl()."'>".$item->getVar('article_title').'</a></td>';
+            echo "<td align='center'>".$item->getVar('article_weight')." $up $down</td>";
+            echo "<td align='center'>".$category.'</td>';
             if ($item->isArticleOnline()) {
-                $statusLink = "<a href='$baseurl?op=offline&id=$id' title='" . _AM_REFERENCES_GO_OFFLINE . "'><img src='" . REFERENCES_IMAGES_URL . "status_online.png' alt='" . _AM_REFERENCES_GO_OFFLINE . "' /></a>";
+                $statusLink = "<a href='$baseurl?op=offline&id=$id' title='"._AM_REFERENCES_GO_OFFLINE."'><img src='".REFERENCES_IMAGES_URL."status_online.png' alt='"._AM_REFERENCES_GO_OFFLINE."' /></a>";
             } else {
-                $statusLink = "<a href='$baseurl?op=online&id=$id' title='" . _AM_REFERENCES_GO_ONLINE . "'><img src='" . REFERENCES_IMAGES_URL . "status_offline.png' alt='" . _AM_REFERENCES_GO_ONLINE . "' /></a>";
+                $statusLink = "<a href='$baseurl?op=online&id=$id' title='"._AM_REFERENCES_GO_ONLINE."'><img src='".REFERENCES_IMAGES_URL."status_offline.png' alt='"._AM_REFERENCES_GO_ONLINE."' /></a>";
             }
-            echo "<td align='center'>" . $statusLink . '</td>';
-            echo "<td align='center'>" . $item->getVar('article_date') . '</td>';
-            echo "<td align='center'>" . $action_edit . ' ' . $action_delete . "</td>\n";
+            echo "<td align='center'>".$statusLink.'</td>';
+            echo "<td align='center'>".$item->getVar('article_date').'</td>';
+            echo "<td align='center'>".$action_edit.' '.$action_delete."</td>\n";
             echo "<tr>\n";
         }
         $class = ($class === 'even') ? 'odd' : 'even';
-        echo "<tr class='" . $class . "'>\n";
-        echo "<td colspan='7' align='center'>" . $form . "</td>\n";
+        echo "<tr class='".$class."'>\n";
+        echo "<td colspan='7' align='center'>".$form."</td>\n";
         echo "</tr>\n";
         echo "</table>\n";
         echo $referencesFilter->getJavascriptInitCode();
         if (isset($pagenav) && is_object($pagenav)) {
-            echo "<div align='center'>" . $pagenav->renderNav() . '</div>';
+            echo "<div align='center'>".$pagenav->renderNav().'</div>';
         }
         echo "<br><br>\n";
-        include_once __DIR__ . '/admin_footer.php';  //show_footer();
+        include_once __DIR__.'/admin_footer.php'; //show_footer();
         break;
 
     // ****************************************************************************************************************
@@ -204,9 +204,9 @@ 
         xoops_cp_header();
         // references_adminMenu(0);
         $object = 'articles';
-        if ($op == 'edit' . $object) {
+        if ($op == 'edit'.$object) {
             $title = _AM_REFERENCES_EDIT_ARTICLE;
-            $id    = isset($_GET['id']) ? (int)$_GET['id'] : 0;
+            $id    = isset($_GET['id']) ? (int) $_GET['id'] : 0;
             if (empty($id)) {
                 references_utils::redirect(_AM_REFERENCES_ERROR_1, $baseurl, 5);
             }
@@ -228,9 +228,9 @@ 
             $label_submit = _AM_REFERENCES_ADD;
             $edit         = false;
         }
-        $sform = new XoopsThemeForm($title, 'frmadd' . $object, $baseurl);
+        $sform = new XoopsThemeForm($title, 'frmadd'.$object, $baseurl);
         $sform->setExtra('enctype="multipart/form-data"');
-        $sform->addElement(new XoopsFormHidden('op', 'saveedit' . $object));
+        $sform->addElement(new XoopsFormHidden('op', 'saveedit'.$object));
         $sform->addElement(new XoopsFormHidden('article_id', $item->getVar('article_id')));
         $categories     = $h_references_categories->getListArray();
         $categoriesList = new XoopsFormSelect(_AM_REFERENCES_CATEGORY, 'article_category_id', $item->getVar('article_category_id', 'e'));
@@ -255,29 +255,29 @@ 
         }
 
         if (references_utils::getModuleOption('use_tags') && references_utils::tagModuleExists()) {
-            require_once XOOPS_ROOT_PATH . '/modules/tag/include/formtag.php';
+            require_once XOOPS_ROOT_PATH.'/modules/tag/include/formtag.php';
             $sform->addElement(new XoopsFormTag('item_tag', 60, 255, $item->getVar('article_id'), 0));
         }
         // Images
         for ($i = 1; $i <= 10; ++$i) {
-            if ($op == 'edit' . $object && $item->pictureExists($i)) {
-                $pictureTray = new XoopsFormElementTray(_AM_REFERENCES_CURRENT_PICTURE . ' ' . $i, '<br>');
-                $pictureTray->addElement(new XoopsFormLabel('', "<img src='" . $item->getPictureUrl($i) . "' alt='' border='0' />"));
-                $deleteCheckbox = new XoopsFormCheckBox('', 'delpicture' . $i);
+            if ($op == 'edit'.$object && $item->pictureExists($i)) {
+                $pictureTray = new XoopsFormElementTray(_AM_REFERENCES_CURRENT_PICTURE.' '.$i, '<br>');
+                $pictureTray->addElement(new XoopsFormLabel('', "<img src='".$item->getPictureUrl($i)."' alt='' border='0' />"));
+                $deleteCheckbox = new XoopsFormCheckBox('', 'delpicture'.$i);
                 $deleteCheckbox->addOption(1, _DELETE);
                 $pictureTray->addElement($deleteCheckbox);
                 $sform->addElement($pictureTray);
                 unset($pictureTray, $deleteCheckbox);
             }
-            $sform->addElement(new XoopsFormFile(_AM_REFERENCES_IMAGE . ' ' . $i, 'attachedfile' . $i, references_utils::getModuleOption('maxuploadsize')), false);
-            $fieldName = 'article_picture' . $i . '_text';
-            $sform->addElement(new XoopsFormText(_AM_REFERENCES_PICTURE_TEXT . ' ' . $i, $fieldName, 50, 255, $item->getVar($fieldName)), false);
+            $sform->addElement(new XoopsFormFile(_AM_REFERENCES_IMAGE.' '.$i, 'attachedfile'.$i, references_utils::getModuleOption('maxuploadsize')), false);
+            $fieldName = 'article_picture'.$i.'_text';
+            $sform->addElement(new XoopsFormText(_AM_REFERENCES_PICTURE_TEXT.' '.$i, $fieldName, 50, 255, $item->getVar($fieldName)), false);
         }
 
         // Fichier attach???
-        if ($op == 'edit' . $object && $item->attachmentExists()) {
+        if ($op == 'edit'.$object && $item->attachmentExists()) {
             $attachedTray = new XoopsFormElementTray(_AM_REFERENCES_ATTACHED_FILE, '<br>');
-            $attachedTray->addElement(new XoopsFormLabel('', "<a href='" . $item->getAttachmentUrl() . "' target='_blank'>" . $item->getVar('article_attached_file') . '</a>'));
+            $attachedTray->addElement(new XoopsFormLabel('', "<a href='".$item->getAttachmentUrl()."' target='_blank'>".$item->getVar('article_attached_file').'</a>'));
             $deleteCheckbox = new XoopsFormCheckBox('', 'delattach');
             $deleteCheckbox->addOption(1, _DELETE);
             $attachedTray->addElement($deleteCheckbox);
@@ -292,14 +292,14 @@ 
         $sform->addElement($button_tray);
         $sform = references_utils::formMarkRequiredFields($sform);
         $sform->display();
-        include_once __DIR__ . '/admin_footer.php';  //show_footer();
+        include_once __DIR__.'/admin_footer.php'; //show_footer();
         break;
 
     // ****************************************************************************************************************
     case 'saveeditarticles':    // Sauvegarde d'un article
         // ****************************************************************************************************************
         xoops_cp_header();
-        $id         = isset($_POST['article_id']) ? (int)$_POST['article_id'] : 0;
+        $id         = isset($_POST['article_id']) ? (int) $_POST['article_id'] : 0;
         $opRedirect = 'articles';
         if (!empty($id)) {
             $edit = true;
@@ -317,9 +317,9 @@ 
 
         // Images
         for ($i = 1; $i <= 10; ++$i) {
-            if (isset($_POST['delpicture' . $i]) && (int)$_POST['delpicture' . $i] == 1) {
+            if (isset($_POST['delpicture'.$i]) && (int) $_POST['delpicture'.$i] == 1) {
                 $item->deletePicture($i);
-                $item->setVar('article_picture' . $i, '');
+                $item->setVar('article_picture'.$i, '');
             }
 
             // Upload de l'image et cr???ation de la vignette
@@ -327,13 +327,13 @@ 
             $return   = references_utils::uploadFile($i - 1, references_utils::getModuleOption('images_path'));
             if ($return === true) {
                 if (references_utils::getModuleOption('images_width') > 0 && references_utils::getModuleOption('images_height') > 0) {
-                    references_utils::createThumb(references_utils::getModuleOption('images_path') . '/' . basename($destname), references_utils::getModuleOption('images_path') . '/' . basename($destname), references_utils::getModuleOption('images_width'),
+                    references_utils::createThumb(references_utils::getModuleOption('images_path').'/'.basename($destname), references_utils::getModuleOption('images_path').'/'.basename($destname), references_utils::getModuleOption('images_width'),
                                                   references_utils::getModuleOption('images_height'), true);
                 }
-                $newDestName = references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . REFERENCES_THUMBS_PREFIX . basename($destname);
-                $retval      = references_utils::resizePicture(references_utils::getModuleOption('images_path') . '/' . basename($destname), $newDestName, $thumbs_width, $thumbs_height, true);
+                $newDestName = references_utils::getModuleOption('images_path').DIRECTORY_SEPARATOR.REFERENCES_THUMBS_PREFIX.basename($destname);
+                $retval      = references_utils::resizePicture(references_utils::getModuleOption('images_path').'/'.basename($destname), $newDestName, $thumbs_width, $thumbs_height, true);
                 if ($retval == 1 || $retval == 3) {
-                    $item->setVar('article_picture' . $i, $destname);
+                    $item->setVar('article_picture'.$i, $destname);
                 }
             } else {
                 if ($return !== false) {
@@ -342,7 +342,7 @@ 
             }
         }
 
-        $timestamp = mktime(0, 0, 0, (int)substr($_POST['article_timestamp'], 5, 2), (int)substr($_POST['article_timestamp'], 8, 2), (int)substr($_POST['article_timestamp'], 0, 4));
+        $timestamp = mktime(0, 0, 0, (int) substr($_POST['article_timestamp'], 5, 2), (int) substr($_POST['article_timestamp'], 8, 2), (int) substr($_POST['article_timestamp'], 0, 4));
         $item->setVar('article_timestamp', $timestamp);
 
         if (!$edit) {
@@ -350,7 +350,7 @@ 
         }
 
         // Suppression ???ventuelle du fichier attach???
-        if (isset($_POST['delattach']) && (int)$_POST['delattach'] == 1) {
+        if (isset($_POST['delattach']) && (int) $_POST['delattach'] == 1) {
             $item->deleteAttachment();
         }
 
@@ -375,9 +375,9 @@ 
                 $h_references_articles->notifyNewArticle($item);
             }
             references_utils::updateCache();
-            references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
+            references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl.'?op='.$opRedirect, 2);
         } else {
-            references_utils::redirect(_AM_REFERENCES_SAVE_PB, $baseurl . '?op=' . $opRedirect, 5);
+            references_utils::redirect(_AM_REFERENCES_SAVE_PB, $baseurl.'?op='.$opRedirect, 5);
         }
         break;
 
@@ -386,7 +386,7 @@ 
     case 'online':    // Mise en ligne d'un article
         // ****************************************************************************************************************
         xoops_cp_header();
-        $id = isset($_GET['id']) ? (int)$_GET['id'] : 0;
+        $id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
         if (empty($id)) {
             references_utils::redirect(_AM_REFERENCES_ERROR_1, $baseurl, 5);
         }
@@ -401,17 +401,17 @@ 
             }
             if ($res) {
                 references_utils::updateCache();
-                references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
+                references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl.'?op='.$opRedirect, 2);
             }
         }
-        references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl . '?op=' . $opRedirect, 5);
+        references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl.'?op='.$opRedirect, 5);
         break;
 
     // ****************************************************************************************************************
     case 'deletearticles':    // Suppression d'un article
         // ****************************************************************************************************************
         xoops_cp_header();
-        $id = isset($_GET['id']) ? (int)$_GET['id'] : 0;
+        $id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
         if (empty($id)) {
             references_utils::redirect(_AM_REFERENCES_ERROR_1, $baseurl, 5);
         }
@@ -422,27 +422,27 @@ 
             $res = $h_references_articles->deleteArticle($item, true);
             if ($res) {
                 references_utils::updateCache();
-                references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
+                references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl.'?op='.$opRedirect, 2);
             }
         }
-        references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl . '?op=' . $opRedirect, 5);
+        references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl.'?op='.$opRedirect, 5);
         break;
 
     // ****************************************************************************************************************
-    case 'instant-zero';    // Publicit???
+    case 'instant-zero'; // Publicit???
         // ****************************************************************************************************************
         xoops_cp_header();
         // references_adminMenu(4);
         echo "<iframe src='http://www.instant-zero.com/modules/liaise/?form_id=2' width='100%' height='600' frameborder='0'></iframe>";
-        include_once __DIR__ . '/admin_footer.php';  //show_footer();
+        include_once __DIR__.'/admin_footer.php'; //show_footer();
         break;
 
     // ****************************************************************************************************************
-    case 'perms';    // Permissions
+    case 'perms'; // Permissions
         // ****************************************************************************************************************
         xoops_cp_header();
         // references_adminMenu(3);
-        require_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php';
         $categories      = $handlers->h_references_categories->getCategories();
         $permissionsForm = new XoopsGroupPermForm(_AM_REFERENCES_VIEWFORM, $xoopsModule->getVar('mid'), REFERENCES_PERM_READ, _AM_REFERENCES_VIEWFORM_DESC, 'admin/index.php?op=perms', 'true');
         foreach ($categories as $category) {
@@ -451,7 +451,7 @@ 
         echo $permissionsForm->render();
         echo "<br><br><br><br>\n";
         unset($permissionsForm);
-        include_once __DIR__ . '/admin_footer.php';  //show_footer();
+        include_once __DIR__.'/admin_footer.php'; //show_footer();
         break;
 
     // ****************************************************************************************************************
@@ -459,7 +459,7 @@ 
         // ****************************************************************************************************************
         xoops_cp_header();
         // references_adminMenu(2);
-        require_once REFERENCES_PATH . 'class/registryfile.php';
+        require_once REFERENCES_PATH.'class/registryfile.php';
         $registry = new references_registryfile();
 
         $sform = new XoopsThemeForm(_MI_REFERENCES_ADMENU1, 'frmatxt', $baseurl);
@@ -475,19 +475,19 @@ 
         $sform->addElement($button_tray);
         $sform = references_utils::formMarkRequiredFields($sform);
         $sform->display();
-        include_once __DIR__ . '/admin_footer.php';  //show_footer();
+        include_once __DIR__.'/admin_footer.php'; //show_footer();
         break;
 
     // ****************************************************************************************************************
     case 'savetexts':        // Sauvegarde des textes
         // ****************************************************************************************************************
         xoops_cp_header();
-        require_once REFERENCES_PATH . 'class/registryfile.php';
+        require_once REFERENCES_PATH.'class/registryfile.php';
         $registry = new references_registryfile();
         $myts     = MyTextSanitizer::getInstance();
         $registry->savefile($myts->stripSlashesGPC($_POST['text1']), REFERENCES_TEXTFILE1);
         references_utils::updateCache();
-        references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=texts', 2);
+        references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl.'?op=texts', 2);
         break;
 
     // ****************************************************************************************************************
@@ -504,10 +504,10 @@ 
         // ****************************************************************************************************************
         xoops_cp_header();
         // references_adminMenu(1);
-        $start = isset($_GET['start']) ? (int)$_GET['start'] : 0;
+        $start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
         $objet = 'categories';
         $items = array();
-        $form  = "<form method='post' action='$baseurl' name='frmadd$objet' id='frmadd$objet'><input type='hidden' name='op' id='op' value='add$objet' /><input type='submit' name='btngo' id='btngo' value='" . _AM_REFERENCES_ADD_ITEM . "' /></form>";
+        $form  = "<form method='post' action='$baseurl' name='frmadd$objet' id='frmadd$objet'><input type='hidden' name='op' id='op' value='add$objet' /><input type='submit' name='btngo' id='btngo' value='"._AM_REFERENCES_ADD_ITEM."' /></form>";
         echo $form;
         references_utils::htitle(_MI_REFERENCES_ADMENU2, 4);
 
@@ -518,36 +518,36 @@ 
 
         $items = $h_references_categories->getCategories($start, $limit);
         if (isset($pagenav) && is_object($pagenav)) {
-            echo "<div align='right'>" . $pagenav->renderNav() . '</div>';
+            echo "<div align='right'>".$pagenav->renderNav().'</div>';
         }
         echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
 
-        echo "<tr><th align='center'>" . _AM_REFERENCES_ID . "</th><th align='center'>" . _AM_REFERENCES_TITLE . "</th><th align='center'>" . _AM_REFERENCES_CATEGORY_WEIGHT . "</th><th align='center'>" . _AM_REFERENCES_ACTION . '</th></tr>';
+        echo "<tr><th align='center'>"._AM_REFERENCES_ID."</th><th align='center'>"._AM_REFERENCES_TITLE."</th><th align='center'>"._AM_REFERENCES_CATEGORY_WEIGHT."</th><th align='center'>"._AM_REFERENCES_ACTION.'</th></tr>';
 
         $class = '';
         foreach ($items as $item) {
             $class         = ($class === 'even') ? 'odd' : 'even';
             $id            = $item->getVar('category_id');
-            $action_edit   = "<a href='$baseurl?op=edit" . $objet . '&id=' . $id . "' title='" . _EDIT . "'>" . $icones['edit'] . '</a>';
-            $action_delete = "<a href='$baseurl?op=delete" . $objet . '&id=' . $id . "' title='" . _DELETE . "'" . $conf_msg . '>' . $icones['delete'] . '</a>';
-
-            echo "<tr class='" . $class . "'>\n";
-            echo "<td align='center'>" . $id . '</td>';
-            echo "<td align='left'><a target='_blank' href='" . $item->getUrl() . "'>" . $item->getVar('category_title') . '</a></td>';
-            echo "<td align='right'>" . $item->getVar('category_weight') . '</td>';
-            echo "<td align='center'>" . $action_edit . ' ' . $action_delete . "</td>\n";
+            $action_edit   = "<a href='$baseurl?op=edit".$objet.'&id='.$id."' title='"._EDIT."'>".$icones['edit'].'</a>';
+            $action_delete = "<a href='$baseurl?op=delete".$objet.'&id='.$id."' title='"._DELETE."'".$conf_msg.'>'.$icones['delete'].'</a>';
+
+            echo "<tr class='".$class."'>\n";
+            echo "<td align='center'>".$id.'</td>';
+            echo "<td align='left'><a target='_blank' href='".$item->getUrl()."'>".$item->getVar('category_title').'</a></td>';
+            echo "<td align='right'>".$item->getVar('category_weight').'</td>';
+            echo "<td align='center'>".$action_edit.' '.$action_delete."</td>\n";
             echo "<tr>\n";
         }
         $class = ($class === 'even') ? 'odd' : 'even';
-        echo "<tr class='" . $class . "'>\n";
-        echo "<td colspan='4' align='center'>" . $form . "</td>\n";
+        echo "<tr class='".$class."'>\n";
+        echo "<td colspan='4' align='center'>".$form."</td>\n";
         echo "</tr>\n";
         echo "</table>\n";
         if (isset($pagenav) && is_object($pagenav)) {
-            echo "<div align='center'>" . $pagenav->renderNav() . '</div>';
+            echo "<div align='center'>".$pagenav->renderNav().'</div>';
         }
         echo "<br><br>\n";
-        include_once __DIR__ . '/admin_footer.php';  //show_footer();
+        include_once __DIR__.'/admin_footer.php'; //show_footer();
         break;
 
     // ****************************************************************************************************************
@@ -557,9 +557,9 @@ 
         xoops_cp_header();
         // references_adminMenu(1);
         $object = 'categories';
-        if ($op == 'edit' . $object) {
+        if ($op == 'edit'.$object) {
             $title = _AM_REFERENCES_EDIT_CATEGORY;
-            $id    = isset($_GET['id']) ? (int)$_GET['id'] : 0;
+            $id    = isset($_GET['id']) ? (int) $_GET['id'] : 0;
             if (empty($id)) {
                 references_utils::redirect(_AM_REFERENCES_ERROR_1, $baseurl, 5);
             }
@@ -577,8 +577,8 @@ 
             $label_submit = _AM_REFERENCES_ADD;
             $edit         = false;
         }
-        $sform = new XoopsThemeForm($title, 'frmadd' . $object, $baseurl);
-        $sform->addElement(new XoopsFormHidden('op', 'saveedit' . $object));
+        $sform = new XoopsThemeForm($title, 'frmadd'.$object, $baseurl);
+        $sform->addElement(new XoopsFormHidden('op', 'saveedit'.$object));
         $sform->addElement(new XoopsFormHidden('category_id', $item->getVar('category_id')));
         $sform->addElement(new XoopsFormText(_AM_REFERENCES_TITLE, 'category_title', 50, 255, $item->getVar('category_title', 'e')), true);
         $sform->addElement(new XoopsFormText(_AM_REFERENCES_CATEGORY_WEIGHT, 'category_weight', 10, 10, $item->getVar('category_weight', 'e')), true);
@@ -611,14 +611,14 @@ 
         $sform->addElement($button_tray);
         $sform = references_utils::formMarkRequiredFields($sform);
         $sform->display();
-        include_once __DIR__ . '/admin_footer.php';  //show_footer();
+        include_once __DIR__.'/admin_footer.php'; //show_footer();
         break;
 
     // ****************************************************************************************************************
     case 'saveeditcategories':    // Sauvegarde d'une cat???gorie
         // ****************************************************************************************************************
         xoops_cp_header();
-        $id         = isset($_POST['category_id']) ? (int)$_POST['category_id'] : 0;
+        $id         = isset($_POST['category_id']) ? (int) $_POST['category_id'] : 0;
         $opRedirect = 'categories';
         if (!empty($id)) {
             $edit = true;
@@ -655,9 +655,9 @@ 
                 $h_references_categories->notifyNewCategory($item);
             }
             references_utils::updateCache();
-            references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
+            references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl.'?op='.$opRedirect, 2);
         } else {
-            references_utils::redirect(_AM_REFERENCES_SAVE_PB, $baseurl . '?op=' . $opRedirect, 5);
+            references_utils::redirect(_AM_REFERENCES_SAVE_PB, $baseurl.'?op='.$opRedirect, 5);
         }
         break;
 
@@ -665,7 +665,7 @@ 
     case 'deletecategories':    // Suppression d'une cat???gorie
         // ****************************************************************************************************************
         xoops_cp_header();
-        $id = isset($_GET['id']) ? (int)$_GET['id'] : 0;
+        $id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
         if (empty($id)) {
             references_utils::redirect(_AM_REFERENCES_ERROR_1, $baseurl, 5);
         }
@@ -676,10 +676,10 @@ 
             $res = $h_references_categories->delete($item, true);
             if ($res) {
                 references_utils::updateCache();
-                references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl . '?op=' . $opRedirect, 2);
+                references_utils::redirect(_AM_REFERENCES_SAVE_OK, $baseurl.'?op='.$opRedirect, 2);
             }
         }
-        references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl . '?op=' . $opRedirect, 5);
+        references_utils::redirect(_AM_REFERENCES_NOT_FOUND, $baseurl.'?op='.$opRedirect, 5);
         break;
 
     // ****************************************************************************************************************

admin/menu.php

Indentation +19 added lines, -19 removed lines

@@ -34,38 +34,38 @@ 
 
 $xoopsModuleAdminPath = XOOPS_ROOT_PATH . '/' . $module->getInfo('dirmoduleadmin');
 if (!file_exists($fileinc = $xoopsModuleAdminPath . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
-    $fileinc = $xoopsModuleAdminPath . '/language/english/main.php';
+	$fileinc = $xoopsModuleAdminPath . '/language/english/main.php';
 }
 include_once $fileinc;
 
 $adminmenu[] = array(
-    'title' => _AM_MODULEADMIN_HOME,
-    'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/home.png'
+	'title' => _AM_MODULEADMIN_HOME,
+	'link'  => 'admin/index.php',
+	'icon'  => $pathIcon32 . '/home.png'
 );
 
 $adminmenu[] = array(
-    'title' => _MI_REFERENCES_ADMENU0,
-    'link'  => 'admin/main.php',
-    'icon'  => $pathIcon32 . '/index.png'
+	'title' => _MI_REFERENCES_ADMENU0,
+	'link'  => 'admin/main.php',
+	'icon'  => $pathIcon32 . '/index.png'
 );
 
 $adminmenu[] = array(
-    'title' => _MI_REFERENCES_ADMENU2,
-    'link'  => 'admin/main.php?op=categories',
-    'icon'  => $pathIcon32 . '/category.png'
+	'title' => _MI_REFERENCES_ADMENU2,
+	'link'  => 'admin/main.php?op=categories',
+	'icon'  => $pathIcon32 . '/category.png'
 );
 
 $adminmenu[] = array(
-    'title' => _MI_REFERENCES_ADMENU1,
-    'link'  => 'admin/main.php?op=texts',
-    'icon'  => $pathIcon32 . '/manage.png'
+	'title' => _MI_REFERENCES_ADMENU1,
+	'link'  => 'admin/main.php?op=texts',
+	'icon'  => $pathIcon32 . '/manage.png'
 );
 
 $adminmenu[] = array(
-    'title' => _MI_REFERENCES_ADMENU3,
-    'link'  => 'admin/main.php?op=perms',
-    'icon'  => $pathIcon32 . '/permissions.png'
+	'title' => _MI_REFERENCES_ADMENU3,
+	'link'  => 'admin/main.php?op=perms',
+	'icon'  => $pathIcon32 . '/permissions.png'
 );
 
 //$adminmenu[] = array(
@@ -75,8 +75,8 @@ 
 //);
 
 $adminmenu[] = array(
-    'title' => _AM_MODULEADMIN_ABOUT,
-    'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png'
+	'title' => _AM_MODULEADMIN_ABOUT,
+	'link'  => 'admin/about.php',
+	'icon'  => $pathIcon32 . '/about.png'
 );
 

Spacing +11 added lines, -11 removed lines

@@ -28,44 +28,44 @@ 
 
 $moduleHandler = xoops_getHandler('module');
 $module        = $moduleHandler->getByDirname($moduleDirName);
-$pathIcon32    = '../../' . $module->getInfo('sysicons32');
-$pathModIcon32 = './' . $module->getInfo('modicons32');
+$pathIcon32    = '../../'.$module->getInfo('sysicons32');
+$pathModIcon32 = './'.$module->getInfo('modicons32');
 xoops_loadLanguage('modinfo', $module->dirname());
 
-$xoopsModuleAdminPath = XOOPS_ROOT_PATH . '/' . $module->getInfo('dirmoduleadmin');
-if (!file_exists($fileinc = $xoopsModuleAdminPath . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
-    $fileinc = $xoopsModuleAdminPath . '/language/english/main.php';
+$xoopsModuleAdminPath = XOOPS_ROOT_PATH.'/'.$module->getInfo('dirmoduleadmin');
+if (!file_exists($fileinc = $xoopsModuleAdminPath.'/language/'.$GLOBALS['xoopsConfig']['language'].'/'.'main.php')) {
+    $fileinc = $xoopsModuleAdminPath.'/language/english/main.php';
 }
 include_once $fileinc;
 
 $adminmenu[] = array(
     'title' => _AM_MODULEADMIN_HOME,
     'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/home.png'
+    'icon'  => $pathIcon32.'/home.png'
 );
 
 $adminmenu[] = array(
     'title' => _MI_REFERENCES_ADMENU0,
     'link'  => 'admin/main.php',
-    'icon'  => $pathIcon32 . '/index.png'
+    'icon'  => $pathIcon32.'/index.png'
 );
 
 $adminmenu[] = array(
     'title' => _MI_REFERENCES_ADMENU2,
     'link'  => 'admin/main.php?op=categories',
-    'icon'  => $pathIcon32 . '/category.png'
+    'icon'  => $pathIcon32.'/category.png'
 );
 
 $adminmenu[] = array(
     'title' => _MI_REFERENCES_ADMENU1,
     'link'  => 'admin/main.php?op=texts',
-    'icon'  => $pathIcon32 . '/manage.png'
+    'icon'  => $pathIcon32.'/manage.png'
 );
 
 $adminmenu[] = array(
     'title' => _MI_REFERENCES_ADMENU3,
     'link'  => 'admin/main.php?op=perms',
-    'icon'  => $pathIcon32 . '/permissions.png'
+    'icon'  => $pathIcon32.'/permissions.png'
 );
 
 //$adminmenu[] = array(
@@ -77,6 +77,6 @@ 
 $adminmenu[] = array(
     'title' => _AM_MODULEADMIN_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png'
+    'icon'  => $pathIcon32.'/about.png'
 );
 

admin/dbupdate.php

Indentation +8 added lines, -8 removed lines

@@ -23,22 +23,22 @@
 // Nouveau champ article_attached_file_description dans references_articles
 $tableName = $xoopsDB->prefix('references_articles');
 if (!references_utils::fieldExists('article_weight', $tableName)) {
-    references_utils::addField('`article_weight` MEDIUMINT( 8 ) UNSIGNED NOT NULL AFTER `article_timestamp`', $tableName);
-    $xoopsDB->queryF('ALTER TABLE ' . $tableName . ' ADD INDEX ( `article_weight` )');
-    $wasUpdated = true;
+	references_utils::addField('`article_weight` MEDIUMINT( 8 ) UNSIGNED NOT NULL AFTER `article_timestamp`', $tableName);
+	$xoopsDB->queryF('ALTER TABLE ' . $tableName . ' ADD INDEX ( `article_weight` )');
+	$wasUpdated = true;
 }
 
 if (!references_utils::fieldExists('article_readmore', $tableName)) {
-    references_utils::addField('article_readmore TEXT NOT NULL', $tableName);
-    $wasUpdated = true;
+	references_utils::addField('article_readmore TEXT NOT NULL', $tableName);
+	$wasUpdated = true;
 }
 
 $tableName = $xoopsDB->prefix('references_categories');
 if (!references_utils::fieldExists('category_description', $tableName)) {
-    references_utils::addField('category_description TEXT NOT NULL', $tableName);
-    $wasUpdated = true;
+	references_utils::addField('category_description TEXT NOT NULL', $tableName);
+	$wasUpdated = true;
 }
 
 if ($wasUpdated) {
-    $op = 'maintain';
+	$op = 'maintain';
 }

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 $tableName = $xoopsDB->prefix('references_articles');
 if (!references_utils::fieldExists('article_weight', $tableName)) {
     references_utils::addField('`article_weight` MEDIUMINT( 8 ) UNSIGNED NOT NULL AFTER `article_timestamp`', $tableName);
-    $xoopsDB->queryF('ALTER TABLE ' . $tableName . ' ADD INDEX ( `article_weight` )');
+    $xoopsDB->queryF('ALTER TABLE '.$tableName.' ADD INDEX ( `article_weight` )');
     $wasUpdated = true;
 }
 

admin/admin_header.php

Spacing +7 added lines, -7 removed lines

@@ -17,15 +17,15 @@ 
  */
 
 $rootPath = dirname(dirname(dirname(__DIR__)));
-include_once $rootPath . '/mainfile.php';
-include_once $rootPath . '/include/cp_functions.php';
-require_once $rootPath . '/include/cp_header.php';
+include_once $rootPath.'/mainfile.php';
+include_once $rootPath.'/include/cp_functions.php';
+require_once $rootPath.'/include/cp_header.php';
 
 global $xoopsModule;
 
 //$moduleFolder = $GLOBALS['xoopsModule']->getVar('dirname');
 $moduleFolder = dirname(__DIR__);
-require_once $moduleFolder . '/include/common.php';
+require_once $moduleFolder.'/include/common.php';
 
 //if functions.php file exist
 //require_once $moduleFolder . '/include/functions.php';
@@ -37,7 +37,7 @@ 
 xoops_loadLanguage('modinfo', $moduleFolder);
 xoops_loadLanguage('main', $moduleFolder);
 
-$pathIcon16           = $GLOBALS['xoops']->url('www/' . $GLOBALS['xoopsModule']->getInfo('sysicons16'));
-$pathIcon32           = $GLOBALS['xoops']->url('www/' . $GLOBALS['xoopsModule']->getInfo('sysicons32'));
-$xoopsModuleAdminPath = $GLOBALS['xoops']->path('www/' . $GLOBALS['xoopsModule']->getInfo('dirmoduleadmin'));
+$pathIcon16           = $GLOBALS['xoops']->url('www/'.$GLOBALS['xoopsModule']->getInfo('sysicons16'));
+$pathIcon32           = $GLOBALS['xoops']->url('www/'.$GLOBALS['xoopsModule']->getInfo('sysicons32'));
+$xoopsModuleAdminPath = $GLOBALS['xoops']->path('www/'.$GLOBALS['xoopsModule']->getInfo('dirmoduleadmin'));
 require_once "{$xoopsModuleAdminPath}/moduleadmin.php";

admin/admin_footer.php

Spacing +1 added lines, -1 removed lines

@@ -19,6 +19,6 @@
 global $xoopsModule;
 //$pathIcon32 = '../../../' . $xoopsModule->getInfo('sysicons32');
 
-echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n" . "    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . '</div>';
+echo "<div class='adminfooter'>\n"."  <div style='text-align: center;'>\n"."    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"."  </div>\n".'  '._AM_MODULEADMIN_ADMIN_FOOTER."\n".'</div>';
 
 xoops_cp_footer();