diff --git a/README.md b/README.md
index 3380b9ae..22799486 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
-publisher
-=========
+#Publisher
 [![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](LICENSE) 
 
 Publishing module for XOOPS for static/HTML content and articles stored and provided in a hierarchical manner
diff --git a/publisher/admin/about.php b/publisher/admin/about.php
index c5dc06dd..e7ac56b6 100644
--- a/publisher/admin/about.php
+++ b/publisher/admin/about.php
@@ -27,7 +27,7 @@
 $aboutAdmin = new ModuleAdmin();
 
 echo $aboutAdmin->addNavigation('about.php');
-echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false);
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
 
 //    if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
 //        echo 'I am at least PHP version 5.4.0, my version: ' . PHP_VERSION . "\n";
@@ -35,5 +35,4 @@
 //        echo 'I am using PHP lower than 5.4, my version: ' . PHP_VERSION . "\n";
 //    }
 
-
 xoops_cp_footer();
diff --git a/publisher/admin/admin_header.php b/publisher/admin/admin_header.php
index 574150b3..08e48c27 100644
--- a/publisher/admin/admin_header.php
+++ b/publisher/admin/admin_header.php
@@ -30,8 +30,7 @@
     'editimg'   => "<img src='" . PUBLISHER_IMAGES_URL . "/button_edit.png' alt='" . _AM_PUBLISHER_ICO_EDIT . "' align='middle' />",
     'deleteimg' => "<img src='" . PUBLISHER_IMAGES_URL . "/button_delete.png' alt='" . _AM_PUBLISHER_ICO_DELETE . "' align='middle' />",
     'online'    => "<img src='" . PUBLISHER_IMAGES_URL . "/on.png' alt='" . _AM_PUBLISHER_ICO_ONLINE . "' align='middle' />",
-    'offline'   => "<img src='" . PUBLISHER_IMAGES_URL . "/off.png' alt='" . _AM_PUBLISHER_ICO_OFFLINE . "' align='middle' />",
-);
+    'offline'   => "<img src='" . PUBLISHER_IMAGES_URL . "/off.png' alt='" . _AM_PUBLISHER_ICO_OFFLINE . "' align='middle' />");
 include_once $GLOBALS['xoops']->path('Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
 
 /*
diff --git a/publisher/admin/category.php b/publisher/admin/category.php
index 1163fa89..7da0dfe2 100644
--- a/publisher/admin/category.php
+++ b/publisher/admin/category.php
@@ -21,7 +21,7 @@
 
 include_once __DIR__ . '/admin_header.php';
 
-$op = XoopsRequest::getString('op', '', 'GET');
+$op = XoopsRequest::getString('op', (XoopsRequest::getString('op', '', 'POST')), 'GET');
 
 $op = (XoopsRequest::getString('editor', '', 'POST')) ? 'mod' : $op;
 $op = (XoopsRequest::getString('addcategory', '', 'POST')) ? 'addcategory' : $op;
@@ -31,18 +31,17 @@
 $categoryid    = XoopsRequest::getInt('categoryid');
 
 switch ($op) {
-
-    case "del":
-        $categoryObj = $publisher->getHandler('category')->get($categoryid);
+    case 'del':
+        $categoryObj =& $publisher->getHandler('category')->get($categoryid);
         $confirm     = XoopsRequest::getInt('confirm', '', 'POST');
         $name        = XoopsRequest::getString('name', '', 'POST');
         if ($confirm) {
             if (!$publisher->getHandler('category')->delete($categoryObj)) {
-                redirect_header("category.php", 1, _AM_PUBLISHER_DELETE_CAT_ERROR);
-//                exit();
+                redirect_header('category.php', 1, _AM_PUBLISHER_DELETE_CAT_ERROR);
+                //                exit();
             }
-            redirect_header("category.php", 1, sprintf(_AM_PUBLISHER_COLISDELETED, $name));
-//            exit();
+            redirect_header('category.php', 1, sprintf(_AM_PUBLISHER_COLISDELETED, $name));
+            //            exit();
         } else {
             xoops_cp_header();
             xoops_confirm(array('op' => 'del', 'categoryid' => $categoryObj->categoryid(), 'confirm' => 1, 'name' => $categoryObj->name()), 'category.php', _AM_PUBLISHER_DELETECOL . " '" . $categoryObj->name() . "'. <br /> <br />" . _AM_PUBLISHER_DELETE_CAT_CONFIRM, _AM_PUBLISHER_DELETE);
@@ -50,41 +49,43 @@
         }
         break;
 
-    case "mod":
+    case 'mod':
         //Added by fx2024
         $nb_subcats = XoopsRequest::getInt('nb_subcats', 0, 'POST');
-        $nb_subcats = $nb_subcats + (XoopsRequest::getInt('nb_sub_yet', 4, 'POST'));
+        $nb_subcats += (XoopsRequest::getInt('nb_sub_yet', 4, 'POST'));
         //end of fx2024 code
 
         publisherCpHeader();
         PublisherUtilities::editCategory(true, $categoryid, $nb_subcats);
         break;
 
-    case "addcategory":
+    case 'addcategory':
         global $modify;
 
         $parentid = XoopsRequest::getInt('parentid');
 
         if ($categoryid != 0) {
-            $categoryObj = $publisher->getHandler('category')->get($categoryid);
+            $categoryObj =& $publisher->getHandler('category')->get($categoryid);
         } else {
-            $categoryObj = $publisher->getHandler('category')->create();
+            $categoryObj =& $publisher->getHandler('category')->create();
         }
 
         // Uploading the image, if any
         // Retreive the filename to be uploaded
-        if ($image_file = XoopsRequest::getArray('image_file', '', 'FILES')['name']) {
-//            $filename = XoopsRequest::getArray('xoops_upload_file', array(), 'POST')[0];
-            if ($filename = XoopsRequest::getArray('xoops_upload_file', array(), 'POST')[0]) {
+        $temp = XoopsRequest::getArray('image_file', '', 'FILES');
+        if ($image_file = $temp['name']) {
+            //            $filename = XoopsRequest::getArray('xoops_upload_file', array(), 'POST')[0];
+            $temp2 = XoopsRequest::getArray('xoops_upload_file', array(), 'POST');
+            if ($filename = $temp2[0]) {
                 // TODO : implement publisher mimetype management
                 $max_size          = $publisher->getConfig('maximum_filesize');
                 $max_imgwidth      = $publisher->getConfig('maximum_image_width');
                 $max_imgheight     = $publisher->getConfig('maximum_image_height');
                 $allowed_mimetypes = publisherGetAllowedImagesTypes();
-
-                if (!($tmp_name = (XoopsRequest::getArray('filename', array(), 'FILES')['tmp_name'])) || !is_readable($tmp_name)) {
+                $temp3             = XoopsRequest::getArray('filename', array(), 'FILES');
+                if (!is_readable($tmp_name) || !($tmp_name = $temp3['tmp_name'])) {
                     redirect_header('javascript:history.go(-1)', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR);
-//                    exit();
+                    //                    exit();
                 }
 
                 xoops_load('XoopsMediaUploader');
@@ -93,11 +94,11 @@
                     $categoryObj->setVar('image', $uploader->getSavedFileName());
                 } else {
                     redirect_header('javascript:history.go(-1)', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR . $uploader->getErrors());
-//                    exit();
+                    //                    exit();
                 }
             }
         } else {
-                $categoryObj->setVar('image', XoopsRequest::getString('image', '', 'POST'));
+            $categoryObj->setVar('image', XoopsRequest::getString('image', '', 'POST'));
         }
         $categoryObj->setVar('parentid', (XoopsRequest::getInt('parentid', 0, 'POST')));
 
@@ -129,8 +130,8 @@
         }
 
         if (!$categoryObj->store()) {
-            redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_CATEGORY_SAVE_ERROR . publisherFormatErrors($categoryObj->getErrors()));
-//            exit;
+            redirect_header('javascript:history.go(-1)', 3, _AM_PUBLISHER_CATEGORY_SAVE_ERROR . publisherFormatErrors($categoryObj->getErrors()));
+            //            exit;
         }
         // TODO : put this function in the category class
         publisherSaveCategoryPermissions($grpread, $categoryObj->categoryid(), 'category_read');
@@ -141,14 +142,16 @@
         $parentCat = $categoryObj->categoryid();
         $sizeof    = count(XoopsRequest::getString('scname', '', 'POST'));
         for ($i = 0; $i < $sizeof; ++$i) {
-            if (XoopsRequest::getArray('scname', array(), 'POST')[$i] != '') {
-                $categoryObj = $publisher->getHandler('category')->create();
-                $categoryObj->setVar('name', XoopsRequest::getArray('scname', array(), 'POST')[$i]);
+            $temp = XoopsRequest::getArray('scname', array(), 'POST');
+            if ($temp[$i] != '') {
+                $categoryObj =& $publisher->getHandler('category')->create();
+                $temp2       = XoopsRequest::getArray('scname', array(), 'POST');
+                $categoryObj->setVar('name', $temp2[$i]);
                 $categoryObj->setVar('parentid', $parentCat);
 
                 if (!$categoryObj->store()) {
-                    redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR . publisherFormatErrors($categoryObj->getErrors()));
-//                    exit;
+                    redirect_header('javascript:history.go(-1)', 3, _AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR . publisherFormatErrors($categoryObj->getErrors()));
+                    //                    exit;
                 }
                 // TODO : put this function in the category class
                 publisherSaveCategoryPermissions($grpread, $categoryObj->categoryid(), 'category_read');
@@ -158,16 +161,16 @@
         }
         //end of fx2024 code
         redirect_header($redirect_to, 2, $redirect_msg);
-//        exit();
+        //        exit();
         break;
 
     //Added by fx2024
 
-    case "addsubcats":
+    case 'addsubcats':
         $categoryid = 0;
         $nb_subcats = XoopsRequest::getInt('nb_subcats', 0, 'POST') + XoopsRequest::getInt('nb_sub_yet', 0, 'POST');
 
-        $categoryObj = $publisher->getHandler('category')->create();
+        $categoryObj =& $publisher->getHandler('category')->create();
         $categoryObj->setVar('name', XoopsRequest::getString('name', '', 'POST'));
         $categoryObj->setVar('description', XoopsRequest::getString('description', '', 'POST'));
         $categoryObj->setVar('weight', XoopsRequest::getInt('weight', 0, 'POST'));
@@ -181,11 +184,11 @@
         break;
     //end of fx2024 code
 
-    case "cancel":
-        redirect_header("category.php", 1, sprintf(_AM_PUBLISHER_BACK2IDX, ''));
-//        exit();
+    case 'cancel':
+        redirect_header('category.php', 1, sprintf(_AM_PUBLISHER_BACK2IDX, ''));
+        //        exit();
         break;
-    case "default":
+    case 'default':
     default:
         publisherCpHeader();
         //publisher_adminMenu(1, _AM_PUBLISHER_CATEGORIES);
@@ -194,39 +197,39 @@
         echo "<form><div style=\"margin-bottom: 12px;\">";
         echo "<input type='button' name='button' onclick=\"location='category.php?op=mod'\" value='" . _AM_PUBLISHER_CATEGORY_CREATE . "'>&nbsp;&nbsp;";
         //echo "<input type='button' name='button' onclick=\"location='item.php?op=mod'\" value='" . _AM_PUBLISHER_CREATEITEM . "'>&nbsp;&nbsp;";
-        echo "</div></form>";
+        echo '</div></form>';
 
         // Creating the objects for top categories
-        $categoriesObj = $publisher->getHandler('category')->getCategories($publisher->getConfig('idxcat_perpage'), $startcategory, 0);
+        $categoriesObj =& $publisher->getHandler('category')->getCategories($publisher->getConfig('idxcat_perpage'), $startcategory, 0);
 
         publisherOpenCollapsableBar('createdcategories', 'createdcategoriesicon', _AM_PUBLISHER_CATEGORIES_TITLE, _AM_PUBLISHER_CATEGORIES_DSC);
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
-        echo "<tr>";
-        echo "<th width='20' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMCATEGORY_ID . "</strong></td>";
-        echo "<th class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . "</strong></td>";
-        echo "<th width='60' class='bg3' width='65' align='center'><strong>" . _CO_PUBLISHER_WEIGHT . "</strong></td>";
-        echo "<th width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
-        echo "</tr>";
-        $totalCategories = $publisher->getHandler('category')->getCategoriesCount(0);
+        echo '<tr>';
+        echo "<th width='20' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMCATEGORY_ID . '</strong></td>';
+        echo "<th class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . '</strong></td>';
+        echo "<th width='60' class='bg3' width='65' align='center'><strong>" . _CO_PUBLISHER_WEIGHT . '</strong></td>';
+        echo "<th width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+        echo '</tr>';
+        $totalCategories =& $publisher->getHandler('category')->getCategoriesCount(0);
         if (count($categoriesObj) > 0) {
             foreach ($categoriesObj as $key => $thiscat) {
                 PublisherUtilities::displayCategory($thiscat);
             }
             unset($key, $thiscat);
         } else {
-            echo "<tr>";
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOCAT . "</td>";
-            echo "</tr>";
+            echo '<tr>';
+            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOCAT . '</td>';
+            echo '</tr>';
             $categoryid = '0';
         }
         echo "</table>\n";
         include_once $GLOBALS['xoops']->path('class/pagenav.php');
         $pagenav = new XoopsPageNav($totalCategories, $publisher->getConfig('idxcat_perpage'), $startcategory, 'startcategory');
         echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
-        echo "<br />";
+        echo '<br />';
         publisherCloseCollapsableBar('createdcategories', 'createdcategoriesicon');
-        echo "<br>";
+        echo '<br>';
         //editcat(false);
         break;
 }
diff --git a/publisher/admin/clone.php b/publisher/admin/clone.php
index acdedba1..f939a58a 100644
--- a/publisher/admin/clone.php
+++ b/publisher/admin/clone.php
@@ -18,25 +18,25 @@
  * @version         $Id: clone.php 10374 2012-12-12 23:39:48Z trabis $
  */
 
-include_once __DIR__ . "/admin_header.php";
+include_once __DIR__ . '/admin_header.php';
 
 publisherCpHeader();
 //publisher_adminMenu(-1, _AM_PUBLISHER_CLONE);
 publisherOpenCollapsableBar('clone', 'cloneicon', _AM_PUBLISHER_CLONE, _AM_PUBLISHER_CLONE_DSC);
 
-if ('submit' == XoopsRequest::getString('op', '', 'POST')) {
+if ('submit' === XoopsRequest::getString('op', '', 'POST')) {
     if (!$GLOBALS['xoopsSecurity']->check()) {
         redirect_header('clone.php', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
-//        exit();
+        //        exit();
     }
 
-//    $clone = $_POST['clone'];
+    //    $clone = $_POST['clone'];
     $clone = XoopsRequest::getString('clone', '', 'POST');
 
     //check if name is valid
     if (empty($clone) || preg_match('/[^a-zA-Z0-9\_\-]/', $clone)) {
         redirect_header('clone.php', 3, sprintf(_AM_PUBLISHER_CLONE_INVALIDNAME, $clone));
-//        exit();
+        //        exit();
     }
 
     // Check wether the cloned module exists or not
@@ -47,17 +47,16 @@
     $patterns = array(
         strtolower(PUBLISHER_DIRNAME)          => strtolower($clone),
         strtoupper(PUBLISHER_DIRNAME)          => strtoupper($clone),
-        ucfirst(strtolower(PUBLISHER_DIRNAME)) => ucfirst(strtolower($clone))
-    );
+        ucfirst(strtolower(PUBLISHER_DIRNAME)) => ucfirst(strtolower($clone)));
 
     $patKeys   = array_keys($patterns);
     $patValues = array_values($patterns);
     PublisherClone::cloneFileFolder(PUBLISHER_ROOT_PATH);
     $logocreated = PublisherClone::createLogo(strtolower($clone));
 
-    $msg = "";
+    $msg = '';
     if (is_dir($GLOBALS['xoops']->path('modules/' . strtolower($clone)))) {
-        $msg .= sprintf(_AM_PUBLISHER_CLONE_CONGRAT, "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin'>" . ucfirst(strtolower($clone)) . "</a>") . "<br />\n";
+        $msg .= sprintf(_AM_PUBLISHER_CLONE_CONGRAT, "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin'>" . ucfirst(strtolower($clone)) . '</a>') . "<br />\n";
         if (!$logocreated) {
             $msg .= _AM_PUBLISHER_CLONE_IMAGEFAIL;
         }
@@ -100,14 +99,14 @@ function file_put_contents($filename, $data, $file_append = false)
 class PublisherClone
 {
 
-// recursive clonning script
+    // recursive clonning script
     /**
      * @param $path
      */
     public static function cloneFileFolder($path)
     {
-    global $patKeys;
-    global $patValues;
+        global $patKeys;
+        global $patValues;
 
         $newPath = str_replace($patKeys[0], $patValues[0], $path);
 
@@ -118,7 +117,7 @@ public static function cloneFileFolder($path)
             // check all files in dir, and process it
             if ($handle == opendir($path)) {
                 while (($file = readdir($handle)) !== false) {
-                    if ($file != '.' && $file != '..' && $file != '.svn') {
+                    if ($file !== '.' && $file !== '..' && $file !== '.svn') {
                         self::cloneFileFolder("{$path}/{$file}");
                     }
                 }
@@ -144,38 +143,38 @@ public static function cloneFileFolder($path)
      */
     public static function createLogo($dirname)
     {
-        if (!extension_loaded("gd")) {
+        if (!extension_loaded('gd')) {
             return false;
         } else {
-            $required_functions = array("imagecreatetruecolor", "imagecolorallocate", "imagefilledrectangle", "imagejpeg", "imagedestroy", "imageftbbox");
-            foreach ($required_functions as $func) {
+            $requiredFunctions = array('imagecreatetruecolor', 'imagecolorallocate', 'imagefilledrectangle', 'imagejpeg', 'imagedestroy', 'imageftbbox');
+            foreach ($requiredFunctions as $func) {
                 if (!function_exists($func)) {
                     return false;
                 }
             }
-            unset($func);
+//            unset($func);
         }
 
-        if (!file_exists($imageBase = $GLOBALS['xoops']->path("modules/" . $dirname . "/assets/images/module_logo.png")) || !file_exists($font = $GLOBALS['xoops']->path("modules/" . $dirname . "/assets/images/VeraBd.ttf"))) {
+        if (!file_exists($imageBase = $GLOBALS['xoops']->path('modules/' . $dirname . '/assets/images/module_logo.png')) || !file_exists($font = $GLOBALS['xoops']->path('modules/' . $dirname . '/assets/images/VeraBd.ttf'))) {
             return false;
         }
 
         $imageModule = imagecreatefrompng($imageBase);
 
         //Erase old text
-        $grey_color = imagecolorallocate($imageModule, 237, 237, 237);
-        imagefilledrectangle($imageModule, 5, 35, 85, 46, $grey_color);
+        $greyColor = imagecolorallocate($imageModule, 237, 237, 237);
+        imagefilledrectangle($imageModule, 5, 35, 85, 46, $greyColor);
 
         // Write text
-        $text_color      = imagecolorallocate($imageModule, 0, 0, 0);
-        $space_to_border = (80 - strlen($dirname) * 6.5) / 2;
-        imagefttext($imageModule, 8.5, 0, $space_to_border, 45, $text_color, $font, ucfirst($dirname), array());
+        $textColor      = imagecolorallocate($imageModule, 0, 0, 0);
+        $spaceToBorder = (80 - strlen($dirname) * 6.5) / 2;
+        imagefttext($imageModule, 8.5, 0, $spaceToBorder, 45, $textColor, $font, ucfirst($dirname), array());
 
         // Set transparency color
         $white = imagecolorallocatealpha($imageModule, 255, 255, 255, 127);
         imagefill($imageModule, 0, 0, $white);
         imagecolortransparent($imageModule, $white);
-        imagepng($imageModule, $GLOBALS['xoops']->path("modules/" . $dirname . "/assets/images/module_logo.png"));
+        imagepng($imageModule, $GLOBALS['xoops']->path('modules/' . $dirname . '/assets/images/module_logo.png'));
         imagedestroy($imageModule);
 
         return true;
diff --git a/publisher/admin/file.php b/publisher/admin/file.php
index 18d81a98..1bea04ff 100644
--- a/publisher/admin/file.php
+++ b/publisher/admin/file.php
@@ -25,22 +25,22 @@
 
 /**
  * @param bool $showmenu
- * @param int $fileid
- * @param int $itemid
+ * @param int  $fileid
+ * @param int  $itemid
  */
 function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
 {
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
     include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 
     // if there is a parameter, and the id exists, retrieve data: we're editing a file
     if ($fileid != 0) {
         // Creating the File object
-        $fileObj = $publisher->getHandler('file')->get($fileid);
+        $fileObj =& $publisher->getHandler('file')->get($fileid);
 
         if ($fileObj->notLoaded()) {
-            redirect_header("javascript:history.go(-1)", 1, _AM_PUBLISHER_NOFILESELECTED);
-//            exit();
+            redirect_header('javascript:history.go(-1)', 1, _AM_PUBLISHER_NOFILESELECTED);
+            //            exit();
         }
 
         if ($showmenu) {
@@ -48,24 +48,24 @@ function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
         }
 
         echo "<br />\n";
-        echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 6px 0 0; '>" . _AM_PUBLISHER_FILE_EDITING . "</span>";
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_FILE_EDITING_DSC . "</span>";
+        echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 6px 0 0; '>" . _AM_PUBLISHER_FILE_EDITING . '</span>';
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_FILE_EDITING_DSC . '</span>';
         publisherOpenCollapsableBar('editfile', 'editfileicon', _AM_PUBLISHER_FILE_INFORMATIONS);
     } else {
         // there's no parameter, so we're adding an item
-        $fileObj = $publisher->getHandler('file')->create();
+        $fileObj =& $publisher->getHandler('file')->create();
         $fileObj->setVar('itemid', $itemid);
         if ($showmenu) {
             //publisher_adminMenu(2, _AM_PUBLISHER_FILE . " > " . _AM_PUBLISHER_FILE_ADD);
         }
-        echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 6px 0 0; '>" . _AM_PUBLISHER_FILE_ADDING . "</span>";
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_FILE_ADDING_DSC . "</span>";
+        echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 6px 0 0; '>" . _AM_PUBLISHER_FILE_ADDING . '</span>';
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_FILE_ADDING_DSC . '</span>';
         publisherOpenCollapsableBar('addfile', 'addfileicon', _AM_PUBLISHER_FILE_INFORMATIONS);
     }
 
     // FILES UPLOAD FORM
-    $files_form = $fileObj->getForm();
-    $files_form->display();
+    $uploadForm = $fileObj->getForm();
+    $uploadForm->display();
 
     if ($fileid != 0) {
         publisherCloseCollapsableBar('editfile', 'editfileicon');
@@ -78,22 +78,22 @@ function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
 $false = false;
 /* -- Available operations -- */
 switch ($op) {
-    case "uploadfile";
+    case 'uploadfile':
         publisherUploadFile(false, true, $false);
         exit;
         break;
 
-    case "uploadanother";
+    case 'uploadanother':
         publisherUploadFile(true, true, $false);
         exit;
         break;
 
-    case "mod":
+    case 'mod':
         $fileid = XoopsRequest::getInt('fileid', 0, 'GET');
         $itemid = XoopsRequest::getInt('itemid', 0, 'GET');
         if (($fileid == 0) && ($itemid == 0)) {
-            redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_NOITEMSELECTED);
-//            exit();
+            redirect_header('javascript:history.go(-1)', 3, _AM_PUBLISHER_NOITEMSELECTED);
+            //            exit();
         }
 
         publisherCpHeader();
@@ -102,14 +102,14 @@ function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
         publisher_editFile(true, $fileid, $itemid);
         break;
 
-    case "modify":
+    case 'modify':
         $fileid = XoopsRequest::getInt('fileid', 0, 'POST');
 
         // Creating the file object
         if ($fileid != 0) {
-            $fileObj = $publisher->getHandler('file')->get($fileid);
+            $fileObj =& $publisher->getHandler('file')->get($fileid);
         } else {
-            $fileObj = $publisher->getHandler('file')->create();
+            $fileObj =& $publisher->getHandler('file')->create();
         }
 
         // Putting the values in the file object
@@ -120,19 +120,18 @@ function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
         // Storing the file
         if (!$fileObj->store()) {
             redirect_header('item.php?op=mod&itemid=' . $fileObj->itemid(), 3, _AM_PUBLISHER_FILE_EDITING_ERROR . publisherFormatErrors($fileObj->getErrors()));
-//            exit;
+            //            exit;
         }
 
         redirect_header('item.php?op=mod&itemid=' . $fileObj->itemid(), 2, _AM_PUBLISHER_FILE_EDITING_SUCCESS);
-//        exit();
+        //        exit();
         break;
 
-    case "del":
-
+    case 'del':
         $fileid = XoopsRequest::getInt('fileid', 0, 'POST');
         $fileid = XoopsRequest::getInt('fileid', $fileid, 'GET');
 
-        $fileObj = $publisher->getHandler('file')->get($fileid);
+        $fileObj =& $publisher->getHandler('file')->get($fileid);
 
         $confirm = XoopsRequest::getInt('confirm', 0, 'POST');
         $title   = XoopsRequest::getString('title', '', 'POST');
@@ -140,24 +139,24 @@ function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
         if ($confirm) {
             if (!$publisher->getHandler('file')->delete($fileObj)) {
                 redirect_header('item.php', 2, _AM_PUBLISHER_FILE_DELETE_ERROR);
-//                exit;
+                //                exit;
             }
 
             redirect_header('item.php', 2, sprintf(_AM_PUBLISHER_FILEISDELETED, $fileObj->name()));
-//            exit();
+            //            exit();
         } else {
             // no confirm: show deletion condition
-            $fileid =  XoopsRequest::getInt('fileid', 0, 'GET');
+            $fileid = XoopsRequest::getInt('fileid', 0, 'GET');
 
             publisherCpHeader();
-            xoops_confirm(array('op' => 'del', 'fileid' => $fileObj->fileid(), 'confirm' => 1, 'name' => $fileObj->name()), 'file.php', _AM_PUBLISHER_DELETETHISFILE . " <br />" . $fileObj->name() . " <br /> <br />", _AM_PUBLISHER_DELETE);
+            xoops_confirm(array('op' => 'del', 'fileid' => $fileObj->fileid(), 'confirm' => 1, 'name' => $fileObj->name()), 'file.php', _AM_PUBLISHER_DELETETHISFILE . ' <br />' . $fileObj->name() . ' <br /> <br />', _AM_PUBLISHER_DELETE);
             xoops_cp_footer();
         }
 
         exit();
         break;
 
-    case "default":
+    case 'default':
     default:
         publisherCpHeader();
         //publisher_adminMenu(2, _AM_PUBLISHER_ITEMS);
diff --git a/publisher/admin/import.php b/publisher/admin/import.php
index 40d9ef7b..f94a31b6 100644
--- a/publisher/admin/import.php
+++ b/publisher/admin/import.php
@@ -19,22 +19,19 @@
  * @version         $Id: import.php 12825 2014-10-31 02:42:34Z zyspec $
  */
 
-include_once __DIR__ . "/admin_header.php";
+include_once __DIR__ . '/admin_header.php';
 
 $op = XoopsRequest::getString('op', XoopsRequest::getString('op', 'none', 'GET'), 'POST');
 
 switch ($op) {
-
-    case "importExecute":
-
+    case 'importExecute':
         $importfile      = XoopsRequest::getString('importfile', 'nonselected', 'POST');
-        $importfile_path = $GLOBALS['xoops']->path("modules/" . $publisher->getModule()->dirname() . "/admin/import/" . $importfile . ".php");
+        $importfile_path = $GLOBALS['xoops']->path('modules/' . $publisher->getModule()->dirname() . '/admin/import/' . $importfile . '.php');
         include_once $importfile_path;
         break;
 
-    case "default":
+    case 'default':
     default:
-
         $importfile = 'none';
 
         publisherCpHeader();
@@ -44,7 +41,7 @@
 
         xoops_load('XoopsFormLoader');
 
-        $moduleHandler = xoops_gethandler('module');
+        $moduleHandler =& xoops_getHandler('module');
 
         // WF-Section
         /*$wfs_version = 0;
@@ -63,7 +60,7 @@
         if ($moduleObj) {
             $from_module_version = round($moduleObj->getVar('version') / 100, 2);
             if (($from_module_version >= 1.1)) {
-                $importfile_select_array["news"] = "News " . $from_module_version;
+                $importfile_select_array['news'] = 'News ' . $from_module_version;
                 $news_version                    = $from_module_version;
             }
         }
@@ -74,7 +71,7 @@
         if ($moduleObj) {
             $from_module_version = round($moduleObj->getVar('version') / 100, 2);
             if (($from_module_version >= 1.1)) {
-                $importfile_select_array["xnews"] = "xNews " . $from_module_version;
+                $importfile_select_array['xnews'] = 'xNews ' . $from_module_version;
                 $xnews_version                    = $from_module_version;
             }
         }
@@ -85,7 +82,7 @@
         if ($moduleObj) {
             $from_module_version = round($moduleObj->getVar('version') / 100, 2);
             if (($from_module_version >= 1.1)) {
-                $importfile_select_array["ams"] = "AMS " . $from_module_version;
+                $importfile_select_array['ams'] = 'AMS ' . $from_module_version;
                 $ams_version                    = $from_module_version;
             }
         }
@@ -96,7 +93,7 @@
         if ($moduleObj) {
             $from_module_version = round($moduleObj->getVar('version') / 100, 2);
             if (($from_module_version >= 1.1)) {
-                $importfile_select_array["smartsection"] = "Smartsection " . $from_module_version;
+                $importfile_select_array['smartsection'] = 'Smartsection ' . $from_module_version;
                 $smartsection_version                    = $from_module_version;
             }
         }
@@ -107,7 +104,7 @@
         if ($moduleObj) {
             $from_module_version = round($moduleObj->getVar('version') / 100, 2);
             if (($from_module_version >= 1.1)) {
-                $importfile_select_array["cjaycontent"] = "C-Jay Content " . $from_module_version;
+                $importfile_select_array['cjaycontent'] = 'C-Jay Content ' . $from_module_version;
                 $cjaycontent_version                    = $from_module_version;
             }
         }
@@ -118,7 +115,7 @@
         if ($moduleObj) {
             $from_module_version = round($moduleObj->getVar('version') / 100, 2);
             if (($from_module_version >= 1.1)) {
-                $importfile_select_array["fmcontent"] = "FmContent " . $from_module_version;
+                $importfile_select_array['fmcontent'] = 'FmContent ' . $from_module_version;
                 $fmcontent_version                    = $from_module_version;
             }
         }
@@ -135,7 +132,7 @@
         } */
 
         if (isset($importfile_select_array) && count($importfile_select_array) > 0) {
-            $sform = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SELECTION, "op", xoops_getenv('PHP_SELF'));
+            $sform = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SELECTION, 'op', xoops_getenv('PHP_SELF'));
             $sform->setExtra('enctype="multipart/form-data"');
 
             // Partners to import
@@ -170,7 +167,7 @@
             $sform->display();
             unset($hidden);
         } else {
-            echo "<span style='color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block;'>" . _AM_PUBLISHER_IMPORT_NO_MODULE . "</span>";
+            echo "<span style='color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block;'>" . _AM_PUBLISHER_IMPORT_NO_MODULE . '</span>';
         }
 
         // End of collapsable bar
diff --git a/publisher/admin/import/ams.php b/publisher/admin/import/ams.php
index d3376160..996e4da4 100644
--- a/publisher/admin/import/ams.php
+++ b/publisher/admin/import/ams.php
@@ -23,52 +23,52 @@
 include_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
-$importFromModuleName = "xNews " . XoopsRequest::getString('ams_version', '', 'POST');
+$importFromModuleName = 'AMS ' . XoopsRequest::getString('ams_version', '', 'POST');
 
-$scriptname = "ams.php";
+$scriptname = 'ams.php';
 
-$op = ('go' == XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start';
+$op = ('go' === XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start';
 
-if ($op == 'start') {
+if ($op === 'start') {
     xoops_load('XoopsFormLoader');
 
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     publisherOpenCollapsableBar('amsimport', 'amsimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
-    $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("ams_topics"));
+    $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('ams_topics'));
     list ($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result);
 
     if ($totalCat == 0) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . "</span>";
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . '</span>';
     } else {
         include_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
-        $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("nw_stories"));
+        $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('nw_stories'));
         list ($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
 
         if ($totalArticles == 0) {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . '</span>';
         } else {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . '</span>';
 
-            $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
+            $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . '/import/$scriptname');
 
-//---------- mb ------------------
-// add "publisher" category to "imagecategory" table
+            //---------- mb ------------------
+            // add 'publisher' category to 'imagecategory' table
 
-//            if (!$GLOBALS['xoopsSecurity']->check()) {
-//                redirect_header('admin.php?fct=images', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
-//            }
+            //            if (!$GLOBALS['xoopsSecurity']->check()) {
+            //                redirect_header('admin.php?fct=images', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+            //            }
 
-            $imageCategoryHandler =& xoops_gethandler('imagecategory');
+            $imageCategoryHandler =& xoops_getHandler('imagecategory');
             $imagecategory        =& $imageCategoryHandler->create();
-//            $imagecategory->setVar('imgcat_name', $imgcat_name);
+            //            $imagecategory->setVar('imgcat_name', $imgcat_name);
             $imagecategory->setVar('imgcat_name', PUBLISHER_DIRNAME); //$imgcat_name);
             $imagecategory->setVar('imgcat_maxsize', $GLOBALS['xoopsModuleConfig']['maximum_filesize']); //$imgcat_maxsize);
             $imagecategory->setVar('imgcat_maxwidth', $GLOBALS['xoopsModuleConfig']['maximum_image_width']);//$imgcat_maxwidth);
             $imagecategory->setVar('imgcat_maxheight', $GLOBALS['xoopsModuleConfig']['maximum_image_height']);//$imgcat_maxheight);
-//            $imgcat_display = empty($imgcat_display) ? 0 : 1;
+            //            $imgcat_display = empty($imgcat_display) ? 0 : 1;
             $imagecategory->setVar('imgcat_display', 1);//$imgcat_display);
             $imagecategory->setVar('imgcat_weight', 0);//$imgcat_weight);
             $imagecategory->setVar('imgcat_storetype', 'file');//$imgcat_storetype);
@@ -77,48 +77,48 @@
                 $imageCategoryHandler->insert($imagecategory);
                 // exit();
             } catch (Exception $e) {
-                echo "Caught exception: : couldn't insert Image Category " . $e->getMessage() . "n";
+                echo 'Caught exception: couldn not insert Image Category' . $e->getMessage() . 'n';
             }
 
             $newid                     = $imagecategory->getVar('imgcat_id');
-            $imagecategoryperm_handler =& xoops_gethandler('groupperm');
+            $imagecategorypermHandler =& xoops_getHandler('groupperm');
             if (!isset($readgroup)) {
                 $readgroup = array();
             }
             if (!in_array(XOOPS_GROUP_ADMIN, $readgroup)) {
-                array_push($readgroup, XOOPS_GROUP_ADMIN);
+                $readgroup[] = XOOPS_GROUP_ADMIN;
             }
             foreach ($readgroup as $rgroup) {
-                $imagecategoryperm =& $imagecategoryperm_handler->create();
+                $imagecategoryperm =& $imagecategorypermHandler->create();
                 $imagecategoryperm->setVar('gperm_groupid', $rgroup);
                 $imagecategoryperm->setVar('gperm_itemid', $newid);
                 $imagecategoryperm->setVar('gperm_name', 'imgcat_read');
                 $imagecategoryperm->setVar('gperm_modid', 1);
-                $imagecategoryperm_handler->insert($imagecategoryperm);
+                $imagecategorypermHandler->insert($imagecategoryperm);
                 unset($imagecategoryperm);
             }
-            unset($rgroup);
+            //            unset($rgroup);
             if (!isset($writegroup)) {
                 $writegroup = array();
             }
             if (!in_array(XOOPS_GROUP_ADMIN, $writegroup)) {
-                array_push($writegroup, XOOPS_GROUP_ADMIN);
+                $writegroup[] = XOOPS_GROUP_ADMIN;
             }
             foreach ($writegroup as $wgroup) {
-                $imagecategoryperm =& $imagecategoryperm_handler->create();
+                $imagecategoryperm =& $imagecategorypermHandler->create();
                 $imagecategoryperm->setVar('gperm_groupid', $wgroup);
                 $imagecategoryperm->setVar('gperm_itemid', $newid);
                 $imagecategoryperm->setVar('gperm_name', 'imgcat_write');
                 $imagecategoryperm->setVar('gperm_modid', 1);
-                $imagecategoryperm_handler->insert($imagecategoryperm);
+                $imagecategorypermHandler->insert($imagecategoryperm);
                 unset($imagecategoryperm);
             }
-            unset($wgroup);
+            //            unset($wgroup);
 
-//---------- mb ------------------
+            //---------- mb ------------------
 
             // Categories to be imported
-            $sql = "SELECT cat.topic_id, cat.topic_pid, cat.topic_title, COUNT(art.storyid) FROM " . $GLOBALS['xoopsDB']->prefix("ams_topics") . " AS cat INNER JOIN " . $GLOBALS['xoopsDB']->prefix("nw_stories") . " AS art ON cat.topic_id=art.topicid GROUP BY art.topicid";
+            $sql = 'SELECT cat.topic_id, cat.topic_pid, cat.topic_title, COUNT(art.storyid) FROM ' . $GLOBALS['xoopsDB']->prefix('ams_topics') . ' AS cat INNER JOIN ' . $GLOBALS['xoopsDB']->prefix('nw_stories') . ' AS art ON cat.topic_id=art.topicid GROUP BY art.topicid';
 
             $result           = $GLOBALS['xoopsDB']->query($sql);
             $cat_cbox_options = array();
@@ -128,14 +128,14 @@
                 $cat_cbox_options[$cid] = "$cat_title ($art_count)";
             }
 
-            $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode("<br />", $cat_cbox_options));
+            $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode('<br />', $cat_cbox_options));
             $cat_label->setDescription(_AM_PUBLISHER_IMPORT_CATEGORIES_DSC);
             $form->addElement($cat_label);
 
             // Publisher parent category
-            $mytree = new XoopsTree($GLOBALS['xoopsDB']->prefix("publisher_categories"), "categoryid", "parentid");
+            $mytree = new XoopsTree($GLOBALS['xoopsDB']->prefix('publisher_categories'), 'categoryid', 'parentid');
             ob_start();
-            $mytree->makeMySelBox("name", "weight", $preset_id = 0, $none = 1, $sel_name = "parent_category");
+            $mytree->makeMySelBox('name', 'weight', $preset_id = 0, $none = 1, $sel_name = 'parent_category');
 
             $parent_cat_sel = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY, ob_get_contents());
             $parent_cat_sel->setDescription(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY_DSC);
@@ -155,57 +155,57 @@
     xoops_cp_footer();
 }
 
-if ($op == 'go') {
+if ($op === 'go') {
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
-    include_once (dirname(dirname(__DIR__))) . '/include/common.php';
+    include_once(dirname(dirname(__DIR__))) . '/include/common.php';
     publisherOpenCollapsableBar('amsimportgo', 'amsimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
 
-    $moduleHandler = xoops_gethandler('module');
-    $moduleObj      = $moduleHandler->getByDirname('ams');
-    $ams_module_id  = $moduleObj->getVar('mid');
+    $moduleHandler =& xoops_getHandler('module');
+    $moduleObj     = $moduleHandler->getByDirname('ams');
+    $ams_module_id = $moduleObj->getVar('mid');
 
-    $gperm_handler = xoops_gethandler('groupperm');
+    $gpermHandler =& xoops_getHandler('groupperm');
 
     $cnt_imported_cat      = 0;
     $cnt_imported_articles = 0;
 
     $parentId = XoopsRequest::getInt('parent_category', 0, 'POST');
 
-    $sql = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix('ams_topics');
+    $sql = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('ams_topics');
 
     $resultCat = $GLOBALS['xoopsDB']->query($sql);
 
     $newCatArray     = array();
     $newArticleArray = array();
 
-    $imageCategoryHandler =& xoops_gethandler('imagecategory');
-//    $criteria = new criteriaCombo;
+    $imageCategoryHandler =& xoops_getHandler('imagecategory');
+    //    $criteria = new criteriaCombo;
 
-//  get the total number of subcats for this category
-// $criteria = new CriteriaCompo();
-// $criteria->add(new Criteria('imagecategory', $catObj->getVar('cid'), '='));
-// $childCount = (int)($mylinksCatHandler->getCount($criteria));
+    //  get the total number of subcats for this category
+    // $criteria = new CriteriaCompo();
+    // $criteria->add(new Criteria('imagecategory', $catObj->getVar('cid'), '='));
+    // $childCount = (int)($mylinksCatHandler->getCount($criteria));
 
     $criteria        = new Criteria('imgcat_name', PUBLISHER_DIRNAME);
     $imageCategoryId = $imageCategoryHandler->getObjects($criteria);
 
-//    $criteria = new CriteriaCompo();
-//    $criteria->add(new Criteria("imagecategory", PUBLISHER_DIRNAME, "="));
+    //    $criteria = new CriteriaCompo();
+    //    $criteria->add(new Criteria('imagecategory', PUBLISHER_DIRNAME, '='));
 
-//    $newid = $imageCategoryId->getVar('imgcat_id');
+    //    $newid = $imageCategoryId->getVar('imgcat_id');
     $newid = $imageCategoryId[0]->vars['imgcat_id']['value'];
-//    $newid = $imageCategoryId[0]->vars['imgcat_id'];
+    //    $newid = $imageCategoryId[0]->vars['imgcat_id'];
 
-//    $select_form = new XoopsFormSelect("", $name_current, array(), 1);
-//    $select_form->addOption("", _SELECT);
-//    $select_form->addOptionArray($writer_handler->getList($criteria));
+    //    $select_form = new XoopsFormSelect('', $name_current, array(), 1);
+    //    $select_form->addOption('', _SELECT);
+    //    $select_form->addOptionArray($writerHandler->getList($criteria));
 
-//    $sql = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix('imagecategory') . " WHERE imgcat_name=" . PUBLISHER_DIRNAME;
-//            $resultImageCategory = $GLOBALS['xoopsDB']->query($sql);
-//
-//
-//    $newid = $resultImageCategory->getVar('imgcat_id');
+    //    $sql = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('imagecategory') . ' WHERE imgcat_name=' . PUBLISHER_DIRNAME;
+    //            $resultImageCategory = $GLOBALS['xoopsDB']->query($sql);
+    //
+    //
+    //    $newid = $resultImageCategory->getVar('imgcat_id');
 
     $oldToNew = array();
     while (($arrCat = $GLOBALS['xoopsDB']->fetchArray($resultCat)) !== false) {
@@ -213,25 +213,25 @@
         $newCat['oldid']  = $arrCat['topic_id'];
         $newCat['oldpid'] = $arrCat['topic_pid'];
 
-        $categoryObj = $publisher->getHandler('category')->create();
+        $categoryObj =& $publisher->getHandler('category')->create();
 
         $categoryObj->setVar('parentid', $arrCat['topic_pid']);
         $categoryObj->setVar('image', $arrCat['topic_imgurl']);
         $categoryObj->setVar('weight', $arrCat['weight']);
         $categoryObj->setVar('name', $arrCat['topic_title']);
-//        $categoryObj->setVar('description', $arrCat['topic_description']);
+        //        $categoryObj->setVar('description', $arrCat['topic_description']);
         $categoryObj->setVar('moderator', 1);
 
         // Category image: copying to Publisher category uploads
-        if (($arrCat['topic_imgurl'] != 'blank.gif') && ($arrCat['topic_imgurl'] != '')) {
-            if (copy($GLOBALS['xoops']->path("uploads/AMS/topics/" . $arrCat['topic_imgurl']), $GLOBALS['xoops']->path("uploads/" . PUBLISHER_DIRNAME . "/images/category/" . $arrCat['topic_imgurl']))) {
+        if (($arrCat['topic_imgurl'] !== 'blank.gif') && ($arrCat['topic_imgurl'] !== '')) {
+            if (copy($GLOBALS['xoops']->path('uploads/AMS/topics/' . $arrCat['topic_imgurl']), $GLOBALS['xoops']->path('uploads/' . PUBLISHER_DIRNAME . '/images/category/' . $arrCat['topic_imgurl']))) {
                 $categoryObj->setVar('image', $arrCat['topic_imgurl']);
 
-//======== there is no need to add the category images to Image Manager, because they are handled directly from /images/category/ folder
+                //======== there is no need to add the category images to Image Manager, because they are handled directly from /images/category/ folder
 
                 /*
 
-                  $imageHandler =& xoops_gethandler('image');
+                  $imageHandler =& xoops_getHandler('image');
                   $image =& $imageHandler->create();
                   $image->setVar('image_name', $arrCat['topic_imgurl']);//'images/' . $uploader->getSavedFileName());
                   $image->setVar('image_nicename', substr($arrCat['topic_imgurl'],-13)); //$image_nicename);
@@ -247,26 +247,26 @@
 
                   */
 
-//============================
+                //============================
 
             }
         }
 
         if (!$publisher->getHandler('category')->insert($categoryObj)) {
-            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['topic_title']) . "<br/>";
+            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['topic_title']) . '<br/>';
             continue;
         }
 
         //copy all images to Image Manager
 
-        $src = $GLOBALS['xoops']->path("uploads/AMS/topics/");
-        $dst = $GLOBALS['xoops']->path("uploads");
+        $src = $GLOBALS['xoops']->path('uploads/AMS/topics/');
+        $dst = $GLOBALS['xoops']->path('uploads');
 
         PublisherUtilities::recurseCopy($src, $dst);
 
         //populate the Image Manager with images from xNews articles (by Bleekk)
 
-        $sql = "INSERT INTO " . $GLOBALS['xoopsDB']->prefix("image") . "(`image_name`, `image_nicename`, `image_mimetype`, `image_display`, `image_weight`, `imgcat_id`)
+        $sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('image') . "(`image_name`, `image_nicename`, `image_mimetype`, `image_display`, `image_weight`, `imgcat_id`)
        SELECT
        s.picture,
        RIGHT(s.picture,13) AS nicename,
@@ -274,7 +274,7 @@
        1 AS image_display,
        0 AS image_weight,
        c.imgcat_id
-       FROM " . $GLOBALS['xoopsDB']->prefix("ams_article") . " s, " . $GLOBALS['xoopsDB']->prefix("imagecategory") . " c
+       FROM " . $GLOBALS['xoopsDB']->prefix('ams_article') . ' s, ' . $GLOBALS['xoopsDB']->prefix('imagecategory') . " c
        WHERE s.picture <> ''
        AND c.imgcat_name = '" . PUBLISHER_DIRNAME . "'";
 
@@ -283,13 +283,13 @@
         $newCat['newid'] = $categoryObj->categoryid();
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br/>";
+        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . '<br/>';
 
-        $sql            = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix('ams_article') . " WHERE topicid=" . $arrCat['topic_id'];
+        $sql            = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('ams_article') . ' WHERE topicid=' . $arrCat['topic_id'];
         $resultArticles = $GLOBALS['xoopsDB']->query($sql);
         while (($arrArticle = $GLOBALS['xoopsDB']->fetchArray($resultArticles)) !== false) {
             // insert article
-            $itemObj = $publisher->getHandler('item')->create();
+            $itemObj =& $publisher->getHandler('item')->create();
 
             $itemObj->setVar('categoryid', $categoryObj->categoryid());
             $itemObj->setVar('title', $arrArticle['title']);
@@ -303,20 +303,20 @@
             $itemObj->setVar('weight', 0);
             $itemObj->setVar('status', PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED);
 
-//            $itemObj->setVar('dobr', !$arrArticle['dobr']);
-//            $itemObj->setVar('item_tag', $arrArticle['tags']);
+            //            $itemObj->setVar('dobr', !$arrArticle['dobr']);
+            //            $itemObj->setVar('item_tag', $arrArticle['tags']);
             $itemObj->setVar('notifypub', $arrArticle['notifypub']);
-//-------- image
+            //-------- image
 
-            $img_handler =& xoops_gethandler('image');
+            $imgHandler =& xoops_getHandler('image');
 
-//            $criteria = new Criteria('image_name', $arrArticle['picture']);
-            $imageId    = $img_handler->getObjects($criteria);
+            //            $criteria = new Criteria('image_name', $arrArticle['picture']);
+            $imageId    = $imgHandler->getObjects($criteria);
             $newImageId = $imageId[0]->vars['image_id']['value'];
             $itemObj->setVar('image', $newImageId);
             $itemObj->setVar('images', $newImageId);
 
-//--------------
+            //--------------
 
             $itemObj->setVar('rating', $arrArticle['rating']);
             $itemObj->setVar('votes', $arrArticle['votes']);
@@ -327,30 +327,30 @@
             /*
              // HTML Wrap
              if ($arrArticle['htmlpage']) {
-             $pagewrap_filename	= $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']);
+             $pagewrap_filename = $GLOBALS['xoops']->path('modules/wfsection/html/' .$arrArticle['htmlpage']);
              if (file_exists($pagewrap_filename)) {
-             if (copy($pagewrap_filename, $GLOBALS['xoops']->path("uploads/publisher/content/" . $arrArticle['htmlpage']))) {
-             $itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]");
-             echo sprintf("&nbsp;&nbsp;&nbsp;&nbsp;" . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>";
+             if (copy($pagewrap_filename, $GLOBALS['xoops']->path('uploads/publisher/content/' . $arrArticle['htmlpage']))) {
+             $itemObj->setVar('body', '[pagewrap=' . $arrArticle['htmlpage'] . ']');
+             echo sprintf('&nbsp;&nbsp;&nbsp;&nbsp;' . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . '<br/>';
              }
              }
              }
              */
 
             if (!$itemObj->store()) {
-                echo sprintf("  " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['storyid'] . ' ' . $arrArticle['title']) . "<br/>";
+                echo sprintf('  ' . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['storyid'] . ' ' . $arrArticle['title']) . '<br/>';
                 continue;
             } else {
-//--------------------------------------------
+                //--------------------------------------------
                 // Linkes files
-                $sql               = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix("ams_article_files") . " WHERE storyid=" . $arrArticle['storyid'];
+                $sql               = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('ams_article_files') . ' WHERE storyid=' . $arrArticle['storyid'];
                 $resultFiles       = $GLOBALS['xoopsDB']->query($sql);
                 $allowed_mimetypes = '';
                 while (($arrFile = $GLOBALS['xoopsDB']->fetchArray($resultFiles)) !== false) {
-                    $filename = $GLOBALS['xoops']->path("uploads/AMS/attached/" . $arrFile['downloadname']);
+                    $filename = $GLOBALS['xoops']->path('uploads/AMS/attached/' . $arrFile['downloadname']);
                     if (file_exists($filename)) {
-                        if (copy($filename, $GLOBALS['xoops']->path("uploads/publisher/" . $arrFile['filerealname']))) {
-                            $fileObj = $publisher->getHandler('file')->create();
+                        if (copy($filename, $GLOBALS['xoops']->path('uploads/publisher/' . $arrFile['filerealname']))) {
+                            $fileObj =& $publisher->getHandler('file')->create();
                             $fileObj->setVar('name', $arrFile['filerealname']);
                             $fileObj->setVar('description', $arrFile['filerealname']);
                             $fileObj->setVar('status', PublisherConstantsInterface::PUBLISHER_STATUS_FILE_ACTIVE);
@@ -363,32 +363,32 @@
                             $fileObj->setVar('short_url', $arrFile['filerealname']);
 
                             if ($fileObj->store($allowed_mimetypes, true, false)) {
-                                echo "&nbsp;&nbsp;&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname']) . "<br />";
+                                echo '&nbsp;&nbsp;&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname']) . '<br />';
                             }
                         }
                     }
                 }
 
-//------------------------
+                //------------------------
 
                 $newArticleArray[$arrArticle['storyid']] = $itemObj->itemid();
-                echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
+                echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->getTitle()) . '<br />';
                 ++$cnt_imported_articles;
             }
         }
 
         // Saving category permissions
-        $groupsIds = $gperm_handler->getGroupIds('nw_view', $arrCat['topic_id'], $ams_module_id);
+        $groupsIds = $gpermHandler->getGroupIds('nw_view', $arrCat['topic_id'], $ams_module_id);
         publisherSaveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'category_read');
-        $groupsIds = $gperm_handler->getGroupIds('nw_submit', $arrCat['topic_id'], $ams_module_id);
+        $groupsIds = $gpermHandler->getGroupIds('nw_submit', $arrCat['topic_id'], $ams_module_id);
         publisherSaveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'item_submit');
 
-        $groupsIds = $gperm_handler->getGroupIds('nw_approve', $arrCat['topic_id'], $ams_module_id);
+        $groupsIds = $gpermHandler->getGroupIds('nw_approve', $arrCat['topic_id'], $ams_module_id);
         publisherSaveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'category_moderation');
 
         $newCatArray[$newCat['oldid']] = $newCat;
         unset($newCat);
-        echo "<br/>";
+        echo '<br/>';
     }
 
     // Looping through category to change the parentID to the new parentID
@@ -407,12 +407,12 @@
     unset($oldid, $newCat);
 
     // Looping through the comments to link them to the new articles and module
-    echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />";
+    echo _AM_PUBLISHER_IMPORT_COMMENTS . '<br />';
 
     $publisher_module_id = $publisher->getModule()->mid();
 
-    $commentHandler = xoops_gethandler('comment');
-    $criteria        = new CriteriaCompo();
+    $commentHandler =& xoops_getHandler('comment');
+    $criteria       = new CriteriaCompo();
     $criteria->add(new Criteria('com_modid', $ams_module_id));
     $comments = $commentHandler->getObjects($criteria);
     foreach ($comments as $comment) {
@@ -420,18 +420,18 @@
         $comment->setVar('com_modid', $publisher_module_id);
         $comment->setNew();
         if (!$commentHandler->insert($comment)) {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . '<br />';
         } else {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . '<br />';
         }
 
     }
-    unset($comment);
+    //    unset($comment);
 
-    echo "<br/><br/>Done.<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . "<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . "<br/>";
-    echo "<br/><a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . "</a><br/>";
+    echo '<br/><br/>Done.<br/>';
+    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br/>';
+    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . '<br/>';
+    echo "<br/><a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . '</a><br/>';
 
     publisherCloseCollapsableBar('amsimportgo', 'amsimportgoicon');
     xoops_cp_footer();
diff --git a/publisher/admin/import/cjaycontent.php b/publisher/admin/import/cjaycontent.php
index e70af6f8..e4f3425d 100644
--- a/publisher/admin/import/cjaycontent.php
+++ b/publisher/admin/import/cjaycontent.php
@@ -23,11 +23,11 @@
 include_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
-$importFromModuleName = "cjaycontent " . XoopsRequest::getString('cjaycontent_version', '', 'POST');
+$importFromModuleName = 'cjaycontent ' . XoopsRequest::getString('cjaycontent_version', '', 'POST');
 
-$scriptname = "cjaycontent.php";
+$scriptname = 'cjaycontent.php';
 
-$op = ('go' == XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start';
+$op = ('go' === XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start';
 
 /**
  * @param $src
@@ -49,35 +49,20 @@
 //    closedir($dir);
 //}
 
-if ($op == 'start') {
+if ($op === 'start') {
     xoops_load('XoopsFormLoader');
 
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
-    publisherOpenCollapsableBar(
-        'cjaycontentimport',
-        'cjaycontentimporticon',
-        sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName),
-        _AM_PUBLISHER_IMPORT_INFO
-    );
-
-    $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("cjaycontent"));
+    publisherOpenCollapsableBar('cjaycontentimport', 'cjaycontentimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
+
+    $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('cjaycontent'));
     list ($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
 
     if ($totalArticles == 0) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(
-                _AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS,
-                $importFromModuleName,
-                $totalArticles
-            ) . "</span>";
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . '</span>';
     } else {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(
-                _AM_PUBLISHER_IMPORT_MODULE_FOUND,
-                $importFromModuleName,
-                $totalArticles,
-                $totalCat
-            )
-             . "</span>";
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . '</span>';
 
         $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
 
@@ -90,28 +75,23 @@
 
         $form->display();
     }
-//    }
+    //    }
 
     publisherCloseCollapsableBar('cjaycontentimport', 'cjaycontentimporticon');
     xoops_cp_footer();
 }
 
-if ($op == 'go') {
+if ($op === 'go') {
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
-    include_once (dirname(dirname(__DIR__))) . '/include/common.php';
-    publisherOpenCollapsableBar(
-        'cjaycontentimportgo',
-        'cjaycontentimportgoicon',
-        sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName),
-        _AM_PUBLISHER_IMPORT_RESULT
-    );
-
-    $moduleHandler        = xoops_gethandler('module');
+    include_once(dirname(dirname(__DIR__))) . '/include/common.php';
+    publisherOpenCollapsableBar('cjaycontentimportgo', 'cjaycontentimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
+
+    $moduleHandler         =& xoops_getHandler('module');
     $moduleObj             = $moduleHandler->getByDirname('cjaycontent');
     $cjaycontent_module_id = $moduleObj->getVar('mid');
 
-    $gperm_handler = xoops_gethandler('groupperm');
+    $gpermHandler =& xoops_getHandler('groupperm');
 
     $cnt_imported_articles = 0;
 
@@ -119,39 +99,39 @@
 
     $oldToNew = array();
 
-    $sql            = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix('cjaycontent');
+    $sql            = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('cjaycontent');
     $resultArticles = $GLOBALS['xoopsDB']->query($sql);
     while (($arrArticle = $GLOBALS['xoopsDB']->fetchArray($resultArticles)) !== false) {
         // insert article
-        $itemObj = $publisher->getHandler('item')->create();
+        $itemObj =& $publisher->getHandler('item')->create();
         $itemObj->setVar('itemid', $arrArticle['id']);
-//      $itemObj->setVar('categoryid', $categoryObj->categoryid());
+        //      $itemObj->setVar('categoryid', $categoryObj->categoryid());
         $itemObj->setVar('title', $arrArticle['title']);
         $itemObj->setVar('uid', $arrArticle['submitter']);
         $itemObj->setVar('summary', $arrArticle['comment']);
         $itemObj->setVar('body', $arrArticle['content']);
         $itemObj->setVar('counter', $arrArticle['hits']);
         $itemObj->setVar('datesub', $arrArticle['date']);
-//            $itemObj->setVar('dohtml', !$arrArticle['nohtml']);
-//            $itemObj->setVar('dosmiley', !$arrArticle['nosmiley']);
+        //            $itemObj->setVar('dohtml', !$arrArticle['nohtml']);
+        //            $itemObj->setVar('dosmiley', !$arrArticle['nosmiley']);
         $itemObj->setVar('weight', $arrArticle['weight']);
         $itemObj->setVar('status', PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED);
 
-//            $itemObj->setVar('dobr', !$arrArticle['dobr']);
-//            $itemObj->setVar('item_tag', $arrArticle['tags']);
-//            $itemObj->setVar('notifypub', $arrArticle['notifypub']);
+        //            $itemObj->setVar('dobr', !$arrArticle['dobr']);
+        //            $itemObj->setVar('item_tag', $arrArticle['tags']);
+        //            $itemObj->setVar('notifypub', $arrArticle['notifypub']);
 
         $itemObj->setVar('image', $arrArticle['image']);
-//            $itemObj->setVar('rating', $arrArticle['rating']);
-//            $itemObj->setVar('votes', $arrArticle['votes']);
-//            $itemObj->setVar('comments', $arrArticle['comments']);
-//            $itemObj->setVar('meta_keywords', $arrArticle['keywords']);
-//            $itemObj->setVar('meta_description', $arrArticle['description']);
+        //            $itemObj->setVar('rating', $arrArticle['rating']);
+        //            $itemObj->setVar('votes', $arrArticle['votes']);
+        //            $itemObj->setVar('comments', $arrArticle['comments']);
+        //            $itemObj->setVar('meta_keywords', $arrArticle['keywords']);
+        //            $itemObj->setVar('meta_description', $arrArticle['description']);
 
         /*
          // HTML Wrap
          if ($arrArticle['htmlpage']) {
-         $pagewrap_filename	= $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']);
+         $pagewrap_filename = $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']);
          if (file_exists($pagewrap_filename)) {
          if (copy($pagewrap_filename, $GLOBALS['xoops']->path("uploads/publisher/content/" . $arrArticle['htmlpage']))) {
          $itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]");
@@ -162,24 +142,24 @@
          */
 
         if (!$itemObj->store()) {
-            echo sprintf("  " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . "<br/>";
+            echo sprintf('  ' . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . '<br/>';
             continue;
         } else {
             $newArticleArray[$arrArticle['id']] = $itemObj->itemid();
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->getTitle()) . '<br />';
             ++$cnt_imported_articles;
         }
     }
 
-    echo "<br/>";
+    echo '<br/>';
 
-// Looping through the comments to link them to the new articles and module
-    echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />";
+    // Looping through the comments to link them to the new articles and module
+    echo _AM_PUBLISHER_IMPORT_COMMENTS . '<br />';
 
     $publisher_module_id = $publisher->getModule()->mid();
 
-    $commentHandler = xoops_gethandler('comment');
-    $criteria        = new CriteriaCompo();
+    $commentHandler =& xoops_getHandler('comment');
+    $criteria       = new CriteriaCompo();
     $criteria->add(new Criteria('com_modid', $cjaycontent_module_id));
     $comments = $commentHandler->getObjects($criteria);
     foreach ($comments as $comment) {
@@ -187,18 +167,18 @@
         $comment->setVar('com_modid', $publisher_module_id);
         $comment->setNew();
         if (!$commentHandler->insert($comment)) {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . '<br />';
         } else {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . '<br />';
         }
 
     }
-    unset($comment);
+//    unset($comment);
 
-    echo "<br/><br/>Done.<br/>";
+    echo '<br/><br/>Done.<br/>';
 
-    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . "<br/>";
-    echo "<br/><a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . "</a><br/>";
+    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . '<br/>';
+    echo "<br/><a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . '</a><br/>';
 
     publisherCloseCollapsableBar('cjaycontentimportgo', 'cjaycontentimportgoicon');
     xoops_cp_footer();
diff --git a/publisher/admin/import/fmcontent.php b/publisher/admin/import/fmcontent.php
index edd8476a..d392206c 100644
--- a/publisher/admin/import/fmcontent.php
+++ b/publisher/admin/import/fmcontent.php
@@ -24,42 +24,42 @@
 include_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
-$importFromModuleName = "FmContent " . XoopsRequest::getString('fmcontent_version', '', 'POST');
+$importFromModuleName = 'FmContent ' . XoopsRequest::getString('fmcontent_version', '', 'POST');
 
-$scriptname = "fmcontent.php";
+$scriptname = 'fmcontent.php';
 
-$op = ('go' == XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start';
+$op = ('go' === XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start';
 
-if ('start' == $op) {
+if ('start' === $op) {
     xoops_load('XoopsFormLoader');
 
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     publisherOpenCollapsableBar('fmimport', 'fmimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
-    $moduleHandler = xoops_gethandler('module');
-    $moduleObj      = $moduleHandler->getByDirname('fmcontent');
-    $fm_module_id   = $moduleObj->getVar('mid');
+    $moduleHandler =& xoops_getHandler('module');
+    $moduleObj     = $moduleHandler->getByDirname('fmcontent');
+    $fm_module_id  = $moduleObj->getVar('mid');
 
-    $fmTopicHdlr  =& xoops_getmodulehandler('topic', 'fmcontent');
+    $fmTopicHdlr  =& xoops_getModuleHandler('topic', 'fmcontent');
     $fmTopicCount = $fmTopicHdlr->getCount(new Criteria('topic_modid', $fm_module_id));
 
     if (empty($fmTopicCount)) {
-        echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . "</span>";
+        echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . '</span>';
     } else {
         include_once $GLOBALS['xoops']->path('www/class/xoopstree.php');
-        $fmContentHdlr  =& xoops_getmodulehandler('page', 'fmcontent');
+        $fmContentHdlr  =& xoops_getModuleHandler('page', 'fmcontent');
         $fmContentCount = $fmContentHdlr->getCount(new Criteria('content_modid', $fm_module_id));
 
         if (empty($fmContentCount)) {
-            echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $fmContentCount) . "</span>";
+            echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $fmContentCount) . '</span>';
         } else {
             /*
                         echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $fmContentCount, $fmTopicCount) . "</span>";
                         $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
             */
             // Categories to be imported
-            $sql = "SELECT cat.topic_id, cat.topic_pid, cat.topic_title, COUNT(art.content_id) FROM " . $GLOBALS['xoopsDB']->prefix("fmcontent_topic") . " AS cat INNER JOIN " . $GLOBALS['xoopsDB']->prefix("fmcontent_content") . " AS art ON ((cat.topic_id=art.content_topic) AND (cat.topic_modid=art.content_modid)) WHERE cat.topic_modid={$fm_module_id} GROUP BY art.content_topic";
+            $sql = 'SELECT cat.topic_id, cat.topic_pid, cat.topic_title, COUNT(art.content_id) FROM ' . $GLOBALS['xoopsDB']->prefix('fmcontent_topic') . ' AS cat INNER JOIN ' . $GLOBALS['xoopsDB']->prefix('fmcontent_content') . " AS art ON ((cat.topic_id=art.content_topic) AND (cat.topic_modid=art.content_modid)) WHERE cat.topic_modid={$fm_module_id} GROUP BY art.content_topic";
 
             $result           = $GLOBALS['xoopsDB']->query($sql);
             $cat_cbox_options = array();
@@ -78,16 +78,16 @@
             }
             natcasesort($cat_cbox_options); //put them in "alphabetical" order
 
-            echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $fmContentCount, count($cat_cbox_options)) . "</span>";
+            echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $fmContentCount, count($cat_cbox_options)) . '</span>';
             $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
 
-            $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode("<br />", $cat_cbox_options));
+            $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode('<br />', $cat_cbox_options));
             $cat_label->setDescription(_AM_PUBLISHER_IMPORT_CATEGORIES_DSC);
             $form->addElement($cat_label);
 
             // Publisher parent category
             xoops_load('tree');
-            $categoryHdlr   = $publisher->getHandler('category');
+            $categoryHdlr   =& $publisher->getHandler('category');
             $catObjs        = $categoryHdlr->getAll();
             $myObjTree      = new XoopsObjectTree($catObjs, 'categoryid', 'parentid');
             $catSelBox      = $myObjTree->makeSelBox('parent_category', 'name', '-', 0, true);
@@ -117,16 +117,16 @@
     xoops_cp_footer();
 }
 
-if ('go' == $op) {
+if ('go' === $op) {
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     publisherOpenCollapsableBar('fmimportgo', 'fmimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
 
-    $moduleHandler = xoops_gethandler('module');
-    $moduleObj      = $moduleHandler->getByDirname('fmcontent');
-    $fm_module_id   = $moduleObj->getVar('mid');
+    $moduleHandler =& xoops_getHandler('module');
+    $moduleObj     = $moduleHandler->getByDirname('fmcontent');
+    $fm_module_id  = $moduleObj->getVar('mid');
 
-    $gperm_handler = xoops_gethandler('groupperm');
+    $gpermHandler =& xoops_getHandler('groupperm');
 
     $cnt_imported_cat      = 0;
     $cnt_imported_articles = 0;
@@ -134,7 +134,7 @@
     $parentId = XoopsRequest::getInt('parent_category', 0, 'POST');
 
     // get all FmContent Content items without a category (content_topic=0)
-    $fmContentHdlr =& xoops_getmodulehandler('page', 'fmcontent');
+    $fmContentHdlr =& xoops_getModuleHandler('page', 'fmcontent');
 
     $criteria = new CriteriaCompo();
     $criteria->add(new Criteria('content_modid', $fm_module_id));
@@ -145,64 +145,65 @@
         ++$cnt_imported_cat; //count category if there was content to import
 
         // create Publsher category to hold FmContent Content items with no Topic (content_topic=0)
-        $categoryObj = $publisher->getHandler('category')->create();
-        $categoryObj->setVars(array('parentid'    => $parentId,
-                                    'name'        => _AM_PUBLISHER_IMPORT_FMCONTENT_NAME,
-                                    'description' => _AM_PUBLISHER_IMPORT_FMCONTENT_TLT,
-                                    'image'       => '',
-                                    'total'       => 0,
-                                    'weight'      => 1,
-                                    'created'     => time(),
-                                    'moderator', $GLOBALS['xoopsUser']->getVar('uid'))
-        );
+        $categoryObj =& $publisher->getHandler('category')->create();
+        $categoryObj->setVars(array(
+                                  'parentid'    => $parentId,
+                                  'name'        => _AM_PUBLISHER_IMPORT_FMCONTENT_NAME,
+                                  'description' => _AM_PUBLISHER_IMPORT_FMCONTENT_TLT,
+                                  'image'       => '',
+                                  'total'       => 0,
+                                  'weight'      => 1,
+                                  'created'     => time(),
+                                  'moderator',
+                                  $GLOBALS['xoopsUser']->getVar('uid')));
         $categoryObj->store();
 
-        $fmTopicHdlr =& xoops_getmodulehandler('topic', 'fmcontent');
+        $fmTopicHdlr =& xoops_getModuleHandler('topic', 'fmcontent');
 
         // insert articles for this category
         foreach ($fmContentObjs as $thisFmContentObj) {
-            $itemObj = $publisher->getHandler('item')->create();
-            $itemObj->setVars(array('categoryid'       => $categoryObj->categoryid(),
-                                    'title'            => $thisFmContentObj->getVar('content_title'),
-                                    'uid'              => $thisFmContentObj->getVar('content_uid'),
-                                    'summary'          => $thisFmContentObj->getVar('content_short'),
-                                    'body'             => $thisFmContentObj->getVar('content_text'),
-                                    'datesub'          => $thisFmContentObj->getVar('content_create'),
-                                    'dohtml'           => $thisFmContentObj->getVar('dohtml'),
-                                    'dosmiley'         => $thisFmContentObj->getVar('dosmiley'),
-                                    'doxcode'          => $thisFmContentObj->getVar('doxcode'),
-                                    'doimage'          => $thisFmContentObj->getVar('doimage'),
-                                    'dobr'             => $thisFmContentObj->getVar('dobr'),
-                                    'weight'           => $thisFmContentObj->getVar('content_order'),
-                                    'status'           => ($thisFmContentObj->getVar('content_status')) ? PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED : PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE,
-                                    'counter'          => $thisFmContentObj->getVar('content_hits'),
-                                    'rating'           => 0,
-                                    'votes'            => 0,
-                                    'comments'         => $thisFmContentObj->getVar('content_comments'),
-                                    'meta_keywords'    => $thisFmContentObj->getVar('content_words'),
-                                    'meta_description' => $thisFmContentObj->getVar('content_desc'))
-            );
+            $itemObj =& $publisher->getHandler('item')->create();
+            $itemObj->setVars(array(
+                                  'categoryid'       => $categoryObj->categoryid(),
+                                  'title'            => $thisFmContentObj->getVar('content_title'),
+                                  'uid'              => $thisFmContentObj->getVar('content_uid'),
+                                  'summary'          => $thisFmContentObj->getVar('content_short'),
+                                  'body'             => $thisFmContentObj->getVar('content_text'),
+                                  'datesub'          => $thisFmContentObj->getVar('content_create'),
+                                  'dohtml'           => $thisFmContentObj->getVar('dohtml'),
+                                  'dosmiley'         => $thisFmContentObj->getVar('dosmiley'),
+                                  'doxcode'          => $thisFmContentObj->getVar('doxcode'),
+                                  'doimage'          => $thisFmContentObj->getVar('doimage'),
+                                  'dobr'             => $thisFmContentObj->getVar('dobr'),
+                                  'weight'           => $thisFmContentObj->getVar('content_order'),
+                                  'status'           => ($thisFmContentObj->getVar('content_status')) ? PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED : PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE,
+                                  'counter'          => $thisFmContentObj->getVar('content_hits'),
+                                  'rating'           => 0,
+                                  'votes'            => 0,
+                                  'comments'         => $thisFmContentObj->getVar('content_comments'),
+                                  'meta_keywords'    => $thisFmContentObj->getVar('content_words'),
+                                  'meta_description' => $thisFmContentObj->getVar('content_desc')));
             $contentImg = $thisFmContentObj->getVar('content_img');
             if (!empty($contentImg)) {
-                $itemObj->setVars(array('images' => 1,
-                                        'image'  => $thisFmContentObj->getVar('content_img'))
-                );
+                $itemObj->setVars(array(
+                                      'images' => 1,
+                                      'image'  => $thisFmContentObj->getVar('content_img')));
             }
 
             if (!$itemObj->store()) {
-                echo sprintf("  " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $thisFmContentObj->getVar('title')) . "<br />\n";
+                echo sprintf('  ' . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $thisFmContentObj->getVar('title')) . '<br />\n';
                 continue;
             } else {
                 $newArticleArray[$thisFmContentObj->getVar('storyid')] = $itemObj->itemid();
-                echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />\n";
+                echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->getTitle()) . '<br />\n';
                 ++$cnt_imported_articles;
             }
         }
 
         // Saving category permissions
-        $groupsIds = $gperm_handler->getGroupIds('fmcontent_view', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
+        $groupsIds = $gpermHandler->getGroupIds('fmcontent_view', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
         publisherSaveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'category_read');
-        $groupsIds = $gperm_handler->getGroupIds('fmcontent_submit', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
+        $groupsIds = $gpermHandler->getGroupIds('fmcontent_submit', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
         publisherSaveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'item_submit');
 
         unset($fmContentObjs, $itemObj, $categoryObj, $thisFmContentObj);
@@ -218,21 +219,21 @@
 
     // first create FmContent Topics as Publisher Categories
     foreach ($fmTopicObjs as $thisFmTopicObj) {
-        $CatIds = array('oldid'  => $thisFmTopicObj->getVar('topic_id'),
-                        'oldpid' => $thisFmTopicObj->getVar('topic_pid')
-        );
+        $CatIds = array(
+            'oldid'  => $thisFmTopicObj->getVar('topic_id'),
+            'oldpid' => $thisFmTopicObj->getVar('topic_pid'));
 
-        $categoryObj = $publisher->getHandler('category')->create();
+        $categoryObj =& $publisher->getHandler('category')->create();
 
-        $categoryObj->setVars(array('parentid'    => $thisFmTopicObj->getVar('topic_pid'),
-                                    'weight'      => $thisFmTopicObj->getVar('topic_weight'),
-                                    'name'        => $thisFmTopicObj->getVar('topic_title'),
-                                    'description' => $thisFmTopicObj->getVar('topic_desc'))
-        );
+        $categoryObj->setVars(array(
+                                  'parentid'    => $thisFmTopicObj->getVar('topic_pid'),
+                                  'weight'      => $thisFmTopicObj->getVar('topic_weight'),
+                                  'name'        => $thisFmTopicObj->getVar('topic_title'),
+                                  'description' => $thisFmTopicObj->getVar('topic_desc')));
 
         // Category image
-        if (('blank.gif' != $thisFmTopicObj->getVar('topic_img')) && ('' != $thisFmTopicObj->getVar('topic_img'))) {
-            if (copy($GLOBALS['xoops']->path("www/uploads/fmcontent/img/" . $thisFmTopicObj->getVar('topic_img')), $GLOBALS['xoops']->path("www/uploads/publisher/images/category/" . $thisFmTopicObj->getVar('topic_img')))) {
+        if (('blank.gif' !== $thisFmTopicObj->getVar('topic_img')) && ('' !== $thisFmTopicObj->getVar('topic_img'))) {
+            if (copy($GLOBALS['xoops']->path('www/uploads/fmcontent/img/' . $thisFmTopicObj->getVar('topic_img')), $GLOBALS['xoops']->path('www/uploads/publisher/images/category/' . $thisFmTopicObj->getVar('topic_img')))) {
                 $categoryObj->setVar('image', $thisFmTopicObj->getVar('topic_img'));
             }
         }
@@ -254,27 +255,27 @@
 
         // insert articles for this category
         foreach ($fmContentObjs as $thisFmContentObj) {
-            $itemObj = $publisher->getHandler('item')->create();
-            $itemObj->setVars(array('categoryid'       => $CatIds['newid'],
-                                    'title'            => $thisFmContentObj->getVar('content_title'),
-                                    'uid'              => $thisFmContentObj->getVar('content_uid'),
-                                    'summary'          => $thisFmContentObj->getVar('content_short'),
-                                    'body'             => $thisFmContentObj->getVar('content_text'),
-                                    'counter'          => $thisFmContentObj->getVar('content_hits'),
-                                    'datesub'          => $thisFmContentObj->getVar('content_create'),
-                                    'dohtml'           => $thisFmContentObj->getVar('dohtml'),
-                                    'dosmiley'         => $thisFmContentObj->getVar('dosmiley'),
-                                    'doxcode'          => $thisFmContentObj->getVar('doxcode'),
-                                    'doimage'          => $thisFmContentObj->getVar('doimage'),
-                                    'dobr'             => $thisFmContentObj->getVar('dobr'),
-                                    'weight'           => $thisFmContentObj->getVar('content_order'),
-                                    'status'           => ($thisFmContentObj->getVar('content_status')) ? PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED : PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE,
-                                    'rating'           => 0,
-                                    'votes'            => 0,
-                                    'comments'         => $thisFmContentObj->getVar('content_comments'),
-                                    'meta_keywords'    => $thisFmContentObj->getVar('content_words'),
-                                    'meta_description' => $thisFmContentObj->getVar('content_desc'))
-            );
+            $itemObj =& $publisher->getHandler('item')->create();
+            $itemObj->setVars(array(
+                                  'categoryid'       => $CatIds['newid'],
+                                  'title'            => $thisFmContentObj->getVar('content_title'),
+                                  'uid'              => $thisFmContentObj->getVar('content_uid'),
+                                  'summary'          => $thisFmContentObj->getVar('content_short'),
+                                  'body'             => $thisFmContentObj->getVar('content_text'),
+                                  'counter'          => $thisFmContentObj->getVar('content_hits'),
+                                  'datesub'          => $thisFmContentObj->getVar('content_create'),
+                                  'dohtml'           => $thisFmContentObj->getVar('dohtml'),
+                                  'dosmiley'         => $thisFmContentObj->getVar('dosmiley'),
+                                  'doxcode'          => $thisFmContentObj->getVar('doxcode'),
+                                  'doimage'          => $thisFmContentObj->getVar('doimage'),
+                                  'dobr'             => $thisFmContentObj->getVar('dobr'),
+                                  'weight'           => $thisFmContentObj->getVar('content_order'),
+                                  'status'           => ($thisFmContentObj->getVar('content_status')) ? PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED : PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE,
+                                  'rating'           => 0,
+                                  'votes'            => 0,
+                                  'comments'         => $thisFmContentObj->getVar('content_comments'),
+                                  'meta_keywords'    => $thisFmContentObj->getVar('content_words'),
+                                  'meta_description' => $thisFmContentObj->getVar('content_desc')));
             $contentImg = $thisFmContentObj->getVar('content_img');
             if (!empty($contentImg)) {
                 $itemObj->setVar('images', 1);
@@ -282,26 +283,26 @@
             }
 
             if (!$itemObj->store()) {
-                echo sprintf("  " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $thisFmContentObj->getVar('title')) . "<br />\n";
+                echo sprintf('  ' . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $thisFmContentObj->getVar('title')) . "<br />\n";
                 continue;
             } else {
                 $newArticleArray[$thisFmContentObj->getVar('storyid')] = $itemObj->itemid();
-                echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />\n";
+                echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->getTitle()) . "<br />\n";
                 ++$cnt_imported_articles;
             }
         }
 
         // Saving category permissions
-        $groupsIds = $gperm_handler->getGroupIds('fmcontent_view', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
+        $groupsIds = $gpermHandler->getGroupIds('fmcontent_view', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
         publisherSaveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'category_read');
-        $groupsIds = $gperm_handler->getGroupIds('fmcontent_submit', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
+        $groupsIds = $gpermHandler->getGroupIds('fmcontent_submit', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
         publisherSaveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'item_submit');
 
         $newCatArray[$CatIds['oldid']] = $CatIds;
         unset($CatIds, $thisFmContentObj);
         echo "<br />\n";
     }
-    unset($thisFmTopicObj);
+    //    unset($thisFmTopicObj);
 
     // Looping through cat to change the parentid to the new parentid
     foreach ($newCatArray as $oldid => $CatIds) {
@@ -319,8 +320,8 @@
 
     $publisher_module_id = $publisher->getModule()->mid();
 
-    $commentHandler = xoops_gethandler('comment');
-    $criteria        = new CriteriaCompo();
+    $commentHandler =& xoops_getHandler('comment');
+    $criteria       = new CriteriaCompo();
     $criteria->add(new Criteria('com_modid', $fm_module_id));
     $comments = $commentHandler->getObjects($criteria);
     foreach ($comments as $comment) {
@@ -328,18 +329,15 @@
         $comment->setVar('com_modid', $publisher_module_id);
         $comment->setNew();
         if (!$commentHandler->insert($comment)) {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />\n";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />\n";
         } else {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />\n";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />\n";
         }
 
     }
-    unset($comment);
+    //    unset($comment);
 
-    echo "<br /><br />" . _AM_PUBLISHER_IMPORT_DONE . "<br />\n"
-         . "" . sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . "<br />\n"
-         . "" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . "<br />\n"
-         . "<br/>\n<a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . "</a><br />\n";
+    echo '<br /><br />' . _AM_PUBLISHER_IMPORT_DONE . "<br />\n" . '' . sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . "<br />\n" . '' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . "<br />\n" . "<br/>\n<a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . "</a><br />\n";
 
     publisherCloseCollapsableBar('fmimportgo', 'fmimportgoicon');
     xoops_cp_footer();
diff --git a/publisher/admin/import/news.php b/publisher/admin/import/news.php
index e98b0fc7..8e24b2b4 100644
--- a/publisher/admin/import/news.php
+++ b/publisher/admin/import/news.php
@@ -23,56 +23,56 @@
 include_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
-$importFromModuleName = "News " . XoopsRequest::getString('news_version', '', 'POST');
+$importFromModuleName = 'News ' . XoopsRequest::getString('news_version', '', 'POST');
 
-$scriptname = "news.php";
+$scriptname = 'news.php';
 
-$op = ('go' == XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start';
+$op = ('go' === XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start';
 
-if ($op == 'start') {
+if ($op === 'start') {
     xoops_load('XoopsFormLoader');
 
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     publisherOpenCollapsableBar('newsimport', 'newsimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
-    $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("topics"));
+    $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('topics'));
     list ($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result);
 
     if ($totalCat == 0) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . "</span>";
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . '</span>';
     } else {
         include_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
-        $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("stories"));
+        $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('stories'));
         list ($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
 
         if ($totalArticles == 0) {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . '</span>';
         } else {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . '</span>';
 
-            $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
+            $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . '/import/$scriptname');
 
             // Categories to be imported
-            $sql = "SELECT cat.topic_id, cat.topic_pid, cat.topic_title, COUNT(art.storyid) FROM " . $GLOBALS['xoopsDB']->prefix("topics") . " AS cat INNER JOIN " . $GLOBALS['xoopsDB']->prefix("stories") . " AS art ON cat.topic_id=art.topicid GROUP BY art.topicid";
+            $sql = 'SELECT cat.topic_id, cat.topic_pid, cat.topic_title, COUNT(art.storyid) FROM ' . $GLOBALS['xoopsDB']->prefix('topics') . ' AS cat INNER JOIN ' . $GLOBALS['xoopsDB']->prefix('stories') . ' AS art ON cat.topic_id=art.topicid GROUP BY art.topicid';
 
             $result           = $GLOBALS['xoopsDB']->query($sql);
             $cat_cbox_options = array();
 
             while ((list ($cid, $pid, $cat_title, $art_count) = $GLOBALS['xoopsDB']->fetchRow($result)) !== false) {
                 $cat_title              = $myts->displayTarea($cat_title);
-                $cat_cbox_options[$cid] = "$cat_title ($art_count)";
+                $cat_cbox_options[$cid] = '$cat_title ($art_count)';
             }
 
-            $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode("<br />", $cat_cbox_options));
+            $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode('<br />', $cat_cbox_options));
             $cat_label->setDescription(_AM_PUBLISHER_IMPORT_CATEGORIES_DSC);
             $form->addElement($cat_label);
 
             // Publisher parent category
-            $mytree = new XoopsTree($GLOBALS['xoopsDB']->prefix("publisher_categories"), "categoryid", "parentid");
+            $mytree = new XoopsTree($GLOBALS['xoopsDB']->prefix('publisher_categories'), 'categoryid', 'parentid');
             ob_start();
-            $mytree->makeMySelBox("name", "weight", $preset_id = 0, $none = 1, $sel_name = "parent_category");
+            $mytree->makeMySelBox('name', 'weight', $preset_id = 0, $none = 1, $sel_name = 'parent_category');
 
             $parent_cat_sel = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY, ob_get_contents());
             $parent_cat_sel->setDescription(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY_DSC);
@@ -92,23 +92,23 @@
     xoops_cp_footer();
 }
 
-if ($op == 'go') {
+if ($op === 'go') {
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     publisherOpenCollapsableBar('newsimportgo', 'newsimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
 
-    $moduleHandler = xoops_gethandler('module');
+    $moduleHandler  =& xoops_getHandler('module');
     $moduleObj      = $moduleHandler->getByDirname('news');
     $news_module_id = $moduleObj->getVar('mid');
 
-    $gperm_handler = xoops_gethandler('groupperm');
+    $gpermHandler =& xoops_getHandler('groupperm');
 
     $cnt_imported_cat      = 0;
     $cnt_imported_articles = 0;
 
     $parentId = XoopsRequest::getInt('parent_category', 0, 'POST');
 
-    $sql = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix('topics');
+    $sql = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('topics');
 
     $resultCat = $GLOBALS['xoopsDB']->query($sql);
 
@@ -117,12 +117,11 @@
 
     $oldToNew = array();
     while (($arrCat = $GLOBALS['xoopsDB']->fetchArray($resultCat)) !== false) {
-
         $newCat           = array();
         $newCat['oldid']  = $arrCat['topic_id'];
         $newCat['oldpid'] = $arrCat['topic_pid'];
 
-        $categoryObj = $publisher->getHandler('category')->create();
+        $categoryObj =& $publisher->getHandler('category')->create();
 
         $categoryObj->setVar('parentid', $arrCat['topic_pid']);
         $categoryObj->setVar('weight', 0);
@@ -130,27 +129,27 @@
         $categoryObj->setVar('description', $arrCat['topic_description']);
 
         // Category image
-        if (($arrCat['topic_imgurl'] != 'blank.gif') && ($arrCat['topic_imgurl'] != '')) {
-            if (copy($GLOBALS['xoops']->path("modules/news/assets/images/topics/" . $arrCat['topic_imgurl']), $GLOBALS['xoops']->path("uploads/publisher/images/category/" . $arrCat['topic_imgurl']))) {
+        if (($arrCat['topic_imgurl'] !== 'blank.gif') && ($arrCat['topic_imgurl'] !== '')) {
+            if (copy($GLOBALS['xoops']->path('modules/news/assets/images/topics/' . $arrCat['topic_imgurl']), $GLOBALS['xoops']->path('uploads/publisher/images/category/' . $arrCat['topic_imgurl']))) {
                 $categoryObj->setVar('image', $arrCat['topic_imgurl']);
             }
         }
 
         if (!$publisher->getHandler('category')->insert($categoryObj)) {
-            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['topic_title']) . "<br/>";
+            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['topic_title']) . '<br/>';
             continue;
         }
 
         $newCat['newid'] = $categoryObj->categoryid();
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>";
+        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . '<br\>';
 
-        $sql            = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix('stories') . " WHERE topicid=" . $arrCat['topic_id'];
+        $sql            = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('stories') . ' WHERE topicid=' . $arrCat['topic_id'];
         $resultArticles = $GLOBALS['xoopsDB']->query($sql);
         while (($arrArticle = $GLOBALS['xoopsDB']->fetchArray($resultArticles)) !== false) {
             // insert article
-            $itemObj = $publisher->getHandler('item')->create();
+            $itemObj =& $publisher->getHandler('item')->create();
 
             $itemObj->setVar('categoryid', $categoryObj->categoryid());
             $itemObj->setVar('title', $arrArticle['title']);
@@ -173,31 +172,31 @@
             /*
              // HTML Wrap
              if ($arrArticle['htmlpage']) {
-             $pagewrap_filename	= $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']);
+             $pagewrap_filename = $GLOBALS['xoops']->path('modules/wfsection/html/' .$arrArticle['htmlpage']);
              if (file_exists($pagewrap_filename)) {
-             if (copy($pagewrap_filename, $GLOBALS['xoops']->path("uploads/publisher/content/" . $arrArticle['htmlpage']))) {
-             $itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]");
-             echo sprintf("&nbsp;&nbsp;&nbsp;&nbsp;" . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>";
+             if (copy($pagewrap_filename, $GLOBALS['xoops']->path('uploads/publisher/content/' . $arrArticle['htmlpage']))) {
+             $itemObj->setVar('body', '[pagewrap=' . $arrArticle['htmlpage'] . ']');
+             echo sprintf('&nbsp;&nbsp;&nbsp;&nbsp;' . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . '<br/>';
              }
              }
              }
              */
 
             if (!$itemObj->store()) {
-                echo sprintf("  " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . "<br/>";
+                echo sprintf('  ' . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . '<br/>';
                 continue;
             } else {
                 /*
                  // Linkes files
-                 $sql = "SELECT * FROM ".$GLOBALS['xoopsDB']->prefix("wfs_files")." WHERE articleid=" . $arrArticle['articleid'];
+                 $sql = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('wfs_files').' WHERE articleid=' . $arrArticle['articleid'];
                  $resultFiles = $GLOBALS['xoopsDB']->query ($sql);
                  $allowed_mimetypes = '';
                  while ($arrFile = $GLOBALS['xoopsDB']->fetchArray ($resultFiles)) {
 
-                 $filename = $GLOBALS['xoops']->path("modules/wfsection/cache/uploaded/" . $arrFile['filerealname']);
+                 $filename = $GLOBALS['xoops']->path('modules/wfsection/cache/uploaded/' . $arrFile['filerealname']);
                  if (file_exists($filename)) {
-                 if (copy($filename, $GLOBALS['xoops']->path("uploads/publisher/" . $arrFile['filerealname']))) {
-                 $fileObj = $publisher_file_handler->create();
+                 if (copy($filename, $GLOBALS['xoops']->path('uploads/publisher/' . $arrFile['filerealname']))) {
+                 $fileObj = $publisher_fileHandler->create();
                  $fileObj->setVar('name', $arrFile['fileshowname']);
                  $fileObj->setVar('description', $arrFile['filedescript']);
                  $fileObj->setVar('status', PublisherConstantsInterface::PUBLISHER_STATUS_FILE_ACTIVE);
@@ -209,27 +208,27 @@
                  $fileObj->setVar('filename', $arrFile['filerealname']);
 
                  if ($fileObj->store($allowed_mimetypes, true, false)) {
-                 echo "&nbsp;&nbsp;&nbsp;&nbsp;"  . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname']) . "<br />";
+                 echo '&nbsp;&nbsp;&nbsp;&nbsp;'  . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname']) . '<br />';
                  }
                  }
                  }
                  }
                  */
                 $newArticleArray[$arrArticle['storyid']] = $itemObj->itemid();
-                echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
+                echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->getTitle()) . '<br />';
                 ++$cnt_imported_articles;
             }
         }
 
         // Saving category permissions
-        $groupsIds = $gperm_handler->getGroupIds('news_view', $arrCat['topic_id'], $news_module_id);
+        $groupsIds = $gpermHandler->getGroupIds('news_view', $arrCat['topic_id'], $news_module_id);
         publisherSaveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'category_read');
-        $groupsIds = $gperm_handler->getGroupIds('news_submit', $arrCat['topic_id'], $news_module_id);
+        $groupsIds = $gpermHandler->getGroupIds('news_submit', $arrCat['topic_id'], $news_module_id);
         publisherSaveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'item_submit');
 
         $newCatArray[$newCat['oldid']] = $newCat;
         unset($newCat);
-        echo "<br/>";
+        echo '<br/>';
     }
 
     // Looping through cat to change the parentid to the new parentid
@@ -248,12 +247,12 @@
     unset($oldid, $newCat);
 
     // Looping through the comments to link them to the new articles and module
-    echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />";
+    echo _AM_PUBLISHER_IMPORT_COMMENTS . '<br />';
 
     $publisher_module_id = $publisher->getModule()->mid();
 
-    $commentHandler = xoops_gethandler('comment');
-    $criteria        = new CriteriaCompo();
+    $commentHandler =& xoops_getHandler('comment');
+    $criteria       = new CriteriaCompo();
     $criteria->add(new Criteria('com_modid', $news_module_id));
     $comments = $commentHandler->getObjects($criteria);
     foreach ($comments as $comment) {
@@ -261,18 +260,18 @@
         $comment->setVar('com_modid', $publisher_module_id);
         $comment->setNew();
         if (!$commentHandler->insert($comment)) {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . '<br />';
         } else {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . '<br />';
         }
 
     }
-    unset($comment);
+    //    unset($comment);
 
-    echo "<br/><br/>Done.<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . "<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . "<br/>";
-    echo "<br/><a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . "</a><br/>";
+    echo '<br/><br/>Done.<br/>';
+    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br/>';
+    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . '<br/>';
+    echo "<br/><a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . '</a><br/>';
 
     publisherCloseCollapsableBar('newsimportgo', 'newsimportgoicon');
     xoops_cp_footer();
diff --git a/publisher/admin/import/smartsection.php b/publisher/admin/import/smartsection.php
index 9c2a6245..a9134d2d 100644
--- a/publisher/admin/import/smartsection.php
+++ b/publisher/admin/import/smartsection.php
@@ -23,39 +23,39 @@
 include_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
-$importFromModuleName = "Smartsection " . XoopsRequest::getString('smartsection_version', '', 'POST');
+$importFromModuleName = 'Smartsection ' . XoopsRequest::getString('smartsection_version', '', 'POST');
 
-$scriptname = "smartsection.php";
+$scriptname = 'smartsection.php';
 
-$op = ('go' == XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start';
+$op = ('go' === XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start';
 
-if ($op == 'start') {
+if ($op === 'start') {
     xoops_load('XoopsFormLoader');
 
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     publisherOpenCollapsableBar('newsimport', 'newsimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
-    $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("smartsection_categories"));
+    $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('smartsection_categories'));
     list ($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result);
 
     if ($totalCat == 0) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . "</span>";
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . '</span>';
     } else {
         include_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
-        $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix('smartsection_items'));
+        $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('smartsection_items'));
         list ($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
 
         if ($totalArticles == 0) {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . '</span>';
         } else {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . '</span>';
 
             $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/{$scriptname}");
 
             // Categories to be imported
-            $sql = "SELECT cat.categoryid, cat.parentid, cat.name, COUNT(art.itemid) FROM " . $GLOBALS['xoopsDB']->prefix('smartsection_categories') . " AS cat INNER JOIN " . $GLOBALS['xoopsDB']->prefix('smartsection_items') . " AS art ON cat.categoryid=art.categoryid GROUP BY art.categoryid";
+            $sql = 'SELECT cat.categoryid, cat.parentid, cat.name, COUNT(art.itemid) FROM ' . $GLOBALS['xoopsDB']->prefix('smartsection_categories') . ' AS cat INNER JOIN ' . $GLOBALS['xoopsDB']->prefix('smartsection_items') . ' AS art ON cat.categoryid=art.categoryid GROUP BY art.categoryid';
 
             $result           = $GLOBALS['xoopsDB']->query($sql);
             $cat_cbox_options = array();
@@ -65,14 +65,14 @@
                 $cat_cbox_options[$cid] = "$cat_title ($art_count)";
             }
 
-            $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode("<br />", $cat_cbox_options));
+            $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode('<br />', $cat_cbox_options));
             $cat_label->setDescription(_AM_PUBLISHER_IMPORT_CATEGORIES_DSC);
             $form->addElement($cat_label);
 
             // Publisher parent category
-            $mytree = new XoopsTree($GLOBALS['xoopsDB']->prefix("publisher_categories"), "categoryid", "parentid");
+            $mytree = new XoopsTree($GLOBALS['xoopsDB']->prefix('publisher_categories'), 'categoryid', 'parentid');
             ob_start();
-            $mytree->makeMySelBox("name", "weight", $preset_id = 0, $none = 1, $sel_name = "parent_category");
+            $mytree->makeMySelBox('name', 'weight', $preset_id = 0, $none = 1, $sel_name = 'parent_category');
 
             $parent_cat_sel = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY, ob_get_contents());
             $parent_cat_sel->setDescription(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY_DSC);
@@ -92,23 +92,23 @@
     xoops_cp_footer();
 }
 
-if ($op == 'go') {
+if ($op === 'go') {
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     publisherOpenCollapsableBar('newsimportgo', 'newsimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
 
-    $moduleHandler         = xoops_gethandler('module');
+    $moduleHandler          =& xoops_getHandler('module');
     $moduleObj              = $moduleHandler->getByDirname('smartsection');
     $smartsection_module_id = $moduleObj->getVar('mid');
 
-    $gperm_handler = xoops_gethandler('groupperm');
+    $gpermHandler =& xoops_getHandler('groupperm');
 
     $cnt_imported_cat      = 0;
     $cnt_imported_articles = 0;
 
     $parentId = XoopsRequest::getInt('parent_category', 0, 'POST');
 
-    $sql = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix('smartsection_categories');
+    $sql = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('smartsection_categories');
 
     $resultCat = $GLOBALS['xoopsDB']->query($sql);
 
@@ -121,18 +121,18 @@
         $newCat['oldid']  = $arrCat['categoryid'];
         $newCat['oldpid'] = $arrCat['parentid'];
 
-        $categoryObj = $publisher->getHandler('category')->create();
+        $categoryObj =& $publisher->getHandler('category')->create();
 
         $categoryObj->setVars($arrCat);
         $categoryObj->setVar('categoryid', 0);
 
         // Copy category image
-        if (($arrCat['image'] != 'blank.gif') && ($arrCat['image'] != '')) {
-            copy($GLOBALS['xoops']->path("uploads/smartsection/images/category/" . $arrCat['image']), $GLOBALS['xoops']->path("uploads/publisher/images/category/" . $arrCat['image']));
+        if (($arrCat['image'] !== 'blank.gif') && ($arrCat['image'] !== '')) {
+            copy($GLOBALS['xoops']->path('uploads/smartsection/images/category/' . $arrCat['image']), $GLOBALS['xoops']->path('uploads/publisher/images/category/' . $arrCat['image']));
         }
 
         if (!$publisher->getHandler('category')->insert($categoryObj)) {
-            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['name']) . "<br/>";
+            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['name']) . '<br/>';
             continue;
         }
 
@@ -141,12 +141,12 @@
 
         echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>";
 
-        $sql            = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix('smartsection_items') . " WHERE categoryid=" . $arrCat['categoryid'];
+        $sql            = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('smartsection_items') . ' WHERE categoryid=' . $arrCat['categoryid'];
         $resultArticles = $GLOBALS['xoopsDB']->query($sql);
 
         while (($arrArticle = $GLOBALS['xoopsDB']->fetchArray($resultArticles)) !== false) {
             // insert article
-            $itemObj = $publisher->getHandler('item')->create();
+            $itemObj =& $publisher->getHandler('item')->create();
 
             $itemObj->setVars($arrArticle);
             $itemObj->setVar('itemid', 0);
@@ -158,7 +158,7 @@
             // TODO: copy contents folder
             /*
             if ($arrArticle['htmlpage']) {
-            $pagewrap_filename	= $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']);
+            $pagewrap_filename  = $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']);
             if (file_exists($pagewrap_filename)) {
             if (copy($pagewrap_filename, $GLOBALS['xoops']->path("uploads/publisher/content/" . $arrArticle['htmlpage']))) {
             $itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]");
@@ -169,44 +169,43 @@
             */
 
             if (!$itemObj->store()) {
-                echo sprintf("  " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . "<br/>";
+                echo sprintf('  ' . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . '<br/>';
                 continue;
             } else {
-
                 // Linkes files
-                $sql               = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix("smartsection_files") . " WHERE itemid=" . $arrArticle['itemid'];
+                $sql               = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('smartsection_files') . ' WHERE itemid=' . $arrArticle['itemid'];
                 $resultFiles       = $GLOBALS['xoopsDB']->query($sql);
                 $allowed_mimetypes = null;
                 while (($arrFile = $GLOBALS['xoopsDB']->fetchArray($resultFiles)) !== false) {
-                    $filename = $GLOBALS['xoops']->path("uploads/smartsection/" . $arrFile['filename']);
+                    $filename = $GLOBALS['xoops']->path('uploads/smartsection/' . $arrFile['filename']);
                     if (file_exists($filename)) {
-                        if (copy($filename, $GLOBALS['xoops']->path("uploads/publisher/" . $arrFile['filename']))) {
-                            $fileObj = $publisher->getHandler('file')->create();
+                        if (copy($filename, $GLOBALS['xoops']->path('uploads/publisher/' . $arrFile['filename']))) {
+                            $fileObj =& $publisher->getHandler('file')->create();
                             $fileObj->setVars($arrFile);
                             $fileObj->setVar('fileid', 0);
 
                             if ($fileObj->store($allowed_mimetypes, true, false)) {
-                                echo "&nbsp;&nbsp;&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filename']) . "<br />";
+                                echo '&nbsp;&nbsp;&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filename']) . '<br />';
                             }
                         }
                     }
                 }
 
                 $newArticleArray[$arrArticle['itemid']] = $itemObj->itemid();
-                echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
+                echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->getTitle()) . '<br />';
                 ++$cnt_imported_articles;
             }
         }
 
         // Saving category permissions
-        $groupsIds = $gperm_handler->getGroupIds('category_read', $arrCat['categoryid'], $smartsection_module_id);
+        $groupsIds = $gpermHandler->getGroupIds('category_read', $arrCat['categoryid'], $smartsection_module_id);
         publisherSaveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'category_read');
-        $groupsIds = $gperm_handler->getGroupIds('item_submit', $arrCat['categoryid'], $smartsection_module_id);
+        $groupsIds = $gpermHandler->getGroupIds('item_submit', $arrCat['categoryid'], $smartsection_module_id);
         publisherSaveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'item_submit');
 
         $newCatArray[$newCat['oldid']] = $newCat;
         unset($newCat);
-        echo "<br/>";
+        echo '<br/>';
     }
 
     // Looping through cat to change the parentid to the new parentid
@@ -225,12 +224,12 @@
     unset($oldid, $newCat);
 
     // Looping through the comments to link them to the new articles and module
-    echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />";
+    echo _AM_PUBLISHER_IMPORT_COMMENTS . '<br />';
 
     $publisher_module_id = $publisher->getModule()->mid();
 
-    $commentHandler = xoops_gethandler('comment');
-    $criteria        = new CriteriaCompo();
+    $commentHandler =& xoops_getHandler('comment');
+    $criteria       = new CriteriaCompo();
     $criteria->add(new Criteria('com_modid', $smartsection_module_id));
     $comments = $commentHandler->getObjects($criteria);
     foreach ($comments as $comment) {
@@ -238,18 +237,18 @@
         $comment->setVar('com_modid', $publisher_module_id);
         $comment->setNew();
         if (!$commentHandler->insert($comment)) {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . '<br />';
         } else {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . '<br />';
         }
 
     }
-    unset($comment);
+//    unset($comment);
 
-    echo "<br/><br/>Done.<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . "<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . "<br/>";
-    echo "<br/><a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . "</a><br/>";
+    echo '<br/><br/>Done.<br/>';
+    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br/>';
+    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . '<br/>';
+    echo "<br/><a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . '</a><br/>';
 
     publisherCloseCollapsableBar('newsimportgo', 'newsimportgoicon');
     xoops_cp_footer();
diff --git a/publisher/admin/import/wfsection.php b/publisher/admin/import/wfsection.php
index 113c96b6..ea818cdf 100644
--- a/publisher/admin/import/wfsection.php
+++ b/publisher/admin/import/wfsection.php
@@ -23,39 +23,39 @@
 include_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
-$importFromModuleName = "WF-Section " . XoopsRequest::getString('wfs_version', '', 'POST');
+$importFromModuleName = 'WF-Section ' . XoopsRequest::getString('wfs_version', '', 'POST');
 
-$scriptname = "wfsection.php";
+$scriptname = 'wfsection.php';
 
-$op = ('go' == XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start';
+$op = ('go' === XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start';
 
-if ($op == 'start') {
+if ($op === 'start') {
     xoops_load('XoopsFormLoader');
 
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     publisherOpenCollapsableBar('wfsectionimport', 'wfsectionimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
-    $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("wfs_category"));
+    $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('wfs_category'));
     list ($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result);
 
     if ($totalCat == 0) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NOCATSELECTED . "</span>";
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NOCATSELECTED . '</span>';
     } else {
-        include_once $GLOBALS['xoops']->path("class/xoopstree.php");
+        include_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
-        $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("wfs_article"));
+        $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('wfs_article'));
         list ($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
 
         if ($totalArticles == 0) {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . '</span>';
         } else {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . '</span>';
 
             $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
 
             // Categories to be imported
-            $sql              = "SELECT cat.id, cat.pid, cat.title, COUNT(art.articleid) FROM " . $GLOBALS['xoopsDB']->prefix("wfs_category") . " AS cat INNER JOIN " . $GLOBALS['xoopsDB']->prefix("wfs_article") . " AS art ON cat.id=art.categoryid GROUP BY art.categoryid";
+            $sql              = 'SELECT cat.id, cat.pid, cat.title, COUNT(art.articleid) FROM ' . $GLOBALS['xoopsDB']->prefix('wfs_category') . ' AS cat INNER JOIN ' . $GLOBALS['xoopsDB']->prefix('wfs_article') . ' AS art ON cat.id=art.categoryid GROUP BY art.categoryid';
             $result           = $GLOBALS['xoopsDB']->query($sql);
             $cat_cbox_values  = array();
             $cat_cbox_options = array();
@@ -63,14 +63,14 @@
                 $cat_title              = $myts->displayTarea($cat_title);
                 $cat_cbox_options[$cid] = "$cat_title ($art_count)";
             }
-            $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode("<br />", $cat_cbox_options));
+            $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode('<br />', $cat_cbox_options));
             $cat_label->setDescription(_AM_PUBLISHER_IMPORT_CATEGORIES_DSC);
             $form->addElement($cat_label);
 
             // SmartFAQ parent category
-            $mytree = new XoopsTree($GLOBALS['xoopsDB']->prefix("publisher_categories"), "categoryid", "parentid");
+            $mytree = new XoopsTree($GLOBALS['xoopsDB']->prefix('publisher_categories'), 'categoryid', 'parentid');
             ob_start();
-            $mytree->makeMySelBox("name", "weight", $preset_id = 0, $none = 1, $sel_name = "parent_category");
+            $mytree->makeMySelBox('name', 'weight', $preset_id = 0, $none = 1, $sel_name = 'parent_category');
 
             $parent_cat_sel = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY, ob_get_contents());
             $parent_cat_sel->setDescription(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY_DSC);
@@ -90,7 +90,7 @@
     xoops_cp_footer();
 }
 
-if ($op == 'go') {
+if ($op === 'go') {
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     publisherOpenCollapsableBar('wfsectionimportgo', 'wfsectionimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
@@ -100,19 +100,19 @@
 
     $parentId = XoopsRequest::getInt('parent_category', 0, 'POST');
     //added to support 2.0.7
-    if (XoopsRequest::getString('from_module_version', '', 'POST') == '2.07' || XoopsRequest::getString('from_module_version', '', 'POST') == '2.06') {
+    if (XoopsRequest::getString('from_module_version', '', 'POST') === '2.07' || XoopsRequest::getString('from_module_version', '', 'POST') === '2.06') {
         $orders = 'weight';
     } else {
         $orders = 'orders';
     }
     //$sql = "SELECT * FROM ".$GLOBALS['xoopsDB']->prefix("wfs_category")." ORDER by orders";
-    $sql = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix("wfs_category") . " ORDER by $orders";
+    $sql = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('wfs_category') . " ORDER by $orders";
     //end added to support 2.0.7
     $resultCat = $GLOBALS['xoopsDB']->query($sql);
 
     $newCatArray = array();
     while (($arrCat = $GLOBALS['xoopsDB']->fetchArray($resultCat)) !== false) {
-        $categoryObj = $publisher->getHandler('category')->create();
+        $categoryObj =& $publisher->getHandler('category')->create();
 
         $newCat = array();
 
@@ -124,20 +124,20 @@
         //$categoryObj->setVar ('weight', $arrCat['orders']);
         $categoryObj->setVar('weight', $arrCat[$orders]);
         //added to support 2.0.7
-        $categoryObj->setGroupsRead(explode(" ", trim($arrCat['groupid'])));
-        $categoryObj->setGroupsSubmit(explode(" ", trim($arrCat['editaccess'])));
+        $categoryObj->setGroupsRead(explode(' ', trim($arrCat['groupid'])));
+        $categoryObj->setGroupsSubmit(explode(' ', trim($arrCat['editaccess'])));
         $categoryObj->setVar('name', $arrCat['title']);
         $categoryObj->setVar('description', $arrCat['description']);
 
         // Category image
-        if (($arrCat['imgurl'] != 'blank.gif') && ($arrCat['imgurl'])) {
-            if (copy($GLOBALS['xoops']->path("modules/wfsection/images/category/" . $arrCat['imgurl']), PUBLISHER_UPLOAD_PATH . "/images/category/" . $arrCat['imgurl'])) {
+        if (($arrCat['imgurl'] !== 'blank.gif') && ($arrCat['imgurl'])) {
+            if (copy($GLOBALS['xoops']->path('modules/wfsection/images/category/' . $arrCat['imgurl']), PUBLISHER_UPLOAD_PATH . '/images/category/' . $arrCat['imgurl'])) {
                 $categoryObj->setVar('image', $arrCat['imgurl']);
             }
         }
 
         if (!$categoryObj->store(false)) {
-            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['title']) . "<br/>";
+            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['title']) . '<br/>';
             continue;
         }
 
@@ -148,13 +148,13 @@
 
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>";
+        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . '<br\>';
 
-        $sql            = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix("wfs_article") . " WHERE categoryid=" . $arrCat['id'] . " ORDER BY weight";
+        $sql            = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('wfs_article') . ' WHERE categoryid=' . $arrCat['id'] . ' ORDER BY weight';
         $resultArticles = $GLOBALS['xoopsDB']->query($sql);
         while (($arrArticle = $GLOBALS['xoopsDB']->fetchArray($resultArticles)) !== false) {
             // insert article
-            $itemObj = $publisher->getHandler('item')->create();
+            $itemObj =& $publisher->getHandler('item')->create();
 
             $itemObj->setVar('categoryid', $categoryObj->categoryid());
             $itemObj->setVar('title', $arrArticle['title']);
@@ -168,33 +168,33 @@
             $itemObj->setVar('dobr', $arrArticle['nobreaks']);
             $itemObj->setVar('weight', $arrArticle['weight']);
             $itemObj->setVar('status', PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED);
-            $itemObj->setGroupsRead(explode(" ", trim($arrArticle['groupid'])));
+            $itemObj->setGroupsRead(explode(' ', trim($arrArticle['groupid'])));
 
             // HTML Wrap
             if ($arrArticle['htmlpage']) {
-                $pagewrap_filename = $GLOBALS['xoops']->path("modules/wfsection/html/" . $arrArticle['htmlpage']);
+                $pagewrap_filename = $GLOBALS['xoops']->path('modules/wfsection/html/' . $arrArticle['htmlpage']);
                 if (file_exists($pagewrap_filename)) {
-                    if (copy($pagewrap_filename, PUBLISHER_UPLOAD_PATH . "/content/" . $arrArticle['htmlpage'])) {
-                        $itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]");
-                        echo sprintf("&nbsp;&nbsp;&nbsp;&nbsp;" . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>";
+                    if (copy($pagewrap_filename, PUBLISHER_UPLOAD_PATH . '/content/' . $arrArticle['htmlpage'])) {
+                        $itemObj->setVar('body', '[pagewrap=' . $arrArticle['htmlpage'] . ']');
+                        echo sprintf('&nbsp;&nbsp;&nbsp;&nbsp;' . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . '<br/>';
                     }
                 }
             }
 
             if (!$itemObj->store()) {
-                echo sprintf("  " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . "<br/>";
+                echo sprintf('  ' . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . '<br/>';
                 continue;
             } else {
                 // Linkes files
 
-                $sql               = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix("wfs_files") . " WHERE articleid=" . $arrArticle['articleid'];
+                $sql               = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('wfs_files') . ' WHERE articleid=' . $arrArticle['articleid'];
                 $resultFiles       = $GLOBALS['xoopsDB']->query($sql);
                 $allowed_mimetypes = '';
                 while (($arrFile = $GLOBALS['xoopsDB']->fetchArray($resultFiles)) !== false) {
-                    $filename = $GLOBALS['xoops']->path("modules/wfsection/cache/uploaded/" . $arrFile['filerealname']);
+                    $filename = $GLOBALS['xoops']->path('modules/wfsection/cache/uploaded/' . $arrFile['filerealname']);
                     if (file_exists($filename)) {
-                        if (copy($filename, PUBLISHER_UPLOAD_PATH . "/" . $arrFile['filerealname'])) {
-                            $fileObj = $publisher->getHandler('file')->create();
+                        if (copy($filename, PUBLISHER_UPLOAD_PATH . '/' . $arrFile['filerealname'])) {
+                            $fileObj =& $publisher->getHandler('file')->create();
                             $fileObj->setVar('name', $arrFile['fileshowname']);
                             $fileObj->setVar('description', $arrFile['filedescript']);
                             $fileObj->setVar('status', PublisherConstantsInterface::PUBLISHER_STATUS_FILE_ACTIVE);
@@ -206,20 +206,20 @@
                             $fileObj->setVar('filename', $arrFile['filerealname']);
 
                             if ($fileObj->store($allowed_mimetypes, true, false)) {
-                                echo "&nbsp;&nbsp;&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname']) . "<br />";
+                                echo '&nbsp;&nbsp;&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname']) . '<br />';
                             }
                         }
                     }
                 }
 
                 $newArticleArray[$arrArticle['articleid']] = $itemObj->itemid();
-                echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
+                echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->getTitle()) . '<br />';
                 ++$cnt_imported_articles;
             }
         }
         $newCatArray[$newCat['oldid']] = $newCat;
         unset($newCat);
-        echo "<br/>";
+        echo '<br/>';
     }
     // Looping through cat to change the pid to the new pid
     foreach ($newCatArray as $oldid => $newCat) {
@@ -237,16 +237,16 @@
     unset($oldid, $newCat);
 
     // Looping through the comments to link them to the new articles and module
-    echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />";
+    echo _AM_PUBLISHER_IMPORT_COMMENTS . '<br />';
 
-    $moduleHandler = xoops_gethandler('module');
+    $moduleHandler  =& xoops_getHandler('module');
     $moduleObj      = $moduleHandler->getByDirname('wfsection');
     $news_module_id = $moduleObj->getVar('mid');
 
     $publisher_module_id = $publisher->getModule()->mid();
 
-    $commentHandler = xoops_gethandler('comment');
-    $criteria        = new CriteriaCompo();
+    $commentHandler =& xoops_getHandler('comment');
+    $criteria       = new CriteriaCompo();
     $criteria->add(new Criteria('com_modid', $news_module_id));
     $comments = $commentHandler->getObjects($criteria);
     foreach ($comments as $comment) {
@@ -254,18 +254,18 @@
         $comment->setVar('com_modid', $publisher_module_id);
         $comment->setNew();
         if (!$commentHandler->insert($comment)) {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . '<br />';
         } else {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . '<br />';
         }
 
     }
-    unset($comment);
+//    unset($comment);
 
-    echo "<br/><br/>Done.<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . "<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . "<br/>";
-    echo "<br/><a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . "</a><br/>";
+    echo '<br/><br/>Done.<br/>';
+    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br/>';
+    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . '<br/>';
+    echo "<br/><a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . '</a><br/>';
 
     publisherCloseCollapsableBar('wfsectionimportgo', 'wfsectionimportgoicon');
     xoops_cp_footer();
diff --git a/publisher/admin/import/xfsection.php b/publisher/admin/import/xfsection.php
index 4a0939b4..c800b689 100644
--- a/publisher/admin/import/xfsection.php
+++ b/publisher/admin/import/xfsection.php
@@ -23,39 +23,39 @@
 include_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
-$importFromModuleName = "XF-Section " . XoopsRequest::getString('xfs_version', '', 'POST');
+$importFromModuleName = 'XF-Section ' . XoopsRequest::getString('xfs_version', '', 'POST');
 
-$scriptname = "xfsection.php";
+$scriptname = 'xfsection.php';
 
-$op = ('go' == XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start';
+$op = ('go' === XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start';
 
-if ($op == 'start') {
+if ($op === 'start') {
     xoops_load('XoopsFormLoader');
 
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     publisherOpenCollapsableBar('xfsectionimport', 'xfsectionimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
-    $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("xfs_category"));
+    $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('xfs_category'));
     list ($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result);
 
     if ($totalCat == 0) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NOCATSELECTED . "</span>";
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NOCATSELECTED . '</span>';
     } else {
         include_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
-        $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("xfs_article"));
+        $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('xfs_article'));
         list ($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
 
         if ($totalArticles == 0) {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . '</span>';
         } else {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . '</span>';
 
             $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
 
             // Categories to be imported
-            $sql              = "SELECT cat.id, cat.pid, cat.title, COUNT(art.articleid) FROM " . $GLOBALS['xoopsDB']->prefix("xfs_category") . " AS cat INNER JOIN " . $GLOBALS['xoopsDB']->prefix("xfs_article") . " AS art ON cat.id=art.categoryid GROUP BY art.categoryid";
+            $sql              = 'SELECT cat.id, cat.pid, cat.title, COUNT(art.articleid) FROM ' . $GLOBALS['xoopsDB']->prefix('xfs_category') . ' AS cat INNER JOIN ' . $GLOBALS['xoopsDB']->prefix('xfs_article') . ' AS art ON cat.id=art.categoryid GROUP BY art.categoryid';
             $result           = $GLOBALS['xoopsDB']->query($sql);
             $cat_cbox_values  = array();
             $cat_cbox_options = array();
@@ -63,14 +63,14 @@
                 $cat_title              = $myts->displayTarea($cat_title);
                 $cat_cbox_options[$cid] = "$cat_title ($art_count)";
             }
-            $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode("<br />", $cat_cbox_options));
+            $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode('<br />', $cat_cbox_options));
             $cat_label->setDescription(_AM_PUBLISHER_IMPORT_CATEGORIES_DSC);
             $form->addElement($cat_label);
 
             // SmartFAQ parent category
-            $mytree = new XoopsTree($GLOBALS['xoopsDB']->prefix("publisher_categories"), "categoryid", "parentid");
+            $mytree = new XoopsTree($GLOBALS['xoopsDB']->prefix('publisher_categories'), 'categoryid', 'parentid');
             ob_start();
-            $mytree->makeMySelBox("name", "weight", $preset_id = 0, $none = 1, $sel_name = "parent_category");
+            $mytree->makeMySelBox('name', 'weight', $preset_id = 0, $none = 1, $sel_name = 'parent_category');
 
             $parent_cat_sel = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY, ob_get_contents());
             $parent_cat_sel->setDescription(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY_DSC);
@@ -90,7 +90,7 @@
     xoops_cp_footer();
 }
 
-if ($op == 'go') {
+if ($op === 'go') {
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     publisherOpenCollapsableBar('xfsectionimportgo', 'xfsectionimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
@@ -100,13 +100,13 @@
 
     $parentId = XoopsRequest::getInt('parent_category', 0, 'POST');
 
-    $sql = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix("xfs_category") . " ORDER by orders";
+    $sql = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('xfs_category') . ' ORDER by orders';
 
     $resultCat = $GLOBALS['xoopsDB']->query($sql);
 
     $newCatArray = array();
     while (($arrCat = $GLOBALS['xoopsDB']->fetchArray($resultCat)) !== false) {
-        $categoryObj = $publisher->getHandler('category')->create();
+        $categoryObj =& $publisher->getHandler('category')->create();
 
         $newCat = array();
 
@@ -116,20 +116,20 @@
         $categoryObj->setVar('parentid', $arrCat['pid']);
 
         $categoryObj->setVar('weight', $arrCat['orders']);
-        $categoryObj->setGroupsRead(explode(" ", trim($arrCat['groupid'])));
-        $categoryObj->setGroupsSubmit(explode(" ", trim($arrCat['editaccess'])));
+        $categoryObj->setGroupsRead(explode(' ', trim($arrCat['groupid'])));
+        $categoryObj->setGroupsSubmit(explode(' ', trim($arrCat['editaccess'])));
         $categoryObj->setVar('name', $arrCat['title']);
         $categoryObj->setVar('description', $arrCat['description']);
 
         // Category image
-        if (($arrCat['imgurl'] != 'blank.gif') && ($arrCat['imgurl'])) {
-            if (copy($GLOBALS['xoops']->path("modules/xfsection/images/category/" . $arrCat['imgurl']), PUBLISHER_UPLOAD_PATH . "/images/category/" . $arrCat['imgurl'])) {
+        if (($arrCat['imgurl'] !== 'blank.gif') && ($arrCat['imgurl'])) {
+            if (copy($GLOBALS['xoops']->path('modules/xfsection/images/category/' . $arrCat['imgurl']), PUBLISHER_UPLOAD_PATH . '/images/category/' . $arrCat['imgurl'])) {
                 $categoryObj->setVar('image', $arrCat['imgurl']);
             }
         }
 
         if (!$categoryObj->store(false)) {
-            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['title']) . "<br/>";
+            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['title']) . '<br/>';
             continue;
         }
 
@@ -142,11 +142,11 @@
 
         echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>";
 
-        $sql            = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix("xfs_article") . " WHERE categoryid=" . $arrCat['id'] . " ORDER BY weight";
+        $sql            = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('xfs_article') . ' WHERE categoryid=' . $arrCat['id'] . ' ORDER BY weight';
         $resultArticles = $GLOBALS['xoopsDB']->query($sql);
         while (($arrArticle = $GLOBALS['xoopsDB']->fetchArray($resultArticles)) !== false) {
             // insert article
-            $itemObj = $publisher->getHandler('item')->create();
+            $itemObj =& $publisher->getHandler('item')->create();
 
             $itemObj->setVar('categoryid', $categoryObj->categoryid());
             $itemObj->setVar('title', $arrArticle['title']);
@@ -159,7 +159,7 @@
             $itemObj->setVar('dohtml', !$arrArticle['nohtml']);
             $itemObj->setVar('dosmiley', !$arrArticle['nosmiley']);
             $itemObj->setVar('dobr', !$arrArticle['nobr']);
-            $itemObj->setGroupsRead(explode(" ", trim($arrArticle['groupid'])));
+            $itemObj->setGroupsRead(explode(' ', trim($arrArticle['groupid'])));
 
             // status
             $status = PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED;
@@ -170,29 +170,29 @@
 
             // HTML Wrap
             if ($arrArticle['htmlpage']) {
-                $pagewrap_filename = $GLOBALS['xoops']->path("modules/xfsection/html/" . $arrArticle['htmlpage']);
+                $pagewrap_filename = $GLOBALS['xoops']->path('modules/xfsection/html/' . $arrArticle['htmlpage']);
                 if (file_exists($pagewrap_filename)) {
-                    if (copy($pagewrap_filename, PUBLISHER_UPLOAD_PATH . "/content/" . $arrArticle['htmlpage'])) {
-                        $itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]");
-                        echo sprintf("&nbsp;&nbsp;&nbsp;&nbsp;" . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>";
+                    if (copy($pagewrap_filename, PUBLISHER_UPLOAD_PATH . '/content/' . $arrArticle['htmlpage'])) {
+                        $itemObj->setVar('body', '[pagewrap=' . $arrArticle['htmlpage'] . ']');
+                        echo sprintf('&nbsp;&nbsp;&nbsp;&nbsp;' . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . '<br/>';
                     }
                 }
             }
 
             if (!$itemObj->store()) {
-                echo sprintf("  " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . "<br/>";
+                echo sprintf('  ' . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . '<br/>';
                 continue;
             } else {
                 // Linkes files
 
-                $sql               = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix("xfs_files") . " WHERE articleid=" . $arrArticle['articleid'];
+                $sql               = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('xfs_files') . ' WHERE articleid=' . $arrArticle['articleid'];
                 $resultFiles       = $GLOBALS['xoopsDB']->query($sql);
                 $allowed_mimetypes = '';
                 while (($arrFile = $GLOBALS['xoopsDB']->fetchArray($resultFiles)) !== false) {
-                    $filename = $GLOBALS['xoops']->path("modules/xfsection/cache/uploaded/" . $arrFile['filerealname']);
+                    $filename = $GLOBALS['xoops']->path('modules/xfsection/cache/uploaded/' . $arrFile['filerealname']);
                     if (file_exists($filename)) {
-                        if (copy($filename, PUBLISHER_UPLOAD_PATH . "/" . $arrFile['filerealname'])) {
-                            $fileObj = $publisher->getHandler('file')->create();
+                        if (copy($filename, PUBLISHER_UPLOAD_PATH . '/' . $arrFile['filerealname'])) {
+                            $fileObj =& $publisher->getHandler('file')->create();
                             $fileObj->setVar('name', $arrFile['fileshowname']);
                             $fileObj->setVar('description', $arrFile['filedescript']);
                             $fileObj->setVar('status', PublisherConstantsInterface::PUBLISHER_STATUS_FILE_ACTIVE);
@@ -204,20 +204,20 @@
                             $fileObj->setVar('filename', $arrFile['filerealname']);
 
                             if ($fileObj->store($allowed_mimetypes, true, false)) {
-                                echo "&nbsp;&nbsp;&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname']) . "<br />";
+                                echo '&nbsp;&nbsp;&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname']) . '<br />';
                             }
                         }
                     }
                 }
 
                 $newArticleArray[$arrArticle['articleid']] = $itemObj->itemid();
-                echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
+                echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->getTitle()) . '<br />';
                 ++$cnt_imported_articles;
             }
         }
         $newCatArray[$newCat['oldid']] = $newCat;
         unset($newCat);
-        echo "<br/>";
+        echo '<br/>';
     }
     // Looping through cat to change the pid to the new pid
     foreach ($newCatArray as $oldid => $newCat) {
@@ -235,16 +235,16 @@
     unset($oldid, $newCat);
 
     // Looping through the comments to link them to the new articles and module
-    echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />";
+    echo _AM_PUBLISHER_IMPORT_COMMENTS . '<br />';
 
-    $moduleHandler = xoops_gethandler('module');
+    $moduleHandler  =& xoops_getHandler('module');
     $moduleObj      = $moduleHandler->getByDirname('xfsection');
     $news_module_id = $moduleObj->getVar('mid');
 
     $publisher_module_id = $publisher->getModule()->mid();
 
-    $commentHandler = xoops_gethandler('comment');
-    $criteria        = new CriteriaCompo();
+    $commentHandler =& xoops_getHandler('comment');
+    $criteria       = new CriteriaCompo();
     $criteria->add(new Criteria('com_modid', $news_module_id));
     $comments = $commentHandler->getObjects($criteria);
     foreach ($comments as $comment) {
@@ -252,18 +252,18 @@
         $comment->setVar('com_modid', $publisher_module_id);
         $comment->setNew();
         if (!$commentHandler->insert($comment)) {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . '<br />';
         } else {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . '<br />';
         }
 
     }
-    unset($comment);
+//    unset($comment);
 
-    echo "<br/><br/>Done.<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . "<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . "<br/>";
-    echo "<br/><a href='" . PUBLISHER_URL . "'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . "</a><br/>";
+    echo '<br/><br/>Done.<br/>';
+    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br/>';
+    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . '<br/>';
+    echo "<br/><a href='" . PUBLISHER_URL . "'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . '</a><br/>';
 
     publisherCloseCollapsableBar('xfsectionimportgo', 'xfsectionimportgoicon');
     xoops_cp_footer();
diff --git a/publisher/admin/import/xnews.php b/publisher/admin/import/xnews.php
index 7cc8cf0a..a68f17c7 100644
--- a/publisher/admin/import/xnews.php
+++ b/publisher/admin/import/xnews.php
@@ -23,57 +23,45 @@
 include_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
-$importFromModuleName = "xNews " . XoopsRequest::getString('xnews_version', '', 'POST');
+$importFromModuleName = 'xNews ' . XoopsRequest::getString('xnews_version', '', 'POST');
 
-$scriptname = "xnews.php";
+$scriptname = 'xnews.php';
 
-$op = ('go' == XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start';
+$op = ('go' === XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start';
 
-if ($op == 'start') {
+if ('start' === $op) {
     xoops_load('XoopsFormLoader');
 
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
-    publisherOpenCollapsableBar(
-        'xnewsimport',
-        'xnewsimporticon',
-        sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName),
-        _AM_PUBLISHER_IMPORT_INFO
-    );
-
-    $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("nw_topics"));
+    publisherOpenCollapsableBar('xnewsimport', 'xnewsimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
+
+    $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('nw_topics'));
     list ($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result);
 
     if ($totalCat == 0) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . "</span>";
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . '</span>';
     } else {
         include_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
-        $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("nw_stories"));
+        $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('nw_stories'));
         list ($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
 
         if ($totalArticles == 0) {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(
-                    _AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS,
-                    $importFromModuleName,
-                    $totalArticles) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . '</span>';
         } else {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(
-                    _AM_PUBLISHER_IMPORT_MODULE_FOUND,
-                    $importFromModuleName,
-                    $totalArticles,
-                    $totalCat) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . '</span>';
 
             $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
 
             //---------- mb ------------------
-            // add "publisher" category to "imagecategory" table
+            // add 'publisher' category to 'imagecategory' table
 
             //            if (!$GLOBALS['xoopsSecurity']->check()) {
             //                redirect_header('admin.php?fct=images', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
             //            }
 
-            $imageCategoryHandler =& xoops_gethandler('imagecategory');
+            $imageCategoryHandler =& xoops_getHandler('imagecategory');
             $imagecategory        =& $imageCategoryHandler->create();
             //            $imagecategory->setVar('imgcat_name', $imgcat_name);
             $imagecategory->setVar('imgcat_name', PUBLISHER_DIRNAME); //$imgcat_name);
@@ -89,50 +77,49 @@
                 $imageCategoryHandler->insert($imagecategory);
                 // exit();
             } catch (Exception $e) {
-                echo "Caught exception: : couldn't insert Image Category " . $e->getMessage() . "n";
+                echo "Caught exception: : couldn't insert Image Category " . $e->getMessage() . 'n';
             }
 
             $newid                     = $imagecategory->getVar('imgcat_id');
-            $imagecategoryperm_handler =& xoops_gethandler('groupperm');
+            $imagecategorypermHandler =& xoops_getHandler('groupperm');
             if (!isset($readgroup)) {
                 $readgroup = array();
             }
             if (!in_array(XOOPS_GROUP_ADMIN, $readgroup)) {
-                array_push($readgroup, XOOPS_GROUP_ADMIN);
+                $readgroup[] = XOOPS_GROUP_ADMIN;
             }
             foreach ($readgroup as $rgroup) {
-                $imagecategoryperm =& $imagecategoryperm_handler->create();
+                $imagecategoryperm =& $imagecategorypermHandler->create();
                 $imagecategoryperm->setVar('gperm_groupid', $rgroup);
                 $imagecategoryperm->setVar('gperm_itemid', $newid);
                 $imagecategoryperm->setVar('gperm_name', 'imgcat_read');
                 $imagecategoryperm->setVar('gperm_modid', 1);
-                $imagecategoryperm_handler->insert($imagecategoryperm);
+                $imagecategorypermHandler->insert($imagecategoryperm);
                 unset($imagecategoryperm);
             }
-            unset($rgroup);
+            //            unset($rgroup);
 
             if (!isset($writegroup)) {
                 $writegroup = array();
             }
             if (!in_array(XOOPS_GROUP_ADMIN, $writegroup)) {
-                array_push($writegroup, XOOPS_GROUP_ADMIN);
+                $writegroup[] = XOOPS_GROUP_ADMIN;
             }
             foreach ($writegroup as $wgroup) {
-                $imagecategoryperm =& $imagecategoryperm_handler->create();
+                $imagecategoryperm =& $imagecategorypermHandler->create();
                 $imagecategoryperm->setVar('gperm_groupid', $wgroup);
                 $imagecategoryperm->setVar('gperm_itemid', $newid);
                 $imagecategoryperm->setVar('gperm_name', 'imgcat_write');
                 $imagecategoryperm->setVar('gperm_modid', 1);
-                $imagecategoryperm_handler->insert($imagecategoryperm);
+                $imagecategorypermHandler->insert($imagecategoryperm);
                 unset($imagecategoryperm);
             }
-            unset($wgroup);
+            //            unset($wgroup);
 
             //---------- mb ------------------
 
             // Categories to be imported
-            $sql = "SELECT cat.topic_id, cat.topic_pid, cat.topic_title, COUNT(art.storyid) FROM " . $GLOBALS['xoopsDB']->prefix("nw_topics")
-                   . " AS cat INNER JOIN " . $GLOBALS['xoopsDB']->prefix("nw_stories") . " AS art ON cat.topic_id=art.topicid GROUP BY art.topicid";
+            $sql = 'SELECT cat.topic_id, cat.topic_pid, cat.topic_title, COUNT(art.storyid) FROM ' . $GLOBALS['xoopsDB']->prefix('nw_topics') . ' AS cat INNER JOIN ' . $GLOBALS['xoopsDB']->prefix('nw_stories') . ' AS art ON cat.topic_id=art.topicid GROUP BY art.topicid';
 
             $result           = $GLOBALS['xoopsDB']->query($sql);
             $cat_cbox_options = array();
@@ -142,14 +129,14 @@
                 $cat_cbox_options[$cid] = "$cat_title ($art_count)";
             }
 
-            $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode("<br />", $cat_cbox_options));
+            $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode('<br />', $cat_cbox_options));
             $cat_label->setDescription(_AM_PUBLISHER_IMPORT_CATEGORIES_DSC);
             $form->addElement($cat_label);
 
             // Publisher parent category
-            $mytree = new XoopsTree($GLOBALS['xoopsDB']->prefix("publisher_categories"), "categoryid", "parentid");
+            $mytree = new XoopsTree($GLOBALS['xoopsDB']->prefix('publisher_categories'), 'categoryid', 'parentid');
             ob_start();
-            $mytree->makeMySelBox("name", "weight", $preset_id = 0, $none = 1, $sel_name = "parent_category");
+            $mytree->makeMySelBox('name', 'weight', $preset_id = 0, $none = 1, $sel_name = 'parent_category');
 
             $parent_cat_sel = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY, ob_get_contents());
             $parent_cat_sel->setDescription(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY_DSC);
@@ -169,36 +156,31 @@
     xoops_cp_footer();
 }
 
-if ($op == 'go') {
+if ($op === 'go') {
     publisherCpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
-    include_once (dirname(dirname(__DIR__))) . '/include/common.php';
-    publisherOpenCollapsableBar(
-        'xnewsimportgo',
-        'xnewsimportgoicon',
-        sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName),
-        _AM_PUBLISHER_IMPORT_RESULT
-    );
-
-    $moduleHandler  = xoops_gethandler('module');
+    include_once(dirname(dirname(__DIR__))) . '/include/common.php';
+    publisherOpenCollapsableBar('xnewsimportgo', 'xnewsimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
+
+    $moduleHandler   =& xoops_getHandler('module');
     $moduleObj       = $moduleHandler->getByDirname('xnews');
     $xnews_module_id = $moduleObj->getVar('mid');
 
-    $gperm_handler = xoops_gethandler('groupperm');
+    $gpermHandler =& xoops_getHandler('groupperm');
 
     $cnt_imported_cat      = 0;
     $cnt_imported_articles = 0;
 
     $parentId = XoopsRequest::getInt('parent_category', 0, 'POST');
 
-    $sql = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix('nw_topics');
+    $sql = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('nw_topics');
 
     $resultCat = $GLOBALS['xoopsDB']->query($sql);
 
     $newCatArray     = array();
     $newArticleArray = array();
 
-    $imageCategoryHandler =& xoops_gethandler('imagecategory');
+    $imageCategoryHandler =& xoops_getHandler('imagecategory');
     //    $criteria = new criteriaCombo;
 
     //     get the total number of subcats for this category
@@ -210,17 +192,17 @@
     $imageCategoryId = $imageCategoryHandler->getObjects($criteria);
 
     //    $criteria = new CriteriaCompo();
-    //    $criteria->add(new Criteria("imagecategory", PUBLISHER_DIRNAME, "="));
+    //    $criteria->add(new Criteria('imagecategory', PUBLISHER_DIRNAME, '='));
 
     //    $newid = $imageCategoryId->getVar('imgcat_id');
     $newid = $imageCategoryId[0]->vars['imgcat_id']['value'];
     //    $newid = $imageCategoryId[0]->vars['imgcat_id'];
 
-    //    $select_form = new XoopsFormSelect("", $name_current, array(), 1);
-    //    $select_form->addOption("", _SELECT);
-    //    $select_form->addOptionArray($writer_handler->getList($criteria));
+    //    $select_form = new XoopsFormSelect('', $name_current, array(), 1);
+    //    $select_form->addOption('', _SELECT);
+    //    $select_form->addOptionArray($writerHandler->getList($criteria));
 
-    //    $sql = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix('imagecategory') . " WHERE imgcat_name=" . PUBLISHER_DIRNAME;
+    //    $sql = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('imagecategory') . ' WHERE imgcat_name=' . PUBLISHER_DIRNAME;
     //            $resultImageCategory = $GLOBALS['xoopsDB']->query($sql);
     //
     //
@@ -232,7 +214,7 @@
         $newCat['oldid']  = $arrCat['topic_id'];
         $newCat['oldpid'] = $arrCat['topic_pid'];
 
-        $categoryObj = $publisher->getHandler('category')->create();
+        $categoryObj =& $publisher->getHandler('category')->create();
 
         $categoryObj->setVar('parentid', $arrCat['topic_pid']);
         $categoryObj->setVar('image', $arrCat['topic_imgurl']);
@@ -242,20 +224,16 @@
         $categoryObj->setVar('moderator', 1);
 
         // Category image: copying to Publisher category uploads
-        if (($arrCat['topic_imgurl'] != 'blank.gif') && ($arrCat['topic_imgurl'] != '')) {
-            if (copy(
-                $GLOBALS['xoops']->path("uploads/xnews/topics/" . $arrCat['topic_imgurl']),
-                $GLOBALS['xoops']->path("uploads/" . PUBLISHER_DIRNAME . "/images/category/" . $arrCat['topic_imgurl'])
-            )
-            ) {
+        if (($arrCat['topic_imgurl'] !== 'blank.gif') && ($arrCat['topic_imgurl'] !== '')) {
+            if (copy($GLOBALS['xoops']->path('uploads/xnews/topics/' . $arrCat['topic_imgurl']), $GLOBALS['xoops']->path('uploads/' . PUBLISHER_DIRNAME . '/images/category/' . $arrCat['topic_imgurl']))) {
                 $categoryObj->setVar('image', $arrCat['topic_imgurl']);
 
                 //======== there is no need to add the category images to Image Manager, because they are handled directly from /images/category/ folder
 
                 /*
 
-                  $image_handler =& xoops_gethandler('image');
-                  $image =& $image_handler->create();
+                  $imageHandler =& xoops_getHandler('image');
+                  $image =& $imageHandler->create();
                   $image->setVar('image_name', $arrCat['topic_imgurl']);//'images/' . $uploader->getSavedFileName());
                   $image->setVar('image_nicename', substr($arrCat['topic_imgurl'],-13)); //$image_nicename);
                   $image->setVar('image_mimetype', 'image/'. substr($arrCat['topic_imgurl'],-3));//$uploader->getMediaType());
@@ -264,7 +242,7 @@
                   $image->setVar('image_display', 1); //$image_display);
                   $image->setVar('image_weight', 0);//$image_weight);
                   $image->setVar('imgcat_id', $newid );//$imgcat_id);
-                  if (!$image_handler->insert($image)) {
+                  if (!$imageHandler->insert($image)) {
                       $err[] = sprintf(_FAILSAVEIMG, $image->getVar('image_nicename'));
                   }
 
@@ -276,18 +254,18 @@
         }
 
         if (!$publisher->getHandler('category')->insert($categoryObj)) {
-            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['topic_title']) . "<br/>";
+            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['topic_title']) . '<br/>';
             continue;
         }
 
         //copy all images to Image Manager
-        $src = $GLOBALS['xoops']->path("uploads/xnews/topics/");
-        $dst = $GLOBALS['xoops']->path("uploads");
+        $src = $GLOBALS['xoops']->path('uploads/xnews/topics/');
+        $dst = $GLOBALS['xoops']->path('uploads');
         PublisherUtilities::recurseCopy($src, $dst);
 
         //populate the Image Manager with images from xNews articles (by Bleekk)
 
-        $sql = "INSERT INTO " . $GLOBALS['xoopsDB']->prefix("image") . "(`image_name`, `image_nicename`, `image_mimetype`, `image_display`, `image_weight`, `imgcat_id`)
+        $sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('image') . "(`image_name`, `image_nicename`, `image_mimetype`, `image_display`, `image_weight`, `imgcat_id`)
        SELECT
        s.picture,
        RIGHT(s.picture,13) AS nicename,
@@ -295,7 +273,7 @@
        1 AS image_display,
        0 AS image_weight,
        c.imgcat_id
-       FROM " . $GLOBALS['xoopsDB']->prefix("nw_stories") . " s, " . $GLOBALS['xoopsDB']->prefix("imagecategory") . " c
+       FROM " . $GLOBALS['xoopsDB']->prefix('nw_stories') . ' s, ' . $GLOBALS['xoopsDB']->prefix('imagecategory') . " c
        WHERE s.picture <> ''
        AND c.imgcat_name = '" . PUBLISHER_DIRNAME . "'";
 
@@ -304,13 +282,13 @@
         $newCat['newid'] = $categoryObj->categoryid();
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br/>";
+        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . '<br/>';
 
-        $sql            = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix('nw_stories') . " WHERE topicid=" . $arrCat['topic_id'];
+        $sql            = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('nw_stories') . ' WHERE topicid=' . $arrCat['topic_id'];
         $resultArticles = $GLOBALS['xoopsDB']->query($sql);
         while (($arrArticle = $GLOBALS['xoopsDB']->fetchArray($resultArticles)) !== false) {
             // insert article
-            $itemObj = $publisher->getHandler('item')->create();
+            $itemObj =& $publisher->getHandler('item')->create();
 
             $itemObj->setVar('categoryid', $categoryObj->categoryid());
             $itemObj->setVar('title', $arrArticle['title']);
@@ -329,10 +307,10 @@
             $itemObj->setVar('notifypub', $arrArticle['notifypub']);
             //-------- image
 
-            $img_handler =& xoops_gethandler('image');
+            $imgHandler =& xoops_getHandler('image');
 
             $criteria   = new Criteria('image_name', $arrArticle['picture']);
-            $imageId    = $img_handler->getObjects($criteria);
+            $imageId    = $imgHandler->getObjects($criteria);
             $newImageId = $imageId[0]->vars['image_id']['value'];
             $itemObj->setVar('image', $newImageId);
             $itemObj->setVar('images', $newImageId);
@@ -348,30 +326,30 @@
             /*
              // HTML Wrap
              if ($arrArticle['htmlpage']) {
-             $pagewrap_filename	= $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']);
+             $pagewrap_filename = $GLOBALS['xoops']->path('modules/wfsection/html/' .$arrArticle['htmlpage']);
              if (file_exists($pagewrap_filename)) {
-             if (copy($pagewrap_filename, $GLOBALS['xoops']->path("uploads/publisher/content/" . $arrArticle['htmlpage']))) {
-             $itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]");
-             echo sprintf("&nbsp;&nbsp;&nbsp;&nbsp;" . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>";
+             if (copy($pagewrap_filename, $GLOBALS['xoops']->path('uploads/publisher/content/' . $arrArticle['htmlpage']))) {
+             $itemObj->setVar('body', '[pagewrap=' . $arrArticle['htmlpage'] . ']');
+             echo sprintf('&nbsp;&nbsp;&nbsp;&nbsp;' . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . '<br/>';
              }
              }
              }
              */
 
             if (!$itemObj->store()) {
-                echo sprintf("  " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['storyid'] . ' ' . $arrArticle['title']) . "<br/>";
+                echo sprintf('  ' . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['storyid'] . ' ' . $arrArticle['title']) . '<br/>';
                 continue;
             } else {
                 //--------------------------------------------
                 // Linkes files
-                $sql               = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix("nw_stories_files") . " WHERE storyid=" . $arrArticle['storyid'];
+                $sql               = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('nw_stories_files') . ' WHERE storyid=' . $arrArticle['storyid'];
                 $resultFiles       = $GLOBALS['xoopsDB']->query($sql);
                 $allowed_mimetypes = '';
                 while (($arrFile = $GLOBALS['xoopsDB']->fetchArray($resultFiles)) !== false) {
-                    $filename = $GLOBALS['xoops']->path("uploads/xnews/attached/" . $arrFile['downloadname']);
+                    $filename = $GLOBALS['xoops']->path('uploads/xnews/attached/' . $arrFile['downloadname']);
                     if (file_exists($filename)) {
-                        if (copy($filename, $GLOBALS['xoops']->path("uploads/publisher/" . $arrFile['filerealname']))) {
-                            $fileObj = $publisher->getHandler('file')->create();
+                        if (copy($filename, $GLOBALS['xoops']->path('uploads/publisher/' . $arrFile['filerealname']))) {
+                            $fileObj =& $publisher->getHandler('file')->create();
                             $fileObj->setVar('name', $arrFile['filerealname']);
                             $fileObj->setVar('description', $arrFile['filerealname']);
                             $fileObj->setVar('status', PublisherConstantsInterface::PUBLISHER_STATUS_FILE_ACTIVE);
@@ -384,7 +362,7 @@
                             $fileObj->setVar('short_url', $arrFile['filerealname']);
 
                             if ($fileObj->store($allowed_mimetypes, true, false)) {
-                                echo "&nbsp;&nbsp;&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname']) . "<br />";
+                                echo '&nbsp;&nbsp;&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname']) . '<br />';
                             }
                         }
                     }
@@ -393,23 +371,23 @@
                 //------------------------
 
                 $newArticleArray[$arrArticle['storyid']] = $itemObj->itemid();
-                echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
+                echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->getTitle()) . '<br />';
                 ++$cnt_imported_articles;
             }
         }
 
         // Saving category permissions
-        $groupsIds = $gperm_handler->getGroupIds('nw_view', $arrCat['topic_id'], $xnews_module_id);
+        $groupsIds = $gpermHandler->getGroupIds('nw_view', $arrCat['topic_id'], $xnews_module_id);
         publisherSaveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'category_read');
-        $groupsIds = $gperm_handler->getGroupIds('nw_submit', $arrCat['topic_id'], $xnews_module_id);
+        $groupsIds = $gpermHandler->getGroupIds('nw_submit', $arrCat['topic_id'], $xnews_module_id);
         publisherSaveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'item_submit');
 
-        $groupsIds = $gperm_handler->getGroupIds('nw_approve', $arrCat['topic_id'], $xnews_module_id);
+        $groupsIds = $gpermHandler->getGroupIds('nw_approve', $arrCat['topic_id'], $xnews_module_id);
         publisherSaveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'category_moderation');
 
         $newCatArray[$newCat['oldid']] = $newCat;
         unset($newCat);
-        echo "<br/>";
+        echo '<br/>';
     }
 
     // Looping through category to change the parentID to the new parentID
@@ -428,12 +406,12 @@
     unset($oldid, $newCat);
 
     // Looping through the comments to link them to the new articles and module
-    echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />";
+    echo _AM_PUBLISHER_IMPORT_COMMENTS . '<br />';
 
     $publisher_module_id = $publisher->getModule()->mid();
 
-    $commentHandler = xoops_gethandler('comment');
-    $criteria        = new CriteriaCompo();
+    $commentHandler =& xoops_getHandler('comment');
+    $criteria       = new CriteriaCompo();
     $criteria->add(new Criteria('com_modid', $xnews_module_id));
     $comments = $commentHandler->getObjects($criteria);
     foreach ($comments as $comment) {
@@ -441,18 +419,18 @@
         $comment->setVar('com_modid', $publisher_module_id);
         $comment->setNew();
         if (!$commentHandler->insert($comment)) {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . '<br />';
         } else {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
+            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . '<br />';
         }
 
     }
-    unset($comment);
+    //    unset($comment);
 
-    echo "<br/><br/>Done.<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . "<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . "<br/>";
-    echo "<br/><a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . "</a><br/>";
+    echo '<br/><br/>Done.<br/>';
+    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br/>';
+    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . '<br/>';
+    echo "<br/><a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . '</a><br/>';
 
     publisherCloseCollapsableBar('xnewsimportgo', 'xnewsimportgoicon');
     xoops_cp_footer();
diff --git a/publisher/admin/item.php b/publisher/admin/item.php
index 760dd8ea..ee05286b 100644
--- a/publisher/admin/item.php
+++ b/publisher/admin/item.php
@@ -22,16 +22,17 @@
 
 include_once __DIR__ . '/admin_header.php';
 
-$itemid = XoopsRequest::getInt('itemid', (XoopsRequest::getInt('itemid', 0, 'POST')), 'GET') ;
+$itemid = XoopsRequest::getInt('itemid', (XoopsRequest::getInt('itemid', 0, 'POST')), 'GET');
 $op     = ($itemid > 0 || (XoopsRequest::getString('editor', '', 'POST'))) ? 'mod' : '';
 $op     = XoopsRequest::getString('op', $op, 'GET');
 
 //if (!empty(XoopsRequest::getString('additem', '', 'POST'))) {
-//    $op = 'additem';
+//    $op0 = 'additem';
 //} elseif (!empty(XoopsRequest::getString('del', '', 'POST'))) {
-//    $op = 'del';
+//    $op0 = 'del';
 //}
 
+
 $op = (XoopsRequest::getString('additem', '', 'POST')) ? 'additem' : ((XoopsRequest::getString('del', '', 'POST')) ? 'del' : $op);
 
 // Where shall we start ?
@@ -41,24 +42,24 @@
 $rejectedstartitem  = XoopsRequest::getInt('rejectedstartitem', (XoopsRequest::getInt('submittedstartitem', 0, 'GET')), 'POST');
 
 switch ($op) {
-    case "clone":
+    case 'clone':
         if ($itemid == 0) {
-            $totalcategories = $publisher->getHandler('category')->getCategoriesCount(-1);
+            $totalcategories =& $publisher->getHandler('category')->getCategoriesCount(-1);
             if ($totalcategories == 0) {
-                redirect_header("category.php?op=mod", 3, _AM_PUBLISHER_NEED_CATEGORY_ITEM);
-//                exit();
+                redirect_header('category.php?op=mod', 3, _AM_PUBLISHER_NEED_CATEGORY_ITEM);
+                //                exit();
             }
         }
         publisherCpHeader();
         publisher_editItem(true, $itemid, true);
         break;
 
-    case "mod":
+    case 'mod':
         if ($itemid == 0) {
-            $totalcategories = $publisher->getHandler('category')->getCategoriesCount(-1);
+            $totalcategories =& $publisher->getHandler('category')->getCategoriesCount(-1);
             if ($totalcategories == 0) {
-                redirect_header("category.php?op=mod", 3, _AM_PUBLISHER_NEED_CATEGORY_ITEM);
-//                exit();
+                redirect_header('category.php?op=mod', 3, _AM_PUBLISHER_NEED_CATEGORY_ITEM);
+                //                exit();
             }
         }
 
@@ -66,21 +67,21 @@
         publisher_editItem(true, $itemid);
         break;
 
-    case "additem":
-        $redirect_msg = '';
+    case 'additem':
+        $redirect_msg = $error_msg = '';
         // Creating the item object
         if ($itemid != 0) {
-            $itemObj = $publisher->getHandler('item')->get($itemid);
+            $itemObj =& $publisher->getHandler('item')->get($itemid);
         } else {
-            $itemObj = $publisher->getHandler('item')->create();
+            $itemObj =& $publisher->getHandler('item')->create();
         }
 
         $itemObj->setVarsFromRequest();
 
         $old_status = $itemObj->status();
-        $new_status = XoopsRequest::getInt('status', PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED); //_PUBLISHER_STATUS_NOTSET;
+        $newStatus = XoopsRequest::getInt('status', PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED); //_PUBLISHER_STATUS_NOTSET;
 
-        switch ($new_status) {
+        switch ($newStatus) {
             case PublisherConstantsInterface::PUBLISHER_STATUS_SUBMITTED:
                 if (($old_status == PublisherConstantsInterface::PUBLISHER_STATUS_NOTSET)) {
                     $error_msg = _AM_PUBLISHER_ITEMNOTUPDATED;
@@ -93,7 +94,7 @@
             case PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED:
                 if (($old_status == PublisherConstantsInterface::PUBLISHER_STATUS_NOTSET) || ($old_status == PublisherConstantsInterface::PUBLISHER_STATUS_SUBMITTED)) {
                     $redirect_msg = _AM_PUBLISHER_SUBMITTED_APPROVE_SUCCESS;
-                    $notifToDo    = array(PublisherConstantsInterface::PUBLISHER_NOT_ITEM_PUBLISHED);
+                    $notifToDo    = array(PublisherConstantsInterface::PUBLISHER_NOTIFY_ITEM_PUBLISHED);
                 } else {
                     $redirect_msg = _AM_PUBLISHER_PUBLISHED_MOD_SUCCESS;
                 }
@@ -118,20 +119,20 @@
                 $redirect_msg = _AM_PUBLISHER_ITEM_REJECTED;
                 break;
         }
-        $itemObj->setVar('status', $new_status);
+        $itemObj->setVar('status', $newStatus);
 
         // Storing the item
         if (!$itemObj->store()) {
-            redirect_header("javascript:history.go(-1)", 3, $error_msg . publisherFormatErrors($itemObj->getErrors()));
-//            exit;
+            redirect_header('javascript:history.go(-1)', 3, $error_msg . publisherFormatErrors($itemObj->getErrors()));
+            //            exit;
         }
 
         // attach file if any
-        if (($item_upload_file = XoopsRequest::getArray('item_upload_file', '', 'FILES')) && $item_upload_file['name'] !== "") {
+        if (($item_upload_file = XoopsRequest::getArray('item_upload_file', '', 'FILES')) && $item_upload_file['name'] !== '') {
             $file_upload_result = publisherUploadFile(false, false, $itemObj);
             if ($file_upload_result !== true) {
-                redirect_header("javascript:history.go(-1)", 3, $file_upload_result);
-//                exit;
+                redirect_header('javascript:history.go(-1)', 3, $file_upload_result);
+                //                exit;
             }
         }
 
@@ -140,30 +141,30 @@
             $itemObj->sendNotifications($notifToDo);
         }
 
-        redirect_header("item.php", 2, $redirect_msg);
+        redirect_header('item.php', 2, $redirect_msg);
 
         break;
 
-    case "del":
-        $itemObj = $publisher->getHandler('item')->get($itemid);
+    case 'del':
+        $itemObj =& $publisher->getHandler('item')->get($itemid);
         $confirm = XoopsRequest::getInt('confirm', '', 'POST');
 
         if ($confirm) {
             if (!$publisher->getHandler('item')->delete($itemObj)) {
-                redirect_header("item.php", 2, _AM_PUBLISHER_ITEM_DELETE_ERROR . publisherFormatErrors($itemObj->getErrors()));
-//                exit();
+                redirect_header('item.php', 2, _AM_PUBLISHER_ITEM_DELETE_ERROR . publisherFormatErrors($itemObj->getErrors()));
+                //                exit();
             }
-            redirect_header("item.php", 2, sprintf(_AM_PUBLISHER_ITEMISDELETED, $itemObj->title()));
-//            exit();
+            redirect_header('item.php', 2, sprintf(_AM_PUBLISHER_ITEMISDELETED, $itemObj->getTitle()));
+            //            exit();
         } else {
             xoops_cp_header();
-            xoops_confirm(array('op' => 'del', 'itemid' => $itemObj->itemid(), 'confirm' => 1, 'name' => $itemObj->title()), 'item.php', _AM_PUBLISHER_DELETETHISITEM . " <br />'" . $itemObj->title() . "'. <br /> <br />", _AM_PUBLISHER_DELETE);
+            xoops_confirm(array('op' => 'del', 'itemid' => $itemObj->itemid(), 'confirm' => 1, 'name' => $itemObj->getTitle()), 'item.php', _AM_PUBLISHER_DELETETHISITEM . " <br />'" . $itemObj->getTitle() . "'. <br /> <br />", _AM_PUBLISHER_DELETE);
             xoops_cp_footer();
         }
         exit();
         break;
 
-    case "default":
+    case 'default':
     default:
         publisherCpHeader();
         //publisher_adminMenu(2, _AM_PUBLISHER_ITEMS);
@@ -172,7 +173,7 @@
         echo "<br />\n";
         echo "<form><div style=\"margin-bottom: 12px;\">";
         echo "<input type='button' name='button' onclick=\"location='item.php?op=mod'\" value='" . _AM_PUBLISHER_CREATEITEM . "'>&nbsp;&nbsp;";
-        echo "</div></form>";
+        echo '</div></form>';
 
         $orderBy   = 'datesub';
         $ascOrDesc = 'DESC';
@@ -181,42 +182,42 @@
         publisherOpenCollapsableBar('submiteditemstable', 'submiteditemsicon', _AM_PUBLISHER_SUBMISSIONSMNGMT, _AM_PUBLISHER_SUBMITTED_EXP);
 
         // Get the total number of submitted ITEM
-        $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_SUBMITTED));
+        $totalitems =& $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_SUBMITTED));
 
-        $itemsObj = $publisher->getHandler('item')->getAllSubmitted($publisher->getConfig('idxcat_perpage'), $submittedstartitem, -1, $orderBy, $ascOrDesc);
+        $itemsObj =& $publisher->getHandler('item')->getAllSubmitted($publisher->getConfig('idxcat_perpage'), $submittedstartitem, -1, $orderBy, $ascOrDesc);
 
         $totalItemsOnPage = count($itemsObj);
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
-        echo "<tr>";
-        echo "<th width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . "</strong></td>";
-        echo "<th width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . "</strong></td>";
-        echo "<th class='bg3' align='left'><strong>" . _AM_PUBLISHER_TITLE . "</strong></td>";
-        echo "<th width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . "</strong></td>";
-        echo "<th width='80' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
-        echo "</tr>";
+        echo '<tr>';
+        echo "<th width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . '</strong></td>';
+        echo "<th width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . '</strong></td>';
+        echo "<th class='bg3' align='left'><strong>" . _AM_PUBLISHER_TITLE . '</strong></td>';
+        echo "<th width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . '</strong></td>';
+        echo "<th width='80' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+        echo '</tr>';
         if ($totalitems > 0) {
             for ($i = 0; $i < $totalItemsOnPage; ++$i) {
-                $categoryObj = $itemsObj[$i]->category();
+                $categoryObj = $itemsObj[$i]->getCategory();
 
                 $approve = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/approve.gif' title='" . _AM_PUBLISHER_SUBMISSION_MODERATE . "' alt='" . _AM_PUBLISHER_SUBMISSION_MODERATE . "' /></a>&nbsp;";
                 $clone   = '';
                 $delete  = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>";
-                $modify  = "";
+                $modify  = '';
 
-                echo "<tr>";
-                echo "<td class='head' align='center'>" . $itemsObj[$i]->itemid() . "</td>";
-                echo "<td class='even' align='left'>" . $categoryObj->getCategoryLink() . "</td>";
-                echo "<td class='even' align='left'><a href='" . PUBLISHER_URL . "/item.php?itemid=" . $itemsObj[$i]->itemid() . "'>" . $itemsObj[$i]->title() . "</a></td>";
-                echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub() . "</td>";
+                echo '<tr>';
+                echo "<td class='head' align='center'>" . $itemsObj[$i]->itemid() . '</td>';
+                echo "<td class='even' align='left'>" . $categoryObj->getCategoryLink() . '</td>';
+                echo "<td class='even' align='left'><a href='" . PUBLISHER_URL . '/item.php?itemid=' . $itemsObj[$i]->itemid() . "'>" . $itemsObj[$i]->getTitle() . '</a></td>';
+                echo "<td class='even' align='center'>" . $itemsObj[$i]->getDatesub() . '</td>';
                 echo "<td class='even' align='center'> $approve $clone $modify $delete </td>";
-                echo "</tr>";
+                echo '</tr>';
             }
         } else {
             $itemid = 0;
-            echo "<tr>";
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS_SUBMITTED . "</td>";
-            echo "</tr>";
+            echo '<tr>';
+            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS_SUBMITTED . '</td>';
+            echo '</tr>';
         }
         echo "</table>\n";
         echo "<br />\n";
@@ -230,43 +231,43 @@
         publisherOpenCollapsableBar('item_publisheditemstable', 'item_publisheditemsicon', _AM_PUBLISHER_PUBLISHEDITEMS, _AM_PUBLISHER_PUBLISHED_DSC);
 
         // Get the total number of published ITEM
-        $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED));
+        $totalitems =& $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED));
 
-        $itemsObj = $publisher->getHandler('item')->getAllPublished($publisher->getConfig('idxcat_perpage'), $publishedstartitem, -1, $orderBy, $ascOrDesc);
+        $itemsObj =& $publisher->getHandler('item')->getAllPublished($publisher->getConfig('idxcat_perpage'), $publishedstartitem, -1, $orderBy, $ascOrDesc);
 
         $totalItemsOnPage = count($itemsObj);
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
-        echo "<tr>";
-        echo "<th width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . "</strong></td>";
-        echo "<th width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . "</strong></td>";
-        echo "<th class='bg3' align='left'><strong>" . _AM_PUBLISHER_TITLE . "</strong></td>";
-        echo "<th width='30' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEM_VIEWS . "</strong></td>";
-        echo "<th width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . "</strong></td>";
-        echo "<th width='80' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
-        echo "</tr>";
+        echo '<tr>';
+        echo "<th width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . '</strong></td>';
+        echo "<th width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . '</strong></td>';
+        echo "<th class='bg3' align='left'><strong>" . _AM_PUBLISHER_TITLE . '</strong></td>';
+        echo "<th width='30' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEM_VIEWS . '</strong></td>';
+        echo "<th width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . '</strong></td>';
+        echo "<th width='80' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+        echo '</tr>';
         if ($totalitems > 0) {
             for ($i = 0; $i < $totalItemsOnPage; ++$i) {
-                $categoryObj = $itemsObj[$i]->category();
+                $categoryObj = $itemsObj[$i]->getCategory();
 
                 $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "' /></a>";
                 $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'/></a>";
                 $clone  = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a>";
 
-                echo "<tr>";
-                echo "<td class='head' align='center'>" . $itemsObj[$i]->itemid() . "</td>";
-                echo "<td class='even' align='left'>" . $categoryObj->getCategoryLink() . "</td>";
-                echo "<td class='even' align='left'>" . $itemsObj[$i]->getItemLink() . "</td>";
-                echo "<td class='even' align='center'>" . $itemsObj[$i]->counter() . "</td>";
-                echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub() . "</td>";
+                echo '<tr>';
+                echo "<td class='head' align='center'>" . $itemsObj[$i]->itemid() . '</td>';
+                echo "<td class='even' align='left'>" . $categoryObj->getCategoryLink() . '</td>';
+                echo "<td class='even' align='left'>" . $itemsObj[$i]->getItemLink() . '</td>';
+                echo "<td class='even' align='center'>" . $itemsObj[$i]->counter() . '</td>';
+                echo "<td class='even' align='center'>" . $itemsObj[$i]->getDatesub() . '</td>';
                 echo "<td class='even' align='center'> $clone $modify $delete </td>";
-                echo "</tr>";
+                echo '</tr>';
             }
         } else {
             $itemid = 0;
-            echo "<tr>";
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS . "</td>";
-            echo "</tr>";
+            echo '<tr>';
+            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS . '</td>';
+            echo '</tr>';
         }
         echo "</table>\n";
         echo "<br />\n";
@@ -277,45 +278,45 @@
         publisherCloseCollapsableBar('item_publisheditemstable', 'item_publisheditemsicon');
 
         // Display Offline articles
-        publisherOpenCollapsableBar('offlineitemstable', 'offlineitemsicon', _AM_PUBLISHER_ITEMS . " " . _CO_PUBLISHER_OFFLINE, _AM_PUBLISHER_OFFLINE_EXP);
+        publisherOpenCollapsableBar('offlineitemstable', 'offlineitemsicon', _AM_PUBLISHER_ITEMS . ' ' . _CO_PUBLISHER_OFFLINE, _AM_PUBLISHER_OFFLINE_EXP);
 
-        $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE));
+        $totalitems =& $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE));
 
-        $itemsObj = $publisher->getHandler('item')->getAllOffline($publisher->getConfig('idxcat_perpage'), $offlinestartitem, -1, $orderBy, $ascOrDesc);
+        $itemsObj =& $publisher->getHandler('item')->getAllOffline($publisher->getConfig('idxcat_perpage'), $offlinestartitem, -1, $orderBy, $ascOrDesc);
 
         $totalItemsOnPage = count($itemsObj);
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
-        echo "<tr>";
-        echo "<th width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . "</strong></td>";
-        echo "<th width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . "</strong></td>";
-        echo "<th class='bg3' align='left'><strong>" . _AM_PUBLISHER_TITLE . "</strong></td>";
-        echo "<th width='30' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEM_VIEWS . "</strong></td>";
-        echo "<th width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . "</strong></td>";
-        echo "<th width='80' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
-        echo "</tr>";
+        echo '<tr>';
+        echo "<th width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . '</strong></td>';
+        echo "<th width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . '</strong></td>';
+        echo "<th class='bg3' align='left'><strong>" . _AM_PUBLISHER_TITLE . '</strong></td>';
+        echo "<th width='30' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEM_VIEWS . '</strong></td>';
+        echo "<th width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . '</strong></td>';
+        echo "<th width='80' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+        echo '</tr>';
         if ($totalitems > 0) {
             for ($i = 0; $i < $totalItemsOnPage; ++$i) {
-                $categoryObj = $itemsObj[$i]->category();
+                $categoryObj = $itemsObj[$i]->getCategory();
 
                 $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "' /></a>";
                 $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'/></a>";
                 $clone  = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a>";
 
-                echo "<tr>";
-                echo "<td class='head' align='center'>" . $itemsObj[$i]->itemid() . "</td>";
-                echo "<td class='even' align='left'>" . $categoryObj->getCategoryLink() . "</td>";
-                echo "<td class='even' align='left'>" . $itemsObj[$i]->getItemLink() . "</td>";
-                echo "<td class='even' align='center'>" . $itemsObj[$i]->counter() . "</td>";
-                echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub() . "</td>";
+                echo '<tr>';
+                echo "<td class='head' align='center'>" . $itemsObj[$i]->itemid() . '</td>';
+                echo "<td class='even' align='left'>" . $categoryObj->getCategoryLink() . '</td>';
+                echo "<td class='even' align='left'>" . $itemsObj[$i]->getItemLink() . '</td>';
+                echo "<td class='even' align='center'>" . $itemsObj[$i]->counter() . '</td>';
+                echo "<td class='even' align='center'>" . $itemsObj[$i]->getDatesub() . '</td>';
                 echo "<td class='even' align='center'> $clone $modify $delete </td>";
-                echo "</tr>";
+                echo '</tr>';
             }
         } else {
             $itemid = 0;
-            echo "<tr>";
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS_OFFLINE . "</td>";
-            echo "</tr>";
+            echo '<tr>';
+            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS_OFFLINE . '</td>';
+            echo '</tr>';
         }
         echo "</table>\n";
         echo "<br />\n";
@@ -329,41 +330,41 @@
         publisherOpenCollapsableBar('Rejecteditemstable', 'rejecteditemsicon', _AM_PUBLISHER_REJECTED_ITEM, _AM_PUBLISHER_REJECTED_ITEM_EXP, _AM_PUBLISHER_SUBMITTED_EXP);
 
         // Get the total number of Rejected ITEM
-        $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_REJECTED));
-        $itemsObj = $publisher->getHandler('item')->getAllRejected($publisher->getConfig('idxcat_perpage'), $rejectedstartitem, -1, $orderBy, $ascOrDesc);
+        $totalitems =& $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_REJECTED));
+        $itemsObj   =& $publisher->getHandler('item')->getAllRejected($publisher->getConfig('idxcat_perpage'), $rejectedstartitem, -1, $orderBy, $ascOrDesc);
 
         $totalItemsOnPage = count($itemsObj);
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
-        echo "<tr>";
-        echo "<th width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . "</strong></td>";
-        echo "<th width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . "</strong></td>";
-        echo "<th class='bg3' align='left'><strong>" . _AM_PUBLISHER_TITLE . "</strong></td>";
-        echo "<th width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . "</strong></td>";
-        echo "<th width='80' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
-        echo "</tr>";
-
-    if ($totalitems > 0) {
+        echo '<tr>';
+        echo "<th width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . '</strong></td>';
+        echo "<th width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . '</strong></td>';
+        echo "<th class='bg3' align='left'><strong>" . _AM_PUBLISHER_TITLE . '</strong></td>';
+        echo "<th width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . '</strong></td>';
+        echo "<th width='80' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+        echo '</tr>';
+
+        if ($totalitems > 0) {
             for ($i = 0; $i < $totalItemsOnPage; ++$i) {
-                $categoryObj = $itemsObj[$i]->category();
+                $categoryObj = $itemsObj[$i]->getCategory();
 
                 $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "' /></a>";
                 $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'/></a>";
                 $clone  = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a>";
 
-                echo "<tr>";
-                echo "<td class='head' align='center'>" . $itemsObj[$i]->itemid() . "</td>";
-                echo "<td class='even' align='left'>" . $categoryObj->getCategoryLink() . "</td>";
-                echo "<td class='even' align='left'>" . $itemsObj[$i]->getItemLink() . "</td>";
-                echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub() . "</td>";
+                echo '<tr>';
+                echo "<td class='head' align='center'>" . $itemsObj[$i]->itemid() . '</td>';
+                echo "<td class='even' align='left'>" . $categoryObj->getCategoryLink() . '</td>';
+                echo "<td class='even' align='left'>" . $itemsObj[$i]->getItemLink() . '</td>';
+                echo "<td class='even' align='center'>" . $itemsObj[$i]->getDatesub() . '</td>';
                 echo "<td class='even' align='center'> $clone $modify $delete </td>";
-                echo "</tr>";
+                echo '</tr>';
             }
         } else {
             $itemid = 0;
-            echo "<tr>";
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS_REJECTED . "</td>";
-            echo "</tr>";
+            echo '<tr>';
+            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS_REJECTED . '</td>';
+            echo '</tr>';
         }
         echo "</table>\n";
         echo "<br />\n";
@@ -378,13 +379,13 @@
 
 /**
  * @param bool $showmenu
- * @param int $itemid
+ * @param int  $itemid
  * @param bool $clone
  */
 function publisher_editItem($showmenu = false, $itemid = 0, $clone = false)
 {
-    $publisher = PublisherPublisher::getInstance();
-    global $publisher_current_page;
+    $publisher =& PublisherPublisher::getInstance();
+    global $publisherCurrentPage;
 
     xoops_load('XoopsFormLoader');
 
@@ -394,13 +395,12 @@ function publisher_editItem($showmenu = false, $itemid = 0, $clone = false)
     // if there is a parameter, and the id exists, retrieve data: we're editing a item
 
     if ($itemid != 0) {
-
         // Creating the ITEM object
-        $itemObj = $publisher->getHandler('item')->get($itemid);
+        $itemObj =& $publisher->getHandler('item')->get($itemid);
 
         if (!$itemObj) {
-            redirect_header("item.php", 1, _AM_PUBLISHER_NOITEMSELECTED);
-//            exit();
+            redirect_header('item.php', 1, _AM_PUBLISHER_NOITEMSELECTED);
+            //            exit();
         }
 
         if ($clone) {
@@ -411,92 +411,91 @@ function publisher_editItem($showmenu = false, $itemid = 0, $clone = false)
         }
 
         switch ($itemObj->status()) {
-
             case PublisherConstantsInterface::PUBLISHER_STATUS_SUBMITTED:
-                $breadcrumb_action1 = _CO_PUBLISHER_SUBMITTED;
-                $breadcrumb_action2 = _AM_PUBLISHER_APPROVING;
-                $page_title         = _AM_PUBLISHER_SUBMITTED_TITLE;
-                $page_info          = _AM_PUBLISHER_SUBMITTED_INFO;
-                $button_caption     = _AM_PUBLISHER_APPROVE;
-                $new_status         = PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED;
+                $breadcrumbAction1 = _CO_PUBLISHER_SUBMITTED;
+                $breadcrumbAction2 = _AM_PUBLISHER_APPROVING;
+                $pageTitle         = _AM_PUBLISHER_SUBMITTED_TITLE;
+                $pageInfo          = _AM_PUBLISHER_SUBMITTED_INFO;
+                $buttonCaption     = _AM_PUBLISHER_APPROVE;
+                $newStatus         = PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED;
                 break;
 
             case PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED:
-                $breadcrumb_action1 = _CO_PUBLISHER_PUBLISHED;
-                $breadcrumb_action2 = _AM_PUBLISHER_EDITING;
-                $page_title         = _AM_PUBLISHER_PUBLISHEDEDITING;
-                $page_info          = _AM_PUBLISHER_PUBLISHEDEDITING_INFO;
-                $button_caption     = _AM_PUBLISHER_MODIFY;
-                $new_status         = PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED;
+                $breadcrumbAction1 = _CO_PUBLISHER_PUBLISHED;
+                $breadcrumbAction2 = _AM_PUBLISHER_EDITING;
+                $pageTitle         = _AM_PUBLISHER_PUBLISHEDEDITING;
+                $pageInfo          = _AM_PUBLISHER_PUBLISHEDEDITING_INFO;
+                $buttonCaption     = _AM_PUBLISHER_MODIFY;
+                $newStatus         = PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED;
                 break;
 
             case PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE:
-                $breadcrumb_action1 = _CO_PUBLISHER_OFFLINE;
-                $breadcrumb_action2 = _AM_PUBLISHER_EDITING;
-                $page_title         = _AM_PUBLISHER_OFFLINEEDITING;
-                $page_info          = _AM_PUBLISHER_OFFLINEEDITING_INFO;
-                $button_caption     = _AM_PUBLISHER_MODIFY;
-                $new_status         = PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE;
+                $breadcrumbAction1 = _CO_PUBLISHER_OFFLINE;
+                $breadcrumbAction2 = _AM_PUBLISHER_EDITING;
+                $pageTitle         = _AM_PUBLISHER_OFFLINEEDITING;
+                $pageInfo          = _AM_PUBLISHER_OFFLINEEDITING_INFO;
+                $buttonCaption     = _AM_PUBLISHER_MODIFY;
+                $newStatus         = PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE;
                 break;
 
             case PublisherConstantsInterface::PUBLISHER_STATUS_REJECTED:
-                $breadcrumb_action1 = _CO_PUBLISHER_REJECTED;
-                $breadcrumb_action2 = _AM_PUBLISHER_REJECTED;
-                $page_title         = _AM_PUBLISHER_REJECTED_EDIT;
-                $page_info          = _AM_PUBLISHER_REJECTED_EDIT_INFO;
-                $button_caption     = _AM_PUBLISHER_MODIFY;
-                $new_status         = PublisherConstantsInterface::PUBLISHER_STATUS_REJECTED;
+                $breadcrumbAction1 = _CO_PUBLISHER_REJECTED;
+                $breadcrumbAction2 = _AM_PUBLISHER_REJECTED;
+                $pageTitle         = _AM_PUBLISHER_REJECTED_EDIT;
+                $pageInfo          = _AM_PUBLISHER_REJECTED_EDIT_INFO;
+                $buttonCaption     = _AM_PUBLISHER_MODIFY;
+                $newStatus         = PublisherConstantsInterface::PUBLISHER_STATUS_REJECTED;
                 break;
 
             case PublisherConstantsInterface::PUBLISHER_STATUS_NOTSET: // Then it's a clone...
-                $breadcrumb_action1 = _AM_PUBLISHER_ITEMS;
-                $breadcrumb_action2 = _AM_PUBLISHER_CLONE_NEW;
-                $button_caption     = _AM_PUBLISHER_CREATE;
-                $new_status         = PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED;
-                $page_title         = _AM_PUBLISHER_ITEM_DUPLICATING;
-                $page_info          = _AM_PUBLISHER_ITEM_DUPLICATING_DSC;
+                $breadcrumbAction1 = _AM_PUBLISHER_ITEMS;
+                $breadcrumbAction2 = _AM_PUBLISHER_CLONE_NEW;
+                $buttonCaption     = _AM_PUBLISHER_CREATE;
+                $newStatus         = PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED;
+                $pageTitle         = _AM_PUBLISHER_ITEM_DUPLICATING;
+                $pageInfo          = _AM_PUBLISHER_ITEM_DUPLICATING_DSC;
                 break;
 
-            case "default" :
-            default :
-                $breadcrumb_action1 = _AM_PUBLISHER_ITEMS;
-                $breadcrumb_action2 = _AM_PUBLISHER_EDITING;
-                $page_title         = _AM_PUBLISHER_PUBLISHEDEDITING;
-                $page_info          = _AM_PUBLISHER_PUBLISHEDEDITING_INFO;
-                $button_caption     = _AM_PUBLISHER_MODIFY;
-                $new_status         = PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED;
+            case 'default':
+            default:
+                $breadcrumbAction1 = _AM_PUBLISHER_ITEMS;
+                $breadcrumbAction2 = _AM_PUBLISHER_EDITING;
+                $pageTitle         = _AM_PUBLISHER_PUBLISHEDEDITING;
+                $pageInfo          = _AM_PUBLISHER_PUBLISHEDEDITING_INFO;
+                $buttonCaption     = _AM_PUBLISHER_MODIFY;
+                $newStatus         = PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED;
                 break;
         }
 
-        $categoryObj = $itemObj->category();
+        $categoryObj = $itemObj->getCategory();
 
         if ($showmenu) {
-            //publisher_adminMenu(2, $breadcrumb_action1 . " > " . $breadcrumb_action2);
+            //publisher_adminMenu(2, $breadcrumbAction1 . " > " . $breadcrumbAction2);
         }
 
         echo "<br />\n";
-        publisherOpenCollapsableBar('edititemtable', 'edititemicon', $page_title, $page_info);
+        publisherOpenCollapsableBar('edititemtable', 'edititemicon', $pageTitle, $pageInfo);
 
         if ($clone) {
             echo "<form><div style=\"margin-bottom: 10px;\">";
             echo "<input type='button' name='button' onclick=\"location='item.php?op=clone&itemid=" . $itemObj->itemid() . "'\" value='" . _AM_PUBLISHER_CLONE_ITEM . "'>&nbsp;&nbsp;";
-            echo "</div></form>";
+            echo '</div></form>';
         }
 
     } else {
         // there's no parameter, so we're adding an item
 
-        $itemObj = $publisher->getHandler('item')->create();
+        $itemObj =& $publisher->getHandler('item')->create();
         $itemObj->setVarsFromRequest();
 
-        $categoryObj        = $publisher->getHandler('category')->create();
-        $breadcrumb_action1 = _AM_PUBLISHER_ITEMS;
-        $breadcrumb_action2 = _AM_PUBLISHER_CREATINGNEW;
-        $button_caption     = _AM_PUBLISHER_CREATE;
-        $new_status         = PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED;
+        $categoryObj        =& $publisher->getHandler('category')->create();
+        $breadcrumbAction1 = _AM_PUBLISHER_ITEMS;
+        $breadcrumbAction2 = _AM_PUBLISHER_CREATINGNEW;
+        $buttonCaption     = _AM_PUBLISHER_CREATE;
+        $newStatus         = PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED;
 
         if ($showmenu) {
-            //publisher_adminMenu(2, $breadcrumb_action1 . " > " . $breadcrumb_action2);
+            //publisher_adminMenu(2, $breadcrumbAction1 . " > " . $breadcrumbAction2);
         }
 
         $categoryObj->setVar('categoryid', XoopsRequest::getInt('categoryid', 0, 'GET'));
@@ -505,6 +504,7 @@ function publisher_editItem($showmenu = false, $itemid = 0, $clone = false)
     }
 
     $sform = $itemObj->getForm(_AM_PUBLISHER_ITEMS);
+
     $sform->assign($formTpl);
     $formTpl->display('db:publisher_submit.tpl');
 
@@ -514,39 +514,39 @@ function publisher_editItem($showmenu = false, $itemid = 0, $clone = false)
 
     $dir = publisherGetUploadDir(true, 'content');
 
-    if (!preg_match('/777/i', decoct(fileperms($dir)))) {
-        echo "<span style='color:#ff0000;'><h4>" . _AM_PUBLISHER_PERMERROR . "</h4></span>";
+    if (false !== strpos(decoct(fileperms($dir)), '755')) {
+        echo "<span style='color:#ff0000;'><h4>" . _AM_PUBLISHER_PERMERROR . '</h4></span>';
     }
 
     // Upload File
     echo "<form name='form_name2' id='form_name2' action='pw_upload_file.php' method='post' enctype='multipart/form-data'>";
     echo "<table cellspacing='1' width='100%' class='outer'>";
-    echo "<tr><th colspan='2'>" . _AM_PUBLISHER_UPLOAD_FILE . "</th></tr>";
+    echo "<tr><th colspan='2'>" . _AM_PUBLISHER_UPLOAD_FILE . '</th></tr>';
     echo "<tr valign='top' align='left'><td class='head'>" . _AM_PUBLISHER_SEARCH_PW . "</td><td class='even'><input type='file' name='fileupload' id='fileupload' size='30' /></td></tr>";
     echo "<tr valign='top' align='left'><td class='head'><input type='hidden' name='MAX_FILE_SIZE' id='op' value='500000' /></td><td class='even'><input type='submit' name='submit' value='" . _AM_PUBLISHER_UPLOAD . "' /></td></tr>";
-    echo "<input type='hidden' name='backto' value='$publisher_current_page'/>";
-    echo "</table>";
-    echo "</form>";
+    echo "<input type='hidden' name='backto' value='$publisherCurrentPage'/>";
+    echo '</table>';
+    echo '</form>';
 
     // Delete File
-    $form = new XoopsThemeForm(_CO_PUBLISHER_DELETEFILE, "form_name", "pw_delete_file.php");
+    $form = new XoopsThemeForm(_CO_PUBLISHER_DELETEFILE, 'form_name', 'pw_delete_file.php');
 
-    $pWrap_select = new XoopsFormSelect(publisherGetUploadDir(true, 'content'), "address");
+    $pWrapSelect = new XoopsFormSelect(publisherGetUploadDir(true, 'content'), 'address');
     $folder       = dir($dir);
     while (($file = $folder->read()) !== false) {
-        if ($file != "." && $file != "..") {
-            $pWrap_select->addOption($file, $file);
+        if ($file !== '.' && $file !== '..') {
+            $pWrapSelect->addOption($file, $file);
         }
     }
     $folder->close();
-    $form->addElement($pWrap_select);
+    $form->addElement($pWrapSelect);
 
-    $delfile = "delfile";
+    $delfile = 'delfile';
     $form->addElement(new XoopsFormHidden('op', $delfile));
-    $submit = new XoopsFormButton("", "submit", _AM_PUBLISHER_BUTTON_DELETE, "submit");
+    $submit = new XoopsFormButton('', 'submit', _AM_PUBLISHER_BUTTON_DELETE, 'submit');
     $form->addElement($submit);
 
-    $form->addElement(new XoopsFormHidden('backto', $publisher_current_page));
+    $form->addElement(new XoopsFormHidden('backto', $publisherCurrentPage));
     $form->display();
 
     publisherCloseCollapsableBar('pagewraptable', 'pagewrapicon');
diff --git a/publisher/admin/main.php b/publisher/admin/main.php
index e3174bfb..029de11e 100644
--- a/publisher/admin/main.php
+++ b/publisher/admin/main.php
@@ -23,15 +23,15 @@
 include_once $GLOBALS['xoops']->path('class/xoopslists.php');
 include_once $GLOBALS['xoops']->path('class/pagenav.php');
 
-$itemid =  XoopsRequest::getInt('itemid', 0, 'POST');
+$itemid = XoopsRequest::getInt('itemid', 0, 'POST');
 
-$pick = XoopsRequest::getInt('pick', XoopsRequest::getInt('pick', 0, 'GET'), 'POST');
+$pick      = XoopsRequest::getInt('pick', XoopsRequest::getInt('pick', 0, 'GET'), 'POST');
 $statussel = XoopsRequest::getInt('statussel', XoopsRequest::getInt('statussel', 0, 'GET'), 'POST');
-$sortsel = XoopsRequest::getString('sortsel', XoopsRequest::getString('sortsel', 'itemid', 'GET'), 'POST');
-$ordersel = XoopsRequest::getString('ordersel', XoopsRequest::getString('ordersel', 'DESC', 'GET'), 'POST');
+$sortsel   = XoopsRequest::getString('sortsel', XoopsRequest::getString('sortsel', 'itemid', 'GET'), 'POST');
+$ordersel  = XoopsRequest::getString('ordersel', XoopsRequest::getString('ordersel', 'DESC', 'GET'), 'POST');
 
 $module_id     = $publisher->getModule()->mid();
-$gperm_handler = xoops_gethandler('groupperm');
+$gpermHandler =& xoops_getHandler('groupperm');
 $groups        = ($GLOBALS['xoopsUser']) ? ($GLOBALS['xoopsUser']->getGroups()) : XOOPS_GROUP_ANONYMOUS;
 
 // Code for the page
@@ -42,47 +42,42 @@
 //publisher_adminMenu(0, _AM_PUBLISHER_INDEX);
 
 // Total ITEMs -- includes everything on the table
-$totalitems = $publisher->getHandler('item')->getItemsCount();
+$totalitems =& $publisher->getHandler('item')->getItemsCount();
 
 // Total categories
-$totalcategories = $publisher->getHandler('category')->getCategoriesCount(-1);
+$totalcategories =& $publisher->getHandler('category')->getCategoriesCount(-1);
 
 // Total submitted ITEMs
-$totalsubmitted = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_SUBMITTED));
+$totalsubmitted =& $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_SUBMITTED));
 
 // Total published ITEMs
-$totalpublished = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED));
+$totalpublished =& $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED));
 
 // Total offline ITEMs
-$totaloffline = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE));
+$totaloffline =& $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE));
 
 // Total rejected
-$totalrejected = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_REJECTED));
+$totalrejected =& $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_REJECTED));
 
 // Check Path Configuration
-if ((publisherGetPathStatus('root', true) < 0) ||
-    (publisherGetPathStatus('images', true) < 0) ||
-    (publisherGetPathStatus('images/category', true) < 0) ||
-    (publisherGetPathStatus('images/item', true) < 0) ||
-    (publisherGetPathStatus('content', true) < 0)
-) {
+if ((publisherGetPathStatus('root', true) < 0) || (publisherGetPathStatus('images', true) < 0) || (publisherGetPathStatus('images/category', true) < 0) || (publisherGetPathStatus('images/item', true) < 0) || (publisherGetPathStatus('content', true) < 0)) {
     PublisherUtilities::createDir();
 }
 
 publisherOpenCollapsableBar('inventorytable', 'inventoryicon', _AM_PUBLISHER_INVENTORY);
-echo "<br />";
+echo '<br />';
 echo "<table width='100%' class='outer' cellspacing='1' cellpadding='3' border='0' ><tr>";
-echo "<td class='head'>" . _AM_PUBLISHER_TOTALCAT . "</td><td align='center' class='even'>" . $totalcategories . "</td>";
-echo "<td class='head'>" . _AM_PUBLISHER_TOTALSUBMITTED . "</td><td align='center' class='even'>" . $totalsubmitted . "</td>";
-echo "<td class='head'>" . _AM_PUBLISHER_TOTALPUBLISHED . "</td><td align='center' class='even'>" . $totalpublished . "</td>";
-echo "<td class='head'>" . _AM_PUBLISHER_TOTAL_OFFLINE . "</td><td align='center' class='even'>" . $totaloffline . "</td>";
-echo "</tr></table>";
-echo "<br />";
+echo "<td class='head'>" . _AM_PUBLISHER_TOTALCAT . "</td><td align='center' class='even'>" . $totalcategories . '</td>';
+echo "<td class='head'>" . _AM_PUBLISHER_TOTALSUBMITTED . "</td><td align='center' class='even'>" . $totalsubmitted . '</td>';
+echo "<td class='head'>" . _AM_PUBLISHER_TOTALPUBLISHED . "</td><td align='center' class='even'>" . $totalpublished . '</td>';
+echo "<td class='head'>" . _AM_PUBLISHER_TOTAL_OFFLINE . "</td><td align='center' class='even'>" . $totaloffline . '</td>';
+echo '</tr></table>';
+echo '<br />';
 
 echo "<form><div style=\"margin-bottom: 12px;\">";
 echo "<input type='button' name='button' onclick=\"location='category.php?op=mod'\" value='" . _AM_PUBLISHER_CATEGORY_CREATE . "'>&nbsp;&nbsp;";
 echo "<input type='button' name='button' onclick=\"location='item.php?op=mod'\" value='" . _AM_PUBLISHER_CREATEITEM . "'>&nbsp;&nbsp;";
-echo "</div></form>";
+echo '</div></form>';
 
 publisherCloseCollapsableBar('inventorytable', 'inventoryicon');
 
@@ -91,17 +86,22 @@
 
 $showingtxt   = '';
 $selectedtxt  = '';
-$cond         = "";
+$cond         = '';
 $selectedtxt0 = '';
 $selectedtxt1 = '';
 $selectedtxt2 = '';
 $selectedtxt3 = '';
 $selectedtxt4 = '';
 
-$sorttxttitle   = "";
-$sorttxtcreated = "";
-$sorttxtweight  = "";
-$sorttxtitemid  = "";
+$sorttxttitle   = '';
+$sorttxtcreated = '';
+$sorttxtweight  = '';
+$sorttxtitemid  = '';
+
+$sorttxthits     = '';
+$sorttxtvotes    = '';
+$sorttxtcomments = '';
+$sorttxtrating   = '';
 
 $ordertxtasc  = '';
 $ordertxtdesc = '';
@@ -119,7 +119,23 @@
         $sorttxtweight = "selected='selected'";
         break;
 
-    default :
+    case 'counter':
+        $sorttxthits = "selected='selected'";
+        break;
+
+    case 'rating':
+        $sorttxtrating = "selected='selected'";
+        break;
+
+    case 'votes':
+        $sorttxtvotes = "selected='selected'";
+        break;
+
+    case 'comments':
+        $sorttxtcomments = "selected='selected'";
+        break;
+
+    default:
         $sorttxtitemid = "selected='selected'";
         break;
 }
@@ -129,7 +145,7 @@
         $ordertxtasc = "selected='selected'";
         break;
 
-    default :
+    default:
         $ordertxtdesc = "selected='selected'";
         break;
 }
@@ -138,35 +154,35 @@
     case PublisherConstantsInterface::PUBLISHER_STATUS_ALL:
         $selectedtxt0        = "selected='selected'";
         $caption             = _AM_PUBLISHER_ALL;
-        $cond                = "";
+        $cond                = '';
         $status_explaination = _AM_PUBLISHER_ALL_EXP;
         break;
 
     case PublisherConstantsInterface::PUBLISHER_STATUS_SUBMITTED:
         $selectedtxt1        = "selected='selected'";
         $caption             = _CO_PUBLISHER_SUBMITTED;
-        $cond                = " WHERE status = " . PublisherConstantsInterface::PUBLISHER_STATUS_SUBMITTED . " ";
+        $cond                = ' WHERE status = ' . PublisherConstantsInterface::PUBLISHER_STATUS_SUBMITTED . ' ';
         $status_explaination = _AM_PUBLISHER_SUBMITTED_EXP;
         break;
 
     case PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED:
         $selectedtxt2        = "selected='selected'";
         $caption             = _CO_PUBLISHER_PUBLISHED;
-        $cond                = " WHERE status = " . PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED . " ";
+        $cond                = ' WHERE status = ' . PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED . ' ';
         $status_explaination = _AM_PUBLISHER_PUBLISHED_EXP;
         break;
 
     case PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE:
         $selectedtxt3        = "selected='selected'";
         $caption             = _CO_PUBLISHER_OFFLINE;
-        $cond                = " WHERE status = " . PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE . " ";
+        $cond                = ' WHERE status = ' . PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE . ' ';
         $status_explaination = _AM_PUBLISHER_OFFLINE_EXP;
         break;
 
     case PublisherConstantsInterface::PUBLISHER_STATUS_REJECTED:
         $selectedtxt4        = "selected='selected'";
         $caption             = _CO_PUBLISHER_REJECTED;
-        $cond                = " WHERE status = " . PublisherConstantsInterface::PUBLISHER_STATUS_REJECTED . " ";
+        $cond                = ' WHERE status = ' . PublisherConstantsInterface::PUBLISHER_STATUS_REJECTED . ' ';
         $status_explaination = _AM_PUBLISHER_REJECTED_ITEM_EXP;
         break;
 }
@@ -177,19 +193,25 @@
 echo "
     <table width='100%' cellspacing='1' cellpadding='2' border='0' style='border-left: 1px solid silver; border-top: 1px solid silver; border-right: 1px solid silver;'>
         <tr>
-            <td><span style='font-weight: bold; font-variant: small-caps;'>" . _AM_PUBLISHER_SHOWING . " " . $caption . "</span></td>
+            <td><span style='font-weight: bold; font-variant: small-caps;'>" . _AM_PUBLISHER_SHOWING . ' ' . $caption . "</span></td>
             <td align='right'>" . _AM_PUBLISHER_SELECT_SORT . "
                 <select name='sortsel' onchange='submit()'>
                     <option value='itemid' $sorttxtitemid>" . _AM_PUBLISHER_ID . "</option>
                     <option value='title' $sorttxttitle>" . _AM_PUBLISHER_TITLE . "</option>
                     <option value='datesub' $sorttxtcreated>" . _AM_PUBLISHER_CREATED . "</option>
                     <option value='weight' $sorttxtweight>" . _CO_PUBLISHER_WEIGHT . "</option>
+
+                    <option value='counter' $sorttxthits>" . _AM_PUBLISHER_HITS . "</option>
+                    <option value='rating' $sorttxtrating>" . _AM_PUBLISHER_RATE . "</option>
+                    <option value='votes' $sorttxtvotes>" . _AM_PUBLISHER_VOTES . "</option>
+                    <option value='comments' $sorttxtcomments>" . _AM_PUBLISHER_COMMENTS_COUNT . "</option>
+
                 </select>
                 <select name='ordersel' onchange='submit()'>
                     <option value='ASC' $ordertxtasc>" . _AM_PUBLISHER_ASC . "</option>
-                    <option value='DESC' $ordertxtdesc>" . _AM_PUBLISHER_DESC . "</option>
+                    <option value='DESC' $ordertxtdesc>" . _AM_PUBLISHER_DESC . '</option>
                 </select>
-            " . _AM_PUBLISHER_SELECT_STATUS . " :
+            ' . _AM_PUBLISHER_SELECT_STATUS . " :
                 <select name='statussel' onchange='submit()'>
                     <option value='0' $selectedtxt0>" . _AM_PUBLISHER_ALL . " [$totalitems]</option>
                     <option value='1' $selectedtxt1>" . _CO_PUBLISHER_SUBMITTED . " [$totalsubmitted]</option>
@@ -205,10 +227,10 @@
 // Get number of entries in the selected state
 $statusSelected = ($statussel == 0) ? -1 : $statussel;
 
-$numrows = $publisher->getHandler('item')->getItemsCount(-1, $statusSelected);
+$numrows =& $publisher->getHandler('item')->getItemsCount(-1, $statusSelected);
 
 // creating the Q&As objects
-$itemsObj = $publisher->getHandler('item')->getItems($publisher->getConfig('idxcat_perpage'), $startentry, $statusSelected, -1, $sortsel, $ordersel);
+$itemsObj =& $publisher->getHandler('item')->getItems($publisher->getConfig('idxcat_perpage'), $startentry, $statusSelected, -1, $sortsel, $ordersel);
 
 $totalItemsOnPage = count($itemsObj);
 
@@ -217,68 +239,75 @@
 if ($numrows > 0) {
     for ($i = 0; $i < $totalItemsOnPage; ++$i) {
         // Creating the category object to which this item is linked
-        $categoryObj = $itemsObj[$i]->category();
+        $categoryObj = $itemsObj[$i]->getCategory();
         $approve     = '';
-
         switch ($itemsObj[$i]->status()) {
 
             case PublisherConstantsInterface::PUBLISHER_STATUS_SUBMITTED:
                 $statustxt = _CO_PUBLISHER_SUBMITTED;
-                $approve   = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/approve.gif' title='" . _AM_PUBLISHER_SUBMISSION_MODERATE . "' alt='" . _AM_PUBLISHER_SUBMISSION_MODERATE . "' /></a>&nbsp;";
+                $approve   = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/approve.gif' title='" . _AM_PUBLISHER_SUBMISSION_MODERATE . "' alt='" . _AM_PUBLISHER_SUBMISSION_MODERATE . "' /></a>&nbsp;";
                 $clone     = '';
-                $delete    = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>";
-                $modify    = "";
+                $delete    = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>";
+                $modify    = '';
                 break;
 
             case PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED:
                 $statustxt = _CO_PUBLISHER_PUBLISHED;
-                $approve   = "";
+                $approve   = '';
 
-                $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_ITEM_EDIT . "' alt='" . _AM_PUBLISHER_ITEM_EDIT . "' /></a>&nbsp;";
-                $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>&nbsp;";
-                $clone  = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a>";
+                $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_ITEM_EDIT . "' alt='" . _AM_PUBLISHER_ITEM_EDIT . "' /></a>&nbsp;";
+                $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>&nbsp;";
+                $clone  = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a>&nbsp;";
                 break;
 
             case PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE:
                 $statustxt = _CO_PUBLISHER_OFFLINE;
-                $approve   = "";
-                $modify    = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_ITEM_EDIT . "' alt='" . _AM_PUBLISHER_ITEM_EDIT . "' /></a>&nbsp;";
-                $delete    = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>&nbsp;";
-                $clone     = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a>";
+                $approve   = '';
+                $modify    = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_ITEM_EDIT . "' alt='" . _AM_PUBLISHER_ITEM_EDIT . "' /></a>&nbsp;";
+                $delete    = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>&nbsp;";
+                $clone     = /** @lang text */
+                    "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a>&nbsp;";
                 break;
 
             case PublisherConstantsInterface::PUBLISHER_STATUS_REJECTED:
                 $statustxt = _CO_PUBLISHER_REJECTED;
-                $approve   = "";
-                $modify    = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_REJECTED_EDIT . "' alt='" . _AM_PUBLISHER_REJECTED_EDIT . "' /></a>&nbsp;";
-                $delete    = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>&nbsp;";
-                $clone     = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a>";
+                $approve   = '';
+                $modify    = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_REJECTED_EDIT . "' alt='" . _AM_PUBLISHER_REJECTED_EDIT . "' /></a>&nbsp;";
+                $delete    = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>&nbsp;";
+                $clone     = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a>&nbsp;";
                 break;
 
-            case "default":
+            case 'default':
             default:
                 $statustxt = _AM_PUBLISHER_STATUS0;
-                $approve   = "";
+                $approve   = '';
                 $clone     = '';
-                $modify    = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_REJECTED_EDIT . "' alt='" . _AM_PUBLISHER_REJECTED_EDIT . "' /></a>&nbsp;";
-                $delete    = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>";
+                $modify    = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_REJECTED_EDIT . "' alt='" . _AM_PUBLISHER_REJECTED_EDIT . "' /></a>&nbsp;";
+                $delete    = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>";
                 break;
         }
 
-        echo "<tr>";
-        echo "<td class='head' align='center'>" . $itemsObj[$i]->itemid() . "</td>";
-        echo "<td class='even' align='left'>" . $categoryObj->getCategoryLink() . "</td>";
-        echo "<td class='even' align='left'>" . $itemsObj[$i]->getItemLink() . "</td>";
-        echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub() . "</td>";
-        echo "<td class='even' align='center'>" . $statustxt . "</td>";
-        echo "<td class='even' align='center'> " . $approve . $clone . $modify . $delete . "</td>";
-        echo "</tr>";
+        echo '<tr>';
+        echo "<td class='head' align='center'>" . $itemsObj[$i]->itemid() . '</td>';
+        echo "<td class='even' align='left'>" . $categoryObj->getCategoryLink() . '</td>';
+        echo "<td class='even' align='left'>" . $itemsObj[$i]->getItemLink() . '</td>';
+        echo "<td class='even' align='center'>" . $itemsObj[$i]->getDatesub() . '</td>';
+
+        echo "<td class='even' align='center'>" . $itemsObj[$i]->weight() . '</td>';
+        echo "<td class='even' align='center'>" . $itemsObj[$i]->counter() . '</td>';
+        echo "<td class='even' align='center'>" . $itemsObj[$i]->rating() . '</td>';
+        echo "<td class='even' align='center'>" . $itemsObj[$i]->votes() . '</td>';
+        echo "<td class='even' align='center'>" . $itemsObj[$i]->comments() . '</td>';
+
+        echo "<td class='even' align='center'>" . $statustxt . '</td>';
+        echo "<td class='even' align='center'> " . $approve . $clone . $modify . $delete . '</td>';
+        echo '</tr>';
     }
 } else {
     // that is, $numrows = 0, there's no entries yet
-    echo "<tr>";
-    echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMSSEL . "</td>";
-    echo "</tr>";
+    echo '<tr>';
+    echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMSSEL . '</td>';
+    echo '</tr>';
 }
 echo "</table>\n";
 echo "<span style=\"color: #567; margin: 3px 0 18px 0; font-size: small; display: block; \">$status_explaination</span>";
diff --git a/publisher/admin/menu.php b/publisher/admin/menu.php
index 40c20347..6d41aa9a 100644
--- a/publisher/admin/menu.php
+++ b/publisher/admin/menu.php
@@ -21,75 +21,80 @@
 
 // defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
 
-$dirname        = basename(dirname(__DIR__));
-$moduleHandler = xoops_gethandler('module');
-$module         = $moduleHandler->getByDirname($dirname);
-$pathIcon32     = $module->getInfo('icons32');
+$dirname       = basename(dirname(__DIR__));
+$moduleHandler =& xoops_getHandler('module');
+$module        = $moduleHandler->getByDirname($dirname);
+$pathIcon32    = $module->getInfo('icons32');
 
 include_once dirname(__DIR__) . '/include/config.php';
 
 xoops_loadLanguage('admin', $dirname);
 
-$i = 0;
+$adminmenu = array(
+    array(
+        'title' => _MI_PUBLISHER_ADMENU0,
+        'link'  => 'admin/index.php',
+        'icon'  => '../../' . $pathIcon32 . '/home.png'),
 
-// Index
-$adminmenu[$i]['title'] = _MI_PUBLISHER_ADMENU0;
-$adminmenu[$i]['link']  = "admin/index.php";
-$adminmenu[$i]["icon"]  = '../../' . $pathIcon32 . '/home.png';
-++$i;
-
-$adminmenu[$i]['title'] = _MI_PUBLISHER_ADMENU1;
-$adminmenu[$i]['link']  = "admin/main.php";
-$adminmenu[$i]["icon"]  = '../../' . $pathIcon32 . '/manage.png';
-++$i;
+    array(
+        'title' => _MI_PUBLISHER_ADMENU1,
+        'link'  => 'admin/main.php',
+        'icon'  => '../../' . $pathIcon32 . '/manage.png'),
 
 // Category
-$adminmenu[$i]['title'] = _MI_PUBLISHER_ADMENU2;
-$adminmenu[$i]['link']  = "admin/category.php";
-$adminmenu[$i]["icon"]  = '../../' . $pathIcon32 . '/category.png';
-++$i;
+    array(
+        'title' => _MI_PUBLISHER_ADMENU2,
+        'link'  => 'admin/category.php',
+        'icon'  => '../../' . $pathIcon32 . '/category.png'),
 
 // Items
-$adminmenu[$i]['title'] = _MI_PUBLISHER_ADMENU3;
-$adminmenu[$i]['link']  = "admin/item.php";
-$adminmenu[$i]["icon"]  = '../../' . $pathIcon32 . '/content.png';
-++$i;
+array(
+    'title' => _MI_PUBLISHER_ADMENU3,
+    'link'  => 'admin/item.php',
+    'icon'  => '../../' . $pathIcon32 . '/content.png'),
 
 // Permissions
-$adminmenu[$i]['title'] = _MI_PUBLISHER_ADMENU4;
-$adminmenu[$i]['link']  = "admin/permissions.php";
-$adminmenu[$i]["icon"]  = '../../' . $pathIcon32 . '/permissions.png';
-++$i;
+    array(
+        'title' => _MI_PUBLISHER_ADMENU4,
+        'link'  => 'admin/permissions.php',
+        'icon'  => '../../' . $pathIcon32 . '/permissions.png'),
 
 // Mimetypes
-$adminmenu[$i]['title'] = _MI_PUBLISHER_ADMENU6;
-$adminmenu[$i]['link']  = "admin/mimetypes.php";
-$adminmenu[$i]["icon"]  = '../../' . $pathIcon32 . '/type.png';
-++$i;
+    array(
+        'title' => _MI_PUBLISHER_ADMENU6,
+        'link'  => 'admin/mimetypes.php',
+        'icon'  => '../../' . $pathIcon32 . '/type.png'),
 
 // Preferences
-$adminmenu[$i]['title'] = _PREFERENCES;
-$adminmenu[$i]['link']  = "admin/preferences.php";
-$adminmenu[$i]["icon"]  = '../../' . $pathIcon32 . '/administration.png';
-++$i;
+//    array(
+//        'title' => _PREFERENCES,
+//        'link'  => 'admin/preferences.php',
+//        'icon'  => '../../' . $pathIcon32 . '/administration.png'),
+
 /*
-$adminmenu[$i]['title'] = _AM_PUBLISHER_COMMENTS;
-$adminmenu[$i]['link']  = '../../modules/system/admin.php?fct=comments&amp;module=' . $module->getVar('mid');
-$adminmenu[$i]["icon"]  = './assets/images/icon32/folder_txt.png';
-++$i;
+ //Comments
+    array(
+        "title" => _AM_PUBLISHER_COMMENTS,
+        "link"  => '../../modules/system/admin.php?fct=comments&amp;module=' . $module->getVar('mid'),
+        "icon"  => './assets/images/icon32/folder_txt.png'),
 */
-$adminmenu[$i]['title'] = _AM_PUBLISHER_IMPORT;
-$adminmenu[$i]['link']  = "admin/import.php";
-$adminmenu[$i]["icon"]  = '../../' . $pathIcon32 . '/download.png';
-++$i;
-
-$adminmenu[$i]['title'] = _AM_PUBLISHER_CLONE;
-$adminmenu[$i]['link']  = "admin/clone.php";
-$adminmenu[$i]["icon"]  = './assets/images/icon32/editcopy.png';
-++$i;
-
-$adminmenu[$i]['title'] = _AM_PUBLISHER_ABOUT;
-$adminmenu[$i]['link']  = "admin/about.php";
-$adminmenu[$i]["icon"]  = '../../' . $pathIcon32 . '/about.png';
 
-$GLOBALS['xoTheme']->addStylesheet("modules/" . $dirname . "/assets/css/style.css");
+//Import
+    array(
+        'title' => _AM_PUBLISHER_IMPORT,
+        'link'  => 'admin/import.php',
+        'icon'  => '../../' . $pathIcon32 . '/download.png'),
+
+//Clone
+    array(
+        'title' => _AM_PUBLISHER_CLONE,
+        'link'  => 'admin/clone.php',
+        'icon'  => './assets/images/icon32/editcopy.png'),
+
+//About
+array(
+    'title' => _AM_PUBLISHER_ABOUT,
+    'link'  => 'admin/about.php',
+    'icon'  => '../../' . $pathIcon32 . '/about.png'));
+
+$GLOBALS['xoTheme']->addStylesheet('modules/' . $dirname . '/assets/css/style.css');
diff --git a/publisher/admin/mimetypes.php b/publisher/admin/mimetypes.php
index c0f35aff..1ce49ba1 100644
--- a/publisher/admin/mimetypes.php
+++ b/publisher/admin/mimetypes.php
@@ -35,11 +35,12 @@
 $start = XoopsRequest::getInt('start', 0, 'GET');
 $limit = XoopsRequest::getInt('limit', XoopsRequest::getInt('limit', 15, 'GET'), 'POST');
 
-$aSortBy   = array('mime_id'    => _AM_PUBLISHER_MIME_ID,
-                   'mime_name'  => _AM_PUBLISHER_MIME_NAME,
-                   'mime_ext'   => _AM_PUBLISHER_MIME_EXT,
-                   'mime_admin' => _AM_PUBLISHER_MIME_ADMIN,
-                   'mime_user'  => _AM_PUBLISHER_MIME_USER);
+$aSortBy   = array(
+    'mime_id'    => _AM_PUBLISHER_MIME_ID,
+    'mime_name'  => _AM_PUBLISHER_MIME_NAME,
+    'mime_ext'   => _AM_PUBLISHER_MIME_EXT,
+    'mime_admin' => _AM_PUBLISHER_MIME_ADMIN,
+    'mime_user'  => _AM_PUBLISHER_MIME_USER);
 $aOrderBy  = array('ASC' => _AM_PUBLISHER_TEXT_ASCENDING, 'DESC' => _AM_PUBLISHER_TEXT_DESCENDING);
 $aLimitBy  = array('10' => 10, '15' => 15, '20' => 20, '25' => 25, '50' => 50, '100' => 100);
 $aSearchBy = array('mime_id' => _AM_PUBLISHER_MIME_ID, 'mime_name' => _AM_PUBLISHER_MIME_NAME, 'mime_ext' => _AM_PUBLISHER_MIME_EXT);
@@ -49,35 +50,35 @@
 $op = XoopsRequest::getString('op', 'default', 'GET');
 
 switch ($op) {
-    case "add":
+    case 'add':
         PublisherMimetypesUtilities::add();
         break;
 
-    case "delete":
+    case 'delete':
         delete();
         break;
 
-    case "edit":
+    case 'edit':
         PublisherMimetypesUtilities::edit();
         break;
 
-    case "search":
+    case 'search':
         PublisherMimetypesUtilities::search();
         break;
 
-    case "updateMimeValue":
+    case 'updateMimeValue':
         PublisherMimetypesUtilities::updateMimeValue();
         break;
 
-    case "clearAddSession":
+    case 'clearAddSession':
         PublisherMimetypesUtilities::clearAddSession();
         break;
 
-    case "clearEditSession":
+    case 'clearEditSession':
         PublisherMimetypesUtilities::clearEditSession();
         break;
 
-    case "manage":
+    case 'manage':
     default:
         PublisherMimetypesUtilities::manage();
         break;
@@ -88,10 +89,9 @@
  */
 class PublisherMimetypesUtilities
 {
-
     public static function add()
     {
-        $publisher = PublisherPublisher::getInstance();
+        $publisher =& PublisherPublisher::getInstance();
         global $limit, $start;
         $error = array();
         if (!(XoopsRequest::getString('add_mime', '', 'POST'))) {
@@ -100,59 +100,59 @@ public static function add()
 
             publisherOpenCollapsableBar('mimemaddtable', 'mimeaddicon', _AM_PUBLISHER_MIME_ADD_TITLE);
 
-            $session     = PublisherSession::getInstance();
-            $mime_type   = $session->get('publisher_addMime');
-            $mime_errors = $session->get('publisher_addMimeErr');
+            $session     =& PublisherSession::getInstance();
+            $mimeType   = $session->get('publisher_addMime');
+            $mimeErrors = $session->get('publisher_addMimeErr');
 
             //Display any form errors
-            if (!$mime_errors === false) {
-                publisherRenderErrors($mime_errors, publisherMakeUri(PUBLISHER_ADMIN_URL . '/mimetypes.php', array('op' => 'clearAddSession')));
+            if (!$mimeErrors === false) {
+                publisherRenderErrors($mimeErrors, publisherMakeUri(PUBLISHER_ADMIN_URL . '/mimetypes.php', array('op' => 'clearAddSession')));
             }
 
-            if ($mime_type === false) {
-                $mime_ext   = '';
-                $mime_name  = '';
-                $mime_types = '';
-                $mime_admin = 1;
-                $mime_user  = 1;
+            if ($mimeType === false) {
+                $mimeExt   = '';
+                $mimeName  = '';
+                $mimeTypes = '';
+                $mimeAdmin = 1;
+                $mimeUser  = 1;
             } else {
-                $mime_ext   = $mime_type['mime_ext'];
-                $mime_name  = $mime_type['mime_name'];
-                $mime_types = $mime_type['mime_types'];
-                $mime_admin = $mime_type['mime_admin'];
-                $mime_user  = $mime_type['mime_user'];
+                $mimeExt   = $mimeType['mime_ext'];
+                $mimeName  = $mimeType['mime_name'];
+                $mimeTypes = $mimeType['mime_types'];
+                $mimeAdmin = $mimeType['mime_admin'];
+                $mimeUser  = $mimeType['mime_user'];
             }
 
             // Display add form
             echo "<form action='mimetypes.php?op=add' method='post'>";
             echo "<table width='100%' cellspacing='1' class='outer'>";
-            echo "<tr><th colspan='2'>" . _AM_PUBLISHER_MIME_CREATEF . "</th></tr>";
+            echo "<tr><th colspan='2'>" . _AM_PUBLISHER_MIME_CREATEF . '</th></tr>';
             echo "<tr valign='top'>
         <td class='head'>" . _AM_PUBLISHER_MIME_EXTF . "</td>
-        <td class='even'><input type='text' name='mime_ext' id='mime_ext' value='$mime_ext' size='5' /></td>
+        <td class='even'><input type='text' name='mime_ext' id='mime_ext' value='$mimeExt' size='5' /></td>
         </tr>";
             echo "<tr valign='top'>
         <td class='head'>" . _AM_PUBLISHER_MIME_NAMEF . "</td>
-        <td class='even'><input type='text' name='mime_name' id='mime_name' value='$mime_name' /></td>
+        <td class='even'><input type='text' name='mime_name' id='mime_name' value='$mimeName' /></td>
         </tr>";
             echo "<tr valign='top'>
         <td class='head'>" . _AM_PUBLISHER_MIME_TYPEF . "</td>
-        <td class='even'><textarea name='mime_types' id='mime_types' cols='60' rows='5'>$mime_types</textarea></td>
+        <td class='even'><textarea name='mime_types' id='mime_types' cols='60' rows='5'>$mimeTypes</textarea></td>
         </tr>";
             echo "<tr valign='top'>
         <td class='head'>" . _AM_PUBLISHER_MIME_ADMINF . "</td>
         <td class='even'>";
-            echo "<input type='radio' name='mime_admin' value='1' " . ($mime_admin == 1 ? "checked='checked'" : "") . " />" . _YES;
-            echo "<input type='radio' name='mime_admin' value='0' " . ($mime_admin == 0 ? "checked='checked'" : "") . " />" . _NO . "
+            echo "<input type='radio' name='mime_admin' value='1' " . ($mimeAdmin == 1 ? "checked='checked'" : '') . ' />' . _YES;
+            echo "<input type='radio' name='mime_admin' value='0' " . ($mimeAdmin == 0 ? "checked='checked'" : '') . ' />' . _NO . '
         </td>
-        </tr>";
+        </tr>';
             echo "<tr valign='top'>
         <td class='head'>" . _AM_PUBLISHER_MIME_USERF . "</td>
         <td class='even'>";
-            echo "<input type='radio' name='mime_user' value='1'" . ($mime_user == 1 ? "checked='checked'" : "") . " />" . _YES;
-            echo "<input type='radio' name='mime_user' value='0'" . ($mime_user == 0 ? "checked='checked'" : "") . "/>" . _NO . "
+            echo "<input type='radio' name='mime_user' value='1'" . ($mimeUser == 1 ? "checked='checked'" : '') . ' />' . _YES;
+            echo "<input type='radio' name='mime_user' value='0'" . ($mimeUser == 0 ? "checked='checked'" : '') . '/>' . _NO . '
         </td>
-        </tr>";
+        </tr>';
             echo "<tr valign='top'>
         <td class='head'>" . _AM_PUBLISHER_MIME_MANDATORY_FIELD . "</td>
         <td class='even'>
@@ -160,112 +160,112 @@ public static function add()
         <input type='button' name='cancel' value='" . _AM_PUBLISHER_BUTTON_CANCEL . "' onclick='history.go(-1)' class='formButton' />
         </td>
         </tr>";
-            echo "</table></form>";
+            echo '</table></form>';
             // end of add form
 
             // Find new mimetypes table
             echo "<form action='http://www.filext.com' method='post'>";
             echo "<table width='100%' cellspacing='1' class='outer'>";
-            echo "<tr><th colspan='2'>" . _AM_PUBLISHER_MIME_FINDMIMETYPE . "</th></tr>";
+            echo "<tr><th colspan='2'>" . _AM_PUBLISHER_MIME_FINDMIMETYPE . '</th></tr>';
 
             echo "<tr class='foot'>
         <td colspan='2'><input type='submit' name='find_mime' id='find_mime' value='" . _AM_PUBLISHER_MIME_FINDIT . "' class='formButton' /></td>
         </tr>";
 
-            echo "</table></form>";
+            echo '</table></form>';
 
             publisherCloseCollapsableBar('mimeaddtable', 'mimeaddicon');
 
             xoops_cp_footer();
         } else {
-            $has_errors = false;
-            $mime_ext   = XoopsRequest::getString('mime_ext', '', 'POST');
-            $mime_name  = XoopsRequest::getString('mime_name', '', 'POST');
-            $mime_types = XoopsRequest::getText('mime_types', '', 'POST');
-            $mime_admin = XoopsRequest::getInt('mime_admin', 0, 'POST');
-            $mime_user  = XoopsRequest::getInt('mime_user', 0, 'POST');
+            $hasErrors = false;
+            $mimeExt   = XoopsRequest::getString('mime_ext', '', 'POST');
+            $mimeName  = XoopsRequest::getString('mime_name', '', 'POST');
+            $mimeTypes = XoopsRequest::getText('mime_types', '', 'POST');
+            $mimeAdmin = XoopsRequest::getInt('mime_admin', 0, 'POST');
+            $mimeUser  = XoopsRequest::getInt('mime_user', 0, 'POST');
 
             //Validate Mimetype entry
-            if (strlen(trim($mime_ext)) == 0) {
-                $has_errors          = true;
+            if ('' === (trim($mimeExt))) {
+                $hasErrors          = true;
                 $error['mime_ext'][] = _AM_PUBLISHER_VALID_ERR_MIME_EXT;
             }
 
-            if (strlen(trim($mime_name)) == 0) {
-                $has_errors           = true;
+            if ('' === (trim($mimeName))) {
+                $hasErrors           = true;
                 $error['mime_name'][] = _AM_PUBLISHER_VALID_ERR_MIME_NAME;
             }
 
-            if (strlen(trim($mime_types)) == 0) {
-                $has_errors            = true;
+            if ('' === (trim($mimeTypes))) {
+                $hasErrors            = true;
                 $error['mime_types'][] = _AM_PUBLISHER_VALID_ERR_MIME_TYPES;
             }
 
-            if ($has_errors) {
-                $session            = PublisherSession::getInstance();
+            if ($hasErrors) {
+                $session            =& PublisherSession::getInstance();
                 $mime               = array();
-                $mime['mime_ext']   = $mime_ext;
-                $mime['mime_name']  = $mime_name;
-                $mime['mime_types'] = $mime_types;
-                $mime['mime_admin'] = $mime_admin;
-                $mime['mime_user']  = $mime_user;
+                $mime['mime_ext']   = $mimeExt;
+                $mime['mime_name']  = $mimeName;
+                $mime['mime_types'] = $mimeTypes;
+                $mime['mime_admin'] = $mimeAdmin;
+                $mime['mime_user']  = $mimeUser;
                 $session->set('publisher_addMime', $mime);
                 $session->set('publisher_addMimeErr', $error);
                 header('Location: ' . publisherMakeUri(PUBLISHER_ADMIN_URL . '/mimetypes.php', array('op' => 'add'), false));
             }
 
-            $mimetype = $publisher->getHandler('mimetype')->create();
-            $mimetype->setVar('mime_ext', $mime_ext);
-            $mimetype->setVar('mime_name', $mime_name);
-            $mimetype->setVar('mime_types', $mime_types);
-            $mimetype->setVar('mime_admin', $mime_admin);
-            $mimetype->setVar('mime_user', $mime_user);
+            $mimeType =& $publisher->getHandler('mimetype')->create();
+            $mimeType->setVar('mime_ext', $mimeExt);
+            $mimeType->setVar('mime_name', $mimeName);
+            $mimeType->setVar('mime_types', $mimeTypes);
+            $mimeType->setVar('mime_admin', $mimeAdmin);
+            $mimeType->setVar('mime_user', $mimeUser);
 
-            if (!$publisher->getHandler('mimetype')->insert($mimetype)) {
+            if (!$publisher->getHandler('mimetype')->insert($mimeType)) {
                 redirect_header(PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_ADD_MIME_ERROR);
             } else {
                 self::clearAddSessionVars();
-                header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&limit=$limit&start=$start");
+                header('Location: ' . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&limit=$limit&start=$start");
             }
         }
     }
 
     public static function delete()
     {
-        $publisher = PublisherPublisher::getInstance();
+        $publisher =& PublisherPublisher::getInstance();
         global $start, $limit;
-        $mime_id = 0;
+        $mimeId = 0;
         if (0 == XoopsRequest::getInt('id', 0, 'GET')) {
-            redirect_header(PUBLISHER_ADMIN_URL . "/mimetypes.php", 3, _AM_PUBLISHER_MESSAGE_NO_ID);
+            redirect_header(PUBLISHER_ADMIN_URL . '/mimetypes.php', 3, _AM_PUBLISHER_MESSAGE_NO_ID);
         } else {
-            $mime_id = XoopsRequest::getInt('id', 0, 'GET');
+            $mimeId = XoopsRequest::getInt('id', 0, 'GET');
         }
-        $mimetype = $publisher->getHandler('mimetype')->get($mime_id); // Retrieve mimetype object
-        if (!$publisher->getHandler('mimetype')->delete($mimetype, true)) {
-            redirect_header(PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&id=$mime_id&limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR);
+        $mimeType =& $publisher->getHandler('mimetype')->get($mimeId); // Retrieve mimetype object
+        if (!$publisher->getHandler('mimetype')->delete($mimeType, true)) {
+            redirect_header(PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&id=$mimeId&limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR);
         } else {
-            header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&limit=$limit&start=$start");
+            header('Location: ' . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&limit=$limit&start=$start");
         }
     }
 
     public static function edit()
     {
-        $publisher = PublisherPublisher::getInstance();
+        $publisher =& PublisherPublisher::getInstance();
         global $start, $limit;
-        $mime_id    = 0;
+        $mimeId    = 0;
         $error      = array();
-        $has_errors = false;
+        $hasErrors = false;
         if (0 == XoopsRequest::getInt('id', 0, 'GET')) {
-            redirect_header(PUBLISHER_ADMIN_URL . "/mimetypes.php", 3, _AM_PUBLISHER_MESSAGE_NO_ID);
+            redirect_header(PUBLISHER_ADMIN_URL . '/mimetypes.php', 3, _AM_PUBLISHER_MESSAGE_NO_ID);
         } else {
-            $mime_id = XoopsRequest::getInt('id', 0, 'GET');
+            $mimeId = XoopsRequest::getInt('id', 0, 'GET');
         }
-        $mimetype = $publisher->getHandler('mimetype')->get($mime_id); // Retrieve mimetype object
+        $mimeType =& $publisher->getHandler('mimetype')->get($mimeId); // Retrieve mimetype object
 
         if (!(XoopsRequest::getString('edit_mime', '', 'POST'))) {
-            $session     = PublisherSession::getInstance();
-            $mime_type   = $session->get("publisher_editMime_$mime_id");
-            $mime_errors = $session->get("publisher_editMimeErr_$mime_id");
+            $session     =& PublisherSession::getInstance();
+            $mimeType   = $session->get('publisher_editMime_' . $mimeId);
+            $mimeErrors = $session->get('publisher_editMimeErr_' . $mimeId);
 
             // Display header
             publisherCpHeader();
@@ -274,56 +274,56 @@ public static function edit()
             publisherOpenCollapsableBar('mimemedittable', 'mimeediticon', _AM_PUBLISHER_MIME_EDIT_TITLE);
 
             //Display any form errors
-            if (!$mime_errors === false) {
-                publisherRenderErrors($mime_errors, publisherMakeUri(PUBLISHER_ADMIN_URL . '/mimetypes.php', array('op' => 'clearEditSession', 'id' => $mime_id)));
+            if (!$mimeErrors === false) {
+                publisherRenderErrors($mimeErrors, publisherMakeUri(PUBLISHER_ADMIN_URL . '/mimetypes.php', array('op' => 'clearEditSession', 'id' => $mimeId)));
             }
 
-            if ($mime_type === false) {
-                $mime_ext   = $mimetype->getVar('mime_ext');
-                $mime_name  = $mimetype->getVar('mime_name', 'e');
-                $mime_types = $mimetype->getVar('mime_types', 'e');
-                $mime_admin = $mimetype->getVar('mime_admin');
-                $mime_user  = $mimetype->getVar('mime_user');
+            if ($mimeType === false) {
+                $mimeExt   = $mimeType->getVar('mime_ext');
+                $mimeName  = $mimeType->getVar('mime_name', 'e');
+                $mimeTypes = $mimeType->getVar('mime_types', 'e');
+                $mimeAdmin = $mimeType->getVar('mime_admin');
+                $mimeUser  = $mimeType->getVar('mime_user');
             } else {
-                $mime_ext   = $mime_type['mime_ext'];
-                $mime_name  = $mime_type['mime_name'];
-                $mime_types = $mime_type['mime_types'];
-                $mime_admin = $mime_type['mime_admin'];
-                $mime_user  = $mime_type['mime_user'];
+                $mimeExt   = $mimeType['mime_ext'];
+                $mimeName  = $mimeType['mime_name'];
+                $mimeTypes = $mimeType['mime_types'];
+                $mimeAdmin = $mimeType['mime_admin'];
+                $mimeUser  = $mimeType['mime_user'];
             }
 
             // Display edit form
-            echo "<form action='mimetypes.php?op=edit&amp;id=" . $mime_id . "' method='post'>";
+            echo "<form action='mimetypes.php?op=edit&amp;id=" . $mimeId . "' method='post'>";
             echo "<input type='hidden' name='limit' value='" . $limit . "' />";
             echo "<input type='hidden' name='start' value='" . $start . "' />";
             echo "<table width='100%' cellspacing='1' class='outer'>";
-            echo "<tr><th colspan='2'>" . _AM_PUBLISHER_MIME_MODIFYF . "</th></tr>";
+            echo "<tr><th colspan='2'>" . _AM_PUBLISHER_MIME_MODIFYF . '</th></tr>';
             echo "<tr valign='top'>
         <td class='head'>" . _AM_PUBLISHER_MIME_EXTF . "</td>
-        <td class='even'><input type='text' name='mime_ext' id='mime_ext' value='$mime_ext' size='5' /></td>
+        <td class='even'><input type='text' name='mime_ext' id='mime_ext' value='$mimeExt' size='5' /></td>
         </tr>";
             echo "<tr valign='top'>
         <td class='head'>" . _AM_PUBLISHER_MIME_NAMEF . "</td>
-        <td class='even'><input type='text' name='mime_name' id='mime_name' value='$mime_name' /></td>
+        <td class='even'><input type='text' name='mime_name' id='mime_name' value='$mimeName' /></td>
         </tr>";
             echo "<tr valign='top'>
         <td class='head'>" . _AM_PUBLISHER_MIME_TYPEF . "</td>
-        <td class='even'><textarea name='mime_types' id='mime_types' cols='60' rows='5'>$mime_types</textarea></td>
+        <td class='even'><textarea name='mime_types' id='mime_types' cols='60' rows='5'>$mimeTypes</textarea></td>
         </tr>";
             echo "<tr valign='top'>
         <td class='head'>" . _AM_PUBLISHER_MIME_ADMINF . "</td>
         <td class='even'>
-        <input type='radio' name='mime_admin' value='1' " . ($mime_admin == 1 ? "checked='checked'" : '') . " />" . _YES . "
-        <input type='radio' name='mime_admin' value='0' " . ($mime_admin == 0 ? "checked='checked'" : '') . " />" . _NO . "
+        <input type='radio' name='mime_admin' value='1' " . ($mimeAdmin == 1 ? "checked='checked'" : '') . ' />' . _YES . "
+        <input type='radio' name='mime_admin' value='0' " . ($mimeAdmin == 0 ? "checked='checked'" : '') . ' />' . _NO . '
         </td>
-        </tr>";
+        </tr>';
             echo "<tr valign='top'>
         <td class='head'>" . _AM_PUBLISHER_MIME_USERF . "</td>
         <td class='even'>
-        <input type='radio' name='mime_user' value='1' " . ($mime_user == 1 ? "checked='checked'" : '') . " />" . _YES . "
-        <input type='radio' name='mime_user' value='0' " . ($mime_user == 0 ? "checked='checked'" : '') . " />" . _NO . "
+        <input type='radio' name='mime_user' value='1' " . ($mimeUser == 1 ? "checked='checked'" : '') . ' />' . _YES . "
+        <input type='radio' name='mime_user' value='0' " . ($mimeUser == 0 ? "checked='checked'" : '') . ' />' . _NO . '
         </td>
-        </tr>";
+        </tr>';
             echo "<tr valign='top'>
         <td class='head'></td>
         <td class='even'>
@@ -331,123 +331,123 @@ public static function edit()
         <input type='button' name='cancel' value='" . _AM_PUBLISHER_BUTTON_CANCEL . "' onclick='history.go(-1)' class='formButton' />
         </td>
         </tr>";
-            echo "</table></form>";
+            echo '</table></form>';
             // end of edit form
             publisherCloseCollapsableBar('mimeedittable', 'mimeediticon');
             xoops_cp_footer();
         } else {
-            $mime_admin = 0;
-            $mime_user  = 0;
+            $mimeAdmin = 0;
+            $mimeUser  = 0;
             if (1 == XoopsRequest::getInt('mime_admin', 0, 'POST')) {
-                $mime_admin = 1;
+                $mimeAdmin = 1;
             }
             if (1 == XoopsRequest::getInt('mime_user', 0, 'POST')) {
-                $mime_user = 1;
+                $mimeUser = 1;
             }
 
             //Validate Mimetype entry
-            if (strlen(XoopsRequest::getString('mime_ext', '', 'POST')) == 0) {
-                $has_errors          = true;
+            if ('' === (XoopsRequest::getString('mime_ext', '', 'POST'))) {
+                $hasErrors          = true;
                 $error['mime_ext'][] = _AM_PUBLISHER_VALID_ERR_MIME_EXT;
             }
 
-            if (strlen(XoopsRequest::getString('mime_name', '', 'POST')) == 0) {
-                $has_errors           = true;
+            if ('' === (XoopsRequest::getString('mime_name', '', 'POST'))) {
+                $hasErrors           = true;
                 $error['mime_name'][] = _AM_PUBLISHER_VALID_ERR_MIME_NAME;
             }
 
-            if (strlen(XoopsRequest::getString('mime_types', '', 'POST')) == 0) {
-                $has_errors            = true;
+            if ('' === (XoopsRequest::getString('mime_types', '', 'POST'))) {
+                $hasErrors            = true;
                 $error['mime_types'][] = _AM_PUBLISHER_VALID_ERR_MIME_TYPES;
             }
 
-            if ($has_errors) {
-                $session            = PublisherSession::getInstance();
+            if ($hasErrors) {
+                $session            =& PublisherSession::getInstance();
                 $mime               = array();
                 $mime['mime_ext']   = XoopsRequest::getString('mime_ext', '', 'POST');
                 $mime['mime_name']  = XoopsRequest::getString('mime_name', '', 'POST');
                 $mime['mime_types'] = XoopsRequest::getText('mime_types', '', 'POST');
-                $mime['mime_admin'] = $mime_admin;
-                $mime['mime_user']  = $mime_user;
-                $session->set('publisher_editMime_' . $mime_id, $mime);
-                $session->set('publisher_editMimeErr_' . $mime_id, $error);
-                header('Location: ' . publisherMakeUri(PUBLISHER_ADMIN_URL . '/mimetypes.php', array('op' => 'edit', 'id' => $mime_id), false));
+                $mime['mime_admin'] = $mimeAdmin;
+                $mime['mime_user']  = $mimeUser;
+                $session->set('publisher_editMime_' . $mimeId, $mime);
+                $session->set('publisher_editMimeErr_' . $mimeId, $error);
+                header('Location: ' . publisherMakeUri(PUBLISHER_ADMIN_URL . '/mimetypes.php', array('op' => 'edit', 'id' => $mimeId), false));
             }
 
-            $mimetype->setVar('mime_ext', XoopsRequest::getString('mime_ext', '', 'POST'));
-            $mimetype->setVar('mime_name', XoopsRequest::getString('mime_name', '', 'POST'));
-            $mimetype->setVar('mime_types', XoopsRequest::getText('mime_types', '', 'POST'));
-            $mimetype->setVar('mime_admin', $mime_admin);
-            $mimetype->setVar('mime_user', $mime_user);
+            $mimeType->setVar('mime_ext', XoopsRequest::getString('mime_ext', '', 'POST'));
+            $mimeType->setVar('mime_name', XoopsRequest::getString('mime_name', '', 'POST'));
+            $mimeType->setVar('mime_types', XoopsRequest::getText('mime_types', '', 'POST'));
+            $mimeType->setVar('mime_admin', $mimeAdmin);
+            $mimeType->setVar('mime_user', $mimeUser);
 
-            if (!$publisher->getHandler('mimetype')->insert($mimetype, true)) {
-                redirect_header(PUBLISHER_ADMIN_URL . "/mimetypes.php?op=edit&id=$mime_id", 3, _AM_PUBLISHER_MESSAGE_EDIT_MIME_ERROR);
+            if (!$publisher->getHandler('mimetype')->insert($mimeType, true)) {
+                redirect_header(PUBLISHER_ADMIN_URL . "/mimetypes.php?op=edit&id=$mimeId", 3, _AM_PUBLISHER_MESSAGE_EDIT_MIME_ERROR);
             } else {
-                self::clearEditSessionVars($mime_id);
-                header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&limit=$limit&start=$start");
+                self::clearEditSessionVars($mimeId);
+                header('Location: ' . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&limit=$limit&start=$start");
             }
         }
     }
 
     public static function manage()
     {
-        $publisher = PublisherPublisher::getInstance();
+        $publisher =& PublisherPublisher::getInstance();
         global $imagearray, $start, $limit, $aSortBy, $aOrderBy, $aLimitBy, $aSearchBy;
 
         if ((XoopsRequest::getString('deleteMimes', '', 'POST'))) {
-            $aMimes = XoopsRequest::getArray('mimes', array(), "POST");
+            $aMimes = XoopsRequest::getArray('mimes', array(), 'POST');
 
-            $crit = new Criteria('mime_id', "(" . implode($aMimes, ',') . ")", "IN");
+            $crit = new Criteria('mime_id', '(' . implode($aMimes, ',') . ')', 'IN');
 
             if ($publisher->getHandler('mimetype')->deleteAll($crit)) {
-                header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start");
+                header('Location: ' . PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start");
             } else {
                 redirect_header(PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR);
             }
         }
         if ((XoopsRequest::getString('add_mime', '', 'POST'))) {
-//        header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=add&start=$start&limit=$limit");
+            //        header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=add&start=$start&limit=$limit");
             redirect_header(PUBLISHER_ADMIN_URL . "/mimetypes.php?op=add&start=$start&limit=$limit", 3, _AM_PUBLISHER_MIME_CREATEF);
-//        exit();
+            //        exit();
         }
         if ((XoopsRequest::getString('mime_search', '', 'POST'))) {
-//        header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=search");
-            redirect_header(PUBLISHER_ADMIN_URL . "/mimetypes.php?op=search", 3, _AM_PUBLISHER_MIME_SEARCH);
-//        exit();
+            //        header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=search");
+            redirect_header(PUBLISHER_ADMIN_URL . '/mimetypes.php?op=search', 3, _AM_PUBLISHER_MIME_SEARCH);
+            //        exit();
         }
 
         publisherCpHeader();
         ////publisher_adminMenu(4, _AM_PUBLISHER_MIMETYPES);
         publisherOpenCollapsableBar('mimemanagetable', 'mimemanageicon', _AM_PUBLISHER_MIME_MANAGE_TITLE, _AM_PUBLISHER_MIME_INFOTEXT);
-        $crit = new CriteriaCompo();
+        $crit  = new CriteriaCompo();
         $order = XoopsRequest::getString('order', 'ASC', 'POST');
-        $sort = XoopsRequest::getString('sort', 'mime_ext', 'POST');
+        $sort  = XoopsRequest::getString('sort', 'mime_ext', 'POST');
 
         $crit->setOrder($order);
         $crit->setStart($start);
         $crit->setLimit($limit);
         $crit->setSort($sort);
-        $mimetypes  = $publisher->getHandler('mimetype')->getObjects($crit); // Retrieve a list of all mimetypes
-        $mime_count = $publisher->getHandler('mimetype')->getCount();
-        $nav        = new XoopsPageNav($mime_count, $limit, $start, 'start', "op=manage&amp;limit=$limit");
+        $mimetypes  =& $publisher->getHandler('mimetype')->getObjects($crit); // Retrieve a list of all mimetypes
+        $mimeCount =& $publisher->getHandler('mimetype')->getCount();
+        $nav        = new XoopsPageNav($mimeCount, $limit, $start, 'start', "op=manage&amp;limit=$limit");
 
         echo "<table width='100%' cellspacing='1' class='outer'>";
         echo "<tr><td colspan='6' align='right'>";
         echo "<form action='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=search' style='margin:0; padding:0;' method='post'>";
-        echo "<table>";
-        echo "<tr>";
-        echo "<td align='right'>" . _AM_PUBLISHER_TEXT_SEARCH_BY . "</td>";
+        echo '<table>';
+        echo '<tr>';
+        echo "<td align='right'>" . _AM_PUBLISHER_TEXT_SEARCH_BY . '</td>';
         echo "<td align='left'><select name='search_by'>";
         foreach ($aSearchBy as $value => $text) {
             ($sort == $value) ? $selected = "selected='selected'" : $selected = '';
             echo "<option value='$value' $selected>$text</option>";
         }
         unset($value, $text);
-        echo "</select></td>";
-        echo "<td align='right'>" . _AM_PUBLISHER_TEXT_SEARCH_TEXT . "</td>";
+        echo '</select></td>';
+        echo "<td align='right'>" . _AM_PUBLISHER_TEXT_SEARCH_TEXT . '</td>';
         echo "<td align='left'><input type='text' name='search_text' id='search_text' value='' /></td>";
         echo "<td><input type='submit' name='mime_search' id='mime_search' value='" . _AM_PUBLISHER_BUTTON_SEARCH . "' /></td>";
-        echo "</tr></table></form></td></tr>";
+        echo '</tr></table></form></td></tr>';
 
         echo "<tr><td colspan='6'>";
         echo "<form action='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage' style='margin:0; padding:0;' method='post'>";
@@ -459,18 +459,18 @@ public static function manage()
             echo "<option value='$value' $selected>$text</option>";
         }
         unset($value, $text);
-        echo "</select>
+        echo '</select>
     &nbsp;&nbsp;&nbsp;
-    " . _AM_PUBLISHER_TEXT_ORDER_BY . "
+    ' . _AM_PUBLISHER_TEXT_ORDER_BY . "
     <select name='order'>";
         foreach ($aOrderBy as $value => $text) {
             ($order == $value) ? $selected = "selected='selected'" : $selected = '';
             echo "<option value='$value' $selected>$text</option>";
         }
         unset($value, $text);
-        echo "</select>
+        echo '</select>
     &nbsp;&nbsp;&nbsp;
-    " . _AM_PUBLISHER_TEXT_NUMBER_PER_PAGE . "
+    ' . _AM_PUBLISHER_TEXT_NUMBER_PER_PAGE . "
     <select name='limit'>";
         foreach ($aLimitBy as $value => $text) {
             ($limit == $value) ? $selected = "selected='selected'" : $selected = '';
@@ -481,37 +481,37 @@ public static function manage()
     <input type='submit' name='mime_sort' id='mime_sort' value='" . _AM_PUBLISHER_BUTTON_SUBMIT . "' />
     </td>
     </tr>";
-        echo "</table>";
-        echo "</td></tr>";
-        echo "<tr><th colspan='6'>" . _AM_PUBLISHER_MIME_MANAGE_TITLE . "</th></tr>";
+        echo '</table>';
+        echo '</td></tr>';
+        echo "<tr><th colspan='6'>" . _AM_PUBLISHER_MIME_MANAGE_TITLE . '</th></tr>';
         echo "<tr class='head'>
-    <td>" . _AM_PUBLISHER_MIME_ID . "</td>
-    <td>" . _AM_PUBLISHER_MIME_NAME . "</td>
+    <td>" . _AM_PUBLISHER_MIME_ID . '</td>
+    <td>' . _AM_PUBLISHER_MIME_NAME . "</td>
     <td align='center'>" . _AM_PUBLISHER_MIME_EXT . "</td>
     <td align='center'>" . _AM_PUBLISHER_MIME_ADMIN . "</td>
     <td align='center'>" . _AM_PUBLISHER_MIME_USER . "</td>
-    <td align='center'>" . _AM_PUBLISHER_MINDEX_ACTION . "</td>
-    </tr>";
+    <td align='center'>" . _AM_PUBLISHER_MINDEX_ACTION . '</td>
+    </tr>';
         foreach ($mimetypes as $mime) {
             echo "<tr class='even'>
-        <td><input type='checkbox' name='mimes[]' value='" . $mime->getVar('mime_id') . "' />" . $mime->getVar('mime_id') . "</td>
-        <td>" . $mime->getVar('mime_name') . "</td>
+        <td><input type='checkbox' name='mimes[]' value='" . $mime->getVar('mime_id') . "' />" . $mime->getVar('mime_id') . '</td>
+        <td>' . $mime->getVar('mime_name') . "</td>
         <td align='center'>" . $mime->getVar('mime_ext') . "</td>
         <td align='center'>
-        <a href='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=updateMimeValue&amp;id=" . $mime->getVar('mime_id') . "&amp;mime_admin=" . $mime->getVar('mime_admin') . "&amp;limit=" . $limit . "&amp;start=" . $start . "'>
+        <a href='" . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=updateMimeValue&amp;id=' . $mime->getVar('mime_id') . '&amp;mime_admin=' . $mime->getVar('mime_admin') . '&amp;limit=' . $limit . '&amp;start=' . $start . "'>
         " . ($mime->getVar('mime_admin') ? $imagearray['online'] : $imagearray['offline']) . "</a>
         </td>
         <td align='center'>
-        <a href='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=updateMimeValue&amp;id=" . $mime->getVar('mime_id') . "&amp;mime_user=" . $mime->getVar('mime_user') . "&amp;limit=" . $limit . "&amp;start=" . $start . "'>
+        <a href='" . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=updateMimeValue&amp;id=' . $mime->getVar('mime_id') . '&amp;mime_user=' . $mime->getVar('mime_user') . '&amp;limit=' . $limit . '&amp;start=' . $start . "'>
         " . ($mime->getVar('mime_user') ? $imagearray['online'] : $imagearray['offline']) . "</a>
         </td>
         <td align='center'>
-        <a href='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=edit&amp;id=" . $mime->getVar('mime_id') . "&amp;limit=" . $limit . "&amp;start=" . $start . "'>" . $imagearray['editimg'] . "</a>
-        <a href='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=delete&amp;id=" . $mime->getVar('mime_id') . "&amp;limit=" . $limit . "&amp;start=" . $start . "'>" . $imagearray['deleteimg'] . "</a>
+        <a href='" . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=edit&amp;id=' . $mime->getVar('mime_id') . '&amp;limit=' . $limit . '&amp;start=' . $start . "'>" . $imagearray['editimg'] . "</a>
+        <a href='" . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=delete&amp;id=' . $mime->getVar('mime_id') . '&amp;limit=' . $limit . '&amp;start=' . $start . "'>" . $imagearray['deleteimg'] . '</a>
         </td>
-        </tr>";
+        </tr>';
         }
-        unset($mime);
+//        unset($mime);
         echo "<tr class='foot'>
     <td colspan='6' valign='top'>
     <a href='http://www.filext.com' style='float: right;' target='_blank'>" . _AM_PUBLISHER_MIME_FINDMIMETYPE . "</a>
@@ -520,8 +520,8 @@ public static function manage()
     <input type='submit' name='add_mime' id='add_mime' value='" . _AM_PUBLISHER_MIME_CREATEF . "' class='formButton' />
     </td>
     </tr>";
-        echo "</table>";
-        echo "<div id='staff_nav'>" . $nav->renderNav() . "</div>";
+        echo '</table>';
+        echo "<div id='staff_nav'>" . $nav->renderNav() . '</div>';
 
         publisherCloseCollapsableBar('mimemanagetable', 'mimemanageicon');
 
@@ -530,28 +530,28 @@ public static function manage()
 
     public static function search()
     {
-        $publisher = PublisherPublisher::getInstance();
+        $publisher =& PublisherPublisher::getInstance();
         global $limit, $start, $imagearray, $aSearchBy, $aOrderBy, $aLimitBy, $aSortBy;
 
         if ((XoopsRequest::getString('deleteMimes', '', 'POST'))) {
-            $aMimes = XoopsRequest::getArray('mimes', array(), "POST");
+            $aMimes = XoopsRequest::getArray('mimes', array(), 'POST');
 
-            $crit = new Criteria('mime_id', "(" . implode($aMimes, ',') . ")", "IN");
+            $crit = new Criteria('mime_id', '(' . implode($aMimes, ',') . ')', 'IN');
 
             if ($publisher->getHandler('mimetype')->deleteAll($crit)) {
-                header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start");
+                header('Location: ' . PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start");
             } else {
                 redirect_header(PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR);
             }
         }
         if ((XoopsRequest::getString('add_mime', '', 'POST'))) {
-//        header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=add&start=$start&limit=$limit");
+            //        header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=add&start=$start&limit=$limit");
             redirect_header(PUBLISHER_ADMIN_URL . "/mimetypes.php?op=add&start=$start&limit=$limit", 3, _AM_PUBLISHER_MIME_CREATEF);
-//        exit();
+            //        exit();
         }
 
-            $order = XoopsRequest::getString('order', 'ASC', 'POST');
-            $sort = XoopsRequest::getString('sort', 'mime_name', 'POST');
+        $order = XoopsRequest::getString('order', 'ASC', 'POST');
+        $sort  = XoopsRequest::getString('sort', 'mime_name', 'POST');
 
         publisherCpHeader();
         //publisher_adminMenu(4, _AM_PUBLISHER_MIMETYPES . " > " . _AM_PUBLISHER_BUTTON_SEARCH);
@@ -561,7 +561,7 @@ public static function search()
         if (!(XoopsRequest::getString('mime_search', '', 'POST'))) {
             echo "<form action='mimetypes.php?op=search' method='post'>";
             echo "<table width='100%' cellspacing='1' class='outer'>";
-            echo "<tr><th colspan='2'>" . _AM_PUBLISHER_TEXT_SEARCH_MIME . "</th></tr>";
+            echo "<tr><th colspan='2'>" . _AM_PUBLISHER_TEXT_SEARCH_MIME . '</th></tr>';
             echo "<tr><td class='head' width='20%'>" . _AM_PUBLISHER_TEXT_SEARCH_BY . "</td>
         <td class='even'>
         <select name='search_by'>";
@@ -569,9 +569,9 @@ public static function search()
                 echo "<option value='$value'>$text</option>";
             }
             unset($value, $text);
-            echo "</select>
+            echo '</select>
         </td>
-        </tr>";
+        </tr>';
             echo "<tr><td class='head'>" . _AM_PUBLISHER_TEXT_SEARCH_TEXT . "</td>
         <td class='even'>
         <input type='text' name='search_text' id='search_text' value='' />
@@ -582,39 +582,39 @@ public static function search()
         <input type='submit' name='mime_search' id='mime_search' value='" . _AM_PUBLISHER_BUTTON_SEARCH . "' />
         </td>
         </tr>";
-            echo "</table></form>";
+            echo '</table></form>';
         } else {
-            $search_field = XoopsRequest::getString('search_by', '', 'POST');
-            $search_text  = XoopsRequest::getString('search_text', '', 'POST');
+            $searchField = XoopsRequest::getString('search_by', '', 'POST');
+            $searchText  = XoopsRequest::getString('search_text', '', 'POST');
 
-            $crit = new Criteria($search_field, "%$search_text%", 'LIKE');
+            $crit = new Criteria($searchField, "%$searchText%", 'LIKE');
             $crit->setSort($sort);
             $crit->setOrder($order);
             $crit->setLimit($limit);
             $crit->setStart($start);
-            $mime_count = $publisher->getHandler('mimetype')->getCount($crit);
-            $mimetypes  = $publisher->getHandler('mimetype')->getObjects($crit);
-            $nav        = new XoopsPageNav($mime_count, $limit, $start, 'start', "op=search&amp;limit=$limit&amp;order=$order&amp;sort=$sort&amp;mime_search=1&amp;search_by=$search_field&amp;search_text=$search_text");
+            $mimeCount =& $publisher->getHandler('mimetype')->getCount($crit);
+            $mimetypes  =& $publisher->getHandler('mimetype')->getObjects($crit);
+            $nav        = new XoopsPageNav($mimeCount, $limit, $start, 'start', "op=search&amp;limit=$limit&amp;order=$order&amp;sort=$sort&amp;mime_search=1&amp;search_by=$searchField&amp;search_text=$searchText");
             // Display results
             echo '<script type="text/javascript" src="' . PUBLISHER_URL . '/include/functions.js"></script>';
 
             echo "<table width='100%' cellspacing='1' class='outer'>";
             echo "<tr><td colspan='6' align='right'>";
             echo "<form action='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=search' style='margin:0; padding:0;' method='post'>";
-            echo "<table>";
-            echo "<tr>";
-            echo "<td align='right'>" . _AM_PUBLISHER_TEXT_SEARCH_BY . "</td>";
+            echo '<table>';
+            echo '<tr>';
+            echo "<td align='right'>" . _AM_PUBLISHER_TEXT_SEARCH_BY . '</td>';
             echo "<td align='left'><select name='search_by'>";
             foreach ($aSearchBy as $value => $text) {
-                ($search_field == $value) ? $selected = "selected='selected'" : $selected = '';
+                ($searchField == $value) ? $selected = "selected='selected'" : $selected = '';
                 echo "<option value='$value' $selected>$text</option>";
             }
             unset($value, $text);
-            echo "</select></td>";
-            echo "<td align='right'>" . _AM_PUBLISHER_TEXT_SEARCH_TEXT . "</td>";
-            echo "<td align='left'><input type='text' name='search_text' id='search_text' value='$search_text' /></td>";
+            echo '</select></td>';
+            echo "<td align='right'>" . _AM_PUBLISHER_TEXT_SEARCH_TEXT . '</td>';
+            echo "<td align='left'><input type='text' name='search_text' id='search_text' value='$searchText' /></td>";
             echo "<td><input type='submit' name='mime_search' id='mime_search' value='" . _AM_PUBLISHER_BUTTON_SEARCH . "' /></td>";
-            echo "</tr></table></form></td></tr>";
+            echo '</tr></table></form></td></tr>';
 
             echo "<tr><td colspan='6'>";
             echo "<form action='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=search' style='margin:0; padding:0;' method='post'>";
@@ -626,18 +626,18 @@ public static function search()
                 echo "<option value='$value' $selected>$text</option>";
             }
             unset($value, $text);
-            echo "</select>
+            echo '</select>
         &nbsp;&nbsp;&nbsp;
-        " . _AM_PUBLISHER_TEXT_ORDER_BY . "
+        ' . _AM_PUBLISHER_TEXT_ORDER_BY . "
         <select name='order'>";
             foreach ($aOrderBy as $value => $text) {
                 ($order == $value) ? $selected = "selected='selected'" : $selected = '';
                 echo "<option value='$value' $selected>$text</option>";
             }
             unset($value, $text);
-            echo "</select>
+            echo '</select>
         &nbsp;&nbsp;&nbsp;
-        " . _AM_PUBLISHER_TEXT_NUMBER_PER_PAGE . "
+        ' . _AM_PUBLISHER_TEXT_NUMBER_PER_PAGE . "
         <select name='limit'>";
             foreach ($aLimitBy as $value => $text) {
                 ($limit == $value) ? $selected = "selected='selected'" : $selected = '';
@@ -647,42 +647,42 @@ public static function search()
             echo "</select>
         <input type='submit' name='mime_sort' id='mime_sort' value='" . _AM_PUBLISHER_BUTTON_SUBMIT . "' />
         <input type='hidden' name='mime_search' id='mime_search' value='1' />
-        <input type='hidden' name='search_by' id='search_by' value='$search_field' />
-        <input type='hidden' name='search_text' id='search_text' value='$search_text' />
+        <input type='hidden' name='search_by' id='search_by' value='$searchField' />
+        <input type='hidden' name='search_text' id='search_text' value='$searchText' />
         </td>
         </tr>";
-            echo "</table>";
-            echo "</td></tr>";
+            echo '</table>';
+            echo '</td></tr>';
             if (count($mimetypes) > 0) {
-                echo "<tr><th colspan='6'>" . _AM_PUBLISHER_TEXT_SEARCH_MIME . "</th></tr>";
+                echo "<tr><th colspan='6'>" . _AM_PUBLISHER_TEXT_SEARCH_MIME . '</th></tr>';
                 echo "<tr class='head'>
-            <td>" . _AM_PUBLISHER_MIME_ID . "</td>
-            <td>" . _AM_PUBLISHER_MIME_NAME . "</td>
+            <td>" . _AM_PUBLISHER_MIME_ID . '</td>
+            <td>' . _AM_PUBLISHER_MIME_NAME . "</td>
             <td align='center'>" . _AM_PUBLISHER_MIME_EXT . "</td>
             <td align='center'>" . _AM_PUBLISHER_MIME_ADMIN . "</td>
             <td align='center'>" . _AM_PUBLISHER_MIME_USER . "</td>
-            <td align='center'>" . _AM_PUBLISHER_MINDEX_ACTION . "</td>
-            </tr>";
+            <td align='center'>" . _AM_PUBLISHER_MINDEX_ACTION . '</td>
+            </tr>';
                 foreach ($mimetypes as $mime) {
                     echo "<tr class='even'>
-                <td><input type='checkbox' name='mimes[]' value='" . $mime->getVar('mime_id') . "' />" . $mime->getVar('mime_id') . "</td>
-                <td>" . $mime->getVar('mime_name') . "</td>
+                <td><input type='checkbox' name='mimes[]' value='" . $mime->getVar('mime_id') . "' />" . $mime->getVar('mime_id') . '</td>
+                <td>' . $mime->getVar('mime_name') . "</td>
                 <td align='center'>" . $mime->getVar('mime_ext') . "</td>
                 <td align='center'>
-                <a href='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=updateMimeValue&amp;id=" . $mime->getVar('mime_id') . "&amp;mime_admin=" . $mime->getVar('mime_admin') . "&amp;limit=" . $limit . "&amp;start=" . $start . "'>
+                <a href='" . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=updateMimeValue&amp;id=' . $mime->getVar('mime_id') . '&amp;mime_admin=' . $mime->getVar('mime_admin') . '&amp;limit=' . $limit . '&amp;start=' . $start . "'>
                 " . ($mime->getVar('mime_admin') ? $imagearray['online'] : $imagearray['offline']) . "</a>
                 </td>
                 <td align='center'>
-                <a href='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=updateMimeValue&amp;id=" . $mime->getVar('mime_id') . "&amp;mime_user=" . $mime->getVar('mime_user') . "&amp;limit=" . $limit . "&amp;start=" . $start . "'>
+                <a href='" . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=updateMimeValue&amp;id=' . $mime->getVar('mime_id') . '&amp;mime_user=' . $mime->getVar('mime_user') . '&amp;limit=' . $limit . '&amp;start=' . $start . "'>
                 " . ($mime->getVar('mime_user') ? $imagearray['online'] : $imagearray['offline']) . "</a>
                 </td>
                 <td align='center'>
-                <a href='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=edit&amp;id=" . $mime->getVar('mime_id') . "&amp;limit=" . $limit . "&amp;start=" . $start . "'>" . $imagearray['editimg'] . "</a>
-                <a href='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=delete&amp;id=" . $mime->getVar('mime_id') . "&amp;limit=" . $limit . "&amp;start=" . $start . "'>" . $imagearray['deleteimg'] . "</a>
+                <a href='" . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=edit&amp;id=' . $mime->getVar('mime_id') . '&amp;limit=' . $limit . '&amp;start=' . $start . "'>" . $imagearray['editimg'] . "</a>
+                <a href='" . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=delete&amp;id=' . $mime->getVar('mime_id') . '&amp;limit=' . $limit . '&amp;start=' . $start . "'>" . $imagearray['deleteimg'] . '</a>
                 </td>
-                </tr>";
+                </tr>';
                 }
-                unset($mime);
+//                unset($mime);
                 echo "<tr class='foot'>
             <td colspan='6' valign='top'>
             <a href='http://www.filext.com' style='float: right;' target='_blank'>" . _AM_PUBLISHER_MIME_FINDMIMETYPE . "</a>
@@ -692,13 +692,13 @@ public static function search()
             </td>
             </tr>";
             } else {
-                echo "<tr><th>" . _AM_PUBLISHER_TEXT_SEARCH_MIME . "</th></tr>";
+                echo '<tr><th>' . _AM_PUBLISHER_TEXT_SEARCH_MIME . '</th></tr>';
                 echo "<tr class='even'>
-            <td>" . _AM_PUBLISHER_TEXT_NO_RECORDS . "</td>
-            </tr>";
+            <td>" . _AM_PUBLISHER_TEXT_NO_RECORDS . '</td>
+            </tr>';
             }
-            echo "</table>";
-            echo "<div id='pagenav'>" . $nav->renderNav() . "</div>";
+            echo '</table>';
+            echo "<div id='pagenav'>" . $nav->renderNav() . '</div>';
         }
         publisherCloseCollapsableBar('mimesearchtable', 'mimesearchicon');
         xoops_cp_footer();
@@ -706,56 +706,56 @@ public static function search()
 
     public static function updateMimeValue()
     {
-        $mime_id   = 0;
-        $publisher = PublisherPublisher::getInstance();
+        $mimeId   = 0;
+        $publisher =& PublisherPublisher::getInstance();
 
-            $limit = XoopsRequest::getInt('limit', 0, 'GET');
-            $start = XoopsRequest::getInt('start', 0, 'GET');
+        $limit = XoopsRequest::getInt('limit', 0, 'GET');
+        $start = XoopsRequest::getInt('start', 0, 'GET');
 
         if (!(XoopsRequest::getString('id', '', 'GET'))) {
-            redirect_header(PUBLISHER_ADMIN_URL . "/mimetypes.php", 3, _AM_PUBLISHER_MESSAGE_NO_ID);
+            redirect_header(PUBLISHER_ADMIN_URL . '/mimetypes.php', 3, _AM_PUBLISHER_MESSAGE_NO_ID);
         } else {
-            $mime_id = XoopsRequest::getInt('id', 0, 'GET');
+            $mimeId = XoopsRequest::getInt('id', 0, 'GET');
         }
 
-        $mimetype = $publisher->getHandler('mimetype')->get($mime_id);
+        $mimeType =& $publisher->getHandler('mimetype')->get($mimeId);
 
-        if (($mime_admin = XoopsRequest::getString('mime_admin', '', 'GET'))) {
-//            $mime_admin = XoopsRequest::getInt('mime_admin', 0, 'GET');
-            $mime_admin = self::changeMimeValue($mime_admin);
-            $mimetype->setVar('mime_admin', $mime_admin);
+        if (($mimeAdmin = XoopsRequest::getString('mime_admin', '', 'GET'))) {
+            //            $mimeAdmin = XoopsRequest::getInt('mime_admin', 0, 'GET');
+            $mimeAdmin = self::changeMimeValue($mimeAdmin);
+            $mimeType->setVar('mime_admin', $mimeAdmin);
         }
-        if (($mime_user = XoopsRequest::getString('mime_user', '', 'GET'))) {
-//            $mime_user = XoopsRequest::getInt('mime_user', 0, 'GET');
-            $mime_user = self::changeMimeValue($mime_user);
-            $mimetype->setVar('mime_user', $mime_user);
+        if (($mimeUser = XoopsRequest::getString('mime_user', '', 'GET'))) {
+            //            $mimeUser = XoopsRequest::getInt('mime_user', 0, 'GET');
+            $mimeUser = self::changeMimeValue($mimeUser);
+            $mimeType->setVar('mime_user', $mimeUser);
         }
-        if ($publisher->getHandler('mimetype')->insert($mimetype, true)) {
-            header("Location: " . PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start");
+        if ($publisher->getHandler('mimetype')->insert($mimeType, true)) {
+            header('Location: ' . PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start");
         } else {
             redirect_header(PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start", 3);
         }
     }
 
     /**
-     * @param $mime_value
+     * @param $mimeValue
      *
      * @return int
      */
-    protected static function changeMimeValue($mime_value)
+    protected static function changeMimeValue($mimeValue)
     {
-        if ($mime_value == 1) {
-            $mime_value = 0;
+        if ($mimeValue == 1) {
+            $mimeValue = 0;
         } else {
-            $mime_value = 1;
+            $mimeValue = 1;
         }
 
-        return $mime_value;
+        return $mimeValue;
     }
 
     protected static function clearAddSessionVars()
     {
-        $session = PublisherSession::getInstance();
+        $session =& PublisherSession::getInstance();
         $session->del('publisher_addMime');
         $session->del('publisher_addMimeErr');
     }
@@ -772,7 +772,7 @@ public static function clearAddSession()
     public static function clearEditSessionVars($id)
     {
         $id      = (int)($id);
-        $session = PublisherSession::getInstance();
+        $session =& PublisherSession::getInstance();
         $session->del("publisher_editMime_$id");
         $session->del("publisher_editMimeErr_$id");
     }
diff --git a/publisher/admin/pagewrap.php b/publisher/admin/pagewrap.php
index 4fd09864..053e5c30 100644
--- a/publisher/admin/pagewrap.php
+++ b/publisher/admin/pagewrap.php
@@ -28,35 +28,35 @@
 
 $dir = publisherGetUploadDir(true, 'content');
 
-if (!preg_match('/777/i', decoct(fileperms($dir)))) {
-    echo "<span style='color:#ff0000;'><h4>" . _AM_PUBLISHER_PERMERROR . "</h4></span>";
+if (false !== strpos(decoct(fileperms($dir)), '777')) {
+    echo "<span style='color:#ff0000;'><h4>" . _AM_PUBLISHER_PERMERROR . '</h4></span>';
 }
 
 // Upload File
 echo "<form name='form_name2' id='form_name2' action='pw_upload_file.php' method='post' enctype='multipart/form-data'>";
 echo "<table cellspacing='1' width='100%' class='outer'>";
-echo "<tr><th colspan='2'>" . _AM_PUBLISHER_UPLOAD_FILE . "</th></tr>";
+echo "<tr><th colspan='2'>" . _AM_PUBLISHER_UPLOAD_FILE . '</th></tr>';
 echo "<tr valign='top' align='left'><td class='head'>" . _AM_PUBLISHER_SEARCH . "</td><td class='even'><input type='file' name='fileupload' id='fileupload' size='30' /></td></tr>";
 echo "<tr valign='top' align='left'><td class='head'><input type='hidden' name='MAX_FILE_SIZE' id='op' value='500000' /></td><td class='even'><input type='submit' name='submit' value='" . _AM_PUBLISHER_UPLOAD . "' /></td></tr>";
-echo "</table>";
-echo "</form>";
+echo '</table>';
+echo '</form>';
 
 // Delete File
-$form = new XoopsThemeForm(_CO_PUBLISHER_DELETEFILE, "form_name", "pw_delete_file.php");
+$form = new XoopsThemeForm(_CO_PUBLISHER_DELETEFILE, 'form_name', 'pw_delete_file.php');
 
-$pWrap_select = new XoopsFormSelect(publisherGetUploadDir(true, 'content'), "address");
+$pWrapSelect = new XoopsFormSelect(publisherGetUploadDir(true, 'content'), 'address');
 $folder       = dir($dir);
 while ($file == $folder->read()) {
-    if ($file != "." && $file != "..") {
-        $pWrap_select->addOption($file, $file);
+    if ($file !== '.' && $file !== '..') {
+        $pWrapSelect->addOption($file, $file);
     }
 }
 $folder->close();
-$form->addElement($pWrap_select);
+$form->addElement($pWrapSelect);
 
-$delfile = "delfile";
+$delfile = 'delfile';
 $form->addElement(new XoopsFormHidden('op', $delfile));
-$submit = new XoopsFormButton("", "submit", _AM_PUBLISHER_BUTTON_DELETE, "submit");
+$submit = new XoopsFormButton('', 'submit', _AM_PUBLISHER_BUTTON_DELETE, 'submit');
 $form->addElement($submit);
 $form->display();
 
diff --git a/publisher/admin/permissions.php b/publisher/admin/permissions.php
index 32a354ce..6abca1cf 100644
--- a/publisher/admin/permissions.php
+++ b/publisher/admin/permissions.php
@@ -31,9 +31,9 @@
 $block_view     = array();
 publisherOpenCollapsableBar('permissionstable_view', 'permissionsicon_view', _AM_PUBLISHER_PERMISSIONSVIEWMAN, _AM_PUBLISHER_VIEW_CATS);
 
-$result_view = $GLOBALS['xoopsDB']->query("SELECT categoryid, name FROM " . $GLOBALS['xoopsDB']->prefix("publisher_categories") . " ");
+$result_view = $GLOBALS['xoopsDB']->query('SELECT categoryid, name FROM ' . $GLOBALS['xoopsDB']->prefix('publisher_categories') . ' ');
 if ($GLOBALS['xoopsDB']->getRowsNum($result_view)) {
-    $form_submit = new XoopsGroupPermForm("", $publisher->getModule()->mid(), "category_read", "", 'admin/permissions.php');
+    $form_submit = new XoopsGroupPermForm('', $publisher->getModule()->mid(), 'category_read', '', 'admin/permissions.php');
     while (($myrow_view = $GLOBALS['xoopsDB']->fetcharray($result_view)) !== false) {
         $form_submit->addItem($myrow_view['categoryid'], $myts->displayTarea($myrow_view['name']));
     }
@@ -46,9 +46,9 @@
 // Submit Categories permissions
 echo "<br />\n";
 publisherOpenCollapsableBar('permissionstable_submit', 'permissionsicon_submit', _AM_PUBLISHER_PERMISSIONS_CAT_SUBMIT, _AM_PUBLISHER_PERMISSIONS_CAT_SUBMIT_DSC);
-$result_view = $GLOBALS['xoopsDB']->query("SELECT categoryid, name FROM " . $GLOBALS['xoopsDB']->prefix("publisher_categories") . " ");
+$result_view = $GLOBALS['xoopsDB']->query('SELECT categoryid, name FROM ' . $GLOBALS['xoopsDB']->prefix('publisher_categories') . ' ');
 if ($GLOBALS['xoopsDB']->getRowsNum($result_view)) {
-    $form_submit = new XoopsGroupPermForm("", $publisher->getModule()->mid(), "item_submit", "", 'admin/permissions.php');
+    $form_submit = new XoopsGroupPermForm('', $publisher->getModule()->mid(), 'item_submit', '', 'admin/permissions.php');
     while (($myrow_view = $GLOBALS['xoopsDB']->fetcharray($result_view)) !== false) {
         $form_submit->addItem($myrow_view['categoryid'], $myts->displayTarea($myrow_view['name']));
     }
@@ -61,9 +61,9 @@
 // Moderators Categories permissions
 echo "<br />\n";
 publisherOpenCollapsableBar('permissionstable_moderation', 'permissionsicon_moderation', _AM_PUBLISHER_PERMISSIONS_CAT_MODERATOR, _AM_PUBLISHER_PERMISSIONS_CAT_MODERATOR_DSC);
-$result_view = $GLOBALS['xoopsDB']->query("SELECT categoryid, name FROM " . $GLOBALS['xoopsDB']->prefix("publisher_categories") . " ");
+$result_view = $GLOBALS['xoopsDB']->query('SELECT categoryid, name FROM ' . $GLOBALS['xoopsDB']->prefix('publisher_categories') . ' ');
 if ($GLOBALS['xoopsDB']->getRowsNum($result_view)) {
-    $form_submit = new XoopsGroupPermForm("", $publisher->getModule()->mid(), "category_moderation", "", 'admin/permissions.php');
+    $form_submit = new XoopsGroupPermForm('', $publisher->getModule()->mid(), 'category_moderation', '', 'admin/permissions.php');
     while (($myrow_view = $GLOBALS['xoopsDB']->fetcharray($result_view)) !== false) {
         $form_submit->addItem($myrow_view['categoryid'], $myts->displayTarea($myrow_view['name']));
     }
@@ -101,9 +101,8 @@
     PublisherConstantsInterface::PUBLISHER_DOLINEBREAK           => _CO_PUBLISHER_DOLINEBREAK,
     PublisherConstantsInterface::PUBLISHER_NOTIFY                => _AM_PUBLISHER_NOTIFY,
     PublisherConstantsInterface::PUBLISHER_SUBTITLE              => _CO_PUBLISHER_SUBTITLE,
-    PublisherConstantsInterface::PUBLISHER_AUTHOR_ALIAS          => _CO_PUBLISHER_AUTHOR_ALIAS
-);
-$form_submit  = new XoopsGroupPermForm("", $publisher->getModule()->mid(), "form_view", "", 'admin/permissions.php');
+    PublisherConstantsInterface::PUBLISHER_AUTHOR_ALIAS          => _CO_PUBLISHER_AUTHOR_ALIAS);
+$form_submit  = new XoopsGroupPermForm('', $publisher->getModule()->mid(), 'form_view', '', 'admin/permissions.php');
 foreach ($form_options as $key => $value) {
     $form_submit->addItem($key, $value);
 }
@@ -115,7 +114,7 @@
 echo "<br />\n";
 publisherOpenCollapsableBar('permissionstable_editors', 'permissions_editors', _AM_PUBLISHER_PERMISSIONS_EDITORS, _AM_PUBLISHER_PERMISSIONS_EDITORS_DSC);
 $editors     = publisherGetEditors();
-$form_submit = new XoopsGroupPermForm("", $publisher->getModule()->mid(), "editors", "", 'admin/permissions.php');
+$form_submit = new XoopsGroupPermForm('', $publisher->getModule()->mid(), 'editors', '', 'admin/permissions.php');
 foreach ($editors as $key => $value) {
     $form_submit->addItem($key, $value['title']);
 }
@@ -128,9 +127,8 @@
 publisherOpenCollapsableBar('permissionstable_global', 'permissionsicon_global', _AM_PUBLISHER_PERMISSIONS_GLOBAL, _AM_PUBLISHER_PERMISSIONS_GLOBAL_DSC);
 $form_options = array(
     PublisherConstantsInterface::PUBLISHER_SEARCH => _AM_PUBLISHER_SEARCH,
-    PublisherConstantsInterface::PUBLISHER_RATE   => _AM_PUBLISHER_RATE
-);
-$form_submit  = new XoopsGroupPermForm("", $publisher->getModule()->mid(), "global", "", 'admin/permissions.php');
+    PublisherConstantsInterface::PUBLISHER_RATE   => _AM_PUBLISHER_RATE);
+$form_submit  = new XoopsGroupPermForm('', $publisher->getModule()->mid(), 'global', '', 'admin/permissions.php');
 foreach ($form_options as $key => $value) {
     $form_submit->addItem($key, $value);
 }
diff --git a/publisher/admin/preferences.php b/publisher/admin/preferences.php
index 961bb957..5b2614e3 100644
--- a/publisher/admin/preferences.php
+++ b/publisher/admin/preferences.php
@@ -21,7 +21,7 @@
 
 include_once __DIR__ . '/admin_header.php';
 
-$module  = $publisher->getModule();
+$module  =& $publisher->getModule();
 $mod     = $module->mid();
 $modname = $module->name();
 
@@ -40,10 +40,10 @@
 
 $configcat = XoopsRequest::getString('configcat', '', 'GET');
 
-if ($op == 'showmod') {
-    $config_handler = xoops_gethandler('config');
+if ($op === 'showmod') {
+    $configHandler =& xoops_getHandler('config');
 
-    $config = $config_handler->getConfigs(new Criteria('conf_modid', $mod));
+    $config = $configHandler->getConfigs(new Criteria('conf_modid', $mod));
     $count  = count($config);
     if ($count < 1) {
         redirect_header($module->getInfo('adminindex'), 1);
@@ -52,9 +52,10 @@
     $xv_configs  = $module->getInfo('config');
     $config_cats = $module->getInfo('configcat');
 
-    if (!in_array('others', array_keys($config_cats))) {
-        $config_cats['others'] = array('name'        => _MI_PUBLISHER_CONFCAT_OTHERS,
-                                       'description' => _MI_PUBLISHER_CONFCAT_OTHERS_DSC);
+    if (!array_key_exists('others', $config_cats)) {
+        $config_cats['others'] = array(
+            'name'        => _MI_PUBLISHER_CONFCAT_OTHERS,
+            'description' => _MI_PUBLISHER_CONFCAT_OTHERS_DSC);
     }
     $cat_others_used = false;
 
@@ -70,10 +71,10 @@
 
     xoops_load('XoopsFormLoader');
 
-    foreach ($config_cats as $form_cat => $info) {
-        $$form_cat = new XoopsThemeForm($info['name'], 'pref_form_' . $form_cat, 'preferences.php', 'post', true);
+    foreach ($config_cats as $formCat => $info) {
+        $$formCat = new XoopsThemeForm($info['name'], 'pref_form_' . $formCat, 'preferences.php', 'post', true);
     }
-    unset($form_cat, $info);
+    unset($formCat, $info);
 
     for ($i = 0; $i < $count; ++$i) {
         foreach ($xv_configs as $xv_config) {
@@ -82,12 +83,12 @@
             }
         }
 
-        $form_cat = @$xv_config['category'];
-        $form_cat = isset($xv_config['category']) ? $xv_config['category'] : '';
+        $formCat = @$xv_config['category'];
+        $formCat = isset($xv_config['category']) ? $xv_config['category'] : '';
         unset($xv_config);
 
-        if (!in_array($form_cat, array_keys($config_cats))) {
-            $form_cat        = 'others';
+        if (!array_key_exists($formCat, $config_cats)) {
+            $formCat        = 'others';
             $cat_others_used = true;
         }
 
@@ -95,7 +96,7 @@
         switch ($config[$i]->getVar('conf_formtype')) {
             case 'textarea':
                 $myts = MyTextSanitizer::getInstance();
-                if ($config[$i]->getVar('conf_valuetype') == 'array') {
+                if ($config[$i]->getVar('conf_valuetype') === 'array') {
                     // this is exceptional.. only when value type is arrayneed a smarter way for this
                     $ele = ($config[$i]->getVar('conf_value') != '') ? new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50) : new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), '', 5, 50);
                 } else {
@@ -104,7 +105,7 @@
                 break;
             case 'select':
                 $ele     = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
-                $options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
+                $options = $configHandler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
                 $opcount = count($options);
                 for ($j = 0; $j < $opcount; ++$j) {
                     $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
@@ -114,7 +115,7 @@
                 break;
             case 'select_multi':
                 $ele     = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true);
-                $options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
+                $options = $configHandler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
                 $opcount = count($options);
                 for ($j = 0; $j < $opcount; ++$j) {
                     $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
@@ -160,44 +161,43 @@
                 break;
         }
         $hidden = new XoopsFormHidden('conf_ids[]', $config[$i]->getVar('conf_id'));
-        $$form_cat->addElement($ele);
-        $$form_cat->addElement($hidden);
-        unset($ele);
-        unset($hidden);
+        $$formCat->addElement($ele);
+        $$formCat->addElement($hidden);
+        unset($ele, $hidden);
     }
 
     publisherCpHeader();
     //publisher_adminMenu(5, _PREFERENCES);
-    foreach ($config_cats as $form_cat => $info) {
-        if ($form_cat == 'others' && !$cat_others_used) {
+    foreach ($config_cats as $formCat => $info) {
+        if ($formCat === 'others' && !$cat_others_used) {
             continue;
         }
-        $$form_cat->addElement(new XoopsFormHidden('op', 'save'));
-        $$form_cat->addElement(new XoopsFormButton('', 'button', _GO, 'submit'));
-        publisherOpenCollapsableBar($form_cat . '_table', $form_cat . '_icon', $info['name'], $info['description']);
-        $$form_cat->display();
-        publisherCloseCollapsableBar($form_cat . '_table', $form_cat . '_icon');
+        $$formCat->addElement(new XoopsFormHidden('op', 'save'));
+        $$formCat->addElement(new XoopsFormButton('', 'button', _GO, 'submit'));
+        publisherOpenCollapsableBar($formCat . '_table', $formCat . '_icon', $info['name'], $info['description']);
+        $$formCat->display();
+        publisherCloseCollapsableBar($formCat . '_table', $formCat . '_icon');
     }
-    unset($form_cat, $info);
+    unset($formCat, $info);
     xoops_cp_footer();
     exit();
 }
 
-if ($op == 'save') {
+if ($op === 'save') {
     if (!$GLOBALS['xoopsSecurity']->check()) {
         redirect_header($module->getInfo('adminindex'), 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
     }
-    $count          = count($conf_ids);
-    $config_handler = xoops_gethandler('config');
+    $count          = count($confIds);
+    $configHandler =& xoops_getHandler('config');
     if ($count > 0) {
         for ($i = 0; $i < $count; ++$i) {
-            $config    = $config_handler->getConfig($conf_ids[$i]);
-            $new_value =& ${$config->getVar('conf_name')};
-            if (is_array($new_value) || $new_value != $config->getVar('conf_value')) {
-                $config->setConfValueForInput($new_value);
-                $config_handler->insertConfig($config);
+            $config    = $configHandler->getConfig($confIds[$i]);
+            $newValue =& ${$config->getVar('conf_name')};
+            if (is_array($newValue) || $newValue != $config->getVar('conf_value')) {
+                $config->setConfValueForInput($newValue);
+                $configHandler->insertConfig($config);
             }
-            unset($new_value);
+            unset($newValue);
         }
     }
     redirect_header('preferences.php', 2, _AM_DBUPDATED);
diff --git a/publisher/admin/pw_delete_file.php b/publisher/admin/pw_delete_file.php
index e621a3ce..df465e47 100644
--- a/publisher/admin/pw_delete_file.php
+++ b/publisher/admin/pw_delete_file.php
@@ -21,7 +21,7 @@
 
 include_once __DIR__ . '/admin_header.php';
 
-if ('delfileok' == XoopsRequest::getString('op', '', 'POST')) {
+if ('delfileok' === XoopsRequest::getString('op', '', 'POST')) {
     $dir      = publisherGetUploadDir(true, 'content');
     $filename = XoopsRequest::getString('address', '', 'POST');
     if (file_exists($dir . '/' . $filename)) {
diff --git a/publisher/admin/pw_upload_file.php b/publisher/admin/pw_upload_file.php
index 9d3c91c2..69850721 100644
--- a/publisher/admin/pw_upload_file.php
+++ b/publisher/admin/pw_upload_file.php
@@ -38,22 +38,22 @@
  */
 function publisher_pagewrap_upload(&$errors)
 {
-//    include_once PUBLISHER_ROOT_PATH . '/class/uploader.php';
+    //    include_once PUBLISHER_ROOT_PATH . '/class/uploader.php';
     xoops_load('XoopsMediaUploader');
 
-    $publisher  = PublisherPublisher::getInstance();
-    $post_field = 'fileupload';
+    $publisher  =& PublisherPublisher::getInstance();
+    $postField = 'fileupload';
 
-    $max_size      = $publisher->getConfig('maximum_filesize');
-    $max_imgwidth  = $publisher->getConfig('maximum_image_width');
-    $max_imgheight = $publisher->getConfig('maximum_image_height');
+    $maxFileSize      = $publisher->getConfig('maximum_filesize');
+    $maxImageWidth  = $publisher->getConfig('maximum_image_width');
+    $maxImageHeight = $publisher->getConfig('maximum_image_height');
 
     if (!is_dir(publisherGetUploadDir(true, 'content'))) {
         mkdir(publisherGetUploadDir(true, 'content'), 0757);
     }
-    $allowed_mimetypes = array('text/html', 'text/plain', 'application/xhtml+xml');
-    $uploader          = new XoopsMediaUploader(publisherGetUploadDir(true, 'content') . '/', $allowed_mimetypes, $max_size, $max_imgwidth, $max_imgheight);
-    if ($uploader->fetchMedia($post_field)) {
+    $allowedMimeTypes = array('text/html', 'text/plain', 'application/xhtml+xml');
+    $uploader          = new XoopsMediaUploader(publisherGetUploadDir(true, 'content') . '/', $allowedMimeTypes, $maxFileSize, $maxImageWidth, $maxImageHeight);
+    if ($uploader->fetchMedia($postField)) {
         $uploader->setTargetFileName($uploader->getMediaName());
         if ($uploader->upload()) {
             return true;
diff --git a/publisher/archive.php b/publisher/archive.php
index f2540538..0bb39276 100644
--- a/publisher/archive.php
+++ b/publisher/archive.php
@@ -30,17 +30,17 @@
 include_once $GLOBALS['xoops']->path('header.php');
 include_once PUBLISHER_ROOT_PATH . '/footer.php';
 xoops_loadLanguage('calendar');
-xoops_load('XoopsLocal');
+//mb xoops_load('XoopsLocal');
 
 $lastyear   = 0;
 $lastmonth  = 0;
-$months_arr = array(1 => _CAL_JANUARY, 2 => _CAL_FEBRUARY, 3 => _CAL_MARCH, 4 => _CAL_APRIL, 5 => _CAL_MAY, 6 => _CAL_JUNE, 7 => _CAL_JULY, 8 => _CAL_AUGUST, 9 => _CAL_SEPTEMBER, 10 => _CAL_OCTOBER, 11 => _CAL_NOVEMBER, 12 => _CAL_DECEMBER);
+$monthsArray = array(1 => _CAL_JANUARY, 2 => _CAL_FEBRUARY, 3 => _CAL_MARCH, 4 => _CAL_APRIL, 5 => _CAL_MAY, 6 => _CAL_JUNE, 7 => _CAL_JULY, 8 => _CAL_AUGUST, 9 => _CAL_SEPTEMBER, 10 => _CAL_OCTOBER, 11 => _CAL_NOVEMBER, 12 => _CAL_DECEMBER);
 $fromyear   = XoopsRequest::getInt('year');
 $frommonth  = XoopsRequest::getInt('month');
 
 $pgtitle = '';
 if ($fromyear && $frommonth) {
-    $pgtitle = sprintf(" - %d - %d", $fromyear, $frommonth);
+    $pgtitle = sprintf(' - %d - %d', $fromyear, $frommonth);
 }
 
 $dateformat = $publisher->getConfig('format_date');
@@ -68,37 +68,38 @@
 $criteria->setSort('datesub');
 $criteria->setOrder('DESC');
 //Get all articles dates as an array to save memory
-$items      = $publisher->getHandler('item')->getAll($criteria, array('datesub'), false);
+$items      =& $publisher->getHandler('item')->getAll($criteria, array('datesub'), false);
 $itemsCount = count($items);
 
 if (!($itemsCount > 0)) {
     redirect_header(XOOPS_URL, 2, _MD_PUBLISHER_NO_TOP_PERMISSIONS);
-//mb    exit;
+    //mb    exit;
 } else {
     $years  = array();
     $months = array();
     $i      = 0;
     foreach ($items as $item) {
-        $time = XoopsLocal::formatTimestamp($item['datesub'], 'mysql', $useroffset);
-        if (preg_match("/([0-9]{4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})/", $time, $datetime)) {
-            $this_year  = (int)($datetime[1]);
-            $this_month = (int)($datetime[2]);
+        //mb        $time = XoopsLocal::formatTimestamp($item['datesub'], 'mysql', $useroffset);
+        $time = formatTimestamp($item['datesub'], 'mysql', $useroffset);
+        if (preg_match('/(\d{4})-(\d{1,2})-(\d{1,2}) (\d{1,2}):(\d{1,2}):(\d{1,2})/', $time, $datetime)) {
+            $thisYear  = (int)($datetime[1]);
+            $thisMonth = (int)($datetime[2]);
             //first year
             if (empty($lastyear)) {
-                $lastyear          = $this_year;
+                $lastyear          = $thisYear;
                 $articlesThisYear  = 0;
                 $articlesThisMonth = 0;
             }
             //first month of the year reset
             if ($lastmonth == 0) {
-                $lastmonth                    = $this_month;
-                $months[$lastmonth]['string'] = $months_arr[$lastmonth];
+                $lastmonth                    = $thisMonth;
+                $months[$lastmonth]['string'] = $monthsArray[$lastmonth];
                 $months[$lastmonth]['number'] = $lastmonth;
-//                $months[$lastmonth]['articlesMonthCount'] = 1;
+                //                $months[$lastmonth]['articlesMonthCount'] = 1;
                 $articlesThisMonth = 0;
             }
             //new year
-            if ($lastyear != $this_year) {
+            if ($lastyear != $thisYear) {
                 $years[$i]['number'] = $lastyear;
                 $years[$i]['months'] = $months;
 
@@ -106,18 +107,18 @@
 
                 $months            = array();
                 $lastmonth         = 0;
-                $lastyear          = $this_year;
+                $lastyear          = $thisYear;
                 $articlesThisYear  = 0;
                 $articlesThisMonth = 0;
                 ++$i;
             }
             //new month
-            if ($lastmonth != $this_month) {
+            if ($lastmonth != $thisMonth) {
                 if ($articlesThisMonth > 0) {
                     $months[$lastmonth]['articlesMonthCount'] = $articlesThisMonth;
                 }
-                $lastmonth                                = $this_month;
-                $months[$lastmonth]['string']             = $months_arr[$lastmonth];
+                $lastmonth                                = $thisMonth;
+                $months[$lastmonth]['string']             = $monthsArray[$lastmonth];
                 $months[$lastmonth]['number']             = $lastmonth;
                 $months[$lastmonth]['articlesMonthCount'] = 1;
                 $articlesThisMonth                        = 0;
@@ -127,8 +128,8 @@
             ++$articlesThisYear;
         }
     }
-    unset($item);
-    $years[$i]['number'] = $this_year;
+//    unset($item);
+    $years[$i]['number'] = $thisYear;
     $years[$i]['months'] = $months;
 
     $years[$i]['articlesYearCount'] = $articlesThisYear;
@@ -140,7 +141,7 @@
 if ($fromyear != 0 && $frommonth != 0) {
     $xoopsTpl->assign('show_articles', true);
     $xoopsTpl->assign('lang_articles', _MD_PUBLISHER_ITEM);
-    $xoopsTpl->assign('currentmonth', $months_arr[$frommonth]);
+    $xoopsTpl->assign('currentmonth', $monthsArray[$frommonth]);
     $xoopsTpl->assign('currentyear', $fromyear);
     $xoopsTpl->assign('lang_actions', _MD_PUBLISHER_ACTIONS);
     $xoopsTpl->assign('lang_date', _MD_PUBLISHER_DATE);
@@ -154,13 +155,13 @@
 
     $count = 0;
 
-    $itemhandler               = $publisher->getHandler('item');
-    $itemhandler->table_link   = $GLOBALS['xoopsDB']->prefix('publisher_categories');
-    $itemhandler->field_link   = 'categoryid';
-    $itemhandler->field_object = 'categoryid';
+    $itemHandler               =& $publisher->getHandler('item');
+    $itemHandler->tableLink   = $GLOBALS['xoopsDB']->prefix('publisher_categories');
+    $itemHandler->fieldLink   = 'categoryid';
+    $itemHandler->fieldObject = 'categoryid';
     // Categories for which user has access
     $categoriesGranted =& $publisher->getHandler('permission')->getGrantedItems('category_read');
-    $grantedCategories = new Criteria('l.categoryid', "(" . implode(',', $categoriesGranted) . ")", 'IN');
+    $grantedCategories = new Criteria('l.categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN');
     $criteria          = new CriteriaCompo();
     $criteria->add($grantedCategories, 'AND');
     $criteria->add(new Criteria('o.status', 2), 'AND');
@@ -171,26 +172,22 @@
     $criteria->setSort('o.datesub');
     $criteria->setOrder('DESC');
     $criteria->setLimit(3000);
-    $storyarray = $itemhandler->getByLink($criteria); //Query Efficiency?
+    $storyarray = $itemHandler->getByLink($criteria); //Query Efficiency?
 
     $count = count($storyarray);
     if (is_array($storyarray) && $count > 0) {
         foreach ($storyarray as $item) {
-            $story     = array();
-            $htmltitle = '';
-            $story['title']
-                                 =
-                "<a href='" . XOOPS_URL . '/modules/' . PUBLISHER_DIRNAME . '/category.php?categoryid=' . $item->categoryid() . "'>" . $item->getCategoryName() . "</a>: <a href='" . $item->getItemUrl() . "'"
-                . $htmltitle . ">" . $item->title() . "</a>";
+            $story               = array();
+            $htmltitle           = '';
+            $story['title']      = "<a href='" . XOOPS_URL . '/modules/' . PUBLISHER_DIRNAME . '/category.php?categoryid=' . $item->categoryid() . "'>" . $item->getCategoryName() . "</a>: <a href='" . $item->getItemUrl() . "'" . $htmltitle . '>' . $item->getTitle() . '</a>';
             $story['counter']    = $item->counter();
-            $story['date']       = $item->datesub();
+            $story['date']       = $item->getDatesub();
             $story['print_link'] = XOOPS_URL . '/modules/' . PUBLISHER_DIRNAME . '/print.php?itemid=' . $item->itemid();
-            $story['mail_link']  = 'mailto:?subject=' . sprintf(_CO_PUBLISHER_INTITEM, $GLOBALS['xoopsConfig']['sitename']) . '&amp;body=' . sprintf(_CO_PUBLISHER_INTITEMFOUND, $GLOBALS['xoopsConfig']['sitename']) . ':  '
-                                   . $item->getItemUrl();
+            $story['mail_link']  = 'mailto:?subject=' . sprintf(_CO_PUBLISHER_INTITEM, $GLOBALS['xoopsConfig']['sitename']) . '&amp;body=' . sprintf(_CO_PUBLISHER_INTITEMFOUND, $GLOBALS['xoopsConfig']['sitename']) . ':  ' . $item->getItemUrl();
 
             $xoopsTpl->append('stories', $story);
         }
-        unset($item);
+//        unset($item);
     }
     $xoopsTpl->assign('lang_printer', _MD_PUBLISHER_PRINTERFRIENDLY);
     $xoopsTpl->assign('lang_sendstory', _MD_PUBLISHER_SENDSTORY);
diff --git a/publisher/assets/css/jquery.popeye.css b/publisher/assets/css/jquery.popeye.css
index ba4066e6..f88a3f03 100644
--- a/publisher/assets/css/jquery.popeye.css
+++ b/publisher/assets/css/jquery.popeye.css
@@ -4,7 +4,7 @@
  * Mandatory CSS classes for jQuery.popeye
  *
  * Copyright (C) 2011 Christoph Schuessler (schreib@herr-schuessler.de)
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -12,26 +12,27 @@
  *
  */
 .ppy-outer {
-    display:                none;
+    display: none;
 }
+
 .ppy-active .ppy-outer {
-    display:                block;
+    display: block;
 }
+
 .ppy-stage {
-    background-repeat:      no-repeat !important;
-    background-position:    center center !important;
-    position:               relative;
+    background: no-repeat center center !important;
+    position: relative;
 }
 
 .ppy-placeholder {
-    position:               relative;
+    position: relative;
 }
 
 .ppy-caption,
 .ppy-captionwrap {
-    overflow:               hidden;
+    overflow: hidden;
 }
 
 .ppy-hidden {
-    display:                none !important;
-}
\ No newline at end of file
+    display: none !important;
+}
diff --git a/publisher/assets/css/jquery.popeye.style.css b/publisher/assets/css/jquery.popeye.style.css
index fb774d3d..601b3289 100644
--- a/publisher/assets/css/jquery.popeye.style.css
+++ b/publisher/assets/css/jquery.popeye.style.css
@@ -4,7 +4,7 @@
  * Example styles for jQuery.popeye
  *
  * Copyright (C) 2011 Christoph Schuessler (schreib@herr-schuessler.de)
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -14,413 +14,409 @@
 
 /* fallback styles for image list */
 .ppy-imglist {
-    width:          100%;
-    display:        block;
-    overflow:       hidden;
-    
+    width: 100%;
+    display: block;
+    overflow: hidden;
+
 }
+
 .ppy-imglist li {
-    padding:        10px;
-    border:         1px solid #f0f0f0;
-    border-radius:          5px;
-    -moz-border-radius:     5px;
-    -khtml-border-radius:   5px;
-    -webkit-border-radius:  5px;
-    background:     #fff;
-    list-style:     none;
-    float:          left;
-    display:        block;
-    margin:         0 10px 10px 0;
+    padding: 10px;
+    border: 1px solid #f0f0f0;
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    background: #fff;
+    list-style: none;
+    float: left;
+    display: block;
+    margin: 0 10px 10px 0;
 }
+
 .ppy-imglist li a img {
-    display:        block;
-    border:         0;
+    display: block;
+    border: 0;
 }
+
 #ppy1 .ppy-extcaption {
-    width:          240px;
-    display:        block;
+    width: 240px;
+    display: block;
 }
+
 #ppy1 .ppy-imglist li {
-    width:          240px;
-    height:         270px;
+    width: 240px;
+    height: 270px;
 }
+
 #ppy2 .ppy-imglist li,
 #ppy2 .ppy-imglist li a {
-    width:              160px;
-    height:             160px;
-    overflow:           hidden;
-    display:        block;
+    width: 160px;
+    height: 160px;
+    overflow: hidden;
+    display: block;
 }
 
-
-
-
 /* popeye example 1 */
 #ppy1.ppy-active {
-    width:          262px;
-    float:          left;
-    margin:         0 20px 10px 0;
+    width: 262px;
+    float: left;
+    margin: 0 20px 10px 0;
 }
 
 #ppy1 .ppy-outer {
-    padding:        10px;
-    border:         1px solid #e1f1a1;
-    border-radius:          0 10px 10px 10px;
-    -moz-border-radius:     0 10px 10px 10px;
-    -webkit-border-radius:  0 10px 10px 10px;
-    background:     #eff9c7;
+    padding: 10px;
+    border: 1px solid #e1f1a1;
+    border-radius: 0 10px 10px 10px;
+    -moz-border-radius: 0 10px 10px 10px;
+    -webkit-border-radius: 0 10px 10px 10px;
+    background: #eff9c7;
 }
 
 #ppy1 .ppy-stage {
-    width:          240px;
-    height:         173px;
-    border-radius:          0 5px 5px 5px;
-    -moz-border-radius:     0 5px 5px 5px;
-    -webkit-border-radius:  0 5px 5px 5px;
-    cursor:         pointer;
+    width: 240px;
+    height: 173px;
+    border-radius: 0 5px 5px 5px;
+    -moz-border-radius: 0 5px 5px 5px;
+    -webkit-border-radius: 0 5px 5px 5px;
+    cursor: pointer;
 }
 
 #ppy1 .ppy-outer:hover,
 #ppy1.ppy-expanded .ppy-outer {
-    border:         1px solid #d5e68e;
-    box-shadow:         0 0 7px #ccc;
-    -moz-box-shadow:    0 0 7px #ccc;
+    border: 1px solid #d5e68e;
+    box-shadow: 0 0 7px #ccc;
+    -moz-box-shadow: 0 0 7px #ccc;
     -webkit-box-shadow: 0 0 7px #ccc;
 }
 
 #ppy1 .ppy-caption {
-    margin:         5px 0 0 0;
-    padding:        10px;
-    font-size:      0.9em;
-    line-height:    1.3em;
-    color:          #809f21;
-    background:     #eeffa8;
-    border-radius:          10px;
-    -moz-border-radius:     10px;
-    -webkit-border-radius:  10px;
-    box-shadow:         0 0 7px #ccc;
-    -moz-box-shadow:    0 0 7px #ccc;
+    margin: 5px 0 0 0;
+    padding: 10px;
+    font-size: 0.9em;
+    line-height: 1.3em;
+    color: #809f21;
+    background: #eeffa8;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+    box-shadow: 0 0 7px #ccc;
+    -moz-box-shadow: 0 0 7px #ccc;
     -webkit-box-shadow: 0 0 7px #ccc;
-    visibility:         hidden; /* prevent flash of content before popeye loads */
+    visibility: hidden; /* prevent flash of content before popeye loads */
 }
 
 #ppy1 .ppy-caption a {
-    color:          #66bde9;
+    color: #66bde9;
 }
+
 #ppy1 .ppy-caption a:hover {
-    text-decoration:underline;
+    text-decoration: underline;
 }
 
 #ppy1 .ppy-counter {
-    border-bottom:  1px solid #d5e68e;
-    color:          #b8cf5a;
-    padding:        0 0 2px 0;
-    margin:         0 0 5px 0;
-    font-size:      0.9em;
+    border-bottom: 1px solid #d5e68e;
+    color: #b8cf5a;
+    padding: 0 0 2px 0;
+    margin: 0 0 5px 0;
+    font-size: 0.9em;
 }
 
 #ppy1 .ppy-stagewrap {
-    background:     #0c3b3d;
-    border-radius:          0 5px 5px 5px;
-    -moz-border-radius:     0 5px 5px 5px;
-    -webkit-border-radius:  0 5px 5px 5px;
+    background: #0c3b3d;
+    border-radius: 0 5px 5px 5px;
+    -moz-border-radius: 0 5px 5px 5px;
+    -webkit-border-radius: 0 5px 5px 5px;
 }
 
 #ppy1 .ppy-loading {
-    background:     #0c3b3d url(../images/popeye/loading1.gif) no-repeat center !important;
+    background: #0c3b3d url(../images/popeye/loading1.gif) no-repeat center !important;
 }
 
 #ppy1 .ppy-nav {
-    background:     #0c3b3d;
-    background:     -moz-linear-gradient(center bottom, rgb(12,59,61) 0%, rgb(58,131,133) 100%);
-    width:          104px;
-    height:         32px;
-    padding:        5px;
-    position:       absolute;
-    top:            0;
-    left:           0;  
-    border-radius:          0 0 5px 5px;
-    -moz-border-radius:     0 0 5px 5px;
-    -webkit-border-radius:  0 0 5px 5px;   
+    background: #0c3b3d;
+    background: -moz-linear-gradient(center bottom, #0c3b3d 0%, #3a8385 100%);
+    width: 104px;
+    height: 32px;
+    padding: 5px;
+    position: absolute;
+    top: 0;
+    left: 0;
+    border-radius: 0 0 5px 5px;
+    -moz-border-radius: 0 0 5px 5px;
+    -webkit-border-radius: 0 0 5px 5px;
 }
 
 #ppy1 .ppy-nav a {
-    display:        block;
-    overflow:       hidden;
-    text-indent:    -900em;
-    height:         22px;
-    float:          left;
-    padding:        5px;
-    border-radius:          5px;
-    -moz-border-radius:     5px;
-    -khtml-border-radius:   5px;
-    -webkit-border-radius:  5px; 
+    display: block;
+    overflow: hidden;
+    text-indent: -900em;
+    height: 22px;
+    float: left;
+    padding: 5px;
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
 }
 
 #ppy1 .ppy-prev {
-    width:          22px;
-    background:     url(../images/popeye/prev3.png) no-repeat center;
+    width: 22px;
+    background: url(../images/popeye/prev3.png) no-repeat center;
 }
 
 #ppy1 .ppy-next {
-    width:          22px;
-    background:     url(../images/popeye/next3.png) no-repeat center;
+    width: 22px;
+    background: url(../images/popeye/next3.png) no-repeat center;
 }
 
 #ppy1 .ppy-switch-enlarge {
-    width:          30px;
-    background:     url(../images/popeye/enlarge3.png) no-repeat center;
+    width: 30px;
+    background: url(../images/popeye/enlarge3.png) no-repeat center;
 }
 
 #ppy1 .ppy-switch-compact {
-    width:          30px;
-    background:     url(../images/popeye/compact3.png) no-repeat center;
+    width: 30px;
+    background: url(../images/popeye/compact3.png) no-repeat center;
 }
 
 #ppy1 .ppy-nav a:hover {
-    background-color:   #a1c436;
-    cursor:         pointer;
+    background-color: #a1c436;
+    cursor: pointer;
 }
 
-
 /* popeye example 2 */
 #ppy2.ppy-active {
-    width:          224px;
-    float:          right;
-    margin:         0 0 10px 20px;
+    width: 224px;
+    float: right;
+    margin: 0 0 10px 20px;
 }
 
 #ppy2 .ppy-outer {
-    padding:        0 46px 0 0;
-    
+    padding: 0 46px 0 0;
+
 }
+
 #ppy2 .ppy-stagewrap {
-    padding:        7px;
-    border-radius:          5px 0 5px 5px;
-    -moz-border-radius:     5px 0 5px 5px;
-    -webkit-border-radius:  5px 0 5px 5px;
-    background:     #c1eaff;
-    background:     rgba(193,234,255,0.7);
+    padding: 7px;
+    border-radius: 5px 0 5px 5px;
+    -moz-border-radius: 5px 0 5px 5px;
+    -webkit-border-radius: 5px 0 5px 5px;
+    background: #c1eaff;
 }
 
 #ppy2 .ppy-stage {
-    width:              160px;
-    height:             160px;
-    border:             2px solid #fff;
-    border-radius:          3px;
-    -moz-border-radius:     3px;
-    -webkit-border-radius:  3px;
-    background-color:       #777;
-    cursor:         pointer;
+    width: 160px;
+    height: 160px;
+    border: 2px solid #fff;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    background-color: #777;
+    cursor: pointer;
 }
 
 #ppy2 .ppy-counter {
-    background:         #fff;
-    color:              #333;
-    padding:            0 5px;
-    font-size:          0.8em;
-    position:           absolute;
-    bottom:             0;
-    right:              0;
-    opacity:            0.7;
-    border-radius:          5px 0 0 0;
-    -moz-border-radius:     5px 0 0 0;
-    -khtml-border-radius:   5px 0 0 0;
-    -webkit-border-radius:  5px 0 0 0; 
+    background: #fff;
+    color: #333;
+    padding: 0 5px;
+    font-size: 0.8em;
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    opacity: 0.7;
+    border-radius: 5px 0 0 0;
+    -moz-border-radius: 5px 0 0 0;
+    -webkit-border-radius: 5px 0 0 0;
 }
 
 #ppy2 .ppy-loading {
-    background-image:   url(../images/popeye/loading2.gif);
-    background-repeat:  no-repeat;
-    background-position:center;
+    background: url(../images/popeye/loading2.gif) no-repeat center;
 }
 
 #ppy2 .ppy-nav {
-    border-radius:          0 5px 5px 0;
-    -moz-border-radius:     0 5px 5px 0;
-    -webkit-border-radius:  0 5px 5px 0;
-    background:     #76c6ee;
-    background:     -webkit-gradient(
-        linear,
-        left top,
-        right bottom,
-        color-stop(0, rgb(118,198,238)),
-        color-stop(1, rgb(45,158,214))
+    border-radius: 0 5px 5px 0;
+    -moz-border-radius: 0 5px 5px 0;
+    -webkit-border-radius: 0 5px 5px 0;
+    background: #76c6ee;
+    background: -webkit-gradient(
+            linear,
+            left top,
+            right bottom,
+            color-stop(0, #76c6ee),
+            color-stop(1, #2d9ed6)
     );
-    background:     -moz-linear-gradient(
-        left top,
-        rgb(118,198,238) 0%,
-        rgb(45,158,214) 100%
+    background: -moz-linear-gradient(
+            left top,
+            #76c6ee 0%,
+            #2d9ed6 100%
     );
-    border-left:    1px solid #6ab1d5;
-    width:          45px;
-    position:       absolute;
-    top:            4px;
-    right:          0;
+    border-left: 1px solid #6ab1d5;
+    width: 45px;
+    position: absolute;
+    top: 4px;
+    right: 0;
 }
 
 #ppy2 .nav-wrap {
-    padding:        5px 0;
+    padding: 5px 0;
 }
 
 #ppy2 .ppy-nav a {
-    display:        block;
-    overflow:       hidden;
-    text-indent:    -900em;
-    height:         22px;
-    padding:        5px;
-    border-radius:          0 5px 5px 0;
-    -moz-border-radius:     0 5px 5px 0;
-    -webkit-border-radius:  0 5px 5px 0;
-    width:          30px;
+    display: block;
+    overflow: hidden;
+    text-indent: -900em;
+    height: 22px;
+    padding: 5px;
+    border-radius: 0 5px 5px 0;
+    -moz-border-radius: 0 5px 5px 0;
+    -webkit-border-radius: 0 5px 5px 0;
+    width: 30px;
 }
 
 #ppy2 .ppy-prev {
-    background:     url(../images/popeye/prev3.png) no-repeat center;
+    background: url(../images/popeye/prev3.png) no-repeat center;
 }
 
 #ppy2 .ppy-next {
-    background:     url(../images/popeye/next3.png) no-repeat center;
+    background: url(../images/popeye/next3.png) no-repeat center;
 }
 
 #ppy2 .ppy-switch-enlarge {
-    background:     url(../images/popeye/enlarge4.png) no-repeat center;
+    background: url(../images/popeye/enlarge4.png) no-repeat center;
 }
 
 #ppy2 .ppy-switch-compact {
-    background:     url(../images/popeye/compact4.png) no-repeat center;
+    background: url(../images/popeye/compact4.png) no-repeat center;
 }
 
 #ppy2 .ppy-nav a:hover {
-    background-color:   #378eba;
-    cursor:         pointer;
-    opacity:        0.8;
+    background-color: #378eba;
+    cursor: pointer;
+    opacity: 0.8;
 }
 
-
-
 /* popeye example 3 */
 #ppy3.ppy-active {
-    width:          240px;
-    float:          left;
-    margin:         0 20px 10px 0;
+    width: 240px;
+    float: left;
+    margin: 0 20px 10px 0;
 }
 
 #ppy3 .ppy-outer {
 }
 
 #ppy3 .ppy-stage {
-    width:          240px;
-    height:         180px;
-    overflow:       hidden;
-    cursor:         pointer;
+    width: 240px;
+    height: 180px;
+    overflow: hidden;
+    cursor: pointer;
 }
 
 #ppy3 .ppy-stagewrap {
-    background:     #333;
+    background: #333;
 }
 
 #ppy3 .ppy-caption {
-    margin:         10px 0 0 0;
-    padding:        0 5px 3px 0;
-    font-size:      0.9em;
-    line-height:    1.3em;
-    color:          #666;
-    height:         60px;
-    overflow:       auto;
-    border-bottom:  1px solid #ddd;
+    margin: 10px 0 0 0;
+    padding: 0 5px 3px 0;
+    font-size: 0.9em;
+    line-height: 1.3em;
+    color: #666;
+    height: 60px;
+    overflow: auto;
+    border-bottom: 1px solid #ddd;
 }
 
 #ppy3.ppy-expanded .ppy-caption {
-    margin:         0;
-    padding:        10px;
-    color:          #fff;
-    border-bottom:  1px solid #333;
-    background:     #666;
+    margin: 0;
+    padding: 10px;
+    color: #fff;
+    border-bottom: 1px solid #333;
+    background: #666;
 }
 
 #ppy3 .ppy-counter {
-    background:     #333;
-    color:          #fff;
-    padding:        0 5px;
-    font-size:      0.8em;
-    position:       absolute;
-    bottom:         0;
-    left:           0;
-    opacity:        0.7;
+    background: #333;
+    color: #fff;
+    padding: 0 5px;
+    font-size: 0.8em;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    opacity: 0.7;
 }
 
 #ppy3 .ppy-loading {
-    background:     #333 url(../images/popeye/loading3.gif) no-repeat center !important;
+    background: #333 url(../images/popeye/loading3.gif) no-repeat center !important;
 }
 
 #ppy3 .ppy-nav {
-    background:     #333;
-    background:     rgba(51,51,51,0.7);
-    background:     -webkit-gradient(
-        linear,
-        left bottom,
-        left top,
-        color-stop(0, rgba(51,51,51,1)),
-        color-stop(0.4, rgba(51,51,51,0.7)),
-        color-stop(0.6, rgba(51,51,51,0.7)),
-        color-stop(1, rgba(51,51,51,1))
+    background: #333;
+    background: #333333;
+    background: -webkit-gradient(
+            linear,
+            left bottom,
+            left top,
+            color-stop(0, #333333),
+            color-stop(0.4, #333333),
+            color-stop(0.6, #333333),
+            color-stop(1, #333333)
     );
-    background:     -moz-linear-gradient(center bottom, rgba(51,51,51,1) 0%, rgba(51,51,51,0.7) 40%, rgba(51,51,51,0.7) 60%, rgba(51,51,51,1) 100%);
-    width:          100%;
-    height:         100%;
-    text-align:     center;
+    background: -moz-linear-gradient(center bottom, #333333 0%, #333333 40%, #333333 60%, #333333 100%);
+    width: 100%;
+    height: 100%;
+    text-align: center;
 }
+
 #ppy3 .nav-wrap {
-    width:          104px;
-    height:         32px;
-    padding:        30% 0 0 0;
-    margin:         0 auto 0 auto;
+    width: 104px;
+    height: 32px;
+    padding: 30% 0 0 0;
+    margin: 0 auto 0 auto;
 }
+
 #ppy3 .ppy-nav a {
-    display:        block;
-    overflow:       hidden;
-    text-indent:    -900em;
-    height:         22px;
-    float:          left;
-    padding:        5px;
-    border-radius:          5px;
-    -moz-border-radius:     5px;
-    -khtml-border-radius:   5px;
-    -webkit-border-radius:  5px; 
+    display: block;
+    overflow: hidden;
+    text-indent: -900em;
+    height: 22px;
+    float: left;
+    padding: 5px;
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
 }
 
 #ppy3 .ppy-prev {
-    width:          22px;
-    background:     url(../images/popeye/prev3.png) no-repeat center;
+    width: 22px;
+    background: url(../images/popeye/prev3.png) no-repeat center;
 }
 
 #ppy3 .ppy-next {
-    width:          22px;
-    background:     url(../images/popeye/next3.png) no-repeat center;
+    width: 22px;
+    background: url(../images/popeye/next3.png) no-repeat center;
 }
 
 #ppy3 .ppy-switch-enlarge {
-    width:          30px;
-    background:     url(../images/popeye/enlarge3.png) no-repeat center;
+    width: 30px;
+    background: url(../images/popeye/enlarge3.png) no-repeat center;
 }
 
 #ppy3 .ppy-switch-compact {
-    width:          30px;
-    background:     url(../images/popeye/compact3.png) no-repeat center;
+    width: 30px;
+    background: url(../images/popeye/compact3.png) no-repeat center;
 }
 
 #ppy3 .ppy-play {
-    width:          22px;
-    background:     url(../images/popeye/play3.png) no-repeat center;
+    width: 22px;
+    background: url(../images/popeye/play3.png) no-repeat center;
 }
 
 #ppy3 .ppy-pause {
-    width:          22px;
-    background:     url(../images/popeye/pause3.png) no-repeat center;
+    width: 22px;
+    background: url(../images/popeye/pause3.png) no-repeat center;
 }
 
 #ppy3 .ppy-nav a:hover {
-    background-color:   #333;
-    cursor:         pointer;
+    background-color: #333;
+    cursor: pointer;
 }
diff --git a/publisher/assets/css/publisher.css b/publisher/assets/css/publisher.css
index d2ee3a4c..929128f7 100644
--- a/publisher/assets/css/publisher.css
+++ b/publisher/assets/css/publisher.css
@@ -5,214 +5,214 @@
 * Licence: GNU
 */
 .publisher_headertable {
-border-bottom:1px solid;
-width:100%;
-margin:0 0 20px;
-padding:0;
+    border-bottom: 1px solid;
+    width: 100%;
+    margin: 0 0 20px;
+    padding: 0;
 }
 
 .publisher_modulename {
-font-size:0.9em;
-text-align:left;
-font-weight: bold;
-padding-right:0.3em;
-line-height:18px;
+    font-size: 0.9em;
+    text-align: left;
+    font-weight: bold;
+    padding-right: 0.3em;
+    line-height: 18px;
 }
 
 .publisher_breadcrumb {
-font-size:0.9em;
-line-height:18px;
-width:100%;
+    font-size: 0.9em;
+    line-height: 18px;
+    width: 100%;
 }
 
 .publisher_infotitle {
-margin-top:8px;
-margin-bottom:8px;
-font-size:250%;
-line-height:250%;
-font-weight: bold;
-display:block;
+    margin-top: 8px;
+    margin-bottom: 8px;
+    font-size: 250%;
+    line-height: 250%;
+    font-weight: bold;
+    display: block;
 }
 
 .publisher_infotext {
-margin-bottom:8px;
-line-height:130%;
-display:block;
+    margin-bottom: 8px;
+    line-height: 130%;
+    display: block;
 }
 
 .publisher_category_index_list {
-padding-top:5px;
-padding-bottom:5px;
-border-bottom:1px solid;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    border-bottom: 1px solid;
 }
 
 .publisher_categoryname {
-padding-bottom:5px;
-vertical-align:middle;
-font-size:120%;
-text-align:left;
-font-weight: bold;
-line-height:120%;
-margin:0;
+    padding-bottom: 5px;
+    vertical-align: middle;
+    font-size: 120%;
+    text-align: left;
+    font-weight: bold;
+    line-height: 120%;
+    margin: 0;
 }
 
 .publisher_category_image {
-float:left;
-padding-right:5px;
-display:block;
+    float: left;
+    padding-right: 5px;
+    display: block;
 }
 
 .publisher_category_header {
-clear:both;
-padding-top:10px;
-padding-bottom:5px;
+    clear: both;
+    padding-top: 10px;
+    padding-bottom: 5px;
 }
 
 .publisher_subcats {
-clear:both;
-padding-top:5px;
-font-size:90%;
+    clear: both;
+    padding-top: 5px;
+    font-size: 90%;
 }
 
 .publisher_subcats_info {
-padding-bottom:5px;
-font-weight:bold;
+    padding-bottom: 5px;
+    font-weight: bold;
 }
 
 .publisher_collaps_title {
-margin-bottom:2px;
-margin-top:5px;
-font-size:130%;
-line-height:130%;
-font-weight:bold;
-display:block;
+    margin-bottom: 2px;
+    margin-top: 5px;
+    font-size: 130%;
+    line-height: 130%;
+    font-weight: bold;
+    display: block;
 }
 
 .publisher_collaps_info {
-display:block;
-margin:3px 0 12px;
+    display: block;
+    margin: 3px 0 12px;
 }
 
 .publisher_item_head_cat {
 
-text-align:right;
-font-style:normal;
-vertical-align:middle;
-display:block;
+    text-align: right;
+    font-style: normal;
+    vertical-align: middle;
+    display: block;
 }
 
 .publisher_item_head_who {
-padding-top:5px;
-text-align:right;
-font-style:normal;
-vertical-align:middle;
-display:block;
+    padding-top: 5px;
+    text-align: right;
+    font-style: normal;
+    vertical-align: middle;
+    display: block;
 }
 
 .publisher_item_image {
-display:block;
-padding:5px;
+    display: block;
+    padding: 5px;
 }
 
 .publisher_items_link {
-width:50%;
-vertical-align:middle;
+    width: 50%;
+    vertical-align: middle;
 }
 
 .publisher_items_list {
-padding-top:10px;
+    padding-top: 10px;
 }
 
 .publisher_items_list_item {
-padding-top:5px;
-padding-bottom:5px;
+    padding-top: 5px;
+    padding-bottom: 5px;
 }
 
 .publisher_list {
-font-size:16px;
-padding:8px;
+    font-size: 16px;
+    padding: 8px;
 }
 
 .publisher_category_dsc {
-font-size:small;
-display:block;
-margin:3px 0 10px;
+    font-size: small;
+    display: block;
+    margin: 3px 0 10px;
 }
 
 .publisher_adminlinks {
-padding-top:15px;
-padding-bottom:5px;
-font-size:10px;
-text-align:center;
-line-height:18px;
+    padding-top: 15px;
+    padding-bottom: 5px;
+    font-size: 10px;
+    text-align: center;
+    line-height: 18px;
 }
 
 .publisher_itemFoot {
-text-align:right;
-border:1px solid gray;
-padding:3px;
+    text-align: right;
+    border: 1px solid gray;
+    padding: 3px;
 }
 
 .publisher_pre_itemInfo {
-padding-top:5px;
+    padding-top: 5px;
 }
 
 .publisher_modfooter {
-text-align:center;
-padding-top:6px;
-font-size:9px;
+    text-align: center;
+    padding-top: 6px;
+    font-size: 9px;
 
 }
 
 .publisher_spotlight_readmore {
-display:block;
-width:100px;
-height:20px;
-background-color:#aaa;
-color:#fff;
-text-align:center;
-padding-top:5px;
+    display: block;
+    width: 100px;
+    height: 20px;
+    background-color: #aaa;
+    color: #fff;
+    text-align: center;
+    padding-top: 5px;
 }
 
 .publisher_pagenav_top {
-padding-top:5px;
-font-size:10px;
-text-align:left;
+    padding-top: 5px;
+    font-size: 10px;
+    text-align: left;
 }
 
 .publisher_pagenav_bottom {
-padding-top:5px;
-padding-bottom:5px;
-font-size:10px;
-text-align:center;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    font-size: 10px;
+    text-align: center;
 }
 
 #publisher_rpublisher_feed {
-padding-top:5px;
-padding-bottom:10px;
-text-align:center;
+    padding-top: 5px;
+    padding-bottom: 10px;
+    text-align: center;
 }
 
 #publisher_embeded_files {
-text-align:center;
-display:block;
+    text-align: center;
+    display: block;
 }
 
 .publisher_tree ul {
-margin:0 0 0 6px;
-padding:0;
+    margin: 0 0 0 6px;
+    padding: 0;
 }
 
 .publisher_tree ul li {
-list-style-type:none;
-margin:0 0 2px;
-padding:0;
+    list-style-type: none;
+    margin: 0 0 2px;
+    padding: 0;
 }
 
 .publisher_tree ul li a {
-display:block;
-margin:0;
-padding:0;
+    display: block;
+    margin: 0;
+    padding: 0;
 }
 
 .publisher_tree .publisher_tree_category {
@@ -222,518 +222,523 @@ padding:0;
 .publisher_tree .publisher_tree_item {
 
 }
+
 #publisher_container {
-width:50%;
-border:1px solid #CCC;
-padding:20px;
+    width: 50%;
+    border: 1px solid #CCC;
+    padding: 20px;
 }
 
 .publisher_ratingblock {
 
 }
+
 .publisher_loading {
-height:30px;
-background:url(../images/working.gif) 50% 50% no-repeat;
-width:150px;
+    height: 30px;
+    background: url(../images/working.gif) 50% 50% no-repeat;
+    width: 150px;
 }
 
 .publisher_unit-rating {
-list-style:none;
-height:30px;
-position:relative;
-background:url(../images/starrating.gif) top left repeat-x;
-margin:0;
-padding:0;
+    list-style: none;
+    height: 30px;
+    position: relative;
+    background: url(../images/starrating.gif) top left repeat-x;
+    margin: 0;
+    padding: 0;
 }
 
 .publisher_unit-rating div {
-text-indent:-90000px;
-float:left;
-overflow:hidden;
-margin:0;
-padding:0;
+    text-indent: -90000px;
+    float: left;
+    overflow: hidden;
+    margin: 0;
+    padding: 0;
 }
 
 .publisher_unit-rating div a {
-outline:none;
-display:block;
-width:30px;
-height:30px;
-text-decoration:none;
-text-indent:-9000px;
-overflow:hidden;
-z-index:20;
-position:absolute;
-padding:0;
+    outline: none;
+    display: block;
+    width: 30px;
+    height: 30px;
+    text-decoration: none;
+    text-indent: -9000px;
+    overflow: hidden;
+    z-index: 20;
+    position: absolute;
+    padding: 0;
 }
 
 .publisher_unit-rating div a:hover {
-background:url(../images/starrating.gif) left center;
-z-index:2;
-left:0;
+    background: url(../images/starrating.gif) left center;
+    z-index: 2;
+    left: 0;
 }
 
 .publisher_unit-rating a.publisher_r1-unit {
-left:0;
+    left: 0;
 }
 
 .publisher_unit-rating a.publisher_r1-unit:hover {
-width:30px;
+    width: 30px;
 }
 
 .publisher_unit-rating a.publisher_r2-unit {
-left:30px;
+    left: 30px;
 }
 
 .publisher_unit-rating a.publisher_r2-unit:hover {
-width:60px;
+    width: 60px;
 }
 
 .publisher_unit-rating a.publisher_r3-unit {
-left:60px;
+    left: 60px;
 }
 
 .publisher_unit-rating a.publisher_r3-unit:hover {
-width:90px;
+    width: 90px;
 }
 
 .publisher_unit-rating a.publisher_r4-unit {
-left:90px;
+    left: 90px;
 }
 
 .publisher_unit-rating a.publisher_r4-unit:hover {
-width:120px;
+    width: 120px;
 }
 
 .publisher_unit-rating a.publisher_r5-unit {
-left:120px;
+    left: 120px;
 }
 
 .publisher_unit-rating a.publisher_r5-unit:hover {
-width:150px;
+    width: 150px;
 }
 
 .publisher_unit-rating a.publisher_r6-unit {
-left:150px;
+    left: 150px;
 }
 
 .publisher_unit-rating a.publisher_r6-unit:hover {
-width:180px;
+    width: 180px;
 }
 
 .publisher_unit-rating a.publisher_r7-unit {
-left:180px;
+    left: 180px;
 }
 
 .publisher_unit-rating a.publisher_r7-unit:hover {
-width:210px;
+    width: 210px;
 }
 
 .publisher_unit-rating a.publisher_r8-unit {
-left:210px;
+    left: 210px;
 }
 
 .publisher_unit-rating a.publisher_r8-unit:hover {
-width:240px;
+    width: 240px;
 }
 
 .publisher_unit-rating a.publisher_r9-unit {
-left:240px;
+    left: 240px;
 }
 
 .publisher_unit-rating a.publisher_r9-unit:hover {
-width:270px;
+    width: 270px;
 }
 
 .publisher_unit-rating a.publisher_r10-unit {
-left:270px;
+    left: 270px;
 }
 
 .publisher_unit-rating a.publisher_r10-unit:hover {
-width:300px;
+    width: 300px;
 }
 
 .publisher_unit-rating div.publisher_current-rating {
-background:url(../images/starrating.gif) left bottom;
-position:absolute;
-height:30px;
-display:block;
-text-indent:-9000px;
-z-index:1;
-overflow:hidden;
+    background: url(../images/starrating.gif) left bottom;
+    position: absolute;
+    height: 30px;
+    display: block;
+    text-indent: -9000px;
+    z-index: 1;
+    overflow: hidden;
 }
 
 .publisher_voted {
 
 }
+
 .publisher_thanks {
-color:#36AA3D;
+    color: #36AA3D;
 }
 
 /*****columns block************/
-h2.publisher-title,h4.publisher-title {
-line-height:1.1;
-font-size:110%;
-margin:0 0 5px;
-padding:0;
+h2.publisher-title, h4.publisher-title {
+    line-height: 1.1;
+    font-size: 110%;
+    margin: 0 0 5px;
+    padding: 0;
 }
+
 h2.publisher-title a, h4.publisher-title a {
 }
 
 .publisher-left {
-float:left;
-overflow:hidden;
+    float: left;
+    overflow: hidden;
 }
 
 .publisher-box {
-margin:10px;
-padding:10px 0;
+    margin: 10px;
+    padding: 10px 0;
 }
 
 .publisher-left .publisher-box {
-margin-left:10px;
+    margin-left: 10px;
 }
 
 div.publisher-section {
-display:block;
-margin-bottom:5px;
-padding-bottom:5px;
-font-size:92%;
+    display: block;
+    margin-bottom: 5px;
+    padding-bottom: 5px;
+    font-size: 92%;
 }
 
 div.publisher-section a {
-background:url(../images/dot-grey.gif) repeat-x left center;
-display:block;
-text-transform:uppercase;
-font-weight:bold;
-font-size:110%;
-letter-spacing:1px;
-padding:0 2px 2px 0;
+    background: url(../images/dot-grey.gif) repeat-x left center;
+    display: block;
+    text-transform: uppercase;
+    font-weight: bold;
+    font-size: 110%;
+    letter-spacing: 1px;
+    padding: 0 2px 2px 0;
 }
 
 div.publisher-section a span {
-border-left:4px solid;
-background:url(../images/span-bg.gif);
-padding:0 5px;
+    border-left: 4px solid;
+    background: url(../images/span-bg.gif);
+    padding: 0 5px;
 }
 
-div.publisher-section a:hover,div.publisher-section a:active,div.publisher-section a:focus {
-text-decoration:none;
+div.publisher-section a:hover, div.publisher-section a:active, div.publisher-section a:focus {
+    text-decoration: none;
 }
 
 .publisher-box:hover div.publisher-section a span, .hover div.publisher-section a span {
 
 }
+
 .publisher-more {
-text-transform:uppercase;
-display:block;
-clear:both;
-font-size:92%;
-letter-spacing:1px;
-margin:0 0 2px;
+    text-transform: uppercase;
+    display: block;
+    clear: both;
+    font-size: 92%;
+    letter-spacing: 1px;
+    margin: 0 0 2px;
 }
 
 ul.publisher-links {
-font-size:92%;
-margin:0;
-padding:0;
+    font-size: 92%;
+    margin: 0;
+    padding: 0;
 }
 
 ul.publisher-links li {
-list-style:none !important;
-padding-left:10px;
-background:url(../images/bullet.gif) no-repeat 1px 4px;
+    list-style: none !important;
+    padding-left: 10px;
+    background: url(../images/bullet.gif) no-repeat 1px 4px;
 }
 
 .publisher-content img {
-background:#F3F3EB;
-border:1px solid #CCC;
-margin:0 8px 10px 0;
-padding:4px;
+    background: #F3F3EB;
+    border: 1px solid #CCC;
+    margin: 0 8px 10px 0;
+    padding: 4px;
 }
 
 .publisher-clearfix:after {
-clear:both;
-display:block;
-content:".";
-height:0;
-visibility:hidden;
+    clear: both;
+    display: block;
+    content: ".";
+    height: 0;
+    visibility: hidden;
 }
 
 .clear {
-clear:both;
+    clear: both;
 }
 
 /* --------------- Latestnews Slider 1  --------------- */
 
 ul.pub_slideshow1 {
-list-style:none !important;
-height:200px;
-overflow:hidden;
-position:relative;
-margin:0;
-padding:0;
+    list-style: none !important;
+    height: 200px;
+    overflow: hidden;
+    position: relative;
+    margin: 0;
+    padding: 0;
 }
 
 ul.pub_slideshow1 li {
-position:absolute;
-left:0;
-right:0;
-list-style:none !important;
+    position: absolute;
+    left: 0;
+    right: 0;
+    list-style: none !important;
 }
 
 ul.pub_slideshow1 li.show {
-z-index:500;
+    z-index: 500;
 }
 
 ul.pub_slideshow1 img {
-border:none;
+    border: none;
 }
 
 #pub_slideshow1-caption {
-height:70px;
-position:absolute;
-bottom:0;
-left:0;
-color:#fff;
-background:#000;
-z-index:500;
+    height: 70px;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    color: #fff;
+    background: #000;
+    z-index: 500;
 }
 
 #pub_slideshow1-caption .pub_slideshow1-caption-container {
-z-index:1000;
-padding:5px 10px;
+    z-index: 1000;
+    padding: 5px 10px;
 }
 
 #pub_slideshow1-caption h3 {
-font-size:16px;
-margin:0;
-padding:0;
+    font-size: 16px;
+    margin: 0;
+    padding: 0;
 }
 
 #pub_slideshow1-caption p {
-font-weight:normal !important;
-margin:5px 0 0;
-padding:0;
+    font-weight: normal !important;
+    margin: 5px 0 0;
+    padding: 0;
 }
 
 /* --------------- Latestnews Slider 2  --------------- */
 
 .lof-slidecontent {
-position:relative;
-overflow:hidden;
-border:#F4F4F4 solid 1px;
-width:592px;
-height:300px;
+    position: relative;
+    overflow: hidden;
+    border: #F4F4F4 solid 1px;
+    width: 592px;
+    height: 300px;
 }
 
 .lof-main-outer {
-position:relative;
-height:100%;
-width:400px;
-z-index:3;
-overflow:hidden;
+    position: relative;
+    height: 100%;
+    width: 400px;
+    z-index: 3;
+    overflow: hidden;
 }
 
 ul.lof-main-wapper {
-height:300px;
-width:400px;
-position:absolute;
-overflow:hidden;
-list-style:none !important;
-margin:0;
-padding:0;
+    height: 300px;
+    width: 400px;
+    position: absolute;
+    overflow: hidden;
+    list-style: none !important;
+    margin: 0;
+    padding: 0;
 }
 
 ul.lof-main-wapper li {
-overflow:hidden;
-height:100%;
-width:400px;
-float:left;
-list-style:none !important;
-margin:0;
-padding:0;
+    overflow: hidden;
+    height: 100%;
+    width: 400px;
+    float: left;
+    list-style: none !important;
+    margin: 0;
+    padding: 0;
 }
 
 .lof-opacity li {
-position:absolute;
-top:0;
-left:0;
-float:inherit;
-list-style:none !important;
+    position: absolute;
+    top: 0;
+    left: 0;
+    float: inherit;
+    list-style: none !important;
 }
 
 ul.lof-main-wapper li img {
-width:400px;
-padding:0;
+    width: 400px;
+    padding: 0;
 }
 
 ul.lof-navigator {
-top:0;
-position:absolute;
-width:100%;
-margin:0 !important;
-padding:0 !important;
+    top: 0;
+    position: absolute;
+    width: 100%;
+    margin: 0 !important;
+    padding: 0 !important;
 }
 
 ul.lof-navigator li {
-cursor:pointer;
-list-style:none !important;
-width:100%;
-overflow:hidden;
-margin:0 !important;
-padding:0 !important;
+    cursor: pointer;
+    list-style: none !important;
+    width: 100%;
+    overflow: hidden;
+    margin: 0 !important;
+    padding: 0 !important;
 }
 
 .lof-navigator-outer {
-position:absolute;
-right:0;
-top:0;
-z-index:100;
-height:300px;
-width:210px;
-overflow:hidden;
-color:#FFF;
+    position: absolute;
+    right: 0;
+    top: 0;
+    z-index: 100;
+    height: 300px;
+    width: 210px;
+    overflow: hidden;
+    color: #FFF;
 }
 
 .lof-navigator li.active {
-background:url(../images/arrow-bg.png) no-repeat scroll left center;
-color:#FFF;
+    background: url(../images/arrow-bg.png) no-repeat scroll left center;
+    color: #FFF;
 }
 
 .lof-navigator li:hover {
 
 }
+
 .lof-navigator li h3 {
-margin:0;
-padding:15px 10px !important;
+    margin: 0;
+    padding: 15px 10px !important;
 }
-.lof-navigator li h3 a{
-color:#FFF;
-font-size:90%;
+
+.lof-navigator li h3 a {
+    color: #FFF;
+    font-size: 90%;
 }
 
 .lof-navigator li div {
-background:url(../images/transparent_bg.png);
-color:#FFF;
-height:100%;
-position:relative;
-margin-left:15px;
-padding-left:15px;
-border-top:1px solid #E1E1E1;
+    background: url(../images/transparent_bg.png);
+    color: #FFF;
+    height: 100%;
+    position: relative;
+    margin-left: 15px;
+    padding-left: 15px;
+    border-top: 1px solid #E1E1E1;
 }
 
 .lof-navigator li.active div {
-background:#941813 url(../images/grad-bg.png) repeat-x;
-color:#FFF;
+    background: #941813 url(../images/grad-bg.png) repeat-x;
+    color: #FFF;
 }
 
 .lof-navigator li img {
-height:60px;
-width:60px;
-float:left;
-border:#C5C5C5 solid 1px;
-margin:15px 15px 10px 0;
-padding:3px;
+    height: 60px;
+    width: 60px;
+    float: left;
+    border: #C5C5C5 solid 1px;
+    margin: 15px 15px 10px 0;
+    padding: 3px;
 }
 
 .lof-navigator li.active img {
-border:#6C8E5C solid 1px;
+    border: #6C8E5C solid 1px;
 }
 
 .lof-navigator li.active h3 {
-color:#FFF;
+    color: #FFF;
 }
 
 #publisher_upload_button {
-text-align:center;
-font-weight:normal;
-width:130px;
-margin-top:3px;
-border:1px solid #bbb;
-background-color:#D3D2D6;
-color:#405A80;
-padding:3px;
+    text-align: center;
+    font-weight: normal;
+    width: 130px;
+    margin-top: 3px;
+    border: 1px solid #bbb;
+    background-color: #D3D2D6;
+    color: #405A80;
+    padding: 3px;
 }
 
-.publisher_indexfooter,.publisher_itemfooter {
-font-size:10px;
-font-weight:bold;
-text-align:center;
-padding:10px;
+.publisher_indexfooter, .publisher_itemfooter {
+    font-size: 10px;
+    font-weight: bold;
+    text-align: center;
+    padding: 10px;
 }
 
-.publisher_tree ul li ul,.publisher_tree ul li ul li ul {
-padding-left:6px;
+.publisher_tree ul li ul, .publisher_tree ul li ul li ul {
+    padding-left: 6px;
 }
 
 .ppy-imglist li {
-    padding:        0;
-    border:         1px solid #f0f0f0;
-    border-radius:          0;
-    -moz-border-radius:     0;
-    -khtml-border-radius:   0;
-    -webkit-border-radius:  0;
-    background:     #fff;
-    list-style:     none;
-    float:          left;
-    display:        block;
-    margin:         0 0 0 0;
+    padding: 0;
+    border: 1px solid #f0f0f0;
+    border-radius: 0;
+    -moz-border-radius: 0;
+    -webkit-border-radius: 0;
+    background: #fff;
+    list-style: none;
+    float: left;
+    display: block;
+    margin: 0 0 0 0;
 }
 
 #ppy1 .ppy-outer {
-    padding:        0;
-    border:         1px solid #dddddd;
-    border-radius:          0 5px 5px 0;
-    -moz-border-radius:     0 5px 5px 0;
-    -webkit-border-radius:  0 5px 5px 0;
+    padding: 0;
+    border: 1px solid #dddddd;
+    border-radius: 0 5px 5px 0;
+    -moz-border-radius: 0 5px 5px 0;
+    -webkit-border-radius: 0 5px 5px 0;
     background: #dddddd;
 }
 
-
-
 #ppy1 .ppy-outer:hover,
 #ppy1.ppy-expanded .ppy-outer {
-    border:         1px solid #bcbcbc;
-    box-shadow:         0 0 7px #ccc;
-    -moz-box-shadow:    0 0 7px #ccc;
+    border: 1px solid #bcbcbc;
+    box-shadow: 0 0 7px #ccc;
+    -moz-box-shadow: 0 0 7px #ccc;
     -webkit-box-shadow: 0 0 7px #ccc;
 }
 
 #ppy1 .ppy-caption a {
-    color:          #66bde9;
+    color: #66bde9;
 }
+
 #ppy1 .ppy-caption a:hover {
-    text-decoration:underline;
+    text-decoration: underline;
 }
 
 #ppy1 .ppy-caption {
-    margin:         0 0 0 0;
-    padding:        10px;
-    font-size:      0.9em;
-    line-height:    1em;
+    margin: 0 0 0 0;
+    padding: 10px;
+    font-size: 0.9em;
+    line-height: 1em;
     color: #020202;
     background: #dddddd;
-    border-radius:          10px;
-    -moz-border-radius:     10px;
-    -webkit-border-radius:  10px;
-    box-shadow:         0 0 7px #ccc;
-    -moz-box-shadow:    0 0 7px #ccc;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+    box-shadow: 0 0 7px #ccc;
+    -moz-box-shadow: 0 0 7px #ccc;
     -webkit-box-shadow: 0 0 7px #ccc;
-    visibility:         hidden; /* prevent flash of content before popeye loads */
+    visibility: hidden; /* prevent flash of content before popeye loads */
 }
 
 #ppy1 .ppy-counter {
-    border-bottom:  1px solid #dddddd;
+    border-bottom: 1px solid #dddddd;
     color: #020202;
-    padding:        0 0 2px 0;
-    margin:         0 0 5px 0;
-    font-size:      0.9em;
+    padding: 0 0 2px 0;
+    margin: 0 0 5px 0;
+    font-size: 0.9em;
 }
 
 #ppy1 .ppy-stagewrap {
     background: #bcbcbc;
-    border-radius:          0 5px 5px 5px;
-    -moz-border-radius:     0 5px 5px 5px;
-    -webkit-border-radius:  0 5px 5px 5px;
+    border-radius: 0 5px 5px 5px;
+    -moz-border-radius: 0 5px 5px 5px;
+    -webkit-border-radius: 0 5px 5px 5px;
 }
diff --git a/publisher/assets/index.html b/publisher/assets/index.html
index 990cbd60..2c5cdd3f 100644
--- a/publisher/assets/index.html
+++ b/publisher/assets/index.html
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
diff --git a/publisher/assets/js/ajaxupload.3.9.js b/publisher/assets/js/ajaxupload.3.9.js
index 7e51768b..db619f2c 100644
--- a/publisher/assets/js/ajaxupload.3.9.js
+++ b/publisher/assets/js/ajaxupload.3.9.js
@@ -1,22 +1,22 @@
 /**
- * AJAX Upload ( http://valums.com/ajax-upload/ ) 
+ * AJAX Upload ( http://valums.com/ajax-upload/ )
  * Copyright (c) Andris Valums
  * Licensed under the MIT license ( http://valums.com/mit-license/ )
- * Thanks to Gary Haran, David Mark, Corey Burns and others for contributions 
+ * Thanks to Gary Haran, David Mark, Corey Burns and others for contributions
  */
 (function () {
     /* global window */
     /* jslint browser: true, devel: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true */
-    
+
     /**
      * Wrapper for FireBug's console.log
      */
-    function log(){
-        if (typeof(console) != 'undefined' && typeof(console.log) == 'function'){            
+    function log() {
+        if (typeof(console) != 'undefined' && typeof(console.log) == 'function') {
             Array.prototype.unshift.call(arguments, '[Ajax Upload]');
-            console.log( Array.prototype.join.call(arguments, ' '));
+            console.log(Array.prototype.join.call(arguments, ' '));
         }
-    } 
+    }
 
     /**
      * Attaches event to a dom element.
@@ -24,104 +24,104 @@
      * @param type event name
      * @param fn callback This refers to the passed element
      */
-    function addEvent(el, type, fn){
+    function addEvent(el, type, fn) {
         if (el.addEventListener) {
             el.addEventListener(type, fn, false);
         } else if (el.attachEvent) {
-            el.attachEvent('on' + type, function(){
+            el.attachEvent('on' + type, function () {
                 fn.call(el);
-	        });
-	    } else {
+            });
+        } else {
             throw new Error('not supported or DOM not loaded');
         }
-    }   
-    
+    }
+
     /**
      * Attaches resize event to a window, limiting
      * number of event fired. Fires only when encounteres
      * delay of 100 after series of events.
-     * 
+     *
      * Some browsers fire event multiple times when resizing
      * http://www.quirksmode.org/dom/events/resize.html
-     * 
+     *
      * @param fn callback This refers to the passed element
      */
-    function addResizeEvent(fn){
+    function addResizeEvent(fn) {
         var timeout;
-               
-	    addEvent(window, 'resize', function(){
-            if (timeout){
+
+        addEvent(window, 'resize', function () {
+            if (timeout) {
                 clearTimeout(timeout);
             }
-            timeout = setTimeout(fn, 100);                        
+            timeout = setTimeout(fn, 100);
         });
-    }    
-    
+    }
+
     // Needs more testing, will be rewriten for next version        
     // getOffset function copied from jQuery lib (http://jquery.com/)
-    if (document.documentElement.getBoundingClientRect){
+    if (document.documentElement.getBoundingClientRect) {
         // Get Offset using getBoundingClientRect
         // http://ejohn.org/blog/getboundingclientrect-is-awesome/
-        var getOffset = function(el){
+        var getOffset = function (el) {
             var box = el.getBoundingClientRect();
             var doc = el.ownerDocument;
             var body = doc.body;
             var docElem = doc.documentElement; // for ie 
             var clientTop = docElem.clientTop || body.clientTop || 0;
             var clientLeft = docElem.clientLeft || body.clientLeft || 0;
-             
+
             // In Internet Explorer 7 getBoundingClientRect property is treated as physical,
             // while others are logical. Make all logical, like in IE8.	
-            var zoom = 1;            
+            var zoom = 1;
             if (body.getBoundingClientRect) {
                 var bound = body.getBoundingClientRect();
                 zoom = (bound.right - bound.left) / body.clientWidth;
             }
-            
+
             if (zoom > 1) {
                 clientTop = 0;
                 clientLeft = 0;
             }
-            
+
             var top = box.top / zoom + (window.pageYOffset || docElem && docElem.scrollTop / zoom || body.scrollTop / zoom) - clientTop, left = box.left / zoom + (window.pageXOffset || docElem && docElem.scrollLeft / zoom || body.scrollLeft / zoom) - clientLeft;
-            
+
             return {
                 top: top,
                 left: left
             };
-        };        
+        };
     } else {
         // Get offset adding all offsets 
-        var getOffset = function(el){
+        var getOffset = function (el) {
             var top = 0, left = 0;
             do {
                 top += el.offsetTop || 0;
                 left += el.offsetLeft || 0;
                 el = el.offsetParent;
             } while (el);
-            
+
             return {
                 left: left,
                 top: top
             };
         };
     }
-    
+
     /**
      * Returns left, top, right and bottom properties describing the border-box,
      * in pixels, with the top-left relative to the body
      * @param {Element} el
      * @return {Object} Contains left, top, right,bottom
      */
-    function getBox(el){
+    function getBox(el) {
         var left, right, top, bottom;
         var offset = getOffset(el);
         left = offset.left;
         top = offset.top;
-        
+
         right = left + el.offsetWidth;
         bottom = top + el.offsetHeight;
-        
+
         return {
             left: left,
             right: right,
@@ -129,108 +129,110 @@
             bottom: bottom
         };
     }
-    
+
     /**
      * Helper that takes object literal
      * and add all properties to element.style
      * @param {Element} el
      * @param {Object} styles
      */
-    function addStyles(el, styles){
+    function addStyles(el, styles) {
         for (var name in styles) {
             if (styles.hasOwnProperty(name)) {
                 el.style[name] = styles[name];
             }
         }
     }
-        
+
     /**
      * Function places an absolutely positioned
      * element on top of the specified element
      * copying position and dimentions.
      * @param {Element} from
      * @param {Element} to
-     */    
-    function copyLayout(from, to){
-	    var box = getBox(from);
-        
+     */
+    function copyLayout(from, to) {
+        var box = getBox(from);
+
         addStyles(to, {
-	        position: 'absolute',                    
-	        left : box.left + 'px',
-	        top : box.top + 'px',
-	        width : from.offsetWidth + 'px',
-	        height : from.offsetHeight + 'px'
-	    });        
+            position: 'absolute',
+            left: box.left + 'px',
+            top: box.top + 'px',
+            width: from.offsetWidth + 'px',
+            height: from.offsetHeight + 'px'
+        });
     }
 
     /**
-    * Creates and returns element from html chunk
-    * Uses innerHTML to create an element
-    */
-    var toElement = (function(){
+     * Creates and returns element from html chunk
+     * Uses innerHTML to create an element
+     */
+    var toElement = (function () {
         var div = document.createElement('div');
-        return function(html){
+        return function (html) {
             div.innerHTML = html;
             var el = div.firstChild;
             return div.removeChild(el);
         };
     })();
-            
+
     /**
      * Function generates unique id
-     * @return unique id 
+     * @return unique id
      */
-    var getUID = (function(){
+    var getUID = (function () {
         var id = 0;
-        return function(){
+        return function () {
             return 'ValumsAjaxUpload' + id++;
         };
-    })();        
- 
+    })();
+
     /**
      * Get file name from path
      * @param {String} file path to file
      * @return filename
-     */  
-    function fileFromPath(file){
+     */
+    function fileFromPath(file) {
         return file.replace(/.*(\/|\\)/, "");
     }
-    
+
     /**
      * Get file extension lowercase
      * @param {String} file name
      * @return file extenstion
-     */    
-    function getExt(file){
+     */
+    function getExt(file) {
         return (-1 !== file.indexOf('.')) ? file.replace(/.*[.]/, '') : '';
     }
 
-    function hasClass(el, name){        
-        var re = new RegExp('\\b' + name + '\\b');        
+    function hasClass(el, name) {
+        var re = new RegExp('\\b' + name + '\\b');
         return re.test(el.className);
-    }    
-    function addClass(el, name){
-        if ( ! hasClass(el, name)){   
+    }
+
+    function addClass(el, name) {
+        if (!hasClass(el, name)) {
             el.className += ' ' + name;
         }
-    }    
-    function removeClass(el, name){
-        var re = new RegExp('\\b' + name + '\\b');                
-        el.className = el.className.replace(re, '');        
     }
-    
-    function removeNode(el){
+
+    function removeClass(el, name) {
+        var re = new RegExp('\\b' + name + '\\b');
+        el.className = el.className.replace(re, '');
+    }
+
+    function removeNode(el) {
         el.parentNode.removeChild(el);
     }
 
     /**
      * Easy styling and uploading
      * @constructor
-     * @param button An element you want convert to 
+     * @param button An element you want convert to
      * upload button. Tested dimentions up to 500x500px
      * @param {Object} options See defaults below.
      */
-    window.AjaxUpload = function(button, options){
+    window.AjaxUpload = function (button, options) {
         this._settings = {
             // Location of the server-side upload script
             action: 'upload.php',
@@ -248,228 +250,228 @@
             // Class applied to button when mouse is hovered
             hoverClass: 'hover',
             // Class applied to button when AU is disabled
-            disabledClass: 'disabled',            
+            disabledClass: 'disabled',
             // When user selects a file, useful with autoSubmit disabled
             // You can return false to cancel upload			
-            onChange: function(file, extension){
+            onChange: function (file, extension) {
             },
             // Callback to fire before file is uploaded
             // You can return false to cancel upload
-            onSubmit: function(file, extension){
+            onSubmit: function (file, extension) {
             },
             // Fired when file upload is completed
             // WARNING! DO NOT USE "FALSE" STRING AS A RESPONSE!
-            onComplete: function(file, response){
+            onComplete: function (file, response) {
             }
         };
-                        
+
         // Merge the users options with our defaults
         for (var i in options) {
-            if (options.hasOwnProperty(i)){
+            if (options.hasOwnProperty(i)) {
                 this._settings[i] = options[i];
             }
         }
-                
+
         // button isn't necessary a dom element
-        if (button.jquery){
+        if (button.jquery) {
             // jQuery object was passed
             button = button[0];
         } else if (typeof button == "string") {
-            if (/^#.*/.test(button)){
+            if (/^#.*/.test(button)) {
                 // If jQuery user passes #elementId don't break it					
-                button = button.slice(1);                
+                button = button.slice(1);
             }
-            
+
             button = document.getElementById(button);
         }
-        
-        if ( ! button || button.nodeType !== 1){
-            throw new Error("Please make sure that you're passing a valid element"); 
+
+        if (!button || button.nodeType !== 1) {
+            throw new Error("Please make sure that you're passing a valid element");
         }
-                
-        if ( button.nodeName.toUpperCase() == 'A'){
+
+        if (button.nodeName.toUpperCase() == 'A') {
             // disable link                       
-            addEvent(button, 'click', function(e){
-                if (e && e.preventDefault){
+            addEvent(button, 'click', function (e) {
+                if (e && e.preventDefault) {
                     e.preventDefault();
-                } else if (window.event){
+                } else if (window.event) {
                     window.event.returnValue = false;
                 }
             });
         }
-                    
+
         // DOM element
-        this._button = button;        
+        this._button = button;
         // DOM element                 
         this._input = null;
         // If disabled clicking on button won't do anything
         this._disabled = false;
-        
+
         // if the button was disabled before refresh if will remain
         // disabled in FireFox, let's fix it
-        this.enable();        
-        
+        this.enable();
+
         this._rerouteClicks();
     };
-    
+
     // assigning methods to our class
     AjaxUpload.prototype = {
-        setData: function(data){
+        setData: function (data) {
             this._settings.data = data;
         },
-        disable: function(){            
+        disable: function () {
             addClass(this._button, this._settings.disabledClass);
             this._disabled = true;
-            
-            var nodeName = this._button.nodeName.toUpperCase();            
-            if (nodeName == 'INPUT' || nodeName == 'BUTTON'){
+
+            var nodeName = this._button.nodeName.toUpperCase();
+            if (nodeName == 'INPUT' || nodeName == 'BUTTON') {
                 this._button.setAttribute('disabled', 'disabled');
-            }            
-            
+            }
+
             // hide input
-            if (this._input){
+            if (this._input) {
                 // We use visibility instead of display to fix problem with Safari 4
                 // The problem is that the value of input doesn't change if it 
                 // has display none when user selects a file           
                 this._input.parentNode.style.visibility = 'hidden';
             }
         },
-        enable: function(){
+        enable: function () {
             removeClass(this._button, this._settings.disabledClass);
             this._button.removeAttribute('disabled');
             this._disabled = false;
-            
+
         },
         /**
-         * Creates invisible file input 
+         * Creates invisible file input
          * that will hover above the button
          * <div><input type='file' /></div>
          */
-        _createInput: function(){ 
+        _createInput: function () {
             var self = this;
-                        
+
             var input = document.createElement("input");
             input.setAttribute('type', 'file');
             input.setAttribute('name', this._settings.name);
-            
+
             addStyles(input, {
-                'position' : 'absolute',
+                'position': 'absolute',
                 // in Opera only 'browse' button
                 // is clickable and it is located at
                 // the right side of the input
-                'right' : 0,
-                'margin' : 0,
-                'padding' : 0,
-                'fontSize' : '480px',                
-                'cursor' : 'pointer'
-            });            
-
-            var div = document.createElement("div");                        
+                'right': 0,
+                'margin': 0,
+                'padding': 0,
+                'fontSize': '480px',
+                'cursor': 'pointer'
+            });
+
+            var div = document.createElement("div");
             addStyles(div, {
-                'display' : 'block',
-                'position' : 'absolute',
-                'overflow' : 'hidden',
-                'margin' : 0,
-                'padding' : 0,                
-                'opacity' : 0,
+                'display': 'block',
+                'position': 'absolute',
+                'overflow': 'hidden',
+                'margin': 0,
+                'padding': 0,
+                'opacity': 0,
                 // Make sure browse button is in the right side
                 // in Internet Explorer
-                'direction' : 'ltr',
+                'direction': 'ltr',
                 //Max zIndex supported by Opera 9.0-9.2
                 'zIndex': 2147483583
             });
-            
+
             // Make sure that element opacity exists.
             // Otherwise use IE filter            
-            if ( div.style.opacity !== "0") {
-                if (typeof(div.filters) == 'undefined'){
+            if (div.style.opacity !== "0") {
+                if (typeof(div.filters) == 'undefined') {
                     throw new Error('Opacity not supported by the browser');
                 }
                 div.style.filter = "alpha(opacity=0)";
-            }            
-            
-            addEvent(input, 'change', function(){
-                 
-                if ( ! input || input.value === ''){                
-                    return;                
+            }
+
+            addEvent(input, 'change', function () {
+
+                if (!input || input.value === '') {
+                    return;
                 }
-                            
+
                 // Get filename from input, required                
                 // as some browsers have path instead of it          
                 var file = fileFromPath(input.value);
-                                
-                if (false === self._settings.onChange.call(self, file, getExt(file))){
-                    self._clearInput();                
+
+                if (false === self._settings.onChange.call(self, file, getExt(file))) {
+                    self._clearInput();
                     return;
                 }
-                
+
                 // Submit form when value is changed
                 if (self._settings.autoSubmit) {
                     self.submit();
                 }
-            });            
+            });
 
-            addEvent(input, 'mouseover', function(){
+            addEvent(input, 'mouseover', function () {
                 addClass(self._button, self._settings.hoverClass);
             });
-            
-            addEvent(input, 'mouseout', function(){
+
+            addEvent(input, 'mouseout', function () {
                 removeClass(self._button, self._settings.hoverClass);
-                
+
                 // We use visibility instead of display to fix problem with Safari 4
                 // The problem is that the value of input doesn't change if it 
                 // has display none when user selects a file           
                 input.parentNode.style.visibility = 'hidden';
 
-            });   
-                        
-	        div.appendChild(input);
+            });
+
+            div.appendChild(input);
             document.body.appendChild(div);
-              
+
             this._input = input;
         },
-        _clearInput : function(){
-            if (!this._input){
+        _clearInput: function () {
+            if (!this._input) {
                 return;
-            }            
-                             
+            }
+
             // this._input.value = ''; Doesn't work in IE6                               
             removeNode(this._input.parentNode);
-            this._input = null;                                                                   
+            this._input = null;
             this._createInput();
-            
+
             removeClass(this._button, this._settings.hoverClass);
         },
         /**
          * Function makes sure that when user clicks upload button,
          * the this._input is clicked instead
          */
-        _rerouteClicks: function(){
+        _rerouteClicks: function () {
             var self = this;
-            
+
             // IE will later display 'access denied' error
             // if you use using self._input.click()
             // other browsers just ignore click()
 
-            addEvent(self._button, 'mouseover', function(){
-                if (self._disabled){
+            addEvent(self._button, 'mouseover', function () {
+                if (self._disabled) {
                     return;
                 }
-                                
-                if ( ! self._input){
-	                self._createInput();
+
+                if (!self._input) {
+                    self._createInput();
                 }
-                
-                var div = self._input.parentNode;                            
+
+                var div = self._input.parentNode;
                 copyLayout(self._button, div);
                 div.style.visibility = 'visible';
-                                
+
             });
-            
-            
+
+
             // commented because we now hide input on mouseleave
             /**
-             * When the window is resized the elements 
+             * When the window is resized the elements
              * can be misaligned if button position depends
              * on window size
              */
@@ -478,33 +480,33 @@
             //        copyLayout(self._button, self._input.parentNode);
             //    }
             //});            
-                                         
+
         },
         /**
          * Creates iframe with unique name
          * @return {Element} iframe
          */
-        _createIframe: function(){
+        _createIframe: function () {
             // We can't use getTime, because it sometimes return
             // same value in safari :(
-            var id = getUID();            
-             
+            var id = getUID();
+
             // We can't use following code as the name attribute
             // won't be properly registered in IE6, and new window
             // on form submit will open
             // var iframe = document.createElement('iframe');
             // iframe.setAttribute('name', id);                        
- 
+
             var iframe = toElement('<iframe src="javascript:false;" name="' + id + '" />');
             // src="javascript:false; was added
             // because it possibly removes ie6 prompt 
             // "This page contains both secure and nonsecure items"
             // Anyway, it doesn't do any harm.            
             iframe.setAttribute('id', id);
-            
+
             iframe.style.display = 'none';
             document.body.appendChild(iframe);
-            
+
             return iframe;
         },
         /**
@@ -512,24 +514,24 @@
          * @param {Element} iframe Where to submit
          * @return {Element} form
          */
-        _createForm: function(iframe){
+        _createForm: function (iframe) {
             var settings = this._settings;
-                        
+
             // We can't use the following code in IE6
             // var form = document.createElement('form');
             // form.setAttribute('method', 'post');
             // form.setAttribute('enctype', 'multipart/form-data');
             // Because in this case file won't be attached to request                    
             var form = toElement('<form method="post" enctype="multipart/form-data"></form>');
-                        
+
             form.setAttribute('action', settings.action);
-            form.setAttribute('target', iframe.name);                                   
+            form.setAttribute('target', iframe.name);
             form.style.display = 'none';
             document.body.appendChild(form);
-            
+
             // Create hidden input element for each data key
             for (var prop in settings.data) {
-                if (settings.data.hasOwnProperty(prop)){
+                if (settings.data.hasOwnProperty(prop)) {
                     var el = document.createElement("input");
                     el.setAttribute('type', 'hidden');
                     el.setAttribute('name', prop);
@@ -542,42 +544,42 @@
         /**
          * Gets response from iframe and fires onComplete event when ready
          * @param iframe
-         * @param file Filename to use in onComplete callback 
+         * @param file Filename to use in onComplete callback
          */
-        _getResponse : function(iframe, file){            
+        _getResponse: function (iframe, file) {
             // getting response
-            var toDeleteFlag = false, self = this, settings = this._settings;   
-               
-            addEvent(iframe, 'load', function(){                
-                
+            var toDeleteFlag = false, self = this, settings = this._settings;
+
+            addEvent(iframe, 'load', function () {
+
                 if (// For Safari 
-                    iframe.src == "javascript:'%3Chtml%3E%3C/html%3E';" ||
+                iframe.src == "javascript:'%3Chtml%3E%3C/html%3E';" ||
                     // For FF, IE
-                    iframe.src == "javascript:'<html></html>';"){                                                                        
-                        // First time around, do not delete.
-                        // We reload to blank page, so that reloading main page
-                        // does not re-submit the post.
-                        
-                        if (toDeleteFlag) {
-                            // Fix busy state in FF3
-                            setTimeout(function(){
-                                removeNode(iframe);
-                            }, 0);
-                        }
-                                                
-                        return;
+                iframe.src == "javascript:'<html></html>';") {
+                    // First time around, do not delete.
+                    // We reload to blank page, so that reloading main page
+                    // does not re-submit the post.
+
+                    if (toDeleteFlag) {
+                        // Fix busy state in FF3
+                        setTimeout(function () {
+                            removeNode(iframe);
+                        }, 0);
+                    }
+
+                    return;
                 }
-                
+
                 var doc = iframe.contentDocument ? iframe.contentDocument : window.frames[iframe.id].document;
-                
+
                 // fixing Opera 9.26,10.00
                 if (doc.readyState && doc.readyState != 'complete') {
-                   // Opera fires load event multiple times
-                   // Even when the DOM is not ready yet
-                   // this fix should not affect other browsers
-                   return;
+                    // Opera fires load event multiple times
+                    // Even when the DOM is not ready yet
+                    // this fix should not affect other browsers
+                    return;
                 }
-                
+
                 // fixing Opera 9.64
                 if (doc.body && doc.body.innerHTML == "false") {
                     // In Opera 9.64 event was fired second time
@@ -585,16 +587,16 @@
                     // to server response approx. after 1 sec
                     return;
                 }
-                
+
                 var response;
-                
+
                 if (doc.XMLDocument) {
                     // response is a xml document Internet Explorer property
                     response = doc.XMLDocument;
-                } else if (doc.body){
+                } else if (doc.body) {
                     // response is html document or plain text
                     response = doc.body.innerHTML;
-                    
+
                     if (settings.responseType && settings.responseType.toLowerCase() == 'json') {
                         // If the document was sent as 'application/javascript' or
                         // 'text/javascript', then the browser wraps the text in a <pre>
@@ -605,7 +607,7 @@
                         if (doc.body.firstChild && doc.body.firstChild.nodeName.toUpperCase() == 'PRE') {
                             response = doc.body.firstChild.firstChild.nodeValue;
                         }
-                        
+
                         if (response) {
                             response = eval("(" + response + ")");
                         } else {
@@ -616,55 +618,57 @@
                     // response is a xml document
                     response = doc;
                 }
-                
+
                 settings.onComplete.call(self, file, response);
-                
+
                 // Reload blank page, so that reloading main page
                 // does not re-submit the post. Also, remember to
                 // delete the frame
                 toDeleteFlag = true;
-                
+
                 // Fix IE mixed content issue
                 iframe.src = "javascript:'<html></html>';";
-            });            
-        },        
+            });
+        },
         /**
          * Upload file contained in this._input
          */
-        submit: function(){                        
+        submit: function () {
             var self = this, settings = this._settings;
-            
-            if ( ! this._input || this._input.value === ''){                
-                return;                
+
+            if (!this._input || this._input.value === '') {
+                return;
             }
-                                    
+
             var file = fileFromPath(this._input.value);
-            
+
             // user returned false to cancel upload
-            if (false === settings.onSubmit.call(this, file, getExt(file))){
-                this._clearInput();                
+            if (false === settings.onSubmit.call(this, file, getExt(file))) {
+                this._clearInput();
                 return;
             }
-            
+
             // sending request    
             var iframe = this._createIframe();
             var form = this._createForm(iframe);
-            
+
             // assuming following structure
             // div -> input type='file'
-            removeNode(this._input.parentNode);            
+            removeNode(this._input.parentNode);
             removeClass(self._button, self._settings.hoverClass);
-                        
+
             form.appendChild(this._input);
-                        
+
             form.submit();
 
             // request set, clean up                
-            removeNode(form); form = null;                          
-            removeNode(this._input); this._input = null;
-            
+            removeNode(form);
+            form = null;
+            removeNode(this._input);
+            this._input = null;
+
             // Get response from iframe and fire onComplete event when ready
-            this._getResponse(iframe, file);            
+            this._getResponse(iframe, file);
 
             // get ready for next request            
             this._createInput();
diff --git a/publisher/assets/js/behavior.js b/publisher/assets/js/behavior.js
index 851c4464..10e0ef12 100644
--- a/publisher/assets/js/behavior.js
+++ b/publisher/assets/js/behavior.js
@@ -1,254 +1,268 @@
 /*
-   Behaviour v1.1 by Ben Nolan, June 2005. Based largely on the work
-   of Simon Willison (see comments by Simon below).
-
-   Description:
-   	
-   	Uses css selectors to apply javascript behaviours to enable
-   	unobtrusive javascript in html documents.
-   	
-   Usage:   
-   
-	var myrules = {
-		'b.someclass' : function(element){
-			element.onclick = function(){
-				alert(this.innerHTML);
-			}
-		},
-		'#someid u' : function(element){
-			element.onmouseover = function(){
-				this.innerHTML = "BLAH!";
-			}
-		}
-	};
-	
-	Behaviour.register(myrules);
-	
-	// Call Behaviour.apply() to re-apply the rules (if you
-	// update the dom, etc).
-
-   License:
-   
-   	This file is entirely BSD licensed.
-   	
-   More information:
-   	
-   	http://ripcord.co.nz/behaviour/
-   
-*/   
+ Behaviour v1.1 by Ben Nolan, June 2005. Based largely on the work
+ of Simon Willison (see comments by Simon below).
+
+ Description:
+
+ Uses css selectors to apply javascript behaviours to enable
+ unobtrusive javascript in html documents.
+
+ Usage:
+
+ var myrules = {
+ 'b.someclass' : function(element){
+ element.onclick = function(){
+ alert(this.innerHTML);
+ }
+ },
+ '#someid u' : function(element){
+ element.onmouseover = function(){
+ this.innerHTML = "BLAH!";
+ }
+ }
+ };
+
+ Behaviour.register(myrules);
+
+ // Call Behaviour.apply() to re-apply the rules (if you
+ // update the dom, etc).
+
+ License:
+
+ This file is entirely BSD licensed.
+
+ More information:
+
+ http://ripcord.co.nz/behaviour/
+
+ */
 
 var Behaviour = {
-	list : new Array,
-	
-	register : function(sheet){
-		Behaviour.list.push(sheet);
-	},
-	
-	start : function(){
-		Behaviour.addLoadEvent(function(){
-			Behaviour.apply();
-		});
-	},
-	
-	apply : function(){
-		for (h=0;sheet=Behaviour.list[h];h++){
-			for (selector in sheet){
-				list = document.getElementsBySelector(selector);
-				
-				if (!list){
-					continue;
-				}
-
-				for (i=0;element=list[i];i++){
-					sheet[selector](element);
-				}
-			}
-		}
-	},
-	
-	addLoadEvent : function(func){
-		var oldonload = window.onload;
-		
-		if (typeof window.onload != 'function') {
-			window.onload = func;
-		} else {
-			window.onload = function() {
-				oldonload();
-				func();
-			}
-		}
-	}
+    list: new Array,
+
+    register: function (sheet) {
+        Behaviour.list.push(sheet);
+    },
+
+    start: function () {
+        Behaviour.addLoadEvent(function () {
+            Behaviour.apply();
+        });
+    },
+
+    apply: function () {
+        for (h = 0; sheet = Behaviour.list[h]; h++) {
+            for (selector in sheet) {
+                list = document.getElementsBySelector(selector);
+
+                if (!list) {
+                    continue;
+                }
+
+                for (i = 0; element = list[i]; i++) {
+                    sheet[selector](element);
+                }
+            }
+        }
+    },
+
+    addLoadEvent: function (func) {
+        var oldonload = window.onload;
+
+        if (typeof window.onload != 'function') {
+            window.onload = func;
+        } else {
+            window.onload = function () {
+                oldonload();
+                func();
+            }
+        }
+    }
 };
 
 Behaviour.start();
 
 /*
-   The following code is Copyright (C) Simon Willison 2004.
-
-   document.getElementsBySelector(selector)
-   - returns an array of element objects from the current document
-     matching the CSS selector. Selectors can contain element names, 
-     class names and ids and can be nested. For example:
-     
-       elements = document.getElementsBySelect('div#main p a.external')
-     
-     Will return an array of all 'a' elements with 'external' in their 
-     class attribute that are contained inside 'p' elements that are 
-     contained inside the 'div' element which has id="main"
-
-   New in version 0.4: Support for CSS2 and CSS3 attribute selectors:
-   See http://www.w3.org/TR/css3-selectors/#attribute-selectors
-
-   Version 0.4 - Simon Willison, March 25th 2003
-   -- Works in Phoenix 0.5, Mozilla 1.3, Opera 7, Internet Explorer 6, Internet Explorer 5 on Windows
-   -- Opera 7 fails 
-*/
+ The following code is Copyright (C) Simon Willison 2004.
+
+ document.getElementsBySelector(selector)
+ - returns an array of element objects from the current document
+ matching the CSS selector. Selectors can contain element names,
+ class names and ids and can be nested. For example:
+
+ elements = document.getElementsBySelect('div#main p a.external')
+
+ Will return an array of all 'a' elements with 'external' in their
+ class attribute that are contained inside 'p' elements that are
+ contained inside the 'div' element which has id="main"
+
+ New in version 0.4: Support for CSS2 and CSS3 attribute selectors:
+ See http://www.w3.org/TR/css3-selectors/#attribute-selectors
+
+ Version 0.4 - Simon Willison, March 25th 2003
+ -- Works in Phoenix 0.5, Mozilla 1.3, Opera 7, Internet Explorer 6, Internet Explorer 5 on Windows
+ -- Opera 7 fails
+ */
 
 function getAllChildren(e) {
-  // Returns all children of element. Workaround required for IE5/Windows. Ugh.
-  return e.all ? e.all : e.getElementsByTagName('*');
+    // Returns all children of element. Workaround required for IE5/Windows. Ugh.
+    return e.all ? e.all : e.getElementsByTagName('*');
 }
 
-document.getElementsBySelector = function(selector) {
-  // Attempt to fail gracefully in lesser browsers
-  if (!document.getElementsByTagName) {
-    return new Array();
-  }
-  // Split selector in to tokens
-  var tokens = selector.split(' ');
-  var currentContext = new Array(document);
-  for (var i = 0; i < tokens.length; i++) {
-    token = tokens[i].replace(/^\s+/,'').replace(/\s+$/,'');
-    if (token.indexOf('#') > -1) {
-      // Token is an ID selector
-      var bits = token.split('#');
-      var tagName = bits[0];
-      var id = bits[1];
-      var element = document.getElementById(id);
-      if (tagName && element.nodeName.toLowerCase() != tagName) {
-        // tag with that ID not found, return false
+document.getElementsBySelector = function (selector) {
+    // Attempt to fail gracefully in lesser browsers
+    if (!document.getElementsByTagName) {
         return new Array();
-      }
-      // Set currentContext to contain just this element
-      currentContext = new Array(element);
-      continue; // Skip to next token
     }
-    if (token.indexOf('.') > -1) {
-      // Token contains a class selector
-      var bits = token.split('.');
-      var tagName = bits[0];
-      var className = bits[1];
-      if (!tagName) {
-        tagName = '*';
-      }
-      // Get elements matching tag, filter them for class selector
-      var found = new Array;
-      var foundCount = 0;
-      for (var h = 0; h < currentContext.length; h++) {
-        var elements;
-        if (tagName == '*') {
-            elements = getAllChildren(currentContext[h]);
-        } else {
-            elements = currentContext[h].getElementsByTagName(tagName);
-        }
-        for (var j = 0; j < elements.length; j++) {
-          found[foundCount++] = elements[j];
+    // Split selector in to tokens
+    var tokens = selector.split(' ');
+    var currentContext = new Array(document);
+    for (var i = 0; i < tokens.length; i++) {
+        token = tokens[i].replace(/^\s+/, '').replace(/\s+$/, '');
+        if (token.indexOf('#') > -1) {
+            // Token is an ID selector
+            var bits = token.split('#');
+            var tagName = bits[0];
+            var id = bits[1];
+            var element = document.getElementById(id);
+            if (tagName && element.nodeName.toLowerCase() != tagName) {
+                // tag with that ID not found, return false
+                return new Array();
+            }
+            // Set currentContext to contain just this element
+            currentContext = new Array(element);
+            continue; // Skip to next token
         }
-      }
-      currentContext = new Array;
-      var currentContextIndex = 0;
-      for (var k = 0; k < found.length; k++) {
-        if (found[k].className && found[k].className.match(new RegExp('\\b'+className+'\\b'))) {
-          currentContext[currentContextIndex++] = found[k];
+        if (token.indexOf('.') > -1) {
+            // Token contains a class selector
+            var bits = token.split('.');
+            var tagName = bits[0];
+            var className = bits[1];
+            if (!tagName) {
+                tagName = '*';
+            }
+            // Get elements matching tag, filter them for class selector
+            var found = new Array;
+            var foundCount = 0;
+            for (var h = 0; h < currentContext.length; h++) {
+                var elements;
+                if (tagName == '*') {
+                    elements = getAllChildren(currentContext[h]);
+                } else {
+                    elements = currentContext[h].getElementsByTagName(tagName);
+                }
+                for (var j = 0; j < elements.length; j++) {
+                    found[foundCount++] = elements[j];
+                }
+            }
+            currentContext = new Array;
+            var currentContextIndex = 0;
+            for (var k = 0; k < found.length; k++) {
+                if (found[k].className && found[k].className.match(new RegExp('\\b' + className + '\\b'))) {
+                    currentContext[currentContextIndex++] = found[k];
+                }
+            }
+            continue; // Skip to next token
         }
-      }
-      continue; // Skip to next token
-    }
-    // Code to deal with attribute selectors
-    if (token.match(/^(\w*)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/)) {
-      var tagName = RegExp.$1;
-      var attrName = RegExp.$2;
-      var attrOperator = RegExp.$3;
-      var attrValue = RegExp.$4;
-      if (!tagName) {
-        tagName = '*';
-      }
-      // Grab all of the tagName elements within current context
-      var found = new Array;
-      var foundCount = 0;
-      for (var h = 0; h < currentContext.length; h++) {
-        var elements;
-        if (tagName == '*') {
-            elements = getAllChildren(currentContext[h]);
-        } else {
-            elements = currentContext[h].getElementsByTagName(tagName);
+        // Code to deal with attribute selectors
+        if (token.match(/^(\w*)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/)) {
+            var tagName = RegExp.$1;
+            var attrName = RegExp.$2;
+            var attrOperator = RegExp.$3;
+            var attrValue = RegExp.$4;
+            if (!tagName) {
+                tagName = '*';
+            }
+            // Grab all of the tagName elements within current context
+            var found = new Array;
+            var foundCount = 0;
+            for (var h = 0; h < currentContext.length; h++) {
+                var elements;
+                if (tagName == '*') {
+                    elements = getAllChildren(currentContext[h]);
+                } else {
+                    elements = currentContext[h].getElementsByTagName(tagName);
+                }
+                for (var j = 0; j < elements.length; j++) {
+                    found[foundCount++] = elements[j];
+                }
+            }
+            currentContext = new Array;
+            var currentContextIndex = 0;
+            var checkFunction; // This function will be used to filter the elements
+            switch (attrOperator) {
+                case '=': // Equality
+                    checkFunction = function (e) {
+                        return (e.getAttribute(attrName) == attrValue);
+                    };
+                    break;
+                case '~': // Match one of space seperated words
+                    checkFunction = function (e) {
+                        return (e.getAttribute(attrName).match(new RegExp('\\b' + attrValue + '\\b')));
+                    };
+                    break;
+                case '|': // Match start with value followed by optional hyphen
+                    checkFunction = function (e) {
+                        return (e.getAttribute(attrName).match(new RegExp('^' + attrValue + '-?')));
+                    };
+                    break;
+                case '^': // Match starts with value
+                    checkFunction = function (e) {
+                        return (e.getAttribute(attrName).indexOf(attrValue) == 0);
+                    };
+                    break;
+                case '$': // Match ends with value - fails with "Warning" in Opera 7
+                    checkFunction = function (e) {
+                        return (e.getAttribute(attrName).lastIndexOf(attrValue) == e.getAttribute(attrName).length - attrValue.length);
+                    };
+                    break;
+                case '*': // Match ends with value
+                    checkFunction = function (e) {
+                        return (e.getAttribute(attrName).indexOf(attrValue) > -1);
+                    };
+                    break;
+                default :
+                    // Just test for existence of attribute
+                    checkFunction = function (e) {
+                        return e.getAttribute(attrName);
+                    };
+            }
+            currentContext = new Array;
+            var currentContextIndex = 0;
+            for (var k = 0; k < found.length; k++) {
+                if (checkFunction(found[k])) {
+                    currentContext[currentContextIndex++] = found[k];
+                }
+            }
+            // alert('Attribute Selector: '+tagName+' '+attrName+' '+attrOperator+' '+attrValue);
+            continue; // Skip to next token
         }
-        for (var j = 0; j < elements.length; j++) {
-          found[foundCount++] = elements[j];
+
+        if (!currentContext[0]) {
+            return;
         }
-      }
-      currentContext = new Array;
-      var currentContextIndex = 0;
-      var checkFunction; // This function will be used to filter the elements
-      switch (attrOperator) {
-        case '=': // Equality
-          checkFunction = function(e) { return (e.getAttribute(attrName) == attrValue); };
-          break;
-        case '~': // Match one of space seperated words 
-          checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('\\b'+attrValue+'\\b'))); };
-          break;
-        case '|': // Match start with value followed by optional hyphen
-          checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('^'+attrValue+'-?'))); };
-          break;
-        case '^': // Match starts with value
-          checkFunction = function(e) { return (e.getAttribute(attrName).indexOf(attrValue) == 0); };
-          break;
-        case '$': // Match ends with value - fails with "Warning" in Opera 7
-          checkFunction = function(e) { return (e.getAttribute(attrName).lastIndexOf(attrValue) == e.getAttribute(attrName).length - attrValue.length); };
-          break;
-        case '*': // Match ends with value
-          checkFunction = function(e) { return (e.getAttribute(attrName).indexOf(attrValue) > -1); };
-          break;
-        default :
-          // Just test for existence of attribute
-          checkFunction = function(e) { return e.getAttribute(attrName); };
-      }
-      currentContext = new Array;
-      var currentContextIndex = 0;
-      for (var k = 0; k < found.length; k++) {
-        if (checkFunction(found[k])) {
-          currentContext[currentContextIndex++] = found[k];
+
+        // If we get here, token is JUST an element (not a class or ID selector)
+        tagName = token;
+        var found = new Array;
+        var foundCount = 0;
+        for (var h = 0; h < currentContext.length; h++) {
+            var elements = currentContext[h].getElementsByTagName(tagName);
+            for (var j = 0; j < elements.length; j++) {
+                found[foundCount++] = elements[j];
+            }
         }
-      }
-      // alert('Attribute Selector: '+tagName+' '+attrName+' '+attrOperator+' '+attrValue);
-      continue; // Skip to next token
-    }
-    
-    if (!currentContext[0]){
-    	return;
-    }
-    
-    // If we get here, token is JUST an element (not a class or ID selector)
-    tagName = token;
-    var found = new Array;
-    var foundCount = 0;
-    for (var h = 0; h < currentContext.length; h++) {
-      var elements = currentContext[h].getElementsByTagName(tagName);
-      for (var j = 0; j < elements.length; j++) {
-        found[foundCount++] = elements[j];
-      }
+        currentContext = found;
     }
-    currentContext = found;
-  }
-  return currentContext;
+    return currentContext;
 };
 
 /* That revolting regular expression explained 
-/^(\w+)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/
-  \---/  \---/\-------------/    \-------/
-    |      |         |               |
-    |      |         |           The value
-    |      |    ~,|,^,$,* or =
-    |   Attribute 
-   Tag
-*/
+ /^(\w+)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/
+ \---/  \---/\-------------/    \-------/
+ |      |         |               |
+ |      |         |           The value
+ |      |    ~,|,^,$,* or =
+ |   Attribute
+ Tag
+ */
diff --git a/publisher/assets/js/cookies.js b/publisher/assets/js/cookies.js
index 6328af24..45d6e525 100644
--- a/publisher/assets/js/cookies.js
+++ b/publisher/assets/js/cookies.js
@@ -15,9 +15,8 @@
  * [secure]   Boolean value indicating if the cookie transmission requires a
  *              secure transmission
  */
-function setCookie(name, value, expires, path, domain, secure)
-{
-    document.cookie= name + "=" + escape(value) +
+function setCookie(name, value, expires, path, domain, secure) {
+    document.cookie = name + "=" + encodeURIComponent(value) +
         ((expires) ? "; expires=" + expires.toGMTString() : "") +
         ((path) ? "; path=" + path : "") +
         ((domain) ? "; domain=" + domain : "") +
@@ -32,26 +31,22 @@ function setCookie(name, value, expires, path, domain, secure)
  * Returns a string containing value of specified cookie,
  *   or null if cookie does not exist.
  */
-function getCookie(name)
-{
+function getCookie(name) {
     var dc = document.cookie;
     var prefix = name + "=";
     var begin = dc.indexOf("; " + prefix);
-    if (begin == -1)
-    {
+    if (begin == -1) {
         begin = dc.indexOf(prefix);
         if (begin != 0) return null;
     }
-    else
-    {
+    else {
         begin += 2;
     }
     var end = document.cookie.indexOf(";", begin);
-    if (end == -1)
-    {
+    if (end == -1) {
         end = dc.length;
     }
-    return unescape(dc.substring(begin + prefix.length, end));
+    return decodeURIComponent(dc.substring(begin + prefix.length, end));
 }
 
 /**
@@ -61,11 +56,9 @@ function getCookie(name)
  * [path]    path of the cookie (must be same as path used to create cookie)
  * [domain]  domain of the cookie (must be same as domain used to create cookie)
  */
-function deleteCookie(name, path, domain)
-{
-    if (getCookie(name))
-    {
-        document.cookie = name + "=" + 
+function deleteCookie(name, path, domain) {
+    if (getCookie(name)) {
+        document.cookie = name + "=" +
             ((path) ? "; path=" + path : "") +
             ((domain) ? "; domain=" + domain : "") +
             "; expires=Thu, 01-Jan-70 00:00:01 GMT";
diff --git a/publisher/assets/js/funcs.js b/publisher/assets/js/funcs.js
index d7fdf1ee..543abf3d 100644
--- a/publisher/assets/js/funcs.js
+++ b/publisher/assets/js/funcs.js
@@ -1,14 +1,13 @@
-function selectAll(formObj, fieldname, isInverse)
-{
+function selectAll(formObj, fieldname, isInverse) {
     if (fieldname.length == 0) {
-        for (var i=0;i < formObj.length;i++) {
+        for (var i = 0; i < formObj.length; i++) {
             fldObj = formObj.elements[i];
             if (fldObj.type == 'checkbox') {
                 fldObj.checked = isInverse;
             }
         }
     } else {
-        for (var i=0; i < formObj.length;i++) {
+        for (var i = 0; i < formObj.length; i++) {
             fldObj = formObj.elements[i];
             if (fldObj.type == 'checkbox') {
                 if (fldObj.name.indexOf(fieldname) > -1) {
@@ -21,146 +20,149 @@ function selectAll(formObj, fieldname, isInverse)
 
 
 function publisherPageWrap(id, page) {
-	var revisedMessage;
-	var textareaDom = xoopsGetElementById(id);
-	xoopsInsertText(textareaDom, page);
-	textareaDom.focus();
+    var revisedMessage;
+    var textareaDom = xoopsGetElementById(id);
+    xoopsInsertText(textareaDom, page);
+    textareaDom.focus();
 }
 
 function addSelectedItemsToParent() {
-	self.opener.addToParentList(window.document.forms[0].destList);
-	window.close();
+    self.opener.addToParentList(window.document.forms[0].destList);
+    window.close();
 }
 
 // Fill the selcted item list with the items already present in parent.
 function fillInitialDestList() {
-	var destList = window.document.forms[0].destList;
-	var srcList = self.opener.window.document.forms[0].elements['moderators[]'];
-	for (var count = destList.options.length - 1; count >= 0; count--) {
-		destList.options[count] = null;
-	}
-	for(var i = 0; i < srcList.options.length; i++) {
-		if (srcList.options[i] != null)
-		destList.options[i] = new Option(srcList.options[i].text);
-   }
+    var destList = window.document.forms[0].destList;
+    var srcList = self.opener.window.document.forms[0].elements['moderators[]'];
+    for (var count = destList.options.length - 1; count >= 0; count--) {
+        destList.options[count] = null;
+    }
+    for (var i = 0; i < srcList.options.length; i++) {
+        if (srcList.options[i] != null)
+            destList.options[i] = new Option(srcList.options[i].text);
+    }
 }
 
 // Add the selected items from the source to destination list
 function addSrcToDestList() {
-	destList = window.document.forms[0].destList;
-	srcList = window.document.forms[0].srcList;
-	var len = destList.length;
-	for(var i = 0; i < srcList.length; i++) {
-		if ((srcList.options[i] != null) && (srcList.options[i].selected)) {
-			//Check if this value already exist in the destList or not
-			//if not then add it otherwise do not add it.
-			var found = false;
-			for(var count = 0; count < len; count++) {
-				if (destList.options[count] != null) {
-					if (srcList.options[i].text == destList.options[count].text) {
-						found = true;
-						break;
-					}
-				}
-			}
-			if (found != true) {
-				destList.options[len] = new Option(srcList.options[i].text);
-				len++;
-			}
-		}
-	}
+    destList = window.document.forms[0].destList;
+    srcList = window.document.forms[0].srcList;
+    var len = destList.length;
+    for (var i = 0; i < srcList.length; i++) {
+        if ((srcList.options[i] != null) && (srcList.options[i].selected)) {
+            //Check if this value already exist in the destList or not
+            //if not then add it otherwise do not add it.
+            var found = false;
+            for (var count = 0; count < len; count++) {
+                if (destList.options[count] != null) {
+                    if (srcList.options[i].text == destList.options[count].text) {
+                        found = true;
+                        break;
+                    }
+                }
+            }
+            if (found != true) {
+                destList.options[len] = new Option(srcList.options[i].text);
+                len++;
+            }
+        }
+    }
 }
 
 // Deletes from the destination list.
 function deleteFromDestList() {
-	var destList  = window.document.forms[0].destList;
-	var len = destList.options.length;
-	for(var i = (len-1); i >= 0; i--) {
-		if ((destList.options[i] != null) && (destList.options[i].selected == true)) {
-			destList.options[i] = null;
-		}
-	}
+    var destList = window.document.forms[0].destList;
+    var len = destList.options.length;
+    for (var i = (len - 1); i >= 0; i--) {
+        if ((destList.options[i] != null) && (destList.options[i].selected == true)) {
+            destList.options[i] = null;
+        }
+    }
 }
 
 
 function small_window(myurl, w, h) {
-	// La ventana se llama "Add_from_Src_to_Dest"
-	var newWindow;
-	LeftPosition = (screen.width) ? (screen.width-w)/2 : 0;
-	TopPosition = (screen.height) ? (screen.height-h)/2 : 0;
-	newWindow = window.open(myurl, "Add_from_Src_to_Dest", 'left='+LeftPosition+',top='+TopPosition+',width='+w+', height='+h+',scrollBars=yes,resizable=yes,toolbar=no,menubar=no,location=no,directories=no');
+    // La ventana se llama "Add_from_Src_to_Dest"
+    var newWindow;
+    LeftPosition = (screen.width) ? (screen.width - w) / 2 : 0;
+    TopPosition = (screen.height) ? (screen.height - h) / 2 : 0;
+    newWindow = window.open(myurl, "Add_from_Src_to_Dest", 'left=' + LeftPosition + ',top=' + TopPosition + ',width=' + w + ', height=' + h + ',scrollBars=yes,resizable=yes,toolbar=no,menubar=no,location=no,directories=no');
 }
 
 // Adds the list of selected items selected in the child
 // window to its list. It is called by child window to do so.
 function addToParentList(sourceList) {
-	destinationList = window.document.forms[0].elements['moderators[]'];
-	for(var count = destinationList.options.length - 1; count >= 0; count--) {
-		destinationList.options[count] = null;
-	}
-	for(var i = 0; i < sourceList.options.length; i++) {
-		if (sourceList.options[i] != null)
-			destinationList.options[i] = new Option(sourceList.options[i].text, sourceList.options[i].value );
-	}
+    destinationList = window.document.forms[0].elements['moderators[]'];
+    for (var count = destinationList.options.length - 1; count >= 0; count--) {
+        destinationList.options[count] = null;
+    }
+    for (var i = 0; i < sourceList.options.length; i++) {
+        if (sourceList.options[i] != null)
+            destinationList.options[i] = new Option(sourceList.options[i].text, sourceList.options[i].value);
+    }
 }
 
 // Marks all the items as selected for the submit button.
 function selectList(sourceList) {
-	sourceList = window.document.forms[0].elements['moderators[]'];
-	for(var i = 0; i < sourceList.options.length; i++) {
-		if (sourceList.options[i] != null)
-			sourceList.options[i].selected = true;
-	}
-	return true;
+    sourceList = window.document.forms[0].elements['moderators[]'];
+    for (var i = 0; i < sourceList.options.length; i++) {
+        if (sourceList.options[i] != null)
+            sourceList.options[i].selected = true;
+    }
+    return true;
 }
 
 // Deletes the selected items of supplied list.
 function deleteSelectedItemsFromList(sourceList) {
-	var maxCnt = sourceList.options.length;
-	for(var i = maxCnt - 1; i >= 0; i--) {
-		if ((sourceList.options[i] != null) && (sourceList.options[i].selected == true)) {
-			sourceList.options[i] = null;
-		}
-	}
+    var maxCnt = sourceList.options.length;
+    for (var i = maxCnt - 1; i >= 0; i--) {
+        if ((sourceList.options[i] != null) && (sourceList.options[i].selected == true)) {
+            sourceList.options[i] = null;
+        }
+    }
 }
 
-function goto_URL(object)
-{
-	window.location.href = object.options[object.selectedIndex].value;
+function goto_URL(object) {
+    window.location.href = object.options[object.selectedIndex].value;
 }
 
-function toggle(id)
-{
-	if (document.getElementById) { obj = document.getElementById(id); }
-	if (document.all) { obj = document.all[id]; }
-	if (document.layers) { obj = document.layers[id]; }
-	if (obj) {
-		if (obj.style.display == "none") {
-			obj.style.display = "";
-		} else {
-			obj.style.display = "none";
-		}
-	}
-
-	var expDays = 365;
-	var exp = new Date();
-	exp.setTime(exp.getTime() + (expDays*24*60*60*1000));
-
-	setCookie(window.location.pathname+"_publisher_collaps_" + obj.id , obj.style.display, exp);
-
-	return false;
+function toggle(id) {
+    if (document.getElementById) {
+        obj = document.getElementById(id);
+    }
+    if (document.all) {
+        obj = document.all[id];
+    }
+    if (document.layers) {
+        obj = document.layers[id];
+    }
+    if (obj) {
+        if (obj.style.display == "none") {
+            obj.style.display = "";
+        } else {
+            obj.style.display = "none";
+        }
+    }
+
+    var expDays = 365;
+    var exp = new Date();
+    exp.setTime(exp.getTime() + (expDays * 24 * 60 * 60 * 1000));
+
+    setCookie(window.location.pathname + "_publisher_collaps_" + obj.id, obj.style.display, exp);
+
+    return false;
 }
 
 var iconClose = new Image();
-iconClose.src = '../assets/images/links/close12.gif';
+iconClose.src = '../images/links/close12.gif';
 var iconOpen = new Image();
-iconOpen.src = '../assets/images/links/open12.gif';
-
-function toggleIcon ( iconName )
-{
-	if ( document.images[iconName].src == window.iconOpen.src ) {
-		document.images[iconName].src = window.iconClose.src;
-	} else if ( document.images[iconName].src == window.iconClose.src ) {
-		document.images[iconName].src = window.iconOpen.src;
-	}
+iconOpen.src = '../images/links/open12.gif';
+
+function toggleIcon(iconName) {
+    if (document.images[iconName].src == window.iconOpen.src) {
+        document.images[iconName].src = window.iconClose.src;
+    } else if (document.images[iconName].src == window.iconClose.src) {
+        document.images[iconName].src = window.iconOpen.src;
+    }
 }
diff --git a/publisher/assets/js/index.html b/publisher/assets/js/index.html
index 990cbd60..2c5cdd3f 100644
--- a/publisher/assets/js/index.html
+++ b/publisher/assets/js/index.html
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
diff --git a/publisher/assets/js/jquery.easing.js b/publisher/assets/js/jquery.easing.js
index ef743210..bd6cac11 100644
--- a/publisher/assets/js/jquery.easing.js
+++ b/publisher/assets/js/jquery.easing.js
@@ -33,143 +33,164 @@
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
  * OF THE POSSIBILITY OF SUCH DAMAGE. 
  *
-*/
+ */
 
 // t: current time, b: begInnIng value, c: change In value, d: duration
 jQuery.easing['jswing'] = jQuery.easing['swing'];
 
-jQuery.extend( jQuery.easing,
-{
-	def: 'easeOutQuad',
-	swing: function (x, t, b, c, d) {
-		//alert(jQuery.easing.default);
-		return jQuery.easing[jQuery.easing.def](x, t, b, c, d);
-	},
-	easeInQuad: function (x, t, b, c, d) {
-		return c*(t/=d)*t + b;
-	},
-	easeOutQuad: function (x, t, b, c, d) {
-		return -c *(t/=d)*(t-2) + b;
-	},
-	easeInOutQuad: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return c/2*t*t + b;
-		return -c/2 * ((--t)*(t-2) - 1) + b;
-	},
-	easeInCubic: function (x, t, b, c, d) {
-		return c*(t/=d)*t*t + b;
-	},
-	easeOutCubic: function (x, t, b, c, d) {
-		return c*((t=t/d-1)*t*t + 1) + b;
-	},
-	easeInOutCubic: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return c/2*t*t*t + b;
-		return c/2*((t-=2)*t*t + 2) + b;
-	},
-	easeInQuart: function (x, t, b, c, d) {
-		return c*(t/=d)*t*t*t + b;
-	},
-	easeOutQuart: function (x, t, b, c, d) {
-		return -c * ((t=t/d-1)*t*t*t - 1) + b;
-	},
-	easeInOutQuart: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return c/2*t*t*t*t + b;
-		return -c/2 * ((t-=2)*t*t*t - 2) + b;
-	},
-	easeInQuint: function (x, t, b, c, d) {
-		return c*(t/=d)*t*t*t*t + b;
-	},
-	easeOutQuint: function (x, t, b, c, d) {
-		return c*((t=t/d-1)*t*t*t*t + 1) + b;
-	},
-	easeInOutQuint: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
-		return c/2*((t-=2)*t*t*t*t + 2) + b;
-	},
-	easeInSine: function (x, t, b, c, d) {
-		return -c * Math.cos(t/d * (Math.PI/2)) + c + b;
-	},
-	easeOutSine: function (x, t, b, c, d) {
-		return c * Math.sin(t/d * (Math.PI/2)) + b;
-	},
-	easeInOutSine: function (x, t, b, c, d) {
-		return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
-	},
-	easeInExpo: function (x, t, b, c, d) {
-		return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
-	},
-	easeOutExpo: function (x, t, b, c, d) {
-		return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
-	},
-	easeInOutExpo: function (x, t, b, c, d) {
-		if (t==0) return b;
-		if (t==d) return b+c;
-		if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
-		return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
-	},
-	easeInCirc: function (x, t, b, c, d) {
-		return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b;
-	},
-	easeOutCirc: function (x, t, b, c, d) {
-		return c * Math.sqrt(1 - (t=t/d-1)*t) + b;
-	},
-	easeInOutCirc: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;
-		return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b;
-	},
-	easeInElastic: function (x, t, b, c, d) {
-		var s=1.70158;var p=0;var a=c;
-		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
-		if (a < Math.abs(c)) { a=c; var s=p/4; }
-		else var s = p/(2*Math.PI) * Math.asin (c/a);
-		return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
-	},
-	easeOutElastic: function (x, t, b, c, d) {
-		var s=1.70158;var p=0;var a=c;
-		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
-		if (a < Math.abs(c)) { a=c; var s=p/4; }
-		else var s = p/(2*Math.PI) * Math.asin (c/a);
-		return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b;
-	},
-	easeInOutElastic: function (x, t, b, c, d) {
-		var s=1.70158;var p=0;var a=c;
-		if (t==0) return b;  if ((t/=d/2)==2) return b+c;  if (!p) p=d*(.3*1.5);
-		if (a < Math.abs(c)) { a=c; var s=p/4; }
-		else var s = p/(2*Math.PI) * Math.asin (c/a);
-		if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
-		return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b;
-	},
-	easeInBack: function (x, t, b, c, d, s) {
-		if (s == undefined) s = 1.70158;
-		return c*(t/=d)*t*((s+1)*t - s) + b;
-	},
-	easeOutBack: function (x, t, b, c, d, s) {
-		if (s == undefined) s = 1.70158;
-		return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
-	},
-	easeInOutBack: function (x, t, b, c, d, s) {
-		if (s == undefined) s = 1.70158; 
-		if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
-		return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
-	},
-	easeInBounce: function (x, t, b, c, d) {
-		return c - jQuery.easing.easeOutBounce (x, d-t, 0, c, d) + b;
-	},
-	easeOutBounce: function (x, t, b, c, d) {
-		if ((t/=d) < (1/2.75)) {
-			return c*(7.5625*t*t) + b;
-		} else if (t < (2/2.75)) {
-			return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;
-		} else if (t < (2.5/2.75)) {
-			return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b;
-		} else {
-			return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b;
-		}
-	},
-	easeInOutBounce: function (x, t, b, c, d) {
-		if (t < d/2) return jQuery.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b;
-		return jQuery.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b;
-	}
-});
+jQuery.extend(jQuery.easing,
+    {
+        def: 'easeOutQuad',
+        swing: function (x, t, b, c, d) {
+            //alert(jQuery.easing.default);
+            return jQuery.easing[jQuery.easing.def](x, t, b, c, d);
+        },
+        easeInQuad: function (x, t, b, c, d) {
+            return c * (t /= d) * t + b;
+        },
+        easeOutQuad: function (x, t, b, c, d) {
+            return -c * (t /= d) * (t - 2) + b;
+        },
+        easeInOutQuad: function (x, t, b, c, d) {
+            if ((t /= d / 2) < 1) return c / 2 * t * t + b;
+            return -c / 2 * ((--t) * (t - 2) - 1) + b;
+        },
+        easeInCubic: function (x, t, b, c, d) {
+            return c * (t /= d) * t * t + b;
+        },
+        easeOutCubic: function (x, t, b, c, d) {
+            return c * ((t = t / d - 1) * t * t + 1) + b;
+        },
+        easeInOutCubic: function (x, t, b, c, d) {
+            if ((t /= d / 2) < 1) return c / 2 * t * t * t + b;
+            return c / 2 * ((t -= 2) * t * t + 2) + b;
+        },
+        easeInQuart: function (x, t, b, c, d) {
+            return c * (t /= d) * t * t * t + b;
+        },
+        easeOutQuart: function (x, t, b, c, d) {
+            return -c * ((t = t / d - 1) * t * t * t - 1) + b;
+        },
+        easeInOutQuart: function (x, t, b, c, d) {
+            if ((t /= d / 2) < 1) return c / 2 * t * t * t * t + b;
+            return -c / 2 * ((t -= 2) * t * t * t - 2) + b;
+        },
+        easeInQuint: function (x, t, b, c, d) {
+            return c * (t /= d) * t * t * t * t + b;
+        },
+        easeOutQuint: function (x, t, b, c, d) {
+            return c * ((t = t / d - 1) * t * t * t * t + 1) + b;
+        },
+        easeInOutQuint: function (x, t, b, c, d) {
+            if ((t /= d / 2) < 1) return c / 2 * t * t * t * t * t + b;
+            return c / 2 * ((t -= 2) * t * t * t * t + 2) + b;
+        },
+        easeInSine: function (x, t, b, c, d) {
+            return -c * Math.cos(t / d * (Math.PI / 2)) + c + b;
+        },
+        easeOutSine: function (x, t, b, c, d) {
+            return c * Math.sin(t / d * (Math.PI / 2)) + b;
+        },
+        easeInOutSine: function (x, t, b, c, d) {
+            return -c / 2 * (Math.cos(Math.PI * t / d) - 1) + b;
+        },
+        easeInExpo: function (x, t, b, c, d) {
+            return (t == 0) ? b : c * Math.pow(2, 10 * (t / d - 1)) + b;
+        },
+        easeOutExpo: function (x, t, b, c, d) {
+            return (t == d) ? b + c : c * (-Math.pow(2, -10 * t / d) + 1) + b;
+        },
+        easeInOutExpo: function (x, t, b, c, d) {
+            if (t == 0) return b;
+            if (t == d) return b + c;
+            if ((t /= d / 2) < 1) return c / 2 * Math.pow(2, 10 * (t - 1)) + b;
+            return c / 2 * (-Math.pow(2, -10 * --t) + 2) + b;
+        },
+        easeInCirc: function (x, t, b, c, d) {
+            return -c * (Math.sqrt(1 - (t /= d) * t) - 1) + b;
+        },
+        easeOutCirc: function (x, t, b, c, d) {
+            return c * Math.sqrt(1 - (t = t / d - 1) * t) + b;
+        },
+        easeInOutCirc: function (x, t, b, c, d) {
+            if ((t /= d / 2) < 1) return -c / 2 * (Math.sqrt(1 - t * t) - 1) + b;
+            return c / 2 * (Math.sqrt(1 - (t -= 2) * t) + 1) + b;
+        },
+        easeInElastic: function (x, t, b, c, d) {
+            var s = 1.70158;
+            var p = 0;
+            var a = c;
+            if (t == 0) return b;
+            if ((t /= d) == 1) return b + c;
+            if (!p) p = d * .3;
+            if (a < Math.abs(c)) {
+                a = c;
+                var s = p / 4;
+            }
+            else var s = p / (2 * Math.PI) * Math.asin(c / a);
+            return -(a * Math.pow(2, 10 * (t -= 1)) * Math.sin((t * d - s) * (2 * Math.PI) / p)) + b;
+        },
+        easeOutElastic: function (x, t, b, c, d) {
+            var s = 1.70158;
+            var p = 0;
+            var a = c;
+            if (t == 0) return b;
+            if ((t /= d) == 1) return b + c;
+            if (!p) p = d * .3;
+            if (a < Math.abs(c)) {
+                a = c;
+                var s = p / 4;
+            }
+            else var s = p / (2 * Math.PI) * Math.asin(c / a);
+            return a * Math.pow(2, -10 * t) * Math.sin((t * d - s) * (2 * Math.PI) / p) + c + b;
+        },
+        easeInOutElastic: function (x, t, b, c, d) {
+            var s = 1.70158;
+            var p = 0;
+            var a = c;
+            if (t == 0) return b;
+            if ((t /= d / 2) == 2) return b + c;
+            if (!p) p = d * (.3 * 1.5);
+            if (a < Math.abs(c)) {
+                a = c;
+                var s = p / 4;
+            }
+            else var s = p / (2 * Math.PI) * Math.asin(c / a);
+            if (t < 1) return -.5 * (a * Math.pow(2, 10 * (t -= 1)) * Math.sin((t * d - s) * (2 * Math.PI) / p)) + b;
+            return a * Math.pow(2, -10 * (t -= 1)) * Math.sin((t * d - s) * (2 * Math.PI) / p) * .5 + c + b;
+        },
+        easeInBack: function (x, t, b, c, d, s) {
+            if (s == undefined) s = 1.70158;
+            return c * (t /= d) * t * ((s + 1) * t - s) + b;
+        },
+        easeOutBack: function (x, t, b, c, d, s) {
+            if (s == undefined) s = 1.70158;
+            return c * ((t = t / d - 1) * t * ((s + 1) * t + s) + 1) + b;
+        },
+        easeInOutBack: function (x, t, b, c, d, s) {
+            if (s == undefined) s = 1.70158;
+            if ((t /= d / 2) < 1) return c / 2 * (t * t * (((s *= (1.525)) + 1) * t - s)) + b;
+            return c / 2 * ((t -= 2) * t * (((s *= (1.525)) + 1) * t + s) + 2) + b;
+        },
+        easeInBounce: function (x, t, b, c, d) {
+            return c - jQuery.easing.easeOutBounce(x, d - t, 0, c, d) + b;
+        },
+        easeOutBounce: function (x, t, b, c, d) {
+            if ((t /= d) < (1 / 2.75)) {
+                return c * (7.5625 * t * t) + b;
+            } else if (t < (2 / 2.75)) {
+                return c * (7.5625 * (t -= (1.5 / 2.75)) * t + .75) + b;
+            } else if (t < (2.5 / 2.75)) {
+                return c * (7.5625 * (t -= (2.25 / 2.75)) * t + .9375) + b;
+            } else {
+                return c * (7.5625 * (t -= (2.625 / 2.75)) * t + .984375) + b;
+            }
+        },
+        easeInOutBounce: function (x, t, b, c, d) {
+            if (t < d / 2) return jQuery.easing.easeInBounce(x, t * 2, 0, c, d) * .5 + b;
+            return jQuery.easing.easeOutBounce(x, t * 2 - d, 0, c, d) * .5 + c * .5 + b;
+        }
+    });
 
 /*
  *
@@ -202,4 +223,4 @@ jQuery.extend( jQuery.easing,
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
  * OF THE POSSIBILITY OF SUCH DAMAGE. 
  *
- */
\ No newline at end of file
+ */
diff --git a/publisher/assets/js/jquery.popeye-2.1.js b/publisher/assets/js/jquery.popeye-2.1.js
index b3961ada..4922bfe3 100644
--- a/publisher/assets/js/jquery.popeye-2.1.js
+++ b/publisher/assets/js/jquery.popeye-2.1.js
@@ -4,14 +4,14 @@
  * converts a HTML image list in image gallery with inline enlargement
  *
  * Copyright (C) 2008 - 2011 Christoph Schuessler (schreib@herr-schuessler.de)
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  */
- 
+
 (function ($) {
 
 
@@ -22,11 +22,12 @@
     //
     ////////////////////////////////////////////////////////////////////////////
     $.fn.popeye = function (options) {
-    
+        'use strict';
+
         // build main options before element iteration
         //----------------------------------------------------------------------
         var opts = $.extend({}, $.fn.popeye.defaults, options);
-        
+
         ////////////////////////////////////////////////////////////////////////////////
         //
         // firebug console output
@@ -34,12 +35,12 @@
         // @param type String the message type [info | warn] (optional)
         //
         ////////////////////////////////////////////////////////////////////////////////
-        function debug(text,type) {
+        function debug(text, type) {
             if (window.console && window.console.log && opts.debug) {
-                if(type == 'info' && window.console.info) {
+                if (type === 'info' && window.console.info) {
                     window.console.info(text);
                 }
-                else if(type == 'warn' && window.console.warn) {
+                else if (type === 'warn' && window.console.warn) {
                     window.console.warn(text);
                 }
                 else {
@@ -47,663 +48,666 @@
                 }
             }
         }
-                   
+
         // let's go!
         //----------------------------------------------------------------------
-        return this.each(function(){
-            
-            // first thing to do: make ppy html visible           
+        return this.each(function () {
+
+            // first thing to do: make ppy html visible
             $(this).addClass('ppy-active');
-            
+
             // cache object
-            var $self           = $(this),
-            
+            var $self = $(this),
+
             // images
-            img                 = $self.find('.ppy-imglist > li > a > img'),
-            a                   = $self.find('.ppy-imglist > li > a'),
-            tot                 = img.length,
-            
+                img = $self.find('.ppy-imglist > li > a > img'),
+                a = $self.find('.ppy-imglist > li > a'),
+                tot = img.length,
+
             // single image mode
-            singleImageMode     = (tot == 1) ? true : false,
-            
+                singleImageMode = (tot === 1) ,
+
             // flag for moueover check
-            ismouseover         = false,
-            
+                ismouseover = false,
+
             // start in compact mode
-            enlarged            = false,
-            
+                enlarged = false,
+
             // counter vars
-            cur             = 0,                // array index of currently displayed image
- 
+                cur = 0,                // array index of currently displayed image
+
             // extra classes
-            eclass          = 'ppy-expanded',       //class to be applied to enlarged popeye-box
-            lclass          = 'ppy-loading',        //class to be applied to stage while loading image
-            sclass          = 'ppy-single-image',   //class to be applied to popeye-box if there's only one image to display
-            
+                eclass = 'ppy-expanded',       //class to be applied to enlarged popeye-box
+                lclass = 'ppy-loading',        //class to be applied to stage while loading image
+                sclass = 'ppy-single-image',   //class to be applied to popeye-box if there's only one image to display
+
             // html nodes
-            ppyPlaceholder      = $('<div class="ppy-placeholder"></div>'),
-            ppyStageWrap        = $('<div class="ppy-stagewrap"></div>'),
-            ppyCaptionWrap      = $('<div class="ppy-captionwrap"></div>'),
-            ppyOuter            = $self.find('.ppy-outer'),
-            ppyStage            = $self.find('.ppy-stage'),
-            ppyNav              = $self.find('.ppy-nav'),
-            ppyPrev             = $self.find('.ppy-prev'),
-            ppyNext             = $self.find('.ppy-next'),
-            ppySwitchEnlarge    = $self.find('.ppy-switch-enlarge'),
-            ppySwitchCompact    = $self.find('.ppy-switch-compact').addClass('ppy-hidden'),
-            ppyPlay             = $self.find('.ppy-play'),
-            ppyPause            = $self.find('.ppy-pause').addClass('ppy-hidden'),
-            ppyCaption          = $self.find('.ppy-caption'),
-            ppyText             = $self.find('.ppy-text'),
-            ppyCounter          = $self.find('.ppy-counter'),
-            ppyCurrent          = $self.find('.ppy-current'),
-            ppyTotal            = $self.find('.ppy-total'),
-            
+                ppyPlaceholder = $('<div class="ppy-placeholder"></div>'),
+                ppyStageWrap = $('<div class="ppy-stagewrap"></div>'),
+                ppyCaptionWrap = $('<div class="ppy-captionwrap"></div>'),
+                ppyOuter = $self.find('.ppy-outer'),
+                ppyStage = $self.find('.ppy-stage'),
+                ppyNav = $self.find('.ppy-nav'),
+                ppyPrev = $self.find('.ppy-prev'),
+                ppyNext = $self.find('.ppy-next'),
+                ppySwitchEnlarge = $self.find('.ppy-switch-enlarge'),
+                ppySwitchCompact = $self.find('.ppy-switch-compact').addClass('ppy-hidden'),
+                ppyPlay = $self.find('.ppy-play'),
+                ppyPause = $self.find('.ppy-pause').addClass('ppy-hidden'),
+                ppyCaption = $self.find('.ppy-caption'),
+                ppyText = $self.find('.ppy-text'),
+                ppyCounter = $self.find('.ppy-counter'),
+                ppyCurrent = $self.find('.ppy-current'),
+                ppyTotal = $self.find('.ppy-total'),
+
             // css objects
-            cssSelf = {
-                position:       'absolute',
-                width:          'auto',
-                height:         'auto',
-                margin:         0,
-                top:            0,
-                left:           (opts.direction == 'right') ? 0 : 'auto',
-                right:          (opts.direction == 'left') ? 0 : 'auto'
-            },
-            cssStage    = {
-                height:         ppyStage.height(),
-                width:          ppyStage.width()
-            },
-            cssCaption    = {
-                height:         ppyCaption.height()
-            },
-            cssPlaceholder = {
-                'height':         (opts.caption == 'hover' || false) ? ppyOuter.outerHeight() : $self.outerHeight(),
-                'width':          (opts.caption == 'hover' || false) ? ppyOuter.outerWidth() : $self.outerWidth(),
-                'float':          $self.css('float'),
-                'margin-top':      $self.css('margin-top'),
-                'margin-right':    $self.css('margin-right'),
-                'margin-bottom':   $self.css('margin-bottom'),
-                'margin-left':     $self.css('margin-left')
-            };
-            
-            // make caption array from caption element or alt tag           
+                cssSelf = {
+                    position: 'absolute',
+                    width: 'auto',
+                    height: 'auto',
+                    margin: 0,
+                    top: 0,
+                    left: (opts.direction === 'right') ? 0 : 'auto',
+                    right: (opts.direction === 'left') ? 0 : 'auto'
+                },
+                cssStage = {
+                    height: ppyStage.height(),
+                    width: ppyStage.width()
+                },
+                cssCaption = {
+                    height: ppyCaption.height()
+                },
+                cssPlaceholder = {
+                    'height': (opts.caption === 'hover' || false) ? ppyOuter.outerHeight() : $self.outerHeight(),
+                    'width': (opts.caption === 'hover' || false) ? ppyOuter.outerWidth() : $self.outerWidth(),
+                    'float': $self.css('float'),
+                    'margin-top': $self.css('margin-top'),
+                    'margin-right': $self.css('margin-right'),
+                    'margin-bottom': $self.css('margin-bottom'),
+                    'margin-left': $self.css('margin-left')
+                };
+
+            // make caption array from caption element or alt tag
             var cap = [];
-            for(var i=0; i<img.length; i++) {
+            for (var i = 0; i < img.length; i++) {
                 var extcap = $self.find('.ppy-imglist li').eq(i).find('.ppy-extcaption');
-                cap[i]   = extcap.length > 0 ? extcap.html() : img[i].alt;
+                cap[i] = extcap.length > 0 ? extcap.html() : img[i].alt;
             }
-            
+
             // check for html errors
-            if( !ppyStage.length || !ppyNav.length || !ppyOuter.length ) {
-                debug('$.fn.popeye: Incorrect HTML structure','warn');
+            if (!ppyStage.length || !ppyNav.length || !ppyOuter.length) {
+                debug('$.fn.popeye: Incorrect HTML structure', 'warn');
             }
-            
+
             // check for images
-            else if( tot === 0 ) {
-                debug('$.fn.popeye: No images found','warn');
+            else if (tot === 0) {
+                debug('$.fn.popeye: No images found', 'warn');
             }
-            // no errors, setup done! 
+            // no errors, setup done!
             //------------------------------------------------------------------
             else {
                 singleImageMode ? debug('$.fn.popeye -> SingleImageMode started') : debug('$.fn.popeye -> ' + tot + ' thumbnails found.');
                 init();
             }
-            
-                ////////////////////////////////////////////////////////////////////
-                //
-                // $.fn.popeye.showThumb
-                // show thumbnail
-                // @param i Int the index of the thumbnail to show (optional)
-                // @param transition Bool show transition between images (optional)
-                //
-                ////////////////////////////////////////////////////////////////////
-                function showThumb(i, transition) {
-                     
-                    // optional parameters
-                    transition = transition || false;
-                    i = i || cur;
-                    
-                    // set selected thumb as background image of stage
-                    var cssStageImage = {
-                        backgroundImage:    'url(' + img[i].src + ')'
-                    };
-                    // bogus animation css for IE 
-                    var cssTemp = {
-                        height:             '+=0'
-                    };
-                    
-                    // if we are in enlarged mode, return to thumb mode
-                    if(enlarged) {
-                    
-                        hideCaption();
-                        
-                        // fade image out and compact stage with transition
-                        ppyStage.fadeTo((opts.duration/2),0).animate( cssStage, {
-                            queue:      false,
-                            duration:   opts.duration,
-                            easing:     opts.easing,
-                            complete:   function() {
-                                
-                                enlarged = false;
-                                debug('$.fn.showThumb: Entering COMPACT MODE','info');
-        
-                                // remove extra styling and reset z-index
-                                $self.removeClass(eclass);
-                                $self.css('z-index','').parent().css('z-index','');
-                                
-                                // switch buttons
-                                ppySwitchEnlarge.removeClass('ppy-hidden');
-                                ppySwitchCompact.addClass('ppy-hidden');
-                                
-                                // recursive function call
-                                showThumb();
-                                
+
+            ////////////////////////////////////////////////////////////////////
+            //
+            // $.fn.popeye.showThumb
+            // show thumbnail
+            // @param i Int the index of the thumbnail to show (optional)
+            // @param transition Bool show transition between images (optional)
+            //
+            ////////////////////////////////////////////////////////////////////
+            function showThumb(i, transition) {
+
+                // optional parameters
+                transition = transition || false;
+                i = i || cur;
+
+                // set selected thumb as background image of stage
+                var cssStageImage = {
+                    backgroundImage: 'url(' + img[i].src + ')'
+                };
+                // bogus animation css for IE
+                var cssTemp = {
+                    height: '+=0'
+                };
+
+                // if we are in enlarged mode, return to thumb mode
+                if (enlarged) {
+
+                    hideCaption();
+
+                    // fade image out and compact stage with transition
+                    ppyStage.fadeTo((opts.duration / 2), 0).animate(cssStage, {
+                        queue: false,
+                        duration: opts.duration,
+                        easing: opts.easing,
+                        complete: function () {
+
+                            enlarged = false;
+                            debug('$.fn.showThumb: Entering COMPACT MODE', 'info');
+
+                            // remove extra styling and reset z-index
+                            $self.removeClass(eclass);
+                            $self.css('z-index', '').parent().css('z-index', '');
+
+                            // switch buttons
+                            ppySwitchEnlarge.removeClass('ppy-hidden');
+                            ppySwitchCompact.addClass('ppy-hidden');
+
+                            // recursive function call
+                            showThumb();
+
+                            // fade the stage back in
+                            $(this).fadeTo((opts.duration / 2), 1);
+                        }
+                    });
+                }
+                else {
+
+                    // if we navigate from one image to the next, fade out the stage
+                    if (transition) {
+
+                        // fade out image so that background shines through
+                        // background can contain loading gfx
+                        ppyStageWrap.addClass(lclass);
+                        ppyStage.fadeTo((opts.duration / 2), 0);
+
+                        // once thumb has loadded...
+                        var thumbPreloader = new Image();
+                        thumbPreloader.onload = function () {
+                            debug('$.fn.popeye.showThumb: Thumbnail ' + i + ' loaded', 'info');
+
+                            // remove loading indicator
+                            ppyStageWrap.removeClass(lclass);
+
+                            // add all upcoming animations to the queue so that
+                            // they won't start when the preolader has loaded but when the fadeOut has finished
+                            ppyStage.animate(cssTemp, 1, 'linear', function () {
+
+                                // set the new image
+                                ppyStage.css(cssStageImage);
                                 // fade the stage back in
-                                $(this).fadeTo((opts.duration/2),1);
-                            }
-                        });
-                    }
-                    else {
-                    
-                        // if we navigate from one image to the next, fade out the stage
-                        if(transition) {
-                        
-                            // fade out image so that background shines through
-                            // background can contain loading gfx
-                            ppyStageWrap.addClass(lclass);
-                            ppyStage.fadeTo((opts.duration/2), 0);
-                            
-                            // once thumb has loadded...
-                            var thumbPreloader = new Image();
-                            thumbPreloader.onload = function() {
-                                debug('$.fn.popeye.showThumb: Thumbnail ' + i + ' loaded', 'info');
-        
-                                // remove loading indicator
-                                ppyStageWrap.removeClass(lclass);
-                                
-                                // add all upcoming animations to the queue so that 
-                                // they won't start when the preolader has loaded but when the fadeOut has finished
-                                ppyStage.animate(cssTemp,1,'linear',function(){
-                                    
-                                    // set the new image
-                                    ppyStage.css(cssStageImage);
-                                    // fade the stage back in
-                                    $(this).fadeTo((opts.duration/2),1);
-                                
-                                    // update counter and caption
-                                    if(opts.caption == 'hover' && ismouseover) {
-                                        showCaption(cap[i]);
-                                    }
-                                    else if(opts.caption == 'permanent') {
-                                        updateCaption(cap[i]);
-                                    }
-                                    updateCounter();
-                                });
-                                
-                                //  fix IE animated gif bug
-                                thumbPreloader.onload = function(){};
+                                $(this).fadeTo((opts.duration / 2), 1);
+
+                                // update counter and caption
+                                if (opts.caption === 'hover' && ismouseover) {
+                                    showCaption(cap[i]);
+                                }
+                                else if (opts.caption === 'permanent') {
+                                    updateCaption(cap[i]);
+                                }
+                                updateCounter();
+                            });
+
+                            //  fix IE animated gif bug
+                            thumbPreloader.onload = function () {
                             };
-                            // preload thumb
-                            thumbPreloader.src = img[i].src;
-                        }
-                        
-                        // or just drag the image to the stage
-                        else {
-                            ppyStage.css(cssStageImage);
-                            updateCounter();
-                            
-                            //if(ismouseover) {
-                                showCaption(cap[i], true);
-                            //}
-                        }
-                        
-                        // preload big image for instant availability
-                        var preloader = new Image();
-                        
-                        preloader.onload = function() {
-                            debug('$.fn.popeye.showThumb: Image ' + i + ' loaded','info');
-                            preloader.onload = function(){};
                         };
-                        
-                        preloader.src = a[i].href;
+                        // preload thumb
+                        thumbPreloader.src = img[i].src;
                     }
-                }
-                
-                
-                ////////////////////////////////////////////////////////////////////
-                //
-                // $.fn.popeye.showImage
-                // show large image
-                // @param i Int the index of the image to show (optional)
-                //
-                ////////////////////////////////////////////////////////////////////
-                function showImage(i) {
-                
-                    // optional parameter i
-                    i = i || cur;
-                    
-                    // fade out image so that background shines through
-                    // background can contain loading gfx
-                    ppyStageWrap.addClass(lclass);
-                    ppyStage.fadeTo((opts.duration/2), 0);
-                    
-                    // if there are multiple popeyes opened at the same time,
-                    // make sure the current one gets a higher z-index
-                    var allPpy = $('.' + eclass);
-                    allPpy.css('z-index',opts.zindex-1);
-                    
-                    //both ppy and placeholder (for IE7) need high z-index
-                    $self.css('z-index',opts.zindex).parent().css('z-index',opts.zindex);
-                    
-                    // once image has loadded...
+
+                    // or just drag the image to the stage
+                    else {
+                        ppyStage.css(cssStageImage);
+                        updateCounter();
+
+                        //if(ismouseover) {
+                        showCaption(cap[i], true);
+                        //}
+                    }
+
+                    // preload big image for instant availability
                     var preloader = new Image();
-                    preloader.onload = function() {
-                    
-                        // remove loading class
-                        ppyStageWrap.removeClass(lclass);
-    
-                        // set css
-                        var cssStageTo = {
-                            width:              preloader.width,
-                            height:             preloader.height
-                        };
-                        var cssStageIm = {
-                            backgroundImage:    'url(' + a[i].href + ')',
-                            backgroundPosition: 'left top'
+
+                    preloader.onload = function () {
+                        debug('$.fn.popeye.showThumb: Image ' + i + ' loaded', 'info');
+                        preloader.onload = function () {
                         };
-                        
-                        hideCaption();
-                        
-                        // show transitional animation
-                        ppyStage.animate( cssStageTo, {
-                            queue:      false,
-                            duration:   opts.duration,
-                            easing:     opts.easing,
-                            complete:   function(){
-                                
-                                if(opts.navigation == 'hover' && ismouseover) {
-                                    showNav();
-                                }
-                                
-                                enlarged = true;
-                                debug('$.fn.popeye.showImage: Entering ENLARGED MODE','info');
-                                
-                                // add extra class, expanded box can be styled accordingly
-                                $self.addClass(eclass);
-                                
-                                // switch buttons
-                                ppySwitchCompact.removeClass('ppy-hidden');
-                                ppySwitchEnlarge.addClass('ppy-hidden');
-                                
-                                updateCounter();
-                                
-                                // set new bg image and fade it in
-                                $(this).css(cssStageIm).fadeTo((opts.duration/2),1);
-                                
-                                // show caption
-                                showCaption(cap[i]);
-                                
-                                preloadNeighbours();
-                            }
-                        });
                     };
-                    
-                    // preload image
+
                     preloader.src = a[i].href;
-                    
-                }
-                
-                
-                ////////////////////////////////////////////////////////////////////
-                //
-                // $.fn.popeye.updateCounter
-                // update image counter
-                // @param i Int the index of the image (optional)
-                //
-                ////////////////////////////////////////////////////////////////////
-                function updateCounter(i) {
-                    
-                    // optional parameter
-                    i = i || cur;
-                
-                    ppyTotal.text(tot);        // total images
-                    ppyCurrent.text(i + 1);    // current image number
-                    debug('$.fn.popeye.updateCounter: Displaying image ' + (i + 1) + ' of ' + tot);
-                }
-                
-                ////////////////////////////////////////////////////////////////////
-                //
-                // $.fn.popeye.preloadNeighbours
-                // preload next and previos image
-                // @param i Int the index of the current image (optional)
-                //
-                ////////////////////////////////////////////////////////////////////
-                function preloadNeighbours(i) {
-                    
-                    // optional parameter
-                    i = i || cur;
-                    
-                    var preloaderNext = new Image();
-                    var preloaderPrev = new Image();
-                    
-                    var neighbour = i;
-                    
-                    // next image
-                    if( neighbour < ( tot - 1) ) {
-                        neighbour++; 
-                    } else {
-                        neighbour = 0;
-                    }
-                    preloaderNext.src = a[neighbour].href;
-                    
-                    // previous image
-                    neighbour = i;
-                    if( neighbour <= 0 ) {
-                        neighbour = tot - 1;
-                    } else {
-                        neighbour--;
-                    }
-                    preloaderPrev.src = a[neighbour].href;
-                }
-                
-                
-                ////////////////////////////////////////////////////////////////////
-                //
-                // $.fn.popeye.showNav
-                //
-                ////////////////////////////////////////////////////////////////////
-                function showNav() {
-                    ppyNav.stop().fadeTo(150,opts.opacity);
                 }
-                
-                
-                ////////////////////////////////////////////////////////////////////
-                //
-                // $.fn.popeye.hideNav
-                //
-                ////////////////////////////////////////////////////////////////////
-                function hideNav() {
-                    ppyNav.stop().fadeTo(150,0);
+            }
+
+
+            ////////////////////////////////////////////////////////////////////
+            //
+            // $.fn.popeye.showImage
+            // show large image
+            // @param i Int the index of the image to show (optional)
+            //
+            ////////////////////////////////////////////////////////////////////
+            function showImage(i) {
+
+                // optional parameter i
+                i = i || cur;
+
+                // fade out image so that background shines through
+                // background can contain loading gfx
+                ppyStageWrap.addClass(lclass);
+                ppyStage.fadeTo((opts.duration / 2), 0);
+
+                // if there are multiple popeyes opened at the same time,
+                // make sure the current one gets a higher z-index
+                var allPpy = $('.' + eclass);
+                allPpy.css('z-index', opts.zindex - 1);
+
+                //both ppy and placeholder (for IE7) need high z-index
+                $self.css('z-index', opts.zindex).parent().css('z-index', opts.zindex);
+
+                // once image has loadded...
+                var preloader = new Image();
+                preloader.onload = function () {
+
+                    // remove loading class
+                    ppyStageWrap.removeClass(lclass);
+
+                    // set css
+                    var cssStageTo = {
+                        width: preloader.width,
+                        height: preloader.height
+                    };
+                    var cssStageIm = {
+                        backgroundImage: 'url(' + a[i].href + ')',
+                        backgroundPosition: 'left top'
+                    };
+
+                    hideCaption();
+
+                    // show transitional animation
+                    ppyStage.animate(cssStageTo, {
+                        queue: false,
+                        duration: opts.duration,
+                        easing: opts.easing,
+                        complete: function () {
+
+                            if (opts.navigation === 'hover' && ismouseover) {
+                                showNav();
+                            }
+
+                            enlarged = true;
+                            debug('$.fn.popeye.showImage: Entering ENLARGED MODE', 'info');
+
+                            // add extra class, expanded box can be styled accordingly
+                            $self.addClass(eclass);
+
+                            // switch buttons
+                            ppySwitchCompact.removeClass('ppy-hidden');
+                            ppySwitchEnlarge.addClass('ppy-hidden');
+
+                            updateCounter();
+
+                            // set new bg image and fade it in
+                            $(this).css(cssStageIm).fadeTo((opts.duration / 2), 1);
+
+                            // show caption
+                            showCaption(cap[i]);
+
+                            preloadNeighbours();
+                        }
+                    });
+                };
+
+                // preload image
+                preloader.src = a[i].href;
+
+            }
+
+
+            ////////////////////////////////////////////////////////////////////
+            //
+            // $.fn.popeye.updateCounter
+            // update image counter
+            // @param i Int the index of the image (optional)
+            //
+            ////////////////////////////////////////////////////////////////////
+            function updateCounter(i) {
+
+                // optional parameter
+                i = i || cur;
+
+                ppyTotal.text(tot);        // total images
+                ppyCurrent.text(i + 1);    // current image number
+                debug('$.fn.popeye.updateCounter: Displaying image ' + (i + 1) + ' of ' + tot);
+            }
+
+            ////////////////////////////////////////////////////////////////////
+            //
+            // $.fn.popeye.preloadNeighbours
+            // preload next and previos image
+            // @param i Int the index of the current image (optional)
+            //
+            ////////////////////////////////////////////////////////////////////
+            function preloadNeighbours(i) {
+
+                // optional parameter
+                i = i || cur;
+
+                var preloaderNext = new Image();
+                var preloaderPrev = new Image();
+
+                var neighbour = i;
+
+                // next image
+                if (neighbour < ( tot - 1)) {
+                    neighbour++;
+                } else {
+                    neighbour = 0;
                 }
-                
-                
-                ////////////////////////////////////////////////////////////////////
-                //
-                // $.fn.popeye.updateCaption
-                // @param caption String the caption string
-                //
-                ////////////////////////////////////////////////////////////////////
-                function updateCaption(caption) {
-                
-                    if(opts.caption) {
-                        // update text box
-                        ppyText.html(caption);
-                    }
+                preloaderNext.src = a[neighbour].href;
+
+                // previous image
+                neighbour = i;
+                if (neighbour <= 0) {
+                    neighbour = tot - 1;
+                } else {
+                    neighbour--;
                 }
-                
-                ////////////////////////////////////////////////////////////////////
-                //
-                // $.fn.popeye.showCaption
-                // @param caption String the caption string
-                // @param force Boolean force caption display even if caption string is empty
-                //
-                ////////////////////////////////////////////////////////////////////
-                function showCaption(caption,force) {
-                               
-                    // if caption string is not empty...
-                    if(caption && opts.caption) {
-                        updateCaption(caption);
-                        
-                        debug('$.fn.popeye.showCaption -> ppyCaptionWrap.outerHeight(true): ' + ppyCaptionWrap.outerHeight(true));
-                        
-                        // make caption box visible
-                        var cssTempCaption = {
-                            visibility:   'visible' 
-                        };
-                        ppyCaption.css(cssTempCaption);
-                        
-                        if(opts.caption === 'permanent' && !enlarged) {
-                            
-                            // return to original caption height
-                            ppyCaption.css(cssCaption);
-                        }
-                        else {
-                        
-                            // or animate it to its childs height
-                            ppyCaption.animate({'height': ppyCaptionWrap.outerHeight(true)}, {
-                                queue:      false,
-                                duration:   90,
-                                easing:     opts.easing
-                            });
-                        }
-                    }
-                    // if there's no caption to show...
-                    else if(!caption && !force) {
-                        hideCaption();
-                    }
+                preloaderPrev.src = a[neighbour].href;
+            }
+
+
+            ////////////////////////////////////////////////////////////////////
+            //
+            // $.fn.popeye.showNav
+            //
+            ////////////////////////////////////////////////////////////////////
+            function showNav() {
+                ppyNav.stop().fadeTo(150, opts.opacity);
+            }
+
+
+            ////////////////////////////////////////////////////////////////////
+            //
+            // $.fn.popeye.hideNav
+            //
+            ////////////////////////////////////////////////////////////////////
+            function hideNav() {
+                ppyNav.stop().fadeTo(150, 0);
+            }
+
+
+            ////////////////////////////////////////////////////////////////////
+            //
+            // $.fn.popeye.updateCaption
+            // @param caption String the caption string
+            //
+            ////////////////////////////////////////////////////////////////////
+            function updateCaption(caption) {
+
+                if (opts.caption) {
+                    // update text box
+                    ppyText.html(caption);
                 }
-                
-                
-                ////////////////////////////////////////////////////////////////////
-                //
-                // $.fn.popeye.hideCaption
-                //
-                ////////////////////////////////////////////////////////////////////
-                function hideCaption() {
-                    
-                    // css to hide caption but allow its inner text box to expand to content height
+            }
+
+            ////////////////////////////////////////////////////////////////////
+            //
+            // $.fn.popeye.showCaption
+            // @param caption String the caption string
+            // @param force Boolean force caption display even if caption string is empty
+            //
+            ////////////////////////////////////////////////////////////////////
+            function showCaption(caption, force) {
+
+                // if caption string is not empty...
+                if (caption && opts.caption) {
+                    updateCaption(caption);
+
+                    debug('$.fn.popeye.showCaption -> ppyCaptionWrap.outerHeight(true): ' + ppyCaptionWrap.outerHeight(true));
+
+                    // make caption box visible
                     var cssTempCaption = {
-                        visibility:   'hidden',
-                        overflow:     'hidden'
+                        visibility: 'visible'
                     };
-                    
-                    // slide up caption box and hide it when done
-                    ppyCaption.animate( {'height': '0px'}, {
-                        queue:      false,
-                        duration:   90,
-                        easing:     opts.easing,
-                        complete:   function() {
-                            ppyCaption.css(cssTempCaption);
-                        }
-                    });
-                }
-                
-                ////////////////////////////////////////////////////////////////////
-                //
-                // $.fn.popeye.previous
-                // show previous image
-                //
-                ////////////////////////////////////////////////////////////////////
-                function previous() {
-                    if( cur <= 0 ) {
-                        cur = tot - 1;
-                    } else {
-                        cur--;
-                    }
-                    if(enlarged) {
-                        showImage(cur);
+                    ppyCaption.css(cssTempCaption);
+
+                    if (opts.caption === 'permanent' && !enlarged) {
+
+                        // return to original caption height
+                        ppyCaption.css(cssCaption);
                     }
                     else {
-                        showThumb(cur, true);
+
+                        // or animate it to its childs height
+                        ppyCaption.animate({'height': ppyCaptionWrap.outerHeight(true)}, {
+                            queue: false,
+                            duration: 90,
+                            easing: opts.easing
+                        });
                     }
-                    return cur;
                 }
-                
-                ////////////////////////////////////////////////////////////////////
-                //
-                // $.fn.popeye.next
-                // show next image
-                //
-                ////////////////////////////////////////////////////////////////////
-                function next() {
-                    if( cur < ( tot - 1) ) {
-                        cur++; 
-                    } else {
-                        cur = 0;
-                    }
-                    if(enlarged) {
-                        showImage(cur);
-                    }
-                    else {
-                        showThumb(cur, true);
-                    }
-                    return cur;
+                // if there's no caption to show...
+                else if (!caption && !force) {
+                    hideCaption();
                 }
-                
-                ////////////////////////////////////////////////////////////////////
-                //
-                // $.fn.popeye.init
-                // setup of popeye DOM and events
-                //
-                ////////////////////////////////////////////////////////////////////
-                function init() {
-                    
-                    // popeye dom setup
-                    //--------------------------------------------------------------
-                    
-                    // add css 
-                    ppyPlaceholder.css(cssPlaceholder);
-                    $self.css(cssSelf);
-                    
-                    // wrap popeye in placeholder 
-                    $self.wrap(ppyPlaceholder);
-                    
-                    // wrap stage in container for extra styling (e.g. loading gfx)
-                    ppyStageWrap = ppyStage.wrap(ppyStageWrap).parent();
-                    
-                    // wrap caption contents in wrapper (can't use wrap() here...)
-                    ppyCaptionWrap = ppyCaption.wrapInner(ppyCaptionWrap).children().eq(0);
-                    
-                    // display first image
-                    showThumb();
-                    
-                    // add event handlers
-                    //--------------------------------------------------------------
-                    // hover behaviour for navigation
-                    if(opts.navigation == 'hover') {
-                        hideNav();
-                        $self.hover(
-                            function(){
-                                showNav();
-                            },
-                            function(){
-                                hideNav();
-                            }
-                        );
-                        ppyNav.hover(
-                            function(){
-                                showNav();
-                            },
-                            function(){
-                                hideNav();
-                            }
-                        );
-                    }
-                    if(!singleImageMode) {
-                        
-                        // previous image button
-                        ppyPrev.click(function(e){
-                            e.stopPropagation();
-                            previous();
-                        });
-                        
-                        // next image button
-                        ppyNext.click(function(e){
-                            e.stopPropagation();
-                            next();
-                        });
-                    
-                    }
-                    else {
-                        $self.addClass(sclass);
-                        ppyPrev.remove();
-                        ppyNext.remove();
-                        ppyPlay.remove();
-                        ppyPause.remove();
-                        ppyCounter.remove();
+            }
+
+
+            ////////////////////////////////////////////////////////////////////
+            //
+            // $.fn.popeye.hideCaption
+            //
+            ////////////////////////////////////////////////////////////////////
+            function hideCaption() {
+
+                // css to hide caption but allow its inner text box to expand to content height
+                var cssTempCaption = {
+                    visibility: 'hidden',
+                    overflow: 'hidden'
+                };
+
+                // slide up caption box and hide it when done
+                ppyCaption.animate({'height': '0px'}, {
+                    queue: false,
+                    duration: 90,
+                    easing: opts.easing,
+                    complete: function () {
+                        ppyCaption.css(cssTempCaption);
                     }
-                    
-                    // hover behaviour for caption
-                    if(opts.caption == 'hover') {
-                        hideCaption();
-                        $self.hover(
-                            function(){
-                                    showCaption(cap[cur]);
-                            },
-                            function(){
-                                    hideCaption(true);
-                            }
-                        );
-                     }
-                     
-                    // enlarge image button
-                    ppySwitchEnlarge.click(function(e){
-                        e.stopPropagation();
-                        showImage();
-                        return false;
-                    });
-                    
-                    // compact image button                          
-                    ppySwitchCompact.click(function(e){
-                        e.stopPropagation();
-                        showThumb(cur);
-                        return false;
-                    });
-                    
-                    ppyStage.click(function(){
-                        if(enlarged) {
-                            showThumb(cur);
+                });
+            }
+
+            ////////////////////////////////////////////////////////////////////
+            //
+            // $.fn.popeye.previous
+            // show previous image
+            //
+            ////////////////////////////////////////////////////////////////////
+            function previous() {
+                if (cur <= 0) {
+                    cur = tot - 1;
+                } else {
+                    cur--;
+                }
+                if (enlarged) {
+                    showImage(cur);
+                }
+                else {
+                    showThumb(cur, true);
+                }
+                return cur;
+            }
+
+            ////////////////////////////////////////////////////////////////////
+            //
+            // $.fn.popeye.next
+            // show next image
+            //
+            ////////////////////////////////////////////////////////////////////
+            function next() {
+                if (cur < ( tot - 1)) {
+                    cur++;
+                } else {
+                    cur = 0;
+                }
+                if (enlarged) {
+                    showImage(cur);
+                }
+                else {
+                    showThumb(cur, true);
+                }
+                return cur;
+            }
+
+            ////////////////////////////////////////////////////////////////////
+            //
+            // $.fn.popeye.init
+            // setup of popeye DOM and events
+            //
+            ////////////////////////////////////////////////////////////////////
+            function init() {
+
+                // popeye dom setup
+                //--------------------------------------------------------------
+
+                // add css
+                ppyPlaceholder.css(cssPlaceholder);
+                $self.css(cssSelf);
+
+                // wrap popeye in placeholder
+                $self.wrap(ppyPlaceholder);
+
+                // wrap stage in container for extra styling (e.g. loading gfx)
+                ppyStageWrap = ppyStage.wrap(ppyStageWrap).parent();
+
+                // wrap caption contents in wrapper (can't use wrap() here...)
+                ppyCaptionWrap = ppyCaption.wrapInner(ppyCaptionWrap).children().eq(0);
+
+                // display first image
+                showThumb();
+
+                // add event handlers
+                //--------------------------------------------------------------
+                // hover behaviour for navigation
+                if (opts.navigation == 'hover') {
+                    hideNav();
+                    $self.hover(
+                        function () {
+                            showNav();
+                        },
+                        function () {
+                            hideNav();
                         }
-                        else {
-                            showImage();
+                    );
+                    ppyNav.hover(
+                        function () {
+                            showNav();
+                        },
+                        function () {
+                            hideNav();
                         }
-                        
-                    });
-                    
-                    //play button
-                    ppyPlay.click(function(e){
+                    );
+                }
+                if (!singleImageMode) {
+
+                    // previous image button
+                    ppyPrev.click(function (e) {
                         e.stopPropagation();
-                        
-                        // switch buttons
-                        ppyPause.removeClass('ppy-hidden');
-                        ppyPlay.addClass('ppy-hidden');
-                        
-                        // initiate Slideshow
-                        slideshow = window.setInterval( function(){
-                            next();
-                        }, opts.slidespeed);
-                        return false;
+                        previous();
                     });
-                    
-                    //pause button
-                    ppyPause.click(function(e){
+
+                    // next image button
+                    ppyNext.click(function (e) {
                         e.stopPropagation();
-                        
-                        // switch buttons
-                        ppyPlay.removeClass('ppy-hidden');
-                        ppyPause.addClass('ppy-hidden');
-                        
-                        // stop Slideshow
-                        window.clearInterval(slideshow);
-                        return false;
-                    });
-                    
-                    // mouseover flag
-                    $self.mouseenter(function(){
-                        ismouseover = true;
-                    }).mouseleave(function(){
-                        ismouseover = false;
+                        next();
                     });
-                    
-                    // start autoslide
-                    if(opts.autoslide) {
-                        ppyPlay.trigger('click');
+
+                }
+                else {
+                    $self.addClass(sclass);
+                    ppyPrev.remove();
+                    ppyNext.remove();
+                    ppyPlay.remove();
+                    ppyPause.remove();
+                    ppyCounter.remove();
+                }
+
+                // hover behaviour for caption
+                if (opts.caption === 'hover') {
+                    hideCaption();
+                    $self.hover(
+                        function () {
+                            showCaption(cap[cur]);
+                        },
+                        function () {
+                            hideCaption(true);
+                        }
+                    );
+                }
+
+                // enlarge image button
+                ppySwitchEnlarge.click(function (e) {
+                    e.stopPropagation();
+                    showImage();
+                    return false;
+                });
+
+                // compact image button
+                ppySwitchCompact.click(function (e) {
+                    e.stopPropagation();
+                    showThumb(cur);
+                    return false;
+                });
+
+                ppyStage.click(function () {
+                    if (enlarged) {
+                        showThumb(cur);
+                    }
+                    else {
+                        showImage();
                     }
 
+                });
+
+                //play button
+                ppyPlay.click(function (e) {
+                    e.stopPropagation();
+
+                    // switch buttons
+                    ppyPause.removeClass('ppy-hidden');
+                    ppyPlay.addClass('ppy-hidden');
+
+                    // initiate Slideshow
+                    var slideshow;
+                    slideshow = window.setInterval(function () {
+                        next();
+                    }, opts.slidespeed);
+                    return false;
+                });
+
+                //pause button
+                ppyPause.click(function (e) {
+                    e.stopPropagation();
+
+                    // switch buttons
+                    ppyPlay.removeClass('ppy-hidden');
+                    ppyPause.addClass('ppy-hidden');
+
+                    // stop Slideshow
+                    window.clearInterval(slideshow);
+                    return false;
+                });
+
+                // mouseover flag
+                $self.mouseenter(function () {
+                    ismouseover = true;
+                }).mouseleave(function () {
+                    ismouseover = false;
+                });
+
+                // start autoslide
+                if (opts.autoslide) {
+                    ppyPlay.trigger('click');
                 }
+
+            }
         });
     };
-    
+
     ////////////////////////////////////////////////////////////////////////////
     //
     // $.fn.popeye.defaults
@@ -711,26 +715,26 @@
     //
     ////////////////////////////////////////////////////////////////////////////
     $.fn.popeye.defaults = {
-        
+
         navigation: 'hover',            //visibility of navigation - can be 'permanent' or 'hover'
-        caption:    'hover',            //visibility of caption, based on image title - can be false, 'permanent' or 'hover'
-        
-        zindex:     10000,              //z-index of the expanded popeye-box. enter a z-index that works well with your site and doesn't overlay your site's navigational elements like dropdowns
-        
-        direction:  'right',            //direction that popeye-box opens, can be 'left' or 'right'
-        duration:   240,                //duration of transitional effect when enlarging or closing the box
-        opacity:    0.8,                //opacity of navigational overlay (only applicable if 'navigation' is set to 'hover'
-        easing:     'swing',            //easing type, can be 'swing', 'linear' or any of jQuery Easing Plugin types (Plugin required)
-        
+        caption: 'hover',            //visibility of caption, based on image title - can be false, 'permanent' or 'hover'
+
+        zindex: 10000,              //z-index of the expanded popeye-box. enter a z-index that works well with your site and doesn't overlay your site's navigational elements like dropdowns
+
+        direction: 'right',            //direction that popeye-box opens, can be 'left' or 'right'
+        duration: 240,                //duration of transitional effect when enlarging or closing the box
+        opacity: 0.8,                //opacity of navigational overlay (only applicable if 'navigation' is set to 'hover'
+        easing: 'swing',            //easing type, can be 'swing', 'linear' or any of jQuery Easing Plugin types (Plugin required)
+
         slidespeed: 2000,               //timespan that one image is shown in a slideshow
-        autoslide:  false,              //should the slideshow start automatically?
-        
-        debug:      false               //turn on console output (slows down IE8!)
+        autoslide: false,              //should the slideshow start automatically?
+
+        debug: false
 
     };
-       
+
 // end of closure, bind to jQuery Object
-})(jQuery); 
+})(jQuery);
 
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/publisher/assets/js/publisher.js b/publisher/assets/js/publisher.js
index c710be27..cf025649 100644
--- a/publisher/assets/js/publisher.js
+++ b/publisher/assets/js/publisher.js
@@ -1,6 +1,6 @@
 var $publisher = jQuery.noConflict();
 
-$publisher(document).ready(function() {
+$publisher(document).ready(function () {
     //Functions to execute on page load
     if ($publisher.isFunction($publisher.fn.tabs)) {
         $publisher("#tabs").tabs();
@@ -38,4 +38,4 @@ function publisher_updateSelectOption(fromMenuId, toMenuId) {
             index++;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/publisher/assets/js/rating.js b/publisher/assets/js/rating.js
index e225fce2..33d00834 100644
--- a/publisher/assets/js/rating.js
+++ b/publisher/assets/js/rating.js
@@ -1,118 +1,121 @@
 /*
-Page:           rating.js
-Created:        Aug 2006
-Last Mod:       Mar 11 2007
-Handles actions and requests for rating bars.
----------------------------------------------------------
-ryan masuga, masugadesign.com
-ryan@masugadesign.com
-Licensed under a Creative Commons Attribution 3.0 License.
-http://creativecommons.org/licenses/by/3.0/
-See readme.txt for full credit details.
---------------------------------------------------------- */
+ Page:           rating.js
+ Created:        Aug 2006
+ Last Mod:       Mar 11 2007
+ Handles actions and requests for rating bars.
+ ---------------------------------------------------------
+ ryan masuga, masugadesign.com
+ ryan@masugadesign.com
+ Licensed under a Creative Commons Attribution 3.0 License.
+ http://creativecommons.org/licenses/by/3.0/
+ See readme.txt for full credit details.
+ --------------------------------------------------------- */
 
 var xmlhttp;
-	/*@cc_on @*/
-	/*@if (@_jscript_version >= 5)
-	  try {
-	  xmlhttp=new ActiveXObject("Msxml2.XMLHTTP")
-	 } catch (e) {
-	  try {
-	    xmlhttp=new ActiveXObject("Microsoft.XMLHTTP")
-	  } catch (E) {
-	   xmlhttp=false
-	  }
-	 }
-	@else
-	 xmlhttp=false
-	@end @*/
-	if (!xmlhttp && typeof XMLHttpRequest!='undefined') {
-	 try {
-	  xmlhttp = new XMLHttpRequest();
-	 } catch (e) {
-	  xmlhttp=false
-	 }
-	}
-	function myXMLHttpRequest() {
-	  var xmlhttplocal;
-	  try {
-	    xmlhttplocal= new ActiveXObject("Msxml2.XMLHTTP")
-	 } catch (e) {
-	  try {
-	    xmlhttplocal= new ActiveXObject("Microsoft.XMLHTTP")
-	  } catch (E) {
-	    xmlhttplocal=false;
-	  }
-	 }
+/*@cc_on @*/
+/*@if (@_jscript_version >= 5)
+ try {
+ xmlhttp=new ActiveXObject("Msxml2.XMLHTTP")
+ } catch (e) {
+ try {
+ xmlhttp=new ActiveXObject("Microsoft.XMLHTTP")
+ } catch (E) {
+ xmlhttp=false
+ }
+ }
+ @else
+ xmlhttp=false
+ @end @*/
+if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
+    try {
+        xmlhttp = new XMLHttpRequest();
+    } catch (e) {
+        xmlhttp = false
+    }
+}
+function myXMLHttpRequest() {
+    var xmlhttplocal;
+    try {
+        xmlhttplocal = new ActiveXObject("Msxml2.XMLHTTP")
+    } catch (e) {
+        try {
+            xmlhttplocal = new ActiveXObject("Microsoft.XMLHTTP")
+        } catch (E) {
+            xmlhttplocal = false;
+        }
+    }
 
-	if (!xmlhttplocal && typeof XMLHttpRequest!='undefined') {
-	 try {
-	  var xmlhttplocal = new XMLHttpRequest();
-	 } catch (e) {
-	  var xmlhttplocal=false;
-	  alert('couldn\'t create xmlhttp object');
-	 }
-	}
-	return(xmlhttplocal);
+    if (!xmlhttplocal && typeof XMLHttpRequest != 'undefined') {
+        try {
+            var xmlhttplocal = new XMLHttpRequest();
+        } catch (e) {
+            var xmlhttplocal = false;
+            alert('couldn\'t create xmlhttp object');
+        }
+    }
+    return (xmlhttplocal);
 }
 
 function sndReq(itemid, rating) {
-    changeText( 'unit_long'+itemid, '<div class="publisher_loading"></div>');
-    xmlhttp.open('get', 'include/ajax_rating.php?itemid='+itemid+'&rating='+rating);
+    changeText('unit_long' + itemid, '<div class="publisher_loading"></div>');
+    xmlhttp.open('get', 'include/ajax_rating.php?itemid=' + itemid + '&rating=' + rating);
     xmlhttp.onreadystatechange = handleResponse;
     xmlhttp.send(null);
 }
 
 function handleResponse() {
-  if(xmlhttp.readyState == 4){
-		if (xmlhttp.status == 200){
+    if (xmlhttp.readyState == 4) {
+        if (xmlhttp.status == 200) {
 
-        var response = xmlhttp.responseText;
-        var update = new Array();
+            var response = xmlhttp.responseText;
+            var update = new Array();
 
-        if(response.indexOf('|') != -1) {
-            update = response.split('|');
-            changeText(update[0], update[1]);
+            if (response.indexOf('|') != -1) {
+                update = response.split('|');
+                changeText(update[0], update[1]);
+            }
         }
-		}
     }
 }
 
-function changeText( div2show, text ) {
+function changeText(div2show, text) {
     // Detect Browser
     var IE = (document.all) ? 1 : 0;
     var DOM = 0;
-    if (parseInt(navigator.appVersion) >=5) {DOM=1}
+    if (parseInt(navigator.appVersion) >= 5) {
+        DOM = 1
+    }
 
     // Grab the content from the requested "div" and show it in the "publisher_container"
     if (DOM) {
         var viewer = document.getElementById(div2show);
         viewer.innerHTML = text;
-    }  else if(IE) {
+    } else if (IE) {
         document.all[div2show].innerHTML = text;
     }
 }
 
 /* =============================================================== */
 var ratingAction = {
-		'a.rater' : function(element){
-			element.onclick = function(){
+    'a.rater': function (element) {
+        element.onclick = function () {
 
-			var parameterString = this.href.replace(/.*\?(.*)/, "$1");
-			var parameterTokens = parameterString.split("&");
-			var parameterList = new Array();
+            var parameterString = this.href.replace(/.*\?(.*)/, "$1");
+            var parameterTokens = parameterString.split("&");
+            var parameterList = new Array();
 
-			for (j = 0; j < parameterTokens.length; j++) {
-				var parameterName = parameterTokens[j].replace(/(.*)=.*/, "$1");
-				var parameterValue = parameterTokens[j].replace(/.*=(.*)/, "$1");
-				parameterList[parameterName] = parameterValue;
-			}
-			var theItemid = parameterList['itemid'];
-			var theRating = parameterList['rating'];
+            for (j = 0; j < parameterTokens.length; j++) {
+                var parameterName = parameterTokens[j].replace(/(.*)=.*/, "$1");
+                var parameterValue = parameterTokens[j].replace(/.*=(.*)/, "$1");
+                parameterList[parameterName] = parameterValue;
+            }
+            var theItemid = parameterList['itemid'];
+            var theRating = parameterList['rating'];
 
-			sndReq(theItemid,theRating); return false;
-			}
-		}
+            sndReq(theItemid, theRating);
+            return false;
+        }
+    }
 
-	};
+};
 Behaviour.register(ratingAction);
diff --git a/publisher/assets/js/script.easing.js b/publisher/assets/js/script.easing.js
index 396214a9..a94ce2f3 100644
--- a/publisher/assets/js/script.easing.js
+++ b/publisher/assets/js/script.easing.js
@@ -10,309 +10,324 @@
  * Requires: 1.2.2+
  */
 
-(function($) {
+(function ($) {
 
-var types = ['DOMMouseScroll', 'mousewheel'];
+    var types = ['DOMMouseScroll', 'mousewheel'];
 
-$.event.special.mousewheel = {
-	setup: function() {
-		if ( this.addEventListener )
-			for ( var i=types.length; i; )
-				this.addEventListener( types[--i], handler, false );
-		else
-			this.onmousewheel = handler;
-	},
+    $.event.special.mousewheel = {
+        setup: function () {
+            if (this.addEventListener)
+                for (var i = types.length; i;)
+                    this.addEventListener(types[--i], handler, false);
+            else
+                this.onmousewheel = handler;
+        },
 
-	teardown: function() {
-		if ( this.removeEventListener )
-			for ( var i=types.length; i; )
-				this.removeEventListener( types[--i], handler, false );
-		else
-			this.onmousewheel = null;
-	}
-};
+        teardown: function () {
+            if (this.removeEventListener)
+                for (var i = types.length; i;)
+                    this.removeEventListener(types[--i], handler, false);
+            else
+                this.onmousewheel = null;
+        }
+    };
 
-$.fn.extend({
-	mousewheel: function(fn) {
-		return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
-	},
+    $.fn.extend({
+        mousewheel: function (fn) {
+            return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
+        },
 
-	unmousewheel: function(fn) {
-		return this.unbind("mousewheel", fn);
-	}
-});
+        unmousewheel: function (fn) {
+            return this.unbind("mousewheel", fn);
+        }
+    });
 
 
-function handler(event) {
-	var args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true;
+    function handler(event) {
+        var args = [].slice.call(arguments, 1), delta = 0, returnValue = true;
 
-	event = $.event.fix(event || window.event);
-	event.type = "mousewheel";
+        event = $.event.fix(event || window.event);
+        event.type = "mousewheel";
 
-	if ( event.wheelDelta ) delta = event.wheelDelta/120;
-	if ( event.detail     ) delta = -event.detail/3;
+        if (event.wheelDelta) delta = event.wheelDelta / 120;
+        if (event.detail) delta = -event.detail / 3;
 
-	// Add events and delta to the front of the arguments
-	args.unshift(event, delta);
+        // Add events and delta to the front of the arguments
+        args.unshift(event, delta);
 
-	return $.event.handle.apply(this, args);
-}
+        return $.event.handle.apply(this, args);
+    }
 
 })(jQuery);
 
 /**
- * @version		$Id:  $Revision
- * @package		jquery
- * @subpackage	lofslidernews
- * @copyright	Copyright (C) JAN 2010 LandOfCoder.com <@emai:landofcoder@gmail.com>. All rights reserved.
+ * @version        $Id:  $Revision
+ * @package        jquery
+ * @subpackage    lofslidernews
+ * @copyright    Copyright (C) JAN 2010 LandOfCoder.com <@emai:landofcoder@gmail.com>. All rights reserved.
  * @website     http://landofcoder.com
- * @license		This plugin is dual-licensed under the GNU General Public License and the MIT License
+ * @license        This plugin is dual-licensed under the GNU General Public License and the MIT License
  */
 // JavaScript Document
-(function($) {
-	 $.fn.lofJSidernews = function( settings ) {
-	 	return this.each(function() {
-			// get instance of the lofSiderNew.
-			new  $.lofSidernews( this, settings );
-		});
- 	 };
-	 $.lofSidernews = function( obj, settings ){
-		this.settings = {
-			direction	    	: '',
-			mainItemSelector    : 'li',
-			navInnerSelector	: 'ul',
-			navSelector  		: 'li' ,
-			navigatorEvent		: 'click',
-			wapperSelector: 	'.lof-main-wapper',
-			interval	  	 	: 4000,
-			auto			    : true, // whether to automatic play the slideshow
-			maxItemDisplay	 	: 3,
-			startItem			: 0,
-			navPosition			: 'vertical',
-			navigatorHeight		: 100,
-			navigatorWidth		: 210,
-			duration			: 600,
-			navItemsSelector    : '.lof-navigator li',
-			navOuterSelector    : '.lof-navigator-outer' ,
-			isPreloaded			: true,
-			easing				: 'easeInOutQuad'
-		};
-		$.extend( this.settings, settings ||{} );
-		this.nextNo         = null;
-		this.previousNo     = null;
-		this.maxWidth  = this.settings.mainWidth || 600;
-		this.wrapper = $( obj ).find( this.settings.wapperSelector );
-		this.slides = this.wrapper.find( this.settings.mainItemSelector );
-		if( !this.wrapper.length || !this.slides.length ) return ;
-		// set width of wapper
-		if( this.settings.maxItemDisplay > this.slides.length ){
-			this.settings.maxItemDisplay = this.slides.length;
-		}
-		this.currentNo      = isNaN(this.settings.startItem)||this.settings.startItem > this.slides.length?0:this.settings.startItem;
-		this.navigatorOuter = $( obj ).find( this.settings.navOuterSelector );
-		this.navigatorItems = $( obj ).find( this.settings.navItemsSelector ) ;
-		this.navigatorInner = this.navigatorOuter.find( this.settings.navInnerSelector );
+(function ($) {
+    $.fn.lofJSidernews = function (settings) {
+        return this.each(function () {
+            // get instance of the lofSiderNew.
+            new $.lofSidernews(this, settings);
+        });
+    };
+    $.lofSidernews = function (obj, settings) {
+        this.settings = {
+            direction: '',
+            mainItemSelector: 'li',
+            navInnerSelector: 'ul',
+            navSelector: 'li',
+            navigatorEvent: 'click',
+            wapperSelector: '.lof-main-wapper',
+            interval: 4000,
+            auto: true, // whether to automatic play the slideshow
+            maxItemDisplay: 3,
+            startItem: 0,
+            navPosition: 'vertical',
+            navigatorHeight: 100,
+            navigatorWidth: 210,
+            duration: 600,
+            navItemsSelector: '.lof-navigator li',
+            navOuterSelector: '.lof-navigator-outer',
+            isPreloaded: true,
+            easing: 'easeInOutQuad'
+        };
+        $.extend(this.settings, settings || {});
+        this.nextNo = null;
+        this.previousNo = null;
+        this.maxWidth = this.settings.mainWidth || 600;
+        this.wrapper = $(obj).find(this.settings.wapperSelector);
+        this.slides = this.wrapper.find(this.settings.mainItemSelector);
+        if (!this.wrapper.length || !this.slides.length) return;
+        // set width of wapper
+        if (this.settings.maxItemDisplay > this.slides.length) {
+            this.settings.maxItemDisplay = this.slides.length;
+        }
+        this.currentNo = isNaN(this.settings.startItem) || this.settings.startItem > this.slides.length ? 0 : this.settings.startItem;
+        this.navigatorOuter = $(obj).find(this.settings.navOuterSelector);
+        this.navigatorItems = $(obj).find(this.settings.navItemsSelector);
+        this.navigatorInner = this.navigatorOuter.find(this.settings.navInnerSelector);
 
-		if( this.settings.navPosition == 'horizontal' ){
-			this.navigatorInner.width( this.slides.length * this.settings.navigatorWidth );
-			this.navigatorOuter.width( this.settings.maxItemDisplay * this.settings.navigatorWidth );
-			this.navigatorOuter.height(	this.settings.navigatorHeight );
+        if (this.settings.navPosition == 'horizontal') {
+            this.navigatorInner.width(this.slides.length * this.settings.navigatorWidth);
+            this.navigatorOuter.width(this.settings.maxItemDisplay * this.settings.navigatorWidth);
+            this.navigatorOuter.height(this.settings.navigatorHeight);
 
-		} else {
-			this.navigatorInner.height( this.slides.length * this.settings.navigatorHeight );
+        } else {
+            this.navigatorInner.height(this.slides.length * this.settings.navigatorHeight);
 
-			this.navigatorOuter.height( this.settings.maxItemDisplay * this.settings.navigatorHeight );
-			this.navigatorOuter.width(	this.settings.navigatorWidth );
-		}
-		this.navigratorStep = this.__getPositionMode( this.settings.navPosition );
-		this.directionMode = this.__getDirectionMode();
+            this.navigatorOuter.height(this.settings.maxItemDisplay * this.settings.navigatorHeight);
+            this.navigatorOuter.width(this.settings.navigatorWidth);
+        }
+        this.navigratorStep = this.__getPositionMode(this.settings.navPosition);
+        this.directionMode = this.__getDirectionMode();
 
 
-		if( this.settings.direction == 'opacity') {
-			this.wrapper.addClass( 'lof-opacity' );
-			$(this.slides).css('opacity',0).eq(this.currentNo).css('opacity',1);
-		} else {
-			this.wrapper.css({'left':'-'+this.currentNo*this.maxSize+'px', 'width':( this.maxWidth ) * this.slides.length } );
-		}
+        if (this.settings.direction == 'opacity') {
+            this.wrapper.addClass('lof-opacity');
+            $(this.slides).css('opacity', 0).eq(this.currentNo).css('opacity', 1);
+        } else {
+            this.wrapper.css({'left': '-' + this.currentNo * this.maxSize + 'px', 'width': ( this.maxWidth ) * this.slides.length});
+        }
 
 
-		if( this.settings.isPreloaded ) {
-			this.preLoadImage( this.onComplete );
-		} else {
-			this.onComplete();
-		}
+        if (this.settings.isPreloaded) {
+            this.preLoadImage(this.onComplete);
+        } else {
+            this.onComplete();
+        }
 
-	 };
-     $.lofSidernews.fn =  $.lofSidernews.prototype;
-     $.lofSidernews.fn.extend =  $.lofSidernews.extend = $.extend;
+    };
+    $.lofSidernews.fn = $.lofSidernews.prototype;
+    $.lofSidernews.fn.extend = $.lofSidernews.extend = $.extend;
 
-	 $.lofSidernews.fn.extend({
+    $.lofSidernews.fn.extend({
 
-		startUp:function( obj, wrapper ) {
-			seft = this;
+        startUp: function (obj, wrapper) {
+            seft = this;
 
-			this.navigatorItems.each( function(index, item ){
-				$(item).click( function(){
-					seft.jumping( index, true );
-					seft.setNavActive( index, item );
-				} );
-				$(item).css( {'height': seft.settings.navigatorHeight, 'width':  seft.settings.navigatorWidth} );
-			});
-			this.registerWheelHandler( this.navigatorOuter, this );
-			this.setNavActive(this.currentNo );
+            this.navigatorItems.each(function (index, item) {
+                $(item).click(function () {
+                    seft.jumping(index, true);
+                    seft.setNavActive(index, item);
+                });
+                $(item).css({'height': seft.settings.navigatorHeight, 'width': seft.settings.navigatorWidth});
+            });
+            this.registerWheelHandler(this.navigatorOuter, this);
+            this.setNavActive(this.currentNo);
 
-			if( this.settings.buttons && typeof (this.settings.buttons) == "object" ){
-				this.registerButtonsControl( 'click', this.settings.buttons, this );
+            if (this.settings.buttons && typeof (this.settings.buttons) == "object") {
+                this.registerButtonsControl('click', this.settings.buttons, this);
 
-			}
-			if( this.settings.auto )
-			this.play( this.settings.interval,'next', true );
+            }
+            if (this.settings.auto)
+                this.play(this.settings.interval, 'next', true);
 
-			return this;
-		},
-		onComplete:function(){
-			setTimeout( function(){ $('.preload').fadeOut( 900 ); }, 400 );	this.startUp( );
-		},
-		preLoadImage:function(  callback ){
-			var self = this;
-			var images = this.wrapper.find( 'img' );
+            return this;
+        },
+        onComplete: function () {
+            setTimeout(function () {
+                $('.preload').fadeOut(900);
+            }, 400);
+            this.startUp();
+        },
+        preLoadImage: function (callback) {
+            var self = this;
+            var images = this.wrapper.find('img');
 
-			var count = 0;
-			images.each( function(index,image){
-				if( !image.complete ){
-					image.onload =function(){
-						count++;
-						if( count >= images.length ){
-							self.onComplete();
-						}
-					};
-					image.onerror =function(){
-						count++;
-						if( count >= images.length ){
-							self.onComplete();
-						}
-					}
-				}else {
-					count++;
-					if( count >= images.length ){
-						self.onComplete();
-					}
-				}
-			} );
-		},
-		navivationAnimate:function( currentIndex ) {
-			if (currentIndex <= this.settings.startItem
-				|| currentIndex - this.settings.startItem >= this.settings.maxItemDisplay-1) {
-					this.settings.startItem = currentIndex - this.settings.maxItemDisplay+2;
-					if (this.settings.startItem < 0) this.settings.startItem = 0;
-					if (this.settings.startItem >this.slides.length-this.settings.maxItemDisplay) {
-						this.settings.startItem = this.slides.length-this.settings.maxItemDisplay;
-					}
-			}
-			this.navigatorInner.stop().animate( eval('({'+this.navigratorStep[0]+':-'+this.settings.startItem*this.navigratorStep[1]+'})'),
-												{duration:500, easing:'easeInOutQuad'} );
-		},
-		setNavActive:function( index, item ){
-			if( (this.navigatorItems) ){
-				this.navigatorItems.removeClass( 'active' );
-				$(this.navigatorItems.get(index)).addClass( 'active' );
-				this.navivationAnimate( this.currentNo );
-			}
-		},
-		__getPositionMode:function( position ){
-			if(	position  == 'horizontal' ){
-				return ['left', this.settings.navigatorWidth];
-			}
-			return ['top', this.settings.navigatorHeight];
-		},
-		__getDirectionMode:function(){
-			switch( this.settings.direction ){
-				case 'opacity': this.maxSize=0; return ['opacity','opacity'];
-				default: this.maxSize=this.maxWidth; return ['left','width'];
-			}
-		},
-		registerWheelHandler:function( element, obj ){
-			 element.bind('mousewheel', function(event, delta ) {
-				var dir = delta > 0 ? 'Up' : 'Down',
-					vel = Math.abs(delta);
-				if( delta > 0 ){
-					obj.previous( true );
-				} else {
-					obj.next( true );
-				}
-				return false;
-			});
-		},
-		registerButtonsControl:function( eventHandler, objects, self ){
-			for( var action in objects ){
-				switch (action.toString() ){
-					case 'next':
-						objects[action].click( function() { self.next( true) } );
-						break;
-					case 'previous':
-						objects[action].click( function() { self.previous( true) } );
-						break;
-				}
-			}
-			return this;
-		},
-		onProcessing:function( manual, start, end ){
-			this.previousNo = this.currentNo + (this.currentNo>0 ? -1 : this.slides.length-1);
-			this.nextNo 	= this.currentNo + (this.currentNo < this.slides.length-1 ? 1 : 1- this.slides.length);
-			return this;
-		},
-		finishFx:function( manual ){
-			if( manual ) this.stop();
-			if( manual && this.settings.auto ){
-				this.play( this.settings.interval,'next', true );
-			}
-			this.setNavActive( this.currentNo );
-		},
-		getObjectDirection:function( start, end ){
-			return eval("({'"+this.directionMode[0]+"':-"+(this.currentNo*start)+"})");
-		},
-		fxStart:function( index, obj, currentObj ){
-				if( this.settings.direction == 'opacity' ) {
-					$(this.slides).stop().animate({opacity:0}, {duration: this.settings.duration, easing:this.settings.easing} );
-					$(this.slides).eq(index).stop().animate( {opacity:1}, {duration: this.settings.duration, easing:this.settings.easing} );
-				}else {
-					this.wrapper.stop().animate( obj, {duration: this.settings.duration, easing:this.settings.easing} );
-				}
-			return this;
-		},
-		jumping:function( no, manual ){
-			this.stop();
-			if( this.currentNo == no ) return;
-			 var obj = eval("({'"+this.directionMode[0]+"':-"+(this.maxSize*no)+"})");
-			this.onProcessing( null, manual, 0, this.maxSize )
-				.fxStart( no, obj, this )
-				.finishFx( manual );
-				this.currentNo  = no;
-		},
-		next:function( manual , item){
+            var count = 0;
+            images.each(function (index, image) {
+                if (!image.complete) {
+                    image.onload = function () {
+                        count++;
+                        if (count >= images.length) {
+                            self.onComplete();
+                        }
+                    };
+                    image.onerror = function () {
+                        count++;
+                        if (count >= images.length) {
+                            self.onComplete();
+                        }
+                    }
+                } else {
+                    count++;
+                    if (count >= images.length) {
+                        self.onComplete();
+                    }
+                }
+            });
+        },
+        navivationAnimate: function (currentIndex) {
+            if (currentIndex <= this.settings.startItem
+                || currentIndex - this.settings.startItem >= this.settings.maxItemDisplay - 1) {
+                this.settings.startItem = currentIndex - this.settings.maxItemDisplay + 2;
+                if (this.settings.startItem < 0) this.settings.startItem = 0;
+                if (this.settings.startItem > this.slides.length - this.settings.maxItemDisplay) {
+                    this.settings.startItem = this.slides.length - this.settings.maxItemDisplay;
+                }
+            }
+            this.navigatorInner.stop().animate(eval('({' + this.navigratorStep[0] + ':-' + this.settings.startItem * this.navigratorStep[1] + '})'),
+                {duration: 500, easing: 'easeInOutQuad'});
+        },
+        setNavActive: function (index, item) {
+            if ((this.navigatorItems)) {
+                this.navigatorItems.removeClass('active');
+                $(this.navigatorItems.get(index)).addClass('active');
+                this.navivationAnimate(this.currentNo);
+            }
+        },
+        __getPositionMode: function (position) {
+            if (position == 'horizontal') {
+                return ['left', this.settings.navigatorWidth];
+            }
+            return ['top', this.settings.navigatorHeight];
+        },
+        __getDirectionMode: function () {
+            switch (this.settings.direction) {
+                case 'opacity':
+                    this.maxSize = 0;
+                    return ['opacity', 'opacity'];
+                default:
+                    this.maxSize = this.maxWidth;
+                    return ['left', 'width'];
+            }
+        },
+        registerWheelHandler: function (element, obj) {
+            element.bind('mousewheel', function (event, delta) {
+                var dir = delta > 0 ? 'Up' : 'Down',
+                    vel = Math.abs(delta);
+                if (delta > 0) {
+                    obj.previous(true);
+                } else {
+                    obj.next(true);
+                }
+                return false;
+            });
+        },
+        registerButtonsControl: function (eventHandler, objects, self) {
+            for (var action in objects) {
+                switch (action.toString()) {
+                    case 'next':
+                        objects[action].click(function () {
+                            self.next(true)
+                        });
+                        break;
+                    case 'previous':
+                        objects[action].click(function () {
+                            self.previous(true)
+                        });
+                        break;
+                }
+            }
+            return this;
+        },
+        onProcessing: function (manual, start, end) {
+            this.previousNo = this.currentNo + (this.currentNo > 0 ? -1 : this.slides.length - 1);
+            this.nextNo = this.currentNo + (this.currentNo < this.slides.length - 1 ? 1 : 1 - this.slides.length);
+            return this;
+        },
+        finishFx: function (manual) {
+            if (manual) this.stop();
+            if (manual && this.settings.auto) {
+                this.play(this.settings.interval, 'next', true);
+            }
+            this.setNavActive(this.currentNo);
+        },
+        getObjectDirection: function (start, end) {
+            return eval("({'" + this.directionMode[0] + "':-" + (this.currentNo * start) + "})");
+        },
+        fxStart: function (index, obj, currentObj) {
+            if (this.settings.direction == 'opacity') {
+                $(this.slides).stop().animate({opacity: 0}, {duration: this.settings.duration, easing: this.settings.easing});
+                $(this.slides).eq(index).stop().animate({opacity: 1}, {duration: this.settings.duration, easing: this.settings.easing});
+            } else {
+                this.wrapper.stop().animate(obj, {duration: this.settings.duration, easing: this.settings.easing});
+            }
+            return this;
+        },
+        jumping: function (no, manual) {
+            this.stop();
+            if (this.currentNo == no) return;
+            var obj = eval("({'" + this.directionMode[0] + "':-" + (this.maxSize * no) + "})");
+            this.onProcessing(null, manual, 0, this.maxSize)
+                .fxStart(no, obj, this)
+                .finishFx(manual);
+            this.currentNo = no;
+        },
+        next: function (manual, item) {
 
-			this.currentNo += (this.currentNo < this.slides.length-1) ? 1 : (1 - this.slides.length);
-			this.onProcessing( item, manual, 0, this.maxSize )
-				.fxStart( this.currentNo, this.getObjectDirection(this.maxSize ), this )
-				.finishFx( manual );
-		},
-		previous:function( manual, item ){
-			this.currentNo += this.currentNo > 0 ? -1 : this.slides.length - 1;
-			this.onProcessing( item, manual )
-				.fxStart( this.currentNo, this.getObjectDirection(this.maxSize ), this )
-				.finishFx( manual	);
-		},
-		play:function( delay, direction, wait ){
-			this.stop();
-			if(!wait){ this[direction](false); }
-			var self  = this;
-			this.isRun = setTimeout(function() { self[direction](true); }, delay);
-		},
-		stop:function(){
-			if (this.isRun === null) return;
-			clearTimeout(this.isRun);
+            this.currentNo += (this.currentNo < this.slides.length - 1) ? 1 : (1 - this.slides.length);
+            this.onProcessing(item, manual, 0, this.maxSize)
+                .fxStart(this.currentNo, this.getObjectDirection(this.maxSize), this)
+                .finishFx(manual);
+        },
+        previous: function (manual, item) {
+            this.currentNo += this.currentNo > 0 ? -1 : this.slides.length - 1;
+            this.onProcessing(item, manual)
+                .fxStart(this.currentNo, this.getObjectDirection(this.maxSize), this)
+                .finishFx(manual);
+        },
+        play: function (delay, direction, wait) {
+            this.stop();
+            if (!wait) {
+                this[direction](false);
+            }
+            var self = this;
+            this.isRun = setTimeout(function () {
+                self[direction](true);
+            }, delay);
+        },
+        stop: function () {
+            if (this.isRun === null) return;
+            clearTimeout(this.isRun);
             this.isRun = null;
-		}
-	})
+        }
+    })
 })(jQuery);
 
diff --git a/publisher/author_items.php b/publisher/author_items.php
index 96c75aa1..0e356743 100644
--- a/publisher/author_items.php
+++ b/publisher/author_items.php
@@ -22,21 +22,21 @@
 include_once __DIR__ . '/header.php';
 
 $uid = XoopsRequest::getInt('uid', 0, 'GET');
-if (empty($uid)) {
+if (0 == $uid) {
     redirect_header('index.php', 2, _CO_PUBLISHER_ERROR);
-//   exit();
+    //   exit();
 }
 
-$member_handler = xoops_gethandler('member');
-$thisuser       = $member_handler->getUser($uid);
+$memberHandler =& xoops_getHandler('member');
+$thisuser       = $memberHandler->getUser($uid);
 if (!is_object($thisuser)) {
     redirect_header('index.php', 2, _CO_PUBLISHER_ERROR);
-//    exit();
+    //    exit();
 }
 
 if (!$publisher->getConfig('perm_author_items')) {
     redirect_header('index.php', 2, _CO_PUBLISHER_ERROR);
-//mb    exit();
+    //mb    exit();
 }
 
 $myts = MyTextSanitizer::getInstance();
@@ -48,7 +48,7 @@
 $criteria = new CriteriaCompo(new Criteria('datesub', time(), '<='));
 $criteria->add(new Criteria('uid', $uid));
 
-$items = $publisher->getHandler('item')->getItems($limit = 0, $start = 0, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED), -1, 'datesub', 'DESC', '', true, $criteria);
+$items =& $publisher->getHandler('item')->getItems($limit = 0, $start = 0, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED), -1, 'datesub', 'DESC', '', true, $criteria);
 unset($criteria);
 $count = count($items);
 
@@ -70,17 +70,16 @@
                 'count_items' => 0,
                 'count_hits'  => 0,
                 'title'       => $item->getCategoryName(),
-                'link'        => $item->getCategoryLink()
-            );
+                'link'        => $item->getCategoryLink());
         }
 
         $categories[$catid]['count_items']++;
         $categories[$catid]['count_hits'] += $item->counter();
         $categories[$catid]['items'][] = array(
-            'title'     => $item->title(),
+            'title'     => $item->getTitle(),
             'hits'      => $item->counter(),
             'link'      => $item->getItemLink(),
-            'published' => $item->datesub(),
+            'published' => $item->getDatesub(),
             'rating'    => $item->rating());
     }
 }
diff --git a/publisher/backend.php b/publisher/backend.php
index a64239f4..378416ce 100644
--- a/publisher/backend.php
+++ b/publisher/backend.php
@@ -21,7 +21,7 @@
  */
 
 include_once __DIR__ . '/header.php';
-xoops_load('XoopsLocal');
+//xoops_load('XoopsLocal'); //mb
 
 error_reporting(0);
 $GLOBALS['xoopsLogger']->activated = false;
@@ -34,7 +34,7 @@
 $categoryid = XoopsRequest::getInt('categoryid', -1, 'GET');
 
 if ($categoryid != -1) {
-    $categoryObj = $publisher->getHandler('category')->get($categoryid);
+    $categoryObj =& $publisher->getHandler('category')->get($categoryid);
 }
 
 header('Content-Type:text/xml; charset=' . _CHARSET);
@@ -54,12 +54,13 @@
     $tpl->assign('channel_title', htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES));
     $tpl->assign('channel_link', PUBLISHER_URL);
     $tpl->assign('channel_desc', htmlspecialchars($GLOBALS['xoopsConfig']['slogan'], ENT_QUOTES));
-    $tpl->assign('channel_lastbuild', XoopsLocal::formatTimestamp(time(), 'rss'));
+    //mb    $tpl->assign('channel_lastbuild', XoopsLocal::formatTimestamp(time(), 'rss'));
+    $tpl->assign('channel_lastbuild', formatTimestamp(time(), 'rss'));
     $tpl->assign('channel_webmaster', $GLOBALS['xoopsConfig']['adminmail']);
     $tpl->assign('channel_editor', $GLOBALS['xoopsConfig']['adminmail']);
 
     if ($categoryid != -1) {
-        $channel_category .= " > " . $categoryObj->name();
+        $channel_category .= ' > ' . $categoryObj->name();
     }
 
     $tpl->assign('channel_category', htmlspecialchars($channel_category));
@@ -77,18 +78,19 @@
     }
     $tpl->assign('image_width', $width);
     $tpl->assign('image_height', $height);
-    $sarray = $publisher->getHandler('item')->getAllPublished(10, 0, $categoryid);
+    $sarray =& $publisher->getHandler('item')->getAllPublished(10, 0, $categoryid);
     if (is_array($sarray)) {
         $count = $sarray;
         foreach ($sarray as $item) {
-            $tpl->append('items',
-                         array('title'       => htmlspecialchars($item->title(), ENT_QUOTES),
-                               'link'        => $item->getItemUrl(),
-                               'guid'        => $item->getItemUrl(),
-                               'pubdate'     => XoopsLocal::formatTimestamp($item->getVar('datesub'), 'rss'),
-                               'description' => htmlspecialchars($item->getBlockSummary(300, true), ENT_QUOTES)));
+            $tpl->append('items', array(
+                'title'       => htmlspecialchars($item->getTitle(), ENT_QUOTES),
+                'link'        => $item->getItemUrl(),
+                'guid'        => $item->getItemUrl(),
+                //mb                'pubdate'     => XoopsLocal::formatTimestamp($item->getVar('datesub'), 'rss'),
+                'pubdate'     => formatTimestamp($this->getVar('datesub', $format), 'rss'),
+                'description' => htmlspecialchars($item->getBlockSummary(300, true), ENT_QUOTES)));
         }
-        unset($item);
+//        unset($item);
     }
 }
 $tpl->display('db:publisher_rss.tpl');
diff --git a/publisher/blocks/category_items_sel.php b/publisher/blocks/category_items_sel.php
index 8767eb16..19de01c2 100644
--- a/publisher/blocks/category_items_sel.php
+++ b/publisher/blocks/category_items_sel.php
@@ -30,13 +30,13 @@
  */
 function publisher_category_items_sel_show($options)
 {
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
 
     $block = array();
 
-    $categories = $publisher->getHandler('category')->getCategories(0, 0, -1);
+    $categories =& $publisher->getHandler('category')->getCategories(0, 0, -1);
 
-    if (count($categories) == 0) {
+    if (count($categories) === 0) {
         return $block;
     }
 
@@ -49,20 +49,24 @@ function publisher_category_items_sel_show($options)
     // creating the ITEM objects that belong to the selected category
     $block['categories'] = array();
     foreach ($categories as $catID => $catObj) {
-        if (!in_array(0, $selectedcatids) && !in_array($catID, $selectedcatids)) continue;
+        if (!in_array(0, $selectedcatids) && !in_array($catID, $selectedcatids)) {
+            continue;
+        }
 
         $criteria = new Criteria('categoryid', $catID);
-        $items    = $publisher->getHandler('item')->getItems($limit, $start, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED), -1, $sort, $order, '', true, $criteria, true);
+        $items    =& $publisher->getHandler('item')->getItems($limit, $start, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED), -1, $sort, $order, '', true, $criteria, true);
         unset($criteria);
 
-        if (count($items) == 0) continue;
+        if (count($items) === 0) {
+            continue;
+        }
 
         $item['title']                          = $catObj->name();
         $item['itemurl']                        = 'none';
         $block['categories'][$catID]['items'][] = $item;
 
         foreach ($items as $itemObj) {
-            $item['title']                          = $itemObj->title(isset($options[3]) ? $options[3] : 0);
+            $item['title']                          = $itemObj->getTitle(isset($options[3]) ? $options[3] : 0);
             $item['itemurl']                        = $itemObj->getItemUrl();
             $block['categories'][$catID]['items'][] = $item;
         }
@@ -71,7 +75,9 @@ function publisher_category_items_sel_show($options)
 
     unset($items, $categories, $itemObj, $catID, $catObj);
 
-    if (count($block['categories']) == 0) return $block;
+    if (count($block['categories']) === 0) {
+        return $block;
+    }
 
     return $block;
 }
@@ -93,8 +99,7 @@ function publisher_category_items_sel_edit($options)
     $orderEle->addOptionArray(array(
                                   'datesub' => _MB_PUBLISHER_DATE,
                                   'counter' => _MB_PUBLISHER_HITS,
-                                  'weight'  => _MB_PUBLISHER_WEIGHT,
-                              ));
+                                  'weight'  => _MB_PUBLISHER_WEIGHT));
     $dispEle  = new XoopsFormText(_MB_PUBLISHER_DISP, 'options[2]', 10, 255, $options[2]);
     $charsEle = new XoopsFormText(_MB_PUBLISHER_CHARS, 'options[3]', 10, 255, $options[3]);
 
diff --git a/publisher/blocks/date_to_date.php b/publisher/blocks/date_to_date.php
index a33c1d8f..5558eaad 100644
--- a/publisher/blocks/date_to_date.php
+++ b/publisher/blocks/date_to_date.php
@@ -32,7 +32,7 @@
 function publisher_date_to_date_show($options)
 {
     $myts      = MyTextSanitizer::getInstance();
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
 
     $block = array();
 
@@ -43,22 +43,20 @@ function publisher_date_to_date_show($options)
     $criteria->setOrder('DESC');
 
     // creating the ITEM objects that belong to the selected category
-    $itemsObj   = $publisher->getHandler('item')->getObjects($criteria);
+    $itemsObj   =& $publisher->getHandler('item')->getObjects($criteria);
     $totalItems = count($itemsObj);
 
     if ($itemsObj) {
         for ($i = 0; $i < $totalItems; ++$i) {
-
             $newItems['itemid']       = $itemsObj[$i]->itemid();
-            $newItems['title']        = $itemsObj[$i]->title();
+            $newItems['title']        = $itemsObj[$i]->getTitle();
             $newItems['categoryname'] = $itemsObj[$i]->getCategoryName();
             $newItems['categoryid']   = $itemsObj[$i]->categoryid();
-            $newItems['date']         = $itemsObj[$i]->datesub();
-            $newItems['poster']       = $itemsObj[$i]->linkedPosterName();
+            $newItems['date']         = $itemsObj[$i]->getDatesub();
+            $newItems['poster']       = $itemsObj[$i]->getLinkedPosterName();
             $newItems['itemlink']     = $itemsObj[$i]->getItemLink(false, isset($options[3]) ? $options[3] : 65);
             $newItems['categorylink'] = $itemsObj[$i]->getCategoryLink();
-
-            $block['items'][] = $newItems;
+            $block['items'][]         = $newItems;
         }
 
         $block['lang_title']            = _MB_PUBLISHER_ITEMS;
@@ -66,7 +64,7 @@ function publisher_date_to_date_show($options)
         $block['lang_poster']           = _MB_PUBLISHER_POSTEDBY;
         $block['lang_date']             = _MB_PUBLISHER_DATE;
         $modulename                     = $myts->displayTarea($publisher->getModule()->getVar('name'));
-        $block['lang_visitItem']        = _MB_PUBLISHER_VISITITEM . " " . $modulename;
+        $block['lang_visitItem']        = _MB_PUBLISHER_VISITITEM . ' ' . $modulename;
         $block['lang_articles_from_to'] = sprintf(_MB_PUBLISHER_ARTICLES_FROM_TO, $options[0], $options[1]);
     }
 
@@ -82,13 +80,14 @@ function publisher_date_to_date_edit($options)
 {
     include_once PUBLISHER_ROOT_PATH . '/class/blockform.php';
     xoops_load('XoopsFormLoader');
-    xoops_load('XoopsFormCalendar');
+    xoops_load('XoopsFormTextDateSelect');
 
     $form    = new PublisherBlockForm();
-    $fromEle = new XoopsFormCalendar(_MB_PUBLISHER_FROM, 'options[0]', 15, strtotime($options[0]));
-    $fromEle->setNocolspan();
-    $untilEle = new XoopsFormCalendar(_MB_PUBLISHER_UNTIL, 'options[1]', 15, strtotime($options[1]));
-    $untilEle->setNocolspan();
+    $fromEle = new XoopsFormTextDateSelect(_MB_PUBLISHER_FROM, 'options[0]', 15, strtotime($options[0]));
+    //    $fromEle->setNocolspan();
+    $untilEle = new XoopsFormTextDateSelect(_MB_PUBLISHER_UNTIL, 'options[1]', 15, isset($options[1]) ? strtotime($options[1]) : '');
+    //    $untilEle->setNocolspan();
+
     $form->addElement($fromEle);
     $form->addElement($untilEle);
 
diff --git a/publisher/blocks/items_columns.php b/publisher/blocks/items_columns.php
index e7304031..48a181e1 100644
--- a/publisher/blocks/items_columns.php
+++ b/publisher/blocks/items_columns.php
@@ -33,60 +33,60 @@
  */
 function publisher_items_columns_show($options)
 {
-//    global $xoTheme;
-    $publisher = PublisherPublisher::getInstance();
+    //    global $xoTheme;
+    $publisher =& PublisherPublisher::getInstance();
 
     //Column Settings
-    $opt_num_columns  = isset($options[0]) ? (int)($options[0]) : '2';
-    $sel_categories   = isset($options[1]) ? explode(',', $options[1]) : array();
-    $opt_cat_items    = (int)($options[2]);
-    $opt_cat_truncate = isset($options[3]) ? (int)($options[3]) : '0';
+    $optNumColumns  = isset($options[0]) ? (int)($options[0]) : '2';
+    $selCategories   = isset($options[1]) ? explode(',', $options[1]) : array();
+    $optCatItems    = (int)($options[2]);
+    $optCatTruncate = isset($options[3]) ? (int)($options[3]) : '0';
 
     $block                  = array();
     $block['lang_reads']    = _MB_PUBLISHER_READS;
     $block['lang_comments'] = _MB_PUBLISHER_COMMENTS;
     $block['lang_readmore'] = _MB_PUBLISHER_READMORE;
 
-    $sel_categories_obj = array();
+    $selCategoriesObj = array();
 
     //get permited categories only once
-    $categories_obj = $publisher->getHandler('category')->getCategories(0, 0, -1);
+    $categoriesObj =& $publisher->getHandler('category')->getCategories(0, 0, -1);
 
     //if not selected 'all', let's get the selected ones
-    if (!in_array(0, $sel_categories)) {
-        foreach ($categories_obj as $key => $value) {
-            if (in_array($key, $sel_categories)) {
-                $sel_categories_obj[$key] = $value;
+    if (!in_array(0, $selCategories)) {
+        foreach ($categoriesObj as $key => $value) {
+            if (in_array($key, $selCategories)) {
+                $selCategoriesObj[$key] = $value;
             }
         }
     } else {
-        $sel_categories_obj = $categories_obj;
+        $selCategoriesObj =& $categoriesObj;
     }
     unset($key, $value);
 
-    $ccount = count($sel_categories_obj);
+    $ccount = count($selCategoriesObj);
 
-    if ($ccount == 0) {
+    if ($ccount === 0) {
         return false;
     }
 
-    if ($ccount < $opt_num_columns) {
-        $opt_num_columns = $ccount;
+    if ($ccount < $optNumColumns) {
+        $optNumColumns = $ccount;
     }
 
     $k       = 0;
     $columns = array();
 
-    foreach ($sel_categories_obj as $categoryId => $mainitemCatObj) {
-        $categoryItemsObj = $publisher->getHandler('item')->getAllPublished($opt_cat_items, 0, $categoryId);
+    foreach ($selCategoriesObj as $categoryId => $mainitemCatObj) {
+        $categoryItemsObj =& $publisher->getHandler('item')->getAllPublished($optCatItems, 0, $categoryId);
         $scount           = count($categoryItemsObj);
         if ($scount > 0 && is_array($categoryItemsObj)) {
             reset($categoryItemsObj);
             //First Item
             list($itemid, $thisitem) = each($categoryItemsObj);
 
-            $mainitem['item_title']      = $thisitem->title();
-            $mainitem['item_cleantitle'] = strip_tags($thisitem->title());
+            $mainitem['item_title']      = $thisitem->getTitle();
+            $mainitem['item_cleantitle'] = strip_tags($thisitem->getTitle());
             $mainitem['item_link']       = $thisitem->itemid();
             $mainitem['itemurl']         = $thisitem->getItemUrl();
             $mainImage                   = $thisitem->getMainImage();
@@ -97,31 +97,30 @@ function publisher_items_columns_show($options)
                 $mainitem['item_image'] = PUBLISHER_URL . '/thumb.php?src=' . $mainImage['image_path'] . '&amp;w=100';
             }
 
-            $mainitem['item_summary'] = $thisitem->getBlockSummary($opt_cat_truncate);
+            $mainitem['item_summary'] = $thisitem->getBlockSummary($optCatTruncate);
 
             $mainitem['item_cat_name']        = $mainitemCatObj->name();
-            $mainitem['item_cat_description'] = $mainitemCatObj->description() != '' ? $mainitemCatObj->description() : $mainitemCatObj->name();
+            $mainitem['item_cat_description'] = $mainitemCatObj->description() !== '' ? $mainitemCatObj->description() : $mainitemCatObj->name();
             $mainitem['item_cat_link']        = $mainitemCatObj->getCategoryLink();
             $mainitem['categoryurl']          = $mainitemCatObj->getCategoryUrl();
 
             //The Rest
             if ($scount > 1) {
                 while ((list($itemid, $thisitem) = each($categoryItemsObj)) !== false) {
-                    $subitem['title']      = $thisitem->title();
-                    $subitem['cleantitle'] = strip_tags($thisitem->title());
+                    $subitem['title']      = $thisitem->getTitle();
+                    $subitem['cleantitle'] = strip_tags($thisitem->getTitle());
                     $subitem['link']       = $thisitem->getItemLink();
                     $subitem['itemurl']    = $thisitem->getItemUrl();
-                    $subitem['summary']    = $thisitem->getBlockSummary($opt_cat_truncate);
+                    $subitem['summary']    = $thisitem->getBlockSummary($optCatTruncate);
                     $mainitem['subitem'][] = $subitem;
                     unset($subitem);
                 }
             }
             $columns[$k][] = $mainitem;
-            unset($thisitem);
-            unset($mainitem);
+            unset($thisitem, $mainitem);
             ++$k;
 
-            if ($k == $opt_num_columns) {
+            if ($k == $optNumColumns) {
                 $k = 0;
             }
         }
@@ -130,7 +129,7 @@ function publisher_items_columns_show($options)
 
     $block['template']    = $options[4];
     $block['columns']     = $columns;
-    $block['columnwidth'] = (int)(100 / $opt_num_columns);
+    $block['columnwidth'] = (int)(100 / $optNumColumns);
 
     $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . '/modules/' . PUBLISHER_DIRNAME . '/assets/css/publisher.css');
 
@@ -156,8 +155,7 @@ function publisher_items_columns_edit($options)
                                 '2' => 2,
                                 '3' => 3,
                                 '4' => 4,
-                                '5' => 5,
-                            ));
+                                '5' => 5));
     $catEle      = new XoopsFormLabel(_MB_PUBLISHER_SELECTCAT, publisherCreateCategorySelect($options[1], 0, true, 'options[1]'));
     $cItemsEle   = new XoopsFormText(_MB_PUBLISHER_NUMBER_ITEMS_CAT, 'options[2]', 4, 255, $options[2]);
     $truncateEle = new XoopsFormText(_MB_PUBLISHER_TRUNCATE, 'options[3]', 4, 255, $options[3]);
@@ -165,8 +163,7 @@ function publisher_items_columns_edit($options)
     $tempEle = new XoopsFormSelect(_MB_PUBLISHER_TEMPLATE, 'options[4]', $options[4]);
     $tempEle->addOptionArray(array(
                                  'normal'   => _MB_PUBLISHER_TEMPLATE_NORMAL,
-                                 'extended' => _MB_PUBLISHER_TEMPLATE_EXTENDED
-                             ));
+                                 'extended' => _MB_PUBLISHER_TEMPLATE_EXTENDED));
 
     $form->addElement($colEle);
     $form->addElement($catEle);
diff --git a/publisher/blocks/items_menu.php b/publisher/blocks/items_menu.php
index 9f6f31d9..1d176785 100644
--- a/publisher/blocks/items_menu.php
+++ b/publisher/blocks/items_menu.php
@@ -33,19 +33,19 @@ function publisher_items_menu_show($options)
 {
     $block = array();
 
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
 
     // Getting all top cats
-    $block_categoriesObj = $publisher->getHandler('category')->getCategories(0, 0, 0);
+    $blockCategoriesObj =& $publisher->getHandler('category')->getCategories(0, 0, 0);
 
-    if (count($block_categoriesObj) == 0) {
+    if (count($blockCategoriesObj) == 0) {
         return $block;
     }
 
     // Are we in Publisher ?
     $block['inModule'] = (isset($GLOBALS['xoopsModule']) && $GLOBALS['xoopsModule']->getVar('dirname') == $publisher->getModule()->getVar('dirname'));
 
-    $catlink_class = 'menuMain';
+    $catLinkClass = 'menuMain';
 
     $categoryid = 0;
 
@@ -57,13 +57,13 @@ function publisher_items_menu_show($options)
             // if we are in a category, then the $categoryObj is already defined in publisher/category.php
             global $categoryObj;
             $block['currentcat'] = $categoryObj->getCategoryLink('menuTop');
-            $catlink_class       = 'menuSub';
+            $catLinkClass       = 'menuSub';
         }
     }
 
-    foreach ($block_categoriesObj as $catid => $block_categoryObj) {
+    foreach ($blockCategoriesObj as $catid => $blockCategoryObj) {
         if ($catid != $categoryid) {
-            $block['categories'][$catid]['categoryLink'] = $block_categoryObj->getCategoryLink($catlink_class);
+            $block['categories'][$catid]['categoryLink'] = $blockCategoryObj->getCategoryLink($catLinkClass);
         }
     }
 
@@ -87,8 +87,7 @@ function publisher_items_menu_edit($options)
     $orderEle->addOptionArray(array(
                                   'datesub' => _MB_PUBLISHER_DATE,
                                   'counter' => _MB_PUBLISHER_HITS,
-                                  'weight'  => _MB_PUBLISHER_WEIGHT,
-                              ));
+                                  'weight'  => _MB_PUBLISHER_WEIGHT));
     $dispEle = new XoopsFormText(_MB_PUBLISHER_DISP, 'options[2]', 10, 255, $options[2]);
 
     $form->addElement($catEle);
diff --git a/publisher/blocks/items_new.php b/publisher/blocks/items_new.php
index 2b2a2f05..b0d36339 100644
--- a/publisher/blocks/items_new.php
+++ b/publisher/blocks/items_new.php
@@ -31,7 +31,7 @@
  */
 function publisher_items_new_show($options)
 {
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
 
     $selectedcatids = explode(',', $options[0]);
 
@@ -55,17 +55,17 @@ function publisher_items_new_show($options)
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('categoryid', '(' . $options[0] . ')', 'IN'));
     }
-    $itemsObj = $publisher->getHandler('item')->getItems($limit, $start, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED), -1, $sort, $order, '', true, $criteria, true);
+    $itemsObj =& $publisher->getHandler('item')->getItems($limit, $start, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED), -1, $sort, $order, '', true, $criteria, true);
 
     $totalitems = count($itemsObj);
-    if ($itemsObj) {
+    if ($itemsObj && $totalitems > 1) {
         for ($i = 0; $i < $totalitems; ++$i) {
             $item           = array();
             $item['link']   = $itemsObj[$i]->getItemLink(false, isset($options[4]) ? $options[4] : 65);
             $item['id']     = $itemsObj[$i]->itemid();
-            $item['poster'] = $itemsObj[$i]->posterName(); // for make poster name linked, use linkedPosterName() instead of posterName()
+            $item['poster'] = $itemsObj[$i]->posterName(); // for make poster name linked, use getLinkedPosterName() instead of posterName()
 
-            if ($image == 'article') {
+            if ('article' === $image) {
                 $item['image']      = XOOPS_URL . '/uploads/blank.gif';
                 $item['image_name'] = '';
                 $images             = $itemsObj[$i]->getImages();
@@ -78,10 +78,10 @@ function publisher_items_new_show($options)
                     }
                     $item['image_name'] = $images['main']->getVar('image_nicename');
                 }
-            } elseif ($image == 'category') {
+            } elseif ('category' === $image) {
                 $item['image']      = $itemsObj[$i]->getCategoryImagePath();
                 $item['image_name'] = $itemsObj[$i]->getCategoryName();
-            } elseif ($image == 'avatar') {
+            } elseif ('avatar' === $image) {
                 if ($itemsObj[$i]->uid() == '0') {
                     $item['image'] = XOOPS_URL . '/uploads/blank.gif';
                     $images        = $itemsObj[$i]->getImages();
@@ -104,14 +104,20 @@ function publisher_items_new_show($options)
                 $item['image_name'] = $itemsObj[$i]->posterName();
             }
 
-            $item['title'] = $itemsObj[$i]->title();
+            $item['title'] = $itemsObj[$i]->getTitle();
 
-            if ($sort == "datesub") {
-                $item['new'] = $itemsObj[$i]->datesub();
-            } elseif ($sort == "counter") {
+            if ('datesub' === $sort) {
+                $item['new'] = $itemsObj[$i]->getDatesub();
+            } elseif ('counter' === $sort) {
                 $item['new'] = $itemsObj[$i]->counter();
-            } elseif ($sort == "weight") {
+            } elseif ('weight' === $sort) {
                 $item['new'] = $itemsObj[$i]->weight();
+            } elseif ('rating' === $sort) {
+                $item['new'] = $itemsObj[$i]->rating();
+            } elseif ('votes' === $sort) {
+                $item['new'] = $itemsObj[$i]->votes();
+            } elseif ('comments' === $sort) {
+                $item['new'] = $itemsObj[$i]->comments();
             }
 
             $block['newitems'][] = $item;
@@ -138,10 +144,12 @@ function publisher_items_new_edit($options)
     $catEle   = new XoopsFormLabel(_MB_PUBLISHER_SELECTCAT, publisherCreateCategorySelect($options[0], 0, true, 'options[0]'));
     $orderEle = new XoopsFormSelect(_MB_PUBLISHER_ORDER, 'options[1]', $options[1]);
     $orderEle->addOptionArray(array(
-                                  'datesub' => _MB_PUBLISHER_DATE,
-                                  'counter' => _MB_PUBLISHER_HITS,
-                                  'weight'  => _MB_PUBLISHER_WEIGHT,
-                              ));
+                                  'datesub'  => _MB_PUBLISHER_DATE,
+                                  'counter'  => _MB_PUBLISHER_HITS,
+                                  'weight'   => _MB_PUBLISHER_WEIGHT,
+                                  'rating'   => _MI_PUBLISHER_ORDERBY_RATING,
+                                  'votes'    => _MI_PUBLISHER_ORDERBY_VOTES,
+                                  'comments' => _MI_PUBLISHER_ORDERBY_COMMENTS));
 
     $showEle  = new XoopsFormRadioYN(_MB_PUBLISHER_ORDER_SHOW, 'options[2]', $options[2]);
     $dispEle  = new XoopsFormText(_MB_PUBLISHER_DISP, 'options[3]', 10, 255, $options[3]);
@@ -152,8 +160,7 @@ function publisher_items_new_edit($options)
                                   'none'     => _NONE,
                                   'article'  => _MB_PUBLISHER_IMAGE_ARTICLE,
                                   'category' => _MB_PUBLISHER_IMAGE_CATEGORY,
-                                  'avatar'   => _MB_PUBLISHER_IMAGE_AVATAR,
-                              ));
+                                  'avatar'   => _MB_PUBLISHER_IMAGE_AVATAR));
 
     $form->addElement($catEle);
     $form->addElement($orderEle);
diff --git a/publisher/blocks/items_random_item.php b/publisher/blocks/items_random_item.php
index 820d4aa8..df49d281 100644
--- a/publisher/blocks/items_random_item.php
+++ b/publisher/blocks/items_random_item.php
@@ -32,9 +32,9 @@
 function publisher_items_random_item_show($options)
 {
     $block     = array();
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
     // creating the ITEM object
-    $itemsObj = $publisher->getHandler('item')->getRandomItem('', array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED));
+    $itemsObj =& $publisher->getHandler('item')->getRandomItem('', array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED));
 
     if (!is_object($itemsObj)) {
         return $block;
diff --git a/publisher/blocks/items_recent.php b/publisher/blocks/items_recent.php
index 00925958..bcb88172 100644
--- a/publisher/blocks/items_recent.php
+++ b/publisher/blocks/items_recent.php
@@ -31,7 +31,7 @@
  */
 function publisher_items_recent_show($options)
 {
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
     $myts      = MyTextSanitizer::getInstance();
 
     $block = array();
@@ -56,18 +56,18 @@ function publisher_items_recent_show($options)
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('categoryid', '(' . $options[0] . ')', 'IN'));
     }
-    $itemsObj = $publisher->getHandler('item')->getItems($limit, $start, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED), -1, $sort, $order, '', true, $criteria, true);
+    $itemsObj =& $publisher->getHandler('item')->getItems($limit, $start, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED), -1, $sort, $order, '', true, $criteria, true);
 
     $totalItems = count($itemsObj);
 
-    if ($itemsObj) {
+    if ($itemsObj && $totalItems > 1) {
         for ($i = 0; $i < $totalItems; ++$i) {
             $newItems['itemid']       = $itemsObj[$i]->itemid();
-            $newItems['title']        = $itemsObj[$i]->title();
+            $newItems['title']        = $itemsObj[$i]->getTitle();
             $newItems['categoryname'] = $itemsObj[$i]->getCategoryName();
             $newItems['categoryid']   = $itemsObj[$i]->categoryid();
-            $newItems['date']         = $itemsObj[$i]->datesub();
-            $newItems['poster']       = $itemsObj[$i]->linkedPosterName();
+            $newItems['date']         = $itemsObj[$i]->getDatesub();
+            $newItems['poster']       = $itemsObj[$i]->getLinkedPosterName();
             $newItems['itemlink']     = $itemsObj[$i]->getItemLink(false, isset($options[3]) ? $options[3] : 65);
             $newItems['categorylink'] = $itemsObj[$i]->getCategoryLink();
 
@@ -79,7 +79,7 @@ function publisher_items_recent_show($options)
         $block['lang_poster']    = _MB_PUBLISHER_POSTEDBY;
         $block['lang_date']      = _MB_PUBLISHER_DATE;
         $modulename              = $myts->displayTarea($publisher->getModule()->getVar('name'));
-        $block['lang_visitItem'] = _MB_PUBLISHER_VISITITEM . " " . $modulename;
+        $block['lang_visitItem'] = _MB_PUBLISHER_VISITITEM . ' ' . $modulename;
     }
 
     return $block;
@@ -102,8 +102,7 @@ function publisher_items_recent_edit($options)
     $orderEle->addOptionArray(array(
                                   'datesub' => _MB_PUBLISHER_DATE,
                                   'counter' => _MB_PUBLISHER_HITS,
-                                  'weight'  => _MB_PUBLISHER_WEIGHT,
-                              ));
+                                  'weight'  => _MB_PUBLISHER_WEIGHT));
     $dispEle  = new XoopsFormText(_MB_PUBLISHER_DISP, 'options[2]', 10, 255, $options[2]);
     $charsEle = new XoopsFormText(_MB_PUBLISHER_CHARS, 'options[3]', 10, 255, $options[3]);
 
diff --git a/publisher/blocks/items_spot.php b/publisher/blocks/items_spot.php
index 608bcbab..52a25851 100644
--- a/publisher/blocks/items_spot.php
+++ b/publisher/blocks/items_spot.php
@@ -29,45 +29,45 @@
  */
 function publisher_items_spot_show($options)
 {
-//    global $xoTheme;
-    $publisher           = PublisherPublisher::getInstance();
-    $opt_display_last    = $options[0];
-    $opt_items_count     = $options[1];
-    $opt_categoryid      = $options[2];
-    $sel_items           = isset($options[3]) ? explode(',', $options[3]) : '';
-    $opt_display_poster  = $options[4];
-    $opt_display_comment = $options[5];
-    $opt_display_type    = $options[6];
-    $opt_truncate        = (int)($options[7]);
-    $opt_catimage        = $options[8];
-    if ($opt_categoryid == 0) {
-        $opt_categoryid = -1;
+    //    global $xoTheme;
+    $publisher           =& PublisherPublisher::getInstance();
+    $optDisplayLast    = $options[0];
+    $optItemsCount     = $options[1];
+    $optCategoryId      = $options[2];
+    $selItems           = isset($options[3]) ? explode(',', $options[3]) : '';
+    $optDisplayPoster  = $options[4];
+    $optDisplayComment = $options[5];
+    $optDisplayType    = $options[6];
+    $optTruncate        = (int)($options[7]);
+    $optCatImage        = $options[8];
+    if ($optCategoryId == 0) {
+        $optCategoryId = -1;
     }
     $block = array();
-    if ($opt_display_last == 1) {
-        $itemsObj   = $publisher->getHandler('item')->getAllPublished($opt_items_count, 0, $opt_categoryid, $sort = 'datesub', $order = 'DESC', 'summary');
+    if ($optDisplayLast == 1) {
+        $itemsObj   =& $publisher->getHandler('item')->getAllPublished($optItemsCount, 0, $optCategoryId, $sort = 'datesub', $order = 'DESC', 'summary');
         $i          = 1;
         $itemsCount = count($itemsObj);
         if ($itemsObj) {
-            if ($opt_categoryid != -1 && $opt_catimage) {
-                $cat                     = $publisher->getHandler('category')->get($opt_categoryid);
+            if ($optCategoryId != -1 && $optCatImage) {
+                $cat                     =& $publisher->getHandler('category')->get($optCategoryId);
                 $category['name']        = $cat->name();
                 $category['categoryurl'] = $cat->getCategoryUrl();
-                if ($cat->image() != 'blank.png') {
-                    $category['image_path'] = publisherGetImageDir('category', false) . $cat->image();
+                if ($cat->getImage() !== 'blank.png') {
+                    $category['image_path'] = publisherGetImageDir('category', false) . $cat->getImage();
                 } else {
                     $category['image_path'] = '';
                 }
                 $block['category'] = $category;
             }
             foreach ($itemsObj as $key => $thisitem) {
-                $item = $thisitem->toArraySimple('default', 0, $opt_truncate);
+                $item = $thisitem->toArraySimple('default', 0, $optTruncate);
                 if ($i < $itemsCount) {
                     $item['showline'] = true;
                 } else {
                     $item['showline'] = false;
                 }
-                if ($opt_truncate > 0) {
+                if ($optTruncate > 0) {
                     $block['truncate'] = true;
                 }
                 $block['items'][] = $item;
@@ -76,20 +76,20 @@ function publisher_items_spot_show($options)
         }
     } else {
         $i          = 1;
-        $itemsCount = count($sel_items);
-        foreach ($sel_items as $item_id) {
-            $itemObj = $publisher->getHandler('item')->get($item_id);
+        $itemsCount = count($selItems);
+        foreach ($selItems as $itemId) {
+            $itemObj =& $publisher->getHandler('item')->get($itemId);
             if (!$itemObj->notLoaded()) {
                 $item             = $itemObj->toArraySimple();
-                $item['who_when'] = sprintf(_MB_PUBLISHER_WHO_WHEN, $itemObj->posterName(), $itemObj->datesub());
+                $item['who_when'] = sprintf(_MB_PUBLISHER_WHO_WHEN, $itemObj->posterName(), $itemObj->getDatesub());
                 if ($i < $itemsCount) {
                     $item['showline'] = true;
                 } else {
                     $item['showline'] = false;
                 }
-                if ($opt_truncate > 0) {
+                if ($optTruncate > 0) {
                     $block['truncate'] = true;
-                    $item['summary']   = publisherTruncateTagSafe($item['summary'], $opt_truncate);
+                    $item['summary']   = publisherTruncateTagSafe($item['summary'], $optTruncate);
                 }
                 $block['items'][] = $item;
                 ++$i;
@@ -102,11 +102,11 @@ function publisher_items_spot_show($options)
     $block['lang_reads']           = _MB_PUBLISHER_READS;
     $block['lang_comments']        = _MB_PUBLISHER_COMMENTS;
     $block['lang_readmore']        = _MB_PUBLISHER_READMORE;
-    $block['display_whowhen_link'] = $opt_display_poster;
-    $block['display_comment_link'] = $opt_display_comment;
-    $block['display_type']         = $opt_display_type;
+    $block['display_whowhen_link'] = $optDisplayPoster;
+    $block['display_comment_link'] = $optDisplayComment;
+    $block['display_type']         = $optDisplayType;
 
-    $block["publisher_url"] = PUBLISHER_URL;
+    $block['moduleUrl'] = PUBLISHER_URL;
     $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . '/modules/' . PUBLISHER_DIRNAME . '/assets/css/publisher.css');
 
     return $block;
@@ -125,27 +125,26 @@ function publisher_items_spot_edit($options)
     $autoEle   = new XoopsFormRadioYN(_MB_PUBLISHER_AUTO_LAST_ITEMS, 'options[0]', $options[0]);
     $countEle  = new XoopsFormText(_MB_PUBLISHER_LAST_ITEMS_COUNT, 'options[1]', 2, 255, $options[1]);
     $catEle    = new XoopsFormLabel(_MB_PUBLISHER_SELECTCAT, publisherCreateCategorySelect($options[2], 0, true, 'options[2]'));
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
     $criteria  = new CriteriaCompo();
     $criteria->setSort('datesub');
     $criteria->setOrder('DESC');
-    $itemsObj = $publisher->getHandler('item')->getList($criteria);
+    $itemsObj =& $publisher->getHandler('item')->getList($criteria);
     $keys     = array_keys($itemsObj);
     unset($criteria);
     if (empty($options[3]) || ($options[3] == 0)) {
-        $sel_items = isset($keys[0]) ? $keys[0] : 0;
+        $selItems = isset($keys[0]) ? $keys[0] : 0;
     } else {
-        $sel_items = explode(',', $options[3]);
+        $selItems = explode(',', $options[3]);
     }
-    $itemEle = new XoopsFormSelect(_MB_PUBLISHER_SELECT_ITEMS, 'options[3]', $sel_items, 10, true);
+    $itemEle = new XoopsFormSelect(_MB_PUBLISHER_SELECT_ITEMS, 'options[3]', $selItems, 10, true);
     $itemEle->addOptionArray($itemsObj);
     $whoEle  = new XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_WHO_AND_WHEN, 'options[4]', $options[4]);
     $comEle  = new XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_COMMENTS, 'options[5]', $options[5]);
     $typeEle = new XoopsFormSelect(_MB_PUBLISHER_DISPLAY_TYPE, 'options[6]', $options[6]);
     $typeEle->addOptionArray(array(
                                  'block'  => _MB_PUBLISHER_DISPLAY_TYPE_BLOCK,
-                                 'bullet' => _MB_PUBLISHER_DISPLAY_TYPE_BULLET,
-                             ));
+                                 'bullet' => _MB_PUBLISHER_DISPLAY_TYPE_BULLET));
     $truncateEle = new XoopsFormText(_MB_PUBLISHER_TRUNCATE, 'options[7]', 4, 255, $options[7]);
     $imageEle    = new XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_CATIMAGE, 'options[8]', $options[8]);
     $form->addElement($autoEle);
diff --git a/publisher/blocks/latest_files.php b/publisher/blocks/latest_files.php
index 3c5416d6..f50b25a6 100644
--- a/publisher/blocks/latest_files.php
+++ b/publisher/blocks/latest_files.php
@@ -31,7 +31,7 @@
  */
 function publisher_latest_files_show($options)
 {
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
     /**
      * $options[0] : Category
      * $options[1] : Sort order - datesub | counter
@@ -47,15 +47,15 @@ function publisher_latest_files_show($options)
     $directDownload = $options[3];
 
     // creating the files objects
-    $filesObj = $publisher->getHandler('file')->getAllFiles(0, PublisherConstantsInterface::PUBLISHER_STATUS_FILE_ACTIVE, $limit, 0, $sort, $order, explode(',', $options[0]));
+    $filesObj =& $publisher->getHandler('file')->getAllFiles(0, PublisherConstantsInterface::PUBLISHER_STATUS_FILE_ACTIVE, $limit, 0, $sort, $order, explode(',', $options[0]));
     foreach ($filesObj as $fileObj) {
         $aFile         = array();
         $aFile['link'] = $directDownload ? $fileObj->getFileLink() : $fileObj->getItemLink();
-        if ($sort == "datesub") {
-            $aFile['new'] = $fileObj->datesub();
-        } elseif ($sort == "counter") {
+        if ($sort === 'datesub') {
+            $aFile['new'] = $fileObj->getDatesub();
+        } elseif ($sort === 'counter') {
             $aFile['new'] = $fileObj->counter();
-        } elseif ($sort == "weight") {
+        } elseif ($sort === 'weight') {
             $aFile['new'] = $fileObj->weight();
         }
         $block['files'][] = $aFile;
@@ -81,8 +81,7 @@ function publisher_latest_files_edit($options)
     $orderEle->addOptionArray(array(
                                   'datesub' => _MB_PUBLISHER_DATE,
                                   'counter' => _MB_PUBLISHER_HITS,
-                                  'weight'  => _MB_PUBLISHER_WEIGHT,
-                              ));
+                                  'weight'  => _MB_PUBLISHER_WEIGHT));
     $dispEle   = new XoopsFormText(_MB_PUBLISHER_DISP, 'options[2]', 10, 255, $options[2]);
     $directEle = new XoopsFormRadioYN(_MB_PUBLISHER_DIRECTDOWNLOAD, 'options[3]', $options[3]);
 
diff --git a/publisher/blocks/latest_news.php b/publisher/blocks/latest_news.php
index fa3dd458..9cda76cd 100644
--- a/publisher/blocks/latest_news.php
+++ b/publisher/blocks/latest_news.php
@@ -35,21 +35,21 @@ function publisher_latest_news_show($options)
     $block = array();
 
     xoops_loadLanguage('main', 'publisher');
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
 
     $start            = $options[0]; // You can show articles from specified range
     $limit            = $options[1];
-    $column_count     = $options[2];
+    $columnCount     = $options[2];
     $letters          = $options[3];
-    $selected_stories = $options[4];
+    $selectedStories = $options[4];
     $sort             = $options[9];
     $order            = publisherGetOrderBy($sort);
-    $imgwidth         = $options[11];
-    $imgheight        = $options[12];
+    $imgWidth         = $options[11];
+    $imgHeight        = $options[12];
     $border           = $options[13];
     $bordercolor      = $options[14];
 
-    $block['spec']['columnwidth'] = (int)(1 / $column_count * 100);
+    $block['spec']['columnwidth'] = (int)(1 / $columnCount * 100);
 
     $allcats = false;
     if (!isset($options[29])) {
@@ -67,13 +67,13 @@ function publisher_latest_news_show($options)
     }
 
     // Use specific ITEMS
-    if ($selected_stories != 0) {
+    if ($selectedStories != 0) {
         unset($criteria); //removes category option
         $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('itemid', '(' . $selected_stories . ')', 'IN'));
+        $criteria->add(new Criteria('itemid', '(' . $selectedStories . ')', 'IN'));
     }
 
-    $itemsObj = $publisher->getHandler('item')->getItems($limit, $start, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED), -1, $sort, $order, '', true, $criteria, 'itemid');
+    $itemsObj =& $publisher->getHandler('item')->getItems($limit, $start, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED), -1, $sort, $order, '', true, $criteria, 'itemid');
 
     $scount = count($itemsObj);
 
@@ -93,45 +93,45 @@ function publisher_latest_news_show($options)
         if (!function_exists('imagecreatetruecolor')) {
             $item['item_image'] = $mainImage['image_path'];
         } else {
-            $item['item_image'] = PUBLISHER_URL . '/thumb.php?src=' . $mainImage['image_path'] . '&amp;w=' . $imgwidth; // No $imgheight for autoheight option
+            $item['item_image'] = PUBLISHER_URL . '/thumb.php?src=' . $mainImage['image_path'] . '&amp;w=' . $imgWidth; // No $imgHeight for autoheight option
         }
         $item['text'] = $itemObj->getBlockSummary($letters);
 
         $item = $itemObj->getMainImage($item); //returns an array
 
-        $ls_height = '';
+        $lsHeight = '';
         if ($options[12] != 0) {
-            $ls_height = 'height="' . $imgheight . '" ';
+            $lsHeight = 'height="' . $imgHeight . '" ';
         } // set height = 0 in block option for auto height
 
-        if ($options[15] == 'LEFT') {
-            $imgposition = "float: left";
-            $ls_margin   = '-right';
+        if ($options[15] === 'LEFT') {
+            $imgPosition = 'float: left';
+            $lsMargin   = '-right';
         }
 
-        if ($options[15] == 'CENTER') {
-            $imgposition = "text-align:center";
-            $ls_margin   = '';
+        if ($options[15] === 'CENTER') {
+            $imgPosition = 'text-align:center';
+            $lsMargin   = '';
         }
 
-        if ($options[15] == 'RIGHT') {
-            $imgposition = "float: right";
-            $ls_margin   = '-left';
+        if ($options[15] === 'RIGHT') {
+            $imgPosition = 'float: right';
+            $lsMargin   = '-left';
         }
 
         //Image
         if ($options[10] == 1 && $item['image_path'] != '') {
-            $startdiv = '<div style="' . $imgposition . '"><a href="' . $item['itemurl'] . '">';
-            $style    = 'style="margin' . $ls_margin . ': 10px; padding: 2px; border: ' . $border . 'px solid #' . $bordercolor . '"';
-            $enddiv   = 'width="' . $imgwidth . '" ' . $ls_height . '/></a></div>';
+            $startdiv = '<div style="' . $imgPosition . '"><a href="' . $item['itemurl'] . '">';
+            $style    = 'style="margin' . $lsMargin . ': 10px; padding: 2px; border: ' . $border . 'px solid #' . $bordercolor . '"';
+            $enddiv   = 'width="' . $imgWidth . '" ' . $lsHeight . '/></a></div>';
             $image    = $startdiv . '<img ' . $style . ' src="' . $item['item_image'] . '" alt="' . $item['image_name'] . '" ' . $enddiv;
 
             $item['image'] = $image;
         }
 
         if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->isAdmin(-1)) {
-            $item['admin'] = "<a href='" . PUBLISHER_URL . "/submit.php?itemid=" . $itemObj->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/edit.gif'" . " title='" . _CO_PUBLISHER_EDIT . "' alt='" . _CO_PUBLISHER_EDIT . "' /></a>&nbsp;";
-            $item['admin'] .= "<a href='" . PUBLISHER_URL . "/admin/item.php?op=del&amp;itemid=" . $itemObj->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/delete.png'" . " title='" . _CO_PUBLISHER_DELETE . "' alt='" . _CO_PUBLISHER_DELETE . "' /></a>";
+            $item['admin'] = "<a href='" . PUBLISHER_URL . '/submit.php?itemid=' . $itemObj->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/edit.gif'" . " title='" . _CO_PUBLISHER_EDIT . "' alt='" . _CO_PUBLISHER_EDIT . "' /></a>&nbsp;";
+            $item['admin'] .= "<a href='" . PUBLISHER_URL . '/admin/item.php?op=del&amp;itemid=' . $itemObj->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/delete.png'" . " title='" . _CO_PUBLISHER_DELETE . "' alt='" . _CO_PUBLISHER_DELETE . "' /></a>";
         } else {
             $item['admin'] = '';
         }
@@ -160,7 +160,7 @@ function publisher_latest_news_show($options)
 
         $item['posttime'] = '';
         if ($options[20] == 1) {
-            $item['posttime'] = _ON . ' ' . $itemObj->datesub();
+            $item['posttime'] = _ON . ' ' . $itemObj->getDatesub();
         }
 
         $item['topic_title'] = '';
@@ -195,14 +195,13 @@ function publisher_latest_news_show($options)
 
         $item['print'] = '';
         if ($options[24] == 1) {
-            $item['print'] = '<a href="' . PublisherSeo::generateUrl("print", $itemObj->itemid(), $itemObj->short_url()) . '" rel="nofollow"><img src="' . PUBLISHER_URL . '/assets/images/links/print.gif" title="' . _CO_PUBLISHER_PRINT . '" alt="' . _CO_PUBLISHER_PRINT . '" /></a>&nbsp;';
+            $item['print'] = '<a href="' . PublisherSeo::generateUrl('print', $itemObj->itemid(), $itemObj->short_url()) . '" rel="nofollow"><img src="' . PUBLISHER_URL . '/assets/images/links/print.gif" title="' . _CO_PUBLISHER_PRINT . '" alt="' . _CO_PUBLISHER_PRINT . '" /></a>&nbsp;';
         }
 
         $item['pdf'] = '';
         if ($publisher->getConfig('display_pdf')) {
             if ($options[25] == 1) {
-                $item['pdf'] = "<a href='" . PUBLISHER_URL . "/makepdf.php?itemid=" . $itemObj->itemid() . "' rel='nofollow'><img src='" . PUBLISHER_URL . "/assets/images/links/pdf.gif' title='"
-                               . _CO_PUBLISHER_PDF . "' alt='" . _CO_PUBLISHER_PDF . "' /></a>&nbsp;";
+                $item['pdf'] = "<a href='" . PUBLISHER_URL . '/makepdf.php?itemid=' . $itemObj->itemid() . "' rel='nofollow'><img src='" . PUBLISHER_URL . "/assets/images/links/pdf.gif' title='" . _CO_PUBLISHER_PDF . "' alt='" . _CO_PUBLISHER_PDF . "' /></a>&nbsp;";
             }
         }
         $item['email'] = '';
@@ -238,7 +237,7 @@ function publisher_latest_news_show($options)
         $columns[$k][] = $item;
         ++$k;
 
-        if ($k == $column_count) {
+        if ($k == $columnCount) {
             $k = 0;
         }
     }
@@ -264,13 +263,13 @@ function publisher_latest_news_edit($options)
     $form = "<table border='0' cellpadding='0' cellspacing='0'>";
     $form .= $tabletag3 . _MB_PUBLISHER_GENERALCONFIG . $tabletag4; // General Options
     $form .= $tabletag1 . _MB_PUBLISHER_FIRST . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[0] . "' size='4'>&nbsp;" . _MB_PUBLISHER_ITEMS . "</td></tr>";
+    $form .= "<input type='text' name='options[]' value='" . $options[0] . "' size='4'>&nbsp;" . _MB_PUBLISHER_ITEMS . '</td></tr>';
     $form .= $tabletag1 . _MB_PUBLISHER_DISP . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[1] . "' size='4'>&nbsp;" . _MB_PUBLISHER_ITEMS . "</td></tr>";
+    $form .= "<input type='text' name='options[]' value='" . $options[1] . "' size='4'>&nbsp;" . _MB_PUBLISHER_ITEMS . '</td></tr>';
     $form .= $tabletag1 . _MB_PUBLISHER_COLUMNS . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[2] . "' size='4'>&nbsp;" . _MB_PUBLISHER_COLUMN . "</td></tr>";
+    $form .= "<input type='text' name='options[]' value='" . $options[2] . "' size='4'>&nbsp;" . _MB_PUBLISHER_COLUMN . '</td></tr>';
     $form .= $tabletag1 . _MB_PUBLISHER_TEXTLENGTH . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[3] . "' size='4'>&nbsp;" . _MB_PUBLISHER_LETTER . "</td></tr>";
+    $form .= "<input type='text' name='options[]' value='" . $options[3] . "' size='4'>&nbsp;" . _MB_PUBLISHER_LETTER . '</td></tr>';
     $form .= $tabletag1 . _MB_PUBLISHER_SELECTEDSTORIES . $tabletag2;
     $form .= "<input type='text' name='options[]' value='" . $options[4] . "' size='16'></td></tr>";
     $form .= $tabletag1 . _MB_PUBLISHER_SCROLL . $tabletag2;
@@ -291,62 +290,62 @@ function publisher_latest_news_edit($options)
         }
         $form .= ">{$value}</option>";
     }
-    $form .= "</select></td></tr>";
+    $form .= '</select></td></tr>';
 
     $form .= $tabletag1 . _MB_PUBLISHER_ORDER . $tabletag2;
 
     $form .= "<select name='options[9]'>";
     $form .= "<option value='datesub'";
-    if ($options[9] == "datesub") {
+    if ($options[9] === 'datesub') {
         $form .= " selected='selected'";
     }
-    $form .= ">" . _MB_PUBLISHER_DATE . "</option>";
+    $form .= '>' . _MB_PUBLISHER_DATE . '</option>';
 
     $form .= "<option value='counter'";
-    if ($options[9] == "counter") {
+    if ($options[9] === 'counter') {
         $form .= " selected='selected'";
     }
-    $form .= ">" . _MB_PUBLISHER_HITS . "</option>";
+    $form .= '>' . _MB_PUBLISHER_HITS . '</option>';
 
     $form .= "<option value='weight'";
-    if ($options[9] == "weight") {
+    if ($options[9] === 'weight') {
         $form .= " selected='selected'";
     }
-    $form .= ">" . _MB_PUBLISHER_WEIGHT . "</option>";
+    $form .= '>' . _MB_PUBLISHER_WEIGHT . '</option>';
 
-    $form .= "</select></td></tr>";
+    $form .= '</select></td></tr>';
 
     $form .= $tabletag3 . _MB_PUBLISHER_PHOTOSCONFIG . $tabletag4; // Photos Options
     $form .= $tabletag1 . _MB_PUBLISHER_IMGDISPLAY . $tabletag2;
     $form .= publisher_mk_chkbox($options, 10);
     $form .= $tabletag1 . _MB_PUBLISHER_IMGWIDTH . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[11] . "' size='4'>&nbsp;" . _MB_PUBLISHER_PIXEL . "</td></tr>";
+    $form .= "<input type='text' name='options[]' value='" . $options[11] . "' size='4'>&nbsp;" . _MB_PUBLISHER_PIXEL . '</td></tr>';
     $form .= $tabletag1 . _MB_PUBLISHER_IMGHEIGHT . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[12] . "' size='4'>&nbsp;" . _MB_PUBLISHER_PIXEL . "</td></tr>";
+    $form .= "<input type='text' name='options[]' value='" . $options[12] . "' size='4'>&nbsp;" . _MB_PUBLISHER_PIXEL . '</td></tr>';
     $form .= $tabletag1 . _MB_PUBLISHER_BORDER . $tabletag2;
-    $form .= "<input type='text' name='options[]' value='" . $options[13] . "' size='4'>&nbsp;" . _MB_PUBLISHER_PIXEL . "</td></tr>";
+    $form .= "<input type='text' name='options[]' value='" . $options[13] . "' size='4'>&nbsp;" . _MB_PUBLISHER_PIXEL . '</td></tr>';
     $form .= $tabletag1 . _MB_PUBLISHER_BORDERCOLOR . $tabletag2;
     $form .= "<input type='text' name='options[]' value='" . $options[14] . "' size='8'></td></tr>";
     $form .= $tabletag1 . _MB_PUBLISHER_IMGPOSITION . $tabletag2;
     $form .= "<select name='options[]'>";
     $form .= "<option value='LEFT'";
-    if ($options[15] == 'LEFT') {
+    if ($options[15] === 'LEFT') {
         $form .= " selected='selected'";
     }
     $form .= '>' . _LEFT . "</option>\n";
 
     $form .= "<option value='CENTER'";
-    if ($options[15] == 'CENTER') {
+    if ($options[15] === 'CENTER') {
         $form .= " selected='selected'";
     }
     $form .= '>' . _CENTER . "</option>\n";
 
     $form .= "<option value='RIGHT'";
-    if ($options[15] == 'RIGHT') {
+    if ($options[15] === 'RIGHT') {
         $form .= " selected='selected'";
     }
     $form .= '>' . _RIGHT . '</option>';
-    $form .= "</select></td></tr>";
+    $form .= '</select></td></tr>';
 
     $form .= $tabletag3 . _MB_PUBLISHER_LINKSCONFIG . $tabletag4; // Links Options
     $form .= $tabletag1 . _MB_PUBLISHER_DISPLAY_TOPICLINK . $tabletag2;
@@ -386,7 +385,7 @@ function publisher_latest_news_edit($options)
         }
         $form .= ">{$value}</option>";
     }
-    $form .= "</select></td></tr>";
+    $form .= '</select></td></tr>';
 
     //Select Which Categories To Show
     $form .= $tabletag3 . _MB_PUBLISHER_TOPICSCONFIG . $tabletag4; // Topics Options
@@ -394,7 +393,7 @@ function publisher_latest_news_edit($options)
     $form .= publisherCreateCategorySelect($options[29], 0, true, 'options[29]');
     $form .= '</td></tr>';
 
-    $form .= "</table>";
+    $form .= '</table>';
 
     return $form;
 }
@@ -407,16 +406,16 @@ function publisher_latest_news_edit($options)
  */
 function publisher_mk_chkbox($options, $number)
 {
-    $chk = "";
+    $chk = '';
     if ($options[$number] == 1) {
         $chk = " checked='checked'";
     }
-    $chkbox = "<input type='radio' name='options[{$number}]' value='1'" . $chk . " />&nbsp;" . _YES . "&nbsp;&nbsp;";
-    $chk    = "";
+    $chkbox = "<input type='radio' name='options[{$number}]' value='1'" . $chk . ' />&nbsp;' . _YES . '&nbsp;&nbsp;';
+    $chk    = '';
     if ($options[$number] == 0) {
         $chk = " checked='checked'";
     }
-    $chkbox .= "<input type='radio' name='options[{$number}]' value='0'" . $chk . " />&nbsp;" . _NO . "</td></tr>";
+    $chkbox .= "<input type='radio' name='options[{$number}]' value='0'" . $chk . ' />&nbsp;' . _NO . '</td></tr>';
 
     return $chkbox;
 }
@@ -429,21 +428,21 @@ function publisher_mk_chkbox($options, $number)
  */
 function publisher_mk_select($options, $number)
 {
-    $slc = "";
+    $slc = '';
     if ($options[$number] == 2) {
         $slc = " checked='checked'";
     }
-    $select = "<input type='radio' name='options[{$number}]' value='2'" . $slc . " />&nbsp;" . _LEFT . "&nbsp;&nbsp;";
-    $slc    = "";
+    $select = "<input type='radio' name='options[{$number}]' value='2'" . $slc . ' />&nbsp;' . _LEFT . '&nbsp;&nbsp;';
+    $slc    = '';
     if ($options[$number] == 1) {
         $slc = " checked='checked'";
     }
-    $select = "<input type='radio' name='options[{$number}]' value='1'" . $slc . " />&nbsp;" . _CENTER . "&nbsp;&nbsp;";
-    $slc    = "";
+    $select = "<input type='radio' name='options[{$number}]' value='1'" . $slc . ' />&nbsp;' . _CENTER . '&nbsp;&nbsp;';
+    $slc    = '';
     if ($options[$number] == 0) {
         $slc = " checked='checked'";
     }
-    $select .= "<input type='radio' name='options[{$number}]' value='0'" . $slc . " />&nbsp;" . _RIGHT . "</td></tr>";
+    $select .= "<input type='radio' name='options[{$number}]' value='0'" . $slc . ' />&nbsp;' . _RIGHT . '</td></tr>';
 
     return $select;
 }
diff --git a/publisher/blocks/search.php b/publisher/blocks/search.php
index c342114a..52c941e3 100644
--- a/publisher/blocks/search.php
+++ b/publisher/blocks/search.php
@@ -29,10 +29,11 @@
  *
  * @return array
  */
-function publisher_search_show($options) {
+function publisher_search_show($options)
+{
     $block      = array();
-    $publisher  = PublisherPublisher::getInstance();
-    $categories = $publisher->getHandler('category')->getCategoriesForSearch();
+    $publisher  =& PublisherPublisher::getInstance();
+    $categories =& $publisher->getHandler('category')->getCategoriesForSearch();
     if (count($categories) == 0) {
         return $block;
     }
@@ -41,131 +42,131 @@ function publisher_search_show($options) {
 
     $andor    = XoopsRequest::getString('andor', XoopsRequest::getString('andor', '', 'GET'), 'POST');
     $username = XoopsRequest::getString('uname', XoopsRequest::getString('uname', null, 'GET'), 'POST');
-//  $searchin = isset($_POST["searchin"]) ? $_POST["searchin"] : (isset($_GET["searchin"]) ? explode("|", $_GET["searchin"]) : array());
-//  $searchin = XoopsRequest::getArray('searchin', (explode("|", XoopsRequest::getString('searchin', array(), 'GET'))), 'POST');
+    //  $searchin = isset($_POST["searchin"]) ? $_POST["searchin"] : (isset($_GET["searchin"]) ? explode("|", $_GET["searchin"]) : array());
+    //  $searchin = XoopsRequest::getArray('searchin', (explode("|", XoopsRequest::getString('searchin', array(), 'GET'))), 'POST');
 
     $searchin = XoopsRequest::getArray('searchin', '', 'POST');
     if (!isset($searchin)) {
         $searchin = XoopsRequest::getString('searchin', array(), 'GET');
-        $searchin = isset($searchin) ? explode("|", $searchin) : array();
+        $searchin = isset($searchin) ? explode('|', $searchin) : array();
     }
 
-    $sortby   = XoopsRequest::getString('sortby', XoopsRequest::getString('sortby', null, 'GET'), 'POST');
-    $term     = XoopsRequest::getString('term', XoopsRequest::getString('term', '', 'GET'));
+    $sortby = XoopsRequest::getString('sortby', XoopsRequest::getString('sortby', null, 'GET'), 'POST');
+    $term   = XoopsRequest::getString('term', XoopsRequest::getString('term', '', 'GET'));
 
     //mb TODO simplify next lines with category
-    $category = XoopsRequest::getArray('category', array(), 'POST') ? XoopsRequest::getArray('category', array(), 'POST') : (XoopsRequest::getArray('category', null, 'GET'));
-    if (empty($category) || (is_array($category) && in_array("all", $category))) {
+    $category = XoopsRequest::getArray('category', array(), 'POST') ?: (XoopsRequest::getArray('category', null, 'GET'));
+    if (empty($category) || (is_array($category) && in_array('all', $category))) {
         $category = array();
     } else {
-        $category = (!is_array($category)) ? explode(",", $category) : $category;
-        $category = array_map("intval", $category);
+        $category = (!is_array($category)) ? explode(',', $category) : $category;
+        $category = array_map('intval', $category);
     }
 
-    $andor  = (in_array(strtoupper($andor), array("OR", "AND", "EXACT"))) ? strtoupper($andor) : "OR";
-    $sortby = (in_array(strtolower($sortby), array("itemid", "datesub", "title", "categoryid"))) ? strtolower($sortby) : "itemid";
+    $andor  = (in_array(strtoupper($andor), array('OR', 'AND', 'EXACT'))) ? strtoupper($andor) : 'OR';
+    $sortby = (in_array(strtolower($sortby), array('itemid', 'datesub', 'title', 'categoryid'))) ? strtolower($sortby) : 'itemid';
 
     /* type */
-    $type_select = "<select name=\"andor\">";
-    $type_select .= "<option value=\"OR\"";
-    if ("OR" == $andor) {
-        $type_select .= " selected=\"selected\"";
+    $typeSelect = "<select name=\"andor\">";
+    $typeSelect .= "<option value=\"OR\"";
+    if ('OR' === $andor) {
+        $typeSelect .= " selected=\"selected\"";
     }
-    $type_select .= ">" . _SR_ANY . "</option>";
-    $type_select .= "<option value=\"AND\"";
-    if ("AND" == $andor) {
-        $type_select .= " selected=\"selected\"";
+    $typeSelect .= '>' . _SR_ANY . '</option>';
+    $typeSelect .= "<option value=\"AND\"";
+    if ('AND' === $andor) {
+        $typeSelect .= " selected=\"selected\"";
     }
-    $type_select .= ">" . _SR_ALL . "</option>";
-    $type_select .= "<option value=\"EXACT\"";
-    if ("exact" == $andor) {
-        $type_select .= " selected=\"selected\"";
+    $typeSelect .= '>' . _SR_ALL . '</option>';
+    $typeSelect .= "<option value=\"EXACT\"";
+    if ('exact' === $andor) {
+        $typeSelect .= " selected=\"selected\"";
     }
-    $type_select .= ">" . _SR_EXACT . "</option>";
-    $type_select .= "</select>";
+    $typeSelect .= '>' . _SR_EXACT . '</option>';
+    $typeSelect .= '</select>';
 
     /* category */
 
-    $select_category = "<select name=\"category[]\" size=\"5\" multiple=\"multiple\" width=\"150\" style=\"width:150px;\">";
-    $select_category .= "<option value=\"all\"";
+    $categorySelect = "<select name=\"category[]\" size=\"5\" multiple=\"multiple\" width=\"150\" style=\"width:150px;\">";
+    $categorySelect .= "<option value=\"all\"";
     if (empty($category) || count($category) == 0) {
-        $select_category .= "selected=\"selected\"";
+        $categorySelect .= "selected=\"selected\"";
     }
-    $select_category .= ">" . _ALL . "</option>";
+    $categorySelect .= '>' . _ALL . '</option>';
     foreach ($categories as $id => $cat) {
-        $select_category .= "<option value=\"" . $id . "\"";
+        $categorySelect .= "<option value=\"" . $id . "\"";
         if (in_array($id, $category)) {
-            $select_category .= "selected=\"selected\"";
+            $categorySelect .= "selected=\"selected\"";
         }
-        $select_category .= ">" . $cat . "</option>";
+        $categorySelect .= '>' . $cat . '</option>';
     }
     unset($id, $cat);
-    $select_category .= "</select>";
+    $categorySelect .= '</select>';
 
     /* scope */
-    $searchin_select = "";
-    $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"title\"";
-    if (is_array($searchin) && in_array("title", $searchin)) {
-        $searchin_select .= " checked";
-    }
-    $searchin_select .= " />" . _CO_PUBLISHER_TITLE . "&nbsp;&nbsp;";
-    $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"subtitle\"";
-    if (is_array($searchin) && in_array("subtitle", $searchin)) {
-        $searchin_select .= " checked";
-    }
-    $searchin_select .= " />" . _CO_PUBLISHER_SUBTITLE . "&nbsp;&nbsp;";
-    $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"summary\"";
-    if (is_array($searchin) && in_array("summary", $searchin)) {
-        $searchin_select .= " checked";
-    }
-    $searchin_select .= " />" . _CO_PUBLISHER_SUMMARY . "&nbsp;&nbsp;";
-    $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"text\"";
-    if (is_array($searchin) && in_array("body", $searchin)) {
-        $searchin_select .= " checked";
-    }
-    $searchin_select .= " />" . _CO_PUBLISHER_BODY . "&nbsp;&nbsp;";
-    $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"keywords\"";
-    if (is_array($searchin) && in_array("meta_keywords", $searchin)) {
-        $searchin_select .= " checked";
-    }
-    $searchin_select .= " />" . _CO_PUBLISHER_ITEM_META_KEYWORDS . "&nbsp;&nbsp;";
-    $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"all\"";
-    if ((is_array($searchin) && in_array("all", $searchin)) || empty($searchin)) {
-        $searchin_select .= " checked";
-    }
-    $searchin_select .= " />" . _ALL . "&nbsp;&nbsp;";
+    $searchSelect = '';
+    $searchSelect .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"title\"";
+    if (is_array($searchin) && in_array('title', $searchin)) {
+        $searchSelect .= ' checked';
+    }
+    $searchSelect .= ' />' . _CO_PUBLISHER_TITLE . '&nbsp;&nbsp;';
+    $searchSelect .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"subtitle\"";
+    if (is_array($searchin) && in_array('subtitle', $searchin)) {
+        $searchSelect .= ' checked';
+    }
+    $searchSelect .= ' />' . _CO_PUBLISHER_SUBTITLE . '&nbsp;&nbsp;';
+    $searchSelect .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"summary\"";
+    if (is_array($searchin) && in_array('summary', $searchin)) {
+        $searchSelect .= ' checked';
+    }
+    $searchSelect .= ' />' . _CO_PUBLISHER_SUMMARY . '&nbsp;&nbsp;';
+    $searchSelect .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"text\"";
+    if (is_array($searchin) && in_array('body', $searchin)) {
+        $searchSelect .= ' checked';
+    }
+    $searchSelect .= ' />' . _CO_PUBLISHER_BODY . '&nbsp;&nbsp;';
+    $searchSelect .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"keywords\"";
+    if (is_array($searchin) && in_array('meta_keywords', $searchin)) {
+        $searchSelect .= ' checked';
+    }
+    $searchSelect .= ' />' . _CO_PUBLISHER_ITEM_META_KEYWORDS . '&nbsp;&nbsp;';
+    $searchSelect .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"all\"";
+    if (empty($searchin) || (is_array($searchin) && in_array('all', $searchin))) {
+        $searchSelect .= ' checked';
+    }
+    $searchSelect .= ' />' . _ALL . '&nbsp;&nbsp;';
 
     /* sortby */
-    $sortby_select = "<select name=\"sortby\">";
-    $sortby_select .= "<option value=\"itemid\"";
-    if ("itemid" == $sortby || empty($sortby)) {
-        $sortby_select .= " selected=\"selected\"";
-    }
-    $sortby_select .= ">" . _NONE . "</option>";
-    $sortby_select .= "<option value=\"datesub\"";
-    if ("datesub" == $sortby) {
-        $sortby_select .= " selected=\"selected\"";
-    }
-    $sortby_select .= ">" . _CO_PUBLISHER_DATESUB . "</option>";
-    $sortby_select .= "<option value=\"title\"";
-    if ("title" == $sortby) {
-        $sortby_select .= " selected=\"selected\"";
-    }
-    $sortby_select .= ">" . _CO_PUBLISHER_TITLE . "</option>";
-    $sortby_select .= "<option value=\"categoryid\"";
-    if ("categoryid" == $sortby) {
-        $sortby_select .= " selected=\"selected\"";
-    }
-    $sortby_select .= ">" . _CO_PUBLISHER_CATEGORY . "</option>";
-    $sortby_select .= "</select>";
-
-    $block["type_select"]     = $type_select;
-    $block["searchin_select"] = $searchin_select;
-    $block["category_select"] = $select_category;
-    $block["sortby_select"]   = $sortby_select;
-    $block["search_term"]     = $term;
-    $block["search_user"]     = $username;
-    $block["publisher_url"]   = PUBLISHER_URL;
+    $sortbySelect = "<select name=\"sortby\">";
+    $sortbySelect .= "<option value=\"itemid\"";
+    if ('itemid' === $sortby || empty($sortby)) {
+        $sortbySelect .= " selected=\"selected\"";
+    }
+    $sortbySelect .= '>' . _NONE . '</option>';
+    $sortbySelect .= "<option value=\"datesub\"";
+    if ('datesub' === $sortby) {
+        $sortbySelect .= " selected=\"selected\"";
+    }
+    $sortbySelect .= '>' . _CO_PUBLISHER_DATESUB . '</option>';
+    $sortbySelect .= "<option value=\"title\"";
+    if ('title' === $sortby) {
+        $sortbySelect .= " selected=\"selected\"";
+    }
+    $sortbySelect .= '>' . _CO_PUBLISHER_TITLE . '</option>';
+    $sortbySelect .= "<option value=\"categoryid\"";
+    if ('categoryid' === $sortby) {
+        $sortbySelect .= " selected=\"selected\"";
+    }
+    $sortbySelect .= '>' . _CO_PUBLISHER_CATEGORY . '</option>';
+    $sortbySelect .= '</select>';
+
+    $block['typeSelect']     = $typeSelect;
+    $block['searchSelect'] = $searchSelect;
+    $block['categorySelect'] = $categorySelect;
+    $block['sortbySelect']   = $sortbySelect;
+    $block['search_term']     = $term;
+    $block['search_user']     = $username;
+    $block['moduleUrl']   = PUBLISHER_URL;
 
     return $block;
 }
diff --git a/publisher/category.php b/publisher/category.php
index 8ab7e50e..9692aa7f 100644
--- a/publisher/category.php
+++ b/publisher/category.php
@@ -25,18 +25,18 @@
 $categoryid = XoopsRequest::getInt('categoryid', 0, 'GET');
 
 // Creating the category object for the selected category
-$categoryObj = $publisher->getHandler('category')->get($categoryid);
+$categoryObj =& $publisher->getHandler('category')->get($categoryid);
 
 // if the selected category was not found, exit
 if (!is_object($categoryObj) || $categoryObj->notLoaded()) {
-    redirect_header("javascript:history.go(-1)", 1, _MD_PUBLISHER_NOCATEGORYSELECTED);
-//    exit();
+    redirect_header('javascript:history.go(-1)', 1, _MD_PUBLISHER_NOCATEGORYSELECTED);
+    //    exit();
 }
 
 // Check user permissions to access this category
 if (!$categoryObj->checkPermission()) {
-    redirect_header("javascript:history.go(-1)", 1, _NOPERM);
-//    exit;
+    redirect_header('javascript:history.go(-1)', 1, _NOPERM);
+    //    exit;
 }
 
 // At which record shall we start
@@ -44,7 +44,7 @@
 
 $item_page_id = XoopsRequest::getInt('page', -1, 'GET');
 
-$totalItems = $publisher->getHandler('category')->publishedItemsCount();
+$totalItems =& $publisher->getHandler('category')->publishedItemsCount();
 
 // if there is no Item under this categories or the sub-categories, exit
 // why?
@@ -66,23 +66,43 @@
 
 // creating the Item objects that belong to the selected category
 switch ($publisher->getConfig('format_order_by')) {
-    case 'title' :
+    case 'title':
         $sort  = 'title';
         $order = 'ASC';
         break;
 
-    case 'date' :
+    case 'date':
         $sort  = 'datesub';
         $order = 'DESC';
         break;
 
+    case 'counter':
+        $sort  = 'counter';
+        $order = 'DESC';
+        break;
+
+    case 'rating':
+        $sort  = 'rating';
+        $order = 'DESC';
+        break;
+
+    case 'votes':
+        $sort  = 'votes';
+        $order = 'DESC';
+        break;
+
+    case 'comments':
+        $sort  = 'comments';
+        $order = 'DESC';
+        break;
+
     default:
         $sort  = 'weight';
         $order = 'ASC';
         break;
 }
 
-$itemsObj = $publisher->getHandler('item')->getAllPublished($publisher->getConfig('idxcat_index_perpage'), $start, $categoryid, $sort, $order);
+$itemsObj =& $publisher->getHandler('item')->getAllPublished($publisher->getConfig('idxcat_index_perpage'), $start, $categoryid, $sort, $order);
 
 if ($itemsObj) {
     $totalItemOnPage = count($itemsObj);
@@ -98,23 +118,23 @@
 $category                 = $categoryObj->toArraySimple(null, true);
 $category['categoryPath'] = $categoryObj->getCategoryPath($publisher->getConfig('format_linked_path'));
 
-//$totalItems = $publisher_category_handler->publishedItemsCount($publisher->getConfig('idxcat_display_last_item'));
+//$totalItems = $publisher_categoryHandler->publishedItemsCount($publisher->getConfig('idxcat_display_last_item'));
 
 if ($publisher->getConfig('idxcat_display_last_item') == 1) {
     // Get the last smartitem
-    $last_itemObj = $publisher->getHandler('item')->getLastPublishedByCat(array(array($categoryObj)));
+    $last_itemObj =& $publisher->getHandler('item')->getLastPublishedByCat(array(array($categoryObj)));
 }
 $lastitemsize = (int)($publisher->getConfig('idxcat_last_item_size'));
 
 // Creating the sub-categories objects that belong to the selected category
-$subcatsObj    = $publisher->getHandler('category')->getCategories(0, 0, $categoryid);
+$subcatsObj    =& $publisher->getHandler('category')->getCategories(0, 0, $categoryid);
 $total_subcats = count($subcatsObj);
 
 $total_items = 0;
 
 $subcategories = array();
 
-if ($publisher->getConfig('idxcat_show_subcats') != 'no') {
+if ($publisher->getConfig('idxcat_show_subcats') !== 'no') {
     // if this category has subcats
     if (isset($subcatsObj) && $total_subcats > 0) {
         foreach ($subcatsObj as $key => $subcat) {
@@ -122,7 +142,7 @@
             $subcat_total_items = isset($totalItems[$key]) ? $totalItems[$key] : 0;
 
             // Do we display empty sub-cats ?
-            if (($subcat_total_items > 0) || ($publisher->getConfig('idxcat_show_subcats') == 'all')) {
+            if (($subcat_total_items > 0) || ($publisher->getConfig('idxcat_show_subcats') === 'all')) {
                 $subcat_id = $subcat->getVar('categoryid');
                 // if we retreived the last item object for this category
                 if (isset($last_itemObj[$subcat_id])) {
@@ -170,15 +190,15 @@
             $userids[$thisitem->uid()] = 1;
         }
     }
-    $member_handler = xoops_gethandler('member');
-    //$users = $member_handler->getUsers(new Criteria('uid', "(" . implode(',', array_keys($userids)) . ")", "IN"), true);
+    $memberHandler =& xoops_getHandler('member');
+    //$users = $memberHandler->getUsers(new Criteria('uid', "(" . implode(',', array_keys($userids)) . ")", "IN"), true);
     */
     // Adding the items of the selected category
 
     for ($i = 0; $i < $totalItemOnPage; ++$i) {
         $item                 = $itemsObj[$i]->toArraySimple('default', $publisher->getConfig('item_title_size'));
         $item['categoryname'] = $categoryObj->name();
-        $item['categorylink'] = "<a href='" . PublisherSeo::generateUrl('category', $itemsObj[$i]->categoryid(), $categoryObj->short_url()) . "'>" . $categoryObj->name() . "</a>";
+        $item['categorylink'] = "<a href='" . PublisherSeo::generateUrl('category', $itemsObj[$i]->categoryid(), $categoryObj->short_url()) . "'>" . $categoryObj->name() . '</a>';
         $item['who_when']     = $itemsObj[$i]->getWhoAndWhen();
         $xoopsTpl->append('items', $item);
     }
@@ -225,7 +245,7 @@
 
 // RSS Link
 if ($publisher->getConfig('idxcat_show_rss_link') == 1) {
-    $link = sprintf("<a href='%s' title='%s'><img src='%s' border=0 alt='%s'></a>", PUBLISHER_URL . "/backend.php?categoryid=" . $categoryid, _MD_PUBLISHER_RSSFEED, PUBLISHER_URL . "/assets/images/rss.gif", _MD_PUBLISHER_RSSFEED);
+    $link = sprintf("<a href='%s' title='%s'><img src='%s' border=0 alt='%s'></a>", PUBLISHER_URL . '/backend.php?categoryid=' . $categoryid, _MD_PUBLISHER_RSSFEED, PUBLISHER_URL . '/assets/images/rss.gif', _MD_PUBLISHER_RSSFEED);
     $xoopsTpl->assign('rssfeed_link', $link);
 }
 
diff --git a/publisher/class/blockform.php b/publisher/class/blockform.php
index 4cc94c28..b78b286c 100644
--- a/publisher/class/blockform.php
+++ b/publisher/class/blockform.php
@@ -60,8 +60,8 @@ public function render()
                 if (!$ele->getNocolspan()) {
                     $ret .= '<tr><td style="vertical-align: top; width: 250px;">';
                     $ret .= '<span style="font-weight: bold;">' . $ele->getCaption() . '</span>';
-                    if (isset($ele_desc) && $ele_desc == $ele->getDescription()) {
-                        $ret .= '<br /><br /><span style="font-weight: normal;">' . $ele_desc . '</span>';
+                    if (isset($eleDesc) && $eleDesc == $ele->getDescription()) {
+                        $ret .= '<br /><br /><span style="font-weight: normal;">' . $eleDesc . '</span>';
                     }
                     $ret .= '</td><td>' . $ele->render() . '</td></tr>';
                 } else {
diff --git a/publisher/class/category.php b/publisher/class/category.php
index 03c380df..832f5978 100644
--- a/publisher/class/category.php
+++ b/publisher/class/category.php
@@ -30,7 +30,7 @@ class PublisherCategory extends XoopsObject
      * @var PublisherPublisher
      * @access public
      */
-    public $publisher = null;
+    public $publisher;
 
     /**
      * @var array
@@ -42,26 +42,26 @@ class PublisherCategory extends XoopsObject
      */
     public function __construct()
     {
-        $this->publisher = PublisherPublisher::getInstance();
-        $this->initVar("categoryid", XOBJ_DTYPE_INT, null, false);
-        $this->initVar("parentid", XOBJ_DTYPE_INT, null, false);
-        $this->initVar("name", XOBJ_DTYPE_TXTBOX, null, true, 100);
-        $this->initVar("description", XOBJ_DTYPE_TXTAREA, null, false, 255);
-        $this->initVar("image", XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar("total", XOBJ_DTYPE_INT, 1, false);
-        $this->initVar("weight", XOBJ_DTYPE_INT, 1, false);
-        $this->initVar("created", XOBJ_DTYPE_INT, null, false);
-        $this->initVar("template", XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar("header", XOBJ_DTYPE_TXTAREA, null, false);
-        $this->initVar("meta_keywords", XOBJ_DTYPE_TXTAREA, null, false);
-        $this->initVar("meta_description", XOBJ_DTYPE_TXTAREA, null, false);
-        $this->initVar("short_url", XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar("moderator", XOBJ_DTYPE_INT, null, false, 0);
+        $this->publisher =& PublisherPublisher::getInstance();
+        $this->initVar('categoryid', XOBJ_DTYPE_INT, null, false);
+        $this->initVar('parentid', XOBJ_DTYPE_INT, null, false);
+        $this->initVar('name', XOBJ_DTYPE_TXTBOX, null, true, 100);
+        $this->initVar('description', XOBJ_DTYPE_TXTAREA, null, false, 255);
+        $this->initVar('image', XOBJ_DTYPE_TXTBOX, null, false, 255);
+        $this->initVar('total', XOBJ_DTYPE_INT, 1, false);
+        $this->initVar('weight', XOBJ_DTYPE_INT, 1, false);
+        $this->initVar('created', XOBJ_DTYPE_INT, null, false);
+        $this->initVar('template', XOBJ_DTYPE_TXTBOX, null, false, 255);
+        $this->initVar('header', XOBJ_DTYPE_TXTAREA, null, false);
+        $this->initVar('meta_keywords', XOBJ_DTYPE_TXTAREA, null, false);
+        $this->initVar('meta_description', XOBJ_DTYPE_TXTAREA, null, false);
+        $this->initVar('short_url', XOBJ_DTYPE_TXTBOX, null, false, 255);
+        $this->initVar('moderator', XOBJ_DTYPE_INT, null, false, 0);
         //not persistent values
-        $this->initVar("itemcount", XOBJ_DTYPE_INT, 0, false);
+        $this->initVar('itemcount', XOBJ_DTYPE_INT, 0, false);
         $this->initVar('last_itemid', XOBJ_DTYPE_INT);
         $this->initVar('last_title_link', XOBJ_DTYPE_TXTBOX);
-        $this->initVar("dohtml", XOBJ_DTYPE_INT, 1, false);
+        $this->initVar('dohtml', XOBJ_DTYPE_INT, 1, false);
     }
 
     /**
@@ -90,9 +90,9 @@ public function notLoaded()
      */
     public function checkPermission()
     {
-//        global $publisher_isAdmin;
+        //        global $publisherIsAdmin;
         $ret = false;
-        if ($GLOBALS['publisher_isAdmin']) {
+        if ($GLOBALS['publisherIsAdmin']) {
             return true;
         }
         if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->getVar('uid') == $this->moderator()) {
@@ -111,7 +111,7 @@ public function checkPermission()
      *
      * @return mixed|string
      */
-    public function image($format = 's')
+    public function getImage($format = 's')
     {
         if ($this->getVar('image') != '') {
             return $this->getVar('image', $format);
@@ -127,7 +127,7 @@ public function image($format = 's')
      */
     public function template($format = 'n')
     {
-        return $this->getVar("template", $format);
+        return $this->getVar('template', $format);
     }
 
     /**
@@ -146,19 +146,19 @@ public function getCategoryPath($withAllLink = true)
             $parentid = $this->parentid();
             if ($parentid != 0) {
                 $parentObj = $this->publisher->getHandler('category')->get($parentid);
-//                if ($parentObj->notLoaded()) {
-//                    exit;
-//                }
+                //                if ($parentObj->notLoaded()) {
+                //                    exit;
+                //                }
 
                 try {
                     if ($parentObj->notLoaded()) {
                         throw new Exception(_NOPERM);
                     }
                 } catch (Exception $e) {
-//                    redirect_header("javascript:history.go(-1)", 1, _NOPERM);
+                    //                    redirect_header('javascript:history.go(-1)', 1, _NOPERM);
                 }
 
-                $ret = $parentObj->getCategoryPath($withAllLink) . " > " . $ret;
+                $ret = $parentObj->getCategoryPath($withAllLink) . ' > ' . $ret;
             }
             $this->categoryPath = $ret;
         }
@@ -175,16 +175,16 @@ public function getCategoryPathForMetaTitle()
         $parentid = $this->parentid();
         if ($parentid != 0) {
             $parentObj = $this->publisher->getHandler('category')->get($parentid);
-//            if ($parentObj->notLoaded()) {
-//                exit('NOT LOADED');
-//            }
+            //            if ($parentObj->notLoaded()) {
+            //                exit('NOT LOADED');
+            //            }
 
             try {
                 if ($parentObj->notLoaded()) {
                     throw new Exception('NOT LOADED');
                 }
             } catch (Exception $e) {
-//                    redirect_header("javascript:history.go(-1)", 1, _NOPERM);
+                //                    redirect_header('javascript:history.go(-1)', 1, _NOPERM);
             }
 
             $ret = $parentObj->getCategoryPath(false);
@@ -234,9 +234,9 @@ public function getCategoryUrl()
     public function getCategoryLink($class = false)
     {
         if ($class) {
-            return "<a class='$class' href='" . $this->getCategoryUrl() . "'>" . $this->name() . "</a>";
+            return "<a class='$class' href='" . $this->getCategoryUrl() . "'>" . $this->name() . '</a>';
         } else {
-            return "<a href='" . $this->getCategoryUrl() . "'>" . $this->name() . "</a>";
+            return "<a href='" . $this->getCategoryUrl() . "'>" . $this->name() . '</a>';
         }
     }
 
@@ -266,8 +266,8 @@ public function sendNotifications()
         $tags['MODULE_NAME']   = $this->publisher->getModule()->getVar('name');
         $tags['CATEGORY_NAME'] = $this->name();
         $tags['CATEGORY_URL']  = $this->getCategoryUrl();
-        $notification_handler  = xoops_gethandler('notification');
-        $notification_handler->triggerEvent('global_item', 0, 'category_created', $tags);
+        $notificationHandler  =& xoops_getHandler('notification');
+        $notificationHandler->triggerEvent('global_item', 0, 'category_created', $tags);
     }
 
     /**
@@ -291,8 +291,8 @@ public function toArraySimple($category = array())
             $category['last_itemid']     = $this->getVar('last_itemid', 'n');
             $category['last_title_link'] = $this->getVar('last_title_link', 'n');
         }
-        if ($this->image() != 'blank.png') {
-            $category['image_path'] = publisherGetImageDir('category', false) . $this->image();
+        if ($this->getImage() !== 'blank.png') {
+            $category['image_path'] = publisherGetImageDir('category', false) . $this->getImage();
         } else {
             $category['image_path'] = '';
         }
@@ -316,8 +316,8 @@ public function toArrayTable($category = array())
             $category['last_itemid']     = $this->getVar('last_itemid', 'n');
             $category['last_title_link'] = $this->getVar('last_title_link', 'n');
         }
-        if ($this->image() != 'blank.png') {
-            $category['image_path'] = publisherGetImageDir('category', false) . $this->image();
+        if ($this->getImage() !== 'blank.png') {
+            $category['image_path'] = publisherGetImageDir('category', false) . $this->getImage();
         } else {
             $category['image_path'] = '';
         }
@@ -331,8 +331,8 @@ public function toArrayTable($category = array())
      */
     public function createMetaTags()
     {
-        $publisher_metagen = new PublisherMetagen($this->name(), $this->meta_keywords(), $this->meta_description());
-        $publisher_metagen->createMetaTags();
+        $publisherMetagen = new PublisherMetagen($this->name(), $this->meta_keywords(), $this->meta_description());
+        $publisherMetagen->createMetaTags();
     }
 
     /**
@@ -363,15 +363,15 @@ class PublisherCategoryHandler extends XoopsPersistableObjectHandler
      * @var PublisherPublisher
      * @access public
      */
-    public $publisher = null;
+    public $publisher;
 
     /**
-     * @param null|object $db
+     * @param null|XoopsDatabase $db
      */
-    public function __construct(&$db)
+    public function __construct(XoopsDatabase $db)
     {
-        $this->publisher = PublisherPublisher::getInstance();
-        parent::__construct($db, "publisher_categories", 'PublisherCategory', "categoryid", "name");
+        $this->publisher =& PublisherPublisher::getInstance();
+        parent::__construct($db, 'publisher_categories', 'PublisherCategory', 'categoryid', 'name');
     }
 
     /**
@@ -387,8 +387,8 @@ public function &get($id)
         if (isset($cats[$id])) {
             return $cats[$id];
         }
-        $obj       = parent::get($id);
-        $cats[$id] = $obj;
+        $obj       =& parent::get($id);
+        $cats[$id] =& $obj;
 
         return $obj;
     }
@@ -405,12 +405,12 @@ public function insert(&$category, $force = false)
     {
         // Auto create meta tags if empty
         if (!$category->meta_keywords() || !$category->meta_description()) {
-            $publisher_metagen = new PublisherMetagen($category->name(), $category->getVar('meta_keywords'), $category->getVar('description'));
+            $publisherMetagen = new PublisherMetagen($category->name(), $category->getVar('meta_keywords'), $category->getVar('description'));
             if (!$category->meta_keywords()) {
-                $category->setVar('meta_keywords', $publisher_metagen->keywords);
+                $category->setVar('meta_keywords', $publisherMetagen->keywords);
             }
             if (!$category->meta_description()) {
-                $category->setVar('meta_description', $publisher_metagen->description);
+                $category->setVar('meta_description', $publisherMetagen->description);
             }
         }
         // Auto create short_url if empty
@@ -437,7 +437,7 @@ public function delete(&$category, $force = false)
         $this->publisher->getHandler('item')->deleteAll($criteria);
         unset($criteria);
         // Deleting the sub categories
-        $subcats = $this->getCategories(0, 0, $category->categoryid());
+        $subcats =& $this->getCategories(0, 0, $category->categoryid());
         foreach ($subcats as $subcat) {
             $this->delete($subcat);
         }
@@ -446,10 +446,10 @@ public function delete(&$category, $force = false)
 
             return false;
         }
-        $module_id = $this->publisher->getModule()->getVar('mid');
-        xoops_groupperm_deletebymoditem($module_id, "category_read", $category->categoryid());
-        xoops_groupperm_deletebymoditem($module_id, "item_submit", $category->categoryid());
-        xoops_groupperm_deletebymoditem($module_id, "category_moderation", $category->categoryid());
+        $moduleId = $this->publisher->getModule()->getVar('mid');
+        xoops_groupperm_deletebymoditem($moduleId, 'category_read', $category->categoryid());
+        xoops_groupperm_deletebymoditem($moduleId, 'item_submit', $category->categoryid());
+        xoops_groupperm_deletebymoditem($moduleId, 'category_moderation', $category->categoryid());
 
         return true;
     }
@@ -458,16 +458,16 @@ public function delete(&$category, $force = false)
      * retrieve categories from the database
      *
      * @param object $criteria  {@link CriteriaElement} conditions to be met
-     * @param bool   $id_as_key use the categoryid as key for the array?
+     * @param bool   $idAsKey use the categoryid as key for the array?
      *
      * @return array array of {@link XoopsItem} objects
      */
-    public function &getObjects($criteria = null, $id_as_key = false)
+    public function &getObjects($criteria = null, $idAsKey = false)
     {
         $ret        = array();
-        $theObjects = parent::getObjects($criteria, true);
+        $theObjects =& parent::getObjects($criteria, true);
         foreach ($theObjects as $theObject) {
-            if (!$id_as_key) {
+            if (!$idAsKey) {
                 $ret[] = $theObject;
             } else {
                 $ret[$theObject->categoryid()] = $theObject;
@@ -484,20 +484,20 @@ public function &getObjects($criteria = null, $id_as_key = false)
      * @param int    $parentid
      * @param string $sort
      * @param string $order
-     * @param bool   $id_as_key
+     * @param bool   $idAsKey
      *
      * @return array
      */
-    public function &getCategories($limit = 0, $start = 0, $parentid = 0, $sort = 'weight', $order = 'ASC', $id_as_key = true)
+    public function &getCategories($limit = 0, $start = 0, $parentid = 0, $sort = 'weight', $order = 'ASC', $idAsKey = true)
     {
-//        global $publisher_isAdmin;
+        //        global $publisherIsAdmin;
         $criteria = new CriteriaCompo();
         $criteria->setSort($sort);
         $criteria->setOrder($order);
         if ($parentid != -1) {
             $criteria->add(new Criteria('parentid', $parentid));
         }
-        if (!$GLOBALS['publisher_isAdmin']) {
+        if (!$GLOBALS['publisherIsAdmin']) {
             $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('category_read');
             if (count($categoriesGranted) > 0) {
                 $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
@@ -510,7 +510,7 @@ public function &getCategories($limit = 0, $start = 0, $parentid = 0, $sort = 'w
         }
         $criteria->setStart($start);
         $criteria->setLimit($limit);
-        $ret = $this->getObjects($criteria, $id_as_key);
+        $ret =& $this->getObjects($criteria, $idAsKey);
 
         return $ret;
     }
@@ -518,10 +518,10 @@ public function &getCategories($limit = 0, $start = 0, $parentid = 0, $sort = 'w
     /**
      * @param $category
      * @param $level
-     * @param $cat_array
-     * @param $cat_result
+     * @param $catArray
+     * @param $catResult
      */
-    public function getSubCatArray($category, $level, $cat_array, $cat_result)
+    public function getSubCatArray($category, $level, $catArray, $catResult)
     {
         global $theresult;
         $spaces = '';
@@ -529,10 +529,10 @@ public function getSubCatArray($category, $level, $cat_array, $cat_result)
             $spaces .= '--';
         }
         $theresult[$category['categoryid']] = $spaces . $category['name'];
-        if (isset($cat_array[$category['categoryid']])) {
-            $level = $level + 1;
-            foreach ($cat_array[$category['categoryid']] as $parentid => $cat) {
-                $this->getSubCatArray($cat, $level, $cat_array, $cat_result);
+        if (isset($catArray[$category['categoryid']])) {
+            ++$level;
+            foreach ($catArray[$category['categoryid']] as $parentid => $cat) {
+                $this->getSubCatArray($cat, $level, $catArray, $catResult);
             }
         }
     }
@@ -542,12 +542,12 @@ public function getSubCatArray($category, $level, $cat_array, $cat_result)
      */
     public function &getCategoriesForSubmit()
     {
-        global $publisher_isAdmin, $theresult;
+        global $publisherIsAdmin, $theresult;
         $ret      = array();
         $criteria = new CriteriaCompo();
         $criteria->setSort('name');
         $criteria->setOrder('ASC');
-        if (!$publisher_isAdmin) {
+        if (!$publisherIsAdmin) {
             $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('item_submit');
             if (count($categoriesGranted) > 0) {
                 $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
@@ -558,22 +558,22 @@ public function &getCategoriesForSubmit()
                 $criteria->add(new Criteria('moderator', $GLOBALS['xoopsUser']->getVar('uid')), 'OR');
             }
         }
-        $categories = $this->getAll($criteria, array('categoryid', 'parentid', 'name'), false, false);
+        $categories =& $this->getAll($criteria, array('categoryid', 'parentid', 'name'), false, false);
         if (count($categories) == 0) {
             return $ret;
         }
-        $cat_array = array();
+        $catArray = array();
         foreach ($categories as $cat) {
-            $cat_array[$cat['parentid']][$cat['categoryid']] = $cat;
+            $catArray[$cat['parentid']][$cat['categoryid']] = $cat;
         }
         // Needs to have permission on at least 1 top level category
-        if (!isset($cat_array[0])) {
+        if (!isset($catArray[0])) {
             return $ret;
         }
-        $cat_result = array();
-        foreach ($cat_array[0] as $thecat) {
+        $catResult = array();
+        foreach ($catArray[0] as $thecat) {
             $level = 0;
-            $this->getSubCatArray($thecat, $level, $cat_array, $cat_result);
+            $this->getSubCatArray($thecat, $level, $catArray, $catResult);
         }
 
         return $theresult; //this is a global
@@ -584,12 +584,12 @@ public function &getCategoriesForSubmit()
      */
     public function &getCategoriesForSearch()
     {
-        global $publisher_isAdmin, $theresult;
+        global $publisherIsAdmin, $theresult;
         $ret      = array();
         $criteria = new CriteriaCompo();
         $criteria->setSort('name');
         $criteria->setOrder('ASC');
-        if (!$publisher_isAdmin) {
+        if (!$publisherIsAdmin) {
             $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('category_read');
             if (count($categoriesGranted) > 0) {
                 $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
@@ -600,22 +600,22 @@ public function &getCategoriesForSearch()
                 $criteria->add(new Criteria('moderator', $GLOBALS['xoopsUser']->getVar('uid')), 'OR');
             }
         }
-        $categories = $this->getAll($criteria, array('categoryid', 'parentid', 'name'), false, false);
+        $categories =& $this->getAll($criteria, array('categoryid', 'parentid', 'name'), false, false);
         if (count($categories) == 0) {
             return $ret;
         }
-        $cat_array = array();
+        $catArray = array();
         foreach ($categories as $cat) {
-            $cat_array[$cat['parentid']][$cat['categoryid']] = $cat;
+            $catArray[$cat['parentid']][$cat['categoryid']] = $cat;
         }
         // Needs to have permission on at least 1 top level category
-        if (!isset($cat_array[0])) {
+        if (!isset($catArray[0])) {
             return $ret;
         }
-        $cat_result = array();
-        foreach ($cat_array[0] as $thecat) {
+        $catResult = array();
+        foreach ($catArray[0] as $thecat) {
             $level = 0;
-            $this->getSubCatArray($thecat, $level, $cat_array, $cat_result);
+            $this->getSubCatArray($thecat, $level, $catArray, $catResult);
         }
 
         return $theresult; //this is a global
@@ -628,14 +628,14 @@ public function &getCategoriesForSearch()
      */
     public function getCategoriesCount($parentid = 0)
     {
-//        global $publisher_isAdmin;
+        //        global $publisherIsAdmin;
         if ($parentid == -1) {
             return $this->getCount();
         }
         $criteria = new CriteriaCompo();
         if (isset($parentid) && ($parentid != -1)) {
             $criteria->add(new criteria('parentid', $parentid));
-            if (!$GLOBALS['publisher_isAdmin']) {
+            if (!$GLOBALS['publisherIsAdmin']) {
                 $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('category_read');
                 if (count($categoriesGranted) > 0) {
                     $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
@@ -660,10 +660,10 @@ public function getCategoriesCount($parentid = 0)
      */
     public function getSubCats($categories)
     {
-//        global $publisher_isAdmin;
-        $criteria = new CriteriaCompo(new Criteria('parentid', "(" . implode(',', array_keys($categories)) . ")", 'IN'));
+        //        global $publisherIsAdmin;
+        $criteria = new CriteriaCompo(new Criteria('parentid', '(' . implode(',', array_keys($categories)) . ')', 'IN'));
         $ret      = array();
-        if (!$GLOBALS['publisher_isAdmin']) {
+        if (!$GLOBALS['publisherIsAdmin']) {
             $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('category_read');
             if (count($categoriesGranted) > 0) {
                 $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
@@ -677,7 +677,7 @@ public function getSubCats($categories)
         }
         $criteria->setSort('weight');
         $criteria->setOrder('ASC');
-        $subcats = $this->getObjects($criteria, true);
+        $subcats =& $this->getObjects($criteria, true);
         foreach ($subcats as $subcat) {
             $ret[$subcat->getVar('parentid')][$subcat->getVar('categoryid')] = $subcat;
         }
@@ -694,7 +694,7 @@ public function getSubCats($categories)
      */
     public function deleteAll($criteria = null)
     {
-        $categories = $this->getObjects($criteria);
+        $categories =& $this->getObjects($criteria);
         foreach ($categories as $category) {
             if (!$this->delete($category)) {
                 return false;
diff --git a/publisher/class/constants.php b/publisher/class/constants.php
index 197101ca..82665cf6 100644
--- a/publisher/class/constants.php
+++ b/publisher/class/constants.php
@@ -19,14 +19,14 @@
  * @version         $Id: constants.php 10374 2012-12-12 23:39:48Z trabis $
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || exit('Restricted access');
 
 /**
  * Interface PublisherConstantsInterface
  */
 interface PublisherConstantsInterface
 {
-// ITEM status
+    // ITEM status
     const PUBLISHER_STATUS_NOTSET    = -1;
     const PUBLISHER_STATUS_ALL       = 0;
     const PUBLISHER_STATUS_SUBMITTED = 1;
@@ -34,19 +34,19 @@ interface PublisherConstantsInterface
     const PUBLISHER_STATUS_OFFLINE   = 3;
     const PUBLISHER_STATUS_REJECTED  = 4;
 
-// Notification Events
+    // Notification Events
     const PUBLISHER_NOT_CATEGORY_CREATED = 1;
-    const PUBLISHER_NOT_ITEM_SUBMITTED   = 2;
-    const PUBLISHER_NOT_ITEM_PUBLISHED   = 3;
-    const PUBLISHER_NOT_ITEM_REJECTED    = 4;
+    const PUBLISHER_NOTIFY_ITEM_SUBMITTED   = 2;
+    const PUBLISHER_NOTIFY_ITEM_PUBLISHED   = 3;
+    const PUBLISHER_NOTIFY_ITEM_REJECTED    = 4;
 
-// Form constants
+    // Form constants
     const PUBLISHER_SUMMARY = 1;
-//const PUBLISHER_DISPLAY_SUMMARY = 2;
+    //const PUBLISHER_DISPLAY_SUMMARY = 2;
     const PUBLISHER_AVAILABLE_PAGE_WRAP = 3;
     const PUBLISHER_ITEM_TAG            = 4;
     const PUBLISHER_IMAGE_ITEM          = 5;
-//const PUBLISHER_IMAGE_UPLOAD = 6;
+    //const PUBLISHER_IMAGE_UPLOAD = 6;
     const PUBLISHER_ITEM_UPLOAD_FILE      = 7;
     const PUBLISHER_UID                   = 8;
     const PUBLISHER_DATESUB               = 9;
@@ -56,8 +56,8 @@ interface PublisherConstantsInterface
     const PUBLISHER_ITEM_META_DESCRIPTION = 13;
     const PUBLISHER_WEIGHT                = 14;
     const PUBLISHER_ALLOWCOMMENTS         = 15;
-//const PUBLISHER_PERMISSIONS_ITEM = 16;
-//const PUBLISHER_PARTIAL_VIEW = 17;
+    //const PUBLISHER_PERMISSIONS_ITEM = 16;
+    //const PUBLISHER_PARTIAL_VIEW = 17;
     const PUBLISHER_DOHTML       = 18;
     const PUBLISHER_DOSMILEY     = 19;
     const PUBLISHER_DOXCODE      = 20;
@@ -67,11 +67,11 @@ interface PublisherConstantsInterface
     const PUBLISHER_SUBTITLE     = 24;
     const PUBLISHER_AUTHOR_ALIAS = 25;
 
-// Global constants
+    // Global constants
     const PUBLISHER_SEARCH = 1;
     const PUBLISHER_RATE   = 2;
 
-// File status
+    // File status
     const PUBLISHER_STATUS_FILE_NOTSET   = -1;
     const PUBLISHER_STATUS_FILE_ACTIVE   = 1;
     const PUBLISHER_STATUS_FILE_INACTIVE = 2;
diff --git a/publisher/class/file.php b/publisher/class/file.php
index f05bb81d..8255b9e6 100644
--- a/publisher/class/file.php
+++ b/publisher/class/file.php
@@ -35,26 +35,26 @@ class PublisherFile extends XoopsObject
      * @var PublisherPublisher
      * @access public
      */
-    public $publisher = null;
+    public $publisher;
 
     /**
      * @param null|int $id
      */
     public function __construct($id = null)
     {
-        $this->publisher = PublisherPublisher::getInstance();
-        $this->db        = XoopsDatabaseFactory::getDatabaseConnection();
-        $this->initVar("fileid", XOBJ_DTYPE_INT, 0, false);
-        $this->initVar("itemid", XOBJ_DTYPE_INT, null, true);
-        $this->initVar("name", XOBJ_DTYPE_TXTBOX, null, true, 255);
-        $this->initVar("description", XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar("filename", XOBJ_DTYPE_TXTBOX, null, true, 255);
-        $this->initVar("mimetype", XOBJ_DTYPE_TXTBOX, null, true, 64);
-        $this->initVar("uid", XOBJ_DTYPE_INT, 0, false);
-        $this->initVar("datesub", XOBJ_DTYPE_INT, null, false);
-        $this->initVar("status", XOBJ_DTYPE_INT, 1, false);
-        $this->initVar("notifypub", XOBJ_DTYPE_INT, 0, false);
-        $this->initVar("counter", XOBJ_DTYPE_INT, null, false);
+        $this->publisher =& PublisherPublisher::getInstance();
+        $this->db        =& XoopsDatabaseFactory::getDatabaseConnection();
+        $this->initVar('fileid', XOBJ_DTYPE_INT, 0, false);
+        $this->initVar('itemid', XOBJ_DTYPE_INT, null, true);
+        $this->initVar('name', XOBJ_DTYPE_TXTBOX, null, true, 255);
+        $this->initVar('description', XOBJ_DTYPE_TXTBOX, null, false, 255);
+        $this->initVar('filename', XOBJ_DTYPE_TXTBOX, null, true, 255);
+        $this->initVar('mimetype', XOBJ_DTYPE_TXTBOX, null, true, 64);
+        $this->initVar('uid', XOBJ_DTYPE_INT, 0, false);
+        $this->initVar('datesub', XOBJ_DTYPE_INT, null, false);
+        $this->initVar('status', XOBJ_DTYPE_INT, 1, false);
+        $this->initVar('notifypub', XOBJ_DTYPE_INT, 0, false);
+        $this->initVar('counter', XOBJ_DTYPE_INT, null, false);
         if (isset($id)) {
             $file = $this->publisher->getHandler('file')->get($id);
             foreach ($file->vars as $k => $v) {
@@ -77,29 +77,29 @@ public function __call($method, $args)
     }
 
     /**
-     * @param string $post_field
-     * @param array  $allowed_mimetypes
+     * @param string $postField
+     * @param array  $allowedMimetypes
      * @param array  $errors
      *
      * @return bool
      */
-    public function checkUpload($post_field, $allowed_mimetypes = array(), &$errors)
+    public function checkUpload($postField, $allowedMimetypes = array(), &$errors)
     {
         $errors = array();
-        if (!$this->publisher->getHandler('mimetype')->checkMimeTypes($post_field)) {
+        if (!$this->publisher->getHandler('mimetype')->checkMimeTypes($postField)) {
             $errors[] = _CO_PUBLISHER_MESSAGE_WRONG_MIMETYPE;
 
             return false;
         }
-        if (empty($allowed_mimetypes)) {
-            $allowed_mimetypes = $this->publisher->getHandler('mimetype')->getArrayByType();
+        if (empty($allowedMimetypes)) {
+            $allowedMimetypes = $this->publisher->getHandler('mimetype')->getArrayByType();
         }
         $maxfilesize   = $this->publisher->getConfig('maximum_filesize');
         $maxfilewidth  = $this->publisher->getConfig('maximum_image_width');
         $maxfileheight = $this->publisher->getConfig('maximum_image_height');
         xoops_load('XoopsMediaUploader');
-        $uploader = new XoopsMediaUploader(publisherGetUploadDir(), $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
-        if ($uploader->fetchMedia($post_field)) {
+        $uploader = new XoopsMediaUploader(publisherGetUploadDir(), $allowedMimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
+        if ($uploader->fetchMedia($postField)) {
             return true;
         } else {
             $errors = array_merge($errors, $uploader->getErrors(false));
@@ -109,17 +109,17 @@ public function checkUpload($post_field, $allowed_mimetypes = array(), &$errors)
     }
 
     /**
-     * @param string $post_field
-     * @param array  $allowed_mimetypes
+     * @param string $postField
+     * @param array  $allowedMimetypes
      * @param array  $errors
      *
      * @return bool
      */
-    public function storeUpload($post_field, $allowed_mimetypes = array(), &$errors)
+    public function storeUpload($postField, $allowedMimetypes = array(), &$errors)
     {
         $itemid = $this->getVar('itemid');
-        if (empty($allowed_mimetypes)) {
-            $allowed_mimetypes = $this->publisher->getHandler('mimetype')->getArrayByType();
+        if (empty($allowedMimetypes)) {
+            $allowedMimetypes = $this->publisher->getHandler('mimetype')->getArrayByType();
         }
         $maxfilesize   = $this->publisher->getConfig('maximum_filesize');
         $maxfilewidth  = $this->publisher->getConfig('maximum_image_width');
@@ -128,9 +128,9 @@ public function storeUpload($post_field, $allowed_mimetypes = array(), &$errors)
             mkdir(publisherGetUploadDir(), 0757);
         }
         xoops_load('XoopsMediaUploader');
-        $uploader = new XoopsMediaUploader(publisherGetUploadDir() . '/', $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
-        if ($uploader->fetchMedia($post_field)) {
-            $uploader->setTargetFileName($itemid . "_" . $uploader->getMediaName());
+        $uploader = new XoopsMediaUploader(publisherGetUploadDir() . '/', $allowedMimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
+        if ($uploader->fetchMedia($postField)) {
+            $uploader->setTargetFileName($itemid . '_' . $uploader->getMediaName());
             if ($uploader->upload()) {
                 $this->setVar('filename', $uploader->getSavedFileName());
                 if ($this->getVar('name') == '') {
@@ -152,18 +152,18 @@ public function storeUpload($post_field, $allowed_mimetypes = array(), &$errors)
     }
 
     /**
-     * @param null|array $allowed_mimetypes
+     * @param null|array $allowedMimetypes
      * @param bool       $force
      * @param bool       $doupload
      *
      * @return bool
      */
-    public function store($allowed_mimetypes = null, $force = true, $doupload = true)
+    public function store($allowedMimetypes = null, $force = true, $doupload = true)
     {
         if ($this->isNew()) {
             $errors = array();
             if ($doupload) {
-                $ret = $this->storeUpload('item_upload_file', $allowed_mimetypes, $errors);
+                $ret = $this->storeUpload('item_upload_file', $allowedMimetypes, $errors);
             } else {
                 $ret = true;
             }
@@ -185,11 +185,12 @@ public function store($allowed_mimetypes = null, $force = true, $doupload = true
      *
      * @return string
      */
-    public function datesub($dateFormat = 's', $format = "S")
+    public function getDatesub($dateFormat = 's', $format = 'S')
     {
-        xoops_load('XoopsLocal');
+        //mb        xoops_load('XoopsLocal');
+        //mb        return XoopsLocal::formatTimestamp($this->getVar('datesub', $format), $dateFormat);
+        return formatTimestamp($this->getVar('datesub', $format), $dateFormat);
 
-        return XoopsLocal::formatTimestamp($this->getVar('datesub', $format), $dateFormat);
     }
 
     /**
@@ -221,7 +222,7 @@ public function getFilePath()
      */
     public function getFileLink()
     {
-        return "<a href='" . PUBLISHER_URL . "/visit.php?fileid=" . $this->fileid() . "'>" . $this->name() . "</a>";
+        return "<a href='" . PUBLISHER_URL . '/visit.php?fileid=' . $this->fileid() . "'>" . $this->name() . '</a>';
     }
 
     /**
@@ -229,7 +230,7 @@ public function getFileLink()
      */
     public function getItemLink()
     {
-        return "<a href='" . PUBLISHER_URL . "/item.php?itemid=" . $this->itemid() . "'>" . $this->name() . "</a>";
+        return "<a href='" . PUBLISHER_URL . '/item.php?itemid=' . $this->itemid() . "'>" . $this->name() . '</a>';
     }
 
     /**
@@ -249,9 +250,9 @@ public function displayFlash()
         if (!defined('MYTEXTSANITIZER_EXTENDED_MEDIA')) {
             include_once PUBLISHER_ROOT_PATH . '/include/media.textsanitizer.php';
         }
-        $media_ts = MyTextSanitizerExtension::getInstance();
+        $mediaTs =& MyTextSanitizerExtension::getInstance();
 
-        return $media_ts->_displayFlash($this->getFileUrl());
+        return $mediaTs->displayFlash($this->getFileUrl());
     }
 
     /**
@@ -260,8 +261,8 @@ public function displayFlash()
     public function getNameFromFilename()
     {
         $ret     = $this->filename();
-        $sep_pos = strpos($ret, '_');
-        $ret     = substr($ret, $sep_pos + 1, strlen($ret) - $sep_pos);
+        $sepPos = strpos($ret, '_');
+        $ret     = substr($ret, $sepPos + 1, strlen($ret) - $sepPos);
 
         return $ret;
     }
@@ -293,17 +294,17 @@ class PublisherFileHandler extends XoopsPersistableObjectHandler
     public $field_link   = '';
 
     /**
-     * @param null|object $db
+     * @param null|XoopsDatabase $db
      */
-    public function __construct(&$db)
+    public function __construct(XoopsDatabase $db)
     {
-        parent::__construct($db, "publisher_files", 'PublisherFile', "fileid", "name");
+        parent::__construct($db, 'publisher_files', 'PublisherFile', 'fileid', 'name');
     }
 
     /**
      * delete a file from the database
      *
-     * @param object $file  reference to the file to delete
+     * @param object $file reference to the file to delete
      * @param bool   $force
      *
      * @return bool FALSE if failed.
@@ -328,10 +329,10 @@ public function delete(&$file, $force = false)
      */
     public function deleteItemFiles(&$itemObj)
     {
-        if (strtolower(get_class($itemObj)) != 'publisheritem') {
+        if (strtolower(get_class($itemObj)) !== 'publisheritem') {
             return false;
         }
-        $files  = $this->getAllFiles($itemObj->itemid());
+        $files  =& $this->getAllFiles($itemObj->itemid());
         $result = true;
         foreach ($files as $file) {
             if (!$this->delete($file)) {
@@ -395,7 +396,7 @@ public function &getAllFiles($itemid = 0, $status = -1, $limit = 0, $start = 0,
         $criteria->setOrder($order);
         $criteria->setLimit($limit);
         $criteria->setStart($start);
-        $files = $this->getByLink($criteria, array('o.*'), true);
+        $files =& $this->getByLink($criteria, array('o.*'), true);
 
         return $files;
     }
diff --git a/publisher/class/form/category.php b/publisher/class/form/category.php
index 6de6f07d..07d3f5cf 100644
--- a/publisher/class/form/category.php
+++ b/publisher/class/form/category.php
@@ -36,9 +36,9 @@ class PublisherCategoryForm extends XoopsThemeForm
      * @var PublisherPublisher
      * @access public
      */
-    public $publisher = null;
+    public $publisher;
 
-    public $targetObject = null;
+    public $targetObject;
 
     public $subCatsCount = 4;
 
@@ -50,15 +50,15 @@ class PublisherCategoryForm extends XoopsThemeForm
      */
     public function __construct(&$target, $subCatsCount = 4)
     {
-        $this->publisher = PublisherPublisher::getInstance();
+        $this->publisher =& PublisherPublisher::getInstance();
 
-        $this->targetObject = $target;
+        $this->targetObject =& $target;
         $this->subCatsCount = $subCatsCount;
 
-        $member_handler   = xoops_gethandler('member');
-        $this->userGroups = $member_handler->getGroupList();
+        $memberHandler   =& xoops_getHandler('member');
+        $this->userGroups = $memberHandler->getGroupList();
 
-        parent::__construct(_AM_PUBLISHER_CATEGORY, "form", xoops_getenv('PHP_SELF'));
+        parent::__construct(_AM_PUBLISHER_CATEGORY, 'form', xoops_getenv('PHP_SELF'));
         $this->setExtra('enctype="multipart/form-data"');
 
         $this->createElements();
@@ -67,14 +67,14 @@ public function __construct(&$target, $subCatsCount = 4)
 
     public function createElements()
     {
-
+        include_once dirname(dirname(__DIR__)) . '/include/common.php';
         // Category
         $criteria = new Criteria(null);
         $criteria->setSort('weight');
         $criteria->setOrder('ASC');
-        $mytree     = new XoopsObjectTree($this->publisher->getHandler('category')->getObjects($criteria), "categoryid", "parentid");
-        $cat_select = $mytree->makeSelBox('parentid', 'name', '--', $this->targetObject->parentid(), true);
-        $this->addElement(new XoopsFormLabel(_AM_PUBLISHER_PARENT_CATEGORY_EXP, $cat_select));
+        $myTree     = new XoopsObjectTree($this->publisher->getHandler('category')->getObjects($criteria), 'categoryid', 'parentid');
+        $catSelect = $myTree->makeSelBox('parentid', 'name', '--', $this->targetObject->parentid(), true);
+        $this->addElement(new XoopsFormLabel(_AM_PUBLISHER_PARENT_CATEGORY_EXP, $catSelect));
 
         // Name
         $this->addElement(new XoopsFormText(_AM_PUBLISHER_CATEGORY, 'name', 50, 255, $this->targetObject->name('e')), true);
@@ -83,11 +83,11 @@ public function createElements()
         $this->addElement(new XoopsFormTextArea(_AM_PUBLISHER_COLDESCRIPT, 'description', $this->targetObject->description('e'), 7, 60));
 
         // EDITOR
-        $groups          = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : XOOPS_GROUP_ANONYMOUS;
-        $gperm_handler   = $this->publisher->getHandler('groupperm');
-        $module_id       = $this->publisher->getModule()->mid();
-        $allowedEditors = publisherGetEditors($gperm_handler->getItemIds('editors', $groups, $module_id));
-        $nohtml          = false;
+        $groups         = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : XOOPS_GROUP_ANONYMOUS;
+        $gpermHandler  =& $this->publisher->getHandler('groupperm');
+        $moduleId      = $this->publisher->getModule()->mid();
+        $allowedEditors = publisherGetEditors($gpermHandler->getItemIds('editors', $groups, $moduleId));
+        $nohtml         = false;
         if (count($allowedEditors) > 0) {
             $editor = XoopsRequest::getString('editor', '', 'POST');
             if (!empty($editor)) {
@@ -99,65 +99,65 @@ public function createElements()
                 }
             }
             $editor      = (empty($editor) || !in_array($editor, $allowedEditors)) ? $this->publisher->getConfig('submit_editor') : $editor;
-            $form_editor = new XoopsFormSelectEditor($this, 'editor', $editor, $nohtml, $allowedEditors);
-            $this->addElement($form_editor);
+            $formEditor = new XoopsFormSelectEditor($this, 'editor', $editor, $nohtml, $allowedEditors);
+            $this->addElement($formEditor);
         } else {
             $editor = $this->publisher->getConfig('submit_editor');
         }
 
-        $editor_configs           = array();
-        $editor_configs['rows']   = $this->publisher->getConfig('submit_editor_rows') == '' ? 35 : $this->publisher->getConfig('submit_editor_rows');
-        $editor_configs['cols']   = $this->publisher->getConfig('submit_editor_cols') == '' ? 60 : $this->publisher->getConfig('submit_editor_cols');
-        $editor_configs['width']  = $this->publisher->getConfig('submit_editor_width') == '' ? "100%" : $this->publisher->getConfig('submit_editor_width');
-        $editor_configs['height'] = $this->publisher->getConfig('submit_editor_height') == '' ? "400px" : $this->publisher->getConfig('submit_editor_height');
+        $editorConfigs           = array();
+        $editorConfigs['rows']   = $this->publisher->getConfig('submit_editor_rows') == '' ? 35 : $this->publisher->getConfig('submit_editor_rows');
+        $editorConfigs['cols']   = $this->publisher->getConfig('submit_editor_cols') == '' ? 60 : $this->publisher->getConfig('submit_editor_cols');
+        $editorConfigs['width']  = $this->publisher->getConfig('submit_editor_width') == '' ? '100%' : $this->publisher->getConfig('submit_editor_width');
+        $editorConfigs['height'] = $this->publisher->getConfig('submit_editor_height') == '' ? '400px' : $this->publisher->getConfig('submit_editor_height');
 
-        $editor_configs['name']  = 'header';
-        $editor_configs['value'] = $this->targetObject->header('e');
+        $editorConfigs['name']  = 'header';
+        $editorConfigs['value'] = $this->targetObject->header('e');
 
-        $text_header = new XoopsFormEditor(_AM_PUBLISHER_CATEGORY_HEADER, $editor, $editor_configs, $nohtml, $onfailure = null);
-        $text_header->setDescription(_AM_PUBLISHER_CATEGORY_HEADER_DSC);
-        $this->addElement($text_header);
+        $textHeader = new XoopsFormEditor(_AM_PUBLISHER_CATEGORY_HEADER, $editor, $editorConfigs, $nohtml, $onfailure = null);
+        $textHeader->setDescription(_AM_PUBLISHER_CATEGORY_HEADER_DSC);
+        $this->addElement($textHeader);
 
         // IMAGE
-        $image_array  = XoopsLists::getImgListAsArray(publisherGetImageDir('category'));
-        $image_select = new XoopsFormSelect('', 'image', $this->targetObject->image());
-        //$image_select -> addOption ('-1', '---------------');
-        $image_select->addOptionArray($image_array);
-        $image_select->setExtra("onchange='showImgSelected(\"image3\", \"image\", \"" . 'uploads/' . PUBLISHER_DIRNAME . '/images/category/' . "\", \"\", \"" . XOOPS_URL . "\")'");
-        $image_tray = new XoopsFormElementTray(_AM_PUBLISHER_IMAGE, '&nbsp;');
-        $image_tray->addElement($image_select);
-        $image_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . publisherGetImageDir('category', false) . $this->targetObject->image() . "' name='image3' id='image3' alt='' />"));
-        $image_tray->setDescription(_AM_PUBLISHER_IMAGE_DSC);
-        $this->addElement($image_tray);
+        $imageArray  = XoopsLists::getImgListAsArray(publisherGetImageDir('category'));
+        $imageSelect = new XoopsFormSelect('', 'image', $this->targetObject->getImage());
+        //$imageSelect -> addOption ('-1', '---------------');
+        $imageSelect->addOptionArray($imageArray);
+        $imageSelect->setExtra("onchange='showImgSelected(\"image3\", \"image\", \"" . 'uploads/' . PUBLISHER_DIRNAME . '/images/category/' . "\", \"\", \"" . XOOPS_URL . "\")'");
+        $imageTray = new XoopsFormElementTray(_AM_PUBLISHER_IMAGE, '&nbsp;');
+        $imageTray->addElement($imageSelect);
+        $imageTray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . publisherGetImageDir('category', false) . $this->targetObject->getImage() . "' name='image3' id='image3' alt='' />"));
+        $imageTray->setDescription(_AM_PUBLISHER_IMAGE_DSC);
+        $this->addElement($imageTray);
 
         // IMAGE UPLOAD
         $max_size = 5000000;
-        $file_box = new XoopsFormFile(_AM_PUBLISHER_IMAGE_UPLOAD, "image_file", $max_size);
-        $file_box->setExtra("size ='45'");
-        $file_box->setDescription(_AM_PUBLISHER_IMAGE_UPLOAD_DSC);
-        $this->addElement($file_box);
+        $fileBox = new XoopsFormFile(_AM_PUBLISHER_IMAGE_UPLOAD, 'image_file', $max_size);
+        $fileBox->setExtra("size ='45'");
+        $fileBox->setDescription(_AM_PUBLISHER_IMAGE_UPLOAD_DSC);
+        $this->addElement($fileBox);
 
         // Short url
-        $text_short_url = new XoopsFormText(_AM_PUBLISHER_CATEGORY_SHORT_URL, 'short_url', 50, 255, $this->targetObject->short_url('e'));
-        $text_short_url->setDescription(_AM_PUBLISHER_CATEGORY_SHORT_URL_DSC);
-        $this->addElement($text_short_url);
+        $textShortUrl = new XoopsFormText(_AM_PUBLISHER_CATEGORY_SHORT_URL, 'short_url', 50, 255, $this->targetObject->short_url('e'));
+        $textShortUrl->setDescription(_AM_PUBLISHER_CATEGORY_SHORT_URL_DSC);
+        $this->addElement($textShortUrl);
 
         // Meta Keywords
-        $text_meta_keywords = new XoopsFormTextArea(_AM_PUBLISHER_CATEGORY_META_KEYWORDS, 'meta_keywords', $this->targetObject->meta_keywords('e'), 7, 60);
-        $text_meta_keywords->setDescription(_AM_PUBLISHER_CATEGORY_META_KEYWORDS_DSC);
-        $this->addElement($text_meta_keywords);
+        $textMetaKeywords = new XoopsFormTextArea(_AM_PUBLISHER_CATEGORY_META_KEYWORDS, 'meta_keywords', $this->targetObject->meta_keywords('e'), 7, 60);
+        $textMetaKeywords->setDescription(_AM_PUBLISHER_CATEGORY_META_KEYWORDS_DSC);
+        $this->addElement($textMetaKeywords);
 
         // Meta Description
-        $text_meta_description = new XoopsFormTextArea(_AM_PUBLISHER_CATEGORY_META_DESCRIPTION, 'meta_description', $this->targetObject->meta_description('e'), 7, 60);
-        $text_meta_description->setDescription(_AM_PUBLISHER_CATEGORY_META_DESCRIPTION_DSC);
-        $this->addElement($text_meta_description);
+        $textMetaDescription = new XoopsFormTextArea(_AM_PUBLISHER_CATEGORY_META_DESCRIPTION, 'meta_description', $this->targetObject->meta_description('e'), 7, 60);
+        $textMetaDescription->setDescription(_AM_PUBLISHER_CATEGORY_META_DESCRIPTION_DSC);
+        $this->addElement($textMetaDescription);
 
         // Weight
         $this->addElement(new XoopsFormText(_AM_PUBLISHER_COLPOSIT, 'weight', 4, 4, $this->targetObject->weight()));
 
         // Added by skalpa: custom template support
         //todo, check this
-        $this->addElement(new XoopsFormText("Custom template", 'template', 50, 255, $this->targetObject->template('e')), false);
+        $this->addElement(new XoopsFormText('Custom template', 'template', 50, 255, $this->targetObject->template('e')), false);
 
         // READ PERMISSIONS
         $groupsReadCheckbox = new XoopsFormCheckBox(_AM_PUBLISHER_PERMISSIONS_CAT_READ, 'groupsRead[]', $this->targetObject->getGroupsRead());
@@ -186,15 +186,15 @@ public function createElements()
         $moderator->setDescription(_AM_PUBLISHER_CATEGORY_MODERATOR_DSC);
         $this->addElement($moderator);
 
-        $cat_tray = new XoopsFormElementTray(_AM_PUBLISHER_SCATEGORYNAME, '<br /><br />');
+        //SUBCATEGORY
+        $catTray = new XoopsFormElementTray(_AM_PUBLISHER_SCATEGORYNAME, '<br /><br />');
         for ($i = 0; $i < $this->subCatsCount; ++$i) {
-
-            if ($i < (($scname = XoopsRequest::getString('scname', '', 'POST'))) ? count($scname) : 0) {
-                $subname = ($scname = XoopsRequest::getString('scname', '', 'POST')) ? XoopsRequest::getArray('scname', array(), 'POST')[$i] : '';
-            } else {
-                $subname = '';
+            $subname = '';
+            if ($i < (($scname = XoopsRequest::getArray('scname', array(), 'POST')) ? count($scname) : 0)) {
+                $temp    = XoopsRequest::getArray('scname', array(), 'POST');
+                $subname = ($scname = XoopsRequest::getArray('scname', '', 'POST')) ? $temp[$i] : '';
             }
-            $cat_tray->addElement(new XoopsFormText('', 'scname[' . $i . ']', 50, 255, $subname));
+            $catTray->addElement(new XoopsFormText('', 'scname[' . $i . ']', 50, 255, $subname));
 
         }
         $t = new XoopsFormText('', 'nb_subcats', 3, 2);
@@ -210,8 +210,8 @@ public function createElements()
         $r = new XoopsFormElementTray('');
         $r->addElement($l);
         $r->addElement($b);
-        $cat_tray->addElement($r);
-        $this->addElement($cat_tray);
+        $catTray->addElement($r);
+        $this->addElement($catTray);
 
         $this->addElement(new XoopsFormHidden('categoryid', $this->targetObject->categoryid()));
         $this->addElement(new XoopsFormHidden('nb_sub_yet', $this->subCatsCount));
@@ -220,30 +220,27 @@ public function createElements()
     public function createButtons()
     {
         // Action buttons tray
-        $button_tray = new XoopsFormElementTray('', '');
+        $buttonTray = new XoopsFormElementTray('', '');
 
         // No ID for category -- then it's new category, button says 'Create'
         if (!$this->targetObject->categoryid()) {
+            $buttonTray->addElement(new XoopsFormButton('', 'addcategory', _AM_PUBLISHER_CREATE, 'submit'));
 
-            $button_tray->addElement(new XoopsFormButton('', 'addcategory', _AM_PUBLISHER_CREATE, 'submit'));
+            $buttClear = new XoopsFormButton('', '', _AM_PUBLISHER_CLEAR, 'reset');
+            $buttonTray->addElement($buttClear);
 
-            $butt_clear = new XoopsFormButton('', '', _AM_PUBLISHER_CLEAR, 'reset');
-            $button_tray->addElement($butt_clear);
+            $buttCancel = new XoopsFormButton('', '', _AM_PUBLISHER_CANCEL, 'button');
+            $buttCancel->setExtra('onclick="history.go(-1)"');
+            $buttonTray->addElement($buttCancel);
 
-            $butt_cancel = new XoopsFormButton('', '', _AM_PUBLISHER_CANCEL, 'button');
-            $butt_cancel->setExtra('onclick="history.go(-1)"');
-            $button_tray->addElement($butt_cancel);
-
-            $this->addElement($button_tray);
+            $this->addElement($buttonTray);
         } else {
+            $buttonTray->addElement(new XoopsFormButton('', 'addcategory', _AM_PUBLISHER_MODIFY, 'submit'));
+            $buttCancel = new XoopsFormButton('', '', _AM_PUBLISHER_CANCEL, 'button');
+            $buttCancel->setExtra('onclick="history.go(-1)"');
+            $buttonTray->addElement($buttCancel);
 
-            $button_tray->addElement(new XoopsFormButton('', 'addcategory', _AM_PUBLISHER_MODIFY, 'submit'));
-
-            $butt_cancel = new XoopsFormButton('', '', _AM_PUBLISHER_CANCEL, 'button');
-            $butt_cancel->setExtra('onclick="history.go(-1)"');
-            $button_tray->addElement($butt_cancel);
-
-            $this->addElement($button_tray);
+            $this->addElement($buttonTray);
         }
     }
 }
diff --git a/publisher/class/form/file.php b/publisher/class/form/file.php
index 6e4a8d74..80f69dfb 100644
--- a/publisher/class/form/file.php
+++ b/publisher/class/form/file.php
@@ -37,19 +37,19 @@ class PublisherFileForm extends XoopsThemeForm
      * @var PublisherPublisher
      * @access public
      */
-    public $publisher = null;
+    public $publisher;
 
-    public $targetObject = null;
+    public $targetObject;
 
     /**
      * @param $target
      */
     public function __construct(&$target)
     {
-        $this->publisher    = PublisherPublisher::getInstance();
-        $this->targetObject = $target;
+        $this->publisher    =& PublisherPublisher::getInstance();
+        $this->targetObject =& $target;
 
-        parent::__construct(_AM_PUBLISHER_UPLOAD_FILE, "form", xoops_getenv('PHP_SELF'));
+        parent::__construct(_AM_PUBLISHER_UPLOAD_FILE, 'form', xoops_getenv('PHP_SELF'));
         $this->setExtra('enctype="multipart/form-data"');
 
         $this->createElements();
@@ -59,25 +59,25 @@ public function __construct(&$target)
     public function createElements()
     {
         // NAME
-        $name_text = new XoopsFormText(_CO_PUBLISHER_FILENAME, 'name', 50, 255, $this->targetObject->name());
-        $name_text->setDescription(_CO_PUBLISHER_FILE_NAME_DSC);
-        $this->addElement($name_text, true);
+        $nameText = new XoopsFormText(_CO_PUBLISHER_FILENAME, 'name', 50, 255, $this->targetObject->name());
+        $nameText->setDescription(_CO_PUBLISHER_FILE_NAME_DSC);
+        $this->addElement($nameText, true);
 
         // DESCRIPTION
-        $description_text = new XoopsFormTextArea(_CO_PUBLISHER_FILE_DESCRIPTION, 'description', $this->targetObject->description());
-        $description_text->setDescription(_CO_PUBLISHER_FILE_DESCRIPTION_DSC);
-        $this->addElement($description_text);
+        $descriptionText = new XoopsFormTextArea(_CO_PUBLISHER_FILE_DESCRIPTION, 'description', $this->targetObject->description());
+        $descriptionText->setDescription(_CO_PUBLISHER_FILE_DESCRIPTION_DSC);
+        $this->addElement($descriptionText);
 
         // FILE TO UPLOAD
         //if (!$this->targetObject->fileid()) {
-        $file_box = new XoopsFormFile(_CO_PUBLISHER_FILE_TO_UPLOAD, "item_upload_file", 0);
-        $file_box->setExtra("size ='50'");
-        $this->addElement($file_box);
+        $fileBox = new XoopsFormFile(_CO_PUBLISHER_FILE_TO_UPLOAD, 'item_upload_file', 0);
+        $fileBox->setExtra("size ='50'");
+        $this->addElement($fileBox);
         //}
 
-        $status_select = new XoopsFormRadioYN(_CO_PUBLISHER_FILE_STATUS, 'file_status', PublisherConstantsInterface::PUBLISHER_STATUS_FILE_ACTIVE);
-        $status_select->setDescription(_CO_PUBLISHER_FILE_STATUS_DSC);
-        $this->addElement($status_select);
+        $statusSelect = new XoopsFormRadioYN(_CO_PUBLISHER_FILE_STATUS, 'file_status', PublisherConstantsInterface::PUBLISHER_STATUS_FILE_ACTIVE);
+        $statusSelect->setDescription(_CO_PUBLISHER_FILE_STATUS_DSC);
+        $this->addElement($statusSelect);
 
         // fileid
         $this->addElement(new XoopsFormHidden('fileid', $this->targetObject->fileid()));
@@ -88,31 +88,31 @@ public function createElements()
 
     public function createButtons()
     {
-        $files_button_tray = new XoopsFormElementTray('', '');
-        $files_hidden      = new XoopsFormHidden('op', 'uploadfile');
-        $files_button_tray->addElement($files_hidden);
+        $filesButtonTray = new XoopsFormElementTray('', '');
+        $filesHidden      = new XoopsFormHidden('op', 'uploadfile');
+        $filesButtonTray->addElement($filesHidden);
 
         if (!$this->targetObject->fileid()) {
-            $files_butt_create = new XoopsFormButton('', '', _MD_PUBLISHER_UPLOAD, 'submit');
-            $files_butt_create->setExtra('onclick="this.form.elements.op.value=\'uploadfile\'"');
-            $files_button_tray->addElement($files_butt_create);
+            $filesButtonCreate = new XoopsFormButton('', '', _MD_PUBLISHER_UPLOAD, 'submit');
+            $filesButtonCreate->setExtra('onclick="this.form.elements.op.value=\'uploadfile\'"');
+            $filesButtonTray->addElement($filesButtonCreate);
 
-            $files_butt_another = new XoopsFormButton('', '', _CO_PUBLISHER_FILE_UPLOAD_ANOTHER, 'submit');
-            $files_butt_another->setExtra('onclick="this.form.elements.op.value=\'uploadanother\'"');
-            $files_button_tray->addElement($files_butt_another);
+            $filesButtonAnother = new XoopsFormButton('', '', _CO_PUBLISHER_FILE_UPLOAD_ANOTHER, 'submit');
+            $filesButtonAnother->setExtra('onclick="this.form.elements.op.value=\'uploadanother\'"');
+            $filesButtonTray->addElement($filesButtonAnother);
         } else {
-            $files_butt_create = new XoopsFormButton('', '', _MD_PUBLISHER_MODIFY, 'submit');
-            $files_butt_create->setExtra('onclick="this.form.elements.op.value=\'modify\'"');
-            $files_button_tray->addElement($files_butt_create);
+            $filesButtonCreate = new XoopsFormButton('', '', _MD_PUBLISHER_MODIFY, 'submit');
+            $filesButtonCreate->setExtra('onclick="this.form.elements.op.value=\'modify\'"');
+            $filesButtonTray->addElement($filesButtonCreate);
         }
 
-        $files_butt_clear = new XoopsFormButton('', '', _MD_PUBLISHER_CLEAR, 'reset');
-        $files_button_tray->addElement($files_butt_clear);
+        $filesButtonClear = new XoopsFormButton('', '', _MD_PUBLISHER_CLEAR, 'reset');
+        $filesButtonTray->addElement($filesButtonClear);
 
-        $butt_cancel = new XoopsFormButton('', '', _MD_PUBLISHER_CANCEL, 'button');
-        $butt_cancel->setExtra('onclick="history.go(-1)"');
-        $files_button_tray->addElement($butt_cancel);
+        $buttonCancel = new XoopsFormButton('', '', _MD_PUBLISHER_CANCEL, 'button');
+        $buttonCancel->setExtra('onclick="history.go(-1)"');
+        $filesButtonTray->addElement($buttonCancel);
 
-        $this->addElement($files_button_tray);
+        $this->addElement($filesButtonTray);
     }
 }
diff --git a/publisher/class/form/item.php b/publisher/class/form/item.php
index c050f750..08954ada 100644
--- a/publisher/class/form/item.php
+++ b/publisher/class/form/item.php
@@ -42,8 +42,7 @@ class PublisherItemForm extends PublisherThemeTabForm
         _CO_PUBLISHER_TAB_MAIN   => 'mainTab',
         _CO_PUBLISHER_TAB_IMAGES => 'imagesTab',
         _CO_PUBLISHER_TAB_FILES  => 'filesTab',
-        _CO_PUBLISHER_TAB_OTHERS => 'othersTab'
-    );
+        _CO_PUBLISHER_TAB_OTHERS => 'othersTab');
 
     public $mainTab = array(
         PublisherConstantsInterface::PUBLISHER_SUBTITLE,
@@ -60,23 +59,19 @@ class PublisherItemForm extends PublisherThemeTabForm
         PublisherConstantsInterface::PUBLISHER_AUTHOR_ALIAS,
         PublisherConstantsInterface::PUBLISHER_NOTIFY,
         PublisherConstantsInterface::PUBLISHER_AVAILABLE_PAGE_WRAP,
-        PublisherConstantsInterface::PUBLISHER_UID
-    );
+        PublisherConstantsInterface::PUBLISHER_UID);
 
     public $imagesTab = array(
-        PublisherConstantsInterface::PUBLISHER_IMAGE_ITEM
-    );
+        PublisherConstantsInterface::PUBLISHER_IMAGE_ITEM);
 
     public $filesTab = array(
-        PublisherConstantsInterface::PUBLISHER_ITEM_UPLOAD_FILE
-    );
+        PublisherConstantsInterface::PUBLISHER_ITEM_UPLOAD_FILE);
 
     public $othersTab = array(
         PublisherConstantsInterface::PUBLISHER_ITEM_META_KEYWORDS,
         PublisherConstantsInterface::PUBLISHER_ITEM_META_DESCRIPTION,
         PublisherConstantsInterface::PUBLISHER_WEIGHT,
-        PublisherConstantsInterface::PUBLISHER_ALLOWCOMMENTS
-    );
+        PublisherConstantsInterface::PUBLISHER_ALLOWCOMMENTS);
 
     /**
      * @param $checkperm
@@ -93,7 +88,7 @@ public function setCheckPermissions($checkperm)
      */
     public function isGranted($item)
     {
-        $publisher = PublisherPublisher::getInstance();
+        $publisher =& PublisherPublisher::getInstance();
         $ret       = false;
         if (!$this->checkperm || $publisher->getHandler('permission')->isGranted('form_view', $item)) {
             $ret = true;
@@ -132,7 +127,7 @@ public function hasTab($tab)
     public function createElements($obj)
     {
 
-        $publisher = PublisherPublisher::getInstance();
+        $publisher =& PublisherPublisher::getInstance();
 
         $allowedEditors = publisherGetEditors($publisher->getHandler('permission')->getGrantedItems('editors'));
 
@@ -147,10 +142,10 @@ public function createElements($obj)
         $this->startTab(_CO_PUBLISHER_TAB_MAIN);
 
         // Category
-        $category_select = new XoopsFormSelect(_CO_PUBLISHER_CATEGORY, 'categoryid', $obj->getVar('categoryid', 'e'));
-        $category_select->setDescription(_CO_PUBLISHER_CATEGORY_DSC);
-        $category_select->addOptionArray($publisher->getHandler('category')->getCategoriesForSubmit());
-        $this->addElement($category_select);
+        $categoryFormSelect = new XoopsFormSelect(_CO_PUBLISHER_CATEGORY, 'categoryid', $obj->getVar('categoryid', 'e'));
+        $categoryFormSelect->setDescription(_CO_PUBLISHER_CATEGORY_DSC);
+        $categoryFormSelect->addOptionArray($publisher->getHandler('category')->getCategoriesForSubmit());
+        $this->addElement($categoryFormSelect);
 
         // ITEM TITLE
         $this->addElement(new XoopsFormText(_CO_PUBLISHER_TITLE, 'title', 50, 255, $obj->getVar('title', 'e')), true);
@@ -162,21 +157,21 @@ public function createElements($obj)
 
         // SHORT URL
         if ($this->isGranted(PublisherConstantsInterface::PUBLISHER_ITEM_SHORT_URL)) {
-            $text_short_url = new XoopsFormText(_CO_PUBLISHER_ITEM_SHORT_URL, 'item_short_url', 50, 255, $obj->short_url('e'));
-            $text_short_url->setDescription(_CO_PUBLISHER_ITEM_SHORT_URL_DSC);
-            $this->addElement($text_short_url);
+            $textShortUrl = new XoopsFormText(_CO_PUBLISHER_ITEM_SHORT_URL, 'item_short_url', 50, 255, $obj->short_url('e'));
+            $textShortUrl->setDescription(_CO_PUBLISHER_ITEM_SHORT_URL_DSC);
+            $this->addElement($textShortUrl);
         }
 
         // TAGS
         if (xoops_isActiveModule('tag') && $this->isGranted(PublisherConstantsInterface::PUBLISHER_ITEM_TAG)) {
             include_once $GLOBALS['xoops']->path('modules/tag/include/formtag.php');
-            $text_tags = new XoopsFormTag('item_tag', 60, 255, $obj->getVar('item_tag', 'e'), 0);
-            $this->addElement($text_tags);
+            $textTags = new XoopsFormTag('item_tag', 60, 255, $obj->getVar('item_tag', 'e'), 0);
+            $this->addElement($textTags);
         }
 
         // SELECT EDITOR
         $nohtml = !$obj->dohtml();
-        if (count($allowedEditors) == 1) {
+        if (count($allowedEditors) === 1) {
             $editor = $allowedEditors[0];
         } elseif (count($allowedEditors) > 0) {
             $editor = XoopsRequest::getString('editor', '', 'POST');
@@ -185,49 +180,44 @@ public function createElements($obj)
             } else {
                 $editor = publisherGetCookieVar('publisher_editor');
                 if (empty($editor) && is_object($GLOBALS['xoopsUser'])) {
-//                    $editor = @ $GLOBALS['xoopsUser']->getVar('publisher_editor'); // Need set through user profile
+                    //                    $editor = @ $GLOBALS['xoopsUser']->getVar('publisher_editor'); // Need set through user profile
                     $editor = (null !== ($GLOBALS['xoopsUser']->getVar('publisher_editor'))) ? $GLOBALS['xoopsUser']->getVar('publisher_editor') : ''; // Need set through user profile
                 }
             }
             $editor = (empty($editor) || !in_array($editor, $allowedEditors)) ? $publisher->getConfig('submit_editor') : $editor;
 
-            $form_editor = new XoopsFormSelectEditor($this, 'editor', $editor, $nohtml, $allowedEditors);
-            $this->addElement($form_editor);
+            $formEditor = new XoopsFormSelectEditor($this, 'editor', $editor, $nohtml, $allowedEditors);
+            $this->addElement($formEditor);
         } else {
             $editor = $publisher->getConfig('submit_editor');
         }
 
-        $editor_configs           = array();
-        $editor_configs["rows"]   = !$publisher->getConfig('submit_editor_rows') ? 35 : $publisher->getConfig('submit_editor_rows');
-        $editor_configs["cols"]   = !$publisher->getConfig('submit_editor_cols') ? 60 : $publisher->getConfig('submit_editor_cols');
-        $editor_configs["width"]  = !$publisher->getConfig('submit_editor_width') ? "100%" : $publisher->getConfig('submit_editor_width');
-        $editor_configs["height"] = !$publisher->getConfig('submit_editor_height') ? "400px" : $publisher->getConfig('submit_editor_height');
+        $editorConfigs           = array();
+        $editorConfigs['rows']   = !$publisher->getConfig('submit_editor_rows') ? 35 : $publisher->getConfig('submit_editor_rows');
+        $editorConfigs['cols']   = !$publisher->getConfig('submit_editor_cols') ? 60 : $publisher->getConfig('submit_editor_cols');
+        $editorConfigs['width']  = !$publisher->getConfig('submit_editor_width') ? '100%' : $publisher->getConfig('submit_editor_width');
+        $editorConfigs['height'] = !$publisher->getConfig('submit_editor_height') ? '400px' : $publisher->getConfig('submit_editor_height');
 
         // SUMMARY
         if ($this->isGranted(PublisherConstantsInterface::PUBLISHER_SUMMARY)) {
             // Description
-            //$summary_text = new XoopsFormTextArea(_CO_PUBLISHER_SUMMARY, 'summary', $obj->getVar('summary', 'e'), 7, 60);
-            $editor_configs["name"]  = "summary";
-            $editor_configs["value"] = $obj->getVar('summary', 'e');
-            $summary_text            = new XoopsFormEditor(_CO_PUBLISHER_SUMMARY, $editor, $editor_configs, $nohtml, $onfailure = null);
-            $summary_text->setDescription(_CO_PUBLISHER_SUMMARY_DSC);
-            $this->addElement($summary_text);
+            //$summaryText = new XoopsFormTextArea(_CO_PUBLISHER_SUMMARY, 'summary', $obj->getVar('summary', 'e'), 7, 60);
+            $editorConfigs['name']  = 'summary';
+            $editorConfigs['value'] = $obj->getVar('summary', 'e');
+            $summaryText            = new XoopsFormEditor(_CO_PUBLISHER_SUMMARY, $editor, $editorConfigs, $nohtml, $onfailure = null);
+            $summaryText->setDescription(_CO_PUBLISHER_SUMMARY_DSC);
+            $this->addElement($summaryText);
         }
 
         // BODY
-        $editor_configs["name"]  = "body";
-        $editor_configs["value"] = $obj->getVar('body', 'e');
-        $body_text               = new XoopsFormEditor(_CO_PUBLISHER_BODY, $editor, $editor_configs, $nohtml, $onfailure = null);
-        $body_text->setDescription(_CO_PUBLISHER_BODY_DSC);
-        $this->addElement($body_text);
+        $editorConfigs['name']  = 'body';
+        $editorConfigs['value'] = $obj->getVar('body', 'e');
+        $bodyText               = new XoopsFormEditor(_CO_PUBLISHER_BODY, $editor, $editorConfigs, $nohtml, $onfailure = null);
+        $bodyText->setDescription(_CO_PUBLISHER_BODY_DSC);
+        $this->addElement($bodyText);
 
         // VARIOUS OPTIONS
-        if ($this->isGranted(PublisherConstantsInterface::PUBLISHER_DOHTML) ||
-            $this->isGranted(PublisherConstantsInterface::PUBLISHER_DOSMILEY) ||
-            $this->isGranted(PublisherConstantsInterface::PUBLISHER_DOXCODE) ||
-            $this->isGranted(PublisherConstantsInterface::PUBLISHER_DOIMAGE) ||
-            $this->isGranted(PublisherConstantsInterface::PUBLISHER_DOLINEBREAK)
-        ) {
+        if ($this->isGranted(PublisherConstantsInterface::PUBLISHER_DOHTML) || $this->isGranted(PublisherConstantsInterface::PUBLISHER_DOSMILEY) || $this->isGranted(PublisherConstantsInterface::PUBLISHER_DOXCODE) || $this->isGranted(PublisherConstantsInterface::PUBLISHER_DOIMAGE) || $this->isGranted(PublisherConstantsInterface::PUBLISHER_DOLINEBREAK)) {
             if ($this->isGranted(PublisherConstantsInterface::PUBLISHER_DOHTML)) {
                 $html_radio = new XoopsFormRadioYN(_CO_PUBLISHER_DOHTML, 'dohtml', $obj->dohtml(), _YES, _NO);
                 $this->addElement($html_radio);
@@ -252,14 +242,14 @@ public function createElements($obj)
 
         // Available pages to wrap
         if ($this->isGranted(PublisherConstantsInterface::PUBLISHER_AVAILABLE_PAGE_WRAP)) {
-            $wrap_pages                = XoopsLists::getHtmlListAsArray(publisherGetUploadDir(true, 'content'));
-            $available_wrap_pages_text = array();
-            foreach ($wrap_pages as $page) {
-                $available_wrap_pages_text[] = "<span onclick='publisherPageWrap(\"body\", \"[pagewrap=$page] \");' onmouseover='style.cursor=\"pointer\"'>$page</span>";
+            $wrapPages                = XoopsLists::getHtmlListAsArray(publisherGetUploadDir(true, 'content'));
+            $availableWrapPagesText = array();
+            foreach ($wrapPages as $page) {
+                $availableWrapPagesText[] = "<span onclick='publisherPageWrap(\"body\", \"[pagewrap=$page] \");' onmouseover='style.cursor=\"pointer\"'>$page</span>";
             }
-            $available_wrap_pages = new XoopsFormLabel(_CO_PUBLISHER_AVAILABLE_PAGE_WRAP, implode(', ', $available_wrap_pages_text));
-            $available_wrap_pages->setDescription(_CO_PUBLISHER_AVAILABLE_PAGE_WRAP_DSC);
-            $this->addElement($available_wrap_pages);
+            $availableWrapPages = new XoopsFormLabel(_CO_PUBLISHER_AVAILABLE_PAGE_WRAP, implode(', ', $availableWrapPagesText));
+            $availableWrapPages->setDescription(_CO_PUBLISHER_AVAILABLE_PAGE_WRAP_DSC);
+            $this->addElement($availableWrapPages);
         }
 
         // Uid
@@ -268,17 +258,17 @@ public function createElements($obj)
          */
         // Trabis : well, maybe is because you are getting 6000 objects into memory , no??? LOL
         if ($this->isGranted(PublisherConstantsInterface::PUBLISHER_UID)) {
-            $uid_select = new XoopsFormSelect(_CO_PUBLISHER_UID, 'uid', $obj->uid(), 1, false);
-            $uid_select->setDescription(_CO_PUBLISHER_UID_DSC);
-            $sql            = "SELECT uid, uname FROM " . $obj->db->prefix('users') . " ORDER BY uname ASC";
+            $uidSelect = new XoopsFormSelect(_CO_PUBLISHER_UID, 'uid', $obj->uid(), 1, false);
+            $uidSelect->setDescription(_CO_PUBLISHER_UID_DSC);
+            $sql            = 'SELECT uid, uname FROM ' . $obj->db->prefix('users') . ' ORDER BY uname ASC';
             $result         = $obj->db->query($sql);
-            $users_array    = array();
-            $users_array[0] = $GLOBALS['xoopsConfig']['anonymous'];
+            $usersArray    = array();
+            $usersArray[0] = $GLOBALS['xoopsConfig']['anonymous'];
             while (($myrow = $obj->db->fetchArray($result)) !== false) {
-                $users_array[$myrow['uid']] = $myrow['uname'];
+                $usersArray[$myrow['uid']] = $myrow['uname'];
             }
-            $uid_select->addOptionArray($users_array);
-            $this->addElement($uid_select);
+            $uidSelect->addOptionArray($usersArray);
+            $this->addElement($uidSelect);
         }
         /* else {
         $hidden = new XoopsFormHidden('uid', $obj->uid());
@@ -300,19 +290,24 @@ public function createElements($obj)
                 PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED => _CO_PUBLISHER_PUBLISHED,
                 PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE   => _CO_PUBLISHER_OFFLINE,
                 PublisherConstantsInterface::PUBLISHER_STATUS_SUBMITTED => _CO_PUBLISHER_SUBMITTED,
-                PublisherConstantsInterface::PUBLISHER_STATUS_REJECTED  => _CO_PUBLISHER_REJECTED
-            );
-            $status_select = new XoopsFormSelect(_CO_PUBLISHER_STATUS, 'status', $obj->getVar('status'));
-            $status_select->addOptionArray($options);
-            $status_select->setDescription(_CO_PUBLISHER_STATUS_DSC);
-            $this->addElement($status_select);
-            unset($status_select);
+                PublisherConstantsInterface::PUBLISHER_STATUS_REJECTED  => _CO_PUBLISHER_REJECTED);
+            $statusSelect = new XoopsFormSelect(_CO_PUBLISHER_STATUS, 'status', $obj->getVar('status'));
+            $statusSelect->addOptionArray($options);
+            $statusSelect->setDescription(_CO_PUBLISHER_STATUS_DSC);
+            $this->addElement($statusSelect);
+            unset($statusSelect);
         }
 
         // Datesub
         if ($this->isGranted(PublisherConstantsInterface::PUBLISHER_DATESUB)) {
-            $datesub          = ($obj->getVar('datesub') == 0) ? time() : $obj->getVar('datesub');
-            $datesub_datetime = new PublisherFormDateTime(_CO_PUBLISHER_DATESUB, 'datesub', $size = 15, $datesub);
+            if ($obj->isNew()) {
+                $datesub = time();
+            } else {
+                $datesub = ($obj->getVar('datesub') == 0) ? time() : $obj->getVar('datesub');
+            }
+            $datesub_datetime = new PublisherFormDateTime(_CO_PUBLISHER_DATESUB, 'datesub', $size = 15, $datesub, true, true);
+            // $datesub_datetime = new XoopsFormDateTime(_CO_PUBLISHER_DATESUB, 'datesub', $size = 15, $datesub, true, true);
+
             $datesub_datetime->setDescription(_CO_PUBLISHER_DATESUB_DSC);
             $this->addElement($datesub_datetime);
         }
@@ -337,22 +332,22 @@ public function createElements($obj)
                 $objimage_array[$imageObj->getVar('image_name')] = $imageObj->getVar('image_nicename');
             }
 
-            $imgcat_handler = xoops_gethandler('imagecategory');
-            if (method_exists($imgcat_handler, 'getListByPermission')) {
-                $catlist = $imgcat_handler->getListByPermission($group, 'imgcat_read', 1);
+            $imgcatHandler =& xoops_getHandler('imagecategory');
+            if (method_exists($imgcatHandler, 'getListByPermission')) {
+                $catlist = $imgcatHandler->getListByPermission($group, 'imgcat_read', 1);
             } else {
-                $catlist = $imgcat_handler->getList($group, 'imgcat_read', 1);
+                $catlist = $imgcatHandler->getList($group, 'imgcat_read', 1);
             }
             $catids = array_keys($catlist);
 
             $imageObjs = array();
             if (!empty($catids)) {
-                $image_handler = xoops_gethandler('image');
+                $imageHandler =& xoops_getHandler('image');
                 $criteria      = new CriteriaCompo(new Criteria('imgcat_id', '(' . implode(',', $catids) . ')', 'IN'));
                 $criteria->add(new Criteria('image_display', 1));
                 $criteria->setSort('image_nicename');
                 $criteria->setOrder('ASC');
-                $imageObjs = $image_handler->getObjects($criteria, true);
+                $imageObjs = $imageHandler->getObjects($criteria, true);
                 unset($criteria);
             }
             $image_array = array();
@@ -362,15 +357,15 @@ public function createElements($obj)
 
             $image_array = array_diff($image_array, $objimage_array);
 
-            $image_select = new XoopsFormSelect('', 'image_notused', '', 5);
-            $image_select->addOptionArray($image_array);
-            $image_select->setExtra("onchange='showImgSelected(\"image_display\", \"image_notused\", \"uploads/\", \"\", \"" . XOOPS_URL . "\")'");
-            //$image_select->setExtra( "onchange='appendMySelectOption(\"image_notused\", \"image_item\")'");
+            $imageSelect = new XoopsFormSelect('', 'image_notused', '', 5);
+            $imageSelect->addOptionArray($image_array);
+            $imageSelect->setExtra("onchange='showImgSelected(\"image_display\", \"image_notused\", \"uploads/\", \"\", \"" . XOOPS_URL . "\")'");
+            //$imageSelect->setExtra( "onchange='appendMySelectOption(\"image_notused\", \"image_item\")'");
             unset($image_array);
 
-            $image_select2 = new XoopsFormSelect('', 'image_item', '', 5, true);
-            $image_select2->addOptionArray($objimage_array);
-            $image_select2->setExtra("onchange='publisher_updateSelectOption(\"image_item\", \"image_featured\"), showImgSelected(\"image_display\", \"image_item\", \"uploads/\", \"\", \"" . XOOPS_URL . "\")'");
+            $imageSelect2 = new XoopsFormSelect('', 'image_item', '', 5, true);
+            $imageSelect2->addOptionArray($objimage_array);
+            $imageSelect2->setExtra("onchange='publisher_updateSelectOption(\"image_item\", \"image_featured\"), showImgSelected(\"image_display\", \"image_item\", \"uploads/\", \"\", \"" . XOOPS_URL . "\")'");
 
             $buttonadd = new XoopsFormButton('', 'buttonadd', _CO_PUBLISHER_ADD);
             $buttonadd->setExtra("onclick='publisher_appendSelectOption(\"image_notused\", \"image_item\"), publisher_updateSelectOption(\"image_item\", \"image_featured\")'");
@@ -378,10 +373,10 @@ public function createElements($obj)
             $buttonremove = new XoopsFormButton('', 'buttonremove', _CO_PUBLISHER_REMOVE);
             $buttonremove->setExtra("onclick='publisher_appendSelectOption(\"image_item\", \"image_notused\"), publisher_updateSelectOption(\"image_item\", \"image_featured\")'");
 
-            $opentable  = new XoopsFormLabel('', "<table><tr><td>");
-            $addcol     = new XoopsFormLabel('', "</td><td>");
-            $addbreak   = new XoopsFormLabel('', "<br />");
-            $closetable = new XoopsFormLabel('', "</td></tr></table>");
+            $opentable  = new XoopsFormLabel('', '<table><tr><td>');
+            $addcol     = new XoopsFormLabel('', '</td><td>');
+            $addbreak   = new XoopsFormLabel('', '<br />');
+            $closetable = new XoopsFormLabel('', '</td></tr></table>');
 
             $GLOBALS['xoTheme']->addScript(PUBLISHER_URL . '/assets/js/ajaxupload.3.9.js');
             $js_data  = new XoopsFormLabel('', '
@@ -425,63 +420,57 @@ public function createElements($obj)
 /*]]>*/</script>
 ');
             $messages = new XoopsFormLabel('', "<div id='publisher_upload_message'></div>");
-            $button   = new XoopsFormLabel('', "<div id='publisher_upload_button'>" . _CO_PUBLISHER_IMAGE_UPLOAD_NEW . "</div>");
+            $button   = new XoopsFormLabel('', "<div id='publisher_upload_button'>" . _CO_PUBLISHER_IMAGE_UPLOAD_NEW . '</div>');
             $nicename = new XoopsFormText('', 'image_nicename', 30, 30, _CO_PUBLISHER_IMAGE_NICENAME);
 
-            $imgcat_handler = xoops_gethandler('imagecategory');
-            if (method_exists($imgcat_handler, 'getListByPermission')) {
-                $catlist = $imgcat_handler->getListByPermission($group, 'imgcat_read', 1);
+            $imgcatHandler =& xoops_getHandler('imagecategory');
+            if (method_exists($imgcatHandler, 'getListByPermission')) {
+                $catlist = $imgcatHandler->getListByPermission($group, 'imgcat_read', 1);
             } else {
-                $catlist = $imgcat_handler->getList($group, 'imgcat_read', 1);
+                $catlist = $imgcatHandler->getList($group, 'imgcat_read', 1);
             }
             $imagecat = new XoopsFormSelect('', 'imgcat_id', '', 1);
             $imagecat->addOptionArray($catlist);
 
-            $image_upload_tray = new XoopsFormElementTray(_CO_PUBLISHER_IMAGE_UPLOAD, '');
-            $image_upload_tray->addElement($js_data);
-            $image_upload_tray->addElement($messages);
-            $image_upload_tray->addElement($opentable);
-
-            $image_upload_tray->addElement($imagecat);
-
-            $image_upload_tray->addElement($addbreak);
-
-            $image_upload_tray->addElement($nicename);
-
-            $image_upload_tray->addElement($addbreak);
-
-            $image_upload_tray->addElement($button);
-
-            $image_upload_tray->addElement($closetable);
-            $this->addElement($image_upload_tray);
+            $imageUploadTray = new XoopsFormElementTray(_CO_PUBLISHER_IMAGE_UPLOAD, '');
+            $imageUploadTray->addElement($js_data);
+            $imageUploadTray->addElement($messages);
+            $imageUploadTray->addElement($opentable);
+            $imageUploadTray->addElement($imagecat);
+            $imageUploadTray->addElement($addbreak);
+            $imageUploadTray->addElement($nicename);
+            $imageUploadTray->addElement($addbreak);
+            $imageUploadTray->addElement($button);
+            $imageUploadTray->addElement($closetable);
+            $this->addElement($imageUploadTray);
 
-            $image_tray = new XoopsFormElementTray(_CO_PUBLISHER_IMAGE_ITEMS, '');
-            $image_tray->addElement($opentable);
+            $imageTray = new XoopsFormElementTray(_CO_PUBLISHER_IMAGE_ITEMS, '');
+            $imageTray->addElement($opentable);
 
-            $image_tray->addElement($image_select);
-            $image_tray->addElement($addbreak);
-            $image_tray->addElement($buttonadd);
+            $imageTray->addElement($imageSelect);
+            $imageTray->addElement($addbreak);
+            $imageTray->addElement($buttonadd);
 
-            $image_tray->addElement($addcol);
+            $imageTray->addElement($addcol);
 
-            $image_tray->addElement($image_select2);
-            $image_tray->addElement($addbreak);
-            $image_tray->addElement($buttonremove);
+            $imageTray->addElement($imageSelect2);
+            $imageTray->addElement($addbreak);
+            $imageTray->addElement($buttonremove);
 
-            $image_tray->addElement($closetable);
-            $image_tray->setDescription(_CO_PUBLISHER_IMAGE_ITEMS_DSC);
-            $this->addElement($image_tray);
+            $imageTray->addElement($closetable);
+            $imageTray->setDescription(_CO_PUBLISHER_IMAGE_ITEMS_DSC);
+            $this->addElement($imageTray);
 
             $imagename    = is_object($objimages['main']) ? $objimages['main']->getVar('image_name') : '';
             $imageforpath = ($imagename != '') ? $imagename : 'blank.gif';
 
-            $image_select3 = new XoopsFormSelect(_CO_PUBLISHER_IMAGE_ITEM, 'image_featured', $imagename, 1);
-            $image_select3->addOptionArray($objimage_array);
-            $image_select3->setExtra("onchange='showImgSelected(\"image_display\", \"image_featured\", \"uploads/\", \"\", \"" . XOOPS_URL . "\")'");
-            $image_select3->setDescription(_CO_PUBLISHER_IMAGE_ITEM_DSC);
-            $this->addElement($image_select3);
+            $imageSelect3 = new XoopsFormSelect(_CO_PUBLISHER_IMAGE_ITEM, 'image_featured', $imagename, 1);
+            $imageSelect3->addOptionArray($objimage_array);
+            $imageSelect3->setExtra("onchange='showImgSelected(\"image_display\", \"image_featured\", \"uploads/\", \"\", \"" . XOOPS_URL . "\")'");
+            $imageSelect3->setDescription(_CO_PUBLISHER_IMAGE_ITEM_DSC);
+            $this->addElement($imageSelect3);
 
-            $image_preview = new XoopsFormLabel(_CO_PUBLISHER_IMAGE_PREVIEW, "<img width='500' src='" . XOOPS_URL . "/uploads/" . $imageforpath . "' name='image_display' id='image_display' alt='' />");
+            $image_preview = new XoopsFormLabel(_CO_PUBLISHER_IMAGE_PREVIEW, "<img width='500' src='" . XOOPS_URL . '/uploads/' . $imageforpath . "' name='image_display' id='image_display' alt='' />");
             $this->addElement($image_preview);
         }
 
@@ -491,41 +480,41 @@ public function createElements($obj)
         // File upload UPLOAD
         if ($this->isGranted(PublisherConstantsInterface::PUBLISHER_ITEM_UPLOAD_FILE)) {
             // NAME
-            $name_text = new XoopsFormText(_CO_PUBLISHER_FILENAME, 'item_file_name', 50, 255, '');
-            $name_text->setDescription(_CO_PUBLISHER_FILE_NAME_DSC);
-            $this->addElement($name_text);
-            unset($name_text);
+            $nameText = new XoopsFormText(_CO_PUBLISHER_FILENAME, 'item_file_name', 50, 255, '');
+            $nameText->setDescription(_CO_PUBLISHER_FILE_NAME_DSC);
+            $this->addElement($nameText);
+            unset($nameText);
 
             // DESCRIPTION
-            $description_text = new XoopsFormTextArea(_CO_PUBLISHER_FILE_DESCRIPTION, 'item_file_description', '');
-            $description_text->setDescription(_CO_PUBLISHER_FILE_DESCRIPTION_DSC);
-            $this->addElement($description_text);
-            unset($description_text);
-
-            $status_select = new XoopsFormRadioYN(_CO_PUBLISHER_FILE_STATUS, 'item_file_status', 1); //1 - active
-            $status_select->setDescription(_CO_PUBLISHER_FILE_STATUS_DSC);
-            $this->addElement($status_select);
-            unset($status_select);
-
-            $file_box = new XoopsFormFile(_CO_PUBLISHER_ITEM_UPLOAD_FILE, "item_upload_file", 0);
-            $file_box->setDescription(_CO_PUBLISHER_ITEM_UPLOAD_FILE_DSC);
-            $file_box->setExtra("size ='50'");
-            $this->addElement($file_box);
-            unset($file_box);
+            $descriptionText = new XoopsFormTextArea(_CO_PUBLISHER_FILE_DESCRIPTION, 'item_file_description', '');
+            $descriptionText->setDescription(_CO_PUBLISHER_FILE_DESCRIPTION_DSC);
+            $this->addElement($descriptionText);
+            unset($descriptionText);
+
+            $statusSelect = new XoopsFormRadioYN(_CO_PUBLISHER_FILE_STATUS, 'item_file_status', 1); //1 - active
+            $statusSelect->setDescription(_CO_PUBLISHER_FILE_STATUS_DSC);
+            $this->addElement($statusSelect);
+            unset($statusSelect);
+
+            $fileBox = new XoopsFormFile(_CO_PUBLISHER_ITEM_UPLOAD_FILE, 'item_upload_file', 0);
+            $fileBox->setDescription(_CO_PUBLISHER_ITEM_UPLOAD_FILE_DSC);
+            $fileBox->setExtra("size ='50'");
+            $this->addElement($fileBox);
+            unset($fileBox);
 
             if (!$obj->isNew()) {
-                $filesObj = $publisher->getHandler('file')->getAllFiles($obj->itemid());
+                $filesObj =& $publisher->getHandler('file')->getAllFiles($obj->itemid());
                 if (count($filesObj) > 0) {
                     $table = '';
                     $table .= "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
-                    $table .= "<tr>";
+                    $table .= '<tr>';
                     $table .= "<td width='50' class='bg3' align='center'><strong>ID</strong></td>";
-                    $table .= "<td width='150' class='bg3' align='left'><strong>" . _AM_PUBLISHER_FILENAME . "</strong></td>";
-                    $table .= "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_DESCRIPTION . "</strong></td>";
-                    $table .= "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_HITS . "</strong></td>";
-                    $table .= "<td width='100' class='bg3' align='center'><strong>" . _AM_PUBLISHER_UPLOADED_DATE . "</strong></td>";
-                    $table .= "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
-                    $table .= "</tr>";
+                    $table .= "<td width='150' class='bg3' align='left'><strong>" . _AM_PUBLISHER_FILENAME . '</strong></td>';
+                    $table .= "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_DESCRIPTION . '</strong></td>';
+                    $table .= "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_HITS . '</strong></td>';
+                    $table .= "<td width='100' class='bg3' align='center'><strong>" . _AM_PUBLISHER_UPLOADED_DATE . '</strong></td>';
+                    $table .= "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+                    $table .= '</tr>';
 
                     foreach ($filesObj as $fileObj) {
                         $modify = "<a href='file.php?op=mod&fileid=" . $fileObj->fileid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/edit.gif' title='" . _CO_PUBLISHER_EDITFILE . "' alt='" . _CO_PUBLISHER_EDITFILE . "' /></a>";
@@ -535,16 +524,16 @@ public function createElements($obj)
                         } else {
                             $not_visible = '';
                         }
-                        $table .= "<tr>";
-                        $table .= "<td class='head' align='center'>" . $fileObj->getVar('fileid') . "</td>";
-                        $table .= "<td class='odd' align='left'>" . $not_visible . $fileObj->getFileLink() . "</td>";
-                        $table .= "<td class='even' align='left'>" . $fileObj->description() . "</td>";
-                        $table .= "<td class='even' align='center'>" . $fileObj->counter() . "";
-                        $table .= "<td class='even' align='center'>" . $fileObj->datesub() . "</td>";
+                        $table .= '<tr>';
+                        $table .= "<td class='head' align='center'>" . $fileObj->getVar('fileid') . '</td>';
+                        $table .= "<td class='odd' align='left'>" . $not_visible . $fileObj->getFileLink() . '</td>';
+                        $table .= "<td class='even' align='left'>" . $fileObj->description() . '</td>';
+                        $table .= "<td class='even' align='center'>" . $fileObj->counter() . '';
+                        $table .= "<td class='even' align='center'>" . $fileObj->getDatesub() . '</td>';
                         $table .= "<td class='even' align='center'> $modify $delete </td>";
-                        $table .= "</tr>";
+                        $table .= '</tr>';
                     }
-                    $table .= "</table>";
+                    $table .= '</table>';
 
                     $files_box = new XoopsFormLabel(_CO_PUBLISHER_FILES_LINKED, $table);
                     $this->addElement($files_box);
diff --git a/publisher/class/formdatetime.php b/publisher/class/formdatetime.php
index 5bae790f..85db8dd9 100644
--- a/publisher/class/formdatetime.php
+++ b/publisher/class/formdatetime.php
@@ -28,21 +28,27 @@
 class PublisherFormDateTime extends XoopsFormElementTray
 {
     /**
-     * @param     $caption
-     * @param     $name
-     * @param int $size
-     * @param int $value
+     * @param      $caption
+     * @param      $name
+     * @param int  $size
+     * @param int  $value
+     * @param bool $showtime
+     * @param bool $formatTimestamp
      */
-    public function __construct($caption, $name, $size = 15, $value = 0)
+    public function __construct($caption, $name, $size = 15, $value = 0, $showtime = true, $formatTimestamp = true)
     {
         parent::__construct($caption, '&nbsp;');
-        $value    = (int)($value);
-        $value    = ($value > 0) ? $value : time();
-        $datetime = getDate($value);
-        $this->addElement(new XoopsFormTextDateSelect('', $name . '[date]', $size, $value));
+        $value = (int)($value);
+        $value = ($value > 0) ? $value : time();
+        if ($formatTimestamp) {
+            $value = strtotime(formatTimestamp($value));
+        }
+        $datetime = getdate($value);
+
+        $this->addElement(new XoopsFormTextDateSelect('', $name . '[date]', $size, $value, $showtime));
         $timearray = array();
         for ($i = 0; $i < 24; ++$i) {
-            for ($j = 0; $j < 60; $j = $j + 10) {
+            for ($j = 0; $j < 60; $j += 10) {
                 $key             = ($i * 3600) + ($j * 60);
                 $timearray[$key] = ($j != 0) ? $i . ':' . $j : $i . ':0' . $j;
             }
diff --git a/publisher/class/groupperm.php b/publisher/class/groupperm.php
index e53dcc43..ce3d01fc 100644
--- a/publisher/class/groupperm.php
+++ b/publisher/class/groupperm.php
@@ -34,29 +34,29 @@ class PublisherGroupPermHandler extends XoopsGroupPermHandler
     /**
      * Check permission
      *
-     * @param string     $gperm_name    Name of permission
-     * @param int        $gperm_itemid  ID of an item
-     * @param int /array $gperm_groupid A group ID or an array of group IDs
-     * @param int        $gperm_modid   ID of a module
+     * @param string $gpermName   Name of permission
+     * @param int    $gpermItemId ID of an item
+     * @param        int           /array $gpermGroupId A group ID or an array of group IDs
+     * @param int    $gpermModId  ID of a module
      *
      * @return bool TRUE if permission is enabled
      */
-    public function checkRight($gperm_name, $gperm_itemid, $gperm_groupid, $gperm_modid = 1)
+    public function checkRight($gpermName, $gpermItemId, $gpermGroupId, $gpermModId = 1)
     {
-        $criteria = new CriteriaCompo(new Criteria('gperm_modid', $gperm_modid));
-        $criteria->add(new Criteria('gperm_name', $gperm_name));
-        $gperm_itemid = (int)($gperm_itemid);
-        if ($gperm_itemid > 0) {
-            $criteria->add(new Criteria('gperm_itemid', $gperm_itemid));
+        $criteria = new CriteriaCompo(new Criteria('gperm_modid', $gpermModId));
+        $criteria->add(new Criteria('gperm_name', $gpermName));
+        $gpermItemId = (int)($gpermItemId);
+        if ($gpermItemId > 0) {
+            $criteria->add(new Criteria('gperm_itemid', $gpermItemId));
         }
-        if (is_array($gperm_groupid)) {
+        if (is_array($gpermGroupId)) {
             $criteria2 = new CriteriaCompo();
-            foreach ($gperm_groupid as $gid) {
+            foreach ($gpermGroupId as $gid) {
                 $criteria2->add(new Criteria('gperm_groupid', $gid), 'OR');
             }
             $criteria->add($criteria2);
         } else {
-            $criteria->add(new Criteria('gperm_groupid', $gperm_groupid));
+            $criteria->add(new Criteria('gperm_groupid', $gpermGroupId));
         }
         if ($this->getCount($criteria) > 0) {
             return true;
diff --git a/publisher/class/highlighter.php b/publisher/class/highlighter.php
index e451ed01..374758c5 100644
--- a/publisher/class/highlighter.php
+++ b/publisher/class/highlighter.php
@@ -111,29 +111,29 @@ public function highlight($text, $needle)
         // Select pattern to use
         if ($this->simple) {
             $pattern    = '#(%s)#';
-            $sl_pattern = '#(%s)#';
+            $slPattern = '#(%s)#';
         } else {
             $pattern    = '#(?!<.*?)(%s)(?![^<>]*?>)#';
-            $sl_pattern = '#<a\s(?:.*?)>(%s)</a>#';
+            $slPattern = '#<a\s(?:.*?)>(%s)</a>#';
         }
         // Case sensitivity
         if (!$this->caseSens) {
             $pattern .= 'i';
-            $sl_pattern .= 'i';
+            $slPattern .= 'i';
         }
         $needle = (array)$needle;
-        foreach ($needle as $needle_s) {
-            $needle_s = preg_quote($needle_s);
+        foreach ($needle as $needleS) {
+            $needleS = preg_quote($needleS);
             // Escape needle with optional whole word check
             if ($this->wholeWords) {
-                $needle_s = '\b' . $needle_s . '\b';
+                $needleS = '\b' . $needleS . '\b';
             }
             // Strip links
             if ($this->stripLinks) {
-                $sl_regex = sprintf($sl_pattern, $needle_s);
-                $text     = preg_replace($sl_regex, '\1', $text);
+                $slRegex = sprintf($slPattern, $needleS);
+                $text     = preg_replace($slRegex, '\1', $text);
             }
-            $regex = sprintf($pattern, $needle_s);
+            $regex = sprintf($pattern, $needleS);
             $text  = preg_replace($regex, $this->replacementString, $text);
         }
 
diff --git a/publisher/class/item.php b/publisher/class/item.php
index a474f7d3..e054b30d 100644
--- a/publisher/class/item.php
+++ b/publisher/class/item.php
@@ -32,52 +32,52 @@ class PublisherItem extends XoopsObject
      * @var PublisherPublisher
      * @access public
      */
-    public $publisher   = null;
+    public $publisher;
     public $groupsRead = array();
 
     /**
      * @var PublisherCategory
      * @access public
      */
-    public $category = null;
+    public $category;
 
     /**
      * @param int|null $id
      */
     public function __construct($id = null)
     {
-        $this->publisher = PublisherPublisher::getInstance();
-        $this->db        = XoopsDatabaseFactory::getDatabaseConnection();
-        $this->initVar("itemid", XOBJ_DTYPE_INT, 0);
-        $this->initVar("categoryid", XOBJ_DTYPE_INT, 0, false);
-        $this->initVar("title", XOBJ_DTYPE_TXTBOX, '', true, 255);
-        $this->initVar("subtitle", XOBJ_DTYPE_TXTBOX, '', false, 255);
-        $this->initVar("summary", XOBJ_DTYPE_TXTAREA, '', false);
-        $this->initVar("body", XOBJ_DTYPE_TXTAREA, '', false);
-        $this->initVar("uid", XOBJ_DTYPE_INT, 0, false);
-        $this->initVar("author_alias", XOBJ_DTYPE_TXTBOX, '', false, 255);
-        $this->initVar("datesub", XOBJ_DTYPE_INT, '', false);
-        $this->initVar("status", XOBJ_DTYPE_INT, -1, false);
-        $this->initVar("image", XOBJ_DTYPE_INT, 0, false);
-        $this->initVar("images", XOBJ_DTYPE_TXTBOX, '', false, 255);
-        $this->initVar("counter", XOBJ_DTYPE_INT, 0, false);
-        $this->initVar("rating", XOBJ_DTYPE_OTHER, 0, false);
-        $this->initVar("votes", XOBJ_DTYPE_INT, 0, false);
-        $this->initVar("weight", XOBJ_DTYPE_INT, 0, false);
-        $this->initVar("dohtml", XOBJ_DTYPE_INT, 1, true);
-        $this->initVar("dosmiley", XOBJ_DTYPE_INT, 1, true);
-        $this->initVar("doimage", XOBJ_DTYPE_INT, 1, true);
-        $this->initVar("dobr", XOBJ_DTYPE_INT, 1, false);
-        $this->initVar("doxcode", XOBJ_DTYPE_INT, 1, true);
-        $this->initVar("cancomment", XOBJ_DTYPE_INT, 1, true);
-        $this->initVar("comments", XOBJ_DTYPE_INT, 0, false);
-        $this->initVar("notifypub", XOBJ_DTYPE_INT, 1, false);
-        $this->initVar("meta_keywords", XOBJ_DTYPE_TXTAREA, '', false);
-        $this->initVar("meta_description", XOBJ_DTYPE_TXTAREA, '', false);
-        $this->initVar("short_url", XOBJ_DTYPE_TXTBOX, '', false, 255);
-        $this->initVar("item_tag", XOBJ_DTYPE_TXTAREA, '', false);
+        $this->publisher =& PublisherPublisher::getInstance();
+        $this->db        =& XoopsDatabaseFactory::getDatabaseConnection();
+        $this->initVar('itemid', XOBJ_DTYPE_INT, 0);
+        $this->initVar('categoryid', XOBJ_DTYPE_INT, 0, false);
+        $this->initVar('title', XOBJ_DTYPE_TXTBOX, '', true, 255);
+        $this->initVar('subtitle', XOBJ_DTYPE_TXTBOX, '', false, 255);
+        $this->initVar('summary', XOBJ_DTYPE_TXTAREA, '', false);
+        $this->initVar('body', XOBJ_DTYPE_TXTAREA, '', false);
+        $this->initVar('uid', XOBJ_DTYPE_INT, 0, false);
+        $this->initVar('author_alias', XOBJ_DTYPE_TXTBOX, '', false, 255);
+        $this->initVar('datesub', XOBJ_DTYPE_INT, '', false);
+        $this->initVar('status', XOBJ_DTYPE_INT, -1, false);
+        $this->initVar('image', XOBJ_DTYPE_INT, 0, false);
+        $this->initVar('images', XOBJ_DTYPE_TXTBOX, '', false, 255);
+        $this->initVar('counter', XOBJ_DTYPE_INT, 0, false);
+        $this->initVar('rating', XOBJ_DTYPE_OTHER, 0, false);
+        $this->initVar('votes', XOBJ_DTYPE_INT, 0, false);
+        $this->initVar('weight', XOBJ_DTYPE_INT, 0, false);
+        $this->initVar('dohtml', XOBJ_DTYPE_INT, 1, true);
+        $this->initVar('dosmiley', XOBJ_DTYPE_INT, 1, true);
+        $this->initVar('doimage', XOBJ_DTYPE_INT, 1, true);
+        $this->initVar('dobr', XOBJ_DTYPE_INT, 1, false);
+        $this->initVar('doxcode', XOBJ_DTYPE_INT, 1, true);
+        $this->initVar('cancomment', XOBJ_DTYPE_INT, 1, true);
+        $this->initVar('comments', XOBJ_DTYPE_INT, 0, false);
+        $this->initVar('notifypub', XOBJ_DTYPE_INT, 1, false);
+        $this->initVar('meta_keywords', XOBJ_DTYPE_TXTAREA, '', false);
+        $this->initVar('meta_description', XOBJ_DTYPE_TXTAREA, '', false);
+        $this->initVar('short_url', XOBJ_DTYPE_TXTBOX, '', false, 255);
+        $this->initVar('item_tag', XOBJ_DTYPE_TXTAREA, '', false);
         // Non consistent values
-        $this->initVar("pagescount", XOBJ_DTYPE_INT, 0, false);
+        $this->initVar('pagescount', XOBJ_DTYPE_INT, 0, false);
         if (isset($id)) {
             $item = $this->publisher->getHandler('item')->get($id);
             foreach ($item->vars as $k => $v) {
@@ -102,7 +102,7 @@ public function __call($method, $args)
     /**
      * @return null|PublisherCategory
      */
-    public function category()
+    public function getCategory()
     {
         if (!isset($this->category)) {
             $this->category = $this->publisher->getHandler('category')->get($this->getVar('categoryid'));
@@ -117,9 +117,9 @@ public function category()
      *
      * @return mixed|string
      */
-    public function title($maxLength = 0, $format = "S")
+    public function getTitle($maxLength = 0, $format = 'S')
     {
-        $ret = $this->getVar("title", $format);
+        $ret = $this->getVar('title', $format);
         if ($maxLength != 0) {
             if (!XOOPS_USE_MULTIBYTES) {
                 if (strlen($ret) >= $maxLength) {
@@ -137,9 +137,9 @@ public function title($maxLength = 0, $format = "S")
      *
      * @return mixed|string
      */
-    public function subtitle($maxLength = 0, $format = "S")
+    public function getSubtitle($maxLength = 0, $format = 'S')
     {
-        $ret = $this->getVar("subtitle", $format);
+        $ret = $this->getVar('subtitle', $format);
         if ($maxLength != 0) {
             if (!XOOPS_USE_MULTIBYTES) {
                 if (strlen($ret) >= $maxLength) {
@@ -158,9 +158,9 @@ public function subtitle($maxLength = 0, $format = "S")
      *
      * @return mixed|string
      */
-    public function summary($maxLength = 0, $format = "S", $stripTags = '')
+    public function getSummary($maxLength = 0, $format = 'S', $stripTags = '')
     {
-        $ret = $this->getVar("summary", $format);
+        $ret = $this->getVar('summary', $format);
         if (!empty($stripTags)) {
             $ret = strip_tags($ret, $stripTags);
         }
@@ -168,7 +168,7 @@ public function summary($maxLength = 0, $format = "S", $stripTags = '')
             if (!XOOPS_USE_MULTIBYTES) {
                 if (strlen($ret) >= $maxLength) {
                     //$ret = publisherSubstr($ret , 0, $maxLength);
-                    $ret = publisherTruncateTagSafe($ret, $maxLength, $etc = '...', $break_words = false);
+                    $ret = publisherTruncateTagSafe($ret, $maxLength, $etc = '...', $breakWords = false);
                 }
             }
         }
@@ -185,27 +185,27 @@ public function summary($maxLength = 0, $format = "S", $stripTags = '')
     public function getBlockSummary($maxLength = 0, $fullSummary = false)
     {
         if ($fullSummary) {
-            $ret = $this->summary(0, 's', '<br></ br>');
+            $ret = $this->getSummary(0, 's', '<br><br>');
         } else {
-            $ret = $this->summary($maxLength, 's', '<br></ br>');
+            $ret = $this->getSummary($maxLength, 's', '<br><br>');
         }
         //no summary? get body!
-        if (strlen($ret) == 0) {
-            $ret = $this->body($maxLength, 's', '<br></ br>');
+        if ('' === ($ret)) {
+            $ret = $this->getBody($maxLength, 's', '<br><br>');
         }
 
         return $ret;
     }
 
     /**
-     * @param string $file_name
+     * @param string $fileName
      *
      * @return string
      */
-    public function wrappage($file_name)
+    public function wrapPage($fileName)
     {
         $content = '';
-        $page    = publisherGetUploadDir(true, 'content') . $file_name;
+        $page    = publisherGetUploadDir(true, 'content') . $fileName;
         if (file_exists($page)) {
             // this page uses smarty template
             ob_start();
@@ -213,10 +213,10 @@ public function wrappage($file_name)
             $content = ob_get_contents();
             ob_end_clean();
             // Cleaning the content
-            $body_start_pos = strpos($content, '<body>');
-            if ($body_start_pos) {
-                $body_end_pos = strpos($content, '</body>', $body_start_pos);
-                $content      = substr($content, $body_start_pos + strlen('<body>'), $body_end_pos - strlen('<body>') - $body_start_pos);
+            $bodyStartPos = strpos($content, '<body>');
+            if ($bodyStartPos) {
+                $bodyEndPos = strpos($content, '</body>', $bodyStartPos);
+                $content    = substr($content, $bodyStartPos + strlen('<body>'), $bodyEndPos - strlen('<body>') - $bodyStartPos);
             }
             // Check if ML Hack is installed, and if yes, parse the $content in formatForML
             $myts = MyTextSanitizer::getInstance();
@@ -237,30 +237,30 @@ public function wrappage($file_name)
      *
      * @return mixed|string
      */
-    public function body($maxLength = 0, $format = 'S', $stripTags = '')
-    {
-        $ret      = $this->getVar('body', $format);
-        $wrap_pos = strpos($ret, '[pagewrap=');
-        if (!($wrap_pos === false)) {
-            $wrap_pages       = array();
-            $wrap_code_length = strlen('[pagewrap=');
-            while (!($wrap_pos === false)) {
-                $end_wrap_pos = strpos($ret, ']', $wrap_pos);
-                if ($end_wrap_pos) {
-                    $wrap_page_name = substr($ret, $wrap_pos + $wrap_code_length, $end_wrap_pos - $wrap_code_length - $wrap_pos);
-                    $wrap_pages[]   = $wrap_page_name;
+    public function getBody($maxLength = 0, $format = 'S', $stripTags = '')
+    {
+        $ret     = $this->getVar('body', $format);
+        $wrapPos = strpos($ret, '[pagewrap=');
+        if (!($wrapPos === false)) {
+            $wrapPages       = array();
+            $wrapCodeLength = strlen('[pagewrap=');
+            while (!($wrapPos === false)) {
+                $endWrapPos = strpos($ret, ']', $wrapPos);
+                if ($endWrapPos) {
+                    $wrap_page_name = substr($ret, $wrapPos + $wrapCodeLength, $endWrapPos - $wrapCodeLength - $wrapPos);
+                    $wrapPages[]    = $wrap_page_name;
                 }
-                $wrap_pos = strpos($ret, '[pagewrap=', $end_wrap_pos - 1);
+                $wrapPos = strpos($ret, '[pagewrap=', $endWrapPos - 1);
             }
-            foreach ($wrap_pages as $page) {
-                $wrap_page_content = $this->wrappage($page);
-                $ret               = str_replace("[pagewrap={$page}]", $wrap_page_content, $ret);
+            foreach ($wrapPages as $page) {
+                $wrapPageContent = $this->wrapPage($page);
+                $ret               = str_replace("[pagewrap={$page}]", $wrapPageContent, $ret);
             }
         }
         if ($this->publisher->getConfig('item_disp_blocks_summary')) {
-            $summary = $this->summary($maxLength, $format, $stripTags);
+            $summary = $this->getSummary($maxLength, $format, $stripTags);
             if ($summary) {
-                $ret = $this->summary() . $ret;
+                $ret = $this->getSummary() . $ret;
             }
         }
         if (!empty($stripTags)) {
@@ -270,7 +270,7 @@ public function body($maxLength = 0, $format = 'S', $stripTags = '')
             if (!XOOPS_USE_MULTIBYTES) {
                 if (strlen($ret) >= $maxLength) {
                     //$ret = publisherSubstr($ret , 0, $maxLength);
-                    $ret = publisherTruncateTagSafe($ret, $maxLength, $etc = '...', $break_words = false);
+                    $ret = publisherTruncateTagSafe($ret, $maxLength, $etc = '...', $breakWords = false);
                 }
             }
         }
@@ -284,14 +284,14 @@ public function body($maxLength = 0, $format = 'S', $stripTags = '')
      *
      * @return string
      */
-    public function datesub($dateFormat = '', $format = 'S')
+    public function getDatesub($dateFormat = '', $format = 'S')
     {
         if (empty($dateformat)) {
             $dateFormat = $this->publisher->getConfig('format_date');
         }
-        xoops_load('XoopsLocal');
-
-        return XoopsLocal::formatTimestamp($this->getVar('datesub', $format), $dateFormat);
+        //mb        xoops_load('XoopsLocal');
+        //mb        return XoopsLocal::formatTimestamp($this->getVar('datesub', $format), $dateFormat);
+        return formatTimestamp($this->getVar('datesub', $format), $dateFormat);
     }
 
     /**
@@ -318,9 +318,9 @@ public function posterName($realName = -1)
      */
     public function posterAvatar()
     {
-        $ret            = 'blank.gif';
-        $member_handler = xoops_gethandler('member');
-        $thisUser       = $member_handler->getUser($this->uid());
+        $ret           = 'blank.gif';
+        $memberHandler =& xoops_getHandler('member');
+        $thisUser      = $memberHandler->getUser($this->uid());
         if (is_object($thisUser)) {
             $ret = $thisUser->getVar('user_avatar');
         }
@@ -331,7 +331,7 @@ public function posterAvatar()
     /**
      * @return string
      */
-    public function linkedPosterName()
+    public function getLinkedPosterName()
     {
         xoops_load('XoopsUserUtility');
         $ret = $this->author_alias();
@@ -363,12 +363,12 @@ public function store($force = true)
         }
         if ($isNew && $this->status() == PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED) {
             // Increment user posts
-            $user_handler   = xoops_gethandler('user');
-            $member_handler = xoops_gethandler('member');
-            $poster         = $user_handler->get($this->uid());
+            $userHandler   =& xoops_getHandler('user');
+            $memberHandler =& xoops_getHandler('member');
+            $poster        = $userHandler->get($this->uid());
             if (is_object($poster) && !$poster->isNew()) {
                 $poster->setVar('posts', $poster->getVar('posts') + 1);
-                if (!$member_handler->insertUser($poster, true)) {
+                if (!$memberHandler->insertUser($poster, true)) {
                     $this->setErrors('Article created but could not increment user posts.');
 
                     return false;
@@ -384,7 +384,7 @@ public function store($force = true)
      */
     public function getCategoryName()
     {
-        return $this->category()->name();
+        return $this->getCategory()->name();
     }
 
     /**
@@ -392,7 +392,7 @@ public function getCategoryName()
      */
     public function getCategoryUrl()
     {
-        return $this->category()->getCategoryUrl();
+        return $this->getCategory()->getCategoryUrl();
     }
 
     /**
@@ -400,7 +400,7 @@ public function getCategoryUrl()
      */
     public function getCategoryLink()
     {
-        return $this->category()->getCategoryLink();
+        return $this->getCategory()->getCategoryLink();
     }
 
     /**
@@ -410,7 +410,7 @@ public function getCategoryLink()
      */
     public function getCategoryPath($withAllLink = true)
     {
-        return $this->category()->getCategoryPath($withAllLink);
+        return $this->getCategory()->getCategoryPath($withAllLink);
     }
 
     /**
@@ -418,7 +418,7 @@ public function getCategoryPath($withAllLink = true)
      */
     public function getCategoryImagePath()
     {
-        return publisherGetImageDir('category', false) . $this->category()->image();
+        return publisherGetImageDir('category', false) . $this->getCategory()->getImage();
     }
 
     /**
@@ -439,36 +439,36 @@ public function getAdminLinks()
             if (publisherUserIsAdmin() || publisherUserIsAuthor($this) || publisherUserIsModerator($this)) {
                 if ($this->publisher->getConfig('perm_edit') || publisherUserIsModerator($this) || publisherUserIsAdmin()) {
                     // Edit button
-                    $adminLinks .= "<a href='" . PUBLISHER_URL . "/submit.php?itemid=" . $this->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/edit.gif'" . " title='" . _CO_PUBLISHER_EDIT . "' alt='" . _CO_PUBLISHER_EDIT . "'/></a>";
-                    $adminLinks .= " ";
+                    $adminLinks .= "<a href='" . PUBLISHER_URL . '/submit.php?itemid=' . $this->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/edit.gif'" . " title='" . _CO_PUBLISHER_EDIT . "' alt='" . _CO_PUBLISHER_EDIT . "'/></a>";
+                    $adminLinks .= ' ';
                 }
                 if ($this->publisher->getConfig('perm_delete') || publisherUserIsModerator($this) || publisherUserIsAdmin()) {
                     // Delete button
-                    $adminLinks .= "<a href='" . PUBLISHER_URL . "/submit.php?op=del&amp;itemid=" . $this->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/delete.png'" . " title='" . _CO_PUBLISHER_DELETE . "' alt='" . _CO_PUBLISHER_DELETE . "' /></a>";
-                    $adminLinks .= " ";
+                    $adminLinks .= "<a href='" . PUBLISHER_URL . '/submit.php?op=del&amp;itemid=' . $this->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/delete.png'" . " title='" . _CO_PUBLISHER_DELETE . "' alt='" . _CO_PUBLISHER_DELETE . "' /></a>";
+                    $adminLinks .= ' ';
                 }
             }
             if ($this->publisher->getConfig('perm_clone') || publisherUserIsModerator($this) || publisherUserIsAdmin()) {
                 // Duplicate button
-                $adminLinks .= "<a href='" . PUBLISHER_URL . "/submit.php?op=clone&amp;itemid=" . $this->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/clone.gif'" . " title='" . _CO_PUBLISHER_CLONE . "' alt='" . _CO_PUBLISHER_CLONE . "' /></a>";
-                $adminLinks .= " ";
+                $adminLinks .= "<a href='" . PUBLISHER_URL . '/submit.php?op=clone&amp;itemid=' . $this->itemid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/clone.gif'" . " title='" . _CO_PUBLISHER_CLONE . "' alt='" . _CO_PUBLISHER_CLONE . "' /></a>";
+                $adminLinks .= ' ';
             }
         }
         if ($this->publisher->getConfig('display_pdf')) {
             // PDF button
-            $adminLinks .= "<a href='" . PUBLISHER_URL . "/makepdf.php?itemid=" . $this->itemid() . "' rel='nofollow' target='_blank'><img src='" . PUBLISHER_URL . "/assets/images/links/pdf.gif' title='" . _CO_PUBLISHER_PDF . "' alt='" . _CO_PUBLISHER_PDF . "' /></a>";
-            $adminLinks .= " ";
+            $adminLinks .= "<a href='" . PUBLISHER_URL . '/makepdf.php?itemid=' . $this->itemid() . "' rel='nofollow' target='_blank'><img src='" . PUBLISHER_URL . "/assets/images/links/pdf.gif' title='" . _CO_PUBLISHER_PDF . "' alt='" . _CO_PUBLISHER_PDF . "' /></a>";
+            $adminLinks .= ' ';
         }
         // Print button
-        $adminLinks .= "<a href='" . PublisherSeo::generateUrl("print", $this->itemid(), $this->short_url()) . "' rel='nofollow' target='_blank'><img src='" . PUBLISHER_URL . "/assets/images/links/print.gif' title='" . _CO_PUBLISHER_PRINT . "' alt='" . _CO_PUBLISHER_PRINT . "' /></a>";
-        $adminLinks .= " ";
+        $adminLinks .= "<a href='" . PublisherSeo::generateUrl('print', $this->itemid(), $this->short_url()) . "' rel='nofollow' target='_blank'><img src='" . PUBLISHER_URL . "/assets/images/links/print.gif' title='" . _CO_PUBLISHER_PRINT . "' alt='" . _CO_PUBLISHER_PRINT . "' /></a>";
+        $adminLinks .= ' ';
         // Email button
         if (xoops_isActiveModule('tellafriend')) {
             $subject  = sprintf(_CO_PUBLISHER_INTITEMFOUND, $GLOBALS['xoopsConfig']['sitename']);
             $subject  = $this->convertForJapanese($subject);
             $maillink = publisherTellAFriend($subject);
             $adminLinks .= '<a href="' . $maillink . '"><img src="' . PUBLISHER_URL . '/assets/images/links/friend.gif" title="' . _CO_PUBLISHER_MAIL . '" alt="' . _CO_PUBLISHER_MAIL . '" /></a>';
-            $adminLinks .= " ";
+            $adminLinks .= ' ';
         }
 
         return $adminLinks;
@@ -479,30 +479,30 @@ public function getAdminLinks()
      */
     public function sendNotifications($notifications = array())
     {
-        $notification_handler  = xoops_gethandler('notification');
+        $notificationHandler   =& xoops_getHandler('notification');
         $tags                  = array();
         $tags['MODULE_NAME']   = $this->publisher->getModule()->getVar('name');
-        $tags['ITEM_NAME']     = $this->title();
+        $tags['ITEM_NAME']     = $this->getTitle();
         $tags['ITEM_NAME']     = $this->subtitle();
         $tags['CATEGORY_NAME'] = $this->getCategoryName();
         $tags['CATEGORY_URL']  = PUBLISHER_URL . '/category.php?categoryid=' . $this->categoryid();
         $tags['ITEM_BODY']     = $this->body();
-        $tags['DATESUB']       = $this->datesub();
+        $tags['DATESUB']       = $this->getDatesub();
         foreach ($notifications as $notification) {
             switch ($notification) {
-                case PublisherConstantsInterface::PUBLISHER_NOT_ITEM_PUBLISHED:
+                case PublisherConstantsInterface::PUBLISHER_NOTIFY_ITEM_PUBLISHED:
                     $tags['ITEM_URL'] = PUBLISHER_URL . '/item.php?itemid=' . $this->itemid();
-                    $notification_handler->triggerEvent('global_item', 0, 'published', $tags, array(), $this->publisher->getModule()->getVar('mid'));
-                    $notification_handler->triggerEvent('category_item', $this->categoryid(), 'published', $tags, array(), $this->publisher->getModule()->getVar('mid'));
-                    $notification_handler->triggerEvent('item', $this->itemid(), 'approved', $tags, array(), $this->publisher->getModule()->getVar('mid'));
+                    $notificationHandler->triggerEvent('global_item', 0, 'published', $tags, array(), $this->publisher->getModule()->getVar('mid'));
+                    $notificationHandler->triggerEvent('category_item', $this->categoryid(), 'published', $tags, array(), $this->publisher->getModule()->getVar('mid'));
+                    $notificationHandler->triggerEvent('item', $this->itemid(), 'approved', $tags, array(), $this->publisher->getModule()->getVar('mid'));
                     break;
-                case PublisherConstantsInterface::PUBLISHER_NOT_ITEM_SUBMITTED:
+                case PublisherConstantsInterface::PUBLISHER_NOTIFY_ITEM_SUBMITTED:
                     $tags['WAITINGFILES_URL'] = PUBLISHER_URL . '/admin/item.php?itemid=' . $this->itemid();
-                    $notification_handler->triggerEvent('global_item', 0, 'submitted', $tags, array(), $this->publisher->getModule()->getVar('mid'));
-                    $notification_handler->triggerEvent('category_item', $this->categoryid(), 'submitted', $tags, array(), $this->publisher->getModule()->getVar('mid'));
+                    $notificationHandler->triggerEvent('global_item', 0, 'submitted', $tags, array(), $this->publisher->getModule()->getVar('mid'));
+                    $notificationHandler->triggerEvent('category_item', $this->categoryid(), 'submitted', $tags, array(), $this->publisher->getModule()->getVar('mid'));
                     break;
-                case PublisherConstantsInterface::PUBLISHER_NOT_ITEM_REJECTED:
-                    $notification_handler->triggerEvent('item', $this->itemid(), 'rejected', $tags, array(), $this->publisher->getModule()->getVar('mid'));
+                case PublisherConstantsInterface::PUBLISHER_NOTIFY_ITEM_REJECTED:
+                    $notificationHandler->triggerEvent('item', $this->itemid(), 'rejected', $tags, array(), $this->publisher->getModule()->getVar('mid'));
                     break;
                 case -1:
                 default:
@@ -516,31 +516,31 @@ public function sendNotifications($notifications = array())
      */
     public function setDefaultPermissions()
     {
-        $member_handler = xoops_gethandler('member');
-        $groups         = $member_handler->getGroupList();
-        $j              = 0;
-        $group_ids      = array();
+        $memberHandler =& xoops_getHandler('member');
+        $groups        = $memberHandler->getGroupList();
+        $j             = 0;
+        $groupIds      = array();
         foreach (array_keys($groups) as $i) {
-            $group_ids[$j] = $i;
+            $groupIds[$j] = $i;
             ++$j;
         }
-        $this->groupsRead = $group_ids;
+        $this->groupsRead = $groupIds;
     }
 
     /**
      * @todo look at this
      *
-     * @param $group_ids
+     * @param $groupIds
      */
-    public function setPermissions($group_ids)
+    public function setPermissions($groupIds)
     {
-        if (!isset($group_ids)) {
-            $member_handler = xoops_gethandler('member');
-            $groups         = $member_handler->getGroupList();
-            $j              = 0;
-            $group_ids      = array();
+        if (!isset($groupIds)) {
+            $memberHandler =& xoops_getHandler('member');
+            $groups        = $memberHandler->getGroupList();
+            $j             = 0;
+            $groupIds      = array();
             foreach (array_keys($groups) as $i) {
-                $group_ids[$j] = $i;
+                $groupIds[$j] = $i;
                 ++$j;
             }
         }
@@ -571,9 +571,9 @@ public function getItemUrl()
     public function getItemLink($class = false, $maxsize = 0)
     {
         if ($class) {
-            return '<a class=' . $class . ' href="' . $this->getItemUrl() . '">' . $this->title($maxsize) . '</a>';
+            return '<a class=' . $class . ' href="' . $this->getItemUrl() . '">' . $this->getTitle($maxsize) . '</a>';
         } else {
-            return '<a href="' . $this->getItemUrl() . '">' . $this->title($maxsize) . '</a>';
+            return '<a href="' . $this->getItemUrl() . '">' . $this->getTitle($maxsize) . '</a>';
         }
     }
 
@@ -582,8 +582,8 @@ public function getItemLink($class = false, $maxsize = 0)
      */
     public function getWhoAndWhen()
     {
-        $posterName = $this->linkedPosterName();
-        $postdate   = $this->datesub();
+        $posterName = $this->getLinkedPosterName();
+        $postdate   = $this->getDatesub();
 
         return sprintf(_CO_PUBLISHER_POSTEDBY, $posterName, $postdate);
     }
@@ -593,7 +593,7 @@ public function getWhoAndWhen()
      */
     public function getWho()
     {
-        $posterName = $this->linkedPosterName();
+        $posterName = $this->getLinkedPosterName();
 
         return $posterName;
     }
@@ -603,7 +603,7 @@ public function getWho()
      */
     public function getWhen()
     {
-        $postdate = $this->datesub();
+        $postdate = $this->getDatesub();
 
         return $postdate;
     }
@@ -625,31 +625,31 @@ public function plainMaintext($body = null)
     }
 
     /**
-     * @param int         $item_page_id
+     * @param int         $itemPageId
      * @param null|string $body
      *
      * @return string
      */
-    public function buildmaintext($item_page_id = -1, $body = null)
+    public function buildmaintext($itemPageId = -1, $body = null)
     {
         if (!$body) {
             $body = $this->body();
         }
-        $body_parts = explode('[pagebreak]', $body);
-        $this->setVar('pagescount', count($body_parts));
-        if (count($body_parts) <= 1) {
+        $bodyParts = explode('[pagebreak]', $body);
+        $this->setVar('pagescount', count($bodyParts));
+        if (count($bodyParts) <= 1) {
             return $this->plainMaintext($body);
         }
         $ret = '';
-        if ($item_page_id == -1) {
-            $ret .= trim($body_parts[0]);
+        if ($itemPageId == -1) {
+            $ret .= trim($bodyParts[0]);
 
             return $ret;
         }
-        if ($item_page_id >= count($body_parts)) {
-            $item_page_id = count($body_parts) - 1;
+        if ($itemPageId >= count($bodyParts)) {
+            $itemPageId = count($bodyParts) - 1;
         }
-        $ret .= trim($body_parts[$item_page_id]);
+        $ret .= trim($bodyParts[$itemPageId]);
 
         return $ret;
     }
@@ -664,20 +664,20 @@ public function getImages()
         if (!isset($ret[$itemid])) {
             $ret[$itemid]['main']   = '';
             $ret[$itemid]['others'] = array();
-            $images_ids             = array();
+            $imagesIds              = array();
             $image                  = $this->getVar('image');
             $images                 = $this->getVar('images');
             if ($images != '') {
-                $images_ids = explode('|', $images);
+                $imagesIds = explode('|', $images);
             }
             if ($image > 0) {
-                $images_ids = array_merge($images_ids, array($image));
+                $imagesIds = array_merge($imagesIds, array($image));
             }
             $imageObjs = array();
-            if (count($images_ids) > 0) {
-                $image_handler = xoops_gethandler('image');
-                $criteria      = new CriteriaCompo(new Criteria('image_id', '(' . implode(',', $images_ids) . ')', 'IN'));
-                $imageObjs     = $image_handler->getObjects($criteria, true);
+            if (count($imagesIds) > 0) {
+                $imageHandler =& xoops_getHandler('image');
+                $criteria     = new CriteriaCompo(new Criteria('image_id', '(' . implode(',', $imagesIds) . ')', 'IN'));
+                $imageObjs    = $imageHandler->getObjects($criteria, true);
                 unset($criteria);
             }
             foreach ($imageObjs as $id => $imageObj) {
@@ -704,17 +704,17 @@ public function getImages()
      */
     public function toArraySimple($display = 'default', $max_char_title = 0, $max_char_summary = 0, $fullSummary = false)
     {
-        $item_page_id = -1;
+        $itemPageId = -1;
         if (is_numeric($display)) {
-            $item_page_id = $display;
-            $display      = 'all';
+            $itemPageId = $display;
+            $display    = 'all';
         }
         $item['itemid']    = $this->itemid();
         $item['uid']       = $this->uid();
         $item['itemurl']   = $this->getItemUrl();
         $item['titlelink'] = $this->getItemLink('titlelink', $max_char_title);
         $item['subtitle']  = $this->subtitle();
-        $item['datesub']   = $this->datesub();
+        $item['datesub']   = $this->getDatesub();
         $item['counter']   = $this->counter();
         $item['who']       = $this->getWho();
         $item['when']      = $this->getWhen();
@@ -736,14 +736,14 @@ public function toArraySimple($display = 'default', $max_char_title = 0, $max_ch
                 break;
             case 'all':
                 $item = $this->toArrayFull($item);
-                $item = $this->toArrayAll($item, $item_page_id);
+                $item = $this->toArrayAll($item, $itemPageId);
                 break;
         }
         // Highlighting searched words
         $highlight = true;
-        if ($highlight && (XoopsRequest::getString('keywords','', 'GET'))) {
+        if ($highlight && (XoopsRequest::getString('keywords', '', 'GET'))) {
             $myts     = MyTextSanitizer::getInstance();
-            $keywords = $myts->htmlSpecialChars(trim(urldecode(XoopsRequest::getString('keywords','', 'GET'))));
+            $keywords = $myts->htmlSpecialChars(trim(urldecode(XoopsRequest::getString('keywords', '', 'GET'))));
             $fields   = array('title', 'maintext', 'summary');
             foreach ($fields as $field) {
                 if (isset($item[$field])) {
@@ -762,8 +762,8 @@ public function toArraySimple($display = 'default', $max_char_title = 0, $max_ch
      */
     public function toArrayFull($item)
     {
-        $item['title']        = $this->title();
-        $item['clean_title']  = $this->title();
+        $item['title']        = $this->getTitle();
+        $item['clean_title']  = $this->getTitle();
         $item['itemurl']      = $this->getItemUrl();
         $item['cancomment']   = $this->cancomment();
         $item['comments']     = $this->comments();
@@ -780,13 +780,13 @@ public function toArrayFull($item)
 
     /**
      * @param array $item
-     * @param int   $item_page_id
+     * @param int   $itemPageId
      *
      * @return array
      */
-    public function toArrayAll($item, $item_page_id)
+    public function toArrayAll($item, $itemPageId)
     {
-        $item['maintext'] = $this->buildmaintext($item_page_id, $this->body());
+        $item['maintext'] = $this->buildmaintext($itemPageId, $this->getBody());
         $item             = $this->getOtherImages($item);
 
         return $item;
@@ -856,7 +856,7 @@ public function getOtherImages($item = array())
     public function highlight($content, $keywords)
     {
         $color = $this->publisher->getConfig('format_highlight_color');
-        if (substr($color, 0, 1) != '#') {
+        if (substr($color, 0, 1) !== '#') {
             $color = '#' . $color;
         }
         include_once __DIR__ . '/highlighter.php';
@@ -871,7 +871,7 @@ public function highlight($content, $keywords)
      */
     public function createMetaTags()
     {
-        $publisher_metagen = new PublisherMetagen($this->title(), $this->meta_keywords(), $this->meta_description(), $this->category->categoryPath);
+        $publisher_metagen = new PublisherMetagen($this->getTitle(), $this->meta_keywords(), $this->meta_description(), $this->category->categoryPath);
         $publisher_metagen->createMetaTags();
     }
 
@@ -887,21 +887,23 @@ protected function convertForJapanese($str)
             return $str;
         }
         // no action, if not Japanese
-        if ($GLOBALS['xoopsConfig']['language'] != 'japanese') {
+        if ($GLOBALS['xoopsConfig']['language'] !== 'japanese') {
             return $str;
         }
         // presume OS Browser
         $agent   = XoopsRequest::getString('HTTP_USER_AGENT', '', 'SERVER');
         $os      = '';
         $browser = '';
-        if (preg_match("/Win/i", $agent)) {
+        //        if (preg_match("/Win/i", $agent)) {
+        if (false !== stripos($agent, 'Win')) {
             $os = 'win';
         }
-        if (preg_match("/MSIE/i", $agent)) {
+        //        if (preg_match("/MSIE/i", $agent)) {
+        if (false !== stripos($agent, 'MSIE')) {
             $browser = 'msie';
         }
         // if msie
-        if (($os == 'win') && ($browser == 'msie')) {
+        if (($os === 'win') && ($browser === 'msie')) {
             // if multibyte
             if (function_exists('mb_convert_encoding')) {
                 $str = mb_convert_encoding($str, 'SJIS', 'EUC-JP');
@@ -958,66 +960,83 @@ public function accessGranted()
     public function setVarsFromRequest()
     {
         //Required fields
-//        if (!empty($categoryid = XoopsRequest::getInt('categoryid', 0, 'POST'))) {
-//            $this->setVar('categoryid', $categoryid);}
+        //        if (!empty($categoryid = XoopsRequest::getInt('categoryid', 0, 'POST'))) {
+        //            $this->setVar('categoryid', $categoryid);}
 
-       $this->setVar('categoryid', XoopsRequest::getInt('categoryid', 0, 'POST'));
-       $this->setVar('title', XoopsRequest::getString('title', '', 'POST'));
-       $this->setVar('body',  XoopsRequest::getText('body', '', 'POST'));
+        $this->setVar('categoryid', XoopsRequest::getInt('categoryid', 0, 'POST'));
+        $this->setVar('title', XoopsRequest::getString('title', '', 'POST'));
+        $this->setVar('body', XoopsRequest::getText('body', '', 'POST'));
 
         //Not required fields
-       $this->setVar('summary', XoopsRequest::getText('summary', '', 'POST'));
-       $this->setVar('subtitle', XoopsRequest::getString('subtitle', '', 'POST'));
-       $this->setVar('item_tag', XoopsRequest::getString('item_tag', '', 'POST'));
+        $this->setVar('summary', XoopsRequest::getText('summary', '', 'POST'));
+        $this->setVar('subtitle', XoopsRequest::getString('subtitle', '', 'POST'));
+        $this->setVar('item_tag', XoopsRequest::getString('item_tag', '', 'POST'));
 
-        if (( $image_featured = XoopsRequest::getString('image_featured', '', 'POST'))) {
-            $image_item     = XoopsRequest::getArray('image_item', array(), 'POST');
-//            $image_featured = XoopsRequest::getString('image_featured', '', 'POST');
+        if (($imageFeatured = XoopsRequest::getString('image_featured', '', 'POST'))) {
+            $imageItem = XoopsRequest::getArray('image_item', array(), 'POST');
+            //            $imageFeatured = XoopsRequest::getString('image_featured', '', 'POST');
             //Todo: get a better image class for xoops!
             //Image hack
-            $image_item_ids = array();
+            $imageItemIds = array();
 
             $sql    = 'SELECT image_id, image_name FROM ' . $GLOBALS['xoopsDB']->prefix('image');
             $result = $GLOBALS['xoopsDB']->query($sql, 0, 0);
             while (($myrow = $GLOBALS['xoopsDB']->fetchArray($result)) !== false) {
-                $image_name = $myrow['image_name'];
+                $imageName = $myrow['image_name'];
                 $id         = $myrow['image_id'];
-                if ($image_name == $image_featured) {
+                if ($imageName == $imageFeatured) {
                     $this->setVar('image', $id);
                 }
-                if (in_array($image_name, $image_item)) {
-                    $image_item_ids[] = $id;
+                if (in_array($imageName, $imageItem)) {
+                    $imageItemIds[] = $id;
                 }
             }
-            $this->setVar('images', implode('|', $image_item_ids));
+            $this->setVar('images', implode('|', $imageItemIds));
         }
 
-        if (($author_alias = XoopsRequest::getString('author_alias', '', 'POST'))) {
-            $this->setVar('author_alias', $author_alias);
-            if ($this->getVar('autor_alias') != '') {
+        if (($authorAlias = XoopsRequest::getString('author_alias', '', 'POST'))) {
+            $this->setVar('author_alias', $authorAlias);
+            if ($this->getVar('author_alias') !== '') {
                 $this->setVar('uid', 0);
             }
         }
 
-//mb TODO check on version
-            if (($datesub = XoopsRequest::getString('datesub', '', 'POST'))) {
-//            if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
-//                $this->setVar('datesub', strtotime(XoopsRequest::getArray('datesub', array(), 'POST')['date']) + XoopsRequest::getArray('datesub', array(), 'POST')['time']);
-//            } else {
-                $resDate = (XoopsRequest::getArray('datesub', array(), 'POST'));
-                $resTime = (XoopsRequest::getArray('datesub', array(), 'POST'));
-                $this->setVar('datesub', strtotime($resDate['date']) + $resTime['time']);
-//            }
-        } elseif ($this->isnew()) {
+        //mb TODO check on version
+        if (($datesub = XoopsRequest::getString('datesub', '', 'POST'))) {
+            //            if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
+            //                $this->setVar('datesub', strtotime(XoopsRequest::getArray('datesub', array(), 'POST')['date']) + XoopsRequest::getArray('datesub', array(), 'POST')['time']);
+            //            } else {
+            $resDate = (XoopsRequest::getArray('datesub', array(), 'POST'));
+            $resTime = (XoopsRequest::getArray('datesub', array(), 'POST'));
+            //            $this->setVar('datesub', strtotime($resDate['date']) + $resTime['time']);
+            $localTimestamp = strtotime($resDate['date']) + $resTime['time'];
+
+            // get user Timezone offset and use it to find out the Timezone, needed for PHP DataTime
+            $userTimeoffset = $GLOBALS['xoopsUser']->getVar('timezone_offset');
+            $tz             = timezone_name_from_abbr(null, $userTimeoffset * 3600);
+            if ($tz === false) {
+                $tz = timezone_name_from_abbr(null, $userTimeoffset * 3600, false);
+            }
+
+            $userTimezone = new DateTimeZone($tz);
+            $gmtTimezone  = new DateTimeZone('GMT');
+            $myDateTime   = new DateTime('now', $gmtTimezone);
+            $offset       = $userTimezone->getOffset($myDateTime);
+
+            $gmtTimestamp = $localTimestamp - $offset;
+            $this->setVar('datesub', $gmtTimestamp);
+
+            //            }
+        } elseif ($this->isNew()) {
             $this->setVar('datesub', time());
         }
 
-        $this->setVar('short_url',  XoopsRequest::getString('item_short_url', '', 'POST'));
+        $this->setVar('short_url', XoopsRequest::getString('item_short_url', '', 'POST'));
         $this->setVar('meta_keywords', XoopsRequest::getString('item_meta_keywords', '', 'POST'));
         $this->setVar('meta_description', XoopsRequest::getString('item_meta_description', '', 'POST'));
         $this->setVar('weight', XoopsRequest::getInt('weight', 0, 'POST'));
 
-        if ($this->isnew()) {
+        if ($this->isNew()) {
             $this->setVar('uid', is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->uid() : 0);
             $this->setVar('cancoment', $this->publisher->getConfig('submit_allowcomments'));
             $this->setVar('status', $this->publisher->getConfig('submit_status'));
@@ -1027,17 +1046,17 @@ public function setVarsFromRequest()
             $this->setVar('doimage', $this->publisher->getConfig('submit_doimage'));
             $this->setVar('dobr', $this->publisher->getConfig('submit_dobr'));
         } else {
-            $this->setVar('uid', XoopsRequest::getString('uid', '', 'POST'));
-            $this->setVar('cancomment', XoopsRequest::getString('allowcomments', '', 'POST'));
-            $this->setVar('status', XoopsRequest::getString('status', '', 'POST'));
-            $this->setVar('dohtml', XoopsRequest::getString('dohtml', '', 'POST'));
-            $this->setVar('dosmiley', XoopsRequest::getString('dosmiley', '', 'POST'));
-            $this->setVar('doxcode', XoopsRequest::getString('doxcode', '', 'POST'));
-            $this->setVar('doimage', XoopsRequest::getString('doimage', '', 'POST'));
-            $this->setVar('dobr', XoopsRequest::getString('dolinebreak', '', 'POST'));
+            $this->setVar('uid', XoopsRequest::getInt('uid', 0, 'POST'));
+            $this->setVar('cancomment', XoopsRequest::getInt('allowcomments', 1, 'POST'));
+            $this->setVar('status', XoopsRequest::getInt('status', -1, 'POST'));
+            $this->setVar('dohtml', XoopsRequest::getInt('dohtml', 1, 'POST'));
+            $this->setVar('dosmiley', XoopsRequest::getInt('dosmiley', 1, 'POST'));
+            $this->setVar('doxcode', XoopsRequest::getInt('doxcode', 1, 'POST'));
+            $this->setVar('doimage', XoopsRequest::getInt('doimage', 1, 'POST'));
+            $this->setVar('dobr', XoopsRequest::getInt('dolinebreak', 1, 'POST'));
         }
 
-         $this->setVar('notifypub', XoopsRequest::getString('notify', '', 'POST'));
+        $this->setVar('notifypub', XoopsRequest::getString('notify', '', 'POST'));
     }
 }
 
@@ -1055,17 +1074,17 @@ class PublisherItemHandler extends XoopsPersistableObjectHandler
      * @var PublisherPublisher
      * @access public
      */
-    public $publisher = null;
+    public $publisher;
 
     protected $resultCatCounts = array();
 
     /**
-     * @param null|object $db
+     * @param null|XoopsDatabase $db
      */
-    public function __construct(&$db)
+    public function __construct(XoopsDatabase $db)
     {
-        parent::__construct($db, "publisher_items", 'PublisherItem', "itemid", "title");
-        $this->publisher = PublisherPublisher::getInstance();
+        parent::__construct($db, 'publisher_items', 'PublisherItem', 'itemid', 'title');
+        $this->publisher =& PublisherPublisher::getInstance();
     }
 
     /**
@@ -1075,7 +1094,7 @@ public function __construct(&$db)
      */
     public function &create($isNew = true)
     {
-        $obj = parent::create($isNew);
+        $obj =& parent::create($isNew);
         if ($isNew) {
             $obj->setDefaultPermissions();
         }
@@ -1092,7 +1111,7 @@ public function &create($isNew = true)
      */
     public function &get($id)
     {
-        $obj = parent::get($id);
+        $obj =& parent::get($id);
         if (is_object($obj)) {
             $obj->assignOtherProperties();
         }
@@ -1103,7 +1122,7 @@ public function &get($id)
     /**
      * insert a new item in the database
      *
-     * @param object $item  reference to the {@link PublisherItem} object
+     * @param object $item reference to the {@link PublisherItem} object
      * @param bool   $force
      *
      * @return bool FALSE if failed, TRUE if already present and unchanged or successful
@@ -1111,7 +1130,7 @@ public function &get($id)
     public function insert(&$item, $force = false)
     {
         if (!$item->meta_keywords() || !$item->meta_description() || !$item->short_url()) {
-            $publisher_metagen = new PublisherMetagen($item->title(), $item->getVar('meta_keywords'), $item->getVar('summary'));
+            $publisher_metagen = new PublisherMetagen($item->getTitle(), $item->getVar('meta_keywords'), $item->getVar('summary'));
             // Auto create meta tags if empty
             if (!$item->meta_keywords()) {
                 $item->setVar('meta_keywords', $publisher_metagen->keywords);
@@ -1129,8 +1148,8 @@ public function insert(&$item, $force = false)
         }
         if (xoops_isActiveModule('tag')) {
             // Storing tags information
-            $tag_handler = xoops_getmodulehandler('tag', 'tag');
-            $tag_handler->updateByItem($item->getVar('item_tag'), $item->getVar('itemid'), PUBLISHER_DIRNAME, 0);
+            $tagHandler =& xoops_getModuleHandler('tag', 'tag');
+            $tagHandler->updateByItem($item->getVar('item_tag'), $item->getVar('itemid'), PUBLISHER_DIRNAME, 0);
         }
 
         return true;
@@ -1139,7 +1158,7 @@ public function insert(&$item, $force = false)
     /**
      * delete an item from the database
      *
-     * @param object $item  reference to the ITEM to delete
+     * @param object $item reference to the ITEM to delete
      * @param bool   $force
      *
      * @return bool FALSE if failed.
@@ -1157,8 +1176,8 @@ public function delete(&$item, $force = false)
         }
         // Removing tags information
         if (xoops_isActiveModule('tag')) {
-            $tag_handler = xoops_getmodulehandler('tag', 'tag');
-            $tag_handler->updateByItem('', $item->getVar('itemid'), PUBLISHER_DIRNAME, 0);
+            $tagHandler =& xoops_getModuleHandler('tag', 'tag');
+            $tagHandler->updateByItem('', $item->getVar('itemid'), PUBLISHER_DIRNAME, 0);
         }
 
         return true;
@@ -1167,8 +1186,8 @@ public function delete(&$item, $force = false)
     /**
      * retrieve items from the database
      *
-     * @param object $criteria      {@link CriteriaElement} conditions to be met
-     * @param string $id_key        what shall we use as array key ? none, itemid, categoryid
+     * @param object $criteria {@link CriteriaElement} conditions to be met
+     * @param string $id_key   what shall we use as array key ? none, itemid, categoryid
      * @param string $notNullFields
      *
      * @return array array of {@link PublisherItem} objects
@@ -1180,13 +1199,13 @@ public function &getObjects($criteria = null, $id_key = 'none', $notNullFields =
         $sql   = 'SELECT * FROM ' . $this->db->prefix('publisher_items');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             $whereClause = $criteria->renderWhere();
-            if ($whereClause != 'WHERE ()') {
+            if ($whereClause !== 'WHERE ()') {
                 $sql .= ' ' . $criteria->renderWhere();
                 if (!empty($notNullFields)) {
                     $sql .= $this->notNullFieldClause($notNullFields, true);
                 }
             } elseif (!empty($notNullFields)) {
-                $sql .= " WHERE " . $this->notNullFieldClause($notNullFields);
+                $sql .= ' WHERE ' . $this->notNullFieldClause($notNullFields);
             }
             if ($criteria->getSort() != '') {
                 $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
@@ -1194,10 +1213,10 @@ public function &getObjects($criteria = null, $id_key = 'none', $notNullFields =
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         } elseif (!empty($notNullFields)) {
-            $sql .= $sql .= " WHERE " . $this->notNullFieldClause($notNullFields);
+            $sql .= $sql .= ' WHERE ' . $this->notNullFieldClause($notNullFields);
         }
         $result = $this->db->query($sql, $limit, $start);
-        if (!$result || count($result) == 0) {
+        if (!$result || count($result) === 0) {
             return $ret;
         }
         $theObjects = array();
@@ -1208,9 +1227,9 @@ public function &getObjects($criteria = null, $id_key = 'none', $notNullFields =
             unset($item);
         }
         foreach ($theObjects as $theObject) {
-            if ($id_key == 'none') {
+            if ($id_key === 'none') {
                 $ret[] = $theObject;
-            } elseif ($id_key == 'itemid') {
+            } elseif ($id_key === 'itemid') {
                 $ret[$theObject->itemid()] = $theObject;
             } else {
                 $ret[$theObject->getVar($id_key)][$theObject->itemid()] = $theObject;
@@ -1224,7 +1243,7 @@ public function &getObjects($criteria = null, $id_key = 'none', $notNullFields =
     /**
      * count items matching a condition
      *
-     * @param object $criteria      {@link CriteriaElement} to match
+     * @param object $criteria {@link CriteriaElement} to match
      * @param string $notNullFields
      *
      * @return int count of items
@@ -1234,16 +1253,16 @@ public function getCount($criteria = null, $notNullFields = '')
         $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('publisher_items');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             $whereClause = $criteria->renderWhere();
-            if ($whereClause != 'WHERE ()') {
+            if ($whereClause !== 'WHERE ()') {
                 $sql .= ' ' . $criteria->renderWhere();
                 if (!empty($notNullFields)) {
                     $sql .= $this->notNullFieldClause($notNullFields, true);
                 }
             } elseif (!empty($notNullFields)) {
-                $sql .= " WHERE " . $this->notNullFieldClause($notNullFields);
+                $sql .= ' WHERE ' . $this->notNullFieldClause($notNullFields);
             }
         } elseif (!empty($notNullFields)) {
-            $sql .= " WHERE " . $this->notNullFieldClause($notNullFields);
+            $sql .= ' WHERE ' . $this->notNullFieldClause($notNullFields);
         }
         $result = $this->db->query($sql);
         if (!$result) {
@@ -1255,27 +1274,27 @@ public function getCount($criteria = null, $notNullFields = '')
     }
 
     /**
-     * @param  int           $categoryid
-     * @param  string        $status
-     * @param  string        $notNullFields
-     * @param $criteriaPermissions
+     * @param  int    $categoryid
+     * @param  string $status
+     * @param  string $notNullFields
+     * @param         $criteriaPermissions
      * @return CriteriaCompo
      */
     private function getItemsCriteria($categoryid = -1, $status = '', $notNullFields = '', $criteriaPermissions)
     {
-//        global $publisher_isAdmin;
-//        $ret = 0;
-//        if (!$publisher_isAdmin) {
-//            $criteriaPermissions = new CriteriaCompo();
-//            // Categories for which user has access
-//            $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('category_read');
-//            if (!empty($categoriesGranted)) {
-//                $grantedCategories = new Criteria('categoryid', "(" . implode(',', $categoriesGranted) . ")", 'IN');
-//                $criteriaPermissions->add($grantedCategories, 'AND');
-//            } else {
-//                return $ret;
-//            }
-//        }
+        //        global $publisherIsAdmin;
+        //        $ret = 0;
+        //        if (!$publisherIsAdmin) {
+        //            $criteriaPermissions = new CriteriaCompo();
+        //            // Categories for which user has access
+        //            $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('category_read');
+        //            if (!empty($categoriesGranted)) {
+        //                $grantedCategories = new Criteria('categoryid', "(" . implode(',', $categoriesGranted) . ")", 'IN');
+        //                $criteriaPermissions->add($grantedCategories, 'AND');
+        //            } else {
+        //                return $ret;
+        //            }
+        //        }
         if (isset($categoryid) && $categoryid != -1) {
             $criteriaCategory = new criteria('categoryid', $categoryid);
         }
@@ -1311,20 +1330,20 @@ private function getItemsCriteria($categoryid = -1, $status = '', $notNullFields
     public function getItemsCount($categoryid = -1, $status = '', $notNullFields = '')
     {
 
-//        global $publisher_isAdmin;
+        //        global $publisherIsAdmin;
         $criteriaPermissions = '';
-        if (!$GLOBALS['publisher_isAdmin']) {
+        if (!$GLOBALS['publisherIsAdmin']) {
             $criteriaPermissions = new CriteriaCompo();
             // Categories for which user has access
             $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('category_read');
             if (!empty($categoriesGranted)) {
-                $grantedCategories = new Criteria('categoryid', "(" . implode(',', $categoriesGranted) . ")", 'IN');
+                $grantedCategories = new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN');
                 $criteriaPermissions->add($grantedCategories, 'AND');
             } else {
                 return 0;
             }
         }
-//        $ret = array();
+        //        $ret = array();
         $criteria = self::getItemsCriteria($categoryid, $status, $notNullFields, $criteriaPermissions);
         /*
                 if (isset($categoryid) && $categoryid != -1) {
@@ -1477,14 +1496,14 @@ public function getAllRejected($limit = 0, $start = 0, $categoryid = -1, $sort =
      */
     public function getItems($limit = 0, $start = 0, $status = '', $categoryid = -1, $sort = 'datesub', $order = 'DESC', $notNullFields = '', $asObject = true, $otherCriteria = null, $id_key = 'none')
     {
-//        global $publisher_isAdmin;
+        //        global $publisherIsAdmin;
         $criteriaPermissions = '';
-        if (!$GLOBALS['publisher_isAdmin']) {
+        if (!$GLOBALS['publisherIsAdmin']) {
             $criteriaPermissions = new CriteriaCompo();
             // Categories for which user has access
             $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('category_read');
             if (!empty($categoriesGranted)) {
-                $grantedCategories = new Criteria('categoryid', "(" . implode(',', $categoriesGranted) . ")", 'IN');
+                $grantedCategories = new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN');
                 $criteriaPermissions->add($grantedCategories, 'AND');
             } else {
                 return array();
@@ -1515,7 +1534,7 @@ public function getItems($limit = 0, $start = 0, $status = '', $categoryid = -1,
                     $criteria->add($criteriaStatus);
                 }
         */
-//        $ret = array();
+        //        $ret = array();
 
         if (!empty($otherCriteria)) {
             $criteria->add($otherCriteria);
@@ -1524,7 +1543,7 @@ public function getItems($limit = 0, $start = 0, $status = '', $categoryid = -1,
         $criteria->setStart($start);
         $criteria->setSort($sort);
         $criteria->setOrder($order);
-        $ret = $this->getObjects($criteria, $id_key, $notNullFields);
+        $ret =& $this->getObjects($criteria, $id_key, $notNullFields);
 
         return $ret;
     }
@@ -1543,7 +1562,7 @@ public function getRandomItem($field = '', $status = '', $categoryId = -1)
         // Getting the number of published Items
         $totalItems = $this->getItemsCount($categoryId, $status, $notNullFields);
         if ($totalItems > 0) {
-            $totalItems = $totalItems - 1;
+            --$totalItems;
             mt_srand((double)microtime() * 1000000);
             $entryNumber = mt_rand(0, $totalItems);
             $item        = $this->getItems(1, $entryNumber, $status, $categoryId, $sort = 'datesub', $order = 'DESC', $notNullFields);
@@ -1565,7 +1584,7 @@ public function getRandomItem($field = '', $status = '', $categoryId = -1)
     public function deleteAll($criteria = null)
     {
         //todo resource consuming, use get list instead?
-        $items = $this->getObjects($criteria);
+        $items =& $this->getObjects($criteria);
         foreach ($items as $item) {
             $this->delete($item);
         }
@@ -1580,7 +1599,7 @@ public function deleteAll($criteria = null)
      */
     public function updateCounter($itemid)
     {
-        $sql = "UPDATE " . $this->db->prefix("publisher_items") . " SET counter=counter+1 WHERE itemid = " . $itemid;
+        $sql = 'UPDATE ' . $this->db->prefix('publisher_items') . ' SET counter=counter+1 WHERE itemid = ' . $itemid;
         if ($this->db->queryF($sql)) {
             return true;
         } else {
@@ -1598,7 +1617,7 @@ public function notNullFieldClause($notNullFields = '', $withAnd = false)
     {
         $ret = '';
         if ($withAnd) {
-            $ret .= " AND ";
+            $ret .= ' AND ';
         }
         if (!empty($notNullFields) && (is_array($notNullFields))) {
             foreach ($notNullFields as $v) {
@@ -1624,18 +1643,18 @@ public function notNullFieldClause($notNullFields = '', $withAnd = false)
      *
      * @return array
      */
-    public function getItemsFromSearch($queryarray = array(), $andor = 'AND', $limit = 0, $offset = 0, $userid = 0, $categories = array(), $sortby = 0, $searchin = "", $extra = "")
+    public function getItemsFromSearch($queryarray = array(), $andor = 'AND', $limit = 0, $offset = 0, $userid = 0, $categories = array(), $sortby = 0, $searchin = '', $extra = '')
     {
-//        global $publisher_isAdmin;
-        $ret           = array();
-        $gperm_handler = &xoops_gethandler('groupperm');
-        $groups        = is_object($GLOBALS['xoopsUser']) ? ($GLOBALS['xoopsUser']->getGroups()) : XOOPS_GROUP_ANONYMOUS;
-        $searchin      = empty($searchin) ? array("title", "body", "summary") : (is_array($searchin) ? $searchin : array($searchin));
-        if (in_array("all", $searchin) || count($searchin) == 0) {
-            $searchin = array("title", "subtitle", "body", "summary", "meta_keywords");
+        //        global $publisherIsAdmin;
+        $ret          = array();
+        $gpermHandler = &xoops_getHandler('groupperm');
+        $groups       = is_object($GLOBALS['xoopsUser']) ? ($GLOBALS['xoopsUser']->getGroups()) : XOOPS_GROUP_ANONYMOUS;
+        $searchin     = empty($searchin) ? array('title', 'body', 'summary') : (is_array($searchin) ? $searchin : array($searchin));
+        if (in_array('all', $searchin) || count($searchin) == 0) {
+            $searchin = array('title', 'subtitle', 'body', 'summary', 'meta_keywords');
         }
         if (is_array($userid) && count($userid) > 0) {
-            $userid       = array_map("intval", $userid);
+            $userid       = array_map('intval', $userid);
             $criteriaUser = new CriteriaCompo();
             $criteriaUser->add(new Criteria('uid', '(' . implode(',', $userid) . ')', 'IN'), 'OR');
         } elseif (is_numeric($userid) && $userid > 0) {
@@ -1645,7 +1664,7 @@ public function getItemsFromSearch($queryarray = array(), $andor = 'AND', $limit
         $count = count($queryarray);
         if (is_array($queryarray) && $count > 0) {
             $criteriaKeywords = new CriteriaCompo();
-            $elementCount = count($queryarray);
+            $elementCount     = count($queryarray);
             for ($i = 0; $i < $elementCount; ++$i) {
                 $criteriaKeyword = new CriteriaCompo();
                 if (in_array('title', $searchin)) {
@@ -1667,21 +1686,21 @@ public function getItemsFromSearch($queryarray = array(), $andor = 'AND', $limit
                 unset($criteriaKeyword);
             }
         }
-        if (!$GLOBALS['publisher_isAdmin'] && (count($categories) > 0)) {
+        if (!$GLOBALS['publisherIsAdmin'] && (count($categories) > 0)) {
             $criteriaPermissions = new CriteriaCompo();
             // Categories for which user has access
-            $categoriesGranted = $gperm_handler->getItemIds('category_read', $groups, $this->publisher->getModule()->getVar('mid'));
+            $categoriesGranted = $gpermHandler->getItemIds('category_read', $groups, $this->publisher->getModule()->getVar('mid'));
             if (count($categories) > 0) {
                 $categoriesGranted = array_intersect($categoriesGranted, $categories);
             }
             if (count($categoriesGranted) == 0) {
                 return $ret;
             }
-            $grantedCategories = new Criteria('categoryid', "(" . implode(',', $categoriesGranted) . ")", 'IN');
+            $grantedCategories = new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN');
             $criteriaPermissions->add($grantedCategories, 'AND');
         } elseif (count($categories) > 0) {
             $criteriaPermissions = new CriteriaCompo();
-            $grantedCategories   = new Criteria('categoryid', "(" . implode(',', $categories) . ")", 'IN');
+            $grantedCategories   = new Criteria('categoryid', '(' . implode(',', $categories) . ')', 'IN');
             $criteriaPermissions->add($grantedCategories, 'AND');
         }
         $criteriaItemsStatus = new CriteriaCompo();
@@ -1702,15 +1721,15 @@ public function getItemsFromSearch($queryarray = array(), $andor = 'AND', $limit
         $criteria->setLimit($limit);
         $criteria->setStart($offset);
         if (empty($sortby)) {
-            $sortby = "datesub";
+            $sortby = 'datesub';
         }
         $criteria->setSort($sortby);
         $order = 'ASC';
-        if ($sortby == "datesub") {
+        if ($sortby === 'datesub') {
             $order = 'DESC';
         }
         $criteria->setOrder($order);
-        $ret = $this->getObjects($criteria);
+        $ret =& $this->getObjects($criteria);
 
         return $ret;
     }
@@ -1759,12 +1778,12 @@ public function getLastPublishedByCat($categoriesObj, $status = array(PublisherC
             unset($item);
         }
         */
-        $sql = "SELECT mi.categoryid, mi.itemid, mi.title, mi.short_url, mi.uid, mi.datesub";
-        $sql .= " FROM (SELECT categoryid, MAX(datesub) AS date FROM " . $this->db->prefix('publisher_items');
-        $sql .= " WHERE status IN (" . implode(',', $status) . ")";
-        $sql .= " AND categoryid IN (" . implode(',', $catIds) . ")";
-        $sql .= " GROUP BY categoryid)mo";
-        $sql .= " JOIN " . $this->db->prefix('publisher_items') . " mi ON mi.datesub = mo.date";
+        $sql = 'SELECT mi.categoryid, mi.itemid, mi.title, mi.short_url, mi.uid, mi.datesub';
+        $sql .= ' FROM (SELECT categoryid, MAX(datesub) AS date FROM ' . $this->db->prefix('publisher_items');
+        $sql .= ' WHERE status IN (' . implode(',', $status) . ')';
+        $sql .= ' AND categoryid IN (' . implode(',', $catIds) . ')';
+        $sql .= ' GROUP BY categoryid)mo';
+        $sql .= ' JOIN ' . $this->db->prefix('publisher_items') . ' mi ON mi.datesub = mo.date';
         $result = $this->db->query($sql);
         while (($row = $this->db->fetchArray($result)) !== false) {
             $item = new PublisherItem();
@@ -1777,21 +1796,21 @@ public function getLastPublishedByCat($categoriesObj, $status = array(PublisherC
     }
 
     /**
-     * @param $parentid
-     * @param $catsCount
+     * @param         $parentid
+     * @param         $catsCount
      * @param  string $spaces
      * @return int
      */
     public function countArticlesByCat($parentid, $catsCount, $spaces = '')
     {
-//        global $resultCatCounts;
+        //        global $resultCatCounts;
         $newspaces = $spaces . '--';
         $thecount  = 0;
         foreach ($catsCount[$parentid] as $subCatId => $count) {
-            $thecount                   = $thecount + $count;
+            $thecount += $count;
             $this->resultCatCounts[$subCatId] = $count;
             if (isset($catsCount[$subCatId])) {
-                $thecount                   = $thecount + $this->countArticlesByCat($subCatId, $catsCount, $newspaces);
+                $thecount += $this->countArticlesByCat($subCatId, $catsCount, $newspaces);
                 $this->resultCatCounts[$subCatId] = $thecount;
             }
         }
@@ -1808,7 +1827,7 @@ public function countArticlesByCat($parentid, $catsCount, $spaces = '')
      */
     public function getCountsByCat($catId = 0, $status, $inSubCat = false)
     {
-//        global $resultCatCounts;
+        //        global $resultCatCounts;
         $ret       = array();
         $catsCount = array();
         $sql       = 'SELECT c.parentid, i.categoryid, COUNT(*) AS count FROM ' . $this->db->prefix('publisher_items') . ' AS i INNER JOIN ' . $this->db->prefix('publisher_categories') . ' AS c ON i.categoryid=c.categoryid';
@@ -1830,15 +1849,15 @@ public function getCountsByCat($catId = 0, $status, $inSubCat = false)
 
             return $catsCount;
         }
-//        while ($row = $this->db->fetchArray($result)) {
+        //        while ($row = $this->db->fetchArray($result)) {
         while (($row = $this->db->fetchArray($result)) !== false) {
             $catsCount[$row['parentid']][$row['categoryid']] = $row['count'];
         }
-//        $resultCatCounts = array();
+        //        $resultCatCounts = array();
         foreach ($catsCount[0] as $subCatId => $count) {
             $this->resultCatCounts[$subCatId] = $count;
             if (isset($catsCount[$subCatId])) {
-                $this->resultCatCounts[$subCatId] = $this->resultCatCounts[$subCatId] + $this->countArticlesByCat($subCatId, $catsCount, '');
+                $this->resultCatCounts[$subCatId] += $this->countArticlesByCat($subCatId, $catsCount, '');
             }
         }
 
diff --git a/publisher/class/metagen.php b/publisher/class/metagen.php
index 55e64cd7..a3de2099 100644
--- a/publisher/class/metagen.php
+++ b/publisher/class/metagen.php
@@ -30,7 +30,7 @@ class PublisherMetagen
      * @var PublisherPublisher
      * @access public
      */
-    public $publisher = null;
+    public $publisher;
 
     /**
      * @var MyTextSanitizer
@@ -45,7 +45,7 @@ class PublisherMetagen
     /**
      * @var string
      */
-    public $original_title;
+    public $originalTitle;
 
     /**
      * @var string
@@ -76,7 +76,7 @@ class PublisherMetagen
      */
     public function __construct($title, $keywords = '', $description = '', $categoryPath = '')
     {
-        $this->publisher = PublisherPublisher::getInstance();
+        $this->publisher =& PublisherPublisher::getInstance();
         $this->myts      = MyTextSanitizer::getInstance();
         $this->setCategoryPath($categoryPath);
         $this->setTitle($title);
@@ -93,7 +93,7 @@ public function __construct($title, $keywords = '', $description = '', $category
     public function setTitle($title)
     {
         $this->title          = $this->html2text($title);
-        $this->original_title = $this->title;
+        $this->originalTitle = $this->title;
         $titleTag             = array();
         $titleTag['module']   = $this->publisher->getModule()->getVar('name');
         if (isset($this->title) && ($this->title != '') && (strtoupper($this->title) != strtoupper($titleTag['module']))) {
@@ -161,7 +161,7 @@ public function createMetaDescription($maxWords = 30)
     {
         $description = $this->purifyText($this->description);
         $description = $this->html2text($description);
-        $words       = explode(" ", $description);
+        $words       = explode(' ', $description);
         $ret         = '';
         $i           = 1;
         $wordCount   = count($words);
@@ -187,7 +187,7 @@ public function findMetaKeywords($text, $minChar)
         $keywords         = array();
         $text             = $this->purifyText($text);
         $text             = $this->html2text($text);
-        $originalKeywords = explode(" ", $text);
+        $originalKeywords = explode(' ', $text);
         foreach ($originalKeywords as $originalKeyword) {
             $secondRoundKeywords = explode("'", $originalKeyword);
             foreach ($secondRoundKeywords as $secondRoundKeyword) {
@@ -207,10 +207,10 @@ public function findMetaKeywords($text, $minChar)
      */
     public function createMetaKeywords()
     {
-        $keywords       = $this->findMetaKeywords($this->original_title . " " . $this->description, $this->minChar);
+        $keywords       = $this->findMetaKeywords($this->originalTitle . ' ' . $this->description, $this->minChar);
         $moduleKeywords = $this->publisher->getConfig('seo_meta_keywords');
         if ($moduleKeywords != '') {
-            $moduleKeywords = explode(",", $moduleKeywords);
+            $moduleKeywords = explode(',', $moduleKeywords);
             $keywords       = array_merge($keywords, array_map('trim', $moduleKeywords));
         }
         $ret = implode(',', $keywords);
@@ -256,7 +256,7 @@ public function createMetaTags()
      * Return true if the string is length > 0
      *
      * @credit psylove
-     * @var    string  $string Chaine de caractère
+     * @var    string $string Chaine de caractère
      * @return boolean
      */
     public function emptyString($var)
@@ -281,17 +281,17 @@ public static function generateSeoTitle($title = '', $withExt = true)
         $title = rawurlencode(strtolower($title));
         // Transformation des ponctuations
         //                 Tab     Space      !        "        #        %        &        '        (        )        ,        /        :        ;        <        =        >        ?        @        [        \        ]        ^        {        |        }        ~       .
-        $pattern = array("/%09/", "/%20/", "/%21/", "/%22/", "/%23/", "/%25/", "/%26/", "/%27/", "/%28/", "/%29/", "/%2C/", "/%2F/", "/%3A/", "/%3B/", "/%3C/", "/%3D/", "/%3E/", "/%3F/", "/%40/", "/%5B/", "/%5C/", "/%5D/", "/%5E/", "/%7B/", "/%7C/", "/%7D/", "/%7E/", "/\./");
-        $rep_pat = array("-", "-", "-", "-", "-", "-100", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-at-", "-", "-", "-", "-", "-", "-", "-", "-", "-");
-        $title   = preg_replace($pattern, $rep_pat, $title);
+        $pattern = array('/%09/', '/%20/', '/%21/', '/%22/', '/%23/', '/%25/', '/%26/', '/%27/', '/%28/', '/%29/', '/%2C/', '/%2F/', '/%3A/', '/%3B/', '/%3C/', '/%3D/', '/%3E/', '/%3F/', '/%40/', '/%5B/', '/%5C/', '/%5D/', '/%5E/', '/%7B/', '/%7C/', '/%7D/', '/%7E/', "/\./");
+        $repPat = array('-', '-', '-', '-', '-', '-100', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-at-', '-', '-', '-', '-', '-', '-', '-', '-', '-');
+        $title   = preg_replace($pattern, $repPat, $title);
         // Transformation des caractères accentués
         //                  °        è        é        ê        ë        ç        à        â        ä        î        ï        ù        ü        û        ô        ö
-        $pattern = array("/%B0/", "/%E8/", "/%E9/", "/%EA/", "/%EB/", "/%E7/", "/%E0/", "/%E2/", "/%E4/", "/%EE/", "/%EF/", "/%F9/", "/%FC/", "/%FB/", "/%F4/", "/%F6/");
-        $rep_pat = array("-", "e", "e", "e", "e", "c", "a", "a", "a", "i", "i", "u", "u", "u", "o", "o");
-        $title   = preg_replace($pattern, $rep_pat, $title);
-        $tableau = explode("-", $title); // Transforme la chaine de caractères en tableau
+        $pattern = array('/%B0/', '/%E8/', '/%E9/', '/%EA/', '/%EB/', '/%E7/', '/%E0/', '/%E2/', '/%E4/', '/%EE/', '/%EF/', '/%F9/', '/%FC/', '/%FB/', '/%F4/', '/%F6/');
+        $repPat = array('-', 'e', 'e', 'e', 'e', 'c', 'a', 'a', 'a', 'i', 'i', 'u', 'u', 'u', 'o', 'o');
+        $title   = preg_replace($pattern, $repPat, $title);
+        $tableau = explode('-', $title); // Transforme la chaine de caractères en tableau
         $tableau = array_filter($tableau, array('PublisherMetagen', 'emptyString')); // Supprime les chaines vides du tableau
-        $title   = implode("-", $tableau); // Transforme un tableau en chaine de caractères séparé par un tiret
+        $title   = implode('-', $tableau); // Transforme un tableau en chaine de caractères séparé par un tiret
         if (count($title) > 0) {
             if ($withExt) {
                 $title .= '.html';
@@ -311,26 +311,30 @@ public static function generateSeoTitle($title = '', $withExt = true)
      */
     public function purifyText($text, $keyword = false)
     {
-        $text = str_replace('&nbsp;', ' ', $text);
-        $text = str_replace('<br />', ' ', $text);
+        $text = str_replace(['&nbsp;', ' '], ['<br />', ' '], $text);
+        //        $text = str_replace('<br />', ' ', $text);
         $text = strip_tags($text);
         $text = html_entity_decode($text);
         $text = $this->myts->undoHtmlSpecialChars($text);
-        $text = str_replace(')', ' ', $text);
-        $text = str_replace('(', ' ', $text);
-        $text = str_replace(':', ' ', $text);
-        $text = str_replace('&euro', ' euro ', $text);
-        $text = str_replace('&hellip', '...', $text);
-        $text = str_replace('&rsquo', ' ', $text);
-        $text = str_replace('!', ' ', $text);
-        $text = str_replace('?', ' ', $text);
-        $text = str_replace('"', ' ', $text);
-        $text = str_replace('-', ' ', $text);
-        $text = str_replace('\n', ' ', $text);
+        //        $text = str_replace(')', ' ', $text);
+        //        $text = str_replace('(', ' ', $text);
+        //        $text = str_replace(':', ' ', $text);
+        //        $text = str_replace('&euro', ' euro ', $text);
+        //        $text = str_replace('&hellip', '...', $text);
+        //        $text = str_replace('&rsquo', ' ', $text);
+        //        $text = str_replace('!', ' ', $text);
+        //        $text = str_replace('?', ' ', $text);
+        //        $text = str_replace('"', ' ', $text);
+        //        $text = str_replace('-', ' ', $text);
+        //        $text = str_replace('\n', ' ', $text);
+
+        $text = str_replace([')','(',':','&euro','&hellip','&rsquo','!','?','"','-','\n'], [' ' , ' ',  ' ',  ' euro ',  '...',  ' ', ' ', ' ',  ' ', ' ',  ' '], $text);
+
         if ($keyword) {
-            $text = str_replace('.', ' ', $text);
-            $text = str_replace(',', ' ', $text);
-            $text = str_replace('\'', ' ', $text);
+//            $text = str_replace('.', ' ', $text);
+//            $text = str_replace(',', ' ', $text);
+//            $text = str_replace('\'', ' ', $text);
+            $text = str_replace(['.', ' '], [',', ' '], ['\'', ' '], $text);
         }
         $text = str_replace(';', ' ', $text);
 
@@ -363,25 +367,23 @@ public function html2text($document)
             "'&(iexcl|#161);'i",
             "'&(cent|#162);'i",
             "'&(pound|#163);'i",
-            "'&(copy|#169);'i",
-            //"'&#(\d+);'e"
+            "'&(copy|#169);'i",//"'&#(\d+);'e"
         );
         // evaluate as php
         $replace = array(
-            "",
-            "",
-            "",
+            '',
+            '',
+            '',
             "\\1",
             "\"",
-            "&",
-            "<",
-            ">",
-            " ",
+            '&',
+            '<',
+            '>',
+            ' ',
             chr(161),
             chr(162),
             chr(163),
-            chr(169),
-            //"chr(\\1)"
+            chr(169),//"chr(\\1)"
         );
         $text    = preg_replace($search, $replace, $document);
 
diff --git a/publisher/class/mimetype.php b/publisher/class/mimetype.php
index 24ce33ff..03e2fb6c 100644
--- a/publisher/class/mimetype.php
+++ b/publisher/class/mimetype.php
@@ -41,7 +41,7 @@ class PublisherBaseObjectHandler extends XoopsPersistableObjectHandler
      *
      * @var XoopsDatabase
      */
-//mb    public $_db; //mb it is already declared in XoopsObjectHandler
+    //mb    public $_db; //mb it is already declared in XoopsObjectHandler
 
     /**
      * Autoincrementing DB fieldname
@@ -53,7 +53,7 @@ class PublisherBaseObjectHandler extends XoopsPersistableObjectHandler
     /**
      * @param XoopsDatabase $db
      */
-    public function init(&$db)
+    public function init(XoopsDatabase $db)
     {
         $this->db = $db;
     }
@@ -107,12 +107,12 @@ public function &get($id)
      * retrieve objects from the database
      *
      * @param object $criteria  {@link CriteriaElement} conditions to be met
-     * @param bool   $id_as_key Should the department ID be used as array key
+     * @param bool   $idAsKey Should the department ID be used as array key
      *
      * @return array array of objects
      * @access  public
      */
-    public function &getObjects($criteria = null, $id_as_key = false)
+    public function &getObjects($criteria = null, $idAsKey = false)
     {
         $ret   = array();
         $limit = $start = 0;
@@ -130,7 +130,7 @@ public function &getObjects($criteria = null, $id_as_key = false)
         // Add each returned record to the result array
         while (($myrow = $this->db->fetchArray($result)) !== false) {
             $obj = new $this->className($myrow);
-            if (!$id_as_key) {
+            if (!$idAsKey) {
                 $ret[] = $obj;
             } else {
                 $ret[$obj->getVar($id)] = $obj;
@@ -285,15 +285,15 @@ public function deleteAll($criteria = null)
      *
      * @param string $fieldname
      * @param string $fieldvalue
-     * @param object $criteria   {@link CriteriaElement}
+     * @param object $criteria {@link CriteriaElement}
      *
      * @return bool FALSE if update failed
      * @access    public
      */
     public function updateAll($fieldname, $fieldvalue, $criteria = null)
     {
-        $set_clause = is_numeric($fieldvalue) ? $fieldname . ' = ' . $fieldvalue : $fieldname . ' = ' . $this->db->quoteString($fieldvalue);
-        $sql        = 'UPDATE ' . $this->db->prefix($this->dbtable) . ' SET ' . $set_clause;
+        $setClause = is_numeric($fieldvalue) ? $fieldname . ' = ' . $fieldvalue : $fieldname . ' = ' . $this->db->quoteString($fieldvalue);
+        $sql        = 'UPDATE ' . $this->db->prefix($this->dbtable) . ' SET ' . $setClause;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             $sql .= ' ' . $criteria->renderWhere();
         }
@@ -358,7 +358,7 @@ public function &getInstance(&$db)
  * PublisherMimetype class
  *
  * @author  Eric Juden <ericj@epcusa.com>
- * @access public
+ * @access  public
  * @package publisher
  */
 class PublisherMimetype extends XoopsObject
@@ -400,9 +400,9 @@ class PublisherMimetypeHandler extends PublisherBaseObjectHandler
     /**
      * Constructor
      *
-     * @param XoopsDatabase $db reference to a xoopsDB object
+     * @param null|XoopsDatabase $db reference to a xoopsDB object
      */
-    public function __construct(&$db)
+    public function __construct(XoopsDatabase $db)
     {
         parent::init($db);
     }
@@ -470,33 +470,33 @@ public function &getObjects($criteria = null)
     /**
      * Format mime_types into array
      *
-     * @param null $mime_ext
+     * @param null $mimeExt
      *
      * @return array array of mime_types
      */
-    public function getArray($mime_ext = null)
+    public function getArray($mimeExt = null)
     {
-//        global $publisher_isAdmin;
+        //        global $publisherIsAdmin;
         $ret = array();
-        if ($GLOBALS['xoopsUser'] && !$GLOBALS['publisher_isAdmin']) {
+        if ($GLOBALS['xoopsUser'] && !$GLOBALS['publisherIsAdmin']) {
             // For user uploading
             $crit = new CriteriaCompo(new Criteria('mime_user', 1)); //$sql = sprintf("SELECT * FROM %s WHERE mime_user=1", $GLOBALS['xoopsDB']->prefix('publisher_mimetypes'));
-        } elseif ($GLOBALS['xoopsUser'] && $GLOBALS['publisher_isAdmin']) {
+        } elseif ($GLOBALS['xoopsUser'] && $GLOBALS['publisherIsAdmin']) {
             // For admin uploading
             $crit = new CriteriaCompo(new Criteria('mime_admin', 1)); //$sql = sprintf("SELECT * FROM %s WHERE mime_admin=1", $GLOBALS['xoopsDB']->prefix('publisher_mimetypes'));
         } else {
             return $ret;
         }
-        if ($mime_ext) {
-            $crit->add(new Criteria('mime_ext', $mime_ext));
+        if ($mimeExt) {
+            $crit->add(new Criteria('mime_ext', $mimeExt));
         }
-        $result = $this->getObjects($crit);
+        $result =& $this->getObjects($crit);
         // if no records from db, return empty array
         if (!$result) {
             return $ret;
         }
         foreach ($result as $mime) {
-            $line = explode(" ", $mime->getVar('mime_types'));
+            $line = explode(' ', $mime->getVar('mime_types'));
             foreach ($line as $row) {
                 $ret[] = array('type' => $row, 'ext' => $mime->getVar('mime_ext'));
             }
@@ -508,12 +508,12 @@ public function getArray($mime_ext = null)
     /**
      * Checks to see if the user uploading the file has permissions to upload this mimetype
      *
-     * @param string $post_field file being uploaded
+     * @param string $postField file being uploaded
      *
      * @return bool false if no permission, return mimetype if has permission
      * @access public
      */
-    public function checkMimeTypes($post_field)
+    public function checkMimeTypes($postField)
     {
         $ret               = false;
         $allowed_mimetypes = $this->getArrayByType();
@@ -521,7 +521,7 @@ public function checkMimeTypes($post_field)
             return $ret;
         }
         foreach ($allowed_mimetypes as $mime) {
-            if ($mime == $_FILES[$post_field]['type']) {
+            if ($mime == $_FILES[$postField]['type']) {
                 $ret = $mime;
                 break;
             }
@@ -557,19 +557,19 @@ public function getArrayByType()
      */
     private function selectQuery($criteria = null, $join = false)
     {
-//        if (!$join) {
-//            $sql = sprintf('SELECT * FROM %s', $this->db->prefix($this->dbtable));
-//        } else {
-//            echo "no need for join...";
-//            exit;
-//        }
+        //        if (!$join) {
+        //            $sql = sprintf('SELECT * FROM %s', $this->db->prefix($this->dbtable));
+        //        } else {
+        //            echo "no need for join...";
+        //            exit;
+        //        }
 
         try {
             if ($join) {
-                throw new Exception("no need for join...");
+                throw new Exception('no need for join...');
             }
         } catch (Exception $e) {
-            echo "no need for join...";
+            echo 'no need for join...';
         };
 
         $sql = sprintf('SELECT * FROM %s', $this->db->prefix($this->dbtable));
@@ -595,9 +595,8 @@ protected function insertQuery(&$obj)
         foreach ($obj->cleanVars as $k => $v) {
             ${$k} = $v;
         }
-        $sql = sprintf("INSERT INTO %s (mime_id, mime_ext, mime_types, mime_name, mime_admin, mime_user) VALUES
-            (%u, %s, %s, %s, %u, %u)", $this->db->prefix($this->dbtable), $obj->getVar('mime_id'), $this->db->quoteString($obj->getVar('mime_ext')),
-            $this->db->quoteString($obj->getVar('mime_types')), $this->db->quoteString($obj->getVar('mime_name')), $obj->getVar('mime_admin'), $obj->getVar('mime_user'));
+        $sql = sprintf('INSERT INTO %s (mime_id, mime_ext, mime_types, mime_name, mime_admin, mime_user) VALUES
+            (%u, %s, %s, %s, %u, %u)', $this->db->prefix($this->dbtable), $obj->getVar('mime_id'), $this->db->quoteString($obj->getVar('mime_ext')), $this->db->quoteString($obj->getVar('mime_types')), $this->db->quoteString($obj->getVar('mime_name')), $obj->getVar('mime_admin'), $obj->getVar('mime_user'));
 
         return $sql;
     }
@@ -613,9 +612,8 @@ protected function updateQuery(&$obj)
         foreach ($obj->cleanVars as $k => $v) {
             ${$k} = $v;
         }
-        $sql = sprintf("UPDATE %s SET mime_ext = %s, mime_types = %s, mime_name = %s, mime_admin = %u, mime_user = %u WHERE
-            mime_id = %u", $this->db->prefix($this->dbtable), $this->db->quoteString($obj->getVar('mime_ext')),
-                       $this->db->quoteString($obj->getVar('mime_types')), $this->db->quoteString($obj->getVar('mime_name')), $obj->getVar('mime_admin'), $obj->getVar('mime_user'), $obj->getVar('mime_id'));
+        $sql = sprintf('UPDATE %s SET mime_ext = %s, mime_types = %s, mime_name = %s, mime_admin = %u, mime_user = %u WHERE
+            mime_id = %u', $this->db->prefix($this->dbtable), $this->db->quoteString($obj->getVar('mime_ext')), $this->db->quoteString($obj->getVar('mime_types')), $this->db->quoteString($obj->getVar('mime_name')), $obj->getVar('mime_admin'), $obj->getVar('mime_user'), $obj->getVar('mime_id'));
 
         return $sql;
     }
diff --git a/publisher/class/permission.php b/publisher/class/permission.php
index 02a5c511..6bd96338 100644
--- a/publisher/class/permission.php
+++ b/publisher/class/permission.php
@@ -32,37 +32,37 @@ class PublisherPermissionHandler extends XoopsObjectHandler
      * @var PublisherPublisher
      * @access public
      */
-    public $publisher = null;
+    public $publisher;
 
     /**
      *
      */
     public function __construct()
     {
-        $this->publisher = PublisherPublisher::getInstance();
+        $this->publisher =& PublisherPublisher::getInstance();
     }
 
     /**
      * Returns permissions for a certain type
      *
-     * @param string $gperm_name "global", "forum" or "topic" (should perhaps have "post" as well - but I don't know)
+     * @param string $gpermName "global", "forum" or "topic" (should perhaps have "post" as well - but I don't know)
      * @param int    $id         id of the item (forum, topic or possibly post) to get permissions for
      *
      * @return array
      */
-    public function getGrantedGroupsById($gperm_name, $id)
+    public function getGrantedGroupsById($gpermName, $id)
     {
         static $items;
-        if (isset($items[$gperm_name][$id])) {
-            return $items[$gperm_name][$id];
+        if (isset($items[$gpermName][$id])) {
+            return $items[$gpermName][$id];
         }
         $groups   = array();
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('gperm_modid', $this->publisher->getModule()->getVar('mid')));
-        $criteria->add(new Criteria('gperm_name', $gperm_name));
+        $criteria->add(new Criteria('gperm_name', $gpermName));
         $criteria->add(new Criteria('gperm_itemid', $id));
         //Instead of calling groupperm handler and get objects, we will save some memory and do it our way
-        $db    = XoopsDatabaseFactory::getDatabaseConnection();
+        $db    =& XoopsDatabaseFactory::getDatabaseConnection();
         $limit = $start = 0;
         $sql   = 'SELECT gperm_groupid FROM ' . $db->prefix('group_permission');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
@@ -74,7 +74,7 @@ public function getGrantedGroupsById($gperm_name, $id)
         while (($myrow = $db->fetchArray($result)) !== false) {
             $groups[$myrow['gperm_groupid']] = $myrow['gperm_groupid'];
         }
-        $items[$gperm_name][$id] = $groups;
+        $items[$gpermName][$id] = $groups;
 
         return $groups;
     }
@@ -82,20 +82,20 @@ public function getGrantedGroupsById($gperm_name, $id)
     /**
      * Returns permissions for a certain type
      *
-     * @param string $gperm_name "global", "forum" or "topic" (should perhaps have "post" as well - but I don't know)
+     * @param string $gpermName "global", "forum" or "topic" (should perhaps have "post" as well - but I don't know)
      *
      * @return array
      */
-    public function getGrantedItems($gperm_name)
+    public function getGrantedItems($gpermName)
     {
         static $items;
-        if (isset($items[$gperm_name])) {
-            return $items[$gperm_name];
+        if (isset($items[$gpermName])) {
+            return $items[$gpermName];
         }
 
         $ret = array();
         //Instead of calling groupperm handler and get objects, we will save some memory and do it our way
-        $criteria = new CriteriaCompo(new Criteria('gperm_name', $gperm_name));
+        $criteria = new CriteriaCompo(new Criteria('gperm_name', $gpermName));
         $criteria->add(new Criteria('gperm_modid', $this->publisher->getModule()->getVar('mid')));
 
         //Get user's groups
@@ -105,30 +105,30 @@ public function getGrantedItems($gperm_name)
             $criteria2->add(new Criteria('gperm_groupid', $gid), 'OR');
         }
         $criteria->add($criteria2);
-        $db  = XoopsDatabaseFactory::getDatabaseConnection();
+        $db  =& XoopsDatabaseFactory::getDatabaseConnection();
         $sql = 'SELECT gperm_itemid FROM ' . $db->prefix('group_permission');
         $sql .= ' ' . $criteria->renderWhere();
         $result = $db->query($sql, 0, 0);
         while (($myrow = $db->fetchArray($result)) !== false) {
             $ret[$myrow['gperm_itemid']] = $myrow['gperm_itemid'];
         }
-        $items[$gperm_name] = $ret;
+        $items[$gpermName] = $ret;
 
         return $ret;
     }
 
     /**
-     * @param string $gperm_name
+     * @param string $gpermName
      * @param int    $id
      *
      * @return bool
      */
-    public function isGranted($gperm_name, $id)
+    public function isGranted($gpermName, $id)
     {
         if (!$id) {
             return false;
         }
-        $permissions = $this->getGrantedItems($gperm_name);
+        $permissions = $this->getGrantedItems($gpermName);
         if (!empty($permissions) && isset ($permissions[$id])) {
             return true;
         } else {
@@ -141,23 +141,23 @@ public function isGranted($gperm_name, $id)
      *  saveCategoryPermissions()
      *
      * @param array   $groups    : group with granted permission
-     * @param integer $itemid    : itemid on which we are setting permissions for Categories and Forums
-     * @param string  $perm_name : name of the permission
+     * @param integer $itemId    : itemid on which we are setting permissions for Categories and Forums
+     * @param string  $permName : name of the permission
      *
      * @return boolean : TRUE if the no errors occured
      */
-    public function saveItemPermissions($groups, $itemid, $perm_name)
+    public function saveItemPermissions($groups, $itemId, $permName)
     {
         $result        = true;
-        $module_id     = $this->publisher->getModule()->getVar('mid');
-        $gperm_handler = xoops_gethandler('groupperm');
+        $moduleId     = $this->publisher->getModule()->getVar('mid');
+        $gpermHandler =& xoops_getHandler('groupperm');
         // First, if the permissions are already there, delete them
-        $gperm_handler->deleteByModule($module_id, $perm_name, $itemid);
+        $gpermHandler->deleteByModule($moduleId, $permName, $itemId);
         // Save the new permissions
         if (count($groups) > 0) {
-            foreach ($groups as $group_id) {
-                echo $group_id . "-";
-                echo $gperm_handler->addRight($perm_name, $itemid, $group_id, $module_id);
+            foreach ($groups as $groupId) {
+                echo $groupId . '-';
+                echo $gpermHandler->addRight($permName, $itemId, $groupId, $moduleId);
             }
         }
 
@@ -168,16 +168,16 @@ public function saveItemPermissions($groups, $itemid, $perm_name)
      * Delete all permission for a specific item
      *  deletePermissions()
      *
-     * @param integer $itemid     : id of the item for which to delete the permissions
-     * @param string  $gperm_name
+     * @param integer $itemId : id of the item for which to delete the permissions
+     * @param string  $gpermName
      *
      * @return boolean : TRUE if the no errors occured
      */
-    public function deletePermissions($itemid, $gperm_name)
+    public function deletePermissions($itemId, $gpermName)
     {
         $result        = true;
-        $gperm_handler = xoops_gethandler('groupperm');
-        $gperm_handler->deleteByModule($this->publisher->getModule()->getVar('mid'), $gperm_name, $itemid);
+        $gpermHandler =& xoops_getHandler('groupperm');
+        $gpermHandler->deleteByModule($this->publisher->getModule()->getVar('mid'), $gpermName, $itemId);
 
         return $result;
     }
diff --git a/publisher/class/plugins/plugin.tag.php b/publisher/class/plugins/plugin.tag.php
new file mode 100644
index 00000000..d3a7e79a
--- /dev/null
+++ b/publisher/class/plugins/plugin.tag.php
@@ -0,0 +1,65 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright       The XUUPS Project http://sourceforge.net/projects/xuups/
+ * @license         http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package         Publisher
+ * @subpackage      Include
+ * @since           1.0
+ * @author          trabis <lusopoemas@gmail.com>
+ * @author          The SmartFactory <www.smartfactory.ca>
+ * @version         $Id: plugin.tag.php 10374 2012-12-12 23:39:48Z trabis $
+ */
+
+// defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
+
+/** Get item fields: title, content, time, link, uid, uname, tags *
+ *
+ * @param $items
+ */
+function publisher_tag_iteminfo(&$items)
+{
+    $itemsId = array();
+    foreach (array_keys($items) as $catId) {
+        // Some handling here to build the link upon catid
+        // if catid is not used, just skip it
+        foreach (array_keys($items[$catId]) as $itemId) {
+            // In article, the item_id is "art_id"
+            $itemsId[] = (int)($itemId);
+        }
+    }
+    $itemHandler =& xoops_getModuleHandler('item', 'publisher');
+    $criteria     = new Criteria('itemid', '(' . implode(', ', $itemsId) . ')', 'IN');
+    $itemsObj    = $itemHandler->getObjects($criteria, 'itemid');
+
+    foreach (array_keys($items) as $catId) {
+        foreach (array_keys($items[$catId]) as $itemId) {
+            $itemObj                = $itemsObj[$itemId];
+            $items[$catId][$itemId] = array(
+                'title'   => $itemObj->getVar('title'),
+                'uid'     => $itemObj->getVar('uid'),
+                'link'    => "item.php?itemid={$itemId}",
+                'time'    => $itemObj->getVar('datesub'),
+                'tags'    => tag_parse_tag($itemObj->getVar('item_tag', 'n')), // optional
+                'content' => '');
+        }
+    }
+    unset($itemsObj);
+}
+
+/** Remove orphan tag-item links *
+ * @param $mid
+ */
+function publisher_tag_synchronization($mid)
+{
+    // Optional
+}
diff --git a/publisher/class/publisher.php b/publisher/class/publisher.php
index 30a94317..cfbc1fa9 100644
--- a/publisher/class/publisher.php
+++ b/publisher/class/publisher.php
@@ -77,7 +77,7 @@ public function getConfig($name = null)
             $this->initConfig();
         }
         if (!$name) {
-            $this->addLog("Getting all config");
+            $this->addLog('Getting all config');
 
             return $this->config;
         }
@@ -115,12 +115,12 @@ public function setConfig($name = null, $value = null)
      */
     public function &getHandler($name)
     {
-        if (!isset($this->handler[$name . '_handler'])) {
+        if (!isset($this->handler[$name . 'Handler'])) {
             $this->initHandler($name);
         }
         $this->addLog("Getting handler '{$name}'");
 
-        return $this->handler[$name . '_handler'];
+        return $this->handler[$name . 'Handler'];
     }
 
     public function initModule()
@@ -128,7 +128,7 @@ public function initModule()
         if (isset($GLOBALS['xoopsModule']) && is_object($GLOBALS['xoopsModule']) && $GLOBALS['xoopsModule']->getVar('dirname') == $this->dirname) {
             $this->module = $GLOBALS['xoopsModule'];
         } else {
-            $hModule      = xoops_gethandler('module');
+            $hModule      =& xoops_getHandler('module');
             $this->module = $hModule->getByDirname($this->dirname);
         }
         $this->addLog('INIT MODULE');
@@ -137,7 +137,7 @@ public function initModule()
     public function initConfig()
     {
         $this->addLog('INIT CONFIG');
-        $hModConfig   = xoops_gethandler('config');
+        $hModConfig   =& xoops_getHandler('config');
         $this->config = $hModConfig->getConfigsByCat(0, $this->getModule()->getVar('mid'));
     }
 
@@ -147,7 +147,7 @@ public function initConfig()
     public function initHandler($name)
     {
         $this->addLog('INIT ' . $name . ' HANDLER');
-        $this->handler[$name . '_handler'] = xoops_getModuleHandler($name, $this->dirname);
+        $this->handler[$name . 'Handler'] =& xoops_getModuleHandler($name, $this->dirname);
     }
 
     /**
diff --git a/publisher/class/rating.php b/publisher/class/rating.php
index bebeae4a..1bc380f7 100644
--- a/publisher/class/rating.php
+++ b/publisher/class/rating.php
@@ -32,12 +32,12 @@ class PublisherRating extends XoopsObject
      */
     public function __construct()
     {
-        $this->initVar("ratingid", XOBJ_DTYPE_INT, null, false);
-        $this->initVar("itemid", XOBJ_DTYPE_INT, null, false);
-        $this->initVar("uid", XOBJ_DTYPE_INT, null, false);
-        $this->initVar("rate", XOBJ_DTYPE_INT, null, false);
-        $this->initVar("ip", XOBJ_DTYPE_TXTAREA, null, false);
-        $this->initVar("date", XOBJ_DTYPE_INT, null, false);
+        $this->initVar('ratingid', XOBJ_DTYPE_INT, null, false);
+        $this->initVar('itemid', XOBJ_DTYPE_INT, null, false);
+        $this->initVar('uid', XOBJ_DTYPE_INT, null, false);
+        $this->initVar('rate', XOBJ_DTYPE_INT, null, false);
+        $this->initVar('ip', XOBJ_DTYPE_TXTAREA, null, false);
+        $this->initVar('date', XOBJ_DTYPE_INT, null, false);
     }
 }
 
@@ -49,7 +49,7 @@ class PublisherRatingHandler extends XoopsPersistableObjectHandler
     /**
      * @param null|XoopsDatabase $db
      */
-    public function __construct($db)
+    public function __construct(XoopsDatabase $db)
     {
         parent::__construct($db, 'publisher_rating', 'PublisherRating', 'ratingid', 'itemid');
     }
diff --git a/publisher/class/themetabform.php b/publisher/class/themetabform.php
index b7b7cb67..9b714943 100644
--- a/publisher/class/themetabform.php
+++ b/publisher/class/themetabform.php
@@ -30,67 +30,67 @@
  * @author    John
  * @copyright Copyright (c) 2009
  * @version   $Id: themetabform.php 10374 2012-12-12 23:39:48Z trabis $
- * @access public
+ * @access    public
  */
 class PublisherThemeTabForm extends XoopsForm
 {
-    public $_tabs;
+    public $formTabs = array();
 
     /**
      * "action" attribute for the html form
      *
      * @var string
      */
-    public $_action;
+    public $action;
 
     /**
      * "method" attribute for the form.
      *
      * @var string
      */
-    public $_method;
+    public $method;
 
     /**
      * "name" attribute of the form
      *
      * @var string
      */
-    public $_name;
+    public $name;
 
     /**
      * title for the form
      *
      * @var string
      */
-    public $_title;
+    public $title;
 
     /**
      * summary for the form (WGAC2 Requirement)
      *
      * @var string
      */
-    public $_summary = '';
+    public $summary = '';
 
     /**
      * array of {@link XoopsFormElement} objects
      *
      * @var array
      */
-    public $_elements = array();
+    public $elements = array();
 
     /**
      * extra information for the <form> tag
      *
      * @var array
      */
-    public $_extra = array();
+    public $extra = array();
 
     /**
      * required elements
      *
      * @var array
      */
-    public $_required = array();
+    public $required = array();
 
     /**
      * @param string $title
@@ -100,21 +100,21 @@ class PublisherThemeTabForm extends XoopsForm
      * @param bool   $addtoken
      * @param string $summary
      */
-    public function __construct($title, $name, $action, $method = "post", $addtoken = false, $summary = '')
+    public function __construct($title, $name, $action, $method = 'post', $addtoken = false, $summary = '')
     {
-//        global $xoTheme;
-//        $GLOBALS['xoTheme']->addScript(PUBLISHER_URL . '/assets/js/ui.core.js');
-//        $GLOBALS['xoTheme']->addScript(PUBLISHER_URL . '/assets/js/ui.tabs.js');
-//        $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/jquery-ui-1.7.1.custom.css');
+        //        global $xoTheme;
+        //        $GLOBALS['xoTheme']->addScript(PUBLISHER_URL . '/assets/js/ui.core.js');
+        //        $GLOBALS['xoTheme']->addScript(PUBLISHER_URL . '/assets/js/ui.tabs.js');
+        //        $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/jquery-ui-1.7.1.custom.css');
 
         $GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
         $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
 
-        $this->_title   = $title;
-        $this->_name    = $name;
-        $this->_action  = $action;
-        $this->_method  = $method;
-        $this->_summary = $summary;
+        $this->title   = $title;
+        $this->name    = $name;
+        $this->action  = $action;
+        $this->method  = $method;
+        $this->summary = $summary;
         if ($addtoken !== false) {
             $this->addElement(new XoopsFormHiddenToken());
         }
@@ -130,15 +130,15 @@ public function assign(&$tpl)
         $tab      = -1;
         $elements = array();
         if (count($this->getRequired()) > 0) {
-            $this->_elements[] = "<tr class='foot'><td colspan='2'>* = " . _REQUIRED . "</td></tr>";
+            $this->elements[] = "<tr class='foot'><td colspan='2'>* = " . _REQUIRED . '</td></tr>';
         }
         foreach ($this->getElements() as $ele) {
             ++$i;
-            if (is_string($ele) && $ele == 'addTab') {
+            if (is_string($ele) && $ele === 'addTab') {
                 ++$tab;
                 continue;
             }
-            if (is_string($ele) && $ele == 'endTabs') {
+            if (is_string($ele) && $ele === 'endTabs') {
                 $tab = -1;
                 continue;
             }
@@ -147,26 +147,30 @@ public function assign(&$tpl)
                 $elements[$i]['tab']  = $tab;
                 continue;
             }
-            $ele_name                 = $ele->getName();
-            $ele_description          = $ele->getDescription();
-            $n                        = $ele_name ? $ele_name : $i;
-            $elements[$n]['name']     = $ele_name;
+            $eleName                 = $ele->getName();
+            $eleDescription          = $ele->getDescription();
+            $n                        = $eleName ?: $i;
+            $elements[$n]['name']     = $eleName;
             $elements[$n]['caption']  = $ele->getCaption();
             $elements[$n]['body']     = $ele->render();
             $elements[$n]['hidden']   = $ele->isHidden() ? true : false;
             $elements[$n]['required'] = $ele->isRequired();
-            if ($ele_description != '') {
-                $elements[$n]['description'] = $ele_description;
+            if ($eleDescription != '') {
+                $elements[$n]['description'] = $eleDescription;
             }
             $elements[$n]['tab'] = $tab;
         }
         $js = $this->renderValidationJS();
         $tpl->assign($this->getName(), array(
-            'title'      => $this->getTitle(), 'id' => 'tab_' . preg_replace('/[^a-z0-9]+/i', '', $this->getTitle()),
-            'name'       => $this->getName(), 'action' => $this->getAction(), 'method' => $this->getMethod(),
+            'title'      => $this->getTitle(),
+            'id'         => 'tab_' . preg_replace('/[^a-z0-9]+/i', '', $this->getTitle()),
+            'name'       => $this->getName(),
+            'action'     => $this->getAction(),
+            'method'     => $this->getMethod(),
             'extra'      => 'onsubmit="return xoopsFormValidate_' . $this->getName() . '();"' . $this->getExtra(),
-            'javascript' => $js, 'tabs' => $this->_tabs, 'elements' => $elements
-        ));
+            'javascript' => $js,
+            'tabs'       => $this->formTabs,
+            'elements'   => $elements));
     }
 
     /**
@@ -176,16 +180,15 @@ public function assign(&$tpl)
      */
     public function startTab($tabText)
     {
-        $this->addElement($this->_startTab($tabText));
+        $this->addElement($this->startFormTabs($tabText));
     }
 
     /**
      * XoopsThemeTabForm::endTab()
-
      */
     public function endTabs()
     {
-        $this->addElement($this->_endTabs());
+        $this->addElement($this->endFormTabs());
     }
 
     /**
@@ -195,9 +198,9 @@ public function endTabs()
      *
      * @return string
      */
-    public function _startTab($tabText)
+    public function startFormTabs($tabText)
     {
-        $this->_tabs[] = $tabText;
+        $this->formTabs[] = $tabText;
         $ret           = 'addTab';
 
         return $ret;
@@ -208,7 +211,7 @@ public function _startTab($tabText)
      *
      * @return string
      */
-    public function _endTabs()
+    public function endFormTabs()
     {
         $ret = 'endTabs';
 
@@ -222,7 +225,7 @@ public function _endTabs()
      */
     public function getSummary($encode = false)
     {
-        return $encode ? htmlspecialchars($this->_summary, ENT_QUOTES) : $this->_summary;
+        return $encode ? htmlspecialchars($this->summary, ENT_QUOTES) : $this->summary;
     }
 
     /**
@@ -234,7 +237,7 @@ public function getSummary($encode = false)
      */
     public function getTitle($encode = false)
     {
-        return $encode ? htmlspecialchars($this->_title, ENT_QUOTES) : $this->_title;
+        return $encode ? htmlspecialchars($this->title, ENT_QUOTES) : $this->title;
     }
 
     /**
@@ -247,7 +250,7 @@ public function getTitle($encode = false)
      */
     public function getName($encode = true)
     {
-        return $encode ? htmlspecialchars($this->_name, ENT_QUOTES) : $this->_name;
+        return $encode ? htmlspecialchars($this->name, ENT_QUOTES) : $this->name;
     }
 
     /**
@@ -260,7 +263,7 @@ public function getName($encode = true)
     public function getAction($encode = true)
     {
         // Convert &amp; to & for backward compatibility
-        return $encode ? htmlspecialchars(str_replace('&amp;', '&', $this->_action), ENT_QUOTES) : $this->_action;
+        return $encode ? htmlspecialchars(str_replace('&amp;', '&', $this->action), ENT_QUOTES) : $this->action;
     }
 
     /**
@@ -270,7 +273,7 @@ public function getAction($encode = true)
      */
     public function getMethod()
     {
-        return (strtolower($this->_method) == 'get') ? 'get' : 'post';
+        return (strtolower($this->method) === 'get') ? 'get' : 'post';
     }
 
     /**
@@ -282,16 +285,16 @@ public function getMethod()
     public function addElement(&$formElement, $required = false)
     {
         if (is_string($formElement)) {
-            $this->_elements[] = $formElement;
+            $this->elements[] =& $formElement;
         } elseif (is_subclass_of($formElement, 'xoopsformelement')) {
-            $this->_elements[] = &$formElement;
+            $this->elements[] = &$formElement;
             if ($required) {
                 if (method_exists($formElement, 'setRequired')) {
                     $formElement->setRequired(true);
                 } else {
-                    $formElement->_required = true;
+                    $formElement->required = true;
                 }
-                $this->_required[] = &$formElement;
+                $this->required[] = &$formElement;
             }
         }
     }
@@ -306,13 +309,13 @@ public function addElement(&$formElement, $required = false)
     public function getElements($recurse = false)
     {
         if (!$recurse) {
-            return $this->_elements;
+            return $this->elements;
         } else {
             $ret   = array();
-            $count = count($this->_elements);
+            $count = count($this->elements);
             for ($i = 0; $i < $count; ++$i) {
-                if (is_object($this->_elements[$i])) {
-                    $ret[] = &$this->_elements[$i];
+                if (is_object($this->elements[$i])) {
+                    $ret[] = &$this->elements[$i];
                 }
             }
 
@@ -441,7 +444,7 @@ public function getElementValues($encode = false)
     public function setExtra($extra)
     {
         if (!empty($extra)) {
-            $this->_extra[] = $extra;
+            $this->extra[] = $extra;
         }
     }
 
@@ -453,7 +456,7 @@ public function setExtra($extra)
     public function setSummary($summary)
     {
         if (!empty($summary)) {
-            $this->_summary = strip_tags($summary);
+            $this->summary = strip_tags($summary);
         }
     }
 
@@ -464,7 +467,7 @@ public function setSummary($summary)
      */
     public function &getExtra()
     {
-        $extra = empty($this->_extra) ? '' : ' ' . implode(' ', $this->_extra);
+        $extra = empty($this->extra) ? '' : ' ' . implode(' ', $this->extra);
 
         return $extra;
     }
@@ -472,11 +475,11 @@ public function &getExtra()
     /**
      * make an element "required"
      *
-     * @param object $formElement reference to a {@link XoopsFormElement}
+     * @param XoopsFormElement $formElement reference to a {@link XoopsFormElement}
      */
-    public function setRequired(&$formElement)
+    public function setRequired(XoopsFormElement $formElement)
     {
-        $this->_required[] = &$formElement;
+        $this->required[] = &$formElement;
     }
 
     /**
@@ -486,7 +489,7 @@ public function setRequired(&$formElement)
      */
     public function getRequired()
     {
-        return $this->_required;
+        return $this->required;
     }
 
     /**
diff --git a/publisher/class/uploader.php b/publisher/class/uploader.php
index aa59e10c..c4e131b9 100644
--- a/publisher/class/uploader.php
+++ b/publisher/class/uploader.php
@@ -72,9 +72,9 @@
  * }
  * </code>
  *
- * @package    kernel
- * @subpackage core
- * @author     Kazumi Ono <onokazu@xoops.org>
+ * @package        kernel
+ * @subpackage     core
+ * @author         Kazumi Ono <onokazu@xoops.org>
  * @copyright  (c) 2000-2003 The Xoops Project - www.xoops.org
  */
 mt_srand((double)microtime() * 1000000);
@@ -104,7 +104,7 @@ class XoopsMediaUploader
     /**
      * No admin check for uploads
      */
-    public $noadmin_sizecheck;
+    private $noAdminSizeCheck;
 
     /**
      * Constructor
@@ -133,42 +133,42 @@ public function __construct($uploadDir, $allowedMimeTypes = 0, $maxFileSize, $ma
     /**
      * @param $value
      */
-    public function noAdminSizeCheck($value)
+    public function setNoAdminSizeCheck($value)
     {
-        $this->noadmin_sizecheck = $value;
+        $this->noAdminSizeCheck = $value;
     }
 
     /**
      * Fetch the uploaded file
      *
-     * @param string $media_name Name of the file field
+     * @param string $mediaName Name of the file field
      * @param int    $index      Index of the file (if more than one uploaded under that name)
      *
      * @global       $HTTP_POST_FILES
      * @return bool
      */
-    public function fetchMedia($media_name, $index = null)
+    public function fetchMedia($mediaName, $index = null)
     {
         global $_FILES;
-        if (!isset($_FILES[$media_name])) {
+        if (!isset($_FILES[$mediaName])) {
             $this->setErrors('You either did not choose a file to upload or the server has insufficient read/writes to upload this file.!');
 
             return false;
-        } elseif (is_array($_FILES[$media_name]['name']) && isset($index)) {
+        } elseif (isset($index) && is_array($_FILES[$mediaName]['name'])) {
             $index              = (int)($index);
-            $this->mediaName    = (get_magic_quotes_gpc()) ? stripslashes($_FILES[$media_name]['name'][$index]) : $_FILES[$media_name]['name'][$index];
-            $this->mediaType    = $_FILES[$media_name]['type'][$index];
-            $this->mediaSize    = $_FILES[$media_name]['size'][$index];
-            $this->mediaTmpName = $_FILES[$media_name]['tmp_name'][$index];
-            $this->mediaError   = !empty($_FILES[$media_name]['error'][$index]) ? $_FILES[$media_name]['errir'][$index] : 0;
+            $this->mediaName    = $_FILES[$mediaName]['name'][$index];
+            $this->mediaType    = $_FILES[$mediaName]['type'][$index];
+            $this->mediaSize    = $_FILES[$mediaName]['size'][$index];
+            $this->mediaTmpName = $_FILES[$mediaName]['tmp_name'][$index];
+            $this->mediaError   = !empty($_FILES[$mediaName]['error'][$index]) ? $_FILES[$mediaName]['errir'][$index] : 0;
         } else {
-            $media_name         = @$_FILES[$media_name];
-            $this->mediaName    = (get_magic_quotes_gpc()) ? stripslashes($media_name['name']) : $media_name['name'];
-            $this->mediaName    = $media_name['name'];
-            $this->mediaType    = $media_name['type'];
-            $this->mediaSize    = $media_name['size'];
-            $this->mediaTmpName = $media_name['tmp_name'];
-            $this->mediaError   = !empty($media_name['error']) ? $media_name['error'] : 0;
+            $mediaName         = @$_FILES[$mediaName];
+            $this->mediaName    = $mediaName['name'];
+            $this->mediaName    = $mediaName['name'];
+            $this->mediaType    = $mediaName['type'];
+            $this->mediaSize    = $mediaName['size'];
+            $this->mediaTmpName = $mediaName['tmp_name'];
+            $this->mediaError   = !empty($mediaName['error']) ? $mediaName['error'] : 0;
         }
         $this->dimension = getimagesize($this->mediaTmpName);
         $this->errors    = array();
@@ -177,12 +177,12 @@ public function fetchMedia($media_name, $index = null)
 
             return false;
         }
-        if ($this->mediaName == '') {
+        if ('' === $this->mediaName) {
             $this->setErrors('Filename Is Empty');
 
             return false;
         }
-        if ($this->mediaTmpName == 'none') {
+        if ('none' === $this->mediaTmpName) {
             $this->setErrors('No file uploaded, this is a error');
 
             return false;
@@ -333,7 +333,7 @@ public function upload($chmod = 0644)
         if (!is_dir($this->uploadDir)) {
             $this->setErrors('Failed opening directory: ' . $this->uploadDir);
         }
-        if (!is_writeable($this->uploadDir)) {
+        if (!is_writable($this->uploadDir)) {
             $this->setErrors('Failed opening directory with write permission: ' . $this->uploadDir);
         }
         if (!$this->checkMaxFileSize()) {
@@ -350,7 +350,7 @@ public function upload($chmod = 0644)
         if (!$this->checkMimeType()) {
             $this->setErrors('MIME type not allowed: ' . $this->mediaType);
         }
-        if (!$this->_copyFile($chmod)) {
+        if (!$this->copyFile($chmod)) {
             $this->setErrors('Failed uploading file: ' . $this->mediaName);
         }
         if (count($this->errors) > 0) {
@@ -367,7 +367,7 @@ public function upload($chmod = 0644)
      *
      * @return bool
      */
-    public function _copyFile($chmod)
+    public function copyFile($chmod)
     {
         $matched = array();
         if (!preg_match("/\.([a-zA-Z0-9]+)$/", $this->mediaName, $matched)) {
@@ -376,7 +376,7 @@ public function _copyFile($chmod)
         if (isset($this->targetFileName)) {
             $this->savedFileName = $this->targetFileName;
         } elseif (isset($this->prefix)) {
-            $this->savedFileName = uniqid($this->prefix) . '.' . strtolower($matched[1]);
+            $this->savedFileName = uniqid($this->prefix, true) . '.' . strtolower($matched[1]);
         } else {
             $this->savedFileName = strtolower($this->mediaName);
         }
@@ -402,7 +402,7 @@ public function _copyFile($chmod)
      */
     public function checkMaxFileSize()
     {
-        if ($this->noadmin_sizecheck) {
+        if ($this->noAdminSizeCheck) {
             return true;
         }
         if ($this->mediaSize > $this->maxFileSize) {
diff --git a/publisher/class/utilities.php b/publisher/class/utilities.php
index f14e79b9..e1adfb63 100644
--- a/publisher/class/utilities.php
+++ b/publisher/class/utilities.php
@@ -24,7 +24,6 @@
 
 //namespace Publisher;
 
-
 /**
  * Class PublisherUtilities
  */
@@ -41,10 +40,9 @@ class PublisherUtilities
     public static function prepareFolder($folder)
     {
         if (!is_dir($folder)) {
-            mkdir($folder, 0777);
+            mkdir($folder);
             file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
         }
-        chmod($folder, 0777);
     }
 
     /**
@@ -54,9 +52,9 @@ public static function prepareFolder($folder)
     public static function recurseCopy($src, $dst)
     {
         $dir = opendir($src);
-//    @mkdir($dst);
+        //    @mkdir($dst);
         while (false !== ($file = readdir($dir))) {
-            if (($file != '.') && ($file != '..')) {
+            if (($file !== '.') && ($file !== '..')) {
                 if (is_dir($src . '/' . $file)) {
                     self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
                 } else {
@@ -68,11 +66,11 @@ public static function recurseCopy($src, $dst)
     }
 
     // auto create folders----------------------------------------
-//TODO rename this function? And exclude image folder?
+    //TODO rename this function? And exclude image folder?
     public static function createDir()
     {
         // auto crate folders
-//        $thePath = publisherGetUploadDir();
+        //        $thePath = publisherGetUploadDir();
 
         if (publisherGetPathStatus('root', true) < 0) {
             $thePath = publisherGetUploadDir();
@@ -85,8 +83,8 @@ public static function createDir()
             $res     = publisherMkdir($thePath);
 
             if ($res) {
-                $source = PUBLISHER_ROOT_PATH . "/assets/images/blank.png";
-                $dest   = $thePath . "blank.png";
+                $source = PUBLISHER_ROOT_PATH . '/assets/images/blank.png';
+                $dest   = $thePath . 'blank.png';
                 publisherCopyr($source, $dest);
             }
             $msg = $res ? _AM_PUBLISHER_DIRCREATED : _AM_PUBLISHER_DIRNOTCREATED;
@@ -126,14 +124,21 @@ public static function createDir()
     public static function buildTableItemTitleRow()
     {
         echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
-        echo "<tr>";
-        echo "<th width='40px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . "</strong></td>";
-        echo "<th width='100px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMCAT . "</strong></td>";
-        echo "<th class='bg3' align='center'><strong>" . _AM_PUBLISHER_TITLE . "</strong></td>";
-        echo "<th width='90px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . "</strong></td>";
-        echo "<th width='90px' class='bg3' align='center'><strong>" . _CO_PUBLISHER_STATUS . "</strong></td>";
-        echo "<th width='90px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
-        echo "</tr>";
+        echo '<tr>';
+        echo "<th width='40px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . '</strong></td>';
+        echo "<th width='100px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMCAT . '</strong></td>';
+        echo "<th class='bg3' align='center'><strong>" . _AM_PUBLISHER_TITLE . '</strong></td>';
+        echo "<th width='100px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . '</strong></td>';
+
+        echo "<th width='50px' class='bg3' align='center'><strong>" . _CO_PUBLISHER_WEIGHT . '</strong></td>';
+        echo "<th width='50px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_HITS . '</strong></td>';
+        echo "<th width='60px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_RATE . '</strong></td>';
+        echo "<th width='50px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_VOTES . '</strong></td>';
+        echo "<th width='60px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_COMMENTS_COUNT . '</strong></td>';
+
+        echo "<th width='90px' class='bg3' align='center'><strong>" . _CO_PUBLISHER_STATUS . '</strong></td>';
+        echo "<th width='90px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+        echo '</tr>';
     }
 
     /**
@@ -142,15 +147,15 @@ public static function buildTableItemTitleRow()
      */
     public static function displayCategory(PublisherCategory $categoryObj, $level = 0)
     {
-        $publisher = PublisherPublisher::getInstance();
+        $publisher =& PublisherPublisher::getInstance();
 
         $description = $categoryObj->description();
         if (!XOOPS_USE_MULTIBYTES) {
             if (strlen($description) >= 100) {
-                $description = substr($description, 0, (100 - 1)) . "...";
+                $description = substr($description, 0, (100 - 1)) . '...';
             }
         }
-        $modify = "<a href='category.php?op=mod&amp;categoryid=" . $categoryObj->categoryid() . "&amp;parentid=" . $categoryObj->parentid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITCOL . "' alt='" . _AM_PUBLISHER_EDITCOL . "' /></a>";
+        $modify = "<a href='category.php?op=mod&amp;categoryid=" . $categoryObj->categoryid() . '&amp;parentid=' . $categoryObj->parentid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITCOL . "' alt='" . _AM_PUBLISHER_EDITCOL . "' /></a>";
         $delete = "<a href='category.php?op=del&amp;categoryid=" . $categoryObj->categoryid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETECOL . "' alt='" . _AM_PUBLISHER_DELETECOL . "' /></a>";
 
         $spaces = '';
@@ -158,13 +163,13 @@ public static function displayCategory(PublisherCategory $categoryObj, $level =
             $spaces .= '&nbsp;&nbsp;&nbsp;';
         }
 
-        echo "<tr>";
-        echo "<td class='even' align='center'>" . $categoryObj->categoryid() . "</td>";
-        echo "<td class='even' align='left'>" . $spaces . "<a href='" . PUBLISHER_URL . "/category.php?categoryid=" . $categoryObj->categoryid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/subcat.gif' alt='' />&nbsp;" . $categoryObj->name() . "</a></td>";
-        echo "<td class='even' align='center'>" . $categoryObj->weight() . "</td>";
+        echo '<tr>';
+        echo "<td class='even' align='center'>" . $categoryObj->categoryid() . '</td>';
+        echo "<td class='even' align='left'>" . $spaces . "<a href='" . PUBLISHER_URL . '/category.php?categoryid=' . $categoryObj->categoryid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/subcat.gif' alt='' />&nbsp;" . $categoryObj->name() . '</a></td>';
+        echo "<td class='even' align='center'>" . $categoryObj->weight() . '</td>';
         echo "<td class='even' align='center'> $modify $delete </td>";
-        echo "</tr>";
-        $subCategoriesObj = $publisher->getHandler('category')->getCategories(0, 0, $categoryObj->categoryid());
+        echo '</tr>';
+        $subCategoriesObj =& $publisher->getHandler('category')->getCategories(0, 0, $categoryObj->categoryid());
         if (count($subCategoriesObj) > 0) {
             ++$level;
             foreach ($subCategoriesObj as $key => $thiscat) {
@@ -172,34 +177,34 @@ public static function displayCategory(PublisherCategory $categoryObj, $level =
             }
             unset($key, $thiscat);
         }
-        unset($categoryObj);
+//        unset($categoryObj);
     }
 
     /**
      * @param bool $showmenu
-     * @param int  $categoryid
-     * @param int  $nb_subcats
+     * @param int  $categoryId
+     * @param int  $nbSubCats
      * @param null $categoryObj
      */
-    public static function editCategory($showmenu = false, $categoryid = 0, $nb_subcats = 4, $categoryObj = null)
+    public static function editCategory($showmenu = false, $categoryId = 0, $nbSubCats = 4, $categoryObj = null)
     {
-        $publisher = PublisherPublisher::getInstance();
+        $publisher =& PublisherPublisher::getInstance();
 
         // if there is a parameter, and the id exists, retrieve data: we're editing a category
-        if ($categoryid != 0) {
+        if ($categoryId != 0) {
             // Creating the category object for the selected category
-            $categoryObj = $publisher->getHandler('category')->get($categoryid);
+            $categoryObj =& $publisher->getHandler('category')->get($categoryId);
             if ($categoryObj->notLoaded()) {
-                redirect_header("category.php", 1, _AM_PUBLISHER_NOCOLTOEDIT);
-//            exit();
+                redirect_header('category.php', 1, _AM_PUBLISHER_NOCOLTOEDIT);
+                //            exit();
             }
         } else {
             if (!$categoryObj) {
-                $categoryObj = $publisher->getHandler('category')->create();
+                $categoryObj =& $publisher->getHandler('category')->create();
             }
         }
 
-        if ($categoryid != 0) {
+        if ($categoryId != 0) {
             if ($showmenu) {
                 //publisher_adminMenu(1, _AM_PUBLISHER_CATEGORIES . " > " . _AM_PUBLISHER_EDITING);
             }
@@ -212,49 +217,49 @@ public static function editCategory($showmenu = false, $categoryid = 0, $nb_subc
             publisherOpenCollapsableBar('createtable', 'createtableicon', _AM_PUBLISHER_CATEGORY_CREATE, _AM_PUBLISHER_CATEGORY_CREATE_INFO);
         }
 
-        $sform = $categoryObj->getForm($nb_subcats);
+        $sform = $categoryObj->getForm($nbSubCats);
         $sform->display();
 
-        if (!$categoryid) {
+        if (!$categoryId) {
             publisherCloseCollapsableBar('createtable', 'createtableicon');
         } else {
             publisherCloseCollapsableBar('edittable', 'edittableicon');
         }
 
         //Added by fx2024
-        if ($categoryid) {
-            $sel_cat = $categoryid;
+        if ($categoryId) {
+            $selCat = $categoryId;
 
             publisherOpenCollapsableBar('subcatstable', 'subcatsicon', _AM_PUBLISHER_SUBCAT_CAT, _AM_PUBLISHER_SUBCAT_CAT_DSC);
             // Get the total number of sub-categories
-            $categoriesObj = $publisher->getHandler('category')->get($sel_cat);
-            $totalsubs     = $publisher->getHandler('category')->getCategoriesCount($sel_cat);
+            $categoriesObj =& $publisher->getHandler('category')->get($selCat);
+            $totalsubs     =& $publisher->getHandler('category')->getCategoriesCount($selCat);
             // creating the categories objects that are published
-            $subcatsObj    = $publisher->getHandler('category')->getCategories(0, 0, $categoriesObj->categoryid());
+            $subcatsObj    =& $publisher->getHandler('category')->getCategories(0, 0, $categoriesObj->categoryid());
             $totalSCOnPage = count($subcatsObj);
             echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
-            echo "<tr>";
-            echo "<td width='60' class='bg3' align='left'><strong>" . _AM_PUBLISHER_CATID . "</strong></td>";
-            echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_CATCOLNAME . "</strong></td>";
-            echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_SUBDESCRIPT . "</strong></td>";
-            echo "<td width='60' class='bg3' align='right'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
-            echo "</tr>";
+            echo '<tr>';
+            echo "<td width='60' class='bg3' align='left'><strong>" . _AM_PUBLISHER_CATID . '</strong></td>';
+            echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_CATCOLNAME . '</strong></td>';
+            echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_SUBDESCRIPT . '</strong></td>';
+            echo "<td width='60' class='bg3' align='right'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+            echo '</tr>';
             if ($totalsubs > 0) {
                 foreach ($subcatsObj as $subcat) {
-                    $modify = "<a href='category.php?op=mod&amp;categoryid=" . $subcat->categoryid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_MODIFY . "' alt='" . _AM_PUBLISHER_MODIFY . "' /></a>";
-                    $delete = "<a href='category.php?op=del&amp;categoryid=" . $subcat->categoryid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETE . "' alt='" . _AM_PUBLISHER_DELETE . "' /></a>";
-                    echo "<tr>";
-                    echo "<td class='head' align='left'>" . $subcat->categoryid() . "</td>";
-                    echo "<td class='even' align='left'><a href='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/category.php?categoryid=" . $subcat->categoryid() . "&amp;parentid=" . $subcat->parentid() . "'>" . $subcat->name() . "</a></td>";
-                    echo "<td class='even' align='left'>" . $subcat->description() . "</td>";
+                    $modify = "<a href='category.php?op=mod&amp;categoryid=" . $subcat->categoryid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_MODIFY . "' alt='" . _AM_PUBLISHER_MODIFY . "' /></a>";
+                    $delete = "<a href='category.php?op=del&amp;categoryid=" . $subcat->categoryid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETE . "' alt='" . _AM_PUBLISHER_DELETE . "' /></a>";
+                    echo '<tr>';
+                    echo "<td class='head' align='left'>" . $subcat->categoryid() . '</td>';
+                    echo "<td class='even' align='left'><a href='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . '/category.php?categoryid=' . $subcat->categoryid() . '&amp;parentid=' . $subcat->parentid() . "'>" . $subcat->name() . '</a></td>';
+                    echo "<td class='even' align='left'>" . $subcat->description() . '</td>';
                     echo "<td class='even' align='right'> {$modify} {$delete} </td>";
-                    echo "</tr>";
+                    echo '</tr>';
                 }
-                unset($subcat);
+//                unset($subcat);
             } else {
-                echo "<tr>";
-                echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOSUBCAT . "</td>";
-                echo "</tr>";
+                echo '<tr>';
+                echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOSUBCAT . '</td>';
+                echo '</tr>';
             }
             echo "</table>\n";
             echo "<br />\n";
@@ -263,47 +268,47 @@ public static function editCategory($showmenu = false, $categoryid = 0, $nb_subc
             publisherOpenCollapsableBar('bottomtable', 'bottomtableicon', _AM_PUBLISHER_CAT_ITEMS, _AM_PUBLISHER_CAT_ITEMS_DSC);
             $startitem = XoopsRequest::getInt('startitem');
             // Get the total number of published ITEMS
-            $totalitems = $publisher->getHandler('item')->getItemsCount($sel_cat, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED));
+            $totalitems =& $publisher->getHandler('item')->getItemsCount($selCat, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED));
             // creating the items objects that are published
-            $itemsObj         = $publisher->getHandler('item')->getAllPublished($publisher->getConfig('idxcat_perpage'), $startitem, $sel_cat);
+            $itemsObj         =& $publisher->getHandler('item')->getAllPublished($publisher->getConfig('idxcat_perpage'), $startitem, $selCat);
             $totalitemsOnPage = count($itemsObj);
-            $allcats          = $publisher->getHandler('category')->getObjects(null, true);
+            $allcats          =& $publisher->getHandler('category')->getObjects(null, true);
             echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
-            echo "<tr>";
-            echo "<td width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . "</strong></td>";
-            echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCOLNAME . "</strong></td>";
-            echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMDESC . "</strong></td>";
-            echo "<td width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . "</strong></td>";
-            echo "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
-            echo "</tr>";
+            echo '<tr>';
+            echo "<td width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . '</strong></td>';
+            echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCOLNAME . '</strong></td>';
+            echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMDESC . '</strong></td>';
+            echo "<td width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . '</strong></td>';
+            echo "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+            echo '</tr>';
             if ($totalitems > 0) {
                 for ($i = 0; $i < $totalitemsOnPage; ++$i) {
                     $categoryObj = $allcats[$itemsObj[$i]->categoryid()];
-                    $modify      = "<a href='item.php?op=mod&amp;itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "' /></a>";
-                    $delete      = "<a href='item.php?op=del&amp;itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'/></a>";
-                    echo "<tr>";
-                    echo "<td class='head' align='center'>" . $itemsObj[$i]->itemid() . "</td>";
-                    echo "<td class='even' align='left'>" . $categoryObj->name() . "</td>";
-                    echo "<td class='even' align='left'>" . $itemsObj[$i]->getitemLink() . "</td>";
-                    echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub('s') . "</td>";
+                    $modify      = "<a href='item.php?op=mod&amp;itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "' /></a>";
+                    $delete      = "<a href='item.php?op=del&amp;itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . '/modules/' . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'/></a>";
+                    echo '<tr>';
+                    echo "<td class='head' align='center'>" . $itemsObj[$i]->itemid() . '</td>';
+                    echo "<td class='even' align='left'>" . $categoryObj->name() . '</td>';
+                    echo "<td class='even' align='left'>" . $itemsObj[$i]->getitemLink() . '</td>';
+                    echo "<td class='even' align='center'>" . $itemsObj[$i]->getDatesub('s') . '</td>';
                     echo "<td class='even' align='center'> $modify $delete </td>";
-                    echo "</tr>";
+                    echo '</tr>';
                 }
             } else {
                 $itemid = -1;
-                echo "<tr>";
-                echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS . "</td>";
-                echo "</tr>";
+                echo '<tr>';
+                echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS . '</td>';
+                echo '</tr>';
             }
             echo "</table>\n";
             echo "<br />\n";
             $parentid           = XoopsRequest::getInt('parentid', 0, 'GET');
-            $pagenav_extra_args = "op=mod&categoryid=$sel_cat&parentid=$parentid";
+            $pagenavExtraArgs = "op=mod&categoryid=$selCat&parentid=$parentid";
             xoops_load('XoopsPageNav');
-            $pagenav = new XoopsPageNav($totalitems, $publisher->getConfig('idxcat_perpage'), $startitem, 'startitem', $pagenav_extra_args);
+            $pagenav = new XoopsPageNav($totalitems, $publisher->getConfig('idxcat_perpage'), $startitem, 'startitem', $pagenavExtraArgs);
             echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
-            echo "<input type='button' name='button' onclick=\"location='item.php?op=mod&categoryid=" . $sel_cat . "'\" value='" . _AM_PUBLISHER_CREATEITEM . "'>&nbsp;&nbsp;";
-            echo "</div>";
+            echo "<input type='button' name='button' onclick=\"location='item.php?op=mod&categoryid=" . $selCat . "'\" value='" . _AM_PUBLISHER_CREATEITEM . "'>&nbsp;&nbsp;";
+            echo '</div>';
         }
         //end of fx2024 code
     }
diff --git a/publisher/comment_new.php b/publisher/comment_new.php
index 462d6214..4cd4731a 100644
--- a/publisher/comment_new.php
+++ b/publisher/comment_new.php
@@ -24,12 +24,12 @@
 
 $com_itemid = XoopsRequest::getInt('com_itemid', 0, 'GET');
 if ($com_itemid > 0) {
-    $itemObj       = $publisher->getHandler('item')->get($com_itemid);
-    $com_replytext = _POSTEDBY . '&nbsp;<strong>' . $itemObj->linkedPosterName() . '</strong>&nbsp;' . _DATE . '&nbsp;<strong>' . $itemObj->dateSub() . '</strong><br /><br />' . $itemObj->summary();
+    $itemObj       =& $publisher->getHandler('item')->get($com_itemid);
+    $com_replytext = _POSTEDBY . '&nbsp;<strong>' . $itemObj->getLinkedPosterName() . '</strong>&nbsp;' . _DATE . '&nbsp;<strong>' . $itemObj->dateSub() . '</strong><br /><br />' . $itemObj->summary();
     $bodytext      = $itemObj->body();
     if ($bodytext != '') {
         $com_replytext .= '<br /><br />' . $bodytext . '';
     }
-    $com_replytitle = $itemObj->title();
+    $com_replytitle = $itemObj->getTitle();
     include_once $GLOBALS['xoops']->path('include/comment_new.php');
 }
diff --git a/publisher/docs/changelog.txt b/publisher/docs/changelog.txt
index f1541b4c..1264b940 100644
--- a/publisher/docs/changelog.txt
+++ b/publisher/docs/changelog.txt
@@ -1,3 +1,15 @@
+<h5>1.02 RC3       (2015-11-14)</h5>
+- added sort by Rating, Hits, # of Votes and Comments (brutalicuss/mamba)
+- added extra columns in Admin's Summary view (mamba)
+- remove non-existent XoopsFormCalendar in blocks (mamba)
+- replace XoopsLocal::formatTimestamp() with formatTimestamp() so we have User local time (mamba/geekwright)
+- replaced hard-coded GMT date in PublisherFormDateTime with formatTimestamp (mamba) (TODO: do the same for XoopsFormDateTime)
+- adjusted apostrophes to prevent the define translation errors (slider84)
+- bug #6: Array to string conversion (cesagonchu/mamba)
+- fixed bug: not able to delete category (Dante7237/mamba)
+- fixed bug: cloning of article (mamba)
+
+
 <h5>1.02 RC1       (2015-05-26)</h5>
 - updated to XOOPS 2.5.7 version of jQuery UI Tabs (noo-b/mamba)
 - replaced PublisherRequest with calls to XoopsRequest (mamba)
diff --git a/publisher/docs/index.html b/publisher/docs/index.html
index 990cbd60..2c5cdd3f 100644
--- a/publisher/docs/index.html
+++ b/publisher/docs/index.html
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
diff --git a/publisher/file.php b/publisher/file.php
index 5ea158fc..f05f231e 100644
--- a/publisher/file.php
+++ b/publisher/file.php
@@ -22,52 +22,51 @@
 include_once __DIR__ . '/header.php';
 xoops_loadLanguage('admin', PUBLISHER_DIRNAME);
 
-$op     = XoopsRequest::getString('op',  XoopsRequest::getString('op', '', 'GET'), 'POST');
+$op     = XoopsRequest::getString('op', XoopsRequest::getString('op', '', 'GET'), 'POST');
 $fileid = XoopsRequest::getInt('fileid', XoopsRequest::getInt('fileid', 0, 'GET'), 'POST');
 
 if ($fileid == 0) {
-    redirect_header("index.php", 2, _MD_PUBLISHER_NOITEMSELECTED);
-//    exit();
+    redirect_header('index.php', 2, _MD_PUBLISHER_NOITEMSELECTED);
+    //    exit();
 }
 
-$fileObj = $publisher->getHandler('file')->get($fileid);
+$fileObj =& $publisher->getHandler('file')->get($fileid);
 
 // if the selected item was not found, exit
 if (!$fileObj) {
-    redirect_header("index.php", 1, _NOPERM);
-//    exit();
+    redirect_header('index.php', 1, _NOPERM);
+    //    exit();
 }
 
-$itemObj = $publisher->getHandler('item')->get($fileObj->getVar('itemid'));
+$itemObj =& $publisher->getHandler('item')->get($fileObj->getVar('itemid'));
 
 // if the user does not have permission to modify this file, exit
 if (!(publisherUserIsAdmin() || publisherUserIsModerator($itemObj) || (is_object($GLOBALS['xoopsUser']) && $fileObj->getVar('uid') == $GLOBALS['xoopsUser']->getVar('uid')))) {
-    redirect_header("index.php", 1, _NOPERM);
-//    exit();
+    redirect_header('index.php', 1, _NOPERM);
+    //    exit();
 }
 
 /* -- Available operations -- */
 switch ($op) {
-    case "default":
-    case "mod":
-
+    case 'default':
+    case 'mod':
         include_once $GLOBALS['xoops']->path('header.php');
         include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 
         // FILES UPLOAD FORM
-        $files_form = $fileObj->getForm();
-        $files_form->display();
+        $uploadForm = $fileObj->getForm();
+        $uploadForm->display();
         break;
 
-    case "modify":
+    case 'modify':
         $fileid = XoopsRequest::getInt('fileid', 0, 'POST');
 
         // Creating the file object
         if ($fileid != 0) {
-            $fileObj = $publisher->getHandler('file')->get($fileid);
+            $fileObj =& $publisher->getHandler('file')->get($fileid);
         } else {
-            redirect_header("index.php", 1, _NOPERM);
-//            exit();
+            redirect_header('index.php', 1, _NOPERM);
+            //            exit();
         }
 
         // Putting the values in the file object
@@ -81,7 +80,7 @@
             $oldfile = $fileObj->getFilePath();
 
             // Get available mimetypes for file uploading
-            $allowed_mimetypes = $publisher->getHandler('mimetype')->getArrayByType();
+            $allowed_mimetypes =& $publisher->getHandler('mimetype')->getArrayByType();
             // TODO : display the available mimetypes to the user
             $errors = array();
 
@@ -96,33 +95,33 @@
 
         if (!$publisher->getHandler('file')->insert($fileObj)) {
             redirect_header('item.php?itemid=' . $fileObj->itemid(), 3, _AM_PUBLISHER_FILE_EDITING_ERROR . publisherFormatErrors($fileObj->getErrors()));
-//            exit;
+            //            exit;
         }
 
         redirect_header('item.php?itemid=' . $fileObj->itemid(), 2, _AM_PUBLISHER_FILE_EDITING_SUCCESS);
-//        exit();
+        //        exit();
         break;
 
-    case "clear":
-//mb        echo "my time is now " . now;
+    case 'clear':
+        //mb        echo 'my time is now ' . now;
         break;
 
-    case "del":
+    case 'del':
         $confirm = XoopsRequest::getInt('confirm', '', 'POST');
 
         if ($confirm) {
             if (!$publisher->getHandler('file')->delete($fileObj)) {
                 redirect_header('item.php?itemid=' . $fileObj->itemid(), 2, _AM_PUBLISHER_FILE_DELETE_ERROR);
-//                exit;
+                //                exit;
             }
 
             redirect_header('item.php?itemid=' . $fileObj->itemid(), 2, sprintf(_AM_PUBLISHER_FILEISDELETED, $fileObj->name()));
-//            exit();
+            //            exit();
         } else {
             // no confirm: show deletion condition
 
             include_once $GLOBALS['xoops']->path('header.php');
-            xoops_confirm(array('op' => 'del', 'fileid' => $fileObj->fileid(), 'confirm' => 1, 'name' => $fileObj->name()), 'file.php', _AM_PUBLISHER_DELETETHISFILE . " <br />" . $fileObj->name() . " <br /> <br />", _AM_PUBLISHER_DELETE);
+            xoops_confirm(array('op' => 'del', 'fileid' => $fileObj->fileid(), 'confirm' => 1, 'name' => $fileObj->name()), 'file.php', _AM_PUBLISHER_DELETETHISFILE . ' <br />' . $fileObj->name() . ' <br /> <br />', _AM_PUBLISHER_DELETE);
             include_once $GLOBALS['xoops']->path('footer.php');
         }
         exit();
diff --git a/publisher/footer.php b/publisher/footer.php
index b7c3ad11..956771b4 100644
--- a/publisher/footer.php
+++ b/publisher/footer.php
@@ -28,22 +28,20 @@
 //$xoTheme->addScript(PUBLISHER_URL . '/assets/js/jquery.popeye-2.0.4.js');
 //$xoTheme->addScript(PUBLISHER_URL . '/assets/js/publisher.js');
 
-$xoopsTpl->assign("xoops_module_header", '<link rel="alternate" type="application/rss+xml" title="'
-                                         . $publisher->getModule()->name() . '" href="' . PUBLISHER_URL . '/backend.php" />'
-                                         . @$xoopsTpl->get_template_vars("xoops_module_header"));
+$xoopsTpl->assign('xoops_module_header', '<link rel="alternate" type="application/rss+xml" title="' . $publisher->getModule()->name() . '" href="' . PUBLISHER_URL . '/backend.php" />' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 
-$xoopsTpl->assign("publisher_adminpage", "<a href='" . PUBLISHER_URL . "/admin/index.php'>" . _MD_PUBLISHER_ADMIN_PAGE . "</a>");
-$xoopsTpl->assign("isAdmin", $publisher_isAdmin);
-$xoopsTpl->assign('publisher_url', PUBLISHER_URL);
-$xoopsTpl->assign('publisher_images_url', PUBLISHER_IMAGES_URL);
+$xoopsTpl->assign('publisher_adminpage', "<a href='" . PUBLISHER_URL . "/admin/index.php'>" . _MD_PUBLISHER_ADMIN_PAGE . '</a>');
+$xoopsTpl->assign('isAdmin', $publisherIsAdmin);
+$xoopsTpl->assign('moduleUrl', PUBLISHER_URL);
+$xoopsTpl->assign('publisherImagesUrl', PUBLISHER_IMAGES_URL);
 
 $xoopsTpl->assign('displayType', $publisher->getConfig('idxcat_items_display_type'));
 
 // display_category_summary enabled by Freeform Solutions March 21 2006
 $xoopsTpl->assign('display_category_summary', $publisher->getConfig('cat_display_summary'));
 
-$xoopsTpl->assign('displayList', $publisher->getConfig('idxcat_items_display_type') == 'list');
-$xoopsTpl->assign('displayFull', $publisher->getConfig('idxcat_items_display_type') == 'full');
+$xoopsTpl->assign('displayList', $publisher->getConfig('idxcat_items_display_type') === 'list');
+$xoopsTpl->assign('displayFull', $publisher->getConfig('idxcat_items_display_type') === 'full');
 $xoopsTpl->assign('module_dirname', $publisher->getModule()->dirname());
 
 $xoopsTpl->assign('displaylastitem', $publisher->getConfig('idxcat_display_last_item'));
diff --git a/publisher/header.php b/publisher/header.php
index 3695c5a0..877a1121 100644
--- a/publisher/header.php
+++ b/publisher/header.php
@@ -24,6 +24,6 @@
 
 $myts = MyTextSanitizer::getInstance();
 
-if ($publisher->getConfig('seo_url_rewrite') != 'none') {
+if ('none' !== $publisher->getConfig('seo_url_rewrite')) {
     include_once PUBLISHER_ROOT_PATH . '/include/seo.inc.php';
 }
diff --git a/publisher/include/ajax_rating.php b/publisher/include/ajax_rating.php
index c6971a73..05991434 100644
--- a/publisher/include/ajax_rating.php
+++ b/publisher/include/ajax_rating.php
@@ -22,8 +22,8 @@
 error_reporting(0);
 $xoopsLogger->activated = false;
 
-header("Cache-Control: no-cache");
-header("Pragma: nocache");
+header('Cache-Control: no-cache');
+header('Pragma: nocache');
 
 //getting the values
 $rating = XoopsRequest::getInt('rating', 0, 'GET');
@@ -31,23 +31,23 @@
 
 xoops_loadLanguage('main', PUBLISHER_DIRNAME);
 $groups        = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : XOOPS_GROUP_ANONYMOUS;
-$gperm_handler = $publisher->getHandler('groupperm');
-$hModConfig    = xoops_gethandler('config');
+$gpermHandler =& $publisher->getHandler('groupperm');
+$hModConfig    =& xoops_getHandler('config');
 $module_id     = $publisher->getModule()->getVar('mid');
 
 //Checking permissions
-//if (!$publisher->getConfig('perm_rating') || !$gperm_handler->checkRight('global', _PUBLISHER_RATE, $groups, $module_id)) {
+//if (!$publisher->getConfig('perm_rating') || !$gpermHandler->checkRight('global', _PUBLISHER_RATE, $groups, $module_id)) {
 //    $output = "unit_long$itemid|" . _NOPERM . "\n";
 //    echo $output;
 //    exit();
 //}
 
 try {
-    if (!$publisher->getConfig('perm_rating') || !$gperm_handler->checkRight('global', _PUBLISHER_RATE, $groups, $module_id)) {
+    if (!$publisher->getConfig('perm_rating') || !$gpermHandler->checkRight('global', _PUBLISHER_RATE, $groups, $module_id)) {
         throw new Exception(_NOPERM);
     }
 } catch (Exception $e) {
-//    redirect_header("javascript:history.go(-1)", 1, _NOPERM);
+    //    redirect_header('javascript:history.go(-1)', 1, _NOPERM);
     $output = "unit_long$itemid|" . _NOPERM . "\n";
     echo $output;
 }
@@ -66,13 +66,13 @@
         throw new Exception(_MD_PUBLISHER_VOTE_BAD);
     }
 } catch (Exception $e) {
-//    redirect_header("javascript:history.go(-1)", 1, _NOPERM);
+    //    redirect_header('javascript:history.go(-1)', 1, _NOPERM);
     $output = "unit_long$itemid|" . _MD_PUBLISHER_VOTE_BAD . "\n";
     echo $output;
 }
 
 $criteria   = new Criteria('itemid', $itemid);
-$ratingObjs = $publisher->getHandler('rating')->getObjects($criteria);
+$ratingObjs =& $publisher->getHandler('rating')->getObjects($criteria);
 
 $uid            = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
 $count          = count($ratingObjs);
@@ -98,12 +98,12 @@
         throw new Exception(_MD_PUBLISHER_VOTE_ALREADY);
     }
 } catch (Exception $e) {
-//    redirect_header("javascript:history.go(-1)", 1, _NOPERM);
+    //    redirect_header('javascript:history.go(-1)', 1, _NOPERM);
     $output = "unit_long$itemid|" . _MD_PUBLISHER_VOTE_ALREADY . "\n";
     echo $output;
 }
 
-$newRatingObj = $publisher->getHandler('rating')->create();
+$newRatingObj =& $publisher->getHandler('rating')->create();
 $newRatingObj->setVar('itemid', $itemid);
 $newRatingObj->setVar('ip', $ip);
 $newRatingObj->setVar('uid', $uid);
@@ -117,7 +117,7 @@
 $publisher->getHandler('item')->updateAll('rating', number_format($current_rating / $count, 4), $criteria, true);
 $publisher->getHandler('item')->updateAll('votes', $count, $criteria, true);
 
-$tense = $count == 1 ? _MD_PUBLISHER_VOTE_lVOTE : _MD_PUBLISHER_VOTE_lVOTES; //plural form votes/vote
+$tense = $count == 1 ? _MD_PUBLISHER_VOTE_VOTE : _MD_PUBLISHER_VOTE_VOTES; //plural form votes/vote
 
 // $new_back is what gets 'drawn' on your page after a successful 'AJAX/Javascript' vote
 $new_back = array();
@@ -138,7 +138,7 @@
 $new_back[] .= '<div class="publisher_voted">' . _MD_PUBLISHER_VOTE_RATING . ' <strong>' . ($count !== 0 ? number_format($current_rating / $count, 2) : 0) . '</strong>/' . $units . ' (' . $count . ' ' . $tense . ')</div>';
 $new_back[] .= '<div class="publisher_thanks">' . _MD_PUBLISHER_VOTE_THANKS . '</div>';
 
-$allnewback = join("\n", $new_back);
+$allnewback = implode("\n", $new_back);
 
 // ========================
 
diff --git a/publisher/include/ajax_upload.php b/publisher/include/ajax_upload.php
index 01087dab..f5f95f9a 100644
--- a/publisher/include/ajax_upload.php
+++ b/publisher/include/ajax_upload.php
@@ -46,20 +46,20 @@
 
 $imgcat_id = XoopsRequest::getInt('imgcat_id', 0, 'POST');
 
-$imgcat_handler = xoops_gethandler('imagecategory');
-$imgcat         = $imgcat_handler->get($imgcat_id);
+$imgcatHandler =& xoops_getHandler('imagecategory');
+$imgcat         = $imgcatHandler->get($imgcat_id);
 
 $error = false;
 if (!is_object($imgcat)) {
     $error = _CO_PUBLISHER_IMAGE_CAT_NONE;
 } else {
-    $imgcatperm_handler = xoops_gethandler('groupperm');
+    $imgcatpermHandler =& xoops_getHandler('groupperm');
     if (is_object($GLOBALS['xoopsUser'])) {
-        if (!$imgcatperm_handler->checkRight('imgcat_write', $imgcat_id, $GLOBALS['xoopsUser']->getGroups())) {
+        if (!$imgcatpermHandler->checkRight('imgcat_write', $imgcat_id, $GLOBALS['xoopsUser']->getGroups())) {
             $error = _CO_PUBLISHER_IMAGE_CAT_NONE;
         }
     } else {
-        if (!$imgcatperm_handler->checkRight('imgcat_write', $imgcat_id, XOOPS_GROUP_ANONYMOUS)) {
+        if (!$imgcatpermHandler->checkRight('imgcat_write', $imgcat_id, XOOPS_GROUP_ANONYMOUS)) {
             $error = _CO_PUBLISHER_IMAGE_CAT_NOPERM;
         }
     }
@@ -71,11 +71,11 @@
     $uploader->setPrefix('img');
     if ($uploader->fetchMedia('publisher_upload_file')) {
         if (!$uploader->upload()) {
-            $error = implode("<br />", $uploader->getErrors(false));
+            $error = implode('<br />', $uploader->getErrors(false));
 
         } else {
-            $image_handler = xoops_gethandler('image');
-            $image         = $image_handler->create();
+            $imageHandler =& xoops_getHandler('image');
+            $image         = $imageHandler->create();
             $image->setVar('image_name', 'images/' . $uploader->getSavedFileName());
             $image->setVar('image_nicename', $image_nicename);
             $image->setVar('image_mimetype', $uploader->getMediaType());
@@ -83,7 +83,7 @@
             $image->setVar('image_display', 1);
             $image->setVar('image_weight', 0);
             $image->setVar('imgcat_id', $imgcat_id);
-            if ($imgcat->getVar('imgcat_storetype') == 'db') {
+            if ($imgcat->getVar('imgcat_storetype') === 'db') {
                 $fp      = @fopen($uploader->getSavedDestination(), 'rb');
                 $fbinary = @fread($fp, filesize($uploader->getSavedDestination()));
                 @fclose($fp);
@@ -92,19 +92,19 @@
                     unlink($uploader->getSavedDestination());
                 }
             }
-            if (!$image_handler->insert($image)) {
+            if (!$imageHandler->insert($image)) {
                 $error = sprintf(_FAILSAVEIMG, $image->getVar('image_nicename'));
             }
         }
     } else {
-        $error = sprintf(_FAILFETCHIMG, 0) . "<br />" . implode("<br />", $uploader->getErrors(false));
+        $error = sprintf(_FAILFETCHIMG, 0) . '<br />' . implode('<br />', $uploader->getErrors(false));
     }
 }
 
 if ($error) {
     $arr = array('error', publisherConvertCharset($error));
 } else {
-    $arr = array('success', $image->getVar("image_name"), publisherConvertCharset($image->getVar("image_nicename")));
+    $arr = array('success', $image->getVar('image_name'), publisherConvertCharset($image->getVar('image_nicename')));
 }
 
 echo json_encode($arr);
diff --git a/publisher/include/comment_functions.php b/publisher/include/comment_functions.php
index 187ab54c..bec578dc 100644
--- a/publisher/include/comment_functions.php
+++ b/publisher/include/comment_functions.php
@@ -24,7 +24,7 @@
 
 function publisher_com_update($itemId, $totalNum)
 {
-    $db  = XoopsDatabaseFactory::getDatabaseConnection();
+    $db  =& XoopsDatabaseFactory::getDatabaseConnection();
     $sql = 'UPDATE ' . $db->prefix('publisher_items') . ' SET comments = ' . $totalNum . ' WHERE itemid = ' . $itemId;
     $db->query($sql);
 }
diff --git a/publisher/include/common.php b/publisher/include/common.php
index dd07d3bf..b70339a1 100644
--- a/publisher/include/common.php
+++ b/publisher/include/common.php
@@ -39,15 +39,15 @@
 xoops_load('XoopsFilterInput');
 
 $debug     = false;
-$publisher = PublisherPublisher::getInstance($debug);
+$publisher =& PublisherPublisher::getInstance($debug);
 
 //This is needed or it will not work in blocks.
-global $publisher_isAdmin;
+global $publisherIsAdmin;
 
 // Load only if module is installed
 if (is_object($publisher->getModule())) {
     // Find if the user is admin of the module
-    $publisher_isAdmin = publisherUserIsAdmin();
+    $publisherIsAdmin = publisherUserIsAdmin();
     // get current page
-    $publisher_current_page = publisherGetCurrentPage();
+    $publisherCurrentPage = publisherGetCurrentPage();
 }
diff --git a/publisher/include/config.php b/publisher/include/config.php
index 5465ff95..c5bb1a56 100644
--- a/publisher/include/config.php
+++ b/publisher/include/config.php
@@ -23,24 +23,24 @@
 // defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
 require_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
 
-define("PUBLISHER_DIRNAME", basename(dirname(__DIR__)));
-define("PUBLISHER_URL", XOOPS_URL . '/modules/' . PUBLISHER_DIRNAME);
-define("PUBLISHER_PATH", XOOPS_ROOT_PATH . "/modules/" . PUBLISHER_DIRNAME);
-define("PUBLISHER_IMAGES_URL", PUBLISHER_URL . '/assets/images');
-define("PUBLISHER_ADMIN_URL", PUBLISHER_URL . '/admin');
-define("PUBLISHER_ADMIN_PATH", PUBLISHER_PATH . "/admin/index.php");
-define("PUBLISHER_ROOT_PATH", $GLOBALS['xoops']->path('modules/' . PUBLISHER_DIRNAME));
-define("PUBLISHER_AUTHOR_LOGOIMG", PUBLISHER_URL . "/assets/images/logo.png");
+define('PUBLISHER_DIRNAME', basename(dirname(__DIR__)));
+define('PUBLISHER_URL', XOOPS_URL . '/modules/' . PUBLISHER_DIRNAME);
+define('PUBLISHER_PATH', XOOPS_ROOT_PATH . '/modules/' . PUBLISHER_DIRNAME);
+define('PUBLISHER_IMAGES_URL', PUBLISHER_URL . '/assets/images');
+define('PUBLISHER_ADMIN_URL', PUBLISHER_URL . '/admin');
+define('PUBLISHER_ADMIN_PATH', PUBLISHER_PATH . '/admin/index.php');
+define('PUBLISHER_ROOT_PATH', $GLOBALS['xoops']->path('modules/' . PUBLISHER_DIRNAME));
+define('PUBLISHER_AUTHOR_LOGOIMG', PUBLISHER_URL . '/assets/images/logo.png');
 
 /*
 //global $xoopsModule;
 if (!defined('PUBLISHER_MODULE_PATH')) {
-    define("PUBLISHER_DIRNAME", $GLOBALS['xoopsModule']->dirname());
-    define("PUBLISHER_PATH", XOOPS_ROOT_PATH . "/modules/" . PUBLISHER_DIRNAME);
-    define("PUBLISHER_URL", XOOPS_URL . "/modules/" . PUBLISHER_DIRNAME);
-    define("PUBLISHER_ADMIN_URL", PUBLISHER_URL . "/admin/index.php");
-    define("PUBLISHER_ADMIN_PATH", PUBLISHER_PATH . "/admin/index.php");
-    define("PUBLISHER_AUTHOR_LOGOIMG", PUBLISHER_URL . "/assets/images/xoopsproject_logo.png");
+    define('PUBLISHER_DIRNAME', $GLOBALS['xoopsModule']->dirname());
+    define('PUBLISHER_PATH', XOOPS_ROOT_PATH . '/modules/' . PUBLISHER_DIRNAME);
+    define('PUBLISHER_URL', XOOPS_URL . '/modules/' . PUBLISHER_DIRNAME);
+    define('PUBLISHER_ADMIN_URL', PUBLISHER_URL . '/admin/index.php');
+    define('PUBLISHER_ADMIN_PATH', PUBLISHER_PATH . '/admin/index.php');
+    define('PUBLISHER_AUTHOR_LOGOIMG', PUBLISHER_URL . '/assets/images/xoopsproject_logo.png');
 
 }
 */
@@ -48,21 +48,19 @@
 // Define here the folder for the main upload path
 //$img_dir = $GLOBALS['xoopsModuleConfig']['uploaddir'];
 
-define("PUBLISHER_UPLOAD_URL", XOOPS_UPLOAD_URL . '/' . PUBLISHER_DIRNAME); // WITHOUT Trailing slash
-//define("PUBLISHER_UPLOAD_PATH", $img_dir); // WITHOUT Trailing slash
-define("PUBLISHER_UPLOAD_PATH", XOOPS_UPLOAD_PATH . '/' . PUBLISHER_DIRNAME); // WITHOUT Trailing slash
-
-//define("PUBLISHER_UPLOADS_URL", XOOPS_URL . '/uploads/' . PUBLISHER_DIRNAME);
-//define("PUBLISHER_UPLOADS_PATH", $GLOBALS['xoops']->path('uploads/' . PUBLISHER_DIRNAME));
+define('PUBLISHER_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . PUBLISHER_DIRNAME); // WITHOUT Trailing slash
+//define('PUBLISHER_UPLOAD_PATH', $img_dir); // WITHOUT Trailing slash
+define('PUBLISHER_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . PUBLISHER_DIRNAME); // WITHOUT Trailing slash
 
+//define('PUBLISHER_UPLOADS_URL', XOOPS_URL . '/uploads/' . PUBLISHER_DIRNAME);
+//define('PUBLISHER_UPLOADS_PATH', $GLOBALS['xoops']->path('uploads/' . PUBLISHER_DIRNAME));
 
 $uploadFolders = array(
     PUBLISHER_UPLOAD_PATH,
+    PUBLISHER_UPLOAD_PATH . '/content',
     PUBLISHER_UPLOAD_PATH . '/images',
-    PUBLISHER_UPLOAD_PATH . '/images/thumbnails'
-);
+    PUBLISHER_UPLOAD_PATH . '/images/thumbnails');
 
 // module information
-$mod_copyright
-    = "<a href='http://xoops.org' title='XOOPS Project' target='_blank'>
+$mod_copyright = "<a href='http://xoops.org' title='XOOPS Project' target='_blank'>
                      <img src='" . PUBLISHER_AUTHOR_LOGOIMG . "' alt='XOOPS Project' /></a>";
diff --git a/publisher/include/functions.php b/publisher/include/functions.php
index 2105872d..b176358b 100644
--- a/publisher/include/functions.php
+++ b/publisher/include/functions.php
@@ -53,12 +53,18 @@ function publisherCpHeader()
  */
 function publisherGetOrderBy($sort)
 {
-    if ($sort == "datesub") {
-        return "DESC";
-    } elseif ($sort == "counter") {
-        return "DESC";
-    } elseif ($sort == "weight") {
-        return "ASC";
+    if ($sort === 'datesub') {
+        return 'DESC';
+    } elseif ($sort === 'counter') {
+        return 'DESC';
+    } elseif ($sort === 'weight') {
+        return 'ASC';
+    } elseif ($sort === 'votes') {
+        return 'DESC';
+    } elseif ($sort === 'rating') {
+        return 'DESC';
+    } elseif ($sort === 'comments') {
+        return 'DESC';
     }
 
     return null;
@@ -67,12 +73,12 @@ function publisherGetOrderBy($sort)
 /**
  * @credits Thanks to Mithandir
  * @param string $str
- * @param int $start
- * @param int $length
- * @param string $trimmarker
+ * @param int    $start
+ * @param int    $length
+ * @param string $trimMarker
  * @return string
  */
-function publisherSubstr($str, $start, $length, $trimmarker = '...')
+function publisherSubstr($str, $start, $length, $trimMarker = '...')
 {
     // if the string is empty, let's get out ;-)
     if ($str == '') {
@@ -80,17 +86,17 @@ function publisherSubstr($str, $start, $length, $trimmarker = '...')
     }
 
     // reverse a string that is shortened with '' as trimmarker
-    $reversed_string = strrev(xoops_substr($str, $start, $length, ''));
+    $reversedString = strrev(xoops_substr($str, $start, $length, ''));
 
     // find first space in reversed string
-    $position_of_space = strpos($reversed_string, " ", 0);
+    $positionOfSpace = strpos($reversedString, ' ', 0);
 
     // truncate the original string to a length of $length
     // minus the position of the last space
-    // plus the length of the $trimmarker
-    $truncated_string = xoops_substr($str, $start, $length - $position_of_space + strlen($trimmarker), $trimmarker);
+    // plus the length of the $trimMarker
+    $truncatedString = xoops_substr($str, $start, $length - $positionOfSpace + strlen($trimMarker), $trimMarker);
 
-    return $truncated_string;
+    return $truncatedString;
 }
 
 /**
@@ -105,35 +111,37 @@ function publisherHtml2text($document)
     // and white space. It will also convert some
     // common HTML entities to their text equivalent.
     // Credits : newbb2
-    $search = array("'<script[^>]*?>.*?</script>'si", // Strip out javascript
-                    "'<img.*?/>'si", // Strip out img tags
-                    "'<[\/\!]*?[^<>]*?>'si", // Strip out HTML tags
-                    "'([\r\n])[\s]+'", // Strip out white space
-                    "'&(quot|#34);'i", // Replace HTML entities
-                    "'&(amp|#38);'i",
-                    "'&(lt|#60);'i",
-                    "'&(gt|#62);'i",
-                    "'&(nbsp|#160);'i",
-                    "'&(iexcl|#161);'i",
-                    "'&(cent|#162);'i",
-                    "'&(pound|#163);'i",
-                    "'&(copy|#169);'i",
-                    "'&#(\d+);'e"); // evaluate as php
-
-    $replace = array("",
-                     "",
-                     "",
-                     "\\1",
-                     "\"",
-                     "&",
-                     "<",
-                     ">",
-                     " ",
-                     chr(161),
-                     chr(162),
-                     chr(163),
-                     chr(169),
-                     "chr(\\1)");
+    $search = array(
+        "'<script[^>]*?>.*?</script>'si", // Strip out javascript
+        "'<img.*?/>'si", // Strip out img tags
+        "'<[\/\!]*?[^<>]*?>'si", // Strip out HTML tags
+        "'([\r\n])[\s]+'", // Strip out white space
+        "'&(quot|#34);'i", // Replace HTML entities
+        "'&(amp|#38);'i",
+        "'&(lt|#60);'i",
+        "'&(gt|#62);'i",
+        "'&(nbsp|#160);'i",
+        "'&(iexcl|#161);'i",
+        "'&(cent|#162);'i",
+        "'&(pound|#163);'i",
+        "'&(copy|#169);'i",
+        "'&#(\d+);'e"); // evaluate as php
+
+    $replace = array(
+        '',
+        '',
+        '',
+        "\\1",
+        "\"",
+        '&',
+        '<',
+        '>',
+        ' ',
+        chr(161),
+        chr(162),
+        chr(163),
+        chr(169),
+        "chr(\\1)");
 
     $text = preg_replace($search, $replace, $document);
 
@@ -155,7 +163,7 @@ function publisherGetAllowedImagesTypes()
  */
 function publisherModuleHome($withLink = true)
 {
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
 
     if (!$publisher->getConfig('format_breadcrumb_modname')) {
         return '';
@@ -174,7 +182,7 @@ function publisherModuleHome($withLink = true)
  * @author      Aidan Lister <aidan@php.net>
  * @version     1.0.0
  * @param       string $source The source
- * @param       string $dest The destination
+ * @param       string $dest   The destination
  * @return      bool     Returns true on success, false on failure
  */
 function publisherCopyr($source, $dest)
@@ -193,12 +201,12 @@ function publisherCopyr($source, $dest)
     $dir = dir($source);
     while (false !== $entry = $dir->read()) {
         // Skip pointers
-        if ($entry == '.' || $entry == '..') {
+        if ($entry === '.' || $entry === '..') {
             continue;
         }
 
         // Deep copy directories
-        if (is_dir("$source/$entry") && ($dest !== "$source/$entry")) {
+        if (($dest !== "$source/$entry") && is_dir("$source/$entry")) {
             publisherCopyr("$source/$entry", "$dest/$entry");
         } else {
             copy("$source/$entry", "$dest/$entry");
@@ -214,12 +222,12 @@ function publisherCopyr($source, $dest)
 /**
  * .* @credits Thanks to the NewBB2 Development Team
  * @param string $item
- * @param bool $getStatus
+ * @param bool   $getStatus
  * @return bool|int|string
  */
 function &publisherGetPathStatus($item, $getStatus = false)
 {
-    if ($item == 'root') {
+    if ($item === 'root') {
         $path = '';
     } else {
         $path = $item;
@@ -227,19 +235,21 @@ function &publisherGetPathStatus($item, $getStatus = false)
 
     $thePath = publisherGetUploadDir(true, $path);
 
-    if (empty($thePath)) return false;
+    if (empty($thePath)) {
+        return false;
+    }
     if (is_writable($thePath)) {
         $pathCheckResult = 1;
-        $path_status     = _AM_PUBLISHER_AVAILABLE;
+        $pathStatus     = _AM_PUBLISHER_AVAILABLE;
     } elseif (!@is_dir($thePath)) {
         $pathCheckResult = -1;
-        $path_status     = _AM_PUBLISHER_NOTAVAILABLE . " <a href='" . PUBLISHER_ADMIN_URL . "/index.php?op=createdir&amp;path={$item}'>" . _AM_PUBLISHER_CREATETHEDIR . "</a>";
+        $pathStatus     = _AM_PUBLISHER_NOTAVAILABLE . " <a href='" . PUBLISHER_ADMIN_URL . "/index.php?op=createdir&amp;path={$item}'>" . _AM_PUBLISHER_CREATETHEDIR . '</a>';
     } else {
         $pathCheckResult = -2;
-        $path_status     = _AM_PUBLISHER_NOTWRITABLE . " <a href='" . PUBLISHER_ADMIN_URL . "/index.php?op=setperm&amp;path={$item}'>" . _AM_PUBLISHER_SETMPERM . "</a>";
+        $pathStatus     = _AM_PUBLISHER_NOTWRITABLE . " <a href='" . PUBLISHER_ADMIN_URL . "/index.php?op=setperm&amp;path={$item}'>" . _AM_PUBLISHER_SETMPERM . '</a>';
     }
     if (!$getStatus) {
-        return $path_status;
+        return $pathStatus;
     } else {
         return $pathCheckResult;
     }
@@ -255,7 +265,7 @@ function publisherMkdir($target)
     // http://www.php.net/manual/en/function.mkdir.php
     // saint at corenova.com
     // bart at cdasites dot com
-    if (is_dir($target) || empty($target)) {
+    if (empty($target) || is_dir($target)) {
         return true; // best case check first
     }
 
@@ -279,7 +289,7 @@ function publisherMkdir($target)
 /**
  * @credits Thanks to the NewBB2 Development Team
  * @param string $target
- * @param int $mode
+ * @param int    $mode
  * @return bool
  */
 function publisherChmod($target, $mode = 0777)
@@ -295,10 +305,10 @@ function publisherChmod($target, $mode = 0777)
 function publisherGetUploadDir($hasPath = true, $item = false)
 {
     if ($item) {
-        if ($item == 'root') {
+        if ($item === 'root') {
             $item = '';
         } else {
-            $item = $item . '/';
+            $item .= '/';
         }
     } else {
         $item = '';
@@ -313,7 +323,7 @@ function publisherGetUploadDir($hasPath = true, $item = false)
 
 /**
  * @param string $item
- * @param bool $hasPath
+ * @param bool   $hasPath
  * @return string
  */
 function publisherGetImageDir($item = '', $hasPath = true)
@@ -321,7 +331,7 @@ function publisherGetImageDir($item = '', $hasPath = true)
     if ($item) {
         $item = "images/{$item}";
     } else {
-        $item = "images";
+        $item = 'images';
     }
 
     return publisherGetUploadDir($hasPath, $item);
@@ -348,21 +358,21 @@ function publisherFormatErrors($errors = array())
  */
 function publisherUserIsAdmin()
 {
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
 
-    static $publisher_isAdmin;
+    static $publisherIsAdmin;
 
-    if (isset($publisher_isAdmin)) {
-        return $publisher_isAdmin;
+    if (isset($publisherIsAdmin)) {
+        return $publisherIsAdmin;
     }
 
     if (!$GLOBALS['xoopsUser']) {
-        $publisher_isAdmin = false;
+        $publisherIsAdmin = false;
     } else {
-        $publisher_isAdmin = $GLOBALS['xoopsUser']->isAdmin($publisher->getModule()->getVar('mid'));
+        $publisherIsAdmin = $GLOBALS['xoopsUser']->isAdmin($publisher->getModule()->getVar('mid'));
     }
 
-    return $publisher_isAdmin;
+    return $publisherIsAdmin;
 }
 
 /**
@@ -384,8 +394,8 @@ function publisherUserIsAuthor($itemObj)
  */
 function publisherUserIsModerator($itemObj)
 {
-    $publisher         = PublisherPublisher::getInstance();
-    $categoriesGranted = $publisher->getHandler('permission')->getGrantedItems('category_moderation');
+    $publisher         =& PublisherPublisher::getInstance();
+    $categoriesGranted =& $publisher->getHandler('permission')->getGrantedItems('category_moderation');
 
     return (is_object($itemObj) && in_array($itemObj->categoryid(), $categoriesGranted));
 }
@@ -393,26 +403,26 @@ function publisherUserIsModerator($itemObj)
 /**
  * Saves permissions for the selected category
  *
- * @param array $groups : group with granted permission
- * @param integer $categoryid : categoryid on which we are setting permissions
- * @param string $perm_name : name of the permission
+ * @param array   $groups     : group with granted permission
+ * @param integer $categoryId : categoryid on which we are setting permissions
+ * @param string  $permName  : name of the permission
  * @return boolean : TRUE if the no errors occured
  */
-function publisherSaveCategoryPermissions($groups, $categoryid, $perm_name)
+function publisherSaveCategoryPermissions($groups, $categoryId, $permName)
 {
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
 
     $result = true;
 
-    $module_id     = $publisher->getModule()->getVar('mid');
-    $gperm_handler = xoops_gethandler('groupperm');
+    $moduleId     = $publisher->getModule()->getVar('mid');
+    $gpermHandler =& xoops_getHandler('groupperm');
     // First, if the permissions are already there, delete them
-    $gperm_handler->deleteByModule($module_id, $perm_name, $categoryid);
+    $gpermHandler->deleteByModule($moduleId, $permName, $categoryId);
 
     // Save the new permissions
     if (count($groups) > 0) {
-        foreach ($groups as $group_id) {
-            $gperm_handler->addRight($perm_name, $categoryid, $group_id, $module_id);
+        foreach ($groups as $groupId) {
+            $gpermHandler->addRight($permName, $categoryId, $groupId, $moduleId);
         }
     }
 
@@ -424,7 +434,7 @@ function publisherSaveCategoryPermissions($groups, $categoryid, $perm_name)
  * @param string $iconname
  * @param string $tabletitle
  * @param string $tabledsc
- * @param bool $open
+ * @param bool   $open
  * @return void
  */
 function publisherOpenCollapsableBar($tablename = '', $iconname = '', $tabletitle = '', $tabledsc = '', $open = true)
@@ -437,10 +447,10 @@ function publisherOpenCollapsableBar($tablename = '', $iconname = '', $tabletitl
     }
 
     echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"toggle('" . $tablename . "'); toggleIcon('" . $iconname . "')\">";
-    echo "<img id='" . $iconname . "' src='" . PUBLISHER_URL . "/assets/images/links/" . $image . "' alt='' /></a>&nbsp;" . $tabletitle . "</h3>";
+    echo "<img id='" . $iconname . "' src='" . PUBLISHER_URL . '/assets/images/links/' . $image . "' alt='' /></a>&nbsp;" . $tabletitle . '</h3>';
     echo "<div id='" . $tablename . "' style='display: " . $display . ";'>";
     if ($tabledsc != '') {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $tabledsc . "</span>";
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $tabledsc . '</span>';
     }
 }
 
@@ -451,16 +461,16 @@ function publisherOpenCollapsableBar($tablename = '', $iconname = '', $tabletitl
  */
 function publisherCloseCollapsableBar($name, $icon)
 {
-    echo "</div>";
+    echo '</div>';
 
     $urls = publisherGetCurrentUrls();
     $path = $urls['phpself'];
 
-    $cookie_name = $path . '_publisher_collaps_' . $name;
-    $cookie_name = str_replace('.', '_', $cookie_name);
-    $cookie      = publisherGetCookieVar($cookie_name, '');
+    $cookieName = $path . '_publisher_collaps_' . $name;
+    $cookieName = str_replace('.', '_', $cookieName);
+    $cookie      = publisherGetCookieVar($cookieName, '');
 
-    if ($cookie == 'none') {
+    if ($cookie === 'none') {
         echo '
         <script type="text/javascript"><!--
         toggle("' . $name . '"); toggleIcon("' . $icon . '");
@@ -473,7 +483,7 @@ function publisherCloseCollapsableBar($name, $icon)
 /**
  * @param string $name
  * @param string $value
- * @param int $time
+ * @param int    $time
  * @return void
  */
 function publisherSetCookieVar($name, $value, $time = 0)
@@ -491,11 +501,11 @@ function publisherSetCookieVar($name, $value, $time = 0)
  */
 function publisherGetCookieVar($name, $default = '')
 {
-//    if (isset($_COOKIE[$name]) && ($_COOKIE[$name] > '')) {
-//        return $_COOKIE[$name];
-//    } else {
-//        return $default;
-//    }
+    //    if (isset($_COOKIE[$name]) && ($_COOKIE[$name] > '')) {
+    //        return $_COOKIE[$name];
+    //    } else {
+    //        return $default;
+    //    }
     return XoopsRequest::getString('name', $default, 'COOKIE');
 }
 
@@ -504,12 +514,12 @@ function publisherGetCookieVar($name, $default = '')
  */
 function publisherGetCurrentUrls()
 {
-    $http        = strpos(XOOPS_URL, "https://") === false ? "http://" : "https://";
-//    $phpself     = $_SERVER['PHP_SELF'];
-//    $httphost    = $_SERVER['HTTP_HOST'];
-//    $querystring = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
-    $phpself = XoopsRequest::getString('PHP_SELF', '', 'SERVER');
-    $httphost = XoopsRequest::getString('HTTP_HOST', '', 'SERVER');
+    $http = strpos(XOOPS_URL, 'https://') === false ? 'http://' : 'https://';
+    //    $phpself     = $_SERVER['PHP_SELF'];
+    //    $httphost    = $_SERVER['HTTP_HOST'];
+    //    $querystring = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
+    $phpself     = XoopsRequest::getString('PHP_SELF', '', 'SERVER');
+    $httphost    = XoopsRequest::getString('HTTP_HOST', '', 'SERVER');
     $querystring = XoopsRequest::getString('QUERY_STRING', '', 'SERVER');
 
     if ($querystring != '') {
@@ -539,15 +549,15 @@ function publisherGetCurrentPage()
 }
 
 /**
- * @param object|PublisherCategory $categoryObj
- * @param int $selectedid
- * @param int $level
- * @param string $ret
+ * @param null|PublisherCategory $categoryObj
+ * @param int                      $selectedid
+ * @param int                      $level
+ * @param string                   $ret
  * @return string
  */
 function publisherAddCategoryOption(PublisherCategory $categoryObj, $selectedid = 0, $level = 0, $ret = '')
 {
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
 
     $spaces = '';
     for ($j = 0; $j < $level; ++$j) {
@@ -560,9 +570,9 @@ function publisherAddCategoryOption(PublisherCategory $categoryObj, $selectedid
     } elseif ($categoryObj->categoryid() == $selectedid) {
         $ret .= " selected='selected'";
     }
-    $ret .= ">" . $spaces . $categoryObj->name() . "</option>\n";
+    $ret .= '>' . $spaces . $categoryObj->name() . "</option>\n";
 
-    $subCategoriesObj = $publisher->getHandler('category')->getCategories(0, 0, $categoryObj->categoryid());
+    $subCategoriesObj =& $publisher->getHandler('category')->getCategories(0, 0, $categoryObj->categoryid());
     if (count($subCategoriesObj) > 0) {
         ++$level;
         foreach ($subCategoriesObj as $catID => $subCategoryObj) {
@@ -574,15 +584,15 @@ function publisherAddCategoryOption(PublisherCategory $categoryObj, $selectedid
 }
 
 /**
- * @param int $selectedid
- * @param int $parentcategory
- * @param bool $allCatOption
+ * @param int    $selectedid
+ * @param int    $parentcategory
+ * @param bool   $allCatOption
  * @param string $selectname
  * @return string
  */
 function publisherCreateCategorySelect($selectedid = 0, $parentcategory = 0, $allCatOption = true, $selectname = 'options[0]')
 {
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
 
     $selectedid = explode(',', $selectedid);
 
@@ -592,40 +602,40 @@ function publisherCreateCategorySelect($selectedid = 0, $parentcategory = 0, $al
         if (in_array(0, $selectedid)) {
             $ret .= " selected='selected'";
         }
-        $ret .= ">" . _MB_PUBLISHER_ALLCAT . "</option>";
+        $ret .= '>' . _MB_PUBLISHER_ALLCAT . '</option>';
     }
 
     // Creating category objects
-    $categoriesObj = $publisher->getHandler('category')->getCategories(0, 0, $parentcategory);
+    $categoriesObj =& $publisher->getHandler('category')->getCategories(0, 0, $parentcategory);
 
     if (count($categoriesObj) > 0) {
         foreach ($categoriesObj as $catID => $categoryObj) {
             $ret .= publisherAddCategoryOption($categoryObj, $selectedid);
         }
     }
-    $ret .= "</select>";
+    $ret .= '</select>';
 
     return $ret;
 }
 
 /**
- * @param int $selectedid
- * @param int $parentcategory
+ * @param int  $selectedid
+ * @param int  $parentcategory
  * @param bool $allCatOption
  * @return string
  */
 function publisherCreateCategoryOptions($selectedid = 0, $parentcategory = 0, $allCatOption = true)
 {
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
 
-    $ret = "";
+    $ret = '';
     if ($allCatOption) {
         $ret .= "<option value='0'";
-        $ret .= ">" . _MB_PUBLISHER_ALLCAT . "</option>\n";
+        $ret .= '>' . _MB_PUBLISHER_ALLCAT . "</option>\n";
     }
 
     // Creating category objects
-    $categoriesObj = $publisher->getHandler('category')->getCategories(0, 0, $parentcategory);
+    $categoriesObj =& $publisher->getHandler('category')->getCategories(0, 0, $parentcategory);
     if (count($categoriesObj) > 0) {
         foreach ($categoriesObj as $catID => $categoryObj) {
             $ret .= publisherAddCategoryOption($categoryObj, $selectedid);
@@ -636,13 +646,13 @@ function publisherCreateCategoryOptions($selectedid = 0, $parentcategory = 0, $a
 }
 
 /**
- * @param array $err_arr
+ * @param array  $errArray
  * @param string $reseturl
  * @return void
  */
-function publisherRenderErrors(&$err_arr, $reseturl = '')
+function publisherRenderErrors(&$errArray, $reseturl = '')
 {
-    if (is_array($err_arr) && count($err_arr) > 0) {
+    if (is_array($errArray) && count($errArray) > 0) {
         echo '<div id="readOnly" class="errorMsg" style="border:1px solid #D24D00; background:#FEFECC url(' . PUBLISHER_URL . '/assets/images/important-32.png) no-repeat 7px 50%;color:#333;padding-left:45px;">';
 
         echo '<h4 style="text-align:left;margin:0; padding-top:0;">' . _AM_PUBLISHER_MSG_SUBMISSION_ERR;
@@ -653,7 +663,7 @@ function publisherRenderErrors(&$err_arr, $reseturl = '')
 
         echo '</h4><ul>';
 
-        foreach ($err_arr as $key => $error) {
+        foreach ($errArray as $key => $error) {
             if (is_array($error)) {
                 foreach ($error as $err) {
                     echo '<li><a href="#' . $key . '" onclick="var e = xoopsGetElementById(\'' . $key . '\'); e.focus();">' . htmlspecialchars($err) . '</a></li>';
@@ -662,7 +672,7 @@ function publisherRenderErrors(&$err_arr, $reseturl = '')
                 echo '<li><a href="#' . $key . '" onclick="var e = xoopsGetElementById(\'' . $key . '\'); e.focus();">' . htmlspecialchars($error) . '</a></li>';
             }
         }
-        echo "</ul></div><br />";
+        echo '</ul></div><br />';
     }
 }
 
@@ -670,8 +680,8 @@ function publisherRenderErrors(&$err_arr, $reseturl = '')
  * Generate publisher URL
  *
  * @param string $page
- * @param array $vars
- * @param bool $encodeAmp
+ * @param array  $vars
+ * @param bool   $encodeAmp
  * @return string
  *
  * @credit : xHelp module, developped by 3Dev
@@ -701,42 +711,42 @@ function publisherMakeUri($page, $vars = array(), $encodeAmp = true)
  */
 function publisherTellAFriend($subject = '')
 {
-    if (stristr($subject, '%')) {
+    if (false !== strpos($subject, '%')) {
         $subject = rawurldecode($subject);
     }
 
-    $target_uri = XOOPS_URL . XoopsRequest::getString('REQUEST_URI', '', 'SERVER');
+    $targetUri = XOOPS_URL . XoopsRequest::getString('REQUEST_URI', '', 'SERVER');
 
-    return XOOPS_URL . '/modules/tellafriend/index.php?target_uri=' . rawurlencode($target_uri) . '&amp;subject=' . rawurlencode($subject);
+    return XOOPS_URL . '/modules/tellafriend/index.php?target_uri=' . rawurlencode($targetUri) . '&amp;subject=' . rawurlencode($subject);
 }
 
 /**
  * @param bool $another
  * @param bool $withRedirect
- * @param  $itemObj
+ * @param      $itemObj
  * @return bool|string
  */
 function publisherUploadFile($another = false, $withRedirect = true, &$itemObj)
 {
     include_once PUBLISHER_ROOT_PATH . '/class/uploader.php';
 
-//    global $publisher_isAdmin;
-    $publisher = PublisherPublisher::getInstance();
+    //    global $publisherIsAdmin;
+    $publisher =& PublisherPublisher::getInstance();
 
-    $itemid  = XoopsRequest::getInt('itemid', 0, 'POST');
+    $itemId  = XoopsRequest::getInt('itemid', 0, 'POST');
     $uid     = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->uid() : 0;
-    $session = PublisherSession::getInstance();
+    $session =& PublisherSession::getInstance();
     $session->set('publisher_file_filename', XoopsRequest::getString('item_file_name', '', 'POST'));
     $session->set('publisher_file_description', XoopsRequest::getString('item_file_description', '', 'POST'));
     $session->set('publisher_file_status', XoopsRequest::getInt('item_file_status', 1, 'POST'));
     $session->set('publisher_file_uid', $uid);
-    $session->set('publisher_file_itemid', $itemid);
+    $session->set('publisher_file_itemid', $itemId);
 
     if (!is_object($itemObj)) {
-        $itemObj = $publisher->getHandler('item')->get($itemid);
+        $itemObj =& $publisher->getHandler('item')->get($itemId);
     }
 
-    $fileObj = $publisher->getHandler('file')->create();
+    $fileObj =& $publisher->getHandler('file')->create();
     $fileObj->setVar('name', XoopsRequest::getString('item_file_name', '', 'POST'));
     $fileObj->setVar('description', XoopsRequest::getString('item_file_description', '', 'POST'));
     $fileObj->setVar('status', XoopsRequest::getInt('item_file_status', 1, 'POST'));
@@ -745,16 +755,16 @@ function publisherUploadFile($another = false, $withRedirect = true, &$itemObj)
     $fileObj->setVar('datesub', time());
 
     // Get available mimetypes for file uploading
-    $allowed_mimetypes = $publisher->getHandler('mimetype')->getArrayByType();
+    $allowedMimetypes =& $publisher->getHandler('mimetype')->getArrayByType();
     // TODO : display the available mimetypes to the user
     $errors = array();
     if ($publisher->getConfig('perm_upload') && is_uploaded_file($_FILES['item_upload_file']['tmp_name'])) {
-        if (!$ret = $fileObj->checkUpload('item_upload_file', $allowed_mimetypes, $errors)) {
+        if (!$ret = $fileObj->checkUpload('item_upload_file', $allowedMimetypes, $errors)) {
             $errorstxt = implode('<br />', $errors);
 
             $message = sprintf(_CO_PUBLISHER_MESSAGE_FILE_ERROR, $errorstxt);
             if ($withRedirect) {
-                redirect_header("file.php?op=mod&itemid=" . $itemid, 5, $message);
+                redirect_header('file.php?op=mod&itemid=' . $itemId, 5, $message);
             } else {
                 return $message;
             }
@@ -762,25 +772,25 @@ function publisherUploadFile($another = false, $withRedirect = true, &$itemObj)
     }
 
     // Storing the file
-    if (!$fileObj->store($allowed_mimetypes)) {
-//        if ($withRedirect) {
-//            redirect_header("file.php?op=mod&itemid=" . $fileObj->itemid(), 3, _CO_PUBLISHER_FILEUPLOAD_ERROR . publisherFormatErrors($fileObj->getErrors()));
-//            exit;
-//        }
+    if (!$fileObj->store($allowedMimetypes)) {
+        //        if ($withRedirect) {
+        //            redirect_header("file.php?op=mod&itemid=" . $fileObj->itemid(), 3, _CO_PUBLISHER_FILEUPLOAD_ERROR . publisherFormatErrors($fileObj->getErrors()));
+        //            exit;
+        //        }
         try {
             if ($withRedirect) {
                 throw new Exception(_CO_PUBLISHER_FILEUPLOAD_ERROR . publisherFormatErrors($fileObj->getErrors()));
             }
         } catch (Exception $e) {
-            redirect_header("file.php?op=mod&itemid=" . $fileObj->itemid(), 3, _CO_PUBLISHER_FILEUPLOAD_ERROR . publisherFormatErrors($fileObj->getErrors()));
+            redirect_header('file.php?op=mod&itemid=' . $fileObj->itemid(), 3, _CO_PUBLISHER_FILEUPLOAD_ERROR . publisherFormatErrors($fileObj->getErrors()));
         }
     } else {
         return _CO_PUBLISHER_FILEUPLOAD_ERROR . publisherFormatErrors($fileObj->getErrors());
     }
 
     if ($withRedirect) {
-        $redirect_page = $another ? 'file.php' : 'item.php';
-        redirect_header($redirect_page . "?op=mod&itemid=" . $fileObj->itemid(), 2, _CO_PUBLISHER_FILEUPLOAD_SUCCESS);
+        $redirectPage = $another ? 'file.php' : 'item.php';
+        redirect_header($redirectPage . '?op=mod&itemid=' . $fileObj->itemid(), 2, _CO_PUBLISHER_FILEUPLOAD_SUCCESS);
     } else {
         return true;
     }
@@ -817,13 +827,15 @@ function publisherNewFeatureTag()
  * @param boolean
  * @return string
  */
-function publisherTruncateTagSafe($string, $length = 80, $etc = '...', $break_words = false)
+function publisherTruncateTagSafe($string, $length = 80, $etc = '...', $breakWords = false)
 {
-    if ($length == 0) return '';
+    if ($length == 0) {
+        return '';
+    }
 
     if (strlen($string) > $length) {
         $length -= strlen($etc);
-        if (!$break_words) {
+        if (!$breakWords) {
             $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
             $string = preg_replace('/<[^>]*$/', '', $string);
             $string = publisherCloseTags($string);
@@ -844,29 +856,29 @@ function publisherTruncateTagSafe($string, $length = 80, $etc = '...', $break_wo
 function publisherCloseTags($string)
 {
     // match opened tags
-    if (preg_match_all('/<([a-z\:\-]+)[^\/]>/', $string, $start_tags)) {
-        $start_tags = $start_tags[1];
+    if (preg_match_all('/<([a-z\:\-]+)[^\/]>/', $string, $startTags)) {
+        $startTags = $startTags[1];
         // match closed tags
-        if (preg_match_all('/<\/([a-z]+)>/', $string, $end_tags)) {
-            $complete_tags = array();
-            $end_tags      = $end_tags[1];
-
-            foreach ($start_tags as $key => $val) {
-                $posb = array_search($val, $end_tags);
-                if (is_integer($posb)) {
-                    unset($end_tags[$posb]);
+        if (preg_match_all('/<\/([a-z]+)>/', $string, $endTags)) {
+            $completeTags = array();
+            $endTags      = $endTags[1];
+
+            foreach ($startTags as $key => $val) {
+                $posb = array_search($val, $endTags);
+                if (is_int($posb)) {
+                    unset($endTags[$posb]);
                 } else {
-                    $complete_tags[] = $val;
+                    $completeTags[] = $val;
                 }
             }
         } else {
-            $complete_tags = $start_tags;
+            $completeTags = $startTags;
         }
 
-        $complete_tags = array_reverse($complete_tags);
-        $elementCount = count($complete_tags);
+        $completeTags = array_reverse($completeTags);
+        $elementCount  = count($completeTags);
         for ($i = 0; $i < $elementCount; ++$i) {
-            $string .= '</' . $complete_tags[$i] . '>';
+            $string .= '</' . $completeTags[$i] . '>';
         }
     }
 
@@ -874,66 +886,66 @@ function publisherCloseTags($string)
 }
 
 /**
- * @param int $itemid
+ * @param int $itemId
  * @return string
  */
-function publisherRatingBar($itemid)
+function publisherRatingBar($itemId)
 {
-    $publisher        = PublisherPublisher::getInstance();
-    $rating_unitwidth = 30;
+    $publisher        =& PublisherPublisher::getInstance();
+    $ratingUnitWidth = 30;
     $units            = 5;
 
-    $criteria   = new Criteria('itemid', $itemid);
-    $ratingObjs = $publisher->getHandler('rating')->getObjects($criteria);
+    $criteria   = new Criteria('itemid', $itemId);
+    $ratingObjs =& $publisher->getHandler('rating')->getObjects($criteria);
     unset($criteria);
 
     $uid            = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
     $count          = count($ratingObjs);
-    $current_rating = 0;
+    $currentRating = 0;
     $voted          = false;
     $ip             = getenv('REMOTE_ADDR');
-    $rating1        = $rating2 = $rating_width = 0;
+    $rating1        = $rating2 = $ratingWidth = 0;
 
     foreach ($ratingObjs as $ratingObj) {
-        $current_rating += $ratingObj->getVar('rate');
+        $currentRating += $ratingObj->getVar('rate');
         if ($ratingObj->getVar('ip') == $ip || ($uid > 0 && $uid == $ratingObj->getVar('uid'))) {
             $voted = true;
         }
     }
 
-    $tense = $count == 1 ? _MD_PUBLISHER_VOTE_lVOTE : _MD_PUBLISHER_VOTE_lVOTES; //plural form votes/vote
+    $tense = $count == 1 ? _MD_PUBLISHER_VOTE_VOTE : _MD_PUBLISHER_VOTE_VOTES; //plural form votes/vote
 
     // now draw the rating bar
     if ($count != 0) {
-        $rating_width = number_format($current_rating / $count, 2) * $rating_unitwidth;
-        $rating1      = number_format($current_rating / $count, 1);
-        $rating2      = number_format($current_rating / $count, 2);
+        $ratingWidth = number_format($currentRating / $count, 2) * $ratingUnitWidth;
+        $rating1      = number_format($currentRating / $count, 1);
+        $rating2      = number_format($currentRating / $count, 2);
     }
     $groups        = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : XOOPS_GROUP_ANONYMOUS;
-    $gperm_handler = $publisher->getHandler('groupperm');
-
-    if (!$gperm_handler->checkRight('global', PublisherConstantsInterface::PUBLISHER_RATE, $groups, $publisher->getModule()->getVar('mid'))) {
-        $static_rater = array();
-        $static_rater[] .= "\n" . '<div class="publisher_ratingblock">';
-        $static_rater[] .= '<div id="unit_long' . $itemid . '">';
-        $static_rater[] .= '<div id="unit_ul' . $itemid . '" class="publisher_unit-rating" style="width:' . $rating_unitwidth * $units . 'px;">';
-        $static_rater[] .= '<div class="publisher_current-rating" style="width:' . $rating_width . 'px;">' . _MD_PUBLISHER_VOTE_RATING . ' ' . $rating2 . '/' . $units . '</div>';
-        $static_rater[] .= '</div>';
-        $static_rater[] .= '<div class="publisher_static">' . _MD_PUBLISHER_VOTE_RATING . ': <strong> ' . $rating1 . '</strong>/' . $units . ' (' . $count . ' ' . $tense . ') <br /><em>' . _MD_PUBLISHER_VOTE_DISABLE . '</em></div>';
-        $static_rater[] .= '</div>';
-        $static_rater[] .= '</div>' . "\n\n";
-
-        return join("\n", $static_rater);
+    $gpermHandler =& $publisher->getHandler('groupperm');
+
+    if (!$gpermHandler->checkRight('global', PublisherConstantsInterface::PUBLISHER_RATE, $groups, $publisher->getModule()->getVar('mid'))) {
+        $staticRater = array();
+        $staticRater[] .= "\n" . '<div class="publisher_ratingblock">';
+        $staticRater[] .= '<div id="unit_long' . $itemId . '">';
+        $staticRater[] .= '<div id="unit_ul' . $itemId . '" class="publisher_unit-rating" style="width:' . $ratingUnitWidth * $units . 'px;">';
+        $staticRater[] .= '<div class="publisher_current-rating" style="width:' . $ratingWidth . 'px;">' . _MD_PUBLISHER_VOTE_RATING . ' ' . $rating2 . '/' . $units . '</div>';
+        $staticRater[] .= '</div>';
+        $staticRater[] .= '<div class="publisher_static">' . _MD_PUBLISHER_VOTE_RATING . ': <strong> ' . $rating1 . '</strong>/' . $units . ' (' . $count . ' ' . $tense . ') <br /><em>' . _MD_PUBLISHER_VOTE_DISABLE . '</em></div>';
+        $staticRater[] .= '</div>';
+        $staticRater[] .= '</div>' . "\n\n";
+
+        return implode("\n", $staticRater);
     } else {
         $rater = '';
         $rater .= '<div class="publisher_ratingblock">';
-        $rater .= '<div id="unit_long' . $itemid . '">';
-        $rater .= '<div id="unit_ul' . $itemid . '" class="publisher_unit-rating" style="width:' . $rating_unitwidth * $units . 'px;">';
-        $rater .= '<div class="publisher_current-rating" style="width:' . $rating_width . 'px;">' . _MD_PUBLISHER_VOTE_RATING . ' ' . $rating2 . '/' . $units . '</div>';
+        $rater .= '<div id="unit_long' . $itemId . '">';
+        $rater .= '<div id="unit_ul' . $itemId . '" class="publisher_unit-rating" style="width:' . $ratingUnitWidth * $units . 'px;">';
+        $rater .= '<div class="publisher_current-rating" style="width:' . $ratingWidth . 'px;">' . _MD_PUBLISHER_VOTE_RATING . ' ' . $rating2 . '/' . $units . '</div>';
 
         for ($ncount = 1; $ncount <= $units; ++$ncount) { // loop from 1 to the number of units
             if (!$voted) { // if the user hasn't yet voted, draw the voting stars
-                $rater .= '<div><a href="' . PUBLISHER_URL . '/rate.php?itemid=' . $itemid . '&amp;rating=' . $ncount . '" title="' . $ncount . ' ' . _MD_PUBLISHER_VOTE_OUTOF . ' ' . $units . '" class="publisher_r' . $ncount . '-unit rater" rel="nofollow">' . $ncount . '</a></div>';
+                $rater .= '<div><a href="' . PUBLISHER_URL . '/rate.php?itemid=' . $itemId . '&amp;rating=' . $ncount . '" title="' . $ncount . ' ' . _MD_PUBLISHER_VOTE_OUTOF . ' ' . $units . '" class="publisher_r' . $ncount . '-unit rater" rel="nofollow">' . $ncount . '</a></div>';
             }
         }
 
@@ -963,8 +975,8 @@ function publisherGetEditors($allowedEditors = null)
     $ret    = array();
     $nohtml = false;
     xoops_load('XoopsEditorHandler');
-    $editor_handler = XoopsEditorHandler::getInstance();
-    $editors        = $editor_handler->getList($nohtml);
+    $editorHandler =& XoopsEditorHandler::getInstance();
+    $editors        = $editorHandler->getList($nohtml);
     foreach ($editors as $name => $title) {
         $key = publisherStringToInt($name);
         if (is_array($allowedEditors)) {
@@ -984,12 +996,12 @@ function publisherGetEditors($allowedEditors = null)
 
 /**
  * @param string $string
- * @param int $length
+ * @param int    $length
  * @return int
  */
 function publisherStringToInt($string = '', $length = 5)
 {
-    for ($i = 0, $final = "", $string = substr(md5($string), $length); $i < $length; $final .= (int)($string[$i]), ++$i) ;
+    for ($i = 0, $final = '', $string = substr(md5($string), $length); $i < $length; $final .= (int)($string[$i]), ++$i) ;
 
     return (int)($final);
 }
@@ -1000,7 +1012,7 @@ function publisherStringToInt($string = '', $length = 5)
  */
 function publisherConvertCharset($item)
 {
-    if (_CHARSET != 'windows-1256') {
+    if (_CHARSET !== 'windows-1256') {
         return utf8_encode($item);
     }
 
diff --git a/publisher/include/media.textsanitizer.php b/publisher/include/media.textsanitizer.php
index 1ce0593d..9f3ffb63 100644
--- a/publisher/include/media.textsanitizer.php
+++ b/publisher/include/media.textsanitizer.php
@@ -10,24 +10,27 @@
  */
 
 /**
- * @copyright       The XUUPS Project http://sourceforge.net/projects/xuups/
- * @license         http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package         Publisher
- * @subpackage      Include
- * @since           1.0
- * @author          trabis <lusopoemas@gmail.com>
+ * @copyright         The XUUPS Project http://sourceforge.net/projects/xuups/
+ * @license           http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package           Publisher
+ * @subpackage        Include
+ * @since             1.0
+ * @author            trabis <lusopoemas@gmail.com>
  * @author            Taiwen Jiang (phppp or D.J.) <php_pp@hotmail.com>
- * @version         $Id: media.textsanitizer.php 10374 2012-12-12 23:39:48Z trabis $
+ * @version           $Id: media.textsanitizer.php 10374 2012-12-12 23:39:48Z trabis $
  */
 
-define("MYTEXTSANITIZER_EXTENDED_MEDIA", 1);
+define('MYTEXTSANITIZER_EXTENDED_MEDIA', 1);
 
 /**
  * Class MyTextSanitizerExtension
  */
 class MyTextSanitizerExtension
 {
-    public function MyTextSanitizerExtension()
+    /**
+     * MyTextSanitizerExtension constructor.
+     */
+    public function __construct()
     {
     }
 
@@ -66,7 +69,7 @@ public function wmp(&$patterns, &$replacements)
      *
      * @return string
      */
-    public function _displayFlash($url, $width = false, $height = false)
+    public function displayFlash($url, $width = false, $height = false)
     {
         if (!$width || !$height) {
             if (!$dimension = @getimagesize($url)) {
@@ -87,7 +90,7 @@ public function _displayFlash($url, $width = false, $height = false)
         $rp .= "<PARAM NAME='bgcolor' VALUE='#FFFFFF'>";
         $rp .= "<param name='wmode' value='transparent'>";
         $rp .= "<embed src='{$url}' width='{$width}' height='{$height}' quality='high' bgcolor='#FFFFFF' wmode='transparent'  pluginspage='http://www.macromedia.com/go/getflashplayer' type='application/x-shockwave-flash'></embed>";
-        $rp .= "</object>";
+        $rp .= '</object>';
 
         return $rp;
     }
@@ -99,7 +102,7 @@ public function _displayFlash($url, $width = false, $height = false)
     public function flash(&$patterns, &$replacements)
     {
         $patterns[]     = "/\[(swf|flash)=(['\"]?)([^\"']*),([^\"']*)\\2]([^\"]*)\[\/\\1\]/esU";
-        $replacements[] = "MyTextSanitizerExtension::_displayFlash( '\\5', '\\3', '\\4' )";
+        $replacements[] = "MyTextSanitizerExtension::displayFlash( '\\5', '\\3', '\\4' )";
     }
 
     /**
@@ -135,7 +138,7 @@ public function mms(&$patterns, &$replacements)
         $rp .= "<PARAM NAME=\"enableErrorDialogs\" VALUE=\"0\">";
         $rp .= "<PARAM NAME=\"_cx\" VALUE=\"12700\">";
         $rp .= "<PARAM NAME=\"_cy\" VALUE=\"8731\">";
-        $rp .= "</OBJECT>";
+        $rp .= '</OBJECT>';
         $replacements[] = $rp;
     }
 
@@ -162,7 +165,7 @@ public function rtsp(&$patterns, &$replacements)
         $rp .= "<param NAME=\"BACKGROUNDCOLOR\" VALUE=\"#000000\">";
         $rp .= "<param NAME=\"SRC\" VALUE=\"\\4\">";
         $rp .= "<embed autostart=\"0\" src=\"\\4\" type=\"audio/x-pn-realaudio-plugin\" HEIGHT='\\3' WIDTH='\\2' controls=\"ImageWindow\" console=\"cons\"> </embed>";
-        $rp .= "</object>";
+        $rp .= '</object>';
         $rp .= "<br /><object CLASSID=clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA HEIGHT=32 ID=Player WIDTH='\\2' VIEWASTEXT>";
         $rp .= "<param NAME=\"_ExtentX\" VALUE=\"18256\">";
         $rp .= "<param NAME=\"_ExtentY\" VALUE=\"794\">";
@@ -179,7 +182,7 @@ public function rtsp(&$patterns, &$replacements)
         $rp .= "<param NAME=\"BACKGROUNDCOLOR\" VALUE=\"#000000\">";
         $rp .= "<param NAME=\"SRC\" VALUE=\"\\4\">";
         $rp .= "<embed autostart=\"0\" src=\"\\4\" type=\"audio/x-pn-realaudio-plugin\" HEIGHT='30' WIDTH='\\2' controls=\"ControlPanel\" console=\"cons\"> </embed>";
-        $rp .= "</object>";
+        $rp .= '</object>';
 
         $replacements[] = $rp;
     }
diff --git a/publisher/include/notification.inc.php b/publisher/include/notification.inc.php
index a6ed8d03..660182f6 100644
--- a/publisher/include/notification.inc.php
+++ b/publisher/include/notification.inc.php
@@ -26,37 +26,37 @@
 
 /**
  * @param $category
- * @param $item_id
+ * @param $itemId
  *
  * @return mixed
  */
-function publisher_notify_iteminfo($category, $item_id)
+function publisher_notify_iteminfo($category, $itemId)
 {
-    if ($category == 'global') {
+    if ($category === 'global') {
         $item['name'] = '';
         $item['url']  = '';
 
         return $item;
     }
 
-    if ($category == 'category') {
+    if ($category === 'category') {
         // Assume we have a valid category id
-        $sql          = 'SELECT name, short_url FROM ' . $GLOBALS['xoopsDB']->prefix('publisher_categories') . ' WHERE categoryid  = ' . $item_id;
+        $sql          = 'SELECT name, short_url FROM ' . $GLOBALS['xoopsDB']->prefix('publisher_categories') . ' WHERE categoryid  = ' . $itemId;
         $result       = $GLOBALS['xoopsDB']->query($sql); // TODO: error check
-        $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
-        $item['name'] = $result_array['name'];
-        $item['url']  = PublisherSeo::generateUrl('category', $item_id, $result_array['short_url']);
+        $resultArray = $GLOBALS['xoopsDB']->fetchArray($result);
+        $item['name'] = $resultArray['name'];
+        $item['url']  = PublisherSeo::generateUrl('category', $itemId, $resultArray['short_url']);
 
         return $item;
     }
 
-    if ($category == 'item') {
+    if ($category === 'item') {
         // Assume we have a valid story id
-        $sql          = 'SELECT title, short_url FROM ' . $GLOBALS['xoopsDB']->prefix('publisher_items') . ' WHERE itemid = ' . $item_id;
+        $sql          = 'SELECT title, short_url FROM ' . $GLOBALS['xoopsDB']->prefix('publisher_items') . ' WHERE itemid = ' . $itemId;
         $result       = $GLOBALS['xoopsDB']->query($sql); // TODO: error check
-        $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
-        $item['name'] = $result_array['title'];
-        $item['url']  = PublisherSeo::generateUrl('item', $item_id, $result_array['short_url']);
+        $resultArray = $GLOBALS['xoopsDB']->fetchArray($result);
+        $item['name'] = $resultArray['title'];
+        $item['url']  = PublisherSeo::generateUrl('item', $itemId, $resultArray['short_url']);
 
         return $item;
     }
diff --git a/publisher/include/oninstall.php b/publisher/include/oninstall.php
index e866f85a..c6882eb3 100644
--- a/publisher/include/oninstall.php
+++ b/publisher/include/oninstall.php
@@ -20,7 +20,7 @@
  * @return bool
  */
 
-function xoops_module_pre_install_publisher(XoopsModule &$xoopsModule)
+function xoops_module_pre_install_publisher(XoopsModule $xoopsModule)
 {
     // NOP
     return true;
@@ -31,19 +31,22 @@ function xoops_module_pre_install_publisher(XoopsModule &$xoopsModule)
  *
  * @return bool|string
  */
-function xoops_module_install_publisher(XoopsModule &$xoopsModule)
+function xoops_module_install_publisher(XoopsModule $xoopsModule)
 {
+    xoops_loadLanguage('admin', $xoopsModule->getVar('dirname'));
     xoops_loadLanguage('modinfo', $xoopsModule->getVar('dirname'));
-    include_once $GLOBALS['xoops']->path("modules/" . $xoopsModule->getVar('dirname') . "/include/functions.php");
+    include_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/include/functions.php');
 
     $ret = true;
     $msg = '';
     // Create content directory
-    $dir = $GLOBALS['xoops']->path("uploads/" . $xoopsModule->getVar('dirname') . "/content");
-    if (!publisherMkdir($dir))
+    $dir = $GLOBALS['xoops']->path('uploads/' . $xoopsModule->getVar('dirname') . '/content');
+    if (!publisherMkdir($dir)) {
         $msg .= sprintf(_AM_PUBLISHER_DIRNOTCREATED, $dir);
-    if (empty($msg))
+    }
+    if (empty($msg)) {
         return $ret;
-    else
+    } else {
         return $msg;
+    }
 }
diff --git a/publisher/include/onupdate.php b/publisher/include/onupdate.php
index 36577f11..3f4fd0c0 100644
--- a/publisher/include/onupdate.php
+++ b/publisher/include/onupdate.php
@@ -26,22 +26,22 @@ function xoops_module_update_publisher(XoopsModule $module, $oldversion = null)
 
     if ($oldversion < 102) {
         // delete old html template files
-        $templateDirectory = $GLOBALS['xoops']->path("modules/" . $module->getVar('dirname', 'n') . "/templates/");
-        $template_list     = array_diff(scandir($templateDirectory), array('..', '.'));
-        foreach ($template_list as $k => $v) {
-            $fileinfo = new SplFileInfo($templateDirectory . $v);
-            if ($fileinfo->getExtension() == 'html' && $fileinfo->getFilename() != 'index.html') {
+        $templateDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/templates/');
+        $templateList     = array_diff(scandir($templateDirectory), array('..', '.'));
+        foreach ($templateList as $k => $v) {
+            $fileInfo = new SplFileInfo($templateDirectory . $v);
+            if ($fileInfo->getExtension() === 'html' && $fileInfo->getFilename() !== 'index.html') {
                 if (file_exists($templateDirectory . $v)) {
                     unlink($templateDirectory . $v);
                 }
             }
         }
         // delete old block html template files
-        $templateDirectory = $GLOBALS['xoops']->path("modules/" . $module->getVar('dirname', 'n') . "/templates/blocks/");
-        $template_list     = array_diff(scandir($templateDirectory), array('..', '.'));
-        foreach ($template_list as $k => $v) {
-            $fileinfo = new SplFileInfo($templateDirectory . $v);
-            if ($fileinfo->getExtension() == 'html' && $fileinfo->getFilename() != 'index.html') {
+        $templateDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/templates/blocks/');
+        $templateList     = array_diff(scandir($templateDirectory), array('..', '.'));
+        foreach ($templateList as $k => $v) {
+            $fileInfo = new SplFileInfo($templateDirectory . $v);
+            if ($fileInfo->getExtension() === 'html' && $fileInfo->getFilename() !== 'index.html') {
                 if (file_exists($templateDirectory . $v)) {
                     unlink($templateDirectory . $v);
                 }
@@ -50,28 +50,28 @@ function xoops_module_update_publisher(XoopsModule $module, $oldversion = null)
         // Load class XoopsFile
         xoops_load('xoopsfile');
         //delete /images directory
-        $imagesDirectory = $GLOBALS['xoops']->path("modules/" . $module->getVar('dirname', 'n') . "/images/");
-        $folderHandler   = XoopsFile::getHandler("folder", $imagesDirectory);
+        $imagesDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/images/');
+        $folderHandler   = XoopsFile::getHandler('folder', $imagesDirectory);
         $folderHandler->delete($imagesDirectory);
         //delete /css directory
-        $cssDirectory  = $GLOBALS['xoops']->path("modules/" . $module->getVar('dirname', 'n') . "/css/");
-        $folderHandler = XoopsFile::getHandler("folder", $cssDirectory);
+        $cssDirectory  = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/css/');
+        $folderHandler = XoopsFile::getHandler('folder', $cssDirectory);
         $folderHandler->delete($cssDirectory);
         //delete /js directory
-        $jsDirectory   = $GLOBALS['xoops']->path("modules/" . $module->getVar('dirname', 'n') . "/js/");
-        $folderHandler = XoopsFile::getHandler("folder", $jsDirectory);
+        $jsDirectory   = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/js/');
+        $folderHandler = XoopsFile::getHandler('folder', $jsDirectory);
         $folderHandler->delete($jsDirectory);
         //delete /tcpdf directory
-        $tcpdfDirectory = $GLOBALS['xoops']->path("modules/" . $module->getVar('dirname', 'n') . "/tcpdf/");
-        $folderHandler  = XoopsFile::getHandler("folder", $tcpdfDirectory);
+        $tcpdfDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/tcpdf/');
+        $folderHandler  = XoopsFile::getHandler('folder', $tcpdfDirectory);
         $folderHandler->delete($tcpdfDirectory);
         //delete /templates/style.css file
-//       $cssFile = $GLOBALS['xoops']->path("modules/" . $module->getVar('dirname', 'n') . "/templates/style.css");
-//       $folderHandler   = XoopsFile::getHandler("file", $cssFile);
-//       $folderHandler->delete($cssFile);
+        //       $cssFile = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/templates/style.css');
+        //       $folderHandler   = XoopsFile::getHandler('file', $cssFile);
+        //       $folderHandler->delete($cssFile);
     }
 
-    $gperm_handler = xoops_gethandler('groupperm');
+    $gpermHandler =& xoops_getHandler('groupperm');
 
-    return $gperm_handler->deleteByModule($module->getVar('mid'), "item_read");
+    return $gpermHandler->deleteByModule($module->getVar('mid'), 'item_read');
 }
diff --git a/publisher/include/search.inc.php b/publisher/include/search.inc.php
index fb2455db..7feee173 100644
--- a/publisher/include/search.inc.php
+++ b/publisher/include/search.inc.php
@@ -27,66 +27,66 @@
  * @param        $limit
  * @param        $offset
  * @param        $userid
- * @param array $categories
- * @param int $sortby
+ * @param array  $categories
+ * @param int    $sortby
  * @param string $searchin
  * @param string $extra
  *
  * @return array
  */
-function publisher_search($queryarray, $andor, $limit, $offset, $userid, $categories = array(), $sortby = 0, $searchin = "", $extra = "")
+function publisher_search($queryarray, $andor, $limit, $offset, $userid, $categories = array(), $sortby = 0, $searchin = '', $extra = '')
 {
-    $publisher = PublisherPublisher::getInstance();
+    $publisher =& PublisherPublisher::getInstance();
     $ret       = array();
     if ($queryarray == '' || count($queryarray) == 0) {
-        $hightlight_key = '';
+        $hightlightKey = '';
     } else {
         $keywords       = implode('+', $queryarray);
-        $hightlight_key = "&amp;keywords=" . $keywords;
+        $hightlightKey = '&amp;keywords=' . $keywords;
     }
-    $itemsObjs        = $publisher->getHandler('item')->getItemsFromSearch($queryarray, $andor, $limit, $offset, $userid, $categories, $sortby, $searchin, $extra);
+    $itemsObjs        =& $publisher->getHandler('item')->getItemsFromSearch($queryarray, $andor, $limit, $offset, $userid, $categories, $sortby, $searchin, $extra);
     $withCategoryPath = $publisher->getConfig('search_cat_path');
     //xoops_load("xoopslocal");
     $usersIds = array();
     foreach ($itemsObjs as $obj) {
-        $item['image'] = "assets/images/item_icon.gif";
+        $item['image'] = 'assets/images/item_icon.gif';
         $item['link']  = $obj->getItemUrl();
-        $item['link'] .= (!empty($hightlight_key) && (strpos($item['link'], '.php?') === false)) ? "?" . ltrim($hightlight_key, '&amp;') : $hightlight_key;
+        $item['link'] .= (!empty($hightlightKey) && (strpos($item['link'], '.php?') === false)) ? '?' . ltrim($hightlightKey, '&amp;') : $hightlightKey;
         if ($withCategoryPath) {
-            $item['title'] = $obj->getCategoryPath(false) . " > " . $obj->title();
+            $item['title'] = $obj->getCategoryPath(false) . ' > ' . $obj->getTitle();
         } else {
-            $item['title'] = $obj->title();
+            $item['title'] = $obj->getTitle();
         }
         $item['time'] = $obj->getVar('datesub'); //must go has unix timestamp
         $item['uid']  = $obj->uid();
         //"Fulltext search/highlight
-        $text           = $obj->body();
-        $sanitized_text = "";
-        $text_i         = strtolower($text);
+        $text           = $obj->getBody();
+        $sanitizedText = '';
+        $textLower         = strtolower($text);
         $queryarray     = is_array($queryarray) ? $queryarray : array($queryarray);
 
-        if (count($queryarray) > 0 && $queryarray[0] != '') {
+        if ($queryarray[0] != '' && count($queryarray) > 0) {
             foreach ($queryarray as $query) {
-                $pos     = strpos($text_i, strtolower($query)); //xoops_local("strpos", $text_i, strtolower($query));
+                $pos     = strpos($textLower, strtolower($query)); //xoops_local("strpos", $textLower, strtolower($query));
                 $start   = max(($pos - 100), 0);
                 $length  = strlen($query) + 200; //xoops_local("strlen", $query) + 200;
-                $context = $obj->highlight(xoops_substr($text, $start, $length, " [...]"), $query);
-                $sanitized_text .= "<p>[...] " . $context . "</p>";
+                $context = $obj->highlight(xoops_substr($text, $start, $length, ' [...]'), $query);
+                $sanitizedText .= '<p>[...] ' . $context . '</p>';
             }
         }
         //End of highlight
-        $item['text']          = $sanitized_text;
+        $item['text']          = $sanitizedText;
         $item['author']        = $obj->author_alias();
-        $item['datesub']       = $obj->datesub($publisher->getConfig('format_date'));
+        $item['datesub']       = $obj->getDatesub($publisher->getConfig('format_date'));
         $usersIds[$obj->uid()] = $obj->uid();
         $ret[]                 = $item;
-        unset($item, $sanitized_text);
+        unset($item, $sanitizedText);
     }
     xoops_load('XoopsUserUtility');
     $usersNames = XoopsUserUtility::getUnameFromIds($usersIds, $publisher->getConfig('format_realname'), true);
     foreach ($ret as $key => $item) {
-        if ($item["author"] == '') {
-            $ret[$key]["author"] = isset($usersNames[$item["uid"]]) ? $usersNames[$item["uid"]] : '';
+        if ($item['author'] == '') {
+            $ret[$key]['author'] = isset($usersNames[$item['uid']]) ? $usersNames[$item['uid']] : '';
         }
     }
     unset($usersNames, $usersIds);
diff --git a/publisher/include/seo.inc.php b/publisher/include/seo.inc.php
index 478ae53d..a5a44295 100644
--- a/publisher/include/seo.inc.php
+++ b/publisher/include/seo.inc.php
@@ -20,7 +20,7 @@
  * @version         $Id: seo.inc.php 10374 2012-12-12 23:39:48Z trabis $
  */
 
-// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
+// defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
 //$seoOp = @$_GET['seoOp'];
 $seoOp = XoopsRequest::getString('seoOp', '', 'GET');
@@ -28,13 +28,13 @@
 //$seoArg = @$_GET['seoArg'];
 $seoArg = XoopsRequest::getString('seoArg', '', 'GET');
 
-if (empty($seoOp) && XoopsRequest::getString('PATH_INFO', '', 'SERVER')) {
+if ('' == $seoOp && XoopsRequest::getString('PATH_INFO', '', 'SERVER')) {
     // SEO mode is path-info
     /*
     Sample URL for path-info
     http://localhost/modules/publisher/seo.php/item.2/can-i-turn-the-ads-off.html
     */
-    $data = explode("/", XoopsRequest::getString('PATH_INFO', '', 'SERVER'));
+    $data = explode('/', XoopsRequest::getString('PATH_INFO', '', 'SERVER'));
 
     $seoParts = explode('.', $data[1]);
     $seoOp    = $seoParts[0];
@@ -47,8 +47,7 @@
 $seoMap = array(
     'category' => 'category.php',
     'item'     => 'item.php',
-    'print'    => 'print.php'
-);
+    'print'    => 'print.php');
 
 if (!empty($seoOp) && isset($seoMap[$seoOp])) {
     // module specific dispatching logic, other module must implement as
diff --git a/publisher/include/seo_functions.php b/publisher/include/seo_functions.php
index 8df8cf33..d8ac2303 100644
--- a/publisher/include/seo_functions.php
+++ b/publisher/include/seo_functions.php
@@ -10,11 +10,11 @@
 //   are "rewrite" & "path-info"
 
 /**
- * Create a title for the short_url field of an article
+ * Create a title for the shortUrl field of an article
  *
  * @credit psylove
  *
- * @var string $title title of the article
+ * @var string $title   title of the article
  * @var string $withExt do we add an html extension or not
  * @return string sort_url for the article
  */
@@ -52,15 +52,15 @@ public static function getTitle($title = '', $withExt = true)
 
         // Transformation des ponctuations
         //                 Tab     Space      !        "        #        %        &        '        (        )        ,        /        :        ;        <        =        >        ?        @        [        \        ]        ^        {        |        }        ~       .
-        $pattern = array("/%09/", "/%20/", "/%21/", "/%22/", "/%23/", "/%25/", "/%26/", "/%27/", "/%28/", "/%29/", "/%2C/", "/%2F/", "/%3A/", "/%3B/", "/%3C/", "/%3D/", "/%3E/", "/%3F/", "/%40/", "/%5B/", "/%5C/", "/%5D/", "/%5E/", "/%7B/", "/%7C/", "/%7D/", "/%7E/", "/\./");
-        $rep_pat = array("-", "-", "", "", "", "-100", "", "-", "", "", "", "-", "", "", "", "-", "", "", "-at-", "", "-", "", "-", "", "-", "", "-", "");
-        $title   = preg_replace($pattern, $rep_pat, $title);
+        $pattern = array('/%09/', '/%20/', '/%21/', '/%22/', '/%23/', '/%25/', '/%26/', '/%27/', '/%28/', '/%29/', '/%2C/', '/%2F/', '/%3A/', '/%3B/', '/%3C/', '/%3D/', '/%3E/', '/%3F/', '/%40/', '/%5B/', '/%5C/', '/%5D/', '/%5E/', '/%7B/', '/%7C/', '/%7D/', '/%7E/', "/\./");
+        $repPattern = array('-', '-', '', '', '', '-100', '', '-', '', '', '', '-', '', '', '', '-', '', '', '-at-', '', '-', '', '-', '', '-', '', '-', '');
+        $title   = preg_replace($pattern, $repPattern, $title);
 
         // Transformation des caractères accentués
         //                  è        é        ê        ë        ç        à        â        ä        î        ï        ù        ü        û        ô        ö
-        $pattern = array("/%B0/", "/%E8/", "/%E9/", "/%EA/", "/%EB/", "/%E7/", "/%E0/", "/%E2/", "/%E4/", "/%EE/", "/%EF/", "/%F9/", "/%FC/", "/%FB/", "/%F4/", "/%F6/");
-        $rep_pat = array("-", "e", "e", "e", "e", "c", "a", "a", "a", "i", "i", "u", "u", "u", "o", "o");
-        $title   = preg_replace($pattern, $rep_pat, $title);
+        $pattern = array('/%B0/', '/%E8/', '/%E9/', '/%EA/', '/%EB/', '/%E7/', '/%E0/', '/%E2/', '/%E4/', '/%EE/', '/%EF/', '/%F9/', '/%FC/', '/%FB/', '/%F4/', '/%F6/');
+        $repPattern = array('-', 'e', 'e', 'e', 'e', 'c', 'a', 'a', 'a', 'i', 'i', 'u', 'u', 'u', 'o', 'o');
+        $title   = preg_replace($pattern, $repPattern, $title);
 
         if (count($title) > 0) {
             if ($withExt) {
@@ -76,26 +76,26 @@ public static function getTitle($title = '', $withExt = true)
     /**
      * @param        $op
      * @param        $id
-     * @param string $short_url
+     * @param string $shortUrl
      *
      * @return string
      */
-    public static function generateUrl($op, $id, $short_url = "")
+    public static function generateUrl($op, $id, $shortUrl = '')
     {
-        $publisher = PublisherPublisher::getInstance();
-        if ($publisher->getConfig('seo_url_rewrite') != 'none') {
-            if (!empty($short_url)) {
-                $short_url = $short_url . '.html';
+        $publisher =& PublisherPublisher::getInstance();
+        if ($publisher->getConfig('seo_url_rewrite') !== 'none') {
+            if (!empty($shortUrl)) {
+                $shortUrl .= '.html';
             }
 
-            if ($publisher->getConfig('seo_url_rewrite') == 'htaccess') {
+            if ($publisher->getConfig('seo_url_rewrite') === 'htaccess') {
                 // generate SEO url using htaccess
-                return XOOPS_URL . '/' . $publisher->getConfig('seo_module_name') . ".${op}.${id}/${short_url}";
-            } elseif ($publisher->getConfig('seo_url_rewrite') == 'path-info') {
+                return XOOPS_URL . '/' . $publisher->getConfig('seo_module_name') . ".${op}.${id}/${shortUrl}";
+            } elseif ($publisher->getConfig('seo_url_rewrite') === 'path-info') {
                 // generate SEO url using path-info
-                return PUBLISHER_URL . "/index.php/${op}.${id}/${short_url}";
+                return PUBLISHER_URL . "/index.php/${op}.${id}/${shortUrl}";
             } else {
-                die('Unknown SEO method.');
+                exit('Unknown SEO method.');
             }
         } else {
             // generate classic url
@@ -106,7 +106,7 @@ public static function generateUrl($op, $id, $short_url = "")
                 case 'print':
                     return PUBLISHER_URL . "/${op}.php?itemid=${id}";
                 default:
-                    die('Unknown SEO operation.');
+                    exit('Unknown SEO operation.');
             }
         }
     }
diff --git a/publisher/index.php b/publisher/index.php
index 6213e9c8..50366c8c 100644
--- a/publisher/index.php
+++ b/publisher/index.php
@@ -29,65 +29,64 @@
 $start = XoopsRequest::getInt('start', 0, 'GET');
 
 // Number of categories at the top level
-$totalCategories = $publisher->getHandler('category')->getCategoriesCount(0);
+$totalCategories =& $publisher->getHandler('category')->getCategoriesCount(0);
 
 // if there ain't no category to display, let's get out of here
 if ($totalCategories == 0) {
     redirect_header(XOOPS_URL, 2, _MD_PUBLISHER_NO_TOP_PERMISSIONS);
-//    exit;
+    //    exit;
 }
 
 $xoopsOption['template_main'] = 'publisher_display' . '_' . $publisher->getConfig('idxcat_items_display_type') . '.tpl';
 include_once $GLOBALS['xoops']->path('header.php');
 include_once PUBLISHER_ROOT_PATH . '/footer.php';
 
-$gperm_handler = xoops_gethandler('groupperm');
+$gpermHandler =& xoops_getHandler('groupperm');
 
 // Creating the top categories objects
-$categoriesObj = $publisher->getHandler('category')->getCategories($publisher->getConfig('idxcat_cat_perpage'), $catstart);
+$categoriesObj =& $publisher->getHandler('category')->getCategories($publisher->getConfig('idxcat_cat_perpage'), $catstart);
 
 // if no categories are found, exit
 $totalCategoriesOnPage = count($categoriesObj);
 if ($totalCategoriesOnPage == 0) {
-    redirect_header("javascript:history.go(-1)", 2, _MD_PUBLISHER_NO_CAT_EXISTS);
-//    exit;
+    redirect_header('javascript:history.go(-1)', 2, _MD_PUBLISHER_NO_CAT_EXISTS);
+    //    exit;
 }
 
 // Get subcats of the top categories
-$subcats = $publisher->getHandler('category')->getSubCats($categoriesObj);
+$subcats =& $publisher->getHandler('category')->getSubCats($categoriesObj);
 
 // Count of items within each top categories
-$totalItems = $publisher->getHandler('category')->publishedItemsCount();
+$totalItems =& $publisher->getHandler('category')->publishedItemsCount();
 
 // real total count of items
-$real_total_items = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED));
+$real_total_items =& $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED));
 
 if ($publisher->getConfig('idxcat_display_last_item') == 1) {
     // Get the last item in each category
-    $last_itemObj = $publisher->getHandler('item')->getLastPublishedByCat(array_merge(array($categoriesObj), $subcats));
+    $last_itemObj =& $publisher->getHandler('item')->getLastPublishedByCat(array_merge(array($categoriesObj), $subcats));
 }
 
 // Max size of the title in the last item column
 $lastitemsize = (int)($publisher->getConfig('idxcat_last_item_size'));
 
 // Hide sub categories in main page only - hacked by Mowaffak
-if ($publisher->getConfig('idxcat_show_subcats') == 'nomain') {
+if ('nomain' === $publisher->getConfig('idxcat_show_subcats')) {
     $publisher->setConfig('idxcat_show_subcats', 'no');
 }
 
 $categories = array();
 foreach ($categoriesObj as $catId => $category) {
-
     $total = 0;
     // Do we display sub categories ?
-    if ($publisher->getConfig('idxcat_show_subcats') != 'no') {
+    if ($publisher->getConfig('idxcat_show_subcats') !== 'no') {
         // if this category has subcats
         if (isset($subcats[$catId])) {
             foreach ($subcats[$catId] as $key => $subcat) {
                 // Get the items count of this very category
                 $subcat_total_items = isset($totalItems[$key]) ? $totalItems[$key] : 0;
                 // Do we display empty sub-cats ?
-                if (($subcat_total_items > 0) || ($publisher->getConfig('idxcat_show_subcats') == 'all')) {
+                if (($subcat_total_items > 0) || ($publisher->getConfig('idxcat_show_subcats') === 'all')) {
                     $subcat_id = $subcat->getVar('categoryid');
                     // if we retrieved the last item object for this category
                     if (isset($last_itemObj[$subcat_id])) {
@@ -102,7 +101,7 @@
                     //$total += $numItems;
                 }
             }
-            unset($subcat);
+//            unset($subcat);
         }
     }
 
@@ -150,6 +149,25 @@
             $order = 'DESC';
             break;
 
+        case 'counter':
+            $sort  = 'counter';
+            $order = 'DESC';
+            break;
+
+        case 'rating':
+            $sort  = 'rating';
+            $order = 'DESC';
+            break;
+        case 'votes':
+            $sort  = 'votes';
+            $order = 'DESC';
+            break;
+
+        case 'comments':
+            $sort  = 'comments';
+            $order = 'DESC';
+            break;
+
         default:
             $sort  = 'weight';
             $order = 'ASC';
@@ -157,7 +175,7 @@
     }
 
     // Creating the last ITEMs
-    $itemsObj   = $publisher->getHandler('item')->getAllPublished($publisher->getConfig('idxcat_index_perpage'), $start, -1, $sort, $order);
+    $itemsObj   =& $publisher->getHandler('item')->getAllPublished($publisher->getConfig('idxcat_index_perpage'), $start, -1, $sort, $order);
     $itemsCount = count($itemsObj);
 
     //todo: make config for summary size
@@ -212,7 +230,7 @@
 
 // RSS Link
 if ($publisher->getConfig('idxcat_show_rss_link') == 1) {
-    $link = sprintf("<a href='%s' title='%s'><img src='%s' border=0 alt='%s'></a>", PUBLISHER_URL . "/backend.php", _MD_PUBLISHER_RSSFEED, PUBLISHER_URL . "/assets/images/rss.gif", _MD_PUBLISHER_RSSFEED);
+    $link = sprintf("<a href='%s' title='%s'><img src='%s' border=0 alt='%s'></a>", PUBLISHER_URL . '/backend.php', _MD_PUBLISHER_RSSFEED, PUBLISHER_URL . '/assets/images/rss.gif', _MD_PUBLISHER_RSSFEED);
     $xoopsTpl->assign('rssfeed_link', $link);
 }
 
diff --git a/publisher/item.php b/publisher/item.php
index f551fdb2..00f9def8 100644
--- a/publisher/item.php
+++ b/publisher/item.php
@@ -22,21 +22,21 @@
 
 include_once __DIR__ . '/header.php';
 
-$itemid       = XoopsRequest::getInt('itemid', 0, 'GET');
-$item_page_id = XoopsRequest::getInt('page', -1, 'GET');
+$itemId       = XoopsRequest::getInt('itemid', 0, 'GET');
+$itemPageId = XoopsRequest::getInt('page', -1, 'GET');
 
-if ($itemid == 0) {
-    redirect_header("javascript:history.go(-1)", 1, _MD_PUBLISHER_NOITEMSELECTED);
-//    exit();
+if ($itemId == 0) {
+    redirect_header('javascript:history.go(-1)', 1, _MD_PUBLISHER_NOITEMSELECTED);
+    //    exit();
 }
 
 // Creating the item object for the selected item
-$itemObj = $publisher->getHandler('item')->get($itemid);
+$itemObj = $publisher->getHandler('item')->get($itemId);
 
 // if the selected item was not found, exit
 if (!$itemObj) {
-    redirect_header("javascript:history.go(-1)", 1, _MD_PUBLISHER_NOITEMSELECTED);
-//    exit();
+    redirect_header('javascript:history.go(-1)', 1, _MD_PUBLISHER_NOITEMSELECTED);
+    //    exit();
 }
 
 $xoopsOption['template_main'] = 'publisher_item.tpl';
@@ -58,12 +58,12 @@
 
 // Check user permissions to access that category of the selected item
 if (!$itemObj->accessGranted()) {
-    redirect_header("javascript:history.go(-1)", 1, _NOPERM);
-//    exit;
+    redirect_header('javascript:history.go(-1)', 1, _NOPERM);
+    //    exit;
 }
 
 // Update the read counter of the selected item
-if (!$GLOBALS['xoopsUser'] || ($GLOBALS['xoopsUser']->isAdmin($publisher->getModule()->mid()) && $publisher->getConfig('item_admin_hits') == 1) || ($GLOBALS['xoopsUser'] && !$GLOBALS['xoopsUser']->isAdmin($publisher->getModule()->mid()))) {
+if (!$GLOBALS['xoopsUser'] || ($GLOBALS['xoopsUser'] && !$GLOBALS['xoopsUser']->isAdmin($publisher->getModule()->mid())) || ($GLOBALS['xoopsUser']->isAdmin($publisher->getModule()->mid()) && $publisher->getConfig('item_admin_hits') == 1)) {
     $itemObj->updateCounter();
 }
 
@@ -79,74 +79,94 @@
         $order = 'DESC';
         break;
 
-    default :
+    case 'counter':
+        $sort  = 'counter';
+        $order = 'DESC';
+        break;
+
+    case 'rating':
+        $sort  = 'rating';
+        $order = 'DESC';
+        break;
+
+    case 'votes':
+        $sort  = 'votes';
+        $order = 'DESC';
+        break;
+
+    case 'comments':
+        $sort  = 'comments';
+        $order = 'DESC';
+        break;
+
+    default:
         $sort  = 'weight';
         $order = 'ASC';
         break;
 }
 
-if ($publisher->getConfig('item_other_items_type') == "previous_next") {
+if ('previous_next' === $publisher->getConfig('item_other_items_type')) {
     // Retrieving the next and previous object
-    $previous_item_link = '';
-    $previous_item_url  = '';
-    $next_item_link     = '';
-    $next_item_url      = '';
+    $previousItemLink = '';
+    $previousItemUrl  = '';
+    $nextItemLink     = '';
+    $nextItemUrl      = '';
 
     $previousObj = $publisher->getHandler('item')->getPreviousPublished($itemObj);
     $nextObj     = $publisher->getHandler('item')->getNextPublished($itemObj);
     if (is_object($previousObj)) {
-        $previous_item_link = $previousObj->getItemLink();
-        $previous_item_url  = $previousObj->getItemUrl();
+        $previousItemLink = $previousObj->getItemLink();
+        $previousItemUrl  = $previousObj->getItemUrl();
     }
 
     if (is_object($nextObj)) {
-        $next_item_link = $nextObj->getItemLink();
-        $next_item_url  = $nextObj->getItemUrl();
+        $nextItemLink = $nextObj->getItemLink();
+        $nextItemUrl  = $nextObj->getItemUrl();
     }
     unset($previousObj, $nextObj);
-    $xoopsTpl->assign('previous_item_link', $previous_item_link);
-    $xoopsTpl->assign('next_item_link', $next_item_link);
-    $xoopsTpl->assign('previous_item_url', $previous_item_url);
-    $xoopsTpl->assign('next_item_url', $next_item_url);
+    $xoopsTpl->assign('previousItemLink', $previousItemLink);
+    $xoopsTpl->assign('nextItemLink', $nextItemLink);
+    $xoopsTpl->assign('previousItemUrl', $previousItemUrl);
+    $xoopsTpl->assign('nextItemUrl', $nextItemUrl);
 }
 
 //CAREFUL!! with many items this will exhaust memory
-if ($publisher->getConfig('item_other_items_type') == "all") {
+if ($publisher->getConfig('item_other_items_type') === 'all') {
     $itemsObj = $publisher->getHandler('item')->getAllPublished(0, 0, $categoryObj->categoryid(), $sort, $order, '', true, true);
     $items    = array();
-    foreach ($itemsObj as $theitemObj) {
+    foreach ($itemsObj as $theItemObj) {
         $theitem              = array();
-        $theitem['titlelink'] = $theitemObj->getItemLink();
-        $theitem['datesub']   = $theitemObj->datesub();
-        $theitem['counter']   = $theitemObj->counter();
-        if ($theitemObj->itemid() == $itemObj->itemid()) {
-            $theitem['titlelink'] = $theitemObj->title();
+        $theitem['titlelink'] = $theItemObj->getItemLink();
+        $theitem['datesub']   = $theItemObj->getDatesub();
+        $theitem['counter']   = $theItemObj->counter();
+        if ($theItemObj->itemId() == $itemObj->itemId()) {
+            $theitem['titlelink'] = $theItemObj->getTitle();
         }
         $items[] = $theitem;
         unset($theitem);
     }
-    unset($itemsObj, $theitemObj);
+    unset($itemsObj, $theItemObj);
     $xoopsTpl->assign('items', $items);
     unset($items);
 }
 
-// Populating the smarty variables with informations related to the selected item
-$item = $itemObj->toArraySimple($item_page_id);
+// Populating the smarty variables with information related to the selected item
+$item = $itemObj->toArraySimple($itemPageId);
 $xoopsTpl->assign('show_subtitle', $publisher->getConfig('item_disp_subtitle'));
 
 if ($itemObj->pagescount() > 0) {
-    if ($item_page_id == -1) {
-        $item_page_id = 0;
+    if ($itemPageId == -1) {
+        $itemPageId = 0;
     }
     include_once $GLOBALS['xoops']->path('class/pagenav.php');
-    $pagenav = new XoopsPageNav($itemObj->pagescount(), 1, $item_page_id, 'page', 'itemid=' . $itemObj->itemid());
+    $pagenav = new XoopsPageNav($itemObj->pagescount(), 1, $itemPageId, 'page', 'itemid=' . $itemObj->itemId());
     $xoopsTpl->assign('pagenav', $pagenav->renderNav());
 }
 
 // Creating the files object associated with this item
 $file          = array();
 $files         = array();
-$embeded_files = array();
+$embededFiles = array();
 $filesObj      = $itemObj->getFiles();
 
 // check if user has permission to modify files
@@ -162,12 +182,12 @@
         $file['mod'] = true;
     }
 
-    if ($fileObj->mimetype() == 'application/x-shockwave-flash') {
+    if ($fileObj->mimetype() === 'application/x-shockwave-flash') {
         $file['content'] = $fileObj->displayFlash();
         if (strpos($item['maintext'], '[flash-' . $fileObj->getVar('fileid') . ']')) {
             $item['maintext'] = str_replace('[flash-' . $fileObj->getVar('fileid') . ']', $file['content'], $item['maintext']);
         } else {
-            $embeded_files[] = $file;
+            $embededFiles[] = $file;
         }
     } else {
         $file['fileid']      = $fileObj->fileid();
@@ -175,23 +195,23 @@
         $file['description'] = $fileObj->description();
         $file['name']        = $fileObj->name();
         $file['type']        = $fileObj->mimetype();
-        $file['datesub']     = $fileObj->datesub();
+        $file['datesub']     = $fileObj->getDatesub();
         $file['hits']        = $fileObj->counter();
         $files[]             = $file;
     }
 }
 
 $item['files']         = $files;
-$item['embeded_files'] = $embeded_files;
-unset($file, $embeded_files, $filesObj, $fileObj);
+$item['embeded_files'] = $embededFiles;
+unset($file, $embededFiles, $filesObj, $fileObj);
 
 // Language constants
 $xoopsTpl->assign('mail_link', 'mailto:?subject=' . sprintf(_CO_PUBLISHER_INTITEM, $GLOBALS['xoopsConfig']['sitename']) . '&amp;body=' . sprintf(_CO_PUBLISHER_INTITEMFOUND, $GLOBALS['xoopsConfig']['sitename']) . ': ' . $itemObj->getItemUrl());
-$xoopsTpl->assign('itemid', $itemObj->itemid());
+$xoopsTpl->assign('itemid', $itemObj->itemId());
 $xoopsTpl->assign('sectionname', $publisher->getModule()->getVar('name'));
 $xoopsTpl->assign('module_dirname', $publisher->getModule()->getVar('dirname'));
 $xoopsTpl->assign('module_home', publisherModuleHome($publisher->getConfig('format_linked_path')));
-$xoopsTpl->assign('categoryPath', $item['categoryPath'] . " > " . $item['title']);
+$xoopsTpl->assign('categoryPath', $item['categoryPath'] . ' > ' . $item['title']);
 $xoopsTpl->assign('commentatarticlelevel', $publisher->getConfig('perm_com_art_level'));
 $xoopsTpl->assign('com_rule', $publisher->getConfig('com_rule'));
 $xoopsTpl->assign('other_items', $publisher->getConfig('item_other_items_type'));
@@ -201,7 +221,7 @@
 // tags support
 if (xoops_isActiveModule('tag')) {
     include_once $GLOBALS['xoops']->path('modules/tag/include/tagbar.php');
-    $xoopsTpl->assign('tagbar', tagBar($itemid, $catid = 0));
+    $xoopsTpl->assign('tagbar', tagBar($itemId, $catid = 0));
 }
 
 /**
@@ -211,8 +231,8 @@
 $publisher_metagen->createMetaTags();
 
 // Include the comments if the selected ITEM supports comments
-if ((($itemObj->cancomment() == 1) || !$publisher->getConfig('perm_com_art_level')) && ($publisher->getConfig('com_rule') <> 0)) {
-    include_once $GLOBALS['xoops']->path("include/comment_view.php");
+if (($publisher->getConfig('com_rule') <> 0) && (($itemObj->cancomment() == 1) || !$publisher->getConfig('perm_com_art_level'))) {
+    include_once $GLOBALS['xoops']->path('include/comment_view.php');
     // Problem with url_rewrite and posting comments :
     $xoopsTpl->assign(array(
                           'editcomment_link'   => PUBLISHER_URL . '/comment_edit.php?com_itemid=' . $com_itemid . '&amp;com_order=' . $com_order . '&amp;com_mode=' . $com_mode . $link_extra,
@@ -224,7 +244,7 @@
 // Include support for AJAX rating
 if ($publisher->getConfig('perm_rating')) {
     $xoopsTpl->assign('rating_enabled', true);
-    $item['ratingbar'] = publisherRatingBar($itemid);
+    $item['ratingbar'] = publisherRatingBar($itemId);
     $xoTheme->addScript(PUBLISHER_URL . '/assets/js/behavior.js');
     $xoTheme->addScript(PUBLISHER_URL . '/assets/js/rating.js');
 }
diff --git a/publisher/language/english/admin.php b/publisher/language/english/admin.php
index 6663210c..514f6998 100644
--- a/publisher/language/english/admin.php
+++ b/publisher/language/english/admin.php
@@ -5,348 +5,351 @@
  * Author: The SmartFactory <www.smartfactory.ca>
  * Licence: GNU
  */
-define("_AM_PUBLISHER_ABOUT", "About");
-define("_AM_PUBLISHER_ACTION", "Action");
-define("_AM_PUBLISHER_ADD_OPT", "Add %s  more sub categories");
-define("_AM_PUBLISHER_ADD_OPT_SUBMIT", "Add");
-define("_AM_PUBLISHER_ALL", "All");
-define("_AM_PUBLISHER_ALL_EXP", "<strong>All status</strong>: All articles of the module, whatever their status.");
-define("_AM_PUBLISHER_ALLITEMS", "All articles in the module");
-define("_AM_PUBLISHER_ALLITEMSMSG", "Select a status to see all available articles in the selected status.");
-define("_AM_PUBLISHER_APPROVE", "Approve");
-define("_AM_PUBLISHER_APPROVING", "Approving");
-define("_AM_PUBLISHER_ASC", "Ascending");
-define("_AM_PUBLISHER_AVAILABLE", "<span style='font-weight: bold; color: green;'>Available</span>");
-define("_AM_PUBLISHER_BACK2IDX", "Cancelled. Taking you back to the index");
-define("_AM_PUBLISHER_BLOCKS", "Blocks management");
-//define("_AM_PUBLISHER_BODY","Body");
-//define("_AM_PUBLISHER_BODY_DSC","Main body of the article<br><strong>Input Options</strong><span style='font-size: xx-small; font-weight: normal; display: block;'><p>1-Usual text & images with formatting</p>2- Pagewrap as follows<p>[pagewrap=filename.html]</p><p>Or</p>[pagewrap=filename_1.html]<br>[pagebreak] <i>this paginates</i><br>[pagewrap=filename_2.html]<br>etc. <p>Or</p><p>[pagewrap=filename_1.html]<br>[pagewrap=filename_2.html]<br><i>this combines pages</i><p>In order to Pagewrap, upload the necessary html page(s) in yoursite.com/uploads/publisher/content, or simply use the page wrap uploader at the bottom of the page.</p><p>Note that just below the body field, you will find a list of available pages that you can insert in the body by simply clicking on the desired page.</p></span>");
-//define("_AM_PUBLISHER_BODY_REQ","Body*");
-define("_AM_PUBLISHER_BUTTON_CANCEL", "Cancel");
-define("_AM_PUBLISHER_BUTTON_DELETE", "Delete");
-define("_AM_PUBLISHER_BUTTON_EDIT", "Edit");
-define("_AM_PUBLISHER_BUTTON_SEARCH", "Search");
-define("_AM_PUBLISHER_BUTTON_SUBMIT", "Submit");
-define("_AM_PUBLISHER_BUTTON_UPDATE", "Update");
-define("_AM_PUBLISHER_CANCEL", "Cancel");
-define("_AM_PUBLISHER_CAT_ITEMS", "Articles");
-define("_AM_PUBLISHER_CAT_ITEMS_DSC", "Articles within this category");
-define("_AM_PUBLISHER_CATCOLNAME", "Title");
-define("_AM_PUBLISHER_CATCREATED", "New category was created and saved!");
-define("_AM_PUBLISHER_CATEGORIES", "Categories");
-define("_AM_PUBLISHER_CATEGORIES_DSC", "Here is a list of all created categories of the module.");
-define("_AM_PUBLISHER_CATEGORIES_TITLE", "Created categories");
-define("_AM_PUBLISHER_CATEGORY", "Category");
-define("_AM_PUBLISHER_CATEGORY_CREATE", "Create a category");
-define("_AM_PUBLISHER_CATEGORY_CREATE_INFO", "Fill the following form in order to create a new category. The newly created category will be automatically displayed in the user side.");
-//define("_AM_PUBLISHER_CATEGORY_DSC","Article's Category.");
-define("_AM_PUBLISHER_CATEGORY_EDIT_INFO", "You can edit this category. Modifications will immediately take effect in the user side.");
-define("_AM_PUBLISHER_CATEGORY_HEADER", "Category header");
-define("_AM_PUBLISHER_CATEGORY_HEADER_DSC", "");
-define("_AM_PUBLISHER_CATEGORY_META_DESCRIPTION", "Meta Description");
-define("_AM_PUBLISHER_CATEGORY_META_DESCRIPTION_DSC", "In order to help Search Engines, you can customize the meta description you would like to use for this category. if you leave this field empty when creating a category, it will automatically be populated with the Description field of this category.");
-define("_AM_PUBLISHER_CATEGORY_META_KEYWORDS", "Meta Keywords");
-define("_AM_PUBLISHER_CATEGORY_META_KEYWORDS_DSC", "In order to help Search Engines, you can customize the keywords you would like to use for this category. if you leave this field empty when creating a category, it will automatically be populated with words from the Description field of this category.");
-define("_AM_PUBLISHER_CATEGORY_SAVE_ERROR", "An error occurred while saving the category. Here is a list of error(s) :");
-define("_AM_PUBLISHER_CATEGORY_SHORT_URL", "Short URL");
-define("_AM_PUBLISHER_CATEGORY_SHORT_URL_DSC", "When using the SEO features of this module, you can specify a Short URL for this category. This field is optional.");
-define("_AM_PUBLISHER_CATID", "ID");
-define("_AM_PUBLISHER_CLEAR", "Clear");
-define("_AM_PUBLISHER_CLONE_ITEM", "Duplicate article");
-define("_AM_PUBLISHER_CLONE_NEW", "Duplicating article");
-define("_AM_PUBLISHER_COLDESCRIPT", "Category description");
-define("_AM_PUBLISHER_COLISDELETED", "Category %s has been deleted");
-define("_AM_PUBLISHER_COLMODIFIED", "The category was successfully modified.");
-define("_AM_PUBLISHER_COLPOSIT", "Category position");
-define("_AM_PUBLISHER_CREATE", "Create");
-define("_AM_PUBLISHER_CREATED", "Created");
-define("_AM_PUBLISHER_CREATEITEM", "Create article");
-define("_AM_PUBLISHER_CREATETHEDIR", "Create the folder");
-define("_AM_PUBLISHER_CREATINGNEW", "Creating new");
-//define("_AM_PUBLISHER_DB_CHECKTABLES","Check tables");
-//define("_AM_PUBLISHER_DB_CURRENTVER","Current version: <span class='currentVer'>%s</span>");
-//define("_AM_PUBLISHER_DB_DBVER","Database Version %s");
-//define("_AM_PUBLISHER_DB_MSG_ADD_DATA","Data added in table %s");
-//define("_AM_PUBLISHER_DB_MSG_ADD_DATA_ERR","Error adding data in table %s");
-//define("_AM_PUBLISHER_DB_MSG_CHGFIELD","Changing field %s in table %s");
-//define("_AM_PUBLISHER_DB_MSG_CHGFIELD_ERR","Error changing field %s in table %s");
-//define("_AM_PUBLISHER_DB_MSG_CREATE_TABLE","Table %s created");
-//define("_AM_PUBLISHER_DB_MSG_CREATE_TABLE_ERR","Error creating table %s");
-//define("_AM_PUBLISHER_DB_MSG_NEWFIELD","Successfully added field %s");
-//define("_AM_PUBLISHER_DB_MSG_NEWFIELD_ERR","Error adding field %s");
-//define("_AM_PUBLISHER_DB_NEEDUPDATE","Your database is out-of-date. Please upgrade your database tables!");
-//define("_AM_PUBLISHER_DB_NEEDUPDATE_WARNING","WARNING: The SmartFactory strongly recommends you to backup all Publisher tables before running this upgrade script.");
-//define("_AM_PUBLISHER_DB_NOUPDATE","Your database is up-to-date. No updates are necessary.");
-//define("_AM_PUBLISHER_DB_UPDATE_DB","Updating Database");
-//define("_AM_PUBLISHER_DB_UPDATE_ERR","Errors updating to version %s");
-//define("_AM_PUBLISHER_DB_UPDATE_NOW","Update Now!");
-//define("_AM_PUBLISHER_DB_UPDATE_OK","Successfully updated to version %s");
-//define("_AM_PUBLISHER_DB_UPDATE_TO","Updating to version %s");
-define("_AM_PUBLISHER_DELETE", "Delete");
-define("_AM_PUBLISHER_DELETE_CAT_CONFIRM", "Please note that by deleting a category, all the sub-categories and the articles of this category will be deleted as well, along with any comments that may have been posted related to these articles. Are you sure you wish to delete this category?");
-define("_AM_PUBLISHER_DELETE_CAT_ERROR", "An error occurred while deleting this category.");
-define("_AM_PUBLISHER_DELETECOL", "Delete category");
-define("_AM_PUBLISHER_DELETEITEM", "Delete article");
-define("_AM_PUBLISHER_DELETETHISFILE", "Are you sure to delete this file?");
-define("_AM_PUBLISHER_DELETETHISITEM", "Are you sure to delete this item?");
-define("_AM_PUBLISHER_DESC", "Descending");
-define("_AM_PUBLISHER_DESCRIP", "Category description");
-define("_AM_PUBLISHER_DESCRIPTION", "Description");
-define("_AM_PUBLISHER_DIRCREATED", "Folder successfully created ");
-define("_AM_PUBLISHER_DIRNOTCREATED", "The folder could not be created ");
-define("_AM_PUBLISHER_EDITCOL", "Edit category");
-define("_AM_PUBLISHER_EDITING", "Editing");
-define("_AM_PUBLISHER_EDITITEM", "Edit the article");
-define("_AM_PUBLISHER_FDELETED", "File deleted");
-define("_AM_PUBLISHER_FILE", "Files");
-define("_AM_PUBLISHER_FILE_ADD", "Adding a file");
-define("_AM_PUBLISHER_FILE_ADDING", "Adding a new file");
-define("_AM_PUBLISHER_FILE_ADDING_DSC", "Please fill the following form in order to add a new file to this article.");
-define("_AM_PUBLISHER_FILE_DELETE_ERROR", "An error occurred while deleting the file.");
-//define("_AM_PUBLISHER_FILE_DESCRIPTION","Description");
-//define("_AM_PUBLISHER_FILE_DESCRIPTION_DSC","Description of the file to be uploaded.");
-define("_AM_PUBLISHER_FILE_EDITING", "Editing a file");
-define("_AM_PUBLISHER_FILE_EDITING_DSC", "You can edit this file. Modifications will immediately take effect in the user side.");
-define("_AM_PUBLISHER_FILE_EDITING_ERROR", "An error occurred while updating the file.");
-define("_AM_PUBLISHER_FILE_EDITING_SUCCESS", "The file was successfully modified.");
-define("_AM_PUBLISHER_FILE_INFORMATIONS", "File's information");
-//define("_AM_PUBLISHER_FILE_NAME","Name");
-//define("_AM_PUBLISHER_FILE_NAME_DSC","Name that will be used to identify the file.");
-//define("_AM_PUBLISHER_FILE_STATUS","File visible?");
-//define("_AM_PUBLISHER_FILE_STATUS_DSC","if you select no, the file will not be visible from the user side.");
-//define("_AM_PUBLISHER_FILE_TO_UPLOAD","File to upload:");
-//define("_AM_PUBLISHER_FILE_UPLOAD_ANOTHER","Upload again");
-define("_AM_PUBLISHER_FILEISDELETED", "The file has been successfully deleted");
-define("_AM_PUBLISHER_FILENAME", "File name");
-define("_AM_PUBLISHER_FILES_LINKED", "Files linked to this article");
-define("_AM_PUBLISHER_FILEUPLOAD_ERROR", "An error occurred while uploading the file.");
-define("_AM_PUBLISHER_FILEUPLOAD_SUCCESS", "The file was successfully uploaded.");
-define("_AM_PUBLISHER_GOMOD", "Go to module");
-define("_AM_PUBLISHER_HITS", "Hits");
-define("_AM_PUBLISHER_ICO_DELETE", "Delete");
-define("_AM_PUBLISHER_ICO_EDIT", "Edit");
-define("_AM_PUBLISHER_ICO_OFFLINE", "Offline");
-define("_AM_PUBLISHER_ICO_ONLINE", "Online");
-define("_AM_PUBLISHER_ID", "Id");
-define("_AM_PUBLISHER_IMAGE", "Category image");
-define("_AM_PUBLISHER_IMAGE_DSC", "Image representing the category");
-define("_AM_PUBLISHER_IMAGE_ITEM", "Article image");
-//define("_AM_PUBLISHER_IMAGE_ITEM_DSC","Image representing the article");
-define("_AM_PUBLISHER_IMAGE_UPLOAD", "Image upload");
-define("_AM_PUBLISHER_IMAGE_UPLOAD_DSC", "Select an image on your computer. This image will be uploaded to the site and set as the category image.");
-//define("_AM_PUBLISHER_IMAGE_UPLOAD_ITEM_DSC","Select an image on your computer. <br />This image will be uploaded to the site <br />and set as the article image.");
-define("_AM_PUBLISHER_IMPORT", "Import");
-define("_AM_PUBLISHER_IMPORTED_COMMENT", "Comment '%s' imported.");
-define("_AM_PUBLISHER_IMPORTED_COMMENT_ERROR", "Error while importing comment '%s'");
-define("_AM_PUBLISHER_IMPORT_COMMENTS", "Importing comments of the module");
-define("_AM_PUBLISHER_IMPORTED_ARTICLE_FILE", "Linked file %s was imported");
-define("_AM_PUBLISHER_IMPORT_ARTICLE_ERROR", "Error while importing article <em>%s</em>");
-define("_AM_PUBLISHER_IMPORT_ARTICLE_WRAP", "The page wrapped file %s has been copied in the module's content folder.");
-define("_AM_PUBLISHER_IMPORT_BACK", "Back to the import page");
-define("_AM_PUBLISHER_IMPORT_CATEGORIES", "Categories to be imported");
-define("_AM_PUBLISHER_IMPORT_CATEGORIES_DSC", "Here are the categories that will be imported in Publisher");
-define("_AM_PUBLISHER_IMPORT_CATEGORY_ERROR", "Error while importing category <em>%s</em>.");
-define("_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS", "Category <em>%s</em> imported successfully.");
-define("_AM_PUBLISHER_IMPORT_ERROR", "An error occurred while importing the article.");
-define("_AM_PUBLISHER_IMPORT_FILE_NOT_FOUND", "Import file not found at <strong>%s</strong>");
-define("_AM_PUBLISHER_IMPORT_FROM", "Importing from %s");
-define("_AM_PUBLISHER_IMPORT_GOTOMODULE", "Go Publisher's index page");
-define("_AM_PUBLISHER_IMPORT_INFO", "You can import articles directly in Publisher. Simply select from which module you would like to import the articles and click on the 'Import' button.<br><strong>Run this operation only once, otherwise, the articles will be duplicated</strong>");
-define("_AM_PUBLISHER_IMPORT_MODULE_FOUND", "%s module was found. There are %s articles and %s categories that can be imported.");
-define("_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS", "%s module was found, but there are no article to import.");
-define("_AM_PUBLISHER_IMPORT_NOCATSELECTED", "No category was selected to import.");
-define("_AM_PUBLISHER_IMPORT_NO_MODULE", "As no other supported article module are installed on this site, no article can be imported.");
-define("_AM_PUBLISHER_IMPORT_PARENT_CATEGORY", "Parent category");
-define("_AM_PUBLISHER_IMPORT_PARENT_CATEGORY_DSC", "Import selected categories in this parent category.");
-define("_AM_PUBLISHER_IMPORT_RESULT", "Here is the result of the import.");
-define("_AM_PUBLISHER_IMPORT_SETTINGS", "Import Settings");
-define("_AM_PUBLISHER_IMPORT_SUCCESS", "The articles were successfully imported in the module.");
-define("_AM_PUBLISHER_IMPORT_TITLE", "Import Articles");
-define("_AM_PUBLISHER_IMPORTED_ARTICLE", "Imported article: <em>%s</em>");
-define("_AM_PUBLISHER_IMPORTED_ARTICLES", "Articles imported: <em>%s</em>");
-define("_AM_PUBLISHER_IMPORTED_CATEGORIES", "Categories imported: <em>%s</em>");
-define("_AM_PUBLISHER_IMPORT_SELECTION", "Import Selection");
-define("_AM_PUBLISHER_IMPORT_SELECT_FILE", "Articles");
-define("_AM_PUBLISHER_IMPORT_SELECT_FILE_DSC", "Choose the module from which to import the articles.");
-define("_AM_PUBLISHER_INDEX", "Index");
-define("_AM_PUBLISHER_INVENTORY", "Module Summary");
-define("_AM_PUBLISHER_ITEM", "Article");
-define("_AM_PUBLISHER_ITEM_CREATING", "Creating a new article");
-define("_AM_PUBLISHER_ITEM_CREATING_DSC", "Please fill the following form in order to create a new article.");
-define("_AM_PUBLISHER_ITEM_DELETE_ERROR", "An error occurred while deleting this article.");
-define("_AM_PUBLISHER_ITEM_DUPLICATING", "Duplicating an article");
-define("_AM_PUBLISHER_ITEM_DUPLICATING_DSC", "Edit the present form in order to create a new article based on the original article.");
-define("_AM_PUBLISHER_ITEM_EDIT", "Edit this article");
-define("_AM_PUBLISHER_ITEM_RECEIVED_NEED_APPROVAL", "Your article has been sent and will be published upon approval by a moderator.<br />Thank you for your contribution!");
-define("_AM_PUBLISHER_ITEM_REJECTED", "This article has been set as rejected.");
-define("_AM_PUBLISHER_ITEMCAT", "Category");
-define("_AM_PUBLISHER_ITEMCATEGORYNAME", "Category");
-define("_AM_PUBLISHER_ITEMCOLNAME", "Title");
-define("_AM_PUBLISHER_ITEMDESC", "Description");
-define("_AM_PUBLISHER_ITEMID", "ID");
-define("_AM_PUBLISHER_ITEMISDELETED", "The article has been deleted.");
-define("_AM_PUBLISHER_ITEMNOTCREATED", "Sorry. It was not possible to create this article!");
-define("_AM_PUBLISHER_ITEMNOTUPDATED", "Sorry. It was not possible to update the article!");
-define("_AM_PUBLISHER_ITEMS", "Articles");
-define("_AM_PUBLISHER_MESSAGE_ADD_MIME_ERROR", "Error: the mime type was not added.");
-define("_AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR", "Error: the mime type was not deleted.");
-define("_AM_PUBLISHER_MESSAGE_EDIT_MIME_ERROR", "Error: the mime type was not updated.");
-define("_AM_PUBLISHER_MESSAGE_NO_ID", "Error: ID was not specified.");
-define("_AM_PUBLISHER_MIME_ADD_TITLE", "Add a mime type");
-define("_AM_PUBLISHER_MIME_ADMIN", "Admin");
-define("_AM_PUBLISHER_MIME_ADMINF", "Allowed admin mime type");
-define("_AM_PUBLISHER_MIME_CREATE", "Create");
-define("_AM_PUBLISHER_MIME_CREATEF", "Create mime type");
-define("_AM_PUBLISHER_MIME_EDIT_TITLE", "Edit mime type");
-define("_AM_PUBLISHER_MIME_EXT", "EXT");
-define("_AM_PUBLISHER_MIME_EXTF", "File Extension <span style='font-weight: bold; color: red;'>*</span>");
-define("_AM_PUBLISHER_MIME_FINDIT", "Get Extension!");
-define("_AM_PUBLISHER_MIME_FINDMIMETYPE", "Find new mime type?");
-define("_AM_PUBLISHER_MIME_ID", "ID");
-define("_AM_PUBLISHER_MIME_INFOTEXT", "<ul><li>New mime types can be created, edit or deleted easily via this form.</li> <li>Look for a new mime types via an external website.</li> <li>View displayed mime types for Admin and User uploads.</li> <li>Change mime type upload status.</li></ul>");
-define("_AM_PUBLISHER_MIME_MANAGE_TITLE", "Mime types Management");
-define("_AM_PUBLISHER_MIME_MODIFY", "Modify");
-define("_AM_PUBLISHER_MIME_MODIFYF", "Modify mime type");
-define("_AM_PUBLISHER_MIME_NAME", "Application Type");
-define("_AM_PUBLISHER_MIME_NAMEF", "Application Type/Name <span style='font-weight: bold; color: red;'>*</span><div style='padding-top: 8px;'><span style='font-weight: normal;'>Enter application associated with this extension.</span></div>");
-define("_AM_PUBLISHER_MIME_SEARCH", "Mime types Search");
-define("_AM_PUBLISHER_MIME_TYPEF", "Mime types <span style='font-weight: bold; color: red;'>*</span><div style='padding-top: 8px;'><span style='font-weight: normal;'>Enter each mime type associated with the file extension. Each mime type must be separated with a space.</span></div>");
-define("_AM_PUBLISHER_MIME_USER", "User");
-define("_AM_PUBLISHER_MIME_USERF", "Allowed User mime type");
-define("_AM_PUBLISHER_MIMETYPES", "Mime types");
-define("_AM_PUBLISHER_MINDEX_ACTION", "Action");
-define("_AM_PUBLISHER_MODIFY", "Modify");
-define("_AM_PUBLISHER_NEED_CATEGORY_ITEM", "To create an article, you must first create a category.");
-define("_AM_PUBLISHER_NO", "No");
-define("_AM_PUBLISHER_NOCAT", "No categories to display");
-define("_AM_PUBLISHER_NOCOLTOEDIT", "There are no categories to edit!");
-define("_AM_PUBLISHER_NOFILE", "This article does not have any attached files.");
-define("_AM_PUBLISHER_NOFILESELECTED", "No file selected.");
-define("_AM_PUBLISHER_NOITEMS", "There are no published articles.");
-define("_AM_PUBLISHER_NOITEMS_OFFLINE", "There are no offline articles.");
-define("_AM_PUBLISHER_NOITEMS_REJECTED", "There are no rejected articles.");
-define("_AM_PUBLISHER_NOITEMS_SUBMITTED", "There are no submitted article.");
-define("_AM_PUBLISHER_NOITEMSELECTED", "No article selected!");
-define("_AM_PUBLISHER_NOITEMSSEL", "Sorry. There are no articles in the selected state.");
-define("_AM_PUBLISHER_NOPERMSSET", "Permission cannot be set: No categories created yet! Please create a category first.");
-define("_AM_PUBLISHER_NOSUBCAT", "There is no sub categories created yet");
-define("_AM_PUBLISHER_NOTAVAILABLE", "<span style='font-weight: bold; color: red;'>Not available</span>");
-define("_AM_PUBLISHER_NOTWRITABLE", "<span style='font-weight: bold; color: yellow;'>Not writable</span>");
-define("_AM_PUBLISHER_OFFLINE_CREATED_SUCCESS", "The article has been successfully created and put offline.");
-define("_AM_PUBLISHER_OFFLINE_EXP", "<strong>Offline articles</strong>: Published articles that have been put offline, temporarily or not. Offline articles are not displayed in the user side.");
-define("_AM_PUBLISHER_OFFLINE_MOD_SUCCESS", "The article has been successfully put offline.");
-define("_AM_PUBLISHER_OFFLINEEDITING", "Editing an offline article");
-define("_AM_PUBLISHER_OFFLINEEDITING_INFO", "You can edit this offline article. Modifications will be saved for this article. However, if you would like to display this article in the user side, you will need to set the status to <strong>Published</strong>.");
-define("_AM_PUBLISHER_PAGEWRAP", "Page wrap");
-define("_AM_PUBLISHER_PAGEWRAPDSC", "A page-wrap is the ability to link an article with a content file. Doing this, the content of the article is directly taken from that file and you don't need to add the content manually. This is useful when you have already formatted HTML or PHP files.");
-define("_AM_PUBLISHER_PARENT_CATEGORY_EXP", "Parent category<span style='font-size: xx-small; font-weight: normal; display: block;'>Select a parent to make this a sub-category.</span>");
-define("_AM_PUBLISHER_PERMERROR", "ERROR: cannot access file directory. Please CHMOD the uploads/publisher/content directory with value 755 (or 777 depending on your environment)");
-define("_AM_PUBLISHER_PERMISSIONS", "Permissions");
-define("_AM_PUBLISHER_PERMISSIONS_APPLY_ON_ITEMS", "Apply read permissions on articles<span style='font-size: xx-small; font-weight: normal; display: block;'>Apply the above Read Permissions on all<br />articles within that category, overriding their<br />current permissions.<br /><strong>Please note that this is a one-time action only, and not a property</strong></span>");
-define("_AM_PUBLISHER_PERMISSIONS_CAT_READ", "Read permissions<span style='font-size: xx-small; font-weight: normal; display: block;'>Groups that will have permissions to see<br />this Category, as well as any articles<br />inside that category.</span>");
-define("_AM_PUBLISHER_PERMISSIONS_CAT_SUBMIT", "Articles submission permissions");
-define("_AM_PUBLISHER_PERMISSIONS_CAT_SUBMIT_DSC", "Groups that will be allowed to submit articles within this category. Preference '[PERMISSIONS] User submissions' must be enabled.");
-define("_AM_PUBLISHER_PERMISSIONSVIEWMAN", "Permissions to view categories");
-define("_AM_PUBLISHER_PUBLISH", "Publish");
-define("_AM_PUBLISHER_PUBLISHED_DSC", "Here is a list of all published articles available in the user side.");
-define("_AM_PUBLISHER_PUBLISHED_EXP", "<strong>Published articles</strong>: articles that have been approved and are displayed in the user side.");
-define("_AM_PUBLISHER_PUBLISHED_MOD_SUCCESS", "The article has been successfully modified.");
-define("_AM_PUBLISHER_PUBLISHEDEDITING", "Editing a published article");
-define("_AM_PUBLISHER_PUBLISHEDEDITING_INFO", "You can edit this article. Modifications will immediately take effect in the user side.");
-define("_AM_PUBLISHER_PUBLISHEDITEMS", "Published articles");
-define("_AM_PUBLISHER_REJECTED_EDIT", "Edit this rejected article");
-define("_AM_PUBLISHER_REJECTED_ITEM", "Rejected article");
-define("_AM_PUBLISHER_REJECTED_ITEM_EXP", "<strong>Rejected articles</strong>: articles that have been submitted by user, but rejected by a moderator. Rejected articles are not displayed in the user side.");
-define("_AM_PUBLISHER_RUSUREDELF", "Are you sure you want to delete this file?");
-define("_AM_PUBLISHER_SCATEGORYNAME", "Create subcategories<br><br><span style='font-size: xx-small; font-weight: normal; display: block;'>Fill the text box with the names of sub categories to create.<br>Leave blank to not create subcategory. To create more, enter the how much more to create then press 'Add'</span>");
-define("_AM_PUBLISHER_SEARCH", "Search");
-define("_AM_PUBLISHER_SEARCH_PW", "Only HTML, HTM or XHTML extensions are allowed");
-define("_AM_PUBLISHER_SELECT_SORT", "Sort order");
-define("_AM_PUBLISHER_SELECT_STATUS", "Status");
-define("_AM_PUBLISHER_SHOWING", "Showing");
-define("_AM_PUBLISHER_STATUS0", "No status");
-define("_AM_PUBLISHER_SUBCAT_CAT", "Sub categories");
-define("_AM_PUBLISHER_SUBCAT_CAT_DSC", "Here is the list of the sub categories of this category");
-define("_AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR", "An error occurred while saving the category. Here is a list of error(s):");
-define("_AM_PUBLISHER_SUBDESCRIPT", "Description");
-define("_AM_PUBLISHER_SUBMISSION_MODERATE", "Moderate this article");
-define("_AM_PUBLISHER_SUBMISSIONSMNGMT", "Submitted articles");
-define("_AM_PUBLISHER_SUBMIT", "Submit");
-define("_AM_PUBLISHER_SUBMITTED_APPROVE_SUCCESS", "The submitted article has been published in the user side.");
-define("_AM_PUBLISHER_SUBMITTED_EXP", "<strong>Submitted articles</strong>: Articles that have been submitted by users. Once approved, they will be displayed in the user side.");
-define("_AM_PUBLISHER_SUBMITTED_INFO", "This article has been submitted by a member. You can make some modifications if you'd like. Upon approval, this article will be displayed in the user side of this site.");
-define("_AM_PUBLISHER_SUBMITTED_TITLE", "Approving a submitted article");
-define("_AM_PUBLISHER_SUMMARY", "Introduction");
-//define("_AM_PUBLISHER_SUMMARY_DSC","Article's introduction");
-define("_AM_PUBLISHER_TEXT_ASCENDING", "Ascending");
-define("_AM_PUBLISHER_TEXT_DESCENDING", "Descending");
-define("_AM_PUBLISHER_TEXT_NO_RECORDS", "No records found");
-define("_AM_PUBLISHER_TEXT_NUMBER_PER_PAGE", "Number Per Page:");
-define("_AM_PUBLISHER_TEXT_ORDER_BY", "Order By:");
-define("_AM_PUBLISHER_TEXT_SEARCH_BY", "Search By:");
-define("_AM_PUBLISHER_TEXT_SEARCH_MIME", "Search mime types");
-define("_AM_PUBLISHER_TEXT_SEARCH_TEXT", "Search Text:");
-define("_AM_PUBLISHER_TEXT_SORT_BY", "Sort By:");
-define("_AM_PUBLISHER_TITLE", "Title");
-define("_AM_PUBLISHER_TOTAL_OFFLINE", "Offline articles: ");
-define("_AM_PUBLISHER_TOTALCAT", "Categories:");
-define("_AM_PUBLISHER_TOTALPUBLISHED", "Published articles: ");
-define("_AM_PUBLISHER_TOTALSUBMITTED", "Submitted articles: ");
-define("_AM_PUBLISHER_UPDATE_MODULE", "Update module");
-define("_AM_PUBLISHER_UPLOAD", "Upload");
-define("_AM_PUBLISHER_UPLOAD_FILE", "Upload a file");
-define("_AM_PUBLISHER_UPLOAD_FILE_NEW", "Upload a new file");
-define("_AM_PUBLISHER_UPLOADED_DATE", "Uploaded");
-define("_AM_PUBLISHER_VIEW_CATS", "Select categories that each group can view");
-define("_AM_PUBLISHER_YES", "Yes");
-//define("_AM_PUBLISHER_TOOLS","Tools");
-//define("_AM_PUBLISHER_CONFIGURE_READ_PERMISSIONS","Configure read permissions");
-//define("_AM_PUBLISHER_CONFIGURE_READ_PERMISSIONS_EXP","This tool allows you to quickly configure read permissions for ALL categories and ALL articles at once. ALl permissions will first be deleted and then replaced by the options your will have selected.<br /><br /><strong>Please use this tool with care!</strong>");
-//define("_AM_PUBLISHER_FULLACCESS","Categories and articles read permissions");
-//define("_AM_PUBLISHER_PERMISSIONS_UPDATED","Permissions updated.");
-define("_AM_PUBLISHER_ITEM_TAG", "Tags");
+define('_AM_PUBLISHER_ABOUT', 'About');
+define('_AM_PUBLISHER_ACTION', 'Action');
+define('_AM_PUBLISHER_ADD_OPT', 'Add %s  more sub categories');
+define('_AM_PUBLISHER_ADD_OPT_SUBMIT', 'Add');
+define('_AM_PUBLISHER_ALL', 'All');
+define('_AM_PUBLISHER_ALL_EXP', '<strong>All status</strong>: All articles of the module, whatever their status.');
+define('_AM_PUBLISHER_ALLITEMS', 'All articles in the module');
+define('_AM_PUBLISHER_ALLITEMSMSG', 'Select a status to see all available articles in the selected status.');
+define('_AM_PUBLISHER_APPROVE', 'Approve');
+define('_AM_PUBLISHER_APPROVING', 'Approving');
+define('_AM_PUBLISHER_ASC', 'Ascending');
+define('_AM_PUBLISHER_AVAILABLE', "<span style='font-weight: bold; color: green;'>Available</span>");
+define('_AM_PUBLISHER_BACK2IDX', 'Cancelled. Taking you back to the index');
+define('_AM_PUBLISHER_BLOCKS', 'Blocks management');
+//define('_AM_PUBLISHER_BODY','Body');
+//define('_AM_PUBLISHER_BODY_DSC','Main body of the article<br><strong>Input Options</strong><span style='font-size: xx-small; font-weight: normal; display: block;'><p>1-Usual text & images with formatting</p>2- Pagewrap as follows<p>[pagewrap=filename.html]</p><p>Or</p>[pagewrap=filename_1.html]<br>[pagebreak] <i>this paginates</i><br>[pagewrap=filename_2.html]<br>etc. <p>Or</p><p>[pagewrap=filename_1.html]<br>[pagewrap=filename_2.html]<br><i>this combines pages</i><p>In order to Pagewrap, upload the necessary html page(s) in yoursite.com/uploads/publisher/content, or simply use the page wrap uploader at the bottom of the page.</p><p>Note that just below the body field, you will find a list of available pages that you can insert in the body by simply clicking on the desired page.</p></span>');
+//define('_AM_PUBLISHER_BODY_REQ','Body*');
+define('_AM_PUBLISHER_BUTTON_CANCEL', 'Cancel');
+define('_AM_PUBLISHER_BUTTON_DELETE', 'Delete');
+define('_AM_PUBLISHER_BUTTON_EDIT', 'Edit');
+define('_AM_PUBLISHER_BUTTON_SEARCH', 'Search');
+define('_AM_PUBLISHER_BUTTON_SUBMIT', 'Submit');
+define('_AM_PUBLISHER_BUTTON_UPDATE', 'Update');
+define('_AM_PUBLISHER_CANCEL', 'Cancel');
+define('_AM_PUBLISHER_CAT_ITEMS', 'Articles');
+define('_AM_PUBLISHER_CAT_ITEMS_DSC', 'Articles within this category');
+define('_AM_PUBLISHER_CATCOLNAME', 'Title');
+define('_AM_PUBLISHER_CATCREATED', 'New category was created and saved!');
+define('_AM_PUBLISHER_CATEGORIES', 'Categories');
+define('_AM_PUBLISHER_CATEGORIES_DSC', 'Here is a list of all created categories of the module.');
+define('_AM_PUBLISHER_CATEGORIES_TITLE', 'Created categories');
+define('_AM_PUBLISHER_CATEGORY', 'Category');
+define('_AM_PUBLISHER_CATEGORY_CREATE', 'Create a category');
+define('_AM_PUBLISHER_CATEGORY_CREATE_INFO', 'Fill the following form in order to create a new category. The newly created category will be automatically displayed in the user side.');
+//define('_AM_PUBLISHER_CATEGORY_DSC','Article's Category.');
+define('_AM_PUBLISHER_CATEGORY_EDIT_INFO', 'You can edit this category. Modifications will immediately take effect in the user side.');
+define('_AM_PUBLISHER_CATEGORY_HEADER', 'Category header');
+define('_AM_PUBLISHER_CATEGORY_HEADER_DSC', '');
+define('_AM_PUBLISHER_CATEGORY_META_DESCRIPTION', 'Meta Description');
+define('_AM_PUBLISHER_CATEGORY_META_DESCRIPTION_DSC', 'In order to help Search Engines, you can customize the meta description you would like to use for this category. if you leave this field empty when creating a category, it will automatically be populated with the Description field of this category.');
+define('_AM_PUBLISHER_CATEGORY_META_KEYWORDS', 'Meta Keywords');
+define('_AM_PUBLISHER_CATEGORY_META_KEYWORDS_DSC', 'In order to help Search Engines, you can customize the keywords you would like to use for this category. if you leave this field empty when creating a category, it will automatically be populated with words from the Description field of this category.');
+define('_AM_PUBLISHER_CATEGORY_SAVE_ERROR', 'An error occurred while saving the category. Here is a list of error(s) :');
+define('_AM_PUBLISHER_CATEGORY_SHORT_URL', 'Short URL');
+define('_AM_PUBLISHER_CATEGORY_SHORT_URL_DSC', 'When using the SEO features of this module, you can specify a Short URL for this category. This field is optional.');
+define('_AM_PUBLISHER_CATID', 'ID');
+define('_AM_PUBLISHER_CLEAR', 'Clear');
+define('_AM_PUBLISHER_CLONE_ITEM', 'Duplicate article');
+define('_AM_PUBLISHER_CLONE_NEW', 'Duplicating article');
+define('_AM_PUBLISHER_COLDESCRIPT', 'Category description');
+define('_AM_PUBLISHER_COLISDELETED', 'Category %s has been deleted');
+define('_AM_PUBLISHER_COLMODIFIED', 'The category was successfully modified.');
+define('_AM_PUBLISHER_COLPOSIT', 'Category position');
+define('_AM_PUBLISHER_CREATE', 'Create');
+define('_AM_PUBLISHER_CREATED', 'Created');
+define('_AM_PUBLISHER_CREATEITEM', 'Create article');
+define('_AM_PUBLISHER_CREATETHEDIR', 'Create the folder');
+define('_AM_PUBLISHER_CREATINGNEW', 'Creating new');
+//define('_AM_PUBLISHER_DB_CHECKTABLES','Check tables');
+//define('_AM_PUBLISHER_DB_CURRENTVER','Current version: <span class='currentVer'>%s</span>');
+//define('_AM_PUBLISHER_DB_DBVER','Database Version %s');
+//define('_AM_PUBLISHER_DB_MSG_ADD_DATA','Data added in table %s');
+//define('_AM_PUBLISHER_DB_MSG_ADD_DATA_ERR','Error adding data in table %s');
+//define('_AM_PUBLISHER_DB_MSG_CHGFIELD','Changing field %s in table %s');
+//define('_AM_PUBLISHER_DB_MSG_CHGFIELD_ERR','Error changing field %s in table %s');
+//define('_AM_PUBLISHER_DB_MSG_CREATE_TABLE','Table %s created');
+//define('_AM_PUBLISHER_DB_MSG_CREATE_TABLE_ERR','Error creating table %s');
+//define('_AM_PUBLISHER_DB_MSG_NEWFIELD','Successfully added field %s');
+//define('_AM_PUBLISHER_DB_MSG_NEWFIELD_ERR','Error adding field %s');
+//define('_AM_PUBLISHER_DB_NEEDUPDATE','Your database is out-of-date. Please upgrade your database tables!');
+//define('_AM_PUBLISHER_DB_NEEDUPDATE_WARNING','WARNING: The SmartFactory strongly recommends you to backup all Publisher tables before running this upgrade script.');
+//define('_AM_PUBLISHER_DB_NOUPDATE','Your database is up-to-date. No updates are necessary.');
+//define('_AM_PUBLISHER_DB_UPDATE_DB','Updating Database');
+//define('_AM_PUBLISHER_DB_UPDATE_ERR','Errors updating to version %s');
+//define('_AM_PUBLISHER_DB_UPDATE_NOW','Update Now!');
+//define('_AM_PUBLISHER_DB_UPDATE_OK','Successfully updated to version %s');
+//define('_AM_PUBLISHER_DB_UPDATE_TO','Updating to version %s');
+define('_AM_PUBLISHER_DELETE', 'Delete');
+define('_AM_PUBLISHER_DELETE_CAT_CONFIRM', 'Please note that by deleting a category, all the sub-categories and the articles of this category will be deleted as well, along with any comments that may have been posted related to these articles. Are you sure you wish to delete this category?');
+define('_AM_PUBLISHER_DELETE_CAT_ERROR', 'An error occurred while deleting this category.');
+define('_AM_PUBLISHER_DELETECOL', 'Delete category');
+define('_AM_PUBLISHER_DELETEITEM', 'Delete article');
+define('_AM_PUBLISHER_DELETETHISFILE', 'Are you sure to delete this file?');
+define('_AM_PUBLISHER_DELETETHISITEM', 'Are you sure to delete this item?');
+define('_AM_PUBLISHER_DESC', 'Descending');
+define('_AM_PUBLISHER_DESCRIP', 'Category description');
+define('_AM_PUBLISHER_DESCRIPTION', 'Description');
+define('_AM_PUBLISHER_DIRCREATED', 'Folder successfully created ');
+define('_AM_PUBLISHER_DIRNOTCREATED', 'The folder could not be created ');
+define('_AM_PUBLISHER_EDITCOL', 'Edit category');
+define('_AM_PUBLISHER_EDITING', 'Editing');
+define('_AM_PUBLISHER_EDITITEM', 'Edit the article');
+define('_AM_PUBLISHER_FDELETED', 'File deleted');
+define('_AM_PUBLISHER_FILE', 'Files');
+define('_AM_PUBLISHER_FILE_ADD', 'Adding a file');
+define('_AM_PUBLISHER_FILE_ADDING', 'Adding a new file');
+define('_AM_PUBLISHER_FILE_ADDING_DSC', 'Please fill the following form in order to add a new file to this article.');
+define('_AM_PUBLISHER_FILE_DELETE_ERROR', 'An error occurred while deleting the file.');
+//define('_AM_PUBLISHER_FILE_DESCRIPTION','Description');
+//define('_AM_PUBLISHER_FILE_DESCRIPTION_DSC','Description of the file to be uploaded.');
+define('_AM_PUBLISHER_FILE_EDITING', 'Editing a file');
+define('_AM_PUBLISHER_FILE_EDITING_DSC', 'You can edit this file. Modifications will immediately take effect in the user side.');
+define('_AM_PUBLISHER_FILE_EDITING_ERROR', 'An error occurred while updating the file.');
+define('_AM_PUBLISHER_FILE_EDITING_SUCCESS', 'The file was successfully modified.');
+define('_AM_PUBLISHER_FILE_INFORMATIONS', "File's information");
+//define('_AM_PUBLISHER_FILE_NAME','Name');
+//define('_AM_PUBLISHER_FILE_NAME_DSC','Name that will be used to identify the file.');
+//define('_AM_PUBLISHER_FILE_STATUS','File visible?');
+//define('_AM_PUBLISHER_FILE_STATUS_DSC','if you select no, the file will not be visible from the user side.');
+//define('_AM_PUBLISHER_FILE_TO_UPLOAD','File to upload:');
+//define('_AM_PUBLISHER_FILE_UPLOAD_ANOTHER','Upload again');
+define('_AM_PUBLISHER_FILEISDELETED', 'The file has been successfully deleted');
+define('_AM_PUBLISHER_FILENAME', 'File name');
+define('_AM_PUBLISHER_FILES_LINKED', 'Files linked to this article');
+define('_AM_PUBLISHER_FILEUPLOAD_ERROR', 'An error occurred while uploading the file.');
+define('_AM_PUBLISHER_FILEUPLOAD_SUCCESS', 'The file was successfully uploaded.');
+define('_AM_PUBLISHER_GOMOD', 'Go to module');
+define('_AM_PUBLISHER_HITS', 'Hits');
+define('_AM_PUBLISHER_ICO_DELETE', 'Delete');
+define('_AM_PUBLISHER_ICO_EDIT', 'Edit');
+define('_AM_PUBLISHER_ICO_OFFLINE', 'Offline');
+define('_AM_PUBLISHER_ICO_ONLINE', 'Online');
+define('_AM_PUBLISHER_ID', 'Id');
+define('_AM_PUBLISHER_IMAGE', 'Category image');
+define('_AM_PUBLISHER_IMAGE_DSC', 'Image representing the category');
+define('_AM_PUBLISHER_IMAGE_ITEM', 'Article image');
+//define('_AM_PUBLISHER_IMAGE_ITEM_DSC','Image representing the article');
+define('_AM_PUBLISHER_IMAGE_UPLOAD', 'Image upload');
+define('_AM_PUBLISHER_IMAGE_UPLOAD_DSC', 'Select an image on your computer. This image will be uploaded to the site and set as the category image.');
+//define('_AM_PUBLISHER_IMAGE_UPLOAD_ITEM_DSC','Select an image on your computer. <br />This image will be uploaded to the site <br />and set as the article image.');
+define('_AM_PUBLISHER_IMPORT', 'Import');
+define('_AM_PUBLISHER_IMPORTED_COMMENT', "Comment '%s' imported.");
+define('_AM_PUBLISHER_IMPORTED_COMMENT_ERROR', "Error while importing comment '%s'");
+define('_AM_PUBLISHER_IMPORT_COMMENTS', 'Importing comments of the module');
+define('_AM_PUBLISHER_IMPORTED_ARTICLE_FILE', 'Linked file %s was imported');
+define('_AM_PUBLISHER_IMPORT_ARTICLE_ERROR', 'Error while importing article <em>%s</em>');
+define('_AM_PUBLISHER_IMPORT_ARTICLE_WRAP', "The page wrapped file %s has been copied in the module's content folder.");
+define('_AM_PUBLISHER_IMPORT_BACK', 'Back to the import page');
+define('_AM_PUBLISHER_IMPORT_CATEGORIES', 'Categories to be imported');
+define('_AM_PUBLISHER_IMPORT_CATEGORIES_DSC', 'Here are the categories that will be imported in Publisher');
+define('_AM_PUBLISHER_IMPORT_CATEGORY_ERROR', 'Error while importing category <em>%s</em>.');
+define('_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS', 'Category <em>%s</em> imported successfully.');
+define('_AM_PUBLISHER_IMPORT_ERROR', 'An error occurred while importing the article.');
+define('_AM_PUBLISHER_IMPORT_FILE_NOT_FOUND', 'Import file not found at <strong>%s</strong>');
+define('_AM_PUBLISHER_IMPORT_FROM', 'Importing from %s');
+define('_AM_PUBLISHER_IMPORT_GOTOMODULE', "Go Publisher's index page");
+define('_AM_PUBLISHER_IMPORT_INFO', "You can import articles directly in Publisher. Simply select from which module you would like to import the articles and click on the 'Import' button.<br><strong>Run this operation only once, otherwise, the articles will be duplicated</strong>");
+define('_AM_PUBLISHER_IMPORT_MODULE_FOUND', '%s module was found. There are %s articles and %s categories that can be imported.');
+define('_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS', '%s module was found, but there are no article to import.');
+define('_AM_PUBLISHER_IMPORT_NOCATSELECTED', 'No category was selected to import.');
+define('_AM_PUBLISHER_IMPORT_NO_MODULE', 'As no other supported article module are installed on this site, no article can be imported.');
+define('_AM_PUBLISHER_IMPORT_PARENT_CATEGORY', 'Parent category');
+define('_AM_PUBLISHER_IMPORT_PARENT_CATEGORY_DSC', 'Import selected categories in this parent category.');
+define('_AM_PUBLISHER_IMPORT_RESULT', 'Here is the result of the import.');
+define('_AM_PUBLISHER_IMPORT_SETTINGS', 'Import Settings');
+define('_AM_PUBLISHER_IMPORT_SUCCESS', 'The articles were successfully imported in the module.');
+define('_AM_PUBLISHER_IMPORT_TITLE', 'Import Articles');
+define('_AM_PUBLISHER_IMPORTED_ARTICLE', 'Imported article: <em>%s</em>');
+define('_AM_PUBLISHER_IMPORTED_ARTICLES', 'Articles imported: <em>%s</em>');
+define('_AM_PUBLISHER_IMPORTED_CATEGORIES', 'Categories imported: <em>%s</em>');
+define('_AM_PUBLISHER_IMPORT_SELECTION', 'Import Selection');
+define('_AM_PUBLISHER_IMPORT_SELECT_FILE', 'Articles');
+define('_AM_PUBLISHER_IMPORT_SELECT_FILE_DSC', 'Choose the module from which to import the articles.');
+define('_AM_PUBLISHER_INDEX', 'Index');
+define('_AM_PUBLISHER_INVENTORY', 'Module Summary');
+define('_AM_PUBLISHER_ITEM', 'Article');
+define('_AM_PUBLISHER_ITEM_CREATING', 'Creating a new article');
+define('_AM_PUBLISHER_ITEM_CREATING_DSC', 'Please fill the following form in order to create a new article.');
+define('_AM_PUBLISHER_ITEM_DELETE_ERROR', 'An error occurred while deleting this article.');
+define('_AM_PUBLISHER_ITEM_DUPLICATING', 'Duplicating an article');
+define('_AM_PUBLISHER_ITEM_DUPLICATING_DSC', 'Edit the present form in order to create a new article based on the original article.');
+define('_AM_PUBLISHER_ITEM_EDIT', 'Edit this article');
+define('_AM_PUBLISHER_ITEM_RECEIVED_NEED_APPROVAL', 'Your article has been sent and will be published upon approval by a moderator.<br />Thank you for your contribution!');
+define('_AM_PUBLISHER_ITEM_REJECTED', 'This article has been set as rejected.');
+define('_AM_PUBLISHER_ITEMCAT', 'Category');
+define('_AM_PUBLISHER_ITEMCATEGORYNAME', 'Category');
+define('_AM_PUBLISHER_ITEMCOLNAME', 'Title');
+define('_AM_PUBLISHER_ITEMDESC', 'Description');
+define('_AM_PUBLISHER_ITEMID', 'ID');
+define('_AM_PUBLISHER_ITEMISDELETED', 'The article has been deleted.');
+define('_AM_PUBLISHER_ITEMNOTCREATED', 'Sorry. It was not possible to create this article!');
+define('_AM_PUBLISHER_ITEMNOTUPDATED', 'Sorry. It was not possible to update the article!');
+define('_AM_PUBLISHER_ITEMS', 'Articles');
+define('_AM_PUBLISHER_MESSAGE_ADD_MIME_ERROR', 'Error: the mime type was not added.');
+define('_AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR', 'Error: the mime type was not deleted.');
+define('_AM_PUBLISHER_MESSAGE_EDIT_MIME_ERROR', 'Error: the mime type was not updated.');
+define('_AM_PUBLISHER_MESSAGE_NO_ID', 'Error: ID was not specified.');
+define('_AM_PUBLISHER_MIME_ADD_TITLE', 'Add a mime type');
+define('_AM_PUBLISHER_MIME_ADMIN', 'Admin');
+define('_AM_PUBLISHER_MIME_ADMINF', 'Allowed admin mime type');
+define('_AM_PUBLISHER_MIME_CREATE', 'Create');
+define('_AM_PUBLISHER_MIME_CREATEF', 'Create mime type');
+define('_AM_PUBLISHER_MIME_EDIT_TITLE', 'Edit mime type');
+define('_AM_PUBLISHER_MIME_EXT', 'EXT');
+define('_AM_PUBLISHER_MIME_EXTF', "File Extension <span style='font-weight: bold; color: red;'>*</span>");
+define('_AM_PUBLISHER_MIME_FINDIT', 'Get Extension!');
+define('_AM_PUBLISHER_MIME_FINDMIMETYPE', 'Find new mime type?');
+define('_AM_PUBLISHER_MIME_ID', 'ID');
+define('_AM_PUBLISHER_MIME_INFOTEXT', '<ul><li>New mime types can be created, edit or deleted easily via this form.</li> <li>Look for a new mime types via an external website.</li> <li>View displayed mime types for Admin and User uploads.</li> <li>Change mime type upload status.</li></ul>');
+define('_AM_PUBLISHER_MIME_MANAGE_TITLE', 'Mime types Management');
+define('_AM_PUBLISHER_MIME_MODIFY', 'Modify');
+define('_AM_PUBLISHER_MIME_MODIFYF', 'Modify mime type');
+define('_AM_PUBLISHER_MIME_NAME', 'Application Type');
+define('_AM_PUBLISHER_MIME_NAMEF', "Application Type/Name <span style='font-weight: bold; color: red;'>*</span><div style='padding-top: 8px;'><span style='font-weight: normal;'>Enter application associated with this extension.</span></div>");
+define('_AM_PUBLISHER_MIME_SEARCH', 'Mime types Search');
+define('_AM_PUBLISHER_MIME_TYPEF', "Mime types <span style='font-weight: bold; color: red;'>*</span><div style='padding-top: 8px;'><span style='font-weight: normal;'>Enter each mime type associated with the file extension. Each mime type must be separated with a space.</span></div>");
+define('_AM_PUBLISHER_MIME_USER', 'User');
+define('_AM_PUBLISHER_MIME_USERF', 'Allowed User mime type');
+define('_AM_PUBLISHER_MIMETYPES', 'Mime types');
+define('_AM_PUBLISHER_MINDEX_ACTION', 'Action');
+define('_AM_PUBLISHER_MODIFY', 'Modify');
+define('_AM_PUBLISHER_NEED_CATEGORY_ITEM', 'To create an article, you must first create a category.');
+define('_AM_PUBLISHER_NO', 'No');
+define('_AM_PUBLISHER_NOCAT', 'No categories to display');
+define('_AM_PUBLISHER_NOCOLTOEDIT', 'There are no categories to edit!');
+define('_AM_PUBLISHER_NOFILE', 'This article does not have any attached files.');
+define('_AM_PUBLISHER_NOFILESELECTED', 'No file selected.');
+define('_AM_PUBLISHER_NOITEMS', 'There are no published articles.');
+define('_AM_PUBLISHER_NOITEMS_OFFLINE', 'There are no offline articles.');
+define('_AM_PUBLISHER_NOITEMS_REJECTED', 'There are no rejected articles.');
+define('_AM_PUBLISHER_NOITEMS_SUBMITTED', 'There are no submitted article.');
+define('_AM_PUBLISHER_NOITEMSELECTED', 'No article selected!');
+define('_AM_PUBLISHER_NOITEMSSEL', 'Sorry. There are no articles in the selected state.');
+define('_AM_PUBLISHER_NOPERMSSET', 'Permission cannot be set: No categories created yet! Please create a category first.');
+define('_AM_PUBLISHER_NOSUBCAT', 'There is no sub categories created yet');
+define('_AM_PUBLISHER_NOTAVAILABLE', "<span style='font-weight: bold; color: red;'>Not available</span>");
+define('_AM_PUBLISHER_NOTWRITABLE', "<span style='font-weight: bold; color: yellow;'>Not writable</span>");
+define('_AM_PUBLISHER_OFFLINE_CREATED_SUCCESS', 'The article has been successfully created and put offline.');
+define('_AM_PUBLISHER_OFFLINE_EXP', '<strong>Offline articles</strong>: Published articles that have been put offline, temporarily or not. Offline articles are not displayed in the user side.');
+define('_AM_PUBLISHER_OFFLINE_MOD_SUCCESS', 'The article has been successfully put offline.');
+define('_AM_PUBLISHER_OFFLINEEDITING', 'Editing an offline article');
+define('_AM_PUBLISHER_OFFLINEEDITING_INFO', 'You can edit this offline article. Modifications will be saved for this article. However, if you would like to display this article in the user side, you will need to set the status to <strong>Published</strong>.');
+define('_AM_PUBLISHER_PAGEWRAP', 'Page wrap');
+define('_AM_PUBLISHER_PAGEWRAPDSC', "A page-wrap is the ability to link an article with a content file. Doing this, the content of the article is directly taken from that file and you don't need to add the content manually. This is useful when you have already formatted HTML or PHP files.");
+define('_AM_PUBLISHER_PARENT_CATEGORY_EXP', "Parent category<span style='font-size: xx-small; font-weight: normal; display: block;'>Select a parent to make this a sub-category.</span>");
+define('_AM_PUBLISHER_PERMERROR', 'ERROR: cannot access file directory. Please CHMOD the uploads/publisher/content directory with value 755 (or 777 depending on your environment)');
+define('_AM_PUBLISHER_PERMISSIONS', 'Permissions');
+define('_AM_PUBLISHER_PERMISSIONS_APPLY_ON_ITEMS', "Apply read permissions on articles<span style='font-size: xx-small; font-weight: normal; display: block;'>Apply the above Read Permissions on all<br />articles within that category, overriding their<br />current permissions.<br /><strong>Please note that this is a one-time action only, and not a property</strong></span>");
+define('_AM_PUBLISHER_PERMISSIONS_CAT_READ', "Read permissions<span style='font-size: xx-small; font-weight: normal; display: block;'>Groups that will have permissions to see<br />this Category, as well as any articles<br />inside that category.</span>");
+define('_AM_PUBLISHER_PERMISSIONS_CAT_SUBMIT', 'Articles submission permissions');
+define('_AM_PUBLISHER_PERMISSIONS_CAT_SUBMIT_DSC', "Groups that will be allowed to submit articles within this category. Preference '[PERMISSIONS] User submissions' must be enabled.");
+define('_AM_PUBLISHER_PERMISSIONSVIEWMAN', 'Permissions to view categories');
+define('_AM_PUBLISHER_PUBLISH', 'Publish');
+define('_AM_PUBLISHER_PUBLISHED_DSC', 'Here is a list of all published articles available in the user side.');
+define('_AM_PUBLISHER_PUBLISHED_EXP', '<strong>Published articles</strong>: articles that have been approved and are displayed in the user side.');
+define('_AM_PUBLISHER_PUBLISHED_MOD_SUCCESS', 'The article has been successfully modified.');
+define('_AM_PUBLISHER_PUBLISHEDEDITING', 'Editing a published article');
+define('_AM_PUBLISHER_PUBLISHEDEDITING_INFO', 'You can edit this article. Modifications will immediately take effect in the user side.');
+define('_AM_PUBLISHER_PUBLISHEDITEMS', 'Published articles');
+define('_AM_PUBLISHER_REJECTED_EDIT', 'Edit this rejected article');
+define('_AM_PUBLISHER_REJECTED_ITEM', 'Rejected article');
+define('_AM_PUBLISHER_REJECTED_ITEM_EXP', '<strong>Rejected articles</strong>: articles that have been submitted by user, but rejected by a moderator. Rejected articles are not displayed in the user side.');
+define('_AM_PUBLISHER_RUSUREDELF', 'Are you sure you want to delete this file?');
+define('_AM_PUBLISHER_SCATEGORYNAME', "Create subcategories<br><br><span style='font-size: xx-small; font-weight: normal; display: block;'>Fill the text box with the names of sub categories to create.<br>Leave blank to not create subcategory. To create more, enter the how much more to create then press 'Add'</span>");
+define('_AM_PUBLISHER_SEARCH', 'Search');
+define('_AM_PUBLISHER_SEARCH_PW', 'Only HTML, HTM or XHTML extensions are allowed');
+define('_AM_PUBLISHER_SELECT_SORT', 'Sort order');
+define('_AM_PUBLISHER_SELECT_STATUS', 'Status');
+define('_AM_PUBLISHER_SHOWING', 'Showing');
+define('_AM_PUBLISHER_STATUS0', 'No status');
+define('_AM_PUBLISHER_SUBCAT_CAT', 'Sub categories');
+define('_AM_PUBLISHER_SUBCAT_CAT_DSC', 'Here is the list of the sub categories of this category');
+define('_AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR', 'An error occurred while saving the category. Here is a list of error(s):');
+define('_AM_PUBLISHER_SUBDESCRIPT', 'Description');
+define('_AM_PUBLISHER_SUBMISSION_MODERATE', 'Moderate this article');
+define('_AM_PUBLISHER_SUBMISSIONSMNGMT', 'Submitted articles');
+define('_AM_PUBLISHER_SUBMIT', 'Submit');
+define('_AM_PUBLISHER_SUBMITTED_APPROVE_SUCCESS', 'The submitted article has been published in the user side.');
+define('_AM_PUBLISHER_SUBMITTED_EXP', '<strong>Submitted articles</strong>: Articles that have been submitted by users. Once approved, they will be displayed in the user side.');
+define('_AM_PUBLISHER_SUBMITTED_INFO', "This article has been submitted by a member. You can make some modifications if you'd like. Upon approval, this article will be displayed in the user side of this site.");
+define('_AM_PUBLISHER_SUBMITTED_TITLE', 'Approving a submitted article');
+define('_AM_PUBLISHER_SUMMARY', 'Introduction');
+//define('_AM_PUBLISHER_SUMMARY_DSC','Article's introduction');
+define('_AM_PUBLISHER_TEXT_ASCENDING', 'Ascending');
+define('_AM_PUBLISHER_TEXT_DESCENDING', 'Descending');
+define('_AM_PUBLISHER_TEXT_NO_RECORDS', 'No records found');
+define('_AM_PUBLISHER_TEXT_NUMBER_PER_PAGE', 'Number Per Page:');
+define('_AM_PUBLISHER_TEXT_ORDER_BY', 'Order By:');
+define('_AM_PUBLISHER_TEXT_SEARCH_BY', 'Search By:');
+define('_AM_PUBLISHER_TEXT_SEARCH_MIME', 'Search mime types');
+define('_AM_PUBLISHER_TEXT_SEARCH_TEXT', 'Search Text:');
+define('_AM_PUBLISHER_TEXT_SORT_BY', 'Sort By:');
+define('_AM_PUBLISHER_TITLE', 'Title');
+define('_AM_PUBLISHER_TOTAL_OFFLINE', 'Offline articles: ');
+define('_AM_PUBLISHER_TOTALCAT', 'Categories:');
+define('_AM_PUBLISHER_TOTALPUBLISHED', 'Published articles: ');
+define('_AM_PUBLISHER_TOTALSUBMITTED', 'Submitted articles: ');
+define('_AM_PUBLISHER_UPDATE_MODULE', 'Update module');
+define('_AM_PUBLISHER_UPLOAD', 'Upload');
+define('_AM_PUBLISHER_UPLOAD_FILE', 'Upload a file');
+define('_AM_PUBLISHER_UPLOAD_FILE_NEW', 'Upload a new file');
+define('_AM_PUBLISHER_UPLOADED_DATE', 'Uploaded');
+define('_AM_PUBLISHER_VIEW_CATS', 'Select categories that each group can view');
+define('_AM_PUBLISHER_YES', 'Yes');
+//define('_AM_PUBLISHER_TOOLS','Tools');
+//define('_AM_PUBLISHER_CONFIGURE_READ_PERMISSIONS','Configure read permissions');
+//define('_AM_PUBLISHER_CONFIGURE_READ_PERMISSIONS_EXP','This tool allows you to quickly configure read permissions for ALL categories and ALL articles at once. ALl permissions will first be deleted and then replaced by the options your will have selected.<br /><br /><strong>Please use this tool with care!</strong>');
+//define('_AM_PUBLISHER_FULLACCESS','Categories and articles read permissions');
+//define('_AM_PUBLISHER_PERMISSIONS_UPDATED','Permissions updated.');
+define('_AM_PUBLISHER_ITEM_TAG', 'Tags');
 //added in publisher
-define("_AM_PUBLISHER_PERMISSIONS_FORM", "Fields available in articles submission forms");
-define("_AM_PUBLISHER_PERMISSIONS_FORM_DSC", "You can select which optional fields will be present in articles submission forms. You can set default values for this fields in preferences.");
-define("_AM_PUBLISHER_NOTIFY", "Notify on publish?");
-define("_AM_PUBLISHER_PERMISSIONS_EDITORS", "Editors available in articles submission forms");
-define("_AM_PUBLISHER_PERMISSIONS_EDITORS_DSC", "You can select which editors are available in article submission forms.");
-define("_AM_PUBLISHER_PERMISSIONS_GLOBAL", "Global permission settings");
-define("_AM_PUBLISHER_PERMISSIONS_GLOBAL_DSC", "Select which groups can perform which actions.");
-define("_AM_PUBLISHER_RATE", "Rate");
-define("_AM_PUBLISHER_CLONE", "Clone");
-define("_AM_PUBLISHER_CLONE_DSC", "Cloning a module has never been this easy! Just type in the name you want for it and hit submit button!");
-define("_AM_PUBLISHER_CLONE_TITLE", "Clone %s");
-define("_AM_PUBLISHER_CLONE_NAME", "Choose a name for the new module");
-define("_AM_PUBLISHER_CLONE_NAME_DSC", "Do not use special characters! <br />Do not choose an existing module dirname or database table name!");
-define("_AM_PUBLISHER_CLONE_INVALIDNAME", "ERROR: Invalid module name, please try another one!");
-define("_AM_PUBLISHER_CLONE_EXISTS", "ERROR: Module name already taken, please try another one!");
-define("_AM_PUBLISHER_CLONE_CONGRAT", "Congratulations! %s was sucessfully created!<br />You may want to make changes in language files.");
-define("_AM_PUBLISHER_CLONE_IMAGEFAIL", "Attention, we failed creating the new module logo. Please consider modifying assets/images/module_logo.png manually!");
-define("_AM_PUBLISHER_CLONE_FAIL", "Sorry, we failed in creating the new clone. Maybe you need to temporally set write permissions (CHMOD 777) to 'modules' folder and try again.");
-define("_AM_PUBLISHER_COMMENTS", "Comments");
-define("_AM_PUBLISHER_CATEGORY_MODERATOR", "Moderator");
-define("_AM_PUBLISHER_CATEGORY_MODERATOR_DSC", "A moderator can access and submit in this category even if he does not have groups permissions.<br />To moderate a sub category the user must have permissions to submit in the parent category.<br />Set to 'anonymous' if you do not need a moderator.");
+define('_AM_PUBLISHER_PERMISSIONS_FORM', 'Fields available in articles submission forms');
+define('_AM_PUBLISHER_PERMISSIONS_FORM_DSC', 'You can select which optional fields will be present in articles submission forms. You can set default values for this fields in preferences.');
+define('_AM_PUBLISHER_NOTIFY', 'Notify on publish?');
+define('_AM_PUBLISHER_PERMISSIONS_EDITORS', 'Editors available in articles submission forms');
+define('_AM_PUBLISHER_PERMISSIONS_EDITORS_DSC', 'You can select which editors are available in article submission forms.');
+define('_AM_PUBLISHER_PERMISSIONS_GLOBAL', 'Global permission settings');
+define('_AM_PUBLISHER_PERMISSIONS_GLOBAL_DSC', 'Select which groups can perform which actions.');
+define('_AM_PUBLISHER_RATE', 'Rate');
+define('_AM_PUBLISHER_CLONE', 'Clone');
+define('_AM_PUBLISHER_CLONE_DSC', 'Cloning a module has never been this easy! Just type in the name you want for it and hit submit button!');
+define('_AM_PUBLISHER_CLONE_TITLE', 'Clone %s');
+define('_AM_PUBLISHER_CLONE_NAME', 'Choose a name for the new module');
+define('_AM_PUBLISHER_CLONE_NAME_DSC', 'Do not use special characters! <br />Do not choose an existing module dirname or database table name!');
+define('_AM_PUBLISHER_CLONE_INVALIDNAME', 'ERROR: Invalid module name, please try another one!');
+define('_AM_PUBLISHER_CLONE_EXISTS', 'ERROR: Module name already taken, please try another one!');
+define('_AM_PUBLISHER_CLONE_CONGRAT', 'Congratulations! %s was sucessfully created!<br />You may want to make changes in language files.');
+define('_AM_PUBLISHER_CLONE_IMAGEFAIL', 'Attention, we failed creating the new module logo. Please consider modifying assets/images/module_logo.png manually!');
+define('_AM_PUBLISHER_CLONE_FAIL', "Sorry, we failed in creating the new clone. Maybe you need to temporally set write permissions (CHMOD 777) to 'modules' folder and try again.");
+define('_AM_PUBLISHER_COMMENTS', 'Comments');
+define('_AM_PUBLISHER_CATEGORY_MODERATOR', 'Moderator');
+define('_AM_PUBLISHER_CATEGORY_MODERATOR_DSC', "A moderator can access and submit in this category even if he does not have groups permissions.<br />To moderate a sub category the user must have permissions to submit in the parent category.<br />Set to 'anonymous' if you do not need a moderator.");
 //03/05/2012
-define("_AM_PUBLISHER_PERMISSIONS_CAT_MODERATOR", "Moderation permissions");
-define("_AM_PUBLISHER_PERMISSIONS_CAT_MODERATOR_DSC", "Groups that will be allowed to moderate articles within this category. Users on these groups will be able to edit/delete/clone articles. Don't forget to also set submit permissions on these groups!");
+define('_AM_PUBLISHER_PERMISSIONS_CAT_MODERATOR', 'Moderation permissions');
+define('_AM_PUBLISHER_PERMISSIONS_CAT_MODERATOR_DSC', "Groups that will be allowed to moderate articles within this category. Users on these groups will be able to edit/delete/clone articles. Don't forget to also set submit permissions on these groups!");
 //1.01 Beta 1
-define("_AM_PUBLISHER_ITEMCATEGORY_ID", "ID");
-define("_AM_PUBLISHER_ITEM_VIEWS", "Views");
+define('_AM_PUBLISHER_ITEMCATEGORY_ID', 'ID');
+define('_AM_PUBLISHER_ITEM_VIEWS', 'Views');
 //1.02 Beta 3
-define('_AM_PUBLISHER_VALID_ERR_MIME_EXT', "Invalid MIME Extension");
-define('_AM_PUBLISHER_VALID_ERR_MIME_NAME', "Invalid MIME Name");
-define('_AM_PUBLISHER_VALID_ERR_MIME_TYPES', "Invalid MIME Type");
-define('_AM_PUBLISHER_MSG_SUBMISSION_ERR', "Submission Errors");
-define('_AM_PUBLISHER_TEXT_SESSION_RESET', "Clear Add Session");
+define('_AM_PUBLISHER_VALID_ERR_MIME_EXT', 'Invalid MIME Extension');
+define('_AM_PUBLISHER_VALID_ERR_MIME_NAME', 'Invalid MIME Name');
+define('_AM_PUBLISHER_VALID_ERR_MIME_TYPES', 'Invalid MIME Type');
+define('_AM_PUBLISHER_MSG_SUBMISSION_ERR', 'Submission Errors');
+define('_AM_PUBLISHER_TEXT_SESSION_RESET', 'Clear Add Session');
 define('_AM_PUBLISHER_MIME_MANDATORY_FIELD', " <span style='font-weight: bold; color: red;'>*</span> These Fields are Required");
 
-define("_AM_PUBLISHER_IMPORT_NO_CATEGORY", "Views");
-define("_AM_PUBLISHER_REJECTED", "Rejected");
-define("_AM_PUBLISHER_REJECTED_EDIT_INFO", "Edit changes have been rejected");
-define("_PUBLISHER_RATE", "Rating");
-define("_AM_PUBLISHER_SETMPERM", "Set Permissions");
+define('_AM_PUBLISHER_IMPORT_NO_CATEGORY', 'Views');
+define('_AM_PUBLISHER_REJECTED', 'Rejected');
+define('_AM_PUBLISHER_REJECTED_EDIT_INFO', 'Edit changes have been rejected');
+define('_PUBLISHER_RATE', 'Rating');
+define('_AM_PUBLISHER_SETMPERM', 'Set Permissions');
 
-define("_AM_PUBLISHER_IMPORT_FMCONTENT_NAME", "FmContent Top Level");
-define("_AM_PUBLISHER_IMPORT_FMCONTENT_TLT", "Imported Articles from FmContent without a category.");
-define("_AM_PUBLISHER_IMPORT_DONE", "Done.");
+define('_AM_PUBLISHER_IMPORT_FMCONTENT_NAME', 'FmContent Top Level');
+define('_AM_PUBLISHER_IMPORT_FMCONTENT_TLT', 'Imported Articles from FmContent without a category.');
+define('_AM_PUBLISHER_IMPORT_DONE', 'Done.');
+
+define('_AM_PUBLISHER_VOTES', 'Votes');
+define('_AM_PUBLISHER_COMMENTS_COUNT', 'Comments');
diff --git a/publisher/language/english/blocks.php b/publisher/language/english/blocks.php
index f1ee5d19..f5125552 100644
--- a/publisher/language/english/blocks.php
+++ b/publisher/language/english/blocks.php
@@ -6,105 +6,105 @@
  * Licence: GNU
  */
 // Blocks
-define("_MB_PUBLISHER_ALLCAT", "All categories");
-define("_MB_PUBLISHER_AUTO_LAST_ITEMS", "Automatically display last item(s)?");
-define("_MB_PUBLISHER_CATEGORY", "Category");
-define("_MB_PUBLISHER_CHARS", "Length of the title");
-define("_MB_PUBLISHER_COMMENTS", "Comment(s)");
-define("_MB_PUBLISHER_DATE", "Published date");
-define("_MB_PUBLISHER_FIRST", "Exclude First");
-define("_MB_PUBLISHER_DISP", "Display");
-define("_MB_PUBLISHER_DISPLAY_COMMENTS", "Display comment count?");
-define("_MB_PUBLISHER_DISPLAY_TYPE", "Display type:");
-define("_MB_PUBLISHER_DISPLAY_TYPE_BLOCK", "Each item is a block");
-define("_MB_PUBLISHER_DISPLAY_TYPE_BULLET", "Each item is a bullet");
-define("_MB_PUBLISHER_DISPLAY_WHO_AND_WHEN", "Display the poster and date?");
-define("_MB_PUBLISHER_FULLITEM", "Read the complete article");
-define("_MB_PUBLISHER_HITS", "Number of hits");
-define("_MB_PUBLISHER_ITEMS", "Articles");
-define("_MB_PUBLISHER_LAST_ITEMS_COUNT", "if “Yes”, how many items to display?");
-define("_MB_PUBLISHER_ORDER", "Display order");
-define("_MB_PUBLISHER_ORDER_SHOW", "Show order in block");
-define("_MB_PUBLISHER_POSTEDBY", "Published by");
-define("_MB_PUBLISHER_READMORE", "Read more...");
-define("_MB_PUBLISHER_READS", "reads");
-define("_MB_PUBLISHER_SELECT_ITEMS", "if “No”, select the articles to be displayed:");
-define("_MB_PUBLISHER_SELECTCAT", "Display category:");
-define("_MB_PUBLISHER_VISITITEM", "Visit the");
-define("_MB_PUBLISHER_WEIGHT", "List by weight");
-define("_MB_PUBLISHER_WHO_WHEN", "Published by %s on %s");
+define('_MB_PUBLISHER_ALLCAT', 'All categories');
+define('_MB_PUBLISHER_AUTO_LAST_ITEMS', 'Automatically display last item(s)?');
+define('_MB_PUBLISHER_CATEGORY', 'Category');
+define('_MB_PUBLISHER_CHARS', 'Length of the title');
+define('_MB_PUBLISHER_COMMENTS', 'Comment(s)');
+define('_MB_PUBLISHER_DATE', 'Published date');
+define('_MB_PUBLISHER_FIRST', 'Exclude First');
+define('_MB_PUBLISHER_DISP', 'Display');
+define('_MB_PUBLISHER_DISPLAY_COMMENTS', 'Display comment count?');
+define('_MB_PUBLISHER_DISPLAY_TYPE', 'Display type:');
+define('_MB_PUBLISHER_DISPLAY_TYPE_BLOCK', 'Each item is a block');
+define('_MB_PUBLISHER_DISPLAY_TYPE_BULLET', 'Each item is a bullet');
+define('_MB_PUBLISHER_DISPLAY_WHO_AND_WHEN', 'Display the poster and date?');
+define('_MB_PUBLISHER_FULLITEM', 'Read the complete article');
+define('_MB_PUBLISHER_HITS', 'Number of hits');
+define('_MB_PUBLISHER_ITEMS', 'Articles');
+define('_MB_PUBLISHER_LAST_ITEMS_COUNT', 'if “Yes”, how many items to display?');
+define('_MB_PUBLISHER_ORDER', 'Display order');
+define('_MB_PUBLISHER_ORDER_SHOW', 'Show order in block');
+define('_MB_PUBLISHER_POSTEDBY', 'Published by');
+define('_MB_PUBLISHER_READMORE', 'Read more...');
+define('_MB_PUBLISHER_READS', 'reads');
+define('_MB_PUBLISHER_SELECT_ITEMS', 'if “No”, select the articles to be displayed:');
+define('_MB_PUBLISHER_SELECTCAT', 'Display category:');
+define('_MB_PUBLISHER_VISITITEM', 'Visit the');
+define('_MB_PUBLISHER_WEIGHT', 'List by weight');
+define('_MB_PUBLISHER_WHO_WHEN', 'Published by %s on %s');
 //bd tree block hack
-define("_MB_PUBLISHER_LEVELS", "levels");
-define("_MB_PUBLISHER_CURRENTCATEGORY", "Current Category");
-define("_MB_PUBLISHER_ASC", "ASC");
-define("_MB_PUBLISHER_DESC", "DESC");
-define("_MB_PUBLISHER_SHOWITEMS", "Show Items");
+define('_MB_PUBLISHER_LEVELS', 'levels');
+define('_MB_PUBLISHER_CURRENTCATEGORY', 'Current Category');
+define('_MB_PUBLISHER_ASC', 'ASC');
+define('_MB_PUBLISHER_DESC', 'DESC');
+define('_MB_PUBLISHER_SHOWITEMS', 'Show Items');
 //--/bd
-define("_MB_PUBLISHER_FILES", "files");
-define("_MB_PUBLISHER_DIRECTDOWNLOAD", "Direct link to download the file instead of a link to the article?");
-define("_MB_PUBLISHER_FROM", "Select articles <br />from ");
-define("_MB_PUBLISHER_UNTIL", "&nbsp;&nbsp;to");
-define("_MB_PUBLISHER_DATE_FORMAT", "Date format must be mm/dd/yyy");
-define("_MB_PUBLISHER_ARTICLES_FROM_TO", "Articles published between %s and %s");
-define("_MB_PUBLISHER_TRUNCATE", "Truncate summary text at the given bytes (0 will disable this feature) :");
-define("_MB_PUBLISHER_DISPLAY_CATIMAGE", "Display category image (if a category is selected)?");
-define("_MB_PUBLISHER_MORE", "More:");
-define("_MB_PUBLISHER_NUMBER_COLUMN_VIEW", "Number of columns to show");
-define("_MB_PUBLISHER_NUMBER_ITEMS_CAT", "Number of items in each category");
-define("_MB_PUBLISHER_IMAGE_TO_DISPLAY", "Choose an image to display");
-define("_MB_PUBLISHER_IMAGE_ARTICLE", "Article image");
-define("_MB_PUBLISHER_IMAGE_CATEGORY", "Category image");
-define("_MB_PUBLISHER_IMAGE_AVATAR", "User avatar");
+define('_MB_PUBLISHER_FILES', 'files');
+define('_MB_PUBLISHER_DIRECTDOWNLOAD', 'Direct link to download the file instead of a link to the article?');
+define('_MB_PUBLISHER_FROM', 'Select articles <br />from ');
+define('_MB_PUBLISHER_UNTIL', '&nbsp;&nbsp;to');
+define('_MB_PUBLISHER_DATE_FORMAT', 'Date format must be mm/dd/yyy');
+define('_MB_PUBLISHER_ARTICLES_FROM_TO', 'Articles published between %s and %s');
+define('_MB_PUBLISHER_TRUNCATE', 'Truncate summary text at the given bytes (0 will disable this feature) :');
+define('_MB_PUBLISHER_DISPLAY_CATIMAGE', 'Display category image (if a category is selected)?');
+define('_MB_PUBLISHER_MORE', 'More:');
+define('_MB_PUBLISHER_NUMBER_COLUMN_VIEW', 'Number of columns to show');
+define('_MB_PUBLISHER_NUMBER_ITEMS_CAT', 'Number of items in each category');
+define('_MB_PUBLISHER_IMAGE_TO_DISPLAY', 'Choose an image to display');
+define('_MB_PUBLISHER_IMAGE_ARTICLE', 'Article image');
+define('_MB_PUBLISHER_IMAGE_CATEGORY', 'Category image');
+define('_MB_PUBLISHER_IMAGE_AVATAR', 'User avatar');
 //latest news  block
-define("_MB_PUBLISHER_SP", " : ");
-define("_MB_PUBLISHER_NO_COMMENTS", "No comments");
-define("_MB_PUBLISHER_MORE_ITEMS", "More Articles");
-define("_MB_PUBLISHER_POSTER", "Posted by ");
-define("_MB_PUBLISHER_COLUMNS", "Number of Columns");
-define("_MB_PUBLISHER_COLUMN", "column");
-define("_MB_PUBLISHER_TEXTLENGTH", "Number of Letters");
-define("_MB_PUBLISHER_LETTER", "Letter");
-define("_MB_PUBLISHER_IMGWIDTH", "Image Width");
-define("_MB_PUBLISHER_IMGHEIGHT", "Image Height");
-define("_MB_PUBLISHER_PIXEL", "pixel");
-define("_MB_PUBLISHER_BORDER", "Image Border Size");
-define("_MB_PUBLISHER_BORDERCOLOR", "Image Border Color");
-define("_MB_PUBLISHER_IMGPOSITION", "Image Position");
-define("_MB_PUBLISHER_DISPLAY_MORELINK", "Display \"More News\"?");
-define("_MB_PUBLISHER_DISPLAY_TOPICLINK", "Display \"Topics\"?");
-define("_MB_PUBLISHER_DISPLAY_ARCHIVELINK", "Display \"Archives\"?");
-define("_MB_PUBLISHER_DISPLAY_SUBMITLINK", "Display \"Submit\"?");
-define("_MB_PUBLISHER_DISPLAY_POSTEDBY", "Display \"Posted By\"?");
-define("_MB_PUBLISHER_DISPLAY_POSTTIME", "Display \"Date\"?");
-define("_MB_PUBLISHER_DISPLAY_COMMENT", "Display \"Comment(s)\"?");
-define("_MB_PUBLISHER_DISPLAY_TOPICTITLE", "Display \"Topic Title\"?");
-define("_MB_PUBLISHER_DISPLAY_READ", "Display \"Read Counter\"?");
-define("_MB_PUBLISHER_DISPLAY_PRINT", "Display print icon?");
-define("_MB_PUBLISHER_DISPLAY_PDF", "Display pdf icon?");
-define("_MB_PUBLISHER_DISPLAY_EMAIL", "Display email icon?");
-define("_MB_PUBLISHER_TOPICSDISPLAY", "Topics to Display");
-define("_MB_PUBLISHER_SCROLL", "Enable Scrolling News Ticker");
-define("_MB_PUBLISHER_SCROLLHEIGHT", "Scroll Height");
-define("_MB_PUBLISHER_SCROLLSPEED", "Scroll Speed");
-define("_MB_PUBLISHER_SCROLLDIR", "Scroll Direction");
-define("_MB_PUBLISHER_SCROLL_RIGHT", "Right");
-define("_MB_PUBLISHER_SCROLL_LEFT", "Left");
-define("_MB_PUBLISHER_SCROLL_UP", "Up");
-define("_MB_PUBLISHER_SCROLL_DOWN", "Down");
-define("_MB_PUBLISHER_SELECTEDSTORIES", "Set article IDs (e.g.: 3,8,23,46) note: set 0 to show all");
-define("_MB_PUBLISHER_IMGDISPLAY", "Show Article Image");
-define("_MB_PUBLISHER_GENERALCONFIG", "<strong>General Options</strong>");
-define("_MB_PUBLISHER_PHOTOSCONFIG", "<strong>Images Options</strong>");
-define("_MB_PUBLISHER_LINKSCONFIG", "<strong>Links Options</strong>");
-define("_MB_PUBLISHER_TOPICSCONFIG", "<strong>Topic Options</strong>");
-define("_MB_PUBLISHER_TEMPLATESCONFIG", "<strong>Template Options</strong>");
-define("_MB_PUBLISHER_SUBMITNEWS", "Submit article");
-define("_MB_PUBLISHER_TEMPLATE", "Template");
-define("_MB_PUBLISHER_TEMPLATE_NORMAL", "Normal");
-define("_MB_PUBLISHER_TEMPLATE_EXTENDED", "Extended");
-define("_MB_PUBLISHER_TEMPLATE_TICKER", "Ticker");
-define("_MB_PUBLISHER_TEMPLATE_SLIDER1", "Fade-in Slider");
-define("_MB_PUBLISHER_TEMPLATE_SLIDER2", "Tabbed Slider");
-define("_MB_PUBLISHER_ARCHIVE", "Archive");
+define('_MB_PUBLISHER_SP', ' : ');
+define('_MB_PUBLISHER_NO_COMMENTS', 'No comments');
+define('_MB_PUBLISHER_MORE_ITEMS', 'More Articles');
+define('_MB_PUBLISHER_POSTER', 'Posted by ');
+define('_MB_PUBLISHER_COLUMNS', 'Number of Columns');
+define('_MB_PUBLISHER_COLUMN', 'column');
+define('_MB_PUBLISHER_TEXTLENGTH', 'Number of Letters');
+define('_MB_PUBLISHER_LETTER', 'Letter');
+define('_MB_PUBLISHER_IMGWIDTH', 'Image Width');
+define('_MB_PUBLISHER_IMGHEIGHT', 'Image Height');
+define('_MB_PUBLISHER_PIXEL', 'pixel');
+define('_MB_PUBLISHER_BORDER', 'Image Border Size');
+define('_MB_PUBLISHER_BORDERCOLOR', 'Image Border Color');
+define('_MB_PUBLISHER_IMGPOSITION', 'Image Position');
+define('_MB_PUBLISHER_DISPLAY_MORELINK', 'Display \'More News\'?');
+define('_MB_PUBLISHER_DISPLAY_TOPICLINK', 'Display \'Topics\'?');
+define('_MB_PUBLISHER_DISPLAY_ARCHIVELINK', 'Display \'Archives\'?');
+define('_MB_PUBLISHER_DISPLAY_SUBMITLINK', 'Display \'Submit\'?');
+define('_MB_PUBLISHER_DISPLAY_POSTEDBY', 'Display \'Posted By\'?');
+define('_MB_PUBLISHER_DISPLAY_POSTTIME', 'Display \'Date\'?');
+define('_MB_PUBLISHER_DISPLAY_COMMENT', 'Display \'Comment(s)\'?');
+define('_MB_PUBLISHER_DISPLAY_TOPICTITLE', 'Display \'Topic Title\'?');
+define('_MB_PUBLISHER_DISPLAY_READ', 'Display \'Read Counter\'?');
+define('_MB_PUBLISHER_DISPLAY_PRINT', 'Display print icon?');
+define('_MB_PUBLISHER_DISPLAY_PDF', 'Display pdf icon?');
+define('_MB_PUBLISHER_DISPLAY_EMAIL', 'Display email icon?');
+define('_MB_PUBLISHER_TOPICSDISPLAY', 'Topics to Display');
+define('_MB_PUBLISHER_SCROLL', 'Enable Scrolling News Ticker');
+define('_MB_PUBLISHER_SCROLLHEIGHT', 'Scroll Height');
+define('_MB_PUBLISHER_SCROLLSPEED', 'Scroll Speed');
+define('_MB_PUBLISHER_SCROLLDIR', 'Scroll Direction');
+define('_MB_PUBLISHER_SCROLL_RIGHT', 'Right');
+define('_MB_PUBLISHER_SCROLL_LEFT', 'Left');
+define('_MB_PUBLISHER_SCROLL_UP', 'Up');
+define('_MB_PUBLISHER_SCROLL_DOWN', 'Down');
+define('_MB_PUBLISHER_SELECTEDSTORIES', 'Set article IDs (e.g.: 3,8,23,46) note: set 0 to show all');
+define('_MB_PUBLISHER_IMGDISPLAY', 'Show Article Image');
+define('_MB_PUBLISHER_GENERALCONFIG', '<strong>General Options</strong>');
+define('_MB_PUBLISHER_PHOTOSCONFIG', '<strong>Images Options</strong>');
+define('_MB_PUBLISHER_LINKSCONFIG', '<strong>Links Options</strong>');
+define('_MB_PUBLISHER_TOPICSCONFIG', '<strong>Topic Options</strong>');
+define('_MB_PUBLISHER_TEMPLATESCONFIG', '<strong>Template Options</strong>');
+define('_MB_PUBLISHER_SUBMITNEWS', 'Submit article');
+define('_MB_PUBLISHER_TEMPLATE', 'Template');
+define('_MB_PUBLISHER_TEMPLATE_NORMAL', 'Normal');
+define('_MB_PUBLISHER_TEMPLATE_EXTENDED', 'Extended');
+define('_MB_PUBLISHER_TEMPLATE_TICKER', 'Ticker');
+define('_MB_PUBLISHER_TEMPLATE_SLIDER1', 'Fade-in Slider');
+define('_MB_PUBLISHER_TEMPLATE_SLIDER2', 'Tabbed Slider');
+define('_MB_PUBLISHER_ARCHIVE', 'Archive');
 //25-11-2012
-define("_MB_PUBLISHER_ONECOMMENT", "1 comment");
+define('_MB_PUBLISHER_ONECOMMENT', '1 comment');
diff --git a/publisher/language/english/common.php b/publisher/language/english/common.php
index 9aada97e..3fff0f73 100644
--- a/publisher/language/english/common.php
+++ b/publisher/language/english/common.php
@@ -5,102 +5,102 @@
  * Author: The SmartFactory <www.smartfactory.ca>
  * Licence: GNU
  */
-define("_CO_PUBLISHER_MESSAGE_FILE_ERROR", "Error: Unable to store uploaded file for the following reasons:<br />%s");
-define("_CO_PUBLISHER_MESSAGE_WRONG_MIMETYPE", "Error: file type is not allowed. Please re-submit.");
-define("_CO_PUBLISHER_ALLOWCOMMENTS", "Can article be commented?");
-define("_CO_PUBLISHER_AUTHOR_ALIAS", "Author alias");
-define("_CO_PUBLISHER_AUTHOR_ALIAS_DSC", "Select the alias name of the poster, this will be used instead of “anonymous” and will set the owner ID of the article to 0");
-define("_CO_PUBLISHER_AVAILABLE_PAGE_WRAP", "Available pages to wrap");
-define("_CO_PUBLISHER_AVAILABLE_PAGE_WRAP_DSC", "Here are the pages available for wrapping in the body. Click on the page(s) you would like to wrap. Works with XOOPS editor only for the moment. Add manually if you are on another editor.");
-define("_CO_PUBLISHER_DATESUB", "Published date");
-define("_CO_PUBLISHER_DATESUB_DSC", "Select the date of publication");
-define("_CO_PUBLISHER_ITEM_META_DESCRIPTION", "Meta Description");
-define("_CO_PUBLISHER_ITEM_META_DESCRIPTION_DSC", "In order to help Search Engines, you can customize the meta description you would like to use for this article. if you leave this field empty when creating a category, it will automatically be populated with the Summary field of this article.");
-define("_CO_PUBLISHER_ITEM_META_KEYWORDS", "Meta Keywords");
-define("_CO_PUBLISHER_ITEM_META_KEYWORDS_DSC", "In order to help Search Engines, you can customize the keywords you would like to use for this article. If you leave this field empty when creating an article, it will automatically be populated with words from the Summary field of this article.");
-define("_CO_PUBLISHER_ITEM_SHORT_URL", "Short URL");
-define("_CO_PUBLISHER_ITEM_SHORT_URL_DSC", "When using the SEO features of this module, you can specify a Short URL for this article. This field is optional.");
-define("_CO_PUBLISHER_OFFLINE", "Offline");
-define("_CO_PUBLISHER_PERMISSIONS_ITEM", "Permissions");
-define("_CO_PUBLISHER_PERMISSIONS_ITEM_DSC", "Groups that will have permissions to see this item.");
-define("_CO_PUBLISHER_PUBLISHED", "Published");
-define("_CO_PUBLISHER_REJECTED", "Rejected");
-define("_CO_PUBLISHER_STATUS", "Status");
-define("_CO_PUBLISHER_STATUS_DSC", "Select the status of this article");
-define("_CO_PUBLISHER_SUBMITTED", "Submitted");
-define("_CO_PUBLISHER_UID", "Poster name");
-define("_CO_PUBLISHER_UID_DSC", "Select the name of the poster");
-define("_CO_PUBLISHER_WEIGHT", "Weight");
-define("_CO_PUBLISHER_ITEM_UPLOAD_FILE", "File upload");
-define("_CO_PUBLISHER_ITEM_UPLOAD_FILE_DSC", "Select a file from your computer to attach it to this article. You will be able to add more files once the article has been created. Simply edit the article and scroll at the bottom of the page to see the Add file button.<br /><br /> For example, you could add a Word document or an Excel document. You can even upload a Flash file and it will be directly embedded into your article! ");
-//define("_CO_PUBLISHER_OPTIONS","Options");
-define("_CO_PUBLISHER_DISPLAY_SUMMARY", "Display summary on the item page ?");
-define("_CO_PUBLISHER_DOHTML", "Enable HTML tags");
-define("_CO_PUBLISHER_DOIMAGE", "Enable images");
-define("_CO_PUBLISHER_DOLINEBREAK", "Enable line break");
-define("_CO_PUBLISHER_DOSMILEY", "Enable smiley icons");
-define("_CO_PUBLISHER_DOXCODE", "Enable XOOPS codes");
-define("_CO_PUBLISHER_EDIT", "Edit article");
-define("_CO_PUBLISHER_CLONE", "Duplicate article");
-define("_CO_PUBLISHER_ADD_FILE", "Add a file");
-define("_CO_PUBLISHER_DELETE", "Delete article");
-define("_CO_PUBLISHER_PDF", "View this article in PDF format");
-define("_CO_PUBLISHER_PRINT", "Print article");
-define("_CO_PUBLISHER_MAIL", "Send article");
-define("_CO_PUBLISHER_INTITEM", "Have a look at this article at %s");
-define("_CO_PUBLISHER_INTITEMFOUND", "Here is an interesting article I have found at %s");
-define("_CO_PUBLISHER_POSTEDBY", "Published by %s on %s");
-define("_CO_PUBLISHER_BODY", "Body");
-define("_CO_PUBLISHER_BODY_DSC", "Article's body");
-define("_CO_PUBLISHER_CATEGORY", "Category");
-define("_CO_PUBLISHER_CATEGORY_DSC", "Article's category.");
-define("_CO_PUBLISHER_IMAGE_ITEM", "Article featured image");
-define("_CO_PUBLISHER_IMAGE_ITEM_DSC", "Image representing the article");
-define("_CO_PUBLISHER_IMAGE_UPLOAD", "Image upload");
-//define("_CO_PUBLISHER_IMAGE_UPLOAD_ITEM_DSC","Select an image on your computer. <br />This image will be uploaded to the site <br />and set as the article image.");
-define("_CO_PUBLISHER_SUBCATEGORIES_INFO", "Subcategories within <em>%s</em> :");
-define("_CO_PUBLISHER_SUMMARY", "Block summary");
-define("_CO_PUBLISHER_SUMMARY_DSC", "This summary is used for blocks, index and category pages. It does not display inside article.");
-define("_CO_PUBLISHER_TITLE", "Title");
-define("_CO_PUBLISHER_SUBTITLE", "Sub title");
-define("_CO_PUBLISHER_ERROR", "Sorry, some error occurred!");
-define("_CO_PUBLISHER_SORTBY", "Sort by");
-define("_CO_PUBLISHER_ADD", "Add");
-define("_CO_PUBLISHER_REMOVE", "Remove");
-define("_CO_PUBLISHER_PREVIEW", "Preview");
-define("_CO_PUBLISHER_CREATE", "Create");
-define("_CO_PUBLISHER_CLEAR", "Clear");
-define("_CO_PUBLISHER_CANCEL", "Cancel");
-define("_CO_PUBLISHER_IMAGE_ITEMS", "Article images");
-define("_CO_PUBLISHER_IMAGE_ITEMS_DSC", "Please choose the images related to this article");
-define("_CO_PUBLISHER_IMAGE_PREVIEW", "Image preview");
-define("_CO_PUBLISHER_NOTIFY", "Notify on publish?");
-define("_CO_PUBLISHER_FILEUPLOAD_ERROR", "An error occurred while uploading the file.");
-define("_CO_PUBLISHER_FILEUPLOAD_SUCCESS", "The file was successfully uploaded.");
-define("_CO_PUBLISHER_NEW_FEATURE", "New feature!");
-define("_CO_PUBLISHER_TAB_MAIN", "Main");
-define("_CO_PUBLISHER_TAB_IMAGES", "Images");
-define("_CO_PUBLISHER_TAB_OTHERS", "Others");
-define("_CO_PUBLISHER_TAB_META", "Meta data");
-define("_CO_PUBLISHER_TAB_PERMISSIONS", "Permissions");
-define("_CO_PUBLISHER_IMAGE_UPLOAD_NEW", "Upload new image");
-//define("_CO_PUBLISHER_IMAGE_UPLOADING","Uploading");
-define("_CO_PUBLISHER_IMAGE_NICENAME", "Enter image name");
-define("_CO_PUBLISHER_IMAGE_CAT_NONE", "No image category found");
-define("_CO_PUBLISHER_IMAGE_CAT_NOPERM", "You have no permissions to use this image category");
+define('_CO_PUBLISHER_MESSAGE_FILE_ERROR', 'Error: Unable to store uploaded file for the following reasons:<br />%s');
+define('_CO_PUBLISHER_MESSAGE_WRONG_MIMETYPE', 'Error: file type is not allowed. Please re-submit.');
+define('_CO_PUBLISHER_ALLOWCOMMENTS', 'Can article be commented?');
+define('_CO_PUBLISHER_AUTHOR_ALIAS', 'Author alias');
+define('_CO_PUBLISHER_AUTHOR_ALIAS_DSC', 'Select the alias name of the poster, this will be used instead of “anonymous” and will set the owner ID of the article to 0');
+define('_CO_PUBLISHER_AVAILABLE_PAGE_WRAP', 'Available pages to wrap');
+define('_CO_PUBLISHER_AVAILABLE_PAGE_WRAP_DSC', 'Here are the pages available for wrapping in the body. Click on the page(s) you would like to wrap. Works with XOOPS editor only for the moment. Add manually if you are on another editor.');
+define('_CO_PUBLISHER_DATESUB', 'Published date');
+define('_CO_PUBLISHER_DATESUB_DSC', 'Select the date of publication');
+define('_CO_PUBLISHER_ITEM_META_DESCRIPTION', 'Meta Description');
+define('_CO_PUBLISHER_ITEM_META_DESCRIPTION_DSC', 'In order to help Search Engines, you can customize the meta description you would like to use for this article. if you leave this field empty when creating a category, it will automatically be populated with the Summary field of this article.');
+define('_CO_PUBLISHER_ITEM_META_KEYWORDS', 'Meta Keywords');
+define('_CO_PUBLISHER_ITEM_META_KEYWORDS_DSC', 'In order to help Search Engines, you can customize the keywords you would like to use for this article. If you leave this field empty when creating an article, it will automatically be populated with words from the Summary field of this article.');
+define('_CO_PUBLISHER_ITEM_SHORT_URL', 'Short URL');
+define('_CO_PUBLISHER_ITEM_SHORT_URL_DSC', 'When using the SEO features of this module, you can specify a Short URL for this article. This field is optional.');
+define('_CO_PUBLISHER_OFFLINE', 'Offline');
+define('_CO_PUBLISHER_PERMISSIONS_ITEM', 'Permissions');
+define('_CO_PUBLISHER_PERMISSIONS_ITEM_DSC', 'Groups that will have permissions to see this item.');
+define('_CO_PUBLISHER_PUBLISHED', 'Published');
+define('_CO_PUBLISHER_REJECTED', 'Rejected');
+define('_CO_PUBLISHER_STATUS', 'Status');
+define('_CO_PUBLISHER_STATUS_DSC', 'Select the status of this article');
+define('_CO_PUBLISHER_SUBMITTED', 'Submitted');
+define('_CO_PUBLISHER_UID', 'Poster name');
+define('_CO_PUBLISHER_UID_DSC', 'Select the name of the poster');
+define('_CO_PUBLISHER_WEIGHT', 'Weight');
+define('_CO_PUBLISHER_ITEM_UPLOAD_FILE', 'File upload');
+define('_CO_PUBLISHER_ITEM_UPLOAD_FILE_DSC', 'Select a file from your computer to attach it to this article. You will be able to add more files once the article has been created. Simply edit the article and scroll at the bottom of the page to see the Add file button.<br /><br /> For example, you could add a Word document or an Excel document. You can even upload a Flash file and it will be directly embedded into your article! ');
+//define('_CO_PUBLISHER_OPTIONS','Options');
+define('_CO_PUBLISHER_DISPLAY_SUMMARY', 'Display summary on the item page ?');
+define('_CO_PUBLISHER_DOHTML', 'Enable HTML tags');
+define('_CO_PUBLISHER_DOIMAGE', 'Enable images');
+define('_CO_PUBLISHER_DOLINEBREAK', 'Enable line break');
+define('_CO_PUBLISHER_DOSMILEY', 'Enable smiley icons');
+define('_CO_PUBLISHER_DOXCODE', 'Enable XOOPS codes');
+define('_CO_PUBLISHER_EDIT', 'Edit article');
+define('_CO_PUBLISHER_CLONE', 'Duplicate article');
+define('_CO_PUBLISHER_ADD_FILE', 'Add a file');
+define('_CO_PUBLISHER_DELETE', 'Delete article');
+define('_CO_PUBLISHER_PDF', 'View this article in PDF format');
+define('_CO_PUBLISHER_PRINT', 'Print article');
+define('_CO_PUBLISHER_MAIL', 'Send article');
+define('_CO_PUBLISHER_INTITEM', 'Have a look at this article at %s');
+define('_CO_PUBLISHER_INTITEMFOUND', 'Here is an interesting article I have found at %s');
+define('_CO_PUBLISHER_POSTEDBY', 'Published by %s on %s');
+define('_CO_PUBLISHER_BODY', 'Body');
+define('_CO_PUBLISHER_BODY_DSC', "Article's body");
+define('_CO_PUBLISHER_CATEGORY', 'Category');
+define('_CO_PUBLISHER_CATEGORY_DSC', "Article's category.");
+define('_CO_PUBLISHER_IMAGE_ITEM', 'Article featured image');
+define('_CO_PUBLISHER_IMAGE_ITEM_DSC', 'Image representing the article');
+define('_CO_PUBLISHER_IMAGE_UPLOAD', 'Image upload');
+//define('_CO_PUBLISHER_IMAGE_UPLOAD_ITEM_DSC','Select an image on your computer. <br />This image will be uploaded to the site <br />and set as the article image.');
+define('_CO_PUBLISHER_SUBCATEGORIES_INFO', 'Subcategories within <em>%s</em> :');
+define('_CO_PUBLISHER_SUMMARY', 'Block summary');
+define('_CO_PUBLISHER_SUMMARY_DSC', 'This summary is used for blocks, index and category pages. It does not display inside article.');
+define('_CO_PUBLISHER_TITLE', 'Title');
+define('_CO_PUBLISHER_SUBTITLE', 'Sub title');
+define('_CO_PUBLISHER_ERROR', 'Sorry, some error occurred!');
+define('_CO_PUBLISHER_SORTBY', 'Sort by');
+define('_CO_PUBLISHER_ADD', 'Add');
+define('_CO_PUBLISHER_REMOVE', 'Remove');
+define('_CO_PUBLISHER_PREVIEW', 'Preview');
+define('_CO_PUBLISHER_CREATE', 'Create');
+define('_CO_PUBLISHER_CLEAR', 'Clear');
+define('_CO_PUBLISHER_CANCEL', 'Cancel');
+define('_CO_PUBLISHER_IMAGE_ITEMS', 'Article images');
+define('_CO_PUBLISHER_IMAGE_ITEMS_DSC', 'Please choose the images related to this article');
+define('_CO_PUBLISHER_IMAGE_PREVIEW', 'Image preview');
+define('_CO_PUBLISHER_NOTIFY', 'Notify on publish?');
+define('_CO_PUBLISHER_FILEUPLOAD_ERROR', 'An error occurred while uploading the file.');
+define('_CO_PUBLISHER_FILEUPLOAD_SUCCESS', 'The file was successfully uploaded.');
+define('_CO_PUBLISHER_NEW_FEATURE', 'New feature!');
+define('_CO_PUBLISHER_TAB_MAIN', 'Main');
+define('_CO_PUBLISHER_TAB_IMAGES', 'Images');
+define('_CO_PUBLISHER_TAB_OTHERS', 'Others');
+define('_CO_PUBLISHER_TAB_META', 'Meta data');
+define('_CO_PUBLISHER_TAB_PERMISSIONS', 'Permissions');
+define('_CO_PUBLISHER_IMAGE_UPLOAD_NEW', 'Upload new image');
+//define('_CO_PUBLISHER_IMAGE_UPLOADING','Uploading');
+define('_CO_PUBLISHER_IMAGE_NICENAME', 'Enter image name');
+define('_CO_PUBLISHER_IMAGE_CAT_NONE', 'No image category found');
+define('_CO_PUBLISHER_IMAGE_CAT_NOPERM', 'You have no permissions to use this image category');
 //30/04/2012
-define("_CO_PUBLISHER_TAB_FILES", "Files");
-define("_CO_PUBLISHER_FILE", "Files");
-define("_CO_PUBLISHER_FILE_DESCRIPTION", "Description");
-define("_CO_PUBLISHER_FILE_DESCRIPTION_DSC", "Description of the file to be uploaded.");
-define("_CO_PUBLISHER_FILE_NAME_DSC", "Name that will be used to identify the file.");
-define("_CO_PUBLISHER_FILE_STATUS", "File visible?");
-define("_CO_PUBLISHER_FILE_STATUS_DSC", "if you select no, the file will not be visible from the user side.");
-define("_CO_PUBLISHER_FILE_TO_UPLOAD", "File to upload:");
-define("_CO_PUBLISHER_FILE_TYPE", "File type");
-define("_CO_PUBLISHER_FILE_UPLOAD_ANOTHER", "Upload again");
-define("_CO_PUBLISHER_FILENAME", "File name");
-define("_CO_PUBLISHER_FILES_LINKED", "Files linked to this article");
+define('_CO_PUBLISHER_TAB_FILES', 'Files');
+define('_CO_PUBLISHER_FILE', 'Files');
+define('_CO_PUBLISHER_FILE_DESCRIPTION', 'Description');
+define('_CO_PUBLISHER_FILE_DESCRIPTION_DSC', 'Description of the file to be uploaded.');
+define('_CO_PUBLISHER_FILE_NAME_DSC', 'Name that will be used to identify the file.');
+define('_CO_PUBLISHER_FILE_STATUS', 'File visible?');
+define('_CO_PUBLISHER_FILE_STATUS_DSC', 'if you select no, the file will not be visible from the user side.');
+define('_CO_PUBLISHER_FILE_TO_UPLOAD', 'File to upload:');
+define('_CO_PUBLISHER_FILE_TYPE', 'File type');
+define('_CO_PUBLISHER_FILE_UPLOAD_ANOTHER', 'Upload again');
+define('_CO_PUBLISHER_FILENAME', 'File name');
+define('_CO_PUBLISHER_FILES_LINKED', 'Files linked to this article');
 //Added 30/05/2012
-define("_CO_PUBLISHER_EDITFILE", "Edit file");
-define("_CO_PUBLISHER_DELETEFILE", "Delete file");
+define('_CO_PUBLISHER_EDITFILE', 'Edit file');
+define('_CO_PUBLISHER_DELETEFILE', 'Delete file');
diff --git a/publisher/language/english/help/index.html b/publisher/language/english/help/index.html
index 990cbd60..2c5cdd3f 100644
--- a/publisher/language/english/help/index.html
+++ b/publisher/language/english/help/index.html
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
diff --git a/publisher/language/english/mail_template/category_item_published.tpl b/publisher/language/english/mail_template/category_item_published.tpl
index 0733b2c0..18ebe518 100644
--- a/publisher/language/english/mail_template/category_item_published.tpl
+++ b/publisher/language/english/mail_template/category_item_published.tpl
@@ -19,6 +19,6 @@ Please do not reply to this message.
 
 -----------
 
-{X_SITENAME} ({X_SITEURL}) 
+{X_SITENAME} ({X_SITEURL})
 The Webmaster
-{X_ADMINMAIL}
\ No newline at end of file
+{X_ADMINMAIL}
diff --git a/publisher/language/english/mail_template/category_item_submitted.tpl b/publisher/language/english/mail_template/category_item_submitted.tpl
index 2155b18c..08cc1b53 100644
--- a/publisher/language/english/mail_template/category_item_submitted.tpl
+++ b/publisher/language/english/mail_template/category_item_submitted.tpl
@@ -19,6 +19,6 @@ Please do not reply to this message.
 
 -----------
 
-{X_SITENAME} ({X_SITEURL}) 
+{X_SITENAME} ({X_SITEURL})
 The Webmaster
-{X_ADMINMAIL}
\ No newline at end of file
+{X_ADMINMAIL}
diff --git a/publisher/language/english/mail_template/global_item_submitted.tpl b/publisher/language/english/mail_template/global_item_submitted.tpl
index 4a23e6af..18c5d3fe 100644
--- a/publisher/language/english/mail_template/global_item_submitted.tpl
+++ b/publisher/language/english/mail_template/global_item_submitted.tpl
@@ -18,6 +18,6 @@ Please do not reply to this message.
 
 -----------
 
-{X_SITENAME} ({X_SITEURL}) 
+{X_SITENAME} ({X_SITEURL})
 The Webmaster
-{X_ADMINMAIL}
\ No newline at end of file
+{X_ADMINMAIL}
diff --git a/publisher/language/english/mail_template/item_approved.tpl b/publisher/language/english/mail_template/item_approved.tpl
index 543dc67c..ff191e6b 100644
--- a/publisher/language/english/mail_template/item_approved.tpl
+++ b/publisher/language/english/mail_template/item_approved.tpl
@@ -19,6 +19,6 @@ Please do not reply to this message.
 
 -----------
 
-{X_SITENAME} ({X_SITEURL}) 
+{X_SITENAME} ({X_SITEURL})
 The Webmaster
-{X_ADMINMAIL}
\ No newline at end of file
+{X_ADMINMAIL}
diff --git a/publisher/language/english/mail_template/item_rejected.tpl b/publisher/language/english/mail_template/item_rejected.tpl
index 6fe7f140..c67e8676 100644
--- a/publisher/language/english/mail_template/item_rejected.tpl
+++ b/publisher/language/english/mail_template/item_rejected.tpl
@@ -19,6 +19,6 @@ Please do not reply to this message.
 
 -----------
 
-{X_SITENAME} ({X_SITEURL}) 
+{X_SITENAME} ({X_SITEURL})
 The Webmaster
-{X_ADMINMAIL}
\ No newline at end of file
+{X_ADMINMAIL}
diff --git a/publisher/language/english/main.php b/publisher/language/english/main.php
index 688cf6d7..97ebdc90 100644
--- a/publisher/language/english/main.php
+++ b/publisher/language/english/main.php
@@ -5,86 +5,86 @@
  * Author: The SmartFactory <www.smartfactory.ca>
  * Licence: GNU
  */
-define("_MD_PUBLISHER_ADD_FILE_INTRO", "Please fill this form in order to attach a file to this article: '%s'.");
-define("_MD_PUBLISHER_ADD_FILE_TITLE", "Add a file to an article");
-define("_MD_PUBLISHER_ADMIN_PAGE", ":: Administrative Section ::");
-define("_MD_PUBLISHER_MODIFY", "Modify");
-define("_MD_PUBLISHER_CANCEL", "Cancel");
-define("_MD_PUBLISHER_CATEGORY_EDIT", "Edit category");
-define("_MD_PUBLISHER_CATEGORY_SUMMARY", "Summary of %s");
-define("_MD_PUBLISHER_CATEGORY_SUMMARY_INFO", "Sub-categories within %s.");
-define("_MD_PUBLISHER_CLEAR", "Clear");
-define("_MD_PUBLISHER_COMMENTS", "Comment(s)");
-//define("_MD_PUBLISHER_CREATE","Create article");
-define("_MD_PUBLISHER_DATE", "Date");
-define("_MD_PUBLISHER_DATESUB", "Published on");
-define("_MD_PUBLISHER_DESCRIPTION", "Description");
-define("_MD_PUBLISHER_DOWNLOAD_FILE", "Download this file");
-define("_MD_PUBLISHER_EDIT_ARTICLE", "Edit an article");
-define("_MD_PUBLISHER_EMPTY", "This category currently has no article or sub-category");
-define("_MD_PUBLISHER_GOODDAY", "Hello <strong>%s</strong>! ");
-define("_MD_PUBLISHER_HITS", "Hits");
-define("_MD_PUBLISHER_HITSDETAIL", "This article has been read");
-define("_MD_PUBLISHER_HOME", "Home");
-define("_MD_PUBLISHER_INDEX_CATEGORIES_SUMMARY", "Categories summary");
-define("_MD_PUBLISHER_INDEX_CATEGORIES_SUMMARY_INFO", "Here is a list of the top categories and their sub-categories. Select a category to see the articles within.");
-define("_MD_PUBLISHER_INDEX_ITEMS", "Last published articles");
-define("_MD_PUBLISHER_INDEX_ITEMS_INFO", "Here is a list of the Last published articles.");
-define("_MD_PUBLISHER_ITEM", "article");
-define("_MD_PUBLISHER_ITEM_RECEIVED_AND_PUBLISHED", "Your article has been sent and automatically published. Thank you for your contribution!");
-define("_MD_PUBLISHER_ITEM_RECEIVED_NEED_APPROVAL", "Your article has been sent and will be published upon approval by a moderator.<br />Thank you for your contribution!");
-define("_MD_PUBLISHER_ITEMMODIFIED", "The article was successfully modified!");
-define("_MD_PUBLISHER_ITEMS", "Articles");
-define("_MD_PUBLISHER_ITEMS_INFO", "Here are the articles within this category.");
-define("_MD_PUBLISHER_ITEMS_LINKS", "Navigate through the articles");
-define("_MD_PUBLISHER_ITEMS_TITLE", "Articles within %s");
-define("_MD_PUBLISHER_LAST_SMARTITEM", "Last published article");
-define("_MD_PUBLISHER_NAME", "Name");
-define("_MD_PUBLISHER_NEED_CATEGORY_ITEM", "To create an article, you must have appropriate permission in at least one category.");
-define("_MD_PUBLISHER_NEXT_ITEM", "Next article");
-define("_MD_PUBLISHER_NO", "No");
-define("_MD_PUBLISHER_NO_CAT_EXISTS", "Sorry, there&#8217s no category //defined as yet.<br />Please contact the site administrator and tell him about this.");
-define("_MD_PUBLISHER_NO_CAT_PERMISSIONS", "Sorry, you don't have sufficient permissions to access this area.");
-define("_MD_PUBLISHER_NO_TOP_PERMISSIONS", "Sorry, there is no article to display.");
-define("_MD_PUBLISHER_NOCATEGORYSELECTED", "You did not select a valid category!");
-define("_MD_PUBLISHER_NOITEMSELECTED", "You did not select a valid article!");
-define("_MD_PUBLISHER_ON", "on");
-define("_MD_PUBLISHER_OTHER_ITEMS", "Other articles in this category");
-define("_MD_PUBLISHER_PAGE", "Page");
-//define("_MD_PUBLISHER_PREVIEW","Preview");
-define("_MD_PUBLISHER_PREVIOUS_ITEM", "Previous article");
-define("_MD_PUBLISHER_PRINTERFRIENDLY", "Print this article in a printer friendly format");
-define("_MD_PUBLISHER_READS", "reads");
-define("_MD_PUBLISHER_RSSFEED", "RSS Feed");
-define("_MD_PUBLISHER_SENDSTORY", "Send this article to a friend");
-define("_MD_PUBLISHER_SUB_CLONE", "Dupplicate an article");
-define("_MD_PUBLISHER_SUB_SMNAME", "Submit an article");
-define("_MD_PUBLISHER_SUB_SNEWNAME", "Submit an article");
-define("_MD_PUBLISHER_SUBMIT", "Submit an article");
-define("_MD_PUBLISHER_SUBMIT_ERROR", "An error occurred. Your article was not submitted.");
-define("_MD_PUBLISHER_TOTAL_SMARTITEMS", "Total articles");
-define("_MD_PUBLISHER_UPLOAD", "Upload");
-//define("_MD_PUBLISHER_UPLOAD_FILE","Upload a file");
-define("_MD_PUBLISHER_VIEW_MORE", "Read the complete article");
-define("_MD_PUBLISHER_WHO_WHEN", "Published by %s on %s");
-define("_MD_PUBLISHER_PRINT_CLOSE", "Close this window");
+define('_MD_PUBLISHER_ADD_FILE_INTRO', "Please fill this form in order to attach a file to this article: '%s'.");
+define('_MD_PUBLISHER_ADD_FILE_TITLE', 'Add a file to an article');
+define('_MD_PUBLISHER_ADMIN_PAGE', ':: Administrative Section ::');
+define('_MD_PUBLISHER_MODIFY', 'Modify');
+define('_MD_PUBLISHER_CANCEL', 'Cancel');
+define('_MD_PUBLISHER_CATEGORY_EDIT', 'Edit category');
+define('_MD_PUBLISHER_CATEGORY_SUMMARY', 'Summary of %s');
+define('_MD_PUBLISHER_CATEGORY_SUMMARY_INFO', 'Sub-categories within %s.');
+define('_MD_PUBLISHER_CLEAR', 'Clear');
+define('_MD_PUBLISHER_COMMENTS', 'Comment(s)');
+//define('_MD_PUBLISHER_CREATE','Create article');
+define('_MD_PUBLISHER_DATE', 'Date');
+define('_MD_PUBLISHER_DATESUB', 'Published on');
+define('_MD_PUBLISHER_DESCRIPTION', 'Description');
+define('_MD_PUBLISHER_DOWNLOAD_FILE', 'Download this file');
+define('_MD_PUBLISHER_EDIT_ARTICLE', 'Edit an article');
+define('_MD_PUBLISHER_EMPTY', 'This category currently has no article or sub-category');
+define('_MD_PUBLISHER_GOODDAY', 'Hello <strong>%s</strong>! ');
+define('_MD_PUBLISHER_HITS', 'Hits');
+define('_MD_PUBLISHER_HITSDETAIL', 'This article has been read');
+define('_MD_PUBLISHER_HOME', 'Home');
+define('_MD_PUBLISHER_INDEX_CATEGORIES_SUMMARY', 'Categories summary');
+define('_MD_PUBLISHER_INDEX_CATEGORIES_SUMMARY_INFO', 'Here is a list of the top categories and their sub-categories. Select a category to see the articles within.');
+define('_MD_PUBLISHER_INDEX_ITEMS', 'Last published articles');
+define('_MD_PUBLISHER_INDEX_ITEMS_INFO', 'Here is a list of the Last published articles.');
+define('_MD_PUBLISHER_ITEM', 'article');
+define('_MD_PUBLISHER_ITEM_RECEIVED_AND_PUBLISHED', 'Your article has been sent and automatically published. Thank you for your contribution!');
+define('_MD_PUBLISHER_ITEM_RECEIVED_NEED_APPROVAL', 'Your article has been sent and will be published upon approval by a moderator.<br />Thank you for your contribution!');
+define('_MD_PUBLISHER_ITEMMODIFIED', 'The article was successfully modified!');
+define('_MD_PUBLISHER_ITEMS', 'Articles');
+define('_MD_PUBLISHER_ITEMS_INFO', 'Here are the articles within this category.');
+define('_MD_PUBLISHER_ITEMS_LINKS', 'Navigate through the articles');
+define('_MD_PUBLISHER_ITEMS_TITLE', 'Articles within %s');
+define('_MD_PUBLISHER_LAST_SMARTITEM', 'Last published article');
+define('_MD_PUBLISHER_NAME', 'Name');
+define('_MD_PUBLISHER_NEED_CATEGORY_ITEM', 'To create an article, you must have appropriate permission in at least one category.');
+define('_MD_PUBLISHER_NEXT_ITEM', 'Next article');
+define('_MD_PUBLISHER_NO', 'No');
+define('_MD_PUBLISHER_NO_CAT_EXISTS', 'Sorry, there&#8217s no category //defined as yet.<br />Please contact the site administrator and tell him about this.');
+define('_MD_PUBLISHER_NO_CAT_PERMISSIONS', "Sorry, you don't have sufficient permissions to access this area.");
+define('_MD_PUBLISHER_NO_TOP_PERMISSIONS', 'Sorry, there is no article to display.');
+define('_MD_PUBLISHER_NOCATEGORYSELECTED', 'You did not select a valid category!');
+define('_MD_PUBLISHER_NOITEMSELECTED', 'You did not select a valid article!');
+define('_MD_PUBLISHER_ON', 'on');
+define('_MD_PUBLISHER_OTHER_ITEMS', 'Other articles in this category');
+define('_MD_PUBLISHER_PAGE', 'Page');
+//define('_MD_PUBLISHER_PREVIEW','Preview');
+define('_MD_PUBLISHER_PREVIOUS_ITEM', 'Previous article');
+define('_MD_PUBLISHER_PRINTERFRIENDLY', 'Print this article in a printer friendly format');
+define('_MD_PUBLISHER_READS', 'reads');
+define('_MD_PUBLISHER_RSSFEED', 'RSS Feed');
+define('_MD_PUBLISHER_SENDSTORY', 'Send this article to a friend');
+define('_MD_PUBLISHER_SUB_CLONE', 'Dupplicate an article');
+define('_MD_PUBLISHER_SUB_SMNAME', 'Submit an article');
+define('_MD_PUBLISHER_SUB_SNEWNAME', 'Submit an article');
+define('_MD_PUBLISHER_SUBMIT', 'Submit an article');
+define('_MD_PUBLISHER_SUBMIT_ERROR', 'An error occurred. Your article was not submitted.');
+define('_MD_PUBLISHER_TOTAL_SMARTITEMS', 'Total articles');
+define('_MD_PUBLISHER_UPLOAD', 'Upload');
+//define('_MD_PUBLISHER_UPLOAD_FILE','Upload a file');
+define('_MD_PUBLISHER_VIEW_MORE', 'Read the complete article');
+define('_MD_PUBLISHER_WHO_WHEN', 'Published by %s on %s');
+define('_MD_PUBLISHER_PRINT_CLOSE', 'Close this window');
 //added in publisher
-define("_MD_PUBLISHER_VOTE_BAD", "Bad vote, please try again!");
-define("_MD_PUBLISHER_VOTE_ALREADY", "Sorry, you already voted this item!");
-define("_MD_PUBLISHER_VOTE_THANKS", "Thanks for your vote!");
-define("_MD_PUBLISHER_VOTE_lVOTE", "vote");
-define("_MD_PUBLISHER_VOTE_lVOTES", "votes");
-define("_MD_PUBLISHER_VOTE_RATING", "Rating");
-define("_MD_PUBLISHER_VOTE_DISABLE", "Votes are disable!");
-define("_MD_PUBLISHER_VOTE_OUTOF", "out of");
-define("_MD_PUBLISHER_ITEMS_SAME_AUTHOR", "Items by the same author");
-define("_MD_PUBLISHER_TOTAL_ITEMS", "Total items: ");
-define("_MD_PUBLISHER_TOTAL_HITS", "Total hits: ");
-define("_MD_PUBLISHER_NO_AUTHOR_ITEMS", "There is no items by this author");
-define("_MD_PUBLISHER_ARCHIVES", "Article Archives");
-define("_MD_PUBLISHER_ACTIONS", "Actions");
-define("_MD_PUBLISHER_PREVIOUSIMG", "Previous image");
-define("_MD_PUBLISHER_NEXTIMG", "Next Image");
-define("_MD_PUBLISHER_CLOSE", "Close");
-define("_MD_PUBLISHER_ENLARGEIMG", "Enlarge");
-define("_MD_PUBLISHER_OF", " of ");
+define('_MD_PUBLISHER_VOTE_BAD', 'Bad vote, please try again!');
+define('_MD_PUBLISHER_VOTE_ALREADY', 'Sorry, you already voted this item!');
+define('_MD_PUBLISHER_VOTE_THANKS', 'Thanks for your vote!');
+define('_MD_PUBLISHER_VOTE_VOTE', 'vote');
+define('_MD_PUBLISHER_VOTE_VOTES', 'votes');
+define('_MD_PUBLISHER_VOTE_RATING', 'Rating');
+define('_MD_PUBLISHER_VOTE_DISABLE', 'Votes are disable!');
+define('_MD_PUBLISHER_VOTE_OUTOF', 'out of');
+define('_MD_PUBLISHER_ITEMS_SAME_AUTHOR', 'Items by the same author');
+define('_MD_PUBLISHER_TOTAL_ITEMS', 'Total items: ');
+define('_MD_PUBLISHER_TOTAL_HITS', 'Total hits: ');
+define('_MD_PUBLISHER_NO_AUTHOR_ITEMS', 'There is no items by this author');
+define('_MD_PUBLISHER_ARCHIVES', 'Article Archives');
+define('_MD_PUBLISHER_ACTIONS', 'Actions');
+define('_MD_PUBLISHER_PREVIOUSIMG', 'Previous image');
+define('_MD_PUBLISHER_NEXTIMG', 'Next Image');
+define('_MD_PUBLISHER_CLOSE', 'Close');
+define('_MD_PUBLISHER_ENLARGEIMG', 'Enlarge');
+define('_MD_PUBLISHER_OF', ' of ');
diff --git a/publisher/language/english/modinfo.php b/publisher/language/english/modinfo.php
index d666ae93..7f6b88ca 100644
--- a/publisher/language/english/modinfo.php
+++ b/publisher/language/english/modinfo.php
@@ -1,320 +1,324 @@
 <?php
-define("_MI_PUBLISHER_ADMENU1", "Summary");
-define("_MI_PUBLISHER_ADMENU2", "Categories");
-define("_MI_PUBLISHER_ADMENU3", "Articles");
-define("_MI_PUBLISHER_ADMENU4", "Permissions");
-define("_MI_PUBLISHER_ADMENU6", "Mime types");
-define("_MI_PUBLISHER_ADMINHITS", "Admin counter reads?");
-define("_MI_PUBLISHER_ADMINHITSDSC", "Allow administrator hits for the counter stats?");
-define("_MI_PUBLISHER_ALLOWSUBMIT", "User submissions?");
-define("_MI_PUBLISHER_ALLOWSUBMITDSC", "Allow users to submit articles on your website?");
-define("_MI_PUBLISHER_ANONPOST", "Allow anonymous posting?");
-define("_MI_PUBLISHER_ANONPOSTDSC", "Allow anonymous users to submit articles?");
-define("_MI_PUBLISHER_AUTHOR_INFO", "Developers");
-define("_MI_PUBLISHER_AUTHOR_WORD", "The Author's Word");
-define("_MI_PUBLISHER_AUTOAPP", "Auto approve submitted articles?");
-define("_MI_PUBLISHER_AUTOAPPDSC", "Auto approves submitted articles without admin intervention?");
-define("_MI_PUBLISHER_BCRUMB", "Show the module name in the breadcrumb?");
-define("_MI_PUBLISHER_BCRUMBDSC", "If you select “Yes”, the breadcrumb will show \"Publisher > category name > article name\". <br>Otherwise, only \"category name > article name\" will be shown.");
-define("_MI_PUBLISHER_BOTH_FOOTERS", "Both footers");
-define("_MI_PUBLISHER_BY", "by");
-define("_MI_PUBLISHER_CATEGORY_ITEM_NOTIFY", "Category Items");
-define("_MI_PUBLISHER_CATEGORY_ITEM_NOTIFY_DSC", "Notification options that apply to the current category.");
-define("_MI_PUBLISHER_CATEGORY_ITEM_PUBLISHED_NOTIFY", "New article published");
-define("_MI_PUBLISHER_CATEGORY_ITEM_PUBLISHED_NOTIFY_CAP", "Notify me when a new article is published in the current category.");
-define("_MI_PUBLISHER_CATEGORY_ITEM_PUBLISHED_NOTIFY_DSC", "Receive notification when a new article is published in the current category.");
-define("_MI_PUBLISHER_CATEGORY_ITEM_PUBLISHED_NOTIFY_SBJ", "[{X_SITENAME}] {X_MODULE} auto-notify: New article published in category");
-define("_MI_PUBLISHER_CATEGORY_ITEM_SUBMITTED_NOTIFY", "'Article submitted");
-define("_MI_PUBLISHER_CATEGORY_ITEM_SUBMITTED_NOTIFY_CAP", "Notify me when a new article is submitted in the current category.");
-define("_MI_PUBLISHER_CATEGORY_ITEM_SUBMITTED_NOTIFY_DSC", "Receive notification when a new article is submitted in the current category.");
-define("_MI_PUBLISHER_CATEGORY_ITEM_SUBMITTED_NOTIFY_SBJ", "[{X_SITENAME}] {X_MODULE} auto-notify: New article submitted in category");
-define("_MI_PUBLISHER_CATLIST_IMG_W", "Category list image width");
-define("_MI_PUBLISHER_CATLIST_IMG_WDSC", "Specify the width of category images when listing the categories.");
-define("_MI_PUBLISHER_CATMAINIMG_W", "Category main image width");
-define("_MI_PUBLISHER_CATMAINIMG_WDSC", "Specify the width of the category main image.");
-define("_MI_PUBLISHER_CATPERPAGE", "Maximum Categories per page (User side)?");
-define("_MI_PUBLISHER_CATPERPAGEDSC", "Maximum number of top categories per page to be displayed at once in the user side?");
-define("_MI_PUBLISHER_CLONE", "Allow article duplication?");
-define("_MI_PUBLISHER_CLONEDSC", "Select “Yes” to allow users with appropriate permissions to duplicate an article.");
-define("_MI_PUBLISHER_COLLHEAD", "Display the collapsible bar?");
-define("_MI_PUBLISHER_COLLHEADDSC", "If you set this option to “Yes”, the categories summary will be displayed in a collapsible bar as well as the articles. If you set this option to “No”, the collapsible bar will not be displayed.");
-define("_MI_PUBLISHER_COMMENTS", "Control comments at the article level?");
-define("_MI_PUBLISHER_COMMENTSDSC", "if you set this option to “Yes”, you will see comments only on those items that have their comment checkbox marked. <br /><br />Select “No” to have comments managed at the global level (look below under the tag 'Comment rules'.");
-define("_MI_PUBLISHER_DATEFORMAT", "Date format:");
-define("_MI_PUBLISHER_DATEFORMATDSC", "Select a display style. Example: \"d-M-Y H:i\" translates to \"30-Mar-2004 22:35\"<br /><a href='http://jp.php.net/date'>Refer to the PHP manual for more display options.</a>");
-define("_MI_PUBLISHER_DEMO_SITE", "SmartFactory Demo Site");
-define("_MI_PUBLISHER_DEVELOPER_CONTRIBUTOR", "Contributor(s)");
-define("_MI_PUBLISHER_DEVELOPER_CREDITS", "Credits");
-define("_MI_PUBLISHER_DEVELOPER_EMAIL", "Email");
-define("_MI_PUBLISHER_DEVELOPER_LEAD", "Lead developer(s)");
-define("_MI_PUBLISHER_DEVELOPER_WEBSITE", "Website");
-define("_MI_PUBLISHER_DISCOM", "Display comment count?");
-define("_MI_PUBLISHER_DISCOMDSC", "Set to “Yes” to display the comments count in the individual article.");
-define("_MI_PUBLISHER_DISDATECOL", "Display the 'Published on' column?");
-define("_MI_PUBLISHER_DISDATECOLDSC", "When the 'Summary' display type is selected, select “Yes” to display a “Published on” date in the items table on the index and category page.");
-define("_MI_PUBLISHER_DCS", "Display the category summary?");
-define("_MI_PUBLISHER_DCS_DSC", "Select “No” to not display the category summary on a category page that has no subcategories.");
-define("_MI_PUBLISHER_DISPLAYTYPE_FULL", "Full View");
-define("_MI_PUBLISHER_DISPLAYTYPE_LIST", "Bullet list");
-define("_MI_PUBLISHER_DISPLAYTYPE_WFSECTION", "WFSection style");
-define("_MI_PUBLISHER_DISPLAYTYPE_SUMMARY", "Summary View");
-define("_MI_PUBLISHER_DISSBCATDSC", "Display sub-categories description?");
-define("_MI_PUBLISHER_DISSBCATDSCDSC", "Select “Yes” to display the description of sub-categories in the index and category page.");
-define("_MI_PUBLISHER_DISTYPE", "Articles display type:");
-define("_MI_PUBLISHER_DISTYPEDSC", "if “Summary View” is selected, only the Title, Date and Hits of each item will be displayed in a selected category. If “Full View” is selected, each article will be fully displayed in a selected category.");
-define("_MI_PUBLISHER_FOOTERPRINT", "Print page footer");
-define("_MI_PUBLISHER_FOOTERPRINTDSC", "Footer that will be printed for each article");
-define("_MI_PUBLISHER_GLOBAL_ITEM_CATEGORY_CREATED_NOTIFY", "New category");
-define("_MI_PUBLISHER_GLOBAL_ITEM_CATEGORY_CREATED_NOTIFY_CAP", "Notify me when a new category is created.");
-define("_MI_PUBLISHER_GLOBAL_ITEM_CATEGORY_CREATED_NOTIFY_DSC", "Receive notification when a new category is created.");
-define("_MI_PUBLISHER_GLOBAL_ITEM_CATEGORY_CREATED_NOTIFY_SBJ", "[{X_SITENAME}] {X_MODULE} auto-notify: New category");
-define("_MI_PUBLISHER_GLOBAL_ITEM_NOTIFY", "Global Articles");
-define("_MI_PUBLISHER_GLOBAL_ITEM_NOTIFY_DSC", "Notification options that apply to all articles.");
-define("_MI_PUBLISHER_GLOBAL_ITEM_PUBLISHED_NOTIFY", "New article published");
-define("_MI_PUBLISHER_GLOBAL_ITEM_PUBLISHED_NOTIFY_CAP", "Notify me when any new article is published.");
-define("_MI_PUBLISHER_GLOBAL_ITEM_PUBLISHED_NOTIFY_DSC", "Receive notification when any new article is published.");
-define("_MI_PUBLISHER_GLOBAL_ITEM_PUBLISHED_NOTIFY_SBJ", "[{X_SITENAME}] {X_MODULE} auto-notify: New article published");
-define("_MI_PUBLISHER_GLOBAL_ITEM_SUBMITTED_NOTIFY", "Article submitted");
-define("_MI_PUBLISHER_GLOBAL_ITEM_SUBMITTED_NOTIFY_CAP", "Notify me when any article is submitted and is awaiting approval.");
-define("_MI_PUBLISHER_GLOBAL_ITEM_SUBMITTED_NOTIFY_DSC", "Receive notification when any article is submitted and is waiting approval.");
-define("_MI_PUBLISHER_GLOBAL_ITEM_SUBMITTED_NOTIFY_SBJ", "[{X_SITENAME}] {X_MODULE} auto-notify: New article submitted");
-define("_MI_PUBLISHER_HEADERPRINT", "Print page header");
-define("_MI_PUBLISHER_HEADERPRINTDSC", "Header that will be printed for each article");
-define("_MI_PUBLISHER_HITSCOL", "Display the “Hits” column?");
-define("_MI_PUBLISHER_HITSCOLDSC", "When the “Summary” display type is selected, select “Yes” to display the “Hits” column in the items table on the index and category page.");
-define("_MI_PUBLISHER_HLCOLOR", "Highlight color for keywords");
-define("_MI_PUBLISHER_HLCOLORDSC", "Color of the keywords highlighting for the search function.");
-define("_MI_PUBLISHER_IMAGENAV", "Use the image Page Navigation:");
-define("_MI_PUBLISHER_IMAGENAVDSC", "If you set this option to “Yes”, the Page Navigation will be displayed with images, otherwise, the original Page Naviagation will be used.");
-define("_MI_PUBLISHER_INDEXFOOTER", "Index Footer");
-define("_MI_PUBLISHER_INDEXFOOTER_SEL", "Index Footer");
-define("_MI_PUBLISHER_INDEXFOOTERDSC", "Footer that will be displayed at the index page of the module.");
-define("_MI_PUBLISHER_INDEXMSG", "Index page welcome message:");
-define("_MI_PUBLISHER_INDEXMSGDEF", "");
-define("_MI_PUBLISHER_INDEXMSGDSC", "Welcome message to be displayed in the index page of the module.");
-define("_MI_PUBLISHER_ITEM_APPROVED_NOTIFY", "Article approved");
-define("_MI_PUBLISHER_ITEM_APPROVED_NOTIFY_CAP", "Notify me when this article is approved.");
-define("_MI_PUBLISHER_ITEM_APPROVED_NOTIFY_DSC", "Receive notification when this article is approved.");
-define("_MI_PUBLISHER_ITEM_APPROVED_NOTIFY_SBJ", "[{X_SITENAME}] {X_MODULE} auto-notify: article approved");
-define("_MI_PUBLISHER_ITEM_NOTIFY", "Article");
-define("_MI_PUBLISHER_ITEM_NOTIFY_DSC", "Notification options that apply to the current article.");
-define("_MI_PUBLISHER_ITEM_REJECTED_NOTIFY", "Article rejected");
-define("_MI_PUBLISHER_ITEM_REJECTED_NOTIFY_CAP", "Notify me if this article is rejected.");
-define("_MI_PUBLISHER_ITEM_REJECTED_NOTIFY_DSC", "Receive notification if this article is rejected.");
-define("_MI_PUBLISHER_ITEM_REJECTED_NOTIFY_SBJ", "[{X_SITENAME}] {X_MODULE} auto-notify: article rejected");
-define("_MI_PUBLISHER_ITEMFOOTER", "Item footer");
-define("_MI_PUBLISHER_ITEMFOOTER_SEL", "Item footer");
-define("_MI_PUBLISHER_ITEMFOOTERDSC", "Footer that will be displayed for each article.");
-define("_MI_PUBLISHER_ITEMSMENU", "Categories Menu block");
+define('_MI_PUBLISHER_ADMENU1', 'Summary');
+define('_MI_PUBLISHER_ADMENU2', 'Categories');
+define('_MI_PUBLISHER_ADMENU3', 'Articles');
+define('_MI_PUBLISHER_ADMENU4', 'Permissions');
+define('_MI_PUBLISHER_ADMENU6', 'Mime types');
+define('_MI_PUBLISHER_ADMINHITS', 'Admin counter reads?');
+define('_MI_PUBLISHER_ADMINHITSDSC', 'Allow administrator hits for the counter stats?');
+define('_MI_PUBLISHER_ALLOWSUBMIT', 'User submissions?');
+define('_MI_PUBLISHER_ALLOWSUBMITDSC', 'Allow users to submit articles on your website?');
+define('_MI_PUBLISHER_ANONPOST', 'Allow anonymous posting?');
+define('_MI_PUBLISHER_ANONPOSTDSC', 'Allow anonymous users to submit articles?');
+define('_MI_PUBLISHER_AUTHOR_INFO', 'Developers');
+define('_MI_PUBLISHER_AUTHOR_WORD', 'The Author\'s Word');
+define('_MI_PUBLISHER_AUTOAPP', 'Auto approve submitted articles?');
+define('_MI_PUBLISHER_AUTOAPPDSC', 'Auto approves submitted articles without admin intervention?');
+define('_MI_PUBLISHER_BCRUMB', 'Show the module name in the breadcrumb?');
+define('_MI_PUBLISHER_BCRUMBDSC', "If you select “Yes”, the breadcrumb will show 'Publisher > category name > article name'. <br>Otherwise, only 'category name > article name' will be shown.");
+define('_MI_PUBLISHER_BOTH_FOOTERS', 'Both footers');
+define('_MI_PUBLISHER_BY', 'by');
+define('_MI_PUBLISHER_CATEGORY_ITEM_NOTIFY', 'Category Items');
+define('_MI_PUBLISHER_CATEGORY_ITEM_NOTIFY_DSC', 'Notification options that apply to the current category.');
+define('_MI_PUBLISHER_CATEGORY_ITEM_PUBLISHED_NOTIFY', 'New article published');
+define('_MI_PUBLISHER_CATEGORY_ITEM_PUBLISHED_NOTIFY_CAP', 'Notify me when a new article is published in the current category.');
+define('_MI_PUBLISHER_CATEGORY_ITEM_PUBLISHED_NOTIFY_DSC', 'Receive notification when a new article is published in the current category.');
+define('_MI_PUBLISHER_CATEGORY_ITEM_PUBLISHED_NOTIFY_SBJ', '[{X_SITENAME}] {X_MODULE} auto-notify: New article published in category');
+define('_MI_PUBLISHER_CATEGORY_ITEM_SUBMITTED_NOTIFY', 'Article submitted');
+define('_MI_PUBLISHER_CATEGORY_ITEM_SUBMITTED_NOTIFY_CAP', 'Notify me when a new article is submitted in the current category.');
+define('_MI_PUBLISHER_CATEGORY_ITEM_SUBMITTED_NOTIFY_DSC', 'Receive notification when a new article is submitted in the current category.');
+define('_MI_PUBLISHER_CATEGORY_ITEM_SUBMITTED_NOTIFY_SBJ', '[{X_SITENAME}] {X_MODULE} auto-notify: New article submitted in category');
+define('_MI_PUBLISHER_CATLIST_IMG_W', 'Category list image width');
+define('_MI_PUBLISHER_CATLIST_IMG_WDSC', 'Specify the width of category images when listing the categories.');
+define('_MI_PUBLISHER_CATMAINIMG_W', 'Category main image width');
+define('_MI_PUBLISHER_CATMAINIMG_WDSC', 'Specify the width of the category main image.');
+define('_MI_PUBLISHER_CATPERPAGE', 'Maximum Categories per page (User side)?');
+define('_MI_PUBLISHER_CATPERPAGEDSC', 'Maximum number of top categories per page to be displayed at once in the user side?');
+define('_MI_PUBLISHER_CLONE', 'Allow article duplication?');
+define('_MI_PUBLISHER_CLONEDSC', 'Select “Yes” to allow users with appropriate permissions to duplicate an article.');
+define('_MI_PUBLISHER_COLLHEAD', 'Display the collapsible bar?');
+define('_MI_PUBLISHER_COLLHEADDSC', 'If you set this option to “Yes”, the categories summary will be displayed in a collapsible bar as well as the articles. If you set this option to “No”, the collapsible bar will not be displayed.');
+define('_MI_PUBLISHER_COMMENTS', 'Control comments at the article level?');
+define('_MI_PUBLISHER_COMMENTSDSC', 'if you set this option to “Yes”, you will see comments only on those items that have their comment checkbox marked. <br /><br />Select “No” to have comments managed at the global level (look below under the tag \'Comment rules\'.');
+define('_MI_PUBLISHER_DATEFORMAT', 'Date format:');
+define('_MI_PUBLISHER_DATEFORMATDSC', "Select a display style. Example: 'd-M-Y H:i' translates to '30-Mar-2004 22:35'<br /><a href=\'http://jp.php.net/date\'>Refer to the PHP manual for more display options.</a>");
+define('_MI_PUBLISHER_DEMO_SITE', 'SmartFactory Demo Site');
+define('_MI_PUBLISHER_DEVELOPER_CONTRIBUTOR', 'Contributor(s)');
+define('_MI_PUBLISHER_DEVELOPER_CREDITS', 'Credits');
+define('_MI_PUBLISHER_DEVELOPER_EMAIL', 'Email');
+define('_MI_PUBLISHER_DEVELOPER_LEAD', 'Lead developer(s)');
+define('_MI_PUBLISHER_DEVELOPER_WEBSITE', 'Website');
+define('_MI_PUBLISHER_DISCOM', 'Display comment count?');
+define('_MI_PUBLISHER_DISCOMDSC', 'Set to “Yes” to display the comments count in the individual article.');
+define('_MI_PUBLISHER_DISDATECOL', 'Display the \'Published on\' column?');
+define('_MI_PUBLISHER_DISDATECOLDSC', 'When the \'Summary\' display type is selected, select “Yes” to display a “Published on” date in the items table on the index and category page.');
+define('_MI_PUBLISHER_DCS', 'Display the category summary?');
+define('_MI_PUBLISHER_DCS_DSC', 'Select “No” to not display the category summary on a category page that has no subcategories.');
+define('_MI_PUBLISHER_DISPLAYTYPE_FULL', 'Full View');
+define('_MI_PUBLISHER_DISPLAYTYPE_LIST', 'Bullet list');
+define('_MI_PUBLISHER_DISPLAYTYPE_WFSECTION', 'WFSection style');
+define('_MI_PUBLISHER_DISPLAYTYPE_SUMMARY', 'Summary View');
+define('_MI_PUBLISHER_DISSBCATDSC', 'Display sub-categories description?');
+define('_MI_PUBLISHER_DISSBCATDSCDSC', 'Select “Yes” to display the description of sub-categories in the index and category page.');
+define('_MI_PUBLISHER_DISTYPE', 'Articles display type:');
+define('_MI_PUBLISHER_DISTYPEDSC', 'if “Summary View” is selected, only the Title, Date and Hits of each item will be displayed in a selected category. If “Full View” is selected, each article will be fully displayed in a selected category.');
+define('_MI_PUBLISHER_FOOTERPRINT', 'Print page footer');
+define('_MI_PUBLISHER_FOOTERPRINTDSC', 'Footer that will be printed for each article');
+define('_MI_PUBLISHER_GLOBAL_ITEM_CATEGORY_CREATED_NOTIFY', 'New category');
+define('_MI_PUBLISHER_GLOBAL_ITEM_CATEGORY_CREATED_NOTIFY_CAP', 'Notify me when a new category is created.');
+define('_MI_PUBLISHER_GLOBAL_ITEM_CATEGORY_CREATED_NOTIFY_DSC', 'Receive notification when a new category is created.');
+define('_MI_PUBLISHER_GLOBAL_ITEM_CATEGORY_CREATED_NOTIFY_SBJ', '[{X_SITENAME}] {X_MODULE} auto-notify: New category');
+define('_MI_PUBLISHER_GLOBAL_ITEM_NOTIFY', 'Global Articles');
+define('_MI_PUBLISHER_GLOBAL_ITEM_NOTIFY_DSC', 'Notification options that apply to all articles.');
+define('_MI_PUBLISHER_GLOBAL_ITEM_PUBLISHED_NOTIFY', 'New article published');
+define('_MI_PUBLISHER_GLOBAL_ITEM_PUBLISHED_NOTIFY_CAP', 'Notify me when any new article is published.');
+define('_MI_PUBLISHER_GLOBAL_ITEM_PUBLISHED_NOTIFY_DSC', 'Receive notification when any new article is published.');
+define('_MI_PUBLISHER_GLOBAL_ITEM_PUBLISHED_NOTIFY_SBJ', '[{X_SITENAME}] {X_MODULE} auto-notify: New article published');
+define('_MI_PUBLISHER_GLOBAL_ITEM_SUBMITTED_NOTIFY', 'Article submitted');
+define('_MI_PUBLISHER_GLOBAL_ITEM_SUBMITTED_NOTIFY_CAP', 'Notify me when any article is submitted and is awaiting approval.');
+define('_MI_PUBLISHER_GLOBAL_ITEM_SUBMITTED_NOTIFY_DSC', 'Receive notification when any article is submitted and is waiting approval.');
+define('_MI_PUBLISHER_GLOBAL_ITEM_SUBMITTED_NOTIFY_SBJ', '[{X_SITENAME}] {X_MODULE} auto-notify: New article submitted');
+define('_MI_PUBLISHER_HEADERPRINT', 'Print page header');
+define('_MI_PUBLISHER_HEADERPRINTDSC', 'Header that will be printed for each article');
+define('_MI_PUBLISHER_HITSCOL', 'Display the “Hits” column?');
+define('_MI_PUBLISHER_HITSCOLDSC', 'When the “Summary” display type is selected, select “Yes” to display the “Hits” column in the items table on the index and category page.');
+define('_MI_PUBLISHER_HLCOLOR', 'Highlight color for keywords');
+define('_MI_PUBLISHER_HLCOLORDSC', 'Color of the keywords highlighting for the search function.');
+define('_MI_PUBLISHER_IMAGENAV', 'Use the image Page Navigation:');
+define('_MI_PUBLISHER_IMAGENAVDSC', 'If you set this option to “Yes”, the Page Navigation will be displayed with images, otherwise, the original Page Naviagation will be used.');
+define('_MI_PUBLISHER_INDEXFOOTER', 'Index Footer');
+define('_MI_PUBLISHER_INDEXFOOTER_SEL', 'Index Footer');
+define('_MI_PUBLISHER_INDEXFOOTERDSC', 'Footer that will be displayed at the index page of the module.');
+define('_MI_PUBLISHER_INDEXMSG', 'Index page welcome message:');
+define('_MI_PUBLISHER_INDEXMSGDEF', '');
+define('_MI_PUBLISHER_INDEXMSGDSC', 'Welcome message to be displayed in the index page of the module.');
+define('_MI_PUBLISHER_ITEM_APPROVED_NOTIFY', 'Article approved');
+define('_MI_PUBLISHER_ITEM_APPROVED_NOTIFY_CAP', 'Notify me when this article is approved.');
+define('_MI_PUBLISHER_ITEM_APPROVED_NOTIFY_DSC', 'Receive notification when this article is approved.');
+define('_MI_PUBLISHER_ITEM_APPROVED_NOTIFY_SBJ', '[{X_SITENAME}] {X_MODULE} auto-notify: article approved');
+define('_MI_PUBLISHER_ITEM_NOTIFY', 'Article');
+define('_MI_PUBLISHER_ITEM_NOTIFY_DSC', 'Notification options that apply to the current article.');
+define('_MI_PUBLISHER_ITEM_REJECTED_NOTIFY', 'Article rejected');
+define('_MI_PUBLISHER_ITEM_REJECTED_NOTIFY_CAP', 'Notify me if this article is rejected.');
+define('_MI_PUBLISHER_ITEM_REJECTED_NOTIFY_DSC', 'Receive notification if this article is rejected.');
+define('_MI_PUBLISHER_ITEM_REJECTED_NOTIFY_SBJ', '[{X_SITENAME}] {X_MODULE} auto-notify: article rejected');
+define('_MI_PUBLISHER_ITEMFOOTER', 'Item footer');
+define('_MI_PUBLISHER_ITEMFOOTER_SEL', 'Item footer');
+define('_MI_PUBLISHER_ITEMFOOTERDSC', 'Footer that will be displayed for each article.');
+define('_MI_PUBLISHER_ITEMSMENU', 'Categories Menu block');
 //bd tree block hack
-define("_MI_PUBLISHER_ITEMSTREE", "Tree block");
+define('_MI_PUBLISHER_ITEMSTREE', 'Tree block');
 //--/bd
-define("_MI_PUBLISHER_ITEMSNEW", "Recent items List");
-define("_MI_PUBLISHER_ITEMSPOT", "In the Spotlight!");
-define("_MI_PUBLISHER_ITEMSRANDOM_ITEM", "Random item!");
-define("_MI_PUBLISHER_LASTITEM", "Display last item column?");
-define("_MI_PUBLISHER_LASTITEMDSC", "Select “Yes” to display the last item in each category in the index and category page.");
-define("_MI_PUBLISHER_LASTITEMS", "Display the list of newly published articles?");
-define("_MI_PUBLISHER_LASTITEMSDSC", "Select “Yes” to have the list at the bottom of the first page of the module.");
-define("_MI_PUBLISHER_LASTITSIZE", "Last item size:");
-define("_MI_PUBLISHER_LASTITSIZEDSC", "Set the maximum size of the title in the Last item column.");
-define("_MI_PUBLISHER_LINKPATH", "Enable links on the current path:");
-define("_MI_PUBLISHER_LINKPATHDSC", "This option allows the user back-track by clicking on an element of the current path displayed on the top of the page.");
-define("_MI_PUBLISHER_MAX_HEIGHT", "Maximum uploaded image height");
-define("_MI_PUBLISHER_MAX_HEIGHTDSC", "Maximum height of an image file that can be uploaded.");
-define("_MI_PUBLISHER_MAX_SIZE", "Maximum file size");
-define("_MI_PUBLISHER_MAX_SIZEDSC", "Maximum size (in bytes) of a file that can be uploaded.");
-define("_MI_PUBLISHER_MAX_WIDTH", "Maximum uploaded image width");
-define("_MI_PUBLISHER_MAX_WIDTHDSC", "Maximum width of an image file that can be uploaded.");
-define("_MI_PUBLISHER_MD_DESC", "Publishing Solution for your XOOPS Site");
-define("_MI_PUBLISHER_MD_NAME", "Publisher");
-define("_MI_PUBLISHER_MODULE_BUG", "Report a bug for this module");
-define("_MI_PUBLISHER_MODULE_DEMO", "Demo Site");
-define("_MI_PUBLISHER_MODULE_DISCLAIMER", "Disclaimer");
-define("_MI_PUBLISHER_MODULE_FEATURE", "Suggest a new feature for this module");
-define("_MI_PUBLISHER_MODULE_INFO", "Module Development details");
-define("_MI_PUBLISHER_MODULE_RELEASE_DATE", "Release date");
-define("_MI_PUBLISHER_MODULE_STATUS", "Status");
-define("_MI_PUBLISHER_MODULE_SUBMIT_BUG", "Submit a bug");
-define("_MI_PUBLISHER_MODULE_SUBMIT_FEATURE", "Submit a feature request");
-define("_MI_PUBLISHER_MODULE_SUPPORT", "Official support site");
-define("_MI_PUBLISHER_NO_FOOTERS", "None");
-define("_MI_PUBLISHER_ORDERBY", "Sort order");
-define("_MI_PUBLISHER_ORDERBY_DATE", "Date DESC");
-define("_MI_PUBLISHER_ORDERBY_TITLE", "Title ASC");
-define("_MI_PUBLISHER_ORDERBY_WEIGHT", "Weight ASC");
-define("_MI_PUBLISHER_ORDERBYDSC", "Select the sort order of the items throughout the module.");
-define("_MI_PUBLISHER_OTHER_ITEMS_TYPE_ALL", "All articles");
-define("_MI_PUBLISHER_OTHER_ITEMS_TYPE_NONE", "None");
-define("_MI_PUBLISHER_OTHER_ITEMS_TYPE_PREVIOUS_NEXT", "Previous and next article");
-define("_MI_PUBLISHER_OTHERITEMS", "Other articles display type");
-define("_MI_PUBLISHER_OTHERITEMSDSC", "Select how you would like to display the other articles of the category in the article page.");
-define("_MI_PUBLISHER_PERPAGE", "Maximum articles per page (Admin side):");
-define("_MI_PUBLISHER_PERPAGEDSC", "Maximum number of articles per page to be displayed at once in the admin side.");
-define("_MI_PUBLISHER_PERPAGEINDEX", "Maximum articles per page (User side):");
-define("_MI_PUBLISHER_PERPAGEINDEXDSC", "Maximum number of articles per page to be displayed together in the user side.");
-define("_MI_PUBLISHER_PRINTLOGOURL", "Logo print URL");
-define("_MI_PUBLISHER_PRINTLOGOURLDSC", "URL of the logo that will be printed at the top of the page.");
-define("_MI_PUBLISHER_RECENTITEMS", "Recent items (Detail)");
-define("_MI_PUBLISHER_SHOW_RSS", "Show link for RSS feed");
-define("_MI_PUBLISHER_SHOW_RSSDSC", "");
-define("_MI_PUBLISHER_SHOW_SUBCATS", "Display sub categories");
-define("_MI_PUBLISHER_SHOW_SUBCATS_ALL", "Display all subcategories");
-define("_MI_PUBLISHER_SHOW_SUBCATS_DSC", "Select if you want to display the subcategories in the categories list of the index and category page of the module.");
-define("_MI_PUBLISHER_SHOW_SUBCATS_NO", "Do not display sub-categories");
-define("_MI_PUBLISHER_SHOW_SUBCATS_NOMAIN", "Do not display sub-categories in index page, just in category page");
-define("_MI_PUBLISHER_SHOW_SUBCATS_NOTEMPTY", "Display non empty subcategories");
-define("_MI_PUBLISHER_SUB_SMNAME1", "Submit an article");
-define("_MI_PUBLISHER_SUBMITMSG", "Submit page intro message:");
-define("_MI_PUBLISHER_SUBMITMSGDEF", "");
-define("_MI_PUBLISHER_SUBMITMSGDSC", "Intro message to be displayed in the submit page of the module.");
-define("_MI_PUBLISHER_TITLE_SIZE", "Title size:");
-define("_MI_PUBLISHER_TITLE_SIZEDSC", "Set the maximum size of the title in the single item display page.");
-define("_MI_PUBLISHER_UPLOAD", "User file upload?");
-define("_MI_PUBLISHER_UPLOADDSC", "Allow users to upload files linked to articles on your website?");
-define("_MI_PUBLISHER_USEREALNAME", "Use the Real Name of users");
-define("_MI_PUBLISHER_USEREALNAMEDSC", "When displaying a username, use the real name of that user if he has a set his real name.");
-define("_MI_PUBLISHER_VERSION_HISTORY", "Version History");
-define("_MI_PUBLISHER_WELCOME", "Display the welcome title and message:");
-define("_MI_PUBLISHER_WELCOMEDSC", "If this option is set to “Yes”, the module index page will display the title “Welcome in the Publisher of...”, followed by the welcome message defined below. If this option is set to “No”, none of these lines will be displayed.");
-define("_MI_PUBLISHER_WHOWHEN", "Display the poster and date?");
-define("_MI_PUBLISHER_WHOWHENDSC", "Set to “Yes” to display the poster and date information in the individual article.");
-define("_MI_PUBLISHER_PV_TEXT", "Partial view message");
-define("_MI_PUBLISHER_PV_TEXTDSC", "Message for articles that allow only partial view.");
-define("_MI_PUBLISHER_PV_TEXT_DEF", "To view the complete article, you must register.");
-define("_MI_PUBLISHER_SEOMODNAME", "URL Rewriting module name");
-define("_MI_PUBLISHER_SEOMODNAMEDSC", "If URL Rewriting is enabled for the module, this is the name of the module that will be used. For example: http://yoursite.com/publisher/...");
-define("_MI_PUBLISHER_ARTCOUNT", "Display articles count");
-define("_MI_PUBLISHER_ARTCOUNTDSC", "Select “Yes” to display the article count within each category in the category summary table. Please note that the module currently only counts articles within each category and does not count within subcategories.");
-define("_MI_PUBLISHER_LATESTFILES", "Latest uploaded files");
-define("_MI_PUBLISHER_PATHSEARCH", "Display category path in search results");
-define("_MI_PUBLISHER_PATHSEARCHDSC", "");
-define("_MI_PUBLISHER_DISPBREAD", "Display the breadcrumb");
-define("_MI_PUBLISHER_DISPBREADDSC", "Breadcrumb navigation displays the current page's context within the site structure.");
-define("_MI_PUBLISHER_DATE_TO_DATE", "Articles from date to date");
+define('_MI_PUBLISHER_ITEMSNEW', 'Recent items List');
+define('_MI_PUBLISHER_ITEMSPOT', 'In the Spotlight!');
+define('_MI_PUBLISHER_ITEMSRANDOM_ITEM', 'Random item!');
+define('_MI_PUBLISHER_LASTITEM', 'Display last item column?');
+define('_MI_PUBLISHER_LASTITEMDSC', 'Select “Yes” to display the last item in each category in the index and category page.');
+define('_MI_PUBLISHER_LASTITEMS', 'Display the list of newly published articles?');
+define('_MI_PUBLISHER_LASTITEMSDSC', 'Select “Yes” to have the list at the bottom of the first page of the module.');
+define('_MI_PUBLISHER_LASTITSIZE', 'Last item size:');
+define('_MI_PUBLISHER_LASTITSIZEDSC', 'Set the maximum size of the title in the Last item column.');
+define('_MI_PUBLISHER_LINKPATH', 'Enable links on the current path:');
+define('_MI_PUBLISHER_LINKPATHDSC', 'This option allows the user back-track by clicking on an element of the current path displayed on the top of the page.');
+define('_MI_PUBLISHER_MAX_HEIGHT', 'Maximum uploaded image height');
+define('_MI_PUBLISHER_MAX_HEIGHTDSC', 'Maximum height of an image file that can be uploaded.');
+define('_MI_PUBLISHER_MAX_SIZE', 'Maximum file size');
+define('_MI_PUBLISHER_MAX_SIZEDSC', 'Maximum size (in bytes) of a file that can be uploaded.');
+define('_MI_PUBLISHER_MAX_WIDTH', 'Maximum uploaded image width');
+define('_MI_PUBLISHER_MAX_WIDTHDSC', 'Maximum width of an image file that can be uploaded.');
+define('_MI_PUBLISHER_MD_DESC', 'Publishing Solution for your XOOPS Site');
+define('_MI_PUBLISHER_MD_NAME', 'Publisher');
+define('_MI_PUBLISHER_MODULE_BUG', 'Report a bug for this module');
+define('_MI_PUBLISHER_MODULE_DEMO', 'Demo Site');
+define('_MI_PUBLISHER_MODULE_DISCLAIMER', 'Disclaimer');
+define('_MI_PUBLISHER_MODULE_FEATURE', 'Suggest a new feature for this module');
+define('_MI_PUBLISHER_MODULE_INFO', 'Module Development details');
+define('_MI_PUBLISHER_MODULE_RELEASE_DATE', 'Release date');
+define('_MI_PUBLISHER_MODULE_STATUS', 'Status');
+define('_MI_PUBLISHER_MODULE_SUBMIT_BUG', 'Submit a bug');
+define('_MI_PUBLISHER_MODULE_SUBMIT_FEATURE', 'Submit a feature request');
+define('_MI_PUBLISHER_MODULE_SUPPORT', 'Official support site');
+define('_MI_PUBLISHER_NO_FOOTERS', 'None');
+define('_MI_PUBLISHER_ORDERBY', 'Sort order');
+define('_MI_PUBLISHER_ORDERBY_DATE', 'Date DESC');
+define('_MI_PUBLISHER_ORDERBY_TITLE', 'Title ASC');
+define('_MI_PUBLISHER_ORDERBY_WEIGHT', 'Weight ASC');
+define('_MI_PUBLISHER_ORDERBYDSC', 'Select the sort order of the items throughout the module.');
+define('_MI_PUBLISHER_OTHER_ITEMS_TYPE_ALL', 'All articles');
+define('_MI_PUBLISHER_OTHER_ITEMS_TYPE_NONE', 'None');
+define('_MI_PUBLISHER_OTHER_ITEMS_TYPE_PREVIOUS_NEXT', 'Previous and next article');
+define('_MI_PUBLISHER_OTHERITEMS', 'Other articles display type');
+define('_MI_PUBLISHER_OTHERITEMSDSC', 'Select how you would like to display the other articles of the category in the article page.');
+define('_MI_PUBLISHER_PERPAGE', 'Maximum articles per page (Admin side):');
+define('_MI_PUBLISHER_PERPAGEDSC', 'Maximum number of articles per page to be displayed at once in the admin side.');
+define('_MI_PUBLISHER_PERPAGEINDEX', 'Maximum articles per page (User side):');
+define('_MI_PUBLISHER_PERPAGEINDEXDSC', 'Maximum number of articles per page to be displayed together in the user side.');
+define('_MI_PUBLISHER_PRINTLOGOURL', 'Logo print URL');
+define('_MI_PUBLISHER_PRINTLOGOURLDSC', 'URL of the logo that will be printed at the top of the page.');
+define('_MI_PUBLISHER_RECENTITEMS', 'Recent items (Detail)');
+define('_MI_PUBLISHER_SHOW_RSS', 'Show link for RSS feed');
+define('_MI_PUBLISHER_SHOW_RSSDSC', '');
+define('_MI_PUBLISHER_SHOW_SUBCATS', 'Display sub categories');
+define('_MI_PUBLISHER_SHOW_SUBCATS_ALL', 'Display all subcategories');
+define('_MI_PUBLISHER_SHOW_SUBCATS_DSC', 'Select if you want to display the subcategories in the categories list of the index and category page of the module.');
+define('_MI_PUBLISHER_SHOW_SUBCATS_NO', 'Do not display sub-categories');
+define('_MI_PUBLISHER_SHOW_SUBCATS_NOMAIN', 'Do not display sub-categories in index page, just in category page');
+define('_MI_PUBLISHER_SHOW_SUBCATS_NOTEMPTY', 'Display non empty subcategories');
+define('_MI_PUBLISHER_SUB_SMNAME1', 'Submit an article');
+define('_MI_PUBLISHER_SUBMITMSG', 'Submit page intro message:');
+define('_MI_PUBLISHER_SUBMITMSGDEF', '');
+define('_MI_PUBLISHER_SUBMITMSGDSC', 'Intro message to be displayed in the submit page of the module.');
+define('_MI_PUBLISHER_TITLE_SIZE', 'Title size:');
+define('_MI_PUBLISHER_TITLE_SIZEDSC', 'Set the maximum size of the title in the single item display page.');
+define('_MI_PUBLISHER_UPLOAD', 'User file upload?');
+define('_MI_PUBLISHER_UPLOADDSC', 'Allow users to upload files linked to articles on your website?');
+define('_MI_PUBLISHER_USEREALNAME', 'Use the Real Name of users');
+define('_MI_PUBLISHER_USEREALNAMEDSC', 'When displaying a username, use the real name of that user if he has a set his real name.');
+define('_MI_PUBLISHER_VERSION_HISTORY', 'Version History');
+define('_MI_PUBLISHER_WELCOME', 'Display the welcome title and message:');
+define('_MI_PUBLISHER_WELCOMEDSC', 'If this option is set to “Yes”, the module index page will display the title “Welcome in the Publisher of...”, followed by the welcome message defined below. If this option is set to “No”, none of these lines will be displayed.');
+define('_MI_PUBLISHER_WHOWHEN', 'Display the poster and date?');
+define('_MI_PUBLISHER_WHOWHENDSC', 'Set to “Yes” to display the poster and date information in the individual article.');
+define('_MI_PUBLISHER_PV_TEXT', 'Partial view message');
+define('_MI_PUBLISHER_PV_TEXTDSC', 'Message for articles that allow only partial view.');
+define('_MI_PUBLISHER_PV_TEXT_DEF', 'To view the complete article, you must register.');
+define('_MI_PUBLISHER_SEOMODNAME', 'URL Rewriting module name');
+define('_MI_PUBLISHER_SEOMODNAMEDSC', 'If URL Rewriting is enabled for the module, this is the name of the module that will be used. For example: http://yoursite.com/publisher/...');
+define('_MI_PUBLISHER_ARTCOUNT', 'Display articles count');
+define('_MI_PUBLISHER_ARTCOUNTDSC', 'Select “Yes” to display the article count within each category in the category summary table. Please note that the module currently only counts articles within each category and does not count within subcategories.');
+define('_MI_PUBLISHER_LATESTFILES', 'Latest uploaded files');
+define('_MI_PUBLISHER_PATHSEARCH', 'Display category path in search results');
+define('_MI_PUBLISHER_PATHSEARCHDSC', '');
+define('_MI_PUBLISHER_DISPBREAD', 'Display the breadcrumb');
+define('_MI_PUBLISHER_DISPBREADDSC', 'Breadcrumb navigation displays the current page\'s context within the site structure.');
+define('_MI_PUBLISHER_DATE_TO_DATE', 'Articles from date to date');
 //added in publisher
-define("_MI_PUBLISHER_FORM_STATUS", "Select default status for submitted article");
-define("_MI_PUBLISHER_FORM_STATUS_DSC", "");
-define("_MI_PUBLISHER_PUBLISHED", "Published");
-define("_MI_PUBLISHER_OFFLINE", "Offline");
-define("_MI_PUBLISHER_SUBMITTED", "Submited");
-define("_MI_PUBLISHER_REJECTED", "Rejected");
-define("_MI_PUBLISHER_FORM_ALLOWCOMMENTS", "“Allow comments” set to TRUE");
-define("_MI_PUBLISHER_FORM_ALLOWCOMMENTS_DSC", "");
-define("_MI_PUBLISHER_FORM_DOHTML", "“Enable HTML tags” set to TRUE");
-define("_MI_PUBLISHER_FORM_DOHTML_DSC", "");
-define("_MI_PUBLISHER_FORM_DOSMILEY", "“Enable smiley icons” set to TRUE");
-define("_MI_PUBLISHER_FORM_DOSMILEY_DSC", "");
-define("_MI_PUBLISHER_FORM_DOXCODE", "“Enable XOOPS codes” set to TRUE");
-define("_MI_PUBLISHER_FORM_DOXCODE_DSC", "");
-define("_MI_PUBLISHER_FORM_DOIMAGE", "“Enable images” set to TRUE");
-define("_MI_PUBLISHER_FORM_DOIMAGE_DSC", "");
-define("_MI_PUBLISHER_FORM_DOBR", "“Enable line break” set to TRUE");
-define("_MI_PUBLISHER_FORM_DOBR_DSC", "");
-define("_MI_PUBLISHER_EDITOR", "Default editor type");
-define("_MI_PUBLISHER_EDITOR_DSC", "What kind of editor would you like to use by default? You can also allow submitters to choose editors in the permissions menu.");
-define("_MI_PUBLISHER_EDITOR_ROWS", "Editor number of rows");
-define("_MI_PUBLISHER_EDITOR_ROWS_DSC", "");
-define("_MI_PUBLISHER_EDITOR_COLS", "Editor number of columns");
-define("_MI_PUBLISHER_EDITOR_COLS_DSC", "");
-define("_MI_PUBLISHER_EDITOR_WIDTH", "Editor width");
-define("_MI_PUBLISHER_EDITOR_WIDTH_DSC", "");
-define("_MI_PUBLISHER_EDITOR_HEIGHT", "Editor height");
-define("_MI_PUBLISHER_EDITOR_HEIGHT_DSC", "");
+define('_MI_PUBLISHER_FORM_STATUS', 'Select default status for submitted article');
+define('_MI_PUBLISHER_FORM_STATUS_DSC', '');
+define('_MI_PUBLISHER_PUBLISHED', 'Published');
+define('_MI_PUBLISHER_OFFLINE', 'Offline');
+define('_MI_PUBLISHER_SUBMITTED', 'Submited');
+define('_MI_PUBLISHER_REJECTED', 'Rejected');
+define('_MI_PUBLISHER_FORM_ALLOWCOMMENTS', '“Allow comments” set to TRUE');
+define('_MI_PUBLISHER_FORM_ALLOWCOMMENTS_DSC', '');
+define('_MI_PUBLISHER_FORM_DOHTML', '“Enable HTML tags” set to TRUE');
+define('_MI_PUBLISHER_FORM_DOHTML_DSC', '');
+define('_MI_PUBLISHER_FORM_DOSMILEY', '“Enable smiley icons” set to TRUE');
+define('_MI_PUBLISHER_FORM_DOSMILEY_DSC', '');
+define('_MI_PUBLISHER_FORM_DOXCODE', '“Enable XOOPS codes” set to TRUE');
+define('_MI_PUBLISHER_FORM_DOXCODE_DSC', '');
+define('_MI_PUBLISHER_FORM_DOIMAGE', '“Enable images” set to TRUE');
+define('_MI_PUBLISHER_FORM_DOIMAGE_DSC', '');
+define('_MI_PUBLISHER_FORM_DOBR', '“Enable line break” set to TRUE');
+define('_MI_PUBLISHER_FORM_DOBR_DSC', '');
+define('_MI_PUBLISHER_EDITOR', 'Default editor type');
+define('_MI_PUBLISHER_EDITOR_DSC', 'What kind of editor would you like to use by default? You can also allow submitters to choose editors in the permissions menu.');
+define('_MI_PUBLISHER_EDITOR_ROWS', 'Editor number of rows');
+define('_MI_PUBLISHER_EDITOR_ROWS_DSC', '');
+define('_MI_PUBLISHER_EDITOR_COLS', 'Editor number of columns');
+define('_MI_PUBLISHER_EDITOR_COLS_DSC', '');
+define('_MI_PUBLISHER_EDITOR_WIDTH', 'Editor width');
+define('_MI_PUBLISHER_EDITOR_WIDTH_DSC', '');
+define('_MI_PUBLISHER_EDITOR_HEIGHT', 'Editor height');
+define('_MI_PUBLISHER_EDITOR_HEIGHT_DSC', '');
 //blocks descriptions
-define("_MI_PUBLISHER_ITEMSNEW_DSC", "Shows new items");
-define("_MI_PUBLISHER_RECENTITEMS_DSC", "Shows recent items");
-define("_MI_PUBLISHER_ITEMSPOT_DSC", "Shows last item");
-define("_MI_PUBLISHER_ITEMSRANDOM_ITEM_DSC", "Shows a random 'item' item");
-define("_MI_PUBLISHER_ITEMSMENU_DSC", "Menu displaying categories");
-define("_MI_PUBLISHER_LATESTFILES_DSC", "List of latest uploaded files");
-define("_MI_PUBLISHER_DATE_TO_DATE_DSC", "List article from a selected date to another");
-define("_MI_PUBLISHER_ITEMSTREE_DSC", "Display the category and items tree");
+define('_MI_PUBLISHER_ITEMSNEW_DSC', 'Shows new items');
+define('_MI_PUBLISHER_RECENTITEMS_DSC', 'Shows recent items');
+define('_MI_PUBLISHER_ITEMSPOT_DSC', 'Shows last item');
+define('_MI_PUBLISHER_ITEMSRANDOM_ITEM_DSC', 'Shows a random \'item\' item');
+define('_MI_PUBLISHER_ITEMSMENU_DSC', 'Menu displaying categories');
+define('_MI_PUBLISHER_LATESTFILES_DSC', 'List of latest uploaded files');
+define('_MI_PUBLISHER_DATE_TO_DATE_DSC', 'List article from a selected date to another');
+define('_MI_PUBLISHER_ITEMSTREE_DSC', 'Display the category and items tree');
 //templates descriptions
-define("_MI_PUBLISHER_HEADER_DSC", "Display header");
-define("_MI_PUBLISHER_FOOTER_DSC", "Display footer");
-define("_MI_PUBLISHER_SINGLEITEM_DSC", "Display a single item");
-define("_MI_PUBLISHER_CATEGORIES_TABLE_DSC", "Display the category list table used in other templates");
-define("_MI_PUBLISHER_DISPLAY_LIST_DSC", "Display index and category with bullet display type");
-define("_MI_PUBLISHER_DISPLAY_SUMMARY_DSC", "Display index and category with summary display type");
-define("_MI_PUBLISHER_DISPLAY_FULL_DSC", "Display index and category with full display type");
-define("_MI_PUBLISHER_DISPLAY_WFSECTION_DSC", "Display index and category in a WF-Section like style");
-define("_MI_PUBLISHER_ITEM_DSC", "Display item");
-define("_MI_PUBLISHER_ARCHIVE__DSC", "Article Archives");
-define("_MI_PUBLISHER_SUBMIT_DSC", "Form to submit an item");
-define("_MI_PUBLISHER_SINGLEITEM_BLOCK_DSC", "Display a single item in a block");
-define("_MI_PUBLISHER_PRINT_DSC", "Print page template");
-define("_MI_PUBLISHER_RSS_DSC", "Display publisher RSS feed");
-define("_MI_PUBLISHER_ADDFILE_DSC", "Form to add a file to an article");
-define("_MI_PUBLISHER_WARNING_ALPHA", "This module comes as is, without any guarantees whatsoever. This module is ALPHA, meaning it is still under active development. This release is meant for <strong>testing purposes only</strong> and we <strong>strongly</strong> recommend that you do not use it on a live website or in a production environment.");
-define("_MI_PUBLISHER_PEOPLE_DEVELOPERS", "Developers");
-define("_MI_PUBLISHER_PEOPLE_TESTERS", "Testers");
-define("_MI_PUBLISHER_PEOPLE_DOCUMENTERS", "Documenters");
-define("_MI_PUBLISHER_PEOPLE_TRANSLATERS", "Translaters");
-define("_MI_PUBLISHER_PEOPLE_OTHER", "Other contributors");
-define("_MI_PUBLISHER_URL_REWRITE", "URL rewrite method");
-define("_MI_PUBLISHER_URL_REWRITE_DSC", "If you choose htaccess, then don't forget to put “.htaccess” file under your root folder");
-define("_MI_PUBLISHER_URL_REWRITE_NONE", "None");
-define("_MI_PUBLISHER_URL_REWRITE_PATHINFO", "Path-info");
-define("_MI_PUBLISHER_URL_REWRITE_HTACCESS", "Htaccess");
-define("_MI_PUBLISHER_CONFCAT_SEO", "SEO");
-define("_MI_PUBLISHER_CONFCAT_SEO_DSC", "Preferences for rewriting methods, meta data, etc");
-define("_MI_PUBLISHER_CONFCAT_FORMAT", "Format");
-define("_MI_PUBLISHER_CONFCAT_FORMAT_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_PRINT", "Print page");
-define("_MI_PUBLISHER_CONFCAT_PRINT_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_OTHERS", "Others");
-define("_MI_PUBLISHER_CONFCAT_OTHERS_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_PERMISSIONS", "Permissions");
-define("_MI_PUBLISHER_CONFCAT_PERMISSIONS_DSC", "");
-define("_MI_PUBLISHER_COLUMNS", "Columns");
-define("_MI_PUBLISHER_COLUMNS_DSC", "");
-define("_MI_PUBLISHER_ALLOWRATING", "Allow rating feature");
-define("_MI_PUBLISHER_ALLOWRATING_DSC", "You can select who can rate in permissions tab");
-define("_MI_PUBLISHER_ALLOWSEARCH", "Allow extended search feature");
-define("_MI_PUBLISHER_ALLOWSEARCH_DSC", "You can select who can search in permissions tab");
-define("_MI_PUBLISHER_SUB_SMNAME3", "Search");
-define("_MI_PUBLISHER_LATEST_NEWS", "Latest news");
-define("_MI_PUBLISHER_LATEST_NEWS_DSC", "");
-define("_MI_PUBLISHER_SEARCH", "Search block");
-define("_MI_PUBLISHER_SEARCH_DSC", "Advanced search page");
-define("_MI_PUBLISHER_CATEGORY_ITEMS_SEL", "Category items select");
-define("_MI_PUBLISHER_CATEGORY_ITEMS_SEL_DSC", "Shows a drop down select box with items grouped by category");
-define("_MI_PUBLISHER_CONFCAT_INDEX", "Index page");
-define("_MI_PUBLISHER_CONFCAT_INDEX_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_CATEGORY", "Category page");
-define("_MI_PUBLISHER_CONFCAT_CATEGORY_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_ITEM", "Item page");
-define("_MI_PUBLISHER_CONFCAT_ITEM_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_SUBMIT", "Submit page");
-define("_MI_PUBLISHER_CONFCAT_SUBMIT_DSC", "Submit page layout and form default values");
-define("_MI_PUBLISHER_CONFCAT_INDEXCAT", "Index and category pages");
-define("_MI_PUBLISHER_CONFCAT_INDEXCAT_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_SEARCH", "Search page");
-define("_MI_PUBLISHER_CONFCAT_SEARCH_DSC", "");
-define("_MI_PUBLISHER_SEO_METAKEYWORDS", "Meta Keywords");
-define("_MI_PUBLISHER_SEO_METAKEYWORDS_DSC", "This keywords will be merged with the keywords set by articles. Use ", " to separate them.");
-define("_MI_PUBLISHER_SUB_ARCHIVE", "Archive");
-define("_MI_PUBLISHER_ALLOW_AUTHOR_ITEMS", "Allow author items feature");
-define("_MI_PUBLISHER_ALLOW_AUTHOR_ITEMS_DSC", "");
-define("_MI_PUBLISHER_AUTHOR_ITEMS_DSC", "Show items from the same author");
-define("_MI_PUBLISHER_DISP_BLOCK_SUM", "Display block summary on items page?");
-define("_MI_PUBLISHER_DISP_BLOCK_SUM_DSC", "");
-define("_MI_PUBLISHER_ADMENU0", "Home");
-define("_MI_PUBLISHER_DISP_INDEX_SUB", "Display items subtitles in index page?");
-define("_MI_PUBLISHER_DISP_INDEX_SUB_DSC", "");
-define("_MI_PUBLISHER_DISP_CAT_SUB", "Display items subtitles in categories pages?");
-define("_MI_PUBLISHER_DISP_CAT_SUB_DSC", "");
-define("_MI_PUBLISHER_DISP_ITEM_SUB", "Display item subtitle in item page?");
-define("_MI_PUBLISHER_DISP_ITEM_SUB_DSC", "");
+define('_MI_PUBLISHER_HEADER_DSC', 'Display header');
+define('_MI_PUBLISHER_FOOTER_DSC', 'Display footer');
+define('_MI_PUBLISHER_SINGLEITEM_DSC', 'Display a single item');
+define('_MI_PUBLISHER_CATEGORIES_TABLE_DSC', 'Display the category list table used in other templates');
+define('_MI_PUBLISHER_DISPLAY_LIST_DSC', 'Display index and category with bullet display type');
+define('_MI_PUBLISHER_DISPLAY_SUMMARY_DSC', 'Display index and category with summary display type');
+define('_MI_PUBLISHER_DISPLAY_FULL_DSC', 'Display index and category with full display type');
+define('_MI_PUBLISHER_DISPLAY_WFSECTION_DSC', 'Display index and category in a WF-Section like style');
+define('_MI_PUBLISHER_ITEM_DSC', 'Display item');
+define('_MI_PUBLISHER_ARCHIVE__DSC', 'Article Archives');
+define('_MI_PUBLISHER_SUBMIT_DSC', 'Form to submit an item');
+define('_MI_PUBLISHER_SINGLEITEM_BLOCK_DSC', 'Display a single item in a block');
+define('_MI_PUBLISHER_PRINT_DSC', 'Print page template');
+define('_MI_PUBLISHER_RSS_DSC', 'Display publisher RSS feed');
+define('_MI_PUBLISHER_ADDFILE_DSC', 'Form to add a file to an article');
+define('_MI_PUBLISHER_WARNING_ALPHA', 'This module comes as is, without any guarantees whatsoever. This module is ALPHA, meaning it is still under active development. This release is meant for <strong>testing purposes only</strong> and we <strong>strongly</strong> recommend that you do not use it on a live website or in a production environment.');
+define('_MI_PUBLISHER_PEOPLE_DEVELOPERS', 'Developers');
+define('_MI_PUBLISHER_PEOPLE_TESTERS', 'Testers');
+define('_MI_PUBLISHER_PEOPLE_DOCUMENTERS', 'Documenters');
+define('_MI_PUBLISHER_PEOPLE_TRANSLATERS', 'Translaters');
+define('_MI_PUBLISHER_PEOPLE_OTHER', 'Other contributors');
+define('_MI_PUBLISHER_URL_REWRITE', 'URL rewrite method');
+define('_MI_PUBLISHER_URL_REWRITE_DSC', 'If you choose htaccess, then don\'t forget to put “.htaccess” file under your root folder');
+define('_MI_PUBLISHER_URL_REWRITE_NONE', 'None');
+define('_MI_PUBLISHER_URL_REWRITE_PATHINFO', 'Path-info');
+define('_MI_PUBLISHER_URL_REWRITE_HTACCESS', 'Htaccess');
+define('_MI_PUBLISHER_CONFCAT_SEO', 'SEO');
+define('_MI_PUBLISHER_CONFCAT_SEO_DSC', 'Preferences for rewriting methods, meta data, etc');
+define('_MI_PUBLISHER_CONFCAT_FORMAT', 'Format');
+define('_MI_PUBLISHER_CONFCAT_FORMAT_DSC', '');
+define('_MI_PUBLISHER_CONFCAT_PRINT', 'Print page');
+define('_MI_PUBLISHER_CONFCAT_PRINT_DSC', '');
+define('_MI_PUBLISHER_CONFCAT_OTHERS', 'Others');
+define('_MI_PUBLISHER_CONFCAT_OTHERS_DSC', '');
+define('_MI_PUBLISHER_CONFCAT_PERMISSIONS', 'Permissions');
+define('_MI_PUBLISHER_CONFCAT_PERMISSIONS_DSC', '');
+define('_MI_PUBLISHER_COLUMNS', 'Columns');
+define('_MI_PUBLISHER_COLUMNS_DSC', '');
+define('_MI_PUBLISHER_ALLOWRATING', 'Allow rating feature');
+define('_MI_PUBLISHER_ALLOWRATING_DSC', 'You can select who can rate in permissions tab');
+define('_MI_PUBLISHER_ALLOWSEARCH', 'Allow extended search feature');
+define('_MI_PUBLISHER_ALLOWSEARCH_DSC', 'You can select who can search in permissions tab');
+define('_MI_PUBLISHER_SUB_SMNAME3', 'Search');
+define('_MI_PUBLISHER_LATEST_NEWS', 'Latest news');
+define('_MI_PUBLISHER_LATEST_NEWS_DSC', '');
+define('_MI_PUBLISHER_SEARCH', 'Search block');
+define('_MI_PUBLISHER_SEARCH_DSC', 'Advanced search page');
+define('_MI_PUBLISHER_CATEGORY_ITEMS_SEL', 'Category items select');
+define('_MI_PUBLISHER_CATEGORY_ITEMS_SEL_DSC', 'Shows a drop down select box with items grouped by category');
+define('_MI_PUBLISHER_CONFCAT_INDEX', 'Index page');
+define('_MI_PUBLISHER_CONFCAT_INDEX_DSC', '');
+define('_MI_PUBLISHER_CONFCAT_CATEGORY', 'Category page');
+define('_MI_PUBLISHER_CONFCAT_CATEGORY_DSC', '');
+define('_MI_PUBLISHER_CONFCAT_ITEM', 'Item page');
+define('_MI_PUBLISHER_CONFCAT_ITEM_DSC', '');
+define('_MI_PUBLISHER_CONFCAT_SUBMIT', 'Submit page');
+define('_MI_PUBLISHER_CONFCAT_SUBMIT_DSC', 'Submit page layout and form default values');
+define('_MI_PUBLISHER_CONFCAT_INDEXCAT', 'Index and category pages');
+define('_MI_PUBLISHER_CONFCAT_INDEXCAT_DSC', '');
+define('_MI_PUBLISHER_CONFCAT_SEARCH', 'Search page');
+define('_MI_PUBLISHER_CONFCAT_SEARCH_DSC', '');
+define('_MI_PUBLISHER_SEO_METAKEYWORDS', 'Meta Keywords');
+define('_MI_PUBLISHER_SEO_METAKEYWORDS_DSC', 'This keywords will be merged with the keywords set by articles. Use \', \' to separate them.');
+define('_MI_PUBLISHER_SUB_ARCHIVE', 'Archive');
+define('_MI_PUBLISHER_ALLOW_AUTHOR_ITEMS', 'Allow author items feature');
+define('_MI_PUBLISHER_ALLOW_AUTHOR_ITEMS_DSC', '');
+define('_MI_PUBLISHER_AUTHOR_ITEMS_DSC', 'Show items from the same author');
+define('_MI_PUBLISHER_DISP_BLOCK_SUM', 'Display block summary on items page?');
+define('_MI_PUBLISHER_DISP_BLOCK_SUM_DSC', '');
+define('_MI_PUBLISHER_ADMENU0', 'Home');
+define('_MI_PUBLISHER_DISP_INDEX_SUB', 'Display items subtitles in index page?');
+define('_MI_PUBLISHER_DISP_INDEX_SUB_DSC', '');
+define('_MI_PUBLISHER_DISP_CAT_SUB', 'Display items subtitles in categories pages?');
+define('_MI_PUBLISHER_DISP_CAT_SUB_DSC', '');
+define('_MI_PUBLISHER_DISP_ITEM_SUB', 'Display item subtitle in item page?');
+define('_MI_PUBLISHER_DISP_ITEM_SUB_DSC', '');
 //30/04/2012
-define("_MI_PUBLISHER_ALLOWEDIT", "User article edit?");
-define("_MI_PUBLISHER_ALLOWEDITDSC", "Allow users to edit their own articles?");
-define("_MI_PUBLISHER_ALLOWDELETE", "User article delete?");
-define("_MI_PUBLISHER_ALLOWDELETEDSC", "Allow users to delete their own articles?");
+define('_MI_PUBLISHER_ALLOWEDIT', 'User article edit?');
+define('_MI_PUBLISHER_ALLOWEDITDSC', 'Allow users to edit their own articles?');
+define('_MI_PUBLISHER_ALLOWDELETE', 'User article delete?');
+define('_MI_PUBLISHER_ALLOWDELETEDSC', 'Allow users to delete their own articles?');
 
 //1.02 Beta 2
-define("_MI_PUBLISHER_DISPLAY_PDF", "Display PDF Icon");
-define("_MI_PUBLISHER_DISPLAY_PDF_DSC", "Select Yes to show PDF icon and allow users to create PDF files");
+define('_MI_PUBLISHER_DISPLAY_PDF', 'Display PDF Icon');
+define('_MI_PUBLISHER_DISPLAY_PDF_DSC', 'Select Yes to show PDF icon and allow users to create PDF files');
 
-//1.02 Beta 3
+//1.02 RC2
+define('_MI_PUBLISHER_ORDERBY_RATING', 'Rating DESC');
+define('_MI_PUBLISHER_ORDERBY_VOTES', 'Votes DESC');
+define('_MI_PUBLISHER_ORDERBY_COMMENTS', 'Comments DESC');
+define('_MI_PUBLISHER_ORDERBY_HITS', 'Hits DESC');
diff --git a/publisher/makepdf.php b/publisher/makepdf.php
index 8162bc71..a1968b5c 100644
--- a/publisher/makepdf.php
+++ b/publisher/makepdf.php
@@ -10,41 +10,38 @@
 $itemid       = XoopsRequest::getInt('itemid', 0, 'GET');
 $item_page_id = XoopsRequest::getInt('page', -1, 'GET');
 if ($itemid == 0) {
-    redirect_header("javascript:history.go(-1)", 1, _MD_PUBLISHER_NOITEMSELECTED);
-//    exit();
+    redirect_header('javascript:history.go(-1)', 1, _MD_PUBLISHER_NOITEMSELECTED);
 }
 if (!is_file(XOOPS_PATH . '/vendor/tcpdf/tcpdf.php')) {
     redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname') . '/viewtopic.php?topic_id=' . $itemid, 3, 'TCPF for Xoops not installed in ./xoops_lib/vendor/');
 }
 // Creating the item object for the selected item
-$itemObj = $publisher->getHandler('item')->get($itemid);
+$itemObj =& $publisher->getHandler('item')->get($itemid);
 
 // if the selected item was not found, exit
 if (!$itemObj) {
-    redirect_header("javascript:history.go(-1)", 1, _MD_PUBLISHER_NOITEMSELECTED);
-//    exit();
+    redirect_header('javascript:history.go(-1)', 1, _MD_PUBLISHER_NOITEMSELECTED);
 }
 
 // Creating the category object that holds the selected item
-$categoryObj = $publisher->getHandler('category')->get($itemObj->categoryid());
+$categoryObj =& $publisher->getHandler('category')->get($itemObj->categoryid());
 
 // Check user permissions to access that category of the selected item
 if (!$itemObj->accessGranted()) {
-    redirect_header("javascript:history.go(-1)", 1, _NOPERM);
-//    exit();
+    redirect_header('javascript:history.go(-1)', 1, _NOPERM);
 }
 
 xoops_loadLanguage('main', PUBLISHER_DIRNAME);
 
-$dateformat    = $itemObj->datesub();
-$sender_inform = sprintf(_MD_PUBLISHER_WHO_WHEN, $itemObj->posterName(), $itemObj->datesub());
+$dateformat    = $itemObj->getDatesub();
+$sender_inform = sprintf(_MD_PUBLISHER_WHO_WHEN, $itemObj->posterName(), $itemObj->getDatesub());
 $mainImage     = $itemObj->getMainImage();
 
 $content = '';
 if ($mainImage['image_path'] != '') {
     $content .= '<img src="' . $mainImage['image_path'] . '" alt="' . $myts->undoHtmlSpecialChars($mainImage['image_name']) . '"/><br />';
 }
-$content .= '<a href="' . PUBLISHER_URL . '/item.php?itemid=' . $itemid . '" style="text-decoration: none; color: black; font-size: 120%;" title="' . $myts->undoHtmlSpecialChars($itemObj->title()) . '">' . $myts->undoHtmlSpecialChars($itemObj->title()) . '</a>';
+$content .= '<a href="' . PUBLISHER_URL . '/item.php?itemid=' . $itemid . '" style="text-decoration: none; color: black; font-size: 120%;" title="' . $myts->undoHtmlSpecialChars($itemObj->getTitle()) . '">' . $myts->undoHtmlSpecialChars($itemObj->getTitle()) . '</a>';
 $content .= '<br /><span style="color: #CCCCCC; font-weight: bold; font-size: 80%;">' . _CO_PUBLISHER_CATEGORY . ' : </span><a href="' . PUBLISHER_URL . '/category.php?categoryid=' . $itemObj->categoryid() . '" style="color: #CCCCCC; font-weight: bold; font-size: 80%;" title="' . $myts->undoHtmlSpecialChars($categoryObj->name()) . '">' . $myts->undoHtmlSpecialChars($categoryObj->name()) . '</a>';
 $content .= '<br /><span style="font-size: 80%; font-style: italic;">' . $sender_inform . '</span><br />';
 $content .= $itemObj->plainMaintext();
@@ -62,11 +59,13 @@
 
 $pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, _CHARSET, false);
 
-$doc_title  = publisherConvertCharset($myts->undoHtmlSpecialChars($itemObj->title()));
+$doc_title  = publisherConvertCharset($myts->undoHtmlSpecialChars($itemObj->getTitle()));
 $docSubject = $myts->undoHtmlSpecialChars($categoryObj->name());
 
 $docKeywords = $myts->undoHtmlSpecialChars($itemObj->meta_keywords());
-if (array_key_exists('rtl', $pdf_data)) $pdf->setRTL($pdf_data['rtl']);;
+if (array_key_exists('rtl', $pdf_data)) {
+    $pdf->setRTL($pdf_data['rtl']);
+};
 // set document information
 $pdf->SetCreator(PDF_CREATOR);
 $pdf->SetAuthor(PDF_AUTHOR);
diff --git a/publisher/print.php b/publisher/print.php
index 2b8274d7..fa5b70e4 100644
--- a/publisher/print.php
+++ b/publisher/print.php
@@ -26,33 +26,33 @@
 $itemid = XoopsRequest::getInt('itemid', 0, 'GET');
 
 if ($itemid == 0) {
-    redirect_header("javascript:history.go(-1)", 1, _MD_PUBLISHER_NOITEMSELECTED);
-//    exit();
+    redirect_header('javascript:history.go(-1)', 1, _MD_PUBLISHER_NOITEMSELECTED);
+    //    exit();
 }
 
 // Creating the ITEM object for the selected ITEM
-$itemObj = $publisher->getHandler('item')->get($itemid);
+$itemObj =& $publisher->getHandler('item')->get($itemid);
 
 // if the selected ITEM was not found, exit
 if ($itemObj->notLoaded()) {
-    redirect_header("javascript:history.go(-1)", 1, _MD_PUBLISHER_NOITEMSELECTED);
-//    exit();
+    redirect_header('javascript:history.go(-1)', 1, _MD_PUBLISHER_NOITEMSELECTED);
+    //    exit();
 }
 
 // Check user permissions to access that category of the selected ITEM
 if (!$itemObj->accessGranted()) {
-    redirect_header("javascript:history.go(-1)", 1, _NOPERM);
-//    exit;
+    redirect_header('javascript:history.go(-1)', 1, _NOPERM);
+    //    exit;
 }
 
 // Creating the category object that holds the selected ITEM
-$categoryObj = $itemObj->category();
+$categoryObj = $itemObj->getCategory();
 
 $xoopsTpl = new XoopsTpl();
 $myts     = MyTextSanitizer::getInstance();
 
-$item['title']        = $itemObj->title();
-$item['body']         = $itemObj->body();
+$item['title']        = $itemObj->getTitle();
+$item['body']         = $itemObj->getBody();
 $item['categoryname'] = $myts->displayTarea($categoryObj->name());
 
 $mainImage = $itemObj->getMainImage();
@@ -60,11 +60,11 @@
     $item['image'] = '<img src="' . $mainImage['image_path'] . '" alt="' . $myts->undoHtmlSpecialChars($mainImage['image_name']) . '"/>';
 }
 $xoopsTpl->assign('item', $item);
-$xoopsTpl->assign('printtitle', $GLOBALS['xoopsConfig']['sitename'] . " - " . publisherHtml2text($categoryObj->getCategoryPath()) . " > " . $myts->displayTarea($itemObj->title()));
+$xoopsTpl->assign('printtitle', $GLOBALS['xoopsConfig']['sitename'] . ' - ' . publisherHtml2text($categoryObj->getCategoryPath()) . ' > ' . $myts->displayTarea($itemObj->getTitle()));
 $xoopsTpl->assign('printlogourl', $publisher->getConfig('print_logourl'));
 $xoopsTpl->assign('printheader', $myts->displayTarea($publisher->getConfig('print_header'), 1));
 $xoopsTpl->assign('lang_category', _CO_PUBLISHER_CATEGORY);
-$xoopsTpl->assign('lang_author_date', sprintf(_MD_PUBLISHER_WHO_WHEN, $itemObj->posterName(), $itemObj->datesub()));
+$xoopsTpl->assign('lang_author_date', sprintf(_MD_PUBLISHER_WHO_WHEN, $itemObj->posterName(), $itemObj->getDatesub()));
 
 $doNotStartPrint = false;
 $noTitle         = false;
@@ -76,10 +76,10 @@
 $xoopsTpl->assign('smartPopup', $smartPopup);
 $xoopsTpl->assign('current_language', $GLOBALS['xoopsConfig']['language']);
 
-if ($publisher->getConfig('print_footer') == 'item footer' || $publisher->getConfig('print_footer') == 'both') {
+if ($publisher->getConfig('print_footer') === 'item footer' || $publisher->getConfig('print_footer') === 'both') {
     $xoopsTpl->assign('itemfooter', $myts->displayTarea($publisher->getConfig('item_footer'), 1));
 }
-if ($publisher->getConfig('print_footer') == 'index footer' || $publisher->getConfig('print_footer') == 'both') {
+if ($publisher->getConfig('print_footer') === 'index footer' || $publisher->getConfig('print_footer') === 'both') {
     $xoopsTpl->assign('indexfooter', $myts->displayTarea($publisher->getConfig('index_footer'), 1));
 }
 
diff --git a/publisher/rate.php b/publisher/rate.php
index 3deb71a8..aeb4fd7f 100644
--- a/publisher/rate.php
+++ b/publisher/rate.php
@@ -26,23 +26,23 @@
 $itemid = XoopsRequest::getInt('itemid', 0, 'GET');
 
 $groups        = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : XOOPS_GROUP_ANONYMOUS;
-$gperm_handler = xoops_getmodulehandler('groupperm');
-$hModConfig    = xoops_gethandler('config');
+$gpermHandler =& xoops_getModuleHandler('groupperm');
+$hModConfig    =& xoops_getHandler('config');
 $module_id     = $publisher->getModule()->getVar('mid');
 
 //Checking permissions
-if (!$publisher->getConfig('perm_rating') || !$gperm_handler->checkRight('global', PublisherConstantsInterface::PUBLISHER_RATE, $groups, $module_id)) {
+if (!$publisher->getConfig('perm_rating') || !$gpermHandler->checkRight('global', PublisherConstantsInterface::PUBLISHER_RATE, $groups, $module_id)) {
     redirect_header(PUBLISHER_URL . '/item.php?itemid=' . $itemid, 2, _NOPERM);
-//    exit();
+    //    exit();
 }
 
 if ($rating > 5 || $rating < 1) {
     redirect_header(PUBLISHER_URL . '/item.php?itemid=' . $itemid, 2, _MD_PUBLISHER_VOTE_BAD);
-//    exit();
+    //    exit();
 }
 
 $criteria   = new Criteria('itemid', $itemid);
-$ratingObjs = $publisher->getHandler('rating')->getObjects($criteria);
+$ratingObjs =& $publisher->getHandler('rating')->getObjects($criteria);
 
 $uid            = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
 $count          = count($ratingObjs);
@@ -56,14 +56,14 @@
         $voted = true;
     }
 }
-unset($ratingObj);
+//unset($ratingObj);
 
 if ($voted) {
     redirect_header(PUBLISHER_URL . '/item.php?itemid=' . $itemid, 2, _MD_PUBLISHER_VOTE_ALREADY);
-//    exit();
+    //    exit();
 }
 
-$newRatingObj = $publisher->getHandler('rating')->create();
+$newRatingObj =& $publisher->getHandler('rating')->create();
 $newRatingObj->setVar('itemid', $itemid);
 $newRatingObj->setVar('ip', $ip);
 $newRatingObj->setVar('uid', $uid);
diff --git a/publisher/search.php b/publisher/search.php
index ecaafe32..38279e5c 100644
--- a/publisher/search.php
+++ b/publisher/search.php
@@ -24,29 +24,29 @@
 xoops_loadLanguage('search');
 
 //Checking general permissions
-$config_handler    = xoops_gethandler("config");
-$xoopsConfigSearch = $config_handler->getConfigsByCat(XOOPS_CONF_SEARCH);
-if (empty($xoopsConfigSearch["enable_search"])) {
-    redirect_header(PUBLISHER_URL . "/index.php", 2, _NOPERM);
-//    exit();
+$configHandler    =& xoops_getHandler('config');
+$xoopsConfigSearch = $configHandler->getConfigsByCat(XOOPS_CONF_SEARCH);
+if (empty($xoopsConfigSearch['enable_search'])) {
+    redirect_header(PUBLISHER_URL . '/index.php', 2, _NOPERM);
+    //    exit();
 }
 
 $groups        = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : XOOPS_GROUP_ANONYMOUS;
-$gperm_handler = xoops_getmodulehandler('groupperm', PUBLISHER_DIRNAME);
+$gpermHandler =& xoops_getModuleHandler('groupperm', PUBLISHER_DIRNAME);
 $module_id     = $publisher->getModule()->mid();
 
 //Checking permissions
-if (!$publisher->getConfig('perm_search') || !$gperm_handler->checkRight('global', PublisherConstantsInterface::PUBLISHER_SEARCH, $groups, $module_id)) {
+if (!$publisher->getConfig('perm_search') || !$gpermHandler->checkRight('global', PublisherConstantsInterface::PUBLISHER_SEARCH, $groups, $module_id)) {
     redirect_header(PUBLISHER_URL, 2, _NOPERM);
-//    exit();
+    //    exit();
 }
 
-$GLOBALS['xoopsConfig']["module_cache"][$module_id] = 0;
-$xoopsOption["template_main"]                       = 'publisher_search.tpl';
+$GLOBALS['xoopsConfig']['module_cache'][$module_id] = 0;
+$xoopsOption['template_main']                       = 'publisher_search.tpl';
 include $GLOBALS['xoops']->path('header.php');
 
-$module_info_search = $publisher->getModule()->getInfo("search");
-include_once PUBLISHER_ROOT_PATH . '/' . $module_info_search["file"];
+$module_info_search = $publisher->getModule()->getInfo('search');
+include_once PUBLISHER_ROOT_PATH . '/' . $module_info_search['file'];
 
 $limit    = 10; //$publisher->getConfig('idxcat_perpage');
 $uid      = 0;
@@ -59,197 +59,231 @@
 $sortby   = XoopsRequest::getString('sortby', '', 'POST');
 $term     = XoopsRequest::getString('term', '', 'POST');
 
-if (empty($category) || (is_array($category) && in_array("all", $category))) {
+if (empty($category) || (is_array($category) && in_array('all', $category))) {
     $category = array();
 } else {
-    $category = !is_array($category) ? explode(",", $category) : $category;
-    $category = array_map("intval", $category);
+    $category = !is_array($category) ? explode(',', $category) : $category;
+    $category = array_map('intval', $category);
 }
 
-$andor  = (in_array(strtoupper($andor), array("OR", "AND", "EXACT"))) ? strtoupper($andor) : "OR";
-$sortby = (in_array(strtolower($sortby), array("itemid", "datesub", "title", "categoryid"))) ? strtolower($sortby) : "itemid";
+$andor  = (in_array(strtoupper($andor), array('OR', 'AND', 'EXACT'))) ? strtoupper($andor) : 'OR';
+$sortby = (in_array(strtolower($sortby), array('itemid', 'datesub', 'title', 'categoryid'))) ? strtolower($sortby) : 'itemid';
 
-if ((XoopsRequest::getString('submit', '', 'POST')) && $term) {
-
-    $next_search["category"] = implode(",", $category);
-    $next_search["andor"]    = $andor;
-    $next_search["term"]     = $term;
+if ($term && (XoopsRequest::getString('submit', '', 'POST'))) {
+    $next_search['category'] = implode(',', $category);
+    $next_search['andor']    = $andor;
+    $next_search['term']     = $term;
     $query                   = trim($term);
 
-    if ($andor != "EXACT") {
+    if ($andor !== 'EXACT') {
         $ignored_queries = array(); // holds kewords that are shorter than allowed minmum length
         $temp_queries    = preg_split("/[\s,]+/", $query);
         foreach ($temp_queries as $q) {
             $q = trim($q);
-            if (strlen($q) >= $xoopsConfigSearch["keyword_min"]) {
+            if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
                 $queries[] = $myts->addSlashes($q);
             } else {
                 $ignored_queries[] = $myts->addSlashes($q);
             }
         }
-        unset($q);
+//        unset($q);
         if (count($queries) == 0) {
-            redirect_header(PUBLISHER_URL . "/search.php", 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch["keyword_min"]));
-//            exit();
+            redirect_header(PUBLISHER_URL . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+            //            exit();
         }
     } else {
-        if (strlen($query) < $xoopsConfigSearch["keyword_min"]) {
-            redirect_header(PUBLISHER_URL . "/search.php", 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch["keyword_min"]));
-//            exit();
+        if (strlen($query) < $xoopsConfigSearch['keyword_min']) {
+            redirect_header(PUBLISHER_URL . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+            //            exit();
         }
         $queries = array($myts->addSlashes($query));
     }
 
     $uname_required       = false;
     $search_username      = trim($username);
-    $next_search["uname"] = $search_username;
+    $next_search['uname'] = $search_username;
     if (!empty($search_username)) {
         $uname_required  = true;
         $search_username = $myts->addSlashes($search_username);
-        if (!$result = $GLOBALS['xoopsDB']->query("SELECT uid FROM " . $GLOBALS['xoopsDB']->prefix("users") . " WHERE uname LIKE " . $GLOBALS['xoopsDB']->quoteString("%$search_username%"))) {
-            redirect_header(PUBLISHER_URL . "/search.php", 1, _CO_PUBLISHER_ERROR);
-//            exit();
+        if (!$result = $GLOBALS['xoopsDB']->query('SELECT uid FROM ' . $GLOBALS['xoopsDB']->prefix('users') . ' WHERE uname LIKE ' . $GLOBALS['xoopsDB']->quoteString("%$search_username%"))) {
+            redirect_header(PUBLISHER_URL . '/search.php', 1, _CO_PUBLISHER_ERROR);
+            //            exit();
         }
         $uid = array();
         while (($row = $GLOBALS['xoopsDB']->fetchArray($result)) !== false) {
-            $uid[] = $row["uid"];
+            $uid[] = $row['uid'];
         }
     } else {
         $uid = 0;
     }
 
-    $next_search["sortby"]   = $sortby;
-    $next_search["searchin"] = implode("|", $searchin);
+    $next_search['sortby']   = $sortby;
+    $next_search['searchin'] = implode('|', $searchin);
 
     if (!empty($time)) {
-        $extra = "";
+        $extra = '';
     } else {
-        $extra = "";
+        $extra = '';
     }
 
     if ($uname_required && (!$uid || count($uid) < 1)) {
         $results = array();
     } else {
-        $results = $module_info_search["func"]($queries, $andor, $limit, $start, $uid, $category, $sortby, $searchin, $extra);
+        $results = $module_info_search['func']($queries, $andor, $limit, $start, $uid, $category, $sortby, $searchin, $extra);
     }
 
     if (count($results) < 1) {
-        $results[] = array("text" => _SR_NOMATCH);
+        $results[] = array('text' => _SR_NOMATCH);
     }
 
-    $xoopsTpl->assign("results", $results);
+    $xoopsTpl->assign('results', $results);
 
     if (count($next_search) > 0) {
         $items = array();
         foreach ($next_search as $para => $val) {
-            if (!empty($val)) $items[] = "{$para}={$val}";
+            if (!empty($val)) {
+                $items[] = "{$para}={$val}";
+            }
+        }
+        if (count($items) > 0) {
+            $paras = implode('&', $items);
         }
-        if (count($items) > 0) $paras = implode("&", $items);
-        unset($next_search, $para, $val);
-        unset($items);
+        unset($next_search, $para, $val, $items);
     }
-    $search_url = PUBLISHER_URL . "/search.php?" . $paras;
+    $search_url = PUBLISHER_URL . '/search.php?' . $paras;
 
     if (count($results)) {
         $next            = $start + $limit;
-        $queries         = implode(",", $queries);
+        $queries         = implode(',', $queries);
         $search_url_next = $search_url . "&start={$next}";
-        $search_next     = "<a href=\"" . htmlspecialchars($search_url_next) . "\">" . _SR_NEXT . "</a>";
-        $xoopsTpl->assign("search_next", $search_next);
+        $search_next     = "<a href=\"" . htmlspecialchars($search_url_next) . "\">" . _SR_NEXT . '</a>';
+        $xoopsTpl->assign('search_next', $search_next);
     }
     if ($start > 0) {
         $prev            = $start - $limit;
         $search_url_prev = $search_url . "&start={$prev}";
-        $search_prev     = "<a href=\"" . htmlspecialchars($search_url_prev) . "\">" . _SR_PREVIOUS . "</a>";
-        $xoopsTpl->assign("search_prev", $search_prev);
+        $search_prev     = "<a href=\"" . htmlspecialchars($search_url_prev) . "\">" . _SR_PREVIOUS . '</a>';
+        $xoopsTpl->assign('search_prev', $search_prev);
     }
 
     unset($results);
-    $search_info = _SR_KEYWORDS . ": " . $myts->htmlSpecialChars($term);
+    $search_info = _SR_KEYWORDS . ': ' . $myts->htmlSpecialChars($term);
     if ($uname_required) {
-        if ($search_info) $search_info .= "<br />";
-        $search_info .= _CO_PUBLISHER_UID . ": " . $myts->htmlSpecialChars($search_username);
+        if ($search_info) {
+            $search_info .= '<br />';
+        }
+        $search_info .= _CO_PUBLISHER_UID . ': ' . $myts->htmlSpecialChars($search_username);
     }
-    $xoopsTpl->assign("search_info", $search_info);
+    $xoopsTpl->assign('search_info', $search_info);
 }
 
 /* type */
-$type_select = "<select name=\"andor\">";
-$type_select .= "<option value=\"OR\"";
-if ("OR" == $andor) $type_select .= " selected=\"selected\"";
-$type_select .= ">" . _SR_ANY . "</option>";
-$type_select .= "<option value=\"AND\"";
-if ("AND" == $andor) $type_select .= " selected=\"selected\"";
-$type_select .= ">" . _SR_ALL . "</option>";
-$type_select .= "<option value=\"EXACT\"";
-if ("EXACT" == $andor) $type_select .= " selected=\"selected\"";
-$type_select .= ">" . _SR_EXACT . "</option>";
-$type_select .= "</select>";
+$typeSelect = "<select name=\"andor\">";
+$typeSelect .= "<option value=\"OR\"";
+if ('OR' === $andor) {
+    $typeSelect .= " selected=\"selected\"";
+}
+$typeSelect .= '>' . _SR_ANY . '</option>';
+$typeSelect .= "<option value=\"AND\"";
+if ('AND' === $andor) {
+    $typeSelect .= " selected=\"selected\"";
+}
+$typeSelect .= '>' . _SR_ALL . '</option>';
+$typeSelect .= "<option value=\"EXACT\"";
+if ('EXACT' === $andor) {
+    $typeSelect .= " selected=\"selected\"";
+}
+$typeSelect .= '>' . _SR_EXACT . '</option>';
+$typeSelect .= '</select>';
 
 /* category */
-$categories = $publisher->getHandler('category')->getCategoriesForSearch();
+$categories =& $publisher->getHandler('category')->getCategoriesForSearch();
 
-$select_category = "<select name=\"category[]\" size=\"5\" multiple=\"multiple\">";
-$select_category .= "<option value=\"all\"";
-if (empty($category) || count($category) == 0) $select_category .= "selected=\"selected\"";
-$select_category .= ">" . _ALL . "</option>";
+$categorySelect = "<select name=\"category[]\" size=\"5\" multiple=\"multiple\">";
+$categorySelect .= "<option value=\"all\"";
+if (empty($category) || count($category) == 0) {
+    $categorySelect .= "selected=\"selected\"";
+}
+$categorySelect .= '>' . _ALL . '</option>';
 foreach ($categories as $id => $cat) {
-    $select_category .= "<option value=\"" . $id . "\"";
-    if (in_array($id, $category)) $select_category .= "selected=\"selected\"";
-    $select_category .= ">" . $cat . "</option>";
+    $categorySelect .= "<option value=\"" . $id . "\"";
+    if (in_array($id, $category)) {
+        $categorySelect .= "selected=\"selected\"";
+    }
+    $categorySelect .= '>' . $cat . '</option>';
 }
 unset($id, $cat);
-$select_category .= "</select>";
+$categorySelect .= '</select>';
 
 /* scope */
-$searchin_select = "";
-$searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"title\"";
-if (in_array("title", $searchin)) $searchin_select .= " checked";
-$searchin_select .= " />" . _CO_PUBLISHER_TITLE . "&nbsp;&nbsp;";
-$searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"subtitle\"";
-if (in_array("subtitle", $searchin)) $searchin_select .= " checked";
-$searchin_select .= " />" . _CO_PUBLISHER_SUBTITLE . "&nbsp;&nbsp;";
-$searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"summary\"";
-if (in_array("summary", $searchin)) $searchin_select .= " checked";
-$searchin_select .= " />" . _CO_PUBLISHER_SUMMARY . "&nbsp;&nbsp;";
-$searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"text\"";
-if (in_array("body", $searchin)) $searchin_select .= " checked";
-$searchin_select .= " />" . _CO_PUBLISHER_BODY . "&nbsp;&nbsp;";
-$searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"keywords\"";
-if (in_array("meta_keywords", $searchin)) $searchin_select .= " checked";
-$searchin_select .= " />" . _CO_PUBLISHER_ITEM_META_KEYWORDS . "&nbsp;&nbsp;";
-$searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"all\"";
-if (in_array("all", $searchin) || empty($searchin)) $searchin_select .= " checked";
-$searchin_select .= " />" . _ALL . "&nbsp;&nbsp;";
+$searchSelect = '';
+$searchSelect .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"title\"";
+if (in_array('title', $searchin)) {
+    $searchSelect .= ' checked';
+}
+$searchSelect .= ' />' . _CO_PUBLISHER_TITLE . '&nbsp;&nbsp;';
+$searchSelect .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"subtitle\"";
+if (in_array('subtitle', $searchin)) {
+    $searchSelect .= ' checked';
+}
+$searchSelect .= ' />' . _CO_PUBLISHER_SUBTITLE . '&nbsp;&nbsp;';
+$searchSelect .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"summary\"";
+if (in_array('summary', $searchin)) {
+    $searchSelect .= ' checked';
+}
+$searchSelect .= ' />' . _CO_PUBLISHER_SUMMARY . '&nbsp;&nbsp;';
+$searchSelect .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"text\"";
+if (in_array('body', $searchin)) {
+    $searchSelect .= ' checked';
+}
+$searchSelect .= ' />' . _CO_PUBLISHER_BODY . '&nbsp;&nbsp;';
+$searchSelect .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"keywords\"";
+if (in_array('meta_keywords', $searchin)) {
+    $searchSelect .= ' checked';
+}
+$searchSelect .= ' />' . _CO_PUBLISHER_ITEM_META_KEYWORDS . '&nbsp;&nbsp;';
+$searchSelect .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"all\"";
+if (empty($searchin) || in_array('all', $searchin)) {
+    $searchSelect .= ' checked';
+}
+$searchSelect .= ' />' . _ALL . '&nbsp;&nbsp;';
 
 /* sortby */
-$sortby_select = "<select name=\"sortby\">";
-$sortby_select .= "<option value=\"itemid\"";
-if ("itemid" == $sortby || empty($sortby)) $sortby_select .= " selected=\"selected\"";
-$sortby_select .= ">" . _NONE . "</option>";
-$sortby_select .= "<option value=\"datesub\"";
-if ("datesub" == $sortby) $sortby_select .= " selected=\"selected\"";
-$sortby_select .= ">" . _CO_PUBLISHER_DATESUB . "</option>";
-$sortby_select .= "<option value=\"title\"";
-if ("title" == $sortby) $sortby_select .= " selected=\"selected\"";
-$sortby_select .= ">" . _CO_PUBLISHER_TITLE . "</option>";
-$sortby_select .= "<option value=\"categoryid\"";
-if ("categoryid" == $sortby) $sortby_select .= " selected=\"selected\"";
-$sortby_select .= ">" . _CO_PUBLISHER_CATEGORY . "</option>";
-$sortby_select .= "</select>";
-
-$xoopsTpl->assign("type_select", $type_select);
-$xoopsTpl->assign("searchin_select", $searchin_select);
-$xoopsTpl->assign("category_select", $select_category);
-$xoopsTpl->assign("sortby_select", $sortby_select);
-$xoopsTpl->assign("search_term", $term);
-$xoopsTpl->assign("search_user", $username);
-
-$xoopsTpl->assign("modulename", $publisher->getModule()->name());
+$sortbySelect = "<select name=\"sortby\">";
+$sortbySelect .= "<option value=\"itemid\"";
+if ('itemid' === $sortby || empty($sortby)) {
+    $sortbySelect .= " selected=\"selected\"";
+}
+$sortbySelect .= '>' . _NONE . '</option>';
+$sortbySelect .= "<option value=\"datesub\"";
+if ('datesub' === $sortby) {
+    $sortbySelect .= " selected=\"selected\"";
+}
+$sortbySelect .= '>' . _CO_PUBLISHER_DATESUB . '</option>';
+$sortbySelect .= "<option value=\"title\"";
+if ('title' === $sortby) {
+    $sortbySelect .= " selected=\"selected\"";
+}
+$sortbySelect .= '>' . _CO_PUBLISHER_TITLE . '</option>';
+$sortbySelect .= "<option value=\"categoryid\"";
+if ('categoryid' === $sortby) {
+    $sortbySelect .= " selected=\"selected\"";
+}
+$sortbySelect .= '>' . _CO_PUBLISHER_CATEGORY . '</option>';
+$sortbySelect .= '</select>';
+
+$xoopsTpl->assign('typeSelect', $typeSelect);
+$xoopsTpl->assign('searchSelect', $searchSelect);
+$xoopsTpl->assign('categorySelect', $categorySelect);
+$xoopsTpl->assign('sortbySelect', $sortbySelect);
+$xoopsTpl->assign('search_term', $term);
+$xoopsTpl->assign('search_user', $username);
+
+$xoopsTpl->assign('modulename', $publisher->getModule()->name());
 $xoopsTpl->assign('module_dirname', $publisher->getModule()->getVar('dirname'));
 
-if ($xoopsConfigSearch["keyword_min"] > 0) {
-    $xoopsTpl->assign("search_rule", sprintf(_SR_KEYIGNORE, $xoopsConfigSearch["keyword_min"]));
+if ($xoopsConfigSearch['keyword_min'] > 0) {
+    $xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
 }
 
-include $GLOBALS['xoops']->path("footer.php");
+include $GLOBALS['xoops']->path('footer.php');
diff --git a/publisher/sql/mysql.sql b/publisher/sql/mysql.sql
index 34bd4748..81e715cc 100644
--- a/publisher/sql/mysql.sql
+++ b/publisher/sql/mysql.sql
@@ -16,23 +16,24 @@
 #
 
 CREATE TABLE `publisher_categories` (
-  `categoryid` int(11) NOT NULL auto_increment,
-  `parentid` int(11) NOT NULL default '0',
-  `name` varchar(100) NOT NULL default '',
-  `description` text NOT NULL,
-  `image` varchar(255) NOT NULL default '',
-  `total` int(11) NOT NULL default '0',
-  `weight` int(11) NOT NULL default '1',
-  `created` int(11) NOT NULL default '1033141070',
-  `template` varchar(255) NOT NULL default '',
-  `header` text NOT NULL,
-  `meta_keywords` text NOT NULL,
-  `meta_description` text NOT NULL,
-  `short_url` varchar(255) NOT NULL default '',
-  `moderator` int(6) NOT NULL default '0',
+  `categoryid`       INT(11)      NOT NULL AUTO_INCREMENT,
+  `parentid`         INT(11)      NOT NULL DEFAULT '0',
+  `name`             VARCHAR(100) NOT NULL DEFAULT '',
+  `description`      TEXT         NOT NULL,
+  `image`            VARCHAR(255) NOT NULL DEFAULT '',
+  `total`            INT(11)      NOT NULL DEFAULT '0',
+  `weight`           INT(11)      NOT NULL DEFAULT '1',
+  `created`          INT(11)      NOT NULL DEFAULT '1033141070',
+  `template`         VARCHAR(255) NOT NULL DEFAULT '',
+  `header`           TEXT         NOT NULL,
+  `meta_keywords`    TEXT         NOT NULL,
+  `meta_description` TEXT         NOT NULL,
+  `short_url`        VARCHAR(255) NOT NULL DEFAULT '',
+  `moderator`        INT(6)       NOT NULL DEFAULT '0',
   PRIMARY KEY (`categoryid`),
   KEY parentid (parentid)
-) ENGINE=MyISAM;
+)
+  ENGINE = MyISAM;
 # --------------------------------------------------------
 
 #
@@ -43,38 +44,39 @@ CREATE TABLE `publisher_categories` (
 #
 
 CREATE TABLE `publisher_items` (
-  `itemid` int(11) NOT NULL auto_increment,
-  `categoryid` int(11) NOT NULL default '0',
-  `title` varchar(255) NOT NULL default '',
-  `subtitle` varchar(255) NOT NULL default '',
-  `summary` TEXT NOT NULL,
-  `body` LONGTEXT NOT NULL,
-  `uid` int(6) default '0',
-  `author_alias` varchar(255) NOT NULL default '',
-  `datesub` int(11) NOT NULL default '0',
-  `status` int(1) NOT NULL default '-1',
-  `image` int(11) NOT NULL default '0',
-  `images` varchar(255) NOT NULL default '',
-  `counter` int(8) unsigned NOT NULL default '0',
-  `rating` double(6,4) NOT NULL default '0.0000',
-  `votes` int(11) unsigned NOT NULL default '0',
-  `weight` int(11) NOT NULL default '1',
-  `dohtml` tinyint(1) NOT NULL default '1',
-  `dosmiley` tinyint(1) NOT NULL default '1',
-  `doxcode` tinyint(1) NOT NULL default '1',
-  `doimage` tinyint(1) NOT NULL default '1',
-  `dobr` tinyint(1) NOT NULL default '1',
-  `cancomment` tinyint(1) NOT NULL default '1',
-  `comments` int(11) NOT NULL default '0',
-  `notifypub` tinyint(1) NOT NULL default '0',
-  `meta_keywords` TEXT NOT NULL,
-  `meta_description` TEXT NOT NULL,
-  `short_url` VARCHAR(255) NOT NULL,
-  `item_tag` TEXT NOT NULL,
+  `itemid`           INT(11)          NOT NULL AUTO_INCREMENT,
+  `categoryid`       INT(11)          NOT NULL DEFAULT '0',
+  `title`            VARCHAR(255)     NOT NULL DEFAULT '',
+  `subtitle`         VARCHAR(255)     NOT NULL DEFAULT '',
+  `summary`          TEXT             NOT NULL,
+  `body`             LONGTEXT         NOT NULL,
+  `uid`              INT(6)                    DEFAULT '0',
+  `author_alias`     VARCHAR(255)     NOT NULL DEFAULT '',
+  `datesub`          INT(11)          NOT NULL DEFAULT '0',
+  `status`           INT(1)           NOT NULL DEFAULT '-1',
+  `image`            INT(11)          NOT NULL DEFAULT '0',
+  `images`           VARCHAR(255)     NOT NULL DEFAULT '',
+  `counter`          INT(8) UNSIGNED  NOT NULL DEFAULT '0',
+  `rating`           DOUBLE(6, 4)     NOT NULL DEFAULT '0.0000',
+  `votes`            INT(11) UNSIGNED NOT NULL DEFAULT '0',
+  `weight`           INT(11)          NOT NULL DEFAULT '1',
+  `dohtml`           TINYINT(1)       NOT NULL DEFAULT '1',
+  `dosmiley`         TINYINT(1)       NOT NULL DEFAULT '1',
+  `doxcode`          TINYINT(1)       NOT NULL DEFAULT '1',
+  `doimage`          TINYINT(1)       NOT NULL DEFAULT '1',
+  `dobr`             TINYINT(1)       NOT NULL DEFAULT '1',
+  `cancomment`       TINYINT(1)       NOT NULL DEFAULT '1',
+  `comments`         INT(11)          NOT NULL DEFAULT '0',
+  `notifypub`        TINYINT(1)       NOT NULL DEFAULT '0',
+  `meta_keywords`    TEXT             NOT NULL,
+  `meta_description` TEXT             NOT NULL,
+  `short_url`        VARCHAR(255)     NOT NULL,
+  `item_tag`         TEXT             NOT NULL,
   PRIMARY KEY (`itemid`),
   KEY categoryid (categoryid),
   KEY status (status)
-) ENGINE=MyISAM;
+)
+  ENGINE = MyISAM;
 
 
 #
@@ -85,35 +87,37 @@ CREATE TABLE `publisher_items` (
 #
 
 CREATE TABLE `publisher_files` (
-  `fileid` int(11) NOT NULL auto_increment,
-  `itemid` int(11) NOT NULL default '0',
-  `name` varchar(255) NOT NULL default '',
-  `description` TEXT NOT NULL,
-  `filename` varchar(255) NOT NULL default '',
-  `mimetype` varchar(64) NOT NULL default '',
-  `uid` int(6) default '0',
-  `datesub` int(11) NOT NULL default '0',
-  `status` int(1) NOT NULL default '-1',
-  `notifypub` tinyint(1) NOT NULL default '1',
-  `counter` int(8) unsigned NOT NULL default '0',
+  `fileid`      INT(11)         NOT NULL AUTO_INCREMENT,
+  `itemid`      INT(11)         NOT NULL DEFAULT '0',
+  `name`        VARCHAR(255)    NOT NULL DEFAULT '',
+  `description` TEXT            NOT NULL,
+  `filename`    VARCHAR(255)    NOT NULL DEFAULT '',
+  `mimetype`    VARCHAR(64)     NOT NULL DEFAULT '',
+  `uid`         INT(6)                   DEFAULT '0',
+  `datesub`     INT(11)         NOT NULL DEFAULT '0',
+  `status`      INT(1)          NOT NULL DEFAULT '-1',
+  `notifypub`   TINYINT(1)      NOT NULL DEFAULT '1',
+  `counter`     INT(8) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY (`fileid`)
-) ENGINE=MyISAM;
+)
+  ENGINE = MyISAM;
 
 
 # --------------------------------------------------------
 
 
 CREATE TABLE `publisher_meta` (
-  `metakey` varchar(50) NOT NULL default '',
-  `metavalue` varchar(255) NOT NULL default '',
+  `metakey`   VARCHAR(50)  NOT NULL DEFAULT '',
+  `metavalue` VARCHAR(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`metakey`)
-) ENGINE=MyISAM;
+)
+  ENGINE = MyISAM;
 
 #
 # Dumping data for table `publisher_categories`
 #
 
-INSERT INTO `publisher_meta` VALUES ('version','0.1');
+INSERT INTO `publisher_meta` VALUES ('version', '0.1');
 # --------------------------------------------------------
 
 #
@@ -121,14 +125,15 @@ INSERT INTO `publisher_meta` VALUES ('version','0.1');
 #
 
 CREATE TABLE publisher_mimetypes (
-  mime_id int(11) NOT NULL auto_increment,
-  mime_ext varchar(60) NOT NULL default '',
-  mime_types text NOT NULL,
-  mime_name varchar(255) NOT NULL default '',
-  mime_admin int(1) NOT NULL default '1',
-  mime_user int(1) NOT NULL default '0',
+  mime_id    INT(11)      NOT NULL AUTO_INCREMENT,
+  mime_ext   VARCHAR(60)  NOT NULL DEFAULT '',
+  mime_types TEXT         NOT NULL,
+  mime_name  VARCHAR(255) NOT NULL DEFAULT '',
+  mime_admin INT(1)       NOT NULL DEFAULT '1',
+  mime_user  INT(1)       NOT NULL DEFAULT '0',
   KEY mime_id (mime_id)
-) ENGINE=MyISAM;
+)
+  ENGINE = MyISAM;
 
 # --------------------------------------------------------
 
@@ -137,16 +142,17 @@ CREATE TABLE publisher_mimetypes (
 #
 
 CREATE TABLE `publisher_rating` (
-  `ratingid` int(11) NOT NULL auto_increment,
-  `itemid` int(11) NOT NULL,
-  `uid` int(11) NOT NULL,
-  `rate` int(1) NOT NULL,
-  `date` int(11) NOT NULL,
-  `ip` varchar(60) NOT NULL default '',
-  PRIMARY KEY  (`ratingid`),
+  `ratingid` INT(11)     NOT NULL AUTO_INCREMENT,
+  `itemid`   INT(11)     NOT NULL,
+  `uid`      INT(11)     NOT NULL,
+  `rate`     INT(1)      NOT NULL,
+  `date`     INT(11)     NOT NULL,
+  `ip`       VARCHAR(60) NOT NULL DEFAULT '',
+  PRIMARY KEY (`ratingid`),
   KEY uid (uid),
   KEY ip (ip)
-) ENGINE=MyISAM;
+)
+  ENGINE = MyISAM;
 
 # --------------------------------------------------------
 
diff --git a/publisher/submit.php b/publisher/submit.php
index 445e53a0..87936cbf 100644
--- a/publisher/submit.php
+++ b/publisher/submit.php
@@ -24,48 +24,48 @@
 xoops_loadLanguage('admin', PUBLISHER_DIRNAME);
 
 // Get the total number of categories
-$categoriesArray = $publisher->getHandler('category')->getCategoriesForSubmit();
+$categoriesArray =& $publisher->getHandler('category')->getCategoriesForSubmit();
 
 if (!$categoriesArray) {
-    redirect_header("index.php", 1, _MD_PUBLISHER_NEED_CATEGORY_ITEM);
-//    exit();
+    redirect_header('index.php', 1, _MD_PUBLISHER_NEED_CATEGORY_ITEM);
+    //    exit();
 }
 
 $groups        = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : XOOPS_GROUP_ANONYMOUS;
-$gperm_handler = xoops_getmodulehandler('groupperm');
-$module_id     = $publisher->getModule()->getVar('mid');
+$gpermHandler =& xoops_getModuleHandler('groupperm');
+$moduleId     = $publisher->getModule()->getVar('mid');
 
-$itemid = XoopsRequest::getInt('itemid', (XoopsRequest::getInt('itemid', 0, 'POST')), 'GET');
-if ($itemid != 0) {
+$itemId = XoopsRequest::getInt('itemid', (XoopsRequest::getInt('itemid', 0, 'POST')), 'GET');
+if ($itemId != 0) {
     // We are editing or deleting an article
-    $itemObj = $publisher->getHandler('item')->get($itemid);
+    $itemObj =& $publisher->getHandler('item')->get($itemId);
     if (!(publisherUserIsAdmin() || publisherUserIsAuthor($itemObj) || publisherUserIsModerator($itemObj))) {
-        redirect_header("index.php", 1, _NOPERM);
-//        exit();
+        redirect_header('index.php', 1, _NOPERM);
+        //        exit();
     }
     if (!publisherUserIsAdmin() || !publisherUserIsModerator($itemObj)) {
-        if ('del' == XoopsRequest::getString('op', '', 'GET')  && !$publisher->getConfig('perm_delete')) {
-            redirect_header("index.php", 1, _NOPERM);
-//            exit();
+        if ('del' === XoopsRequest::getString('op', '', 'GET') && !$publisher->getConfig('perm_delete')) {
+            redirect_header('index.php', 1, _NOPERM);
+            //            exit();
         } elseif (!$publisher->getConfig('perm_edit')) {
-            redirect_header("index.php", 1, _NOPERM);
-//            exit();
+            redirect_header('index.php', 1, _NOPERM);
+            //            exit();
         }
     }
 
-    $categoryObj = $itemObj->category();
+    $categoryObj = $itemObj->getCategory();
 } else {
     // we are submitting a new article
     // if the user is not admin AND we don't allow user submission, exit
     if (!(publisherUserIsAdmin() || ($publisher->getConfig('perm_submit') == 1 && (is_object($GLOBALS['xoopsUser']) || ($publisher->getConfig('perm_anon_submit') == 1))))) {
-        redirect_header("index.php", 1, _NOPERM);
-//        exit();
+        redirect_header('index.php', 1, _NOPERM);
+        //        exit();
     }
-    $itemObj     = $publisher->getHandler('item')->create();
-    $categoryObj = $publisher->getHandler('category')->create();
+    $itemObj     =& $publisher->getHandler('item')->create();
+    $categoryObj =& $publisher->getHandler('category')->create();
 }
 
-if ('clone' == XoopsRequest::getString('op', '', 'GET')) {
+if ('clone' === XoopsRequest::getString('op', '', 'GET')) {
     $formtitle = _MD_PUBLISHER_SUB_CLONE;
     $itemObj->setNew();
     $itemObj->setVar('itemid', 0);
@@ -82,28 +82,43 @@
     $op = 'add';
 }
 
-$op = XoopsRequest::getString('op', XoopsRequest::getString('op',  $op, 'POST'), 'GET');
+$op = XoopsRequest::getString('op', XoopsRequest::getString('op', $op, 'POST'), 'GET');
 
-$allowedEditors = publisherGetEditors($gperm_handler->getItemIds('editors', $groups, $module_id));
-$form_view       = $gperm_handler->getItemIds('form_view', $groups, $module_id);
+$allowedEditors = publisherGetEditors($gpermHandler->getItemIds('editors', $groups, $moduleId));
+$formView      = $gpermHandler->getItemIds('form_view', $groups, $moduleId);
 
 // This code makes sure permissions are not manipulated
 $elements = array(
-    'summary', 'available_page_wrap', 'item_tag', 'image_item',
-    'item_upload_file', 'uid', 'datesub', 'status', 'item_short_url',
-    'item_meta_keywords', 'item_meta_description', 'weight',
+    'summary',
+    'available_page_wrap',
+    'item_tag',
+    'image_item',
+    'item_upload_file',
+    'uid',
+    'datesub',
+    'status',
+    'item_short_url',
+    'item_meta_keywords',
+    'item_meta_description',
+    'weight',
     'allowcomments',
-    'dohtml', 'dosmiley', 'doxcode', 'doimage', 'dolinebreak',
-    'notify', 'subtitle', 'author_alias');
+    'dohtml',
+    'dosmiley',
+    'doxcode',
+    'doimage',
+    'dolinebreak',
+    'notify',
+    'subtitle',
+    'author_alias');
 foreach ($elements as $element) {
-    if (XoopsRequest::getString('element', '', 'POST') && !in_array(constant('PublisherConstantsInterface::PUBLISHER_' . strtoupper($element)), $form_view)) {
-        redirect_header("index.php", 1, _MD_PUBLISHER_SUBMIT_ERROR);
-//        exit();
+    if (XoopsRequest::getString('element', '', 'POST') && !in_array(constant('PublisherConstantsInterface::PUBLISHER_' . strtoupper($element)), $formView)) {
+        redirect_header('index.php', 1, _MD_PUBLISHER_SUBMIT_ERROR);
+        //        exit();
     }
 }
-unset($element);
+//unset($element);
 
-$item_upload_file = XoopsRequest::getString('item_upload_file', '', 'FILES');
+$itemUploadFile = XoopsRequest::getString('item_upload_file', '', 'FILES');
 
 //stripcslashes
 switch ($op) {
@@ -112,14 +127,14 @@
 
         if ($confirm) {
             if (!$publisher->getHandler('item')->delete($itemObj)) {
-                redirect_header("index.php", 2, _AM_PUBLISHER_ITEM_DELETE_ERROR . publisherFormatErrors($itemObj->getErrors()));
-//                exit();
+                redirect_header('index.php', 2, _AM_PUBLISHER_ITEM_DELETE_ERROR . publisherFormatErrors($itemObj->getErrors()));
+                //                exit();
             }
-            redirect_header("index.php", 2, sprintf(_AM_PUBLISHER_ITEMISDELETED, $itemObj->title()));
-//            exit();
+            redirect_header('index.php', 2, sprintf(_AM_PUBLISHER_ITEMISDELETED, $itemObj->getTitle()));
+            //            exit();
         } else {
             include_once $GLOBALS['xoops']->path('header.php');
-            xoops_confirm(array('op' => 'del', 'itemid' => $itemObj->itemid(), 'confirm' => 1, 'name' => $itemObj->title()), 'submit.php', _AM_PUBLISHER_DELETETHISITEM . " <br />'" . $itemObj->title() . "'. <br /> <br />", _AM_PUBLISHER_DELETE);
+            xoops_confirm(array('op' => 'del', 'itemid' => $itemObj->itemid(), 'confirm' => 1, 'name' => $itemObj->getTitle()), 'submit.php', _AM_PUBLISHER_DELETETHISITEM . " <br />'" . $itemObj->getTitle() . "'. <br /> <br />", _AM_PUBLISHER_DELETE);
             include_once $GLOBALS['xoops']->path('footer.php');
         }
         exit();
@@ -131,11 +146,11 @@
         $xoopsOption['template_main'] = 'publisher_submit.tpl';
         include_once $GLOBALS['xoops']->path('header.php');
         $xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
-//        $xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery-migrate-1.2.1.js');
+        //        $xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery-migrate-1.2.1.js');
         $xoTheme->addScript(PUBLISHER_URL . '/assets/js/publisher.js');
         include_once PUBLISHER_ROOT_PATH . '/footer.php';
 
-        $categoryObj = $publisher->getHandler('category')->get(XoopsRequest::getInt('categoryid', 0, 'POST'));
+        $categoryObj =& $publisher->getHandler('category')->get(XoopsRequest::getInt('categoryid', 0, 'POST'));
 
         $item                 = $itemObj->toArraySimple();
         $item['summary']      = $itemObj->body();
@@ -147,14 +162,14 @@
         $xoopsTpl->assign('op', 'preview');
         $xoopsTpl->assign('module_home', publisherModuleHome());
 
-        if ($itemid) {
+        if ($itemId) {
             $xoopsTpl->assign('categoryPath', _MD_PUBLISHER_EDIT_ARTICLE);
-            $xoopsTpl->assign('lang_intro_title', _MD_PUBLISHER_EDIT_ARTICLE);
-            $xoopsTpl->assign('lang_intro_text', '');
+            $xoopsTpl->assign('langIntroTitle', _MD_PUBLISHER_EDIT_ARTICLE);
+            $xoopsTpl->assign('langIntroText', '');
         } else {
             $xoopsTpl->assign('categoryPath', _MD_PUBLISHER_SUB_SNEWNAME);
-            $xoopsTpl->assign('lang_intro_title', sprintf(_MD_PUBLISHER_SUB_SNEWNAME, ucwords($publisher->getModule()->name())));
-            $xoopsTpl->assign('lang_intro_text', $publisher->getConfig('submit_intro_msg'));
+            $xoopsTpl->assign('langIntroTitle', sprintf(_MD_PUBLISHER_SUB_SNEWNAME, ucwords($publisher->getModule()->name())));
+            $xoopsTpl->assign('langIntroText', $publisher->getConfig('submit_intro_msg'));
         }
 
         $sform = $itemObj->getForm($formtitle, true);
@@ -174,26 +189,26 @@
 
         // Storing the item object in the database
         if (!$itemObj->store()) {
-            redirect_header("javascript:history.go(-1)", 2, _MD_PUBLISHER_SUBMIT_ERROR);
-//            exit();
+            redirect_header('javascript:history.go(-1)', 2, _MD_PUBLISHER_SUBMIT_ERROR);
+            //            exit();
         }
 
         // attach file if any
-        if ($item_upload_file && $item_upload_file['name'] != "") {
-            $file_upload_result = publisherUploadFile(false, false, $itemObj);
-            if ($file_upload_result !== true) {
-                redirect_header("javascript:history.go(-1)", 3, $file_upload_result);
-//                exit;
+        if ($itemUploadFile && $itemUploadFile['name'] != '') {
+            $fileUploadResult = publisherUploadFile(false, false, $itemObj);
+            if ($fileUploadResult !== true) {
+                redirect_header('javascript:history.go(-1)', 3, $fileUploadResult);
+                //                exit;
             }
         }
 
         // if autoapprove_submitted. This does not apply if we are editing an article
-        if (!$itemid) {
+        if (!$itemId) {
             if ($itemObj->getVar('status') == PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED /*$publisher->getConfig('perm_autoapprove'] ==  1*/) {
                 // We do not not subscribe user to notification on publish since we publish it right away
 
                 // Send notifications
-                $itemObj->sendNotifications(array(PublisherConstantsInterface::PUBLISHER_NOT_ITEM_PUBLISHED));
+                $itemObj->sendNotifications(array(PublisherConstantsInterface::PUBLISHER_NOTIFY_ITEM_PUBLISHED));
 
                 $redirect_msg = _MD_PUBLISHER_ITEM_RECEIVED_AND_PUBLISHED;
                 redirect_header($itemObj->getItemUrl(), 2, $redirect_msg);
@@ -201,11 +216,11 @@
                 // Subscribe the user to On Published notification, if requested
                 if ($itemObj->getVar('notifypub')) {
                     include_once $GLOBALS['xoops']->path('include/notification_constants.php');
-                    $notification_handler = xoops_gethandler('notification');
-                    $notification_handler->subscribe('item', $itemObj->itemid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
+                    $notificationHandler =& xoops_getHandler('notification');
+                    $notificationHandler->subscribe('item', $itemObj->itemid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
                 }
                 // Send notifications
-                $itemObj->sendNotifications(array(PublisherConstantsInterface::PUBLISHER_NOT_ITEM_SUBMITTED));
+                $itemObj->sendNotifications(array(PublisherConstantsInterface::PUBLISHER_NOTIFY_ITEM_SUBMITTED));
 
                 $redirect_msg = _MD_PUBLISHER_ITEM_RECEIVED_NEED_APPROVAL;
             }
@@ -213,8 +228,8 @@
             $redirect_msg = _MD_PUBLISHER_ITEMMODIFIED;
             redirect_header($itemObj->getItemUrl(), 2, $redirect_msg);
         }
-        redirect_header("index.php", 2, $redirect_msg);
-//        exit();
+        redirect_header('index.php', 2, $redirect_msg);
+        //        exit();
 
         break;
 
@@ -223,24 +238,24 @@
         $xoopsOption['template_main'] = 'publisher_submit.tpl';
         include_once $GLOBALS['xoops']->path('header.php');
         $GLOBALS['xoTheme']->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
-//        $xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery-migrate-1.2.1.js');
+        //        $xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery-migrate-1.2.1.js');
         $GLOBALS['xoTheme']->addScript(PUBLISHER_URL . '/assets/js/publisher.js');
         include_once PUBLISHER_ROOT_PATH . '/footer.php';
 
-//mb        $itemObj->setVarsFromRequest();
+        //mb        $itemObj->setVarsFromRequest();
 
         $xoopsTpl->assign('module_home', publisherModuleHome());
-        if ('clone' == XoopsRequest::getString('op', '', 'GET')) {
+        if ('clone' === XoopsRequest::getString('op', '', 'GET')) {
             $xoopsTpl->assign('categoryPath', _CO_PUBLISHER_CLONE);
-            $xoopsTpl->assign('lang_intro_title', _CO_PUBLISHER_CLONE);
-        } elseif ($itemid) {
+            $xoopsTpl->assign('langIntroTitle', _CO_PUBLISHER_CLONE);
+        } elseif ($itemId) {
             $xoopsTpl->assign('categoryPath', _MD_PUBLISHER_EDIT_ARTICLE);
-            $xoopsTpl->assign('lang_intro_title', _MD_PUBLISHER_EDIT_ARTICLE);
-            $xoopsTpl->assign('lang_intro_text', '');
+            $xoopsTpl->assign('langIntroTitle', _MD_PUBLISHER_EDIT_ARTICLE);
+            $xoopsTpl->assign('langIntroText', '');
         } else {
             $xoopsTpl->assign('categoryPath', _MD_PUBLISHER_SUB_SNEWNAME);
-            $xoopsTpl->assign('lang_intro_title', sprintf(_MD_PUBLISHER_SUB_SNEWNAME, ucwords($publisher->getModule()->name())));
-            $xoopsTpl->assign('lang_intro_text', $publisher->getConfig('submit_intro_msg'));
+            $xoopsTpl->assign('langIntroTitle', sprintf(_MD_PUBLISHER_SUB_SNEWNAME, ucwords($publisher->getModule()->name())));
+            $xoopsTpl->assign('langIntroText', $publisher->getConfig('submit_intro_msg'));
         }
         $sform = $itemObj->getForm($formtitle, true);
         $sform->assign($xoopsTpl);
diff --git a/publisher/templates/blocks/publisher_items_columns.tpl b/publisher/templates/blocks/publisher_items_columns.tpl
index 8146c8c8..33a963a0 100644
--- a/publisher/templates/blocks/publisher_items_columns.tpl
+++ b/publisher/templates/blocks/publisher_items_columns.tpl
@@ -1,80 +1,81 @@
 <{if $block.template == 'normal'}>
-<div style="width:100%;">
+    <div style="width:100%;">
     <{section name=i loop=$block.columns}>
-    <div style="width: <{$block.columnwidth}>%;" class="publisher-left">
-        <{foreach item=item from=$block.columns[i]}>
-        <div class="publisher-box">
-            <div class="publisher-section publisher-clearfix">
-                <a href="<{$item.categoryurl}>" title="<{$item.item_cat_description}>"><span><{$item.item_cat_name}></span></a>
-            </div>
-            <div class="publisher-content clearfix">
-                <h4 class="publisher-title">
-                    <a href="<{$item.itemurl}>" title="<{$item.item_cleantitle}>"><{$item.item_title}></a>
-                </h4>
+        <div style="width: <{$block.columnwidth}>%;" class="publisher-left">
+            <{foreach item=item from=$block.columns[i]}>
+                <div class="publisher-box">
+                    <div class="publisher-section publisher-clearfix">
+                        <a href="<{$item.categoryurl}>" title="<{$item.item_cat_description}>"><span><{$item.item_cat_name}></span></a>
+                    </div>
+                    <div class="publisher-content clearfix">
+                        <h4 class="publisher-title">
+                            <a href="<{$item.itemurl}>" title="<{$item.item_cleantitle}>"><{$item.item_title}></a>
+                        </h4>
 
-                <p>
-                    <{if $item.item_image != ''}>
-                    <img src="<{$item.item_image}>" alt="<{$item.item_cleantitle}>" align="left" width="100" /> <{/if}> <{$item.item_summary}>
-                </p>
-            </div>
+                        <p>
+                            <{if $item.item_image != ''}>
+                                <img src="<{$item.item_image}>" alt="<{$item.item_cleantitle}>" align="left" width="100"/>
+                            <{/if}> <{$item.item_summary}>
+                        </p>
+                    </div>
 
-            <{if $item.subitem}>
-            <strong class="publisher-more"><{$smarty.const._MB_PUBLISHER_MORE}></strong>
-            <ul class="publisher-links">
-                <{foreach item=subitem from=$item.subitem}>
-                <li>
-                    <a title="<{$subitem.title}>" href="<{$subitem.itemurl}>"> <{$subitem.title}></a>
-                </li>
-                <{/foreach}>
-            </ul>
-            <{/if}>
+                    <{if $item.subitem}>
+                        <strong class="publisher-more"><{$smarty.const._MB_PUBLISHER_MORE}></strong>
+                        <ul class="publisher-links">
+                            <{foreach item=subitem from=$item.subitem}>
+                                <li>
+                                    <a title="<{$subitem.title}>" href="<{$subitem.itemurl}>"> <{$subitem.title}></a>
+                                </li>
+                            <{/foreach}>
+                        </ul>
+                    <{/if}>
+                </div>
+            <{/foreach}>
         </div>
-        <{/foreach}>
-    </div>
     <{/section}>
-</div><{/if}><{if $block.template == 'extended'}>
-<div style="width:100%;">
+    </div><{/if}><{if $block.template == 'extended'}>
+    <div style="width:100%;">
     <{section name=i loop=$block.columns}>
-    <div style="width: <{$block.columnwidth}>%;" class="publisher-left">
-        <{foreach item=item from=$block.columns[i]}>
-        <div class="publisher-box">
+        <div style="width: <{$block.columnwidth}>%;" class="publisher-left">
+            <{foreach item=item from=$block.columns[i]}>
+                <div class="publisher-box">
 
-            <h3 class="publisher-title">
-                <a href="<{$item.itemurl}>" title="<{$item.item_title}>"><{$item.item_title}></a>
-            </h3>
+                    <h3 class="publisher-title">
+                        <a href="<{$item.itemurl}>" title="<{$item.item_title}>"><{$item.item_title}></a>
+                    </h3>
 
-            <div style="float:right; width:60%;">
+                    <div style="float:right; width:60%;">
 
-                <div class="publisher-content clearfix">
-                    <{if $item.item_image != ''}>
-                    <img src="<{$item.item_image}>" alt="<{$item.item_cleantitle}>" align="right" width="100" /> <{/if}>
-                    <p><{$item.item_summary}></p>
+                        <div class="publisher-content clearfix">
+                            <{if $item.item_image != ''}>
+                                <img src="<{$item.item_image}>" alt="<{$item.item_cleantitle}>" align="right" width="100"/>
+                            <{/if}>
+                            <p><{$item.item_summary}></p>
 
-                    <p>
-                        <a href="<{$item.itemurl}>" title="<{$item.item_title}>"><{$smarty.const._MB_PUBLISHER_READMORE}></a>
-                    </p>
-                </div>
+                            <p>
+                                <a href="<{$item.itemurl}>" title="<{$item.item_title}>"><{$smarty.const._MB_PUBLISHER_READMORE}></a>
+                            </p>
+                        </div>
 
-            </div>
+                    </div>
 
-            <{if $item.subitem}>
-            <div style="float:left; width:40%;">
-                <br/>
-                <strong class="publisher-more"><{$smarty.const._MB_PUBLISHER_MORE}></strong>
-                <br/>
-                <ul class="publisher-links">
-                    <{foreach item=subitem from=$item.subitem}>
-                    <li>
-                        <a title="<{$subitem.summary}>" href="<{$subitem.itemurl}>"> <{$subitem.title}></a>
-                    </li>
-                    <{/foreach}>
-                </ul>
+                    <{if $item.subitem}>
+                        <div style="float:left; width:40%;">
+                            <br/>
+                            <strong class="publisher-more"><{$smarty.const._MB_PUBLISHER_MORE}></strong>
+                            <br/>
+                            <ul class="publisher-links">
+                                <{foreach item=subitem from=$item.subitem}>
+                                    <li>
+                                        <a title="<{$subitem.summary}>" href="<{$subitem.itemurl}>"> <{$subitem.title}></a>
+                                    </li>
+                                <{/foreach}>
+                            </ul>
 
-            </div>
-            <{/if}>
+                        </div>
+                    <{/if}>
+                </div>
+            <{/foreach}>
         </div>
-
-        <{/foreach}>
-    </div>
     <{/section}>
-</div><{/if}>
+    </div><{/if}>
diff --git a/publisher/templates/blocks/publisher_items_recent.tpl b/publisher/templates/blocks/publisher_items_recent.tpl
index 1f3d251c..5c0d5f2a 100644
--- a/publisher/templates/blocks/publisher_items_recent.tpl
+++ b/publisher/templates/blocks/publisher_items_recent.tpl
@@ -9,14 +9,14 @@
 
     <{foreach item=item from=$block.items}>
     <tr class="<{cycle values=" even,odd"}>">
-    <td><{$item.itemlink}></td>
-    <td align="left"><{$item.categorylink}></td>
-    <td align="center"><{$item.poster}></td>
-    <td align="right"><{$item.date}></td>
-    </tr><{/foreach}>
+        <td><{$item.itemlink}></td>
+        <td align="left"><{$item.categorylink}></td>
+        <td align="center"><{$item.poster}></td>
+        <td align="right"><{$item.date}></td>
+        </tr><{/foreach}>
 
 </table>
 
 <div style="text-align:right; padding: 5px;">
-    <a href="<{$publisher_url}>"><{$block.lang_visitItem}></a>
+    <a href="<{$moduleUrl}>"><{$block.lang_visitItem}></a>
 </div>
diff --git a/publisher/templates/blocks/publisher_items_spot.tpl b/publisher/templates/blocks/publisher_items_spot.tpl
index 950c7c63..0c398325 100644
--- a/publisher/templates/blocks/publisher_items_spot.tpl
+++ b/publisher/templates/blocks/publisher_items_spot.tpl
@@ -1,30 +1,32 @@
 <{if $block.category && $block.category.image_path != ''}>
-<div align="center">
+    <div align="center">
     <a href="<{$block.category.categoryurl}>" title="<{$block.category.name}>"><img src="<{$block.category.image_path}>" width="185" height="80" alt="<{$block.category.name}>"/></a>
-</div><{/if}>
+    </div><{/if}>
 
 
 <{if $block.display_type=='block'}>
 
-<{foreach item=item from=$block.items}>        <{include file="db:publisher_singleitem_block.tpl" item=$item}>    <{/foreach}>
+    <{foreach item=item from=$block.items}>        <{include file="db:publisher_singleitem_block.tpl" item=$item}>    <{/foreach}>
 
 <{else}>    <{foreach item=item from=$block.items name=spotlight}>        <{if $item.summary != ''}>
-<div class="itemText" style="padding-left: 5px; padding-top: 5px;">
-    <div>
-        <img style="vertical-align: middle;" src="<{$block.publisher_url}>/assets/images/links/doc.png" alt=""/>&nbsp;<{$item.titlelink}>
-    </div>
+    <div class="itemText" style="padding-left: 5px; padding-top: 5px;">
+        <div>
+            <img style="vertical-align: middle;" src="<{$block.moduleUrl}>/assets/images/links/doc.png" alt=""/>&nbsp;<{$item.titlelink}>
+        </div>
 
-    <div>
-        <{if $item.image_path}>
-        <img class="publisher_item_image" src="<{$item.image_path}>" align="right" alt="<{$item.clean_title}>" title="<{$item.clean_title}>"/> <{/if}> <{$item.summary}>
+        <div>
+            <{if $item.image_path}>
+                <img class="publisher_item_image" src="<{$item.image_path}>" align="right" alt="<{$item.clean_title}>" title="<{$item.clean_title}>"/>
+            <{/if}> <{$item.summary}>
+        </div>
     </div>
-</div>
-<div style="clear: both;"></div>                <{if $item.showline}>
-<div style="font-size: 10px; text-align: right; border-bottom: 1px dotted #000000;">
+    <div style="clear: both;"></div>
+    <{if $item.showline}>
+        <div style="font-size: 10px; text-align: right; border-bottom: 1px dotted #000000;">
     <{/if}> <{if $block.truncate}>
-    <div style="font-size: 10px; text-align: right;">
-        <a href="<{$item.itemurl}>"><{$block.lang_readmore}></a></div>
+        <div style="font-size: 10px; text-align: right;">
+            <a href="<{$item.itemurl}>"><{$block.lang_readmore}></a></div>
     <{/if}>
-</div>
+    </div>
 
 <{/if}>    <{/foreach}><{/if}>
diff --git a/publisher/templates/blocks/publisher_latest_files.tpl b/publisher/templates/blocks/publisher_latest_files.tpl
index 7de5f15d..bdf5379f 100644
--- a/publisher/templates/blocks/publisher_latest_files.tpl
+++ b/publisher/templates/blocks/publisher_latest_files.tpl
@@ -1,5 +1,5 @@
 <ul>
     <{foreach item=file from=$block.files}>
-    <li><{$file.link}> (<{$file.new}>)</li>
+        <li><{$file.link}> (<{$file.new}>)</li>
     <{/foreach}>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/publisher/templates/blocks/publisher_latest_news.tpl b/publisher/templates/blocks/publisher_latest_news.tpl
index 9c25c031..e3c76123 100644
--- a/publisher/templates/blocks/publisher_latest_news.tpl
+++ b/publisher/templates/blocks/publisher_latest_news.tpl
@@ -1,219 +1,208 @@
 <{if $block.template == 'normal'}><{if $block.latestnews_scroll }>
-<marquee behavior='scroll' align='center' direction='<{$block.scrolldir}>' height='<{$block.scrollheight}>' scrollamount='3' scrolldelay='<{$block.scrollspeed}>' onmouseover='this.stop()' onmouseout='this.start()'>
-    <{/if}> <{section name=i loop=$block.columns}>
+    <marquee behavior='scroll' align='center' direction='<{$block.scrolldir}>' height='<{$block.scrollheight}>' scrollamount='3' scrolldelay='<{$block.scrollspeed}>' onmouseover='this.stop()' onmouseout='this.start()'>
+<{/if}> <{section name=i loop=$block.columns}>
     <ul>
         <{foreach item=item from=$block.columns[i]}>
-        <li><{if $item.posttime }>[ <{$item.posttime}> ]:<{/if}> <{$item.topic_title}> <{$item.title}></li>
+            <li><{if $item.posttime }>[ <{$item.posttime}> ]:<{/if}> <{$item.topic_title}> <{$item.title}></li>
         <{/foreach}>
     </ul>
-    <{/section}> <{if $block.latestnews_scroll }>
-</marquee><{/if}><{/if}>
+<{/section}> <{if $block.latestnews_scroll }>
+    </marquee><{/if}><{/if}>
 
 <{if $block.template == 'extended'}>
 
-<{php}>
-    $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/jquery.popeye.css');
-    $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/jquery.popeye.style.css');
-    $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/publisher.css');
-<{/php}>
+    <{php}>
+        $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/jquery.popeye.css');
+        $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/jquery.popeye.style.css');
+        $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/publisher.css');
+    <{/php}>
 
-<{if $block.latestnews_scroll }>
-<marquee behavior='scroll' align='center' direction='<{$block.scrolldir}>' height='<{$block.scrollheight}>' scrollamount='3' scrolldelay='<{$block.scrollspeed}>' onmouseover='this.stop()' onmouseout='this.start()'>
+    <{if $block.latestnews_scroll }>
+        <marquee behavior='scroll' align='center' direction='<{$block.scrolldir}>' height='<{$block.scrollheight}>' scrollamount='3' scrolldelay='<{$block.scrollspeed}>' onmouseover='this.stop()' onmouseout='this.start()'>
     <{/if}>
-
     <table width='100%' border='0'>
         <tr>
             <{section name=i loop=$block.columns}>
-            <td width="<{$block.spec.columnwidth}>%">
-                <{foreach item=item from=$block.columns[i]}>
-
-                <div class="itemHead"><{$item.admin}>
-                    <span class="itemTitle"><{$item.topic_title}><{$item.title}></span>
-                </div>
-                <{if $block.poster or $item.posttime or $item.read }>
-                <div class="itemInfo">
-                    <span class="itemPoster"><{$item.poster}></span>
-                    <span class="itemPostDate"><{$item.posttime}><{$item.read}></span>
-                </div>
-                <{/if}>
-                <{$item.image}>
-                <{if $block.letters != 0}>
-                <div style="text-align:justify; padding:5px;">
-                    <{$item.text}>
-                    <div style="clear:both;"></div>
-                </div>
-				<{/if}>
-                <div class="itemFoot">
-                    <span class="itemPermaLink"><{$item.more}><{$item.comment}><{$item.print}><{$item.pdf}><{$item.email}></span>
-                </div>
-
-                <{/foreach}>
-            </td>
+                <td width="<{$block.spec.columnwidth}>%">
+                    <{foreach item=item from=$block.columns[i]}>
+                        <div class="itemHead"><{$item.admin}>
+                            <span class="itemTitle"><{$item.topic_title}><{$item.title}></span>
+                        </div>
+                        <{if $block.poster || $item.posttime || $item.read }>
+                            <div class="itemInfo">
+                                <span class="itemPoster"><{$item.poster}></span>
+                                <span class="itemPostDate"><{$item.posttime}><{$item.read}></span>
+                            </div>
+                        <{/if}>
+                        <{$item.image}>
+                        <{if $block.letters != 0}>
+                            <div style="text-align:justify; padding:5px;">
+                                <{$item.text}>
+                                <div style="clear:both;"></div>
+                            </div>
+                        <{/if}>
+                        <div class="itemFoot">
+                            <span class="itemPermaLink"><{$item.more}><{$item.comment}><{$item.print}><{$item.pdf}><{$item.email}></span>
+                        </div>
+                    <{/foreach}>
+                </td>
             <{/section}>
         </tr>
     </table>
-
     <{if $block.latestnews_scroll }>
-</marquee><{/if}>
+        </marquee><{/if}>
 
-<div><{$block.morelink}><{$block.topiclink}><{$block.archivelink}><{$block.submitlink}></div><{/if}>
+    <div><{$block.morelink}><{$block.topiclink}><{$block.archivelink}><{$block.submitlink}></div><{/if}>
 
 <{if $block.template == 'ticker'}>
 <marquee behavior='scroll' align='middle' direction='<{$block.scrolldir}>' height='<{$block.scrollheight}>' scrollamount='3' scrolldelay='<{$block.scrollspeed}>' onmouseover='this.stop()' onmouseout='this.start()'>
     <{section name=i loop=$block.columns}>
-    <div style="padding:10px;">
-        <{foreach item=item from=$block.columns[i]}> &nbsp;<{$item.title}>&nbsp; <{/foreach}>
-    </div>
+        <div style="padding:10px;">
+            <{foreach item=item from=$block.columns[i]}> &nbsp;<{$item.title}>&nbsp; <{/foreach}>
+        </div>
     <{/section}>
-</marquee><{/if}>
+    </marquee><{/if}>
 
 <{if $block.template == 'slider1'}>
 
-<{php}>$GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/jquery.js');
-    $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/jquery.popeye.css');
-    $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/jquery.popeye.style.css');
-    $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/publisher.css');<{/php}>
+    <{php}>$GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/jquery.js');
+        $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/jquery.popeye.css');
+        $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/jquery.popeye.style.css');
+        $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/publisher.css');<{/php}>
+    <script type="text/javascript">
+        jQuery(document).ready(function () {
 
-<script type="text/javascript">
-    jQuery(document).ready(function()
-    {
+            //Execute the slideShow, set 4 seconds for each images
+            slideShow(5000);
 
-        //Execute the slideShow, set 4 seconds for each images
-        slideShow(5000);
-
-    });
+        });
 
-    function slideShow(speed)
-    {
+        function slideShow(speed) {
 
 
-        //append a LI item to the UL list for displaying caption
-        $('ul.pub_slideshow1').append('<LI id=pub_slideshow1-caption class=caption><DIV class=pub_slideshow1-caption-container><H3></H3><P></P></DIV></LI>');
+            //append a LI item to the UL list for displaying caption
+            $('ul.pub_slideshow1').append('<LI id=pub_slideshow1-caption class=caption><DIV class=pub_slideshow1-caption-container><H3></H3><P></P></DIV></LI>');
 
-        //Set the opacity of all images to 0
-        $('ul.pub_slideshow1 li').css({opacity: 0.0});
+            //Set the opacity of all images to 0
+            $('ul.pub_slideshow1 li').css({opacity: 0.0});
 
-        //Get the first image and display it (set it to full opacity)
-        $('ul.pub_slideshow1 li:first').css({opacity: 1.0});
+            //Get the first image and display it (set it to full opacity)
+            $('ul.pub_slideshow1 li:first').css({opacity: 1.0});
 
-        //Get the caption of the first image from REL attribute and display it
-        $('#pub_slideshow1-caption h3').html($('ul.pub_slideshow1 a:first').find('img').attr('title'));
+            //Get the caption of the first image from REL attribute and display it
+            $('#pub_slideshow1-caption h3').tpl($('ul.pub_slideshow1 a:first').find('img').attr('title'));
 //        $('#pub_slideshow1-caption').find('h3').html($('ul.pub_slideshow1 a:first').find('img').attr('title')); //suggested by PhpStorm
 
-        $('#pub_slideshow1-caption p').html($('ul.pub_slideshow1 a:first').find('img').attr('alt'));
+            $('#pub_slideshow1-caption p').tpl($('ul.pub_slideshow1 a:first').find('img').attr('alt'));
 
-        //Display the caption
-        $('#pub_slideshow1-caption').css({opacity: 0.7, bottom:0});
+            //Display the caption
+            $('#pub_slideshow1-caption').css({opacity: 0.7, bottom: 0});
 
-        //Call the gallery function to run the slideshow
-        var timer = setInterval('gallery()', speed);
+            //Call the gallery function to run the slideshow
+            var timer = setInterval('gallery()', speed);
 
-        //pause the slideshow on mouse over
-        $('ul.pub_slideshow1').hover(
-                function ()
-                {
-                    clearInterval(timer);
-                },
-                function ()
-                {
-                    timer = setInterval('gallery()', speed);
-                }
-                );
+            //pause the slideshow on mouse over
+            $('ul.pub_slideshow1').hover(
+                    function () {
+                        clearInterval(timer);
+                    },
+                    function () {
+                        timer = setInterval('gallery()', speed);
+                    }
+            );
 
-    }
+        }
 
-    function gallery()
-    {
+        function gallery() {
 
 
-        //if no IMGs have the show class, grab the first image
-        var current = ($('ul.pub_slideshow1 li.show') ? $('ul.pub_slideshow1 li.show') : $('#ul.pub_slideshow1 li:first'));
+            //if no IMGs have the show class, grab the first image
+            var current = ($('ul.pub_slideshow1 li.show') ? $('ul.pub_slideshow1 li.show') : $('#ul.pub_slideshow1 li:first'));
 
-        //Get next image, if it reached the end of the slideshow, rotate it back to the first image
-        var next = ((current.next().length) ? ((current.next().attr('id') == 'pub_slideshow1-caption') ? $('ul.pub_slideshow1 li:first') : current.next()) : $('ul.pub_slideshow1 li:first'));
+            //Get next image, if it reached the end of the slideshow, rotate it back to the first image
+            var next = ((current.next().length) ? ((current.next().attr('id') == 'pub_slideshow1-caption') ? $('ul.pub_slideshow1 li:first') : current.next()) : $('ul.pub_slideshow1 li:first'));
 
-        //Get next image caption
-        var title = next.find('img').attr('title');
-        var desc = next.find('img').attr('alt');
+            //Get next image caption
+            var title = next.find('img').attr('title');
+            var desc = next.find('img').attr('alt');
 
-        //Set the fade in effect for the next image, show class has higher z-index
-        next.css({opacity: 0.0}).addClass('show').animate({opacity: 1.0}, 1000);
+            //Set the fade in effect for the next image, show class has higher z-index
+            next.css({opacity: 0.0}).addClass('show').animate({opacity: 1.0}, 1000);
 
-        //Hide the caption first, and then set and display the caption
-        $('#pub_slideshow1-caption').animate({bottom:-70}, 300, function ()
-        {
-            //Display the content
-            $('#pub_slideshow1-caption h3').html(title);
-            $('#pub_slideshow1-caption p').html(desc);
-            $('#pub_slideshow1-caption').animate({bottom:0}, 500);
-        });
-
-        //Hide the current image
-        current.animate({opacity: 0.0}, 1000).removeClass('show');
+            //Hide the caption first, and then set and display the caption
+            $('#pub_slideshow1-caption').animate({bottom: -70}, 300, function () {
+                //Display the content
+                $('#pub_slideshow1-caption h3')._createTrPlaceholder(title);
+                $('#pub_slideshow1-caption p').tpl(desc);
+                $('#pub_slideshow1-caption').animate({bottom: 0}, 500);
+            });
 
-    }
-</script>
+            //Hide the current image
+            current.animate({opacity: 0.0}, 1000).removeClass('show');
 
-<{section name=i}>
+        }
+    </script>
+    <{section name=i}>
 
-<ul class="pub_slideshow1">
-    <{foreach item=item from=$block.columns[i]}>
-    <li>
-        <a href="<{$item.itemurl}>"><img src="<{$item.item_image}>" width="100%" height="<{$block.imgheight}>" title="<{$item.alt}>" alt="<{$item.text}>" /></a>
-    </li>
-    <{/foreach}>
-</ul><{/section}>
+        <ul class="pub_slideshow1">
+        <{foreach item=item from=$block.columns[i]}>
+            <li>
+                <a href="<{$item.itemurl}>"><img src="<{$item.item_image}>" width="100%" height="<{$block.imgheight}>" title="<{$item.alt}>" alt="<{$item.text}>"/></a>
+            </li>
+        <{/foreach}>
+        </ul><{/section}>
 
 <{/if}>
 
 <{if $block.template == 'slider2'}>
 
-<{php}>$GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/jquery.js');
-    $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/jquery.popeye.css');
-    $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/jquery.popeye.style.css');
-    $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/publisher.css');
-    $GLOBALS['xoTheme']->addScript(PUBLISHER_URL . '/assets/js/jquery.easing.js');
-    $GLOBALS['xoTheme']->addScript(PUBLISHER_URL . '/assets/js/script.easing.js');<{/php}>
-
-<script type="text/javascript">
-    jQuery(document).ready(function()
-    {
-        jQuery('#lofslidecontent45').lofJSidernews({interval:4000,
-            direction:'opacity',
-            duration:1000,
-            easing:'easeInOutSine'});
-    });
-
-</script>
-
-<{section name=i}>
-<div id="lofslidecontent45" class="lof-slidecontent">
-
-    <div class="lof-main-outer">
-        <ul class="lof-main-wapper">
-            <{foreach item=item from=$block.columns[i]}>
-            <li>
-                <img src="<{$item.item_image}>" alt="<{$item.alt}>" width="<{$block.imgwidth}>" height="<{$block.imgheight}>" />
-            </li>
-            <{/foreach}>
-        </ul>
-    </div>
-
-    <div class="lof-navigator-outer">
-        <ul class="lof-navigator">
-            <{foreach item=item from=$block.columns[i]}>
-            <li>
-                <div>
-                    <img src="<{$item.item_image}>" alt="" width="60" height="60" />
-                    <h3><a href="<{$item.itemurl}>"> <{$item.alt}> </a></h3>
-                </div>
-            </li>
-            <{/foreach}>
-        </ul>
-    </div>
-</div>
-<script type="text/javascript">
+    <{php}>$GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/jquery.js');
+        $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/jquery.popeye.css');
+        $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/jquery.popeye.style.css');
+        $GLOBALS['xoTheme']->addStylesheet(PUBLISHER_URL . '/assets/css/publisher.css');
+        $GLOBALS['xoTheme']->addScript(PUBLISHER_URL . '/assets/js/jquery.easing.js');
+        $GLOBALS['xoTheme']->addScript(PUBLISHER_URL . '/assets/js/script.easing.js');<{/php}>
+    <script type="text/javascript">
+        jQuery(document).ready(function () {
+            jQuery('#lofslidecontent45').lofJSidernews({
+                interval: 4000,
+                direction: 'opacity',
+                duration: 1000,
+                easing: 'easeInOutSine'
+            });
+        });
 
-</script><{/section}>
+    </script>
+    <{section name=i}>
+        <div id="lofslidecontent45" class="lof-slidecontent">
+
+            <div class="lof-main-outer">
+                <ul class="lof-main-wapper">
+                    <{foreach item=item from=$block.columns[i]}>
+                        <li>
+                            <img src="<{$item.item_image}>" alt="<{$item.alt}>" width="<{$block.imgwidth}>" height="<{$block.imgheight}>"/>
+                        </li>
+                    <{/foreach}>
+                </ul>
+            </div>
+
+            <div class="lof-navigator-outer">
+                <ul class="lof-navigator">
+                    <{foreach item=item from=$block.columns[i]}>
+                        <li>
+                            <div>
+                                <img src="<{$item.item_image}>" alt="" width="60" height="60"/>
+
+                                <h3><a href="<{$item.itemurl}>"> <{$item.alt}> </a></h3>
+                            </div>
+                        </li>
+                    <{/foreach}>
+                </ul>
+            </div>
+        </div>
+        <script type="text/javascript">
+
+        </script>
+    <{/section}>
 
 <{/if}>
diff --git a/publisher/templates/blocks/publisher_search_block.tpl b/publisher/templates/blocks/publisher_search_block.tpl
index 268a975a..25219af4 100644
--- a/publisher/templates/blocks/publisher_search_block.tpl
+++ b/publisher/templates/blocks/publisher_search_block.tpl
@@ -1,4 +1,4 @@
-<form name="search" action="<{$block.publisher_url}>/search.php" method="post">
+<form name="search" action="<{$block.moduleUrl}>/search.php" method="post">
     <table class="outer" border="0" cellpadding="1" cellspacing="0" align="center" width="95%">
         <tr>
             <td class="even"><strong><{$smarty.const._SR_KEYWORDS}></strong>
@@ -11,7 +11,7 @@
         </tr>
         <!-- <tr>
         <td class="head" align="right"><strong><{$smarty.const._SR_TYPE}></strong></td>
-        <td class="even"><{$block.type_select}></td>
+        <td class="even"><{$block.typeSelect}></td>
       </tr>  -->
         <tr>
             <td class="even">
@@ -22,7 +22,7 @@
         </tr>
         <!--  <tr>
             <td class="head" align="right"><strong><{$smarty.const._SR_SEARCHIN}></strong></td>
-            <td class="even"><{$block.searchin_select}></td>
+            <td class="even"><{$block.searchSelect}></td>
           </tr>    -->
         <tr>
             <td class="even">
@@ -35,7 +35,7 @@
         </tr>
         <!-- <tr>
        <td class="head" align="right"><strong><{$smarty.const._CO_PUBLISHER_SORTBY}></strong>&nbsp;</td>
-       <td class="even"><{$block.sortby_select}></td>
+       <td class="even"><{$block.sortbySelect}></td>
      </tr>   --><{if $block.search_rule}>
         <tr>
             <td class="even"><strong><{$smarty.const._SR_SEARCHRULE}></strong>&nbsp;
diff --git a/publisher/templates/publisher_addfile.tpl b/publisher/templates/publisher_addfile.tpl
index d7aab005..379aa9c1 100644
--- a/publisher/templates/publisher_addfile.tpl
+++ b/publisher/templates/publisher_addfile.tpl
@@ -1,23 +1,24 @@
 <{include file="db:publisher_header.tpl" item=$item}>
 
-<div class="publisher_infotitle"><{$lang_intro_title}></div>
-<div class="publisher_infotext"><{$lang_intro_text}></div>
+<div class="publisher_infotitle"><{$langIntroTitle}></div>
+<div class="publisher_infotext"><{$langIntroText}></div>
 <br/><{$form.javascript}>
 <form name="<{$form.name}>" action="<{$form.action}>" method="<{$form.method}>" <{$form.extra}>>
-<table class="outer" cellspacing="1">
-    <tr>
-        <th colspan="2"><{$form.title}></th>
-    </tr>
-    <!-- start of form elements loop --><{foreach item=element from=$form.elements}> <{if $element.hidden != true}>
-    <tr>
-        <td class="head"><{$element.caption}> <{if $element.required}> *<{/if}> <{if $element.description}>
-            <div style="font-weight: normal;"><{$element.description}></div>
-            <{/if}>
-        </td>
-        <td class="<{cycle values=" even,odd"}>"><{$element.body}></td>
-    </tr>
-    <{else}> <{$element.body}> <{/if}> <{/foreach}><!-- end of form elements loop -->
-</table></form>
+    <table class="outer" cellspacing="1">
+        <tr>
+            <th colspan="2"><{$form.title}></th>
+        </tr>
+        <!-- start of form elements loop --><{foreach item=element from=$form.elements}> <{if $element.hidden != true}>
+            <tr>
+                <td class="head"><{$element.caption}> <{if $element.required}> *<{/if}> <{if $element.description}>
+                        <div style="font-weight: normal;"><{$element.description}></div>
+                    <{/if}>
+                </td>
+                <td class="<{cycle values=" even,odd"}>"><{$element.body}></td>
+            </tr>
+        <{else}> <{$element.body}> <{/if}> <{/foreach}><!-- end of form elements loop -->
+    </table>
+</form>
 
 <{if $isAdmin == 1}>
-<div class="publisher_adminlinks"><{$publisher_adminpage}></div><{/if}>
+    <div class="publisher_adminlinks"><{$publisher_adminpage}></div><{/if}>
diff --git a/publisher/templates/publisher_archive.tpl b/publisher/templates/publisher_archive.tpl
index 70df0843..79cc231b 100644
--- a/publisher/templates/publisher_archive.tpl
+++ b/publisher/templates/publisher_archive.tpl
@@ -18,23 +18,22 @@
 </table>
 
 <{if $show_articles == true}>
-<table>
-    <tr>
-        <th><{$lang_articles}></th>
-        <th align="center"><{$lang_actions}></th>
-        <th align="center"><{$lang_views}></th>
-        <th align="center"><{$lang_date}></th>
-    </tr>
-    <{foreach item=story from=$stories}>
-    <tr class="<{cycle values=" even,odd"}>">
-    <td><{$story.title}></td>
-    <td align="center">
-        <a href="<{$story.print_link}>" rel="nofollow"><img src="<{$xoops_url}>/modules/<{$module_dirname}>/assets/images/links/print.gif" border="0" alt="<{$lang_printer}>"/></a>
-        <a href="<{$story.mail_link}>" target="_top"><img src="<{$xoops_url}>/modules/<{$module_dirname}>/assets/images/links/friend.gif" border="0" alt="<{$smarty.const._MD_PUBLISHER_SENDSTORY}>"/></a>
-    </td>
-    <td align="center"><{$story.counter}></td>
-    <td align="center"><{$story.date}></td>
-    </tr><{/foreach}>
-</table>
-
-<div><{$lang_storytotal}></div><{/if}>
+    <table>
+        <tr>
+            <th><{$lang_articles}></th>
+            <th align="center"><{$lang_actions}></th>
+            <th align="center"><{$lang_views}></th>
+            <th align="center"><{$lang_date}></th>
+        </tr>
+        <{foreach item=story from=$stories}>
+        <tr class="<{cycle values=" even,odd"}>">
+            <td><{$story.title}></td>
+            <td align="center">
+                <a href="<{$story.print_link}>" rel="nofollow"><img src="<{$xoops_url}>/modules/<{$module_dirname}>/assets/images/links/print.gif" border="0" alt="<{$lang_printer}>"/></a>
+                <a href="<{$story.mail_link}>" target="_top"><img src="<{$xoops_url}>/modules/<{$module_dirname}>/assets/images/links/friend.gif" border="0" alt="<{$smarty.const._MD_PUBLISHER_SENDSTORY}>"/></a>
+            </td>
+            <td align="center"><{$story.counter}></td>
+            <td align="center"><{$story.date}></td>
+            </tr><{/foreach}>
+    </table>
+    <div><{$lang_storytotal}></div><{/if}>
diff --git a/publisher/templates/publisher_author_items.tpl b/publisher/templates/publisher_author_items.tpl
index 2c2f1413..5c8a9398 100644
--- a/publisher/templates/publisher_author_items.tpl
+++ b/publisher/templates/publisher_author_items.tpl
@@ -3,56 +3,55 @@
 <table width='100%' border='0'>
 
     <{if $total_items == 0}>
-    <tr>
-        <td><{$smarty.const._MD_PUBLISHER_NO_AUTHOR_ITEMS}></td>
-    </tr>
+        <tr>
+            <td><{$smarty.const._MD_PUBLISHER_NO_AUTHOR_ITEMS}></td>
+        </tr>
     <{/if}>
 
     <{foreach item=category from=$categories}>
-    <tr>
-        <{if $rating}>
-        <th colspan='4'>
-            <{else}>
-        <th colspan='3'>
+        <tr>
+            <{if $rating}>
+            <th colspan='4'>
+                <{else}>
+            <th colspan='3'>
 
-            <{/if}> <{$category.link}>
-        </th>
-    </tr>
-    <tr>
-        <td><{$smarty.const._CO_PUBLISHER_DATESUB}></td>
-        <td><{$smarty.const._CO_PUBLISHER_TITLE}></td>
-        <td align='right'><{$smarty.const._MD_PUBLISHER_HITS}></td>
+                <{/if}> <{$category.link}>
+            </th>
+        </tr>
+        <tr>
+            <td><{$smarty.const._CO_PUBLISHER_DATESUB}></td>
+            <td><{$smarty.const._CO_PUBLISHER_TITLE}></td>
+            <td align='right'><{$smarty.const._MD_PUBLISHER_HITS}></td>
 
-        <{if $rating}>
-        <td align='right'><{$smarty.const._MD_PUBLISHER_VOTE_RATING}></td>
-        <{/if}>
-    </tr>
-    <{foreach item=item from=$category.items}>
-    <tr>
-        <td><{$item.published}></td>
-        <td><{$item.link}></td>
-        <td align='right'><{$item.hits}></td>
+            <{if $rating}>
+                <td align='right'><{$smarty.const._MD_PUBLISHER_VOTE_RATING}></td>
+            <{/if}>
+        </tr>
+        <{foreach item=item from=$category.items}>
+            <tr>
+                <td><{$item.published}></td>
+                <td><{$item.link}></td>
+                <td align='right'><{$item.hits}></td>
 
-        <{if $rating}>
-        <td align='right'><{$item.rating}></td>
-        <{/if}>
-    </tr>
-    <{/foreach}>
-    <tr>
-        <td colspan='2' align='left'><{$smarty.const._MD_PUBLISHER_TOTAL_ITEMS}><{$category.count_items}></td>
-        <td align='right'><{$smarty.const._MD_PUBLISHER_TOTAL_HITS}><{$category.count_hits}></td>
-        <{if $rating}>
-        <td>&nbsp;</td>
-        <{/if}>
-    </tr>
-
-    <tr>
-        <{if $rating}>
-        <td colspan='4'>
-            <{else}>
-        <td colspan='3'>
-            <{/if}> &nbsp;
-        </td>
-    </tr>
+                <{if $rating}>
+                    <td align='right'><{$item.rating}></td>
+                <{/if}>
+            </tr>
+        <{/foreach}>
+        <tr>
+            <td colspan='2' align='left'><{$smarty.const._MD_PUBLISHER_TOTAL_ITEMS}><{$category.count_items}></td>
+            <td align='right'><{$smarty.const._MD_PUBLISHER_TOTAL_HITS}><{$category.count_hits}></td>
+            <{if $rating}>
+                <td>&nbsp;</td>
+            <{/if}>
+        </tr>
+        <tr>
+            <{if $rating}>
+            <td colspan='4'>
+                <{else}>
+            <td colspan='3'>
+                <{/if}> &nbsp;
+            </td>
+        </tr>
     <{/foreach}>
 </table>
diff --git a/publisher/templates/publisher_categories_table.tpl b/publisher/templates/publisher_categories_table.tpl
index 2324fb34..acb5a5ec 100644
--- a/publisher/templates/publisher_categories_table.tpl
+++ b/publisher/templates/publisher_categories_table.tpl
@@ -4,56 +4,67 @@
         <td align="left" class="itemHead">
             <strong><{$smarty.const._CO_PUBLISHER_CATEGORY}></strong></td>
         <{if $displayarticlescount}>
-        <td align="left" width="70px" class="itemHead">
-            <strong><{$smarty.const._MD_PUBLISHER_ITEMS}></strong></td>
+            <td align="left" width="70px" class="itemHead">
+                <strong><{$smarty.const._MD_PUBLISHER_ITEMS}></strong></td>
         <{/if}> <{if $displaylastitem == 1}>
-        <td align="left" width="40%" class="itemHead">
-            <strong><{$smarty.const._MD_PUBLISHER_LAST_SMARTITEM}></strong></td>
+            <td align="left" width="40%" class="itemHead">
+                <strong><{$smarty.const._MD_PUBLISHER_LAST_SMARTITEM}></strong></td>
         <{/if}>
     </tr>
 
-    <!-- Start categories loop -->    <{foreach item=category from=$categories}>
-    <tr>
-        <td class="even" align="left">
-            <{if $category.image_path}> <{if $isAdmin == 1}>
-            <a href="<{$publisher_url}>/admin/category.php?op=mod&categoryid=<{$category.categoryid}>"><img src="<{$category.image_path}>" title="<{$smarty.const._MD_PUBLISHER_CATEGORY_EDIT}>" alt="<{$lang_editcategory}>"/></a>&nbsp; <{else}>
-            <img src="<{$category.image_path}>" alt="<{$category.name}>"/>&nbsp; <{/if}>                <!-- End with a selected image path -->                <{else}>                <!-- Start without a selected image path -->                    <{if $isAdmin == 1}>
-            <a href="<{$publisher_url}>/admin/category.php?op=mod&categoryid=<{$category.categoryid}>"><img src="<{$publisher_url}>/assets/images/links/cat.gif" title="<{$lang_editcategory}>" alt="<{$lang_editcategory}>"/></a>&nbsp; <{else}>
-            <img src="<{$publisher_url}>/assets/images/links/cat.gif" alt="<{$category.name}>"/>&nbsp; <{/if}>                <!-- End without a selected image path -->                <{/if}>
+    <!-- Start categories loop --> <{foreach item=category from=$categories}>
+        <tr>
+            <td class="even" align="left">
+                <{if $category.image_path}> <{if $isAdmin == 1}>
+                    <a href="<{$moduleUrl}>/admin/category.php?op=mod&categoryid=<{$category.categoryid}>"><img src="<{$category.image_path}>" title="<{$smarty.const._MD_PUBLISHER_CATEGORY_EDIT}>" alt="<{$lang_editcategory}>"/></a>
+                    &nbsp; <{else}>
+                    <img src="<{$category.image_path}>" alt="<{$category.name}>"/>
+                    &nbsp; <{/if}>                <!-- End with a selected image path -->                <{else}>                <!-- Start without a selected image path -->                    <{if $isAdmin == 1}>
+                    <a href="<{$moduleUrl}>/admin/category.php?op=mod&categoryid=<{$category.categoryid}>"><img src="<{$moduleUrl}>/assets/images/links/cat.gif" title="<{$lang_editcategory}>" alt="<{$lang_editcategory}>"/></a>
+                    &nbsp; <{else}>
+                    <img src="<{$moduleUrl}>/assets/images/links/cat.gif" alt="<{$category.name}>"/>
+                    &nbsp; <{/if}>                <!-- End without a selected image path -->                <{/if}>
 
-            <{if $selected_category == $category.categoryid}>
-            <strong><{$category.name}></strong> <{else}>
-            <strong><{$category.categorylink}></strong> <{/if}>
+                <{if $selected_category == $category.categoryid}>
+                    <strong><{$category.name}></strong>
+                <{else}>
+                    <strong><{$category.categorylink}></strong>
+                <{/if}>
 
-            <br/>
-            <span class="publisher_category_dsc"><{$category.description}></span>
-        </td>
-        <{if $displayarticlescount}>
-        <td class="even" align="center">
-            <{if $category.total != 0}> <{$category.total}> <{/if}>
-        </td>
-        <{/if}> <{if $displaylastitem == 1}>
-        <td class="even" align="right"><{$category.last_title_link}></td>
-        <{/if}>
-    </tr>
-    <{if $category.subcats}> <{foreach item=subcat from=$category.subcats}>
-    <tr>
-        <td class="odd" align="left">
-            <div style="padding-left: 10px;">
-                <{if $subcat.image_path}> <{if $isAdmin == 1}>
-                <a href="<{$publisher_url}>/admin/category.php?op=mod&categoryid=<{$subcat.categoryid}>"><img src="<{$subcat.image_path}>" title="<{$lang_editcategory}>" alt="<{$lang_editcategory}>" alt="<{$lang_editcategory}>"/></a>&nbsp;<{$subcat.categorylink}> <{else}>
-                <img src="<{$subcat.image_path}>" title="<{$lang_editcategory}>" alt="<{$lang_editcategory}>"/>&nbsp;<{$subcat.categorylink}> <{/if}>                            <!-- End with a selected image path -->                            <{else}>                            <!-- Start without a selected image path -->                                <{if $isAdmin == 1}>
-                <a href="<{$publisher_url}>/admin/category.php?op=mod&categoryid=<{$subcat.categoryid}>"><img src="<{$publisher_url}>/assets/images/links/subcat.gif" title="<{$lang_editcategory}>" alt="<{$lang_editcategory}>" alt="<{$lang_editcategory}>"/></a>&nbsp;<{$subcat.categorylink}> <{else}>
-                <img src="<{$publisher_url}>/assets/images/links/subcat.gif" title="<{$lang_editcategory}>" alt="<{$lang_editcategory}>"/>&nbsp;<{$subcat.categorylink}> <{/if}> <{if $displaysubcatdsc == 1}>
-                <span class="publisher_category_dsc"><{$subcat.description}></span> <{/if}> <{/if}>
-            </div>
-        </td>
-        <{if $displayarticlescount}>
-        <td class="odd" align="center"><{$subcat.total}></td>
-        <{/if}> <{if $displaylastitem == 1}>
-        <td class="odd" align="right"><{$subcat.last_title_link}></td>
-        <{/if}>
-    </tr>
-    <{/foreach}> <{/if}> <{/foreach}>    <!-- End categories loop -->
+                <br/>
+                <span class="publisher_category_dsc"><{$category.description}></span>
+            </td>
+            <{if $displayarticlescount}>
+                <td class="even" align="center">
+                    <{if $category.total != 0}> <{$category.total}> <{/if}>
+                </td>
+            <{/if}> <{if $displaylastitem == 1}>
+                <td class="even" align="right"><{$category.last_title_link}></td>
+            <{/if}>
+        </tr>
+        <{if $category.subcats}> <{foreach item=subcat from=$category.subcats}>
+            <tr>
+                <td class="odd" align="left">
+                    <div style="padding-left: 10px;">
+                        <{if $subcat.image_path}> <{if $isAdmin == 1}>
+                            <a href="<{$moduleUrl}>/admin/category.php?op=mod&categoryid=<{$subcat.categoryid}>"><img src="<{$subcat.image_path}>" title="<{$lang_editcategory}>" alt="<{$lang_editcategory}>" alt="<{$lang_editcategory}>"/></a>
+                            &nbsp;<{$subcat.categorylink}> <{else}>
+                            <img src="<{$subcat.image_path}>" title="<{$lang_editcategory}>" alt="<{$lang_editcategory}>"/>
+                            &nbsp;<{$subcat.categorylink}> <{/if}>                            <!-- End with a selected image path -->                            <{else}>                            <!-- Start without a selected image path -->                                <{if $isAdmin == 1}>
+                            <a href="<{$moduleUrl}>/admin/category.php?op=mod&categoryid=<{$subcat.categoryid}>"><img src="<{$moduleUrl}>/assets/images/links/subcat.gif" title="<{$lang_editcategory}>" alt="<{$lang_editcategory}>" alt="<{$lang_editcategory}>"/></a>
+                            &nbsp;<{$subcat.categorylink}> <{else}>
+                            <img src="<{$moduleUrl}>/assets/images/links/subcat.gif" title="<{$lang_editcategory}>" alt="<{$lang_editcategory}>"/>
+                            &nbsp;<{$subcat.categorylink}> <{/if}> <{if $displaysubcatdsc == 1}>
+                            <span class="publisher_category_dsc"><{$subcat.description}></span>
+                        <{/if}> <{/if}>
+                    </div>
+                </td>
+                <{if $displayarticlescount}>
+                    <td class="odd" align="center"><{$subcat.total}></td>
+                <{/if}> <{if $displaylastitem == 1}>
+                    <td class="odd" align="right"><{$subcat.last_title_link}></td>
+                <{/if}>
+            </tr>
+        <{/foreach}> <{/if}> <{/foreach}> <!-- End categories loop -->
 </table>
 <div align="right"><{$catnavbar}></div><!-- End sub categories loop -->
diff --git a/publisher/templates/publisher_display_full.tpl b/publisher/templates/publisher_display_full.tpl
index ad82ee84..9a8947f2 100644
--- a/publisher/templates/publisher_display_full.tpl
+++ b/publisher/templates/publisher_display_full.tpl
@@ -7,7 +7,7 @@
     <{if $collapsable_heading == 1}>
         <div class="publisher_collaps_title">
             <a href='javascript:' onclick="toggle('toptable'); toggleIcon('toptableicon')">
-                <img id='toptableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/>
+                <img id='toptableicon' src='<{$moduleUrl}>/assets/images/links/close12.gif' alt=''/>
             </a>
             &nbsp;<{$lang_category_summary}>
         </div>
@@ -30,7 +30,7 @@
     <{if $collapsable_heading == 1}>
         <div class="publisher_collaps_title">
             <a href='javascript:' onclick="toggle('bottomtable'); toggleIcon('bottomtableicon')">
-            <img id='bottomtableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/>
+                <img id='bottomtableicon' src='<{$moduleUrl}>/assets/images/links/close12.gif' alt=''/>
             </a>
             &nbsp;<{$lang_items_title}>
         </div>
@@ -38,14 +38,11 @@
         <span class="publisher_collaps_info"><{$smarty.const._MD_PUBLISHER_ITEMS_INFO}></span>
     <{/if}>
     <div align="right"><{$navbar}></div>
-
     <!-- Start item loop -->
     <{foreach item=item from=$items}>
         <{include file="db:publisher_singleitem.tpl" item=$item}>
     <{/foreach}>    <!-- End item loop -->
-
     <div align="right"><{$navbar}></div>
-
     <{if $collapsable_heading == 1}>
         </div>
     <{/if}><!-- end of if $items -->
diff --git a/publisher/templates/publisher_display_list.tpl b/publisher/templates/publisher_display_list.tpl
index 411e33bd..81dae49a 100644
--- a/publisher/templates/publisher_display_list.tpl
+++ b/publisher/templates/publisher_display_list.tpl
@@ -3,60 +3,60 @@
 <!-- Display type is bullet list -->
 <div class="publisher_infotitle"><{$lang_category_summary}></div>
 <span class="publisher_collaps_info"><{$category.description}><br><br></span><!-- if the option is set, add the last item column --><{if $category && $displaylastitem == 1 && $items}>
-<div id="publisher_bullet_lastitem">
-    <strong><{$smarty.const._MD_PUBLISHER_LAST_SMARTITEM}> : <{$category.last_title_link}>
-</div>    <{/if}><br/>
+    <div id="publisher_bullet_lastitem">
+        <strong><{$smarty.const._MD_PUBLISHER_LAST_SMARTITEM}> : <{$category.last_title_link}>
+    </div>    <{/if}><br/>
 
 <!-- if we are on the index page OR inside a category that has subcats OR (inside a category with no subcats AND $display_category_summary is set to TRUE, let's display the summary table ! //--><{if $indexpage || $category.subcats || ($category && $display_category_summary)}>    <{include file='db:publisher_categories_table.tpl'}>
 <br/><!-- End of if !$category || $category.subcats || ($category && $display_category_summary) //--><{/if}>
 
 <{if $items}>    <{if $collapsable_heading == 1}>
-<div class="publisher_collaps_title">
-    <a href='javascript:' onclick="toggle('bottomtable'); toggleIcon('bottomtableicon')"><img id='bottomtableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/></a>&nbsp;<{$lang_items_title}>
-</div>
-<div id='bottomtable'>
-    <{else}> <{if $subcats}>
-    <div class="publisher_collaps_title"><strong><{$lang_items_title}></strong></div>
+    <div class="publisher_collaps_title">
+        <a href='javascript:' onclick="toggle('bottomtable'); toggleIcon('bottomtableicon')"><img id='bottomtableicon' src='<{$moduleUrl}>/assets/images/links/close12.gif' alt=''/></a>&nbsp;<{$lang_items_title}>
+    </div>
+    <div id='bottomtable'>
+<{else}> <{if $subcats}>
+        <div class="publisher_collaps_title"><strong><{$lang_items_title}></strong></div>
     <{/if}>    <!-- Content under the collapsable bar //-->    <{/if}>
-
     <table border="0" width="90%" cellspacing="0" cellpadding="0" align="center" class="outer">
         <tr>
             <td align="left" class="itemHead" width='60%'>
                 <strong>&nbsp;&nbsp;<{$smarty.const._CO_PUBLISHER_TITLE}></strong></td>
             <{if $display_date_col == 1}>
-            <td align="center" class="itemHead" width="30%">
-                <strong><{$smarty.const._MD_PUBLISHER_DATESUB}></strong></td>
+                <td align="center" class="itemHead" width="30%">
+                    <strong><{$smarty.const._MD_PUBLISHER_DATESUB}></strong></td>
             <{/if}> <{if $display_hits_col == 1}>
-            <td align="center" class="itemHead" width="10%">
-                <strong><{$smarty.const._MD_PUBLISHER_HITS}></strong></td>
+                <td align="center" class="itemHead" width="10%">
+                    <strong><{$smarty.const._MD_PUBLISHER_HITS}></strong></td>
             <{/if}>
         </tr>
         <!-- Start item loop -->
         <ul>
             <{foreach item=item from=$items}>
-            <tr>
-                <td class="odd">
-                    <div class="publisher_list" align="left">
-                        <li><{$item.titlelink}></li>
-                        <{if $show_subtitle && $item.subtitle}>
-                        <br /><em><{$item.subtitle}></em>
-                        <{/if}>
-                    </div>
-                </td>
+                <tr>
+                    <td class="odd">
+                        <div class="publisher_list" align="left">
+                            <li><{$item.titlelink}></li>
+                            <{if $show_subtitle && $item.subtitle}>
+                                <br/>
+                                <em><{$item.subtitle}></em>
+                            <{/if}>
+                        </div>
+                    </td>
 
-                <{if $display_date_col == 1}>
-                <td class="odd" align="left">
-                    <div class="publisher_list" align="center"><{$item.datesub}></div>
-                </td>
-                <{/if}>
+                    <{if $display_date_col == 1}>
+                        <td class="odd" align="left">
+                            <div class="publisher_list" align="center"><{$item.datesub}></div>
+                        </td>
+                    <{/if}>
 
-                <{if $display_hits_col == 1}>
-                <td class="odd" align="left">
-                    <div class="publisher_list" align="center"><{$item.counter}></div>
-                </td>
-                <{/if}>
+                    <{if $display_hits_col == 1}>
+                        <td class="odd" align="left">
+                            <div class="publisher_list" align="center"><{$item.counter}></div>
+                        </td>
+                    <{/if}>
 
-            </tr>
+                </tr>
             <{/foreach}>
         </ul>
         <!-- End item loop -->
@@ -64,9 +64,9 @@
     </table>
     <div align="right"><{$navbar}></div>
     <{if $collapsable_heading == 1}>
-</div>    <{/if}><!-- end of if $items --><{/if}>
+        </div>    <{/if}><!-- end of if $items --><{/if}>
 
 <{if !$subcats && !$items}>
-<div class="publisher_infotext"><{$smarty.const._MD_PUBLISHER_EMPTY}></div><{/if}>
+    <div class="publisher_infotext"><{$smarty.const._MD_PUBLISHER_EMPTY}></div><{/if}>
 
 <{include file='db:publisher_footer.tpl'}>
diff --git a/publisher/templates/publisher_display_summary.tpl b/publisher/templates/publisher_display_summary.tpl
index 082fa9e4..34e05896 100644
--- a/publisher/templates/publisher_display_summary.tpl
+++ b/publisher/templates/publisher_display_summary.tpl
@@ -8,7 +8,7 @@
     <!-- let's begin the display of the other display type -->
     <{if $collapsable_heading == 1}>
         <div class="publisher_collaps_title">
-            <a href='javascript:' onclick="toggle('toptable'); toggleIcon('toptableicon')"><img id='toptableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/></a>&nbsp;<{$lang_category_summary}>
+            <a href='javascript:' onclick="toggle('toptable'); toggleIcon('toptableicon')"><img id='toptableicon' src='<{$moduleUrl}>/assets/images/links/close12.gif' alt=''/></a>&nbsp;<{$lang_category_summary}>
         </div>
         <div id='toptable'>
         <span class="publisher_collaps_info"">
@@ -29,7 +29,7 @@
     <{if $collapsable_heading == 1}>
         <div class="publisher_collaps_title">
             <a href='javascript:' onclick="toggle('bottomtable'); toggleIcon('bottomtableicon')">
-                <img id='bottomtableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/>
+                <img id='bottomtableicon' src='<{$moduleUrl}>/assets/images/links/close12.gif' alt=''/>
             </a>&nbsp;<{$lang_items_title}>
         </div>
         <div id='bottomtable'>
@@ -73,7 +73,7 @@
                     </td>
                 <{/if}>
             </tr>
-        <{/foreach}>            <!-- End item loop -->
+        <{/foreach}> <!-- End item loop -->
         <tr></tr>
     </table>
     <div align="right"><{$navbar}></div>
diff --git a/publisher/templates/publisher_display_wfsection.tpl b/publisher/templates/publisher_display_wfsection.tpl
index b5565f65..ef8052cc 100644
--- a/publisher/templates/publisher_display_wfsection.tpl
+++ b/publisher/templates/publisher_display_wfsection.tpl
@@ -1,99 +1,97 @@
 <{include file='db:publisher_header.tpl'}>
 
 <!--<{if $collapsable_heading == 1}>
-	<div class="publisher_collaps_title"><a href='javascript:;' onclick="toggle('toptable'); toggleIcon('toptableicon')"><img id='toptableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt='' /></a>&nbsp;<{$lang_category_summary}></div>
-	<div id='toptable'>
-	<span class="publisher_collaps_info""><{$lang_category_summary}></span>
+    <div class="publisher_collaps_title"><a href='javascript:;' onclick="toggle('toptable'); toggleIcon('toptableicon')"><img id='toptableicon' src='<{$moduleUrl}>/assets/images/links/close12.gif' alt='' /></a>&nbsp;<{$lang_category_summary}></div>
+    <div id='toptable'>
+    <span class="publisher_collaps_info""><{$lang_category_summary}></span>
 <{/if}> -->
 
 <{if $indexpage}>
-<div class="item">
-    <!-- Start categories loop -->        <{foreach item=category from=$categories}>
-    <div class="publisher_category_index_list" style="clear: both;">
-        <div class="publisher_categoryname"><{$category.categorylink}></div>
-        <div>
-            <{if $category.image_path}>
-            <img class="publisher_category_image" src="<{$category.image_path}>" alt="<{$category.name}>" width="<{$category_list_image_width}>"/> <{/if}> <{$category.description}>
+    <div class="item">
+    <!-- Start categories loop --> <{foreach item=category from=$categories}>
+        <div class="publisher_category_index_list" style="clear: both;">
+            <div class="publisher_categoryname"><{$category.categorylink}></div>
+            <div>
+                <{if $category.image_path}>
+                    <img class="publisher_category_image" src="<{$category.image_path}>" alt="<{$category.name}>" width="<{$category_list_image_width}>"/>
+                <{/if}> <{$category.description}>
+            </div>
+            <{if $category.subcats}>
+                <div class="publisher_subcats">
+                    <div class="publisher_subcats_info"><{$category.lang_subcategories}></div>
+                    <{foreach name=loop item=subcat from=$category.subcats}> <{$subcat.categorylink}><{if $smarty.foreach.loop.iteration < $category.subcatscount}> -<{/if}> <{/foreach}>
+                </div>
+            <{/if}>
+            <div style="clear: both;"></div>
         </div>
-        <{if $category.subcats}>
-        <div class="publisher_subcats">
-            <div class="publisher_subcats_info"><{$category.lang_subcategories}></div>
-            <{foreach name=loop item=subcat from=$category.subcats}> <{$subcat.categorylink}><{if $smarty.foreach.loop.iteration < $category.subcatscount}> -<{/if}> <{/foreach}>
+    <{/foreach}> <!-- End categories loop -->
+    </div><{else}>
+    <div>
+    <!-- Start categories loop --> <{foreach item=category from=$categories}>
+        <div style="clear: both;">
+            <div>
+                <{if $category.image_path}>
+                    <img class="publisher_category_image" src="<{$category.image_path}>" alt="<{$category.name}>" width="<{$category_list_image_width}>"/>
+                <{/if}> <{$category.description}>
+            </div>
+            <div class="publisher_category_header">
+                <{$category.header}>
+            </div>
+            <div style="clear: both;"></div>
+            <{if $category.subcats}>
+                <div class="publisher_subcats">
+                    <div class="publisher_subcats_info"><{$category.lang_subcategories}></div>
+                    <{foreach name=loop item=subcat from=$category.subcats}> <{$subcat.categorylink}><{if $smarty.foreach.loop.iteration < $category.subcatscount}> -<{/if}> <{/foreach}>
+                </div>
+            <{/if}>
         </div>
-        <{/if}>
-        <div style="clear: both;"></div>
-    </div>
-
-    <{/foreach}>        <!-- End categories loop -->
-</div><{else}>
-<div>
-    <!-- Start categories loop -->        <{foreach item=category from=$categories}>
-    <div style="clear: both;">
-        <div>
-            <{if $category.image_path}>
-            <img class="publisher_category_image" src="<{$category.image_path}>" alt="<{$category.name}>" width="<{$category_list_image_width}>"/> <{/if}> <{$category.description}>
-        </div>
-        <div class="publisher_category_header">
-            <{$category.header}>
-        </div>
-        <div style="clear: both;"></div>
-        <{if $category.subcats}>
-        <div class="publisher_subcats">
-            <div class="publisher_subcats_info"><{$category.lang_subcategories}></div>
-            <{foreach name=loop item=subcat from=$category.subcats}> <{$subcat.categorylink}><{if $smarty.foreach.loop.iteration < $category.subcatscount}> -<{/if}> <{/foreach}>
-        </div>
-        <{/if}>
-    </div>
-    <{/foreach}>        <!-- End categories loop -->
-</div><{/if}>
+    <{/foreach}> <!-- End categories loop -->
+    </div><{/if}>
 
 <!--<{if $collapsable_heading == 1}>
-	</div>
+    </div>
 <{/if}>-->
 <div class="publisher_items_list">
     <{if $items}> <{if $collapsable_heading == 1}>
-    <div class="publisher_collaps_title">
-        <a href='javascript:' onclick="toggle('bottomtable'); toggleIcon('bottomtableicon')"><img id='bottomtableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/></a>&nbsp;<{$lang_items_title}>
-    </div>
-    <div id='bottomtable'>
-        <span class="publisher_collaps_info"><{$smarty.const._MD_PUBLISHER_ITEMS_INFO}></span> <{/if}>
+        <div class="publisher_collaps_title">
+            <a href='javascript:' onclick="toggle('bottomtable'); toggleIcon('bottomtableicon')"><img id='bottomtableicon' src='<{$moduleUrl}>/assets/images/links/close12.gif' alt=''/></a>&nbsp;<{$lang_items_title}>
+        </div>
+        <div id='bottomtable'>
+        <span class="publisher_collaps_info"><{$smarty.const._MD_PUBLISHER_ITEMS_INFO}></span>
+    <{/if}>
         <div align="right"><{$category.navbar}></div>
-
         <div class="item">
             <{foreach item=item from=$items}>
-
-            <table>
-                <tr>
-                    <td style="background-color: rgb(231, 231, 231); font-weight: bold;"><{$item.datesub}></td>
-                </tr>
-                <tr>
-                    <td style="font-weight: bold;"><{$item.title}></td>
-                </tr>
-            </table>
-            <table style="border-bottom: 1px solid rgb(231, 231, 231);">
-                <tr>
-                    <td style="padding-left: 35px;"><{$item.summary}></td>
-                </tr>
-                <tr></tr>
-            </table>
-            <table>
-                <tr>
-                    <td style="text-align: right;" align="right">
-                        <a href="javascript:openWithSelfMain('<{$publisher_url}>/pop.php?itemid=<{$item.itemid}>', 'smartpopup', 700, 519);"><img src="<{$publisher_url}>/assets/images/links/print.gif" alt="" style="vertical-align: bottom;" align="right"></a>
-                    </td>
-                </tr>
-                <tr></tr>
-            </table>
+                <table>
+                    <tr>
+                        <td style="background-color: #e7e7e7; font-weight: bold;"><{$item.datesub}></td>
+                    </tr>
+                    <tr>
+                        <td style="font-weight: bold;"><{$item.title}></td>
+                    </tr>
+                </table>
+                <table style="border-bottom: 1px solid #e7e7e7;">
+                    <tr>
+                        <td style="padding-left: 35px;"><{$item.summary}></td>
+                    </tr>
+                    <tr></tr>
+                </table>
+                <table>
+                    <tr>
+                        <td style="text-align: right;" align="right">
+                            <a href="javascript:openWithSelfMain('<{$moduleUrl}>/pop.php?itemid=<{$item.itemid}>', 'smartpopup', 700, 519);"><img src="<{$moduleUrl}>/assets/images/links/print.gif" alt="" style="vertical-align: bottom;" align="right"></a>
+                        </td>
+                    </tr>
+                    <tr></tr>
+                </table>
             <{/foreach}>
         </div>
-
         <div align="right"><{$category.navbar}></div>
-
         <{$press_room_footer}>
 
         <{if $collapsable_heading == 1}>
-    </div>
-    <{/if}>    <!-- end of if $items --> <{/if}>
+            </div>
+        <{/if}>    <!-- end of if $items --> <{/if}>
 </div>
 
 <{include file='db:publisher_footer.tpl'}>
diff --git a/publisher/templates/publisher_footer.tpl b/publisher/templates/publisher_footer.tpl
index a8cfb8d1..dc82cc4d 100644
--- a/publisher/templates/publisher_footer.tpl
+++ b/publisher/templates/publisher_footer.tpl
@@ -1,19 +1,20 @@
 <{if $isAdmin == 1}>
-<div class="publisher_adminlinks"><{$publisher_adminpage}></div><{/if}>
+    <div class="publisher_adminlinks"><{$publisher_adminpage}></div><{/if}>
 
 <{if ($commentatarticlelevel && $item.cancomment) || $com_rule != 0}>
-<table border="0" width="100%" cellspacing="1" cellpadding="0" align="center">
+    <table border="0" width="100%" cellspacing="1" cellpadding="0" align="center">
     <tr>
         <td colspan="3" align="left">
             <div style="text-align: center; padding: 3px; margin:3px;"> <{$commentsnav}> <{$lang_notice}></div>
             <div style="margin:3px; padding: 3px;">
-                <!-- start comments loop -->            <{if $comment_mode == "flat"}> <{include file="db:system_comments_flat.html"}> <{elseif $comment_mode == "thread"}> <{include file="db:system_comments_thread.html"}> <{elseif $comment_mode == "nest"}> <{include file="db:system_comments_nest.html"}> <{/if}>            <!-- end comments loop -->
+                <!-- start comments loop --> <{if $comment_mode == "flat"}> <{include file="db:system_comments_flat.tpl"}> <{elseif $comment_mode == "thread"}> <{include file="db:system_comments_thread.tpl"}> <{elseif $comment_mode == "nest"}> <{include file="db:system_comments_nest.tpl"}> <{/if}>
+                <!-- end comments loop -->
             </div>
         </td>
     </tr>
-</table><{/if}>
+    </table><{/if}>
 
 <{if $rssfeed_link != ""}>
-<div id="publisher_rpublisher_feed"><{$rssfeed_link}></div><{/if}>
+    <div id="publisher_rpublisher_feed"><{$rssfeed_link}></div><{/if}>
 
-<{include file='db:system_notification_select.html'}>
+<{include file='db:system_notification_select.tpl'}>
diff --git a/publisher/templates/publisher_header.tpl b/publisher/templates/publisher_header.tpl
index da5fa46f..e9ae90d0 100644
--- a/publisher/templates/publisher_header.tpl
+++ b/publisher/templates/publisher_header.tpl
@@ -1,58 +1,58 @@
 <{if $collapsable_heading == 1}>
-<script type="text/javascript"><!--
-function goto_URL(object)
-{
-    window.location.href = object.options[object.selectedIndex].value;
-}
+    <script type="text/javascript"><!--
+        function goto_URL(object) {
+            window.location.href = object.options[object.selectedIndex].value;
+        }
 
-function toggle(id)
-{
-    if (document.getElementById) {
-        obj = document.getElementById(id);
-    }
-    if (document.all) {
-        obj = document.all[id];
-    }
-    if (document.layers) {
-        obj = document.layers[id];
-    }
-    if (obj) {
-        if (obj.style.display == "none") {
-            obj.style.display = "";
-        } else {
-            obj.style.display = "none";
+        function toggle(id) {
+            if (document.getElementById) {
+                obj = document.getElementById(id);
+            }
+            if (document.all) {
+                obj = document.all[id];
+            }
+            if (document.layers) {
+                obj = document.layers[id];
+            }
+            if (obj) {
+                if (obj.style.display == "none") {
+                    obj.style.display = "";
+                } else {
+                    obj.style.display = "none";
+                }
+            }
+            return false;
         }
-    }
-    return false;
-}
 
-var iconClose = new Image();
-iconClose.src = 'assets/images/links/close12.gif';
-var iconOpen = new Image();
-iconOpen.src = 'assets/images/links/open12.gif';
+        var iconClose = new Image();
+        iconClose.src = '../assets/images/links/close12.gif';
+        var iconOpen = new Image();
+        iconOpen.src = '../assets/images/links/open12.gif';
 
-function toggleIcon(iconName)
-{
-    if (document.images[iconName].src == window.iconOpen.src) {
-        document.images[iconName].src = window.iconClose.src;
-    } else if (document.images[iconName].src == window.iconClose.src) {
-        document.images[iconName].src = window.iconOpen.src;
-    }
-}
+        function toggleIcon(iconName) {
+            if (document.images[iconName].src == window.iconOpen.src) {
+                document.images[iconName].src = window.iconClose.src;
+            } else if (document.images[iconName].src == window.iconClose.src) {
+                document.images[iconName].src = window.iconOpen.src;
+            }
+        }
 
-//-->
-</script><{/if}>
+        //-->
+    </script>
+<{/if}>
 
 <{if $publisher_display_breadcrumb}>
 
-<div class="publisher_headertable">
+    <div class="publisher_headertable">
     <{if $module_home}>
-    <span class="publisher_modulename"><{$module_home}></span> <{if $title_and_welcome}>
-    <span><{$lang_mainintro}></span> <{/if}> <{/if}> <{if $categoryPath}>
-            <span class="publisher_breadcrumb">
+        <span class="publisher_modulename"><{$module_home}></span>
+        <{if $title_and_welcome}>
+            <span><{$lang_mainintro}></span>
+        <{/if}> <{/if}> <{if $categoryPath}>
+    <span class="publisher_breadcrumb">
             <{if $module_home}>
                 &gt;
             <{/if}>
-            <{$categoryPath}></span>
-    <{/if}>
-</div><{/if}>
+        <{$categoryPath}></span>
+<{/if}>
+    </div><{/if}>
diff --git a/publisher/templates/publisher_item.tpl b/publisher/templates/publisher_item.tpl
index 8bb80270..06d8aa9f 100644
--- a/publisher/templates/publisher_item.tpl
+++ b/publisher/templates/publisher_item.tpl
@@ -3,187 +3,191 @@
 <div class="item">
     <h2><{$item.title}></h2>
     <{if $show_subtitle && $item.subtitle}>
-    <h3><{$item.subtitle}></h3>
+        <h3><{$item.subtitle}></h3>
     <{/if}> <{if $display_whowhen_link}>
-    <small><{$item.who_when}> (<{$item.counter}> <{$smarty.const._MD_PUBLISHER_READS}>)</small>
+        <small><{$item.who_when}> (<{$item.counter}> <{$smarty.const._MD_PUBLISHER_READS}>)</small>
     <{/if}>
     <div class="itemBody">
-        <!--
-            <{if $item.posterAvatar != 'blank.gif'}>
-            <img class="publisher_item_image" src="<{$xoops_url}>/uploads/<{$item.posterAvatar}>"  align="right" alt="<{$item.posterName}>" title="<{$item.posterName}>" />
-            <{/if}>
-        --><{if $pagenav}>
+
+            <{*<{if $item.posterAvatar != 'blank.gif'}>*}>
+            <{*<img class="publisher_item_image" src="<{$xoops_url}>/uploads/<{$item.posterAvatar}>"  align="right" alt="<{$item.posterName}>" title="<{$item.posterName}>" />*}>
+            <{*<{/if}>*}>
+
+        <{if $pagenav}>
         <div class="publisher_pagenav_top"><{$smarty.const._MD_PUBLISHER_PAGE}>: <{$pagenav}></div>
         <{/if}>
         <div class="itemText">
             <{if $item.image_path || $item.images}>
+                <div class="ppy" id="ppy1">
+                    <ul class="ppy-imglist">
+                        <{if $item.image_path}>
+                            <li>
+                                <a href="<{$item.image_path}>">
+                                    <img src="<{$item.image_thumb}>" alt="<{$item.image_name}>"/>
+                                </a>
+                            </li>
+                        <{/if}>
+                        <{foreach item=image from=$item.images}>
+                            <li>
+                                <a href="<{$image.path}>">
+                                    <img src="<{$image.thumb}>" alt="<{$image.name}>"/>
+                                </a>
+                            </li>
+                        <{/foreach}>
+                    </ul>
+                    <div class="ppy-outer">
+                        <div class="ppy-stage">
+                            <div class="ppy-nav">
+                                <div class="nav-wrap">
+                                    <a class="ppy-prev" title="<{$smarty.const._MD_PUBLISHER_PREVIOUSIMG}>"><{$smarty.const._MD_PUBLISHER_PREVIOUSIMG}></a>
+                                    <a class="ppy-switch-enlarge" title="<{$smarty.const._MD_PUBLISHER_ENLARGEIMG}>"><{$smarty.const._MD_PUBLISHER_ENLARGEIMG}></a>
+                                    <a class="ppy-switch-compact" title="<{$smarty.const._MD_PUBLISHER_CLOSE}>"><{$smarty.const._MD_PUBLISHER_CLOSE}></a>
+                                    <a class="ppy-next" title="<{$smarty.const._MD_PUBLISHER_NEXTIMG}>"><{$smarty.const._MD_PUBLISHER_NEXTIMG}></a>
+                                </div>
+                            </div>
 
-            <div class="ppy" id="ppy1">
-                <ul class="ppy-imglist">
-                    <{if $item.image_path}>
-                    <li>
-                        <a href="<{$item.image_path}>">
-                            <img src="<{$item.image_thumb}>" alt="<{$item.image_name}>" />
-                        </a>
-                    </li>
-                    <{/if}>
-                    <{foreach item=image from=$item.images}>
-                    <li>
-                        <a href="<{$image.path}>">
-                            <img src="<{$image.thumb}>" alt="<{$image.name}>" />
-                        </a>
-                    </li>
-                    <{/foreach}>
-                </ul>
-                <div class="ppy-outer">
-                    <div class="ppy-stage">
-                        <div class="ppy-nav">
-                            <div class="nav-wrap">
-                                <a class="ppy-prev" title="<{$smarty.const._MD_PUBLISHER_PREVIOUSIMG}>"><{$smarty.const._MD_PUBLISHER_PREVIOUSIMG}></a>
-                                <a class="ppy-switch-enlarge" title="<{$smarty.const._MD_PUBLISHER_ENLARGEIMG}>"><{$smarty.const._MD_PUBLISHER_ENLARGEIMG}></a>
-                                <a class="ppy-switch-compact" title="<{$smarty.const._MD_PUBLISHER_CLOSE}>"><{$smarty.const._MD_PUBLISHER_CLOSE}></a>
-                                <a class="ppy-next" title="<{$smarty.const._MD_PUBLISHER_NEXTIMG}>"><{$smarty.const._MD_PUBLISHER_NEXTIMG}></a>
+                            <div class="ppy-counter">
+                                <strong class="ppy-current"></strong> <{$smarty.const._MD_PUBLISHER_OF}>
+                                <strong class="ppy-total"></strong>
                             </div>
                         </div>
-
-                        <div class="ppy-counter">
-                            <strong class="ppy-current"></strong> <{$smarty.const._MD_PUBLISHER_OF}>
-                            <strong class="ppy-total"></strong>
+                        <div class="ppy-caption">
+                            <span class="ppy-text  blockTitle"></span>
                         </div>
                     </div>
-                    <div class="ppy-caption">
-                        <span class="ppy-text  blockTitle"></span>
-                    </div>
                 </div>
-            </div>
             <{/if}> <p><{$item.maintext}></p>
         </div>
         <div style="clear:both;"></div>
         <{if $item.embeded_files}>
-        <div id="publisher_embeded_files">
-            <{foreach item=file from=$item.embeded_files}>
-            <div><{$file.content}></div>
-            <{/foreach}>
-        </div>
+            <div id="publisher_embeded_files">
+                <{foreach item=file from=$item.embeded_files}>
+                    <div><{$file.content}></div>
+                <{/foreach}>
+            </div>
         <{/if}> <{if $pagenav}>
-        <div class="publisher_pagenav_bottom"><{$smarty.const._MD_PUBLISHER_PAGE}>: <{$pagenav}></div>
+            <div class="publisher_pagenav_bottom"><{$smarty.const._MD_PUBLISHER_PAGE}>: <{$pagenav}></div>
         <{/if}> <{if $tagbar}>
-        <p><{include file="db:tag_bar.tpl"}></p>
+            <p><{include file="db:tag_bar.tpl"}></p>
         <{/if}>
     </div>
     <{if $itemfooter}>
-    <div class="publisher_itemfooter"><{$itemfooter}></div>
+        <div class="publisher_itemfooter"><{$itemfooter}></div>
     <{/if}>
     <div class="publisher_pre_itemInfo">
         <div class="itemInfo" style="height: 14px;">
             <{if $display_comment_link && $item.cancomment}>
                 <span style="float: left;">
           <a href="<{$item.itemurl}>"><{$item.comments}> <{$smarty.const._MD_PUBLISHER_COMMENTS}></a>
-        </span> <{else}>
-            <span style="float: left;">&nbsp;</span> <{/if}> <{if $perm_author_items && $item.uid != 0}>
-        <span style="float: left; margin-left: 5px;">
-          <a href="<{$publisher_url}>/author_items.php?uid=<{$item.uid}>"><{$smarty.const._MD_PUBLISHER_ITEMS_SAME_AUTHOR}></a>
-        </span> <{/if}>
+        </span>
+            <{else}>
+                <span style="float: left;">&nbsp;</span>
+            <{/if}> <{if $perm_author_items && $item.uid != 0}>
+                <span style="float: left; margin-left: 5px;">
+          <a href="<{$moduleUrl}>/author_items.php?uid=<{$item.uid}>"><{$smarty.const._MD_PUBLISHER_ITEMS_SAME_AUTHOR}></a>
+        </span>
+            <{/if}>
             <span style="float: right; text-align: right;"><{$item.adminlink}></span>
 
             <div style="height: 0; display: inline; clear: both;"></div>
         </div>
     </div>
 </div>
-<br />
+<br/>
 
 <{if $item.files}>
-<table border="0" width="90%" cellspacing="1" cellpadding="0" align="center" class="outer">
-    <tr>
-        <td colspan="4" class="itemHead">
-            <strong><{$smarty.const._CO_PUBLISHER_FILES_LINKED}></strong></td>
-    </tr>
-    <tr class="even">
-        <td align="left" class="itemTitle">
-            <strong><{$smarty.const._CO_PUBLISHER_FILENAME}></strong></td>
-        <td align="center" width="100" class="itemTitle">
-            <strong><{$smarty.const._MD_PUBLISHER_DATESUB}></strong></td>
-        <td align="center" width="50" class="itemTitle">
-            <strong><{$smarty.const._MD_PUBLISHER_HITS}></strong></td>
-    </tr>
+    <table border="0" width="90%" cellspacing="1" cellpadding="0" align="center" class="outer">
+        <tr>
+            <td colspan="4" class="itemHead">
+                <strong><{$smarty.const._CO_PUBLISHER_FILES_LINKED}></strong></td>
+        </tr>
+        <tr class="even">
+            <td align="left" class="itemTitle">
+                <strong><{$smarty.const._CO_PUBLISHER_FILENAME}></strong></td>
+            <td align="center" width="100" class="itemTitle">
+                <strong><{$smarty.const._MD_PUBLISHER_DATESUB}></strong></td>
+            <td align="center" width="50" class="itemTitle">
+                <strong><{$smarty.const._MD_PUBLISHER_HITS}></strong></td>
+        </tr>
 
-    <!-- BEGIN DYNAMIC BLOCK --><{foreach item=file from=$item.files}>
-    <tr>
-        <td class="odd" align="left">
-            <{if $file.mod}>
-            <a href="<{$publisher_url}>/file.php?op=mod&fileid=<{$file.fileid}>">
-                <img src="<{$publisher_url}>/assets/images/links/edit.gif" title="<{$smarty.const._CO_PUBLISHER_EDITFILE}>" alt="<{$smarty.const._CO_PUBLISHER_EDITFILE}>" /></a>
-
-            <a href="<{$publisher_url}>/file.php?op=del&fileid=<{$file.fileid}>">
-                <img src="<{$publisher_url}>/assets/images/links/delete.png" title="<{$smarty.const._CO_PUBLISHER_DELETEFILE}>" alt="<{$smarty.const._CO_PUBLISHER_DELETEFILE}>" /></a>
-            <{/if}>
-            <a href="<{$publisher_url}>/visit.php?fileid=<{$file.fileid}>" target="_blank">
-                <img src="<{$publisher_url}>/assets/images/links/file.gif" title="<{$smarty.const._MD_PUBLISHER_DOWNLOAD_FILE}>" alt="<{$smarty.const._MD_PUBLISHER_DOWNLOAD_FILE}>" />&nbsp;<strong><{$file.name}></strong>
-            </a>
+        <!-- BEGIN DYNAMIC BLOCK --><{foreach item=file from=$item.files}>
+        <tr>
+            <td class="odd" align="left">
+                <{if $file.mod}>
+                    <a href="<{$moduleUrl}>/file.php?op=mod&fileid=<{$file.fileid}>">
+                        <img src="<{$moduleUrl}>/assets/images/links/edit.gif" title="<{$smarty.const._CO_PUBLISHER_EDITFILE}>" alt="<{$smarty.const._CO_PUBLISHER_EDITFILE}>"/></a>
+                    <a href="<{$moduleUrl}>/file.php?op=del&fileid=<{$file.fileid}>">
+                        <img src="<{$moduleUrl}>/assets/images/links/delete.png" title="<{$smarty.const._CO_PUBLISHER_DELETEFILE}>" alt="<{$smarty.const._CO_PUBLISHER_DELETEFILE}>"/></a>
+                <{/if}>
+                <a href="<{$moduleUrl}>/visit.php?fileid=<{$file.fileid}>" target="_blank">
+                    <img src="<{$moduleUrl}>/assets/images/links/file.gif" title="<{$smarty.const._MD_PUBLISHER_DOWNLOAD_FILE}>" alt="<{$smarty.const._MD_PUBLISHER_DOWNLOAD_FILE}>"/>&nbsp;<strong><{$file.name}></strong>
+                </a>
 
-            <div><{$file.description}></div>
-        </td>
-        <td class="odd" align="center"><{$file.datesub}></td>
-        <td class="odd" align="center"><{$file.hits}></td>
-    </tr>
-    <{/foreach}>    <!-- END DYNAMIC BLOCK -->
-</table>
-<br />
+                <div><{$file.description}></div>
+            </td>
+            <td class="odd" align="center"><{$file.datesub}></td>
+            <td class="odd" align="center"><{$file.hits}></td>
+        </tr>
+        <{/foreach}> <!-- END DYNAMIC BLOCK -->
+    </table>
+    <br/>
 <{/if}>
 
-<{if $other_items == "previous_next"}><{if $previous_item_link || $next_item_link}>
-<table class="outer">
+<{if $other_items == "previous_next"}><{if $previousItemLink || $nextItemLink}>
+    <table class="outer">
     <tr>
         <td class="itemHead" colspan="2">
             <strong><{$smarty.const._MD_PUBLISHER_ITEMS_LINKS}></strong></td>
     </tr>
     <tr style="vertical-align: middle;">
         <td class="odd" width="50%" align="left">
-            <{if $previous_item_link}> <a href="<{$previous_item_url}>">
-            <img style="vertical-align: middle;" src="<{$publisher_images_url}>/links/previous.gif" title="<{$smarty.const._MD_PUBLISHER_PREVIOUS_ITEM}>" alt="<{$smarty.const._MD_PUBLISHER_PREVIOUS_ITEM}>" />
-        </a> <{$previous_item_link}> <{/if}>
+            <{if $previousItemLink}>
+                <a href="<{$previousItemUrl}>">
+                    <img style="vertical-align: middle;" src="<{$publisherImagesUrl}>/links/previous.gif" title="<{$smarty.const._MD_PUBLISHER_PREVIOUS_ITEM}>" alt="<{$smarty.const._MD_PUBLISHER_PREVIOUS_ITEM}>"/>
+                </a>
+                <{$previousItemLink}> <{/if}>
         </td>
         <td class="odd" width="50%" align="right">
-            <{if $next_item_link}> <{$next_item_link}>
-            <a href="<{$next_item_url}>"><img style="vertical-align: middle;" src="<{$publisher_images_url}>/links/next.gif" title="<{$smarty.const._MD_PUBLISHER_NEXT_ITEM}>" alt="<{$smarty.const._MD_PUBLISHER_NEXT_ITEM}>" /></a> <{/if}>
+            <{if $nextItemLink}> <{$nextItemLink}>
+                <a href="<{$nextItemUrl}>"><img style="vertical-align: middle;" src="<{$publisherImagesUrl}>/links/next.gif" title="<{$smarty.const._MD_PUBLISHER_NEXT_ITEM}>" alt="<{$smarty.const._MD_PUBLISHER_NEXT_ITEM}>"/></a>
+            <{/if}>
         </td>
     </tr>
-</table><{/if}><{elseif $other_items == 'all'}>
-<table border="0" width="90%" cellspacing="1" cellpadding="3" align="center" class="outer">
+    </table><{/if}><{elseif $other_items == 'all'}>
+    <table border="0" width="90%" cellspacing="1" cellpadding="3" align="center" class="outer">
     <tr>
         <td align="left" class="itemHead" width='65%'>
             <strong><{$smarty.const._MD_PUBLISHER_OTHER_ITEMS}></strong></td>
         <{if $display_date_col == 1}>
-        <td align="center" class="itemHead" width="25%">
-            <strong><{$smarty.const._MD_PUBLISHER_DATESUB}></strong></td>
+            <td align="center" class="itemHead" width="25%">
+                <strong><{$smarty.const._MD_PUBLISHER_DATESUB}></strong></td>
         <{/if}> <{if $display_hits_col == 1}>
-        <td align="center" class="itemHead" width="10%">
-            <strong><{$smarty.const._MD_PUBLISHER_HITS}></strong></td>
+            <td align="center" class="itemHead" width="10%">
+                <strong><{$smarty.const._MD_PUBLISHER_HITS}></strong></td>
         <{/if}>
     </tr>
     <!-- Start item loop --><{foreach item=item from=$items}>
     <tr>
         <td class="even" align="left"><{$item.titlelink}></td>
         <{if $display_date_col == 1}>
-        <td class="odd" align="left">
-            <div align="center"><{$item.datesub}></div>
-        </td>
+            <td class="odd" align="left">
+                <div align="center"><{$item.datesub}></div>
+            </td>
         <{/if}> <{if $display_hits_col == 1}>
-        <td class="odd" align="left">
-            <div align="center"><{$item.counter}></div>
-        </td>
+            <td class="odd" align="left">
+                <div align="center"><{$item.counter}></div>
+            </td>
         <{/if}>
     </tr>
-    <{/foreach}>    <!-- End item loop -->
-</table><{/if}><{if $rating_enabled}>
-<small><{$item.ratingbar}></small><{/if}><{include file='db:publisher_footer.tpl'}>
+    <{/foreach}> <!-- End item loop -->
+    </table><{/if}><{if $rating_enabled}>
+    <small><{$item.ratingbar}></small><{/if}><{include file='db:publisher_footer.tpl'}>
 
 <script type="text/javascript">
     <!--//<![CDATA[
-    $publisher(document).ready(function ()
-    {
+    $publisher(document).ready(function () {
         var options = {
-            caption:    'permanent'
+            caption: 'permanent'
         };
 
         $publisher('#ppy1').popeye(options);
diff --git a/publisher/templates/publisher_search.tpl b/publisher/templates/publisher_search.tpl
index 4d47265b..4e081d76 100644
--- a/publisher/templates/publisher_search.tpl
+++ b/publisher/templates/publisher_search.tpl
@@ -11,7 +11,7 @@
             <{/if}>
         </div>
         <div class="clear"></div>
-        <{/foreach}>
+    <{/foreach}>
     <{/if}>
 <{/if}>
 
@@ -30,7 +30,7 @@
                     <tr>
                         <td class="head" align="right">
                             <strong><{$smarty.const._SR_TYPE}></strong></td>
-                        <td class="even"><{$type_select}></td>
+                        <td class="even"><{$typeSelect}></td>
                     </tr>
                     <tr>
                         <td class="head" align="right">
@@ -41,7 +41,7 @@
                     <tr>
                         <td class="head" align="right">
                             <strong><{$smarty.const._SR_SEARCHIN}></strong></td>
-                        <td class="even"><{$searchin_select}></td>
+                        <td class="even"><{$searchSelect}></td>
                     </tr>
                     <tr>
                         <td class="head" align="right">
@@ -55,7 +55,7 @@
                         <td class="head" align="right">
                             <strong><{$smarty.const._CO_PUBLISHER_SORTBY}></strong>&nbsp;
                         </td>
-                        <td class="even"><{$sortby_select}></td>
+                        <td class="even"><{$sortbySelect}></td>
                     </tr>
                     <{if $search_rule}>
                         <tr>
diff --git a/publisher/templates/publisher_singleitem.tpl b/publisher/templates/publisher_singleitem.tpl
index 875bde83..e311f1e9 100644
--- a/publisher/templates/publisher_singleitem.tpl
+++ b/publisher/templates/publisher_singleitem.tpl
@@ -31,12 +31,12 @@
     <div class="publisher_pre_itemInfo">
         <div class="itemInfo" style="height: 14px;">
 
-            <{if $display_comment_link && $item.cancomment && $item.comments != -1 && $com_rule <> 0}>
+            <{if $display_comment_link && $item.cancomment && $item.comments != -1 && $com_rule != 0}>
                 <span style="float: left;"><a href="<{$item.itemurl}>"><{$item.comments}> <{$smarty.const._MD_PUBLISHER_COMMENTS}></a></span>
             <{else}>
                 <span style="float: left;">&nbsp;</span>
             <{/if}>
-            <{if $op <> 'preview'}>
+            <{if $op != 'preview'}>
                 <span style="float: right; text-align: right;"><{$item.adminlink}></span>
             <{else}>
                 <span style="float: right;">&nbsp;</span>
diff --git a/publisher/templates/publisher_submit.tpl b/publisher/templates/publisher_submit.tpl
index c97c0e79..8b7a3ed6 100644
--- a/publisher/templates/publisher_submit.tpl
+++ b/publisher/templates/publisher_submit.tpl
@@ -5,8 +5,8 @@
     <{include file="db:publisher_singleitem.tpl" item=$item}>
 <{/if}>
 
-<div class="publisher_infotitle"><{$lang_intro_title}></div>
-<div class="publisher_infotext"><{$lang_intro_text}></div>
+<div class="publisher_infotitle"><{$langIntroTitle}></div>
+<div class="publisher_infotext"><{$langIntroText}></div>
 <br/><{$form.javascript}>
 
 <div id="tabs">
diff --git a/publisher/thumb.php b/publisher/thumb.php
index 044308c3..35fce99f 100644
--- a/publisher/thumb.php
+++ b/publisher/thumb.php
@@ -209,7 +209,7 @@
     define('WEBSHOT_TIMEOUT', '20');
 }            //Seconds to wait for a webshot
 if (!defined('WEBSHOT_USER_AGENT')) {
-    define('WEBSHOT_USER_AGENT', "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.2.18) Gecko/20110614 Firefox/3.6.18");
+    define('WEBSHOT_USER_AGENT', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.2.18) Gecko/20110614 Firefox/3.6.18');
 } //I hate to do this, but a non-browser robot user agent might not show what humans see. So we pretend to be Firefox
 if (!defined('WEBSHOT_JAVASCRIPT_ON')) {
     define('WEBSHOT_JAVASCRIPT_ON', true);
@@ -227,7 +227,6 @@
     define('WEBSHOT_XVFB_RUNNING', false);
 }            //ADVANCED: Enable this if you've got Xvfb running in the background.
 
-
 // If ALLOW_EXTERNAL is true and ALLOW_ALL_EXTERNAL_SITES is false, then external images will only be fetched from these domains and their subdomains.
 if (!isset($ALLOWED_SITES)) {
     $ALLOWED_SITES = array(
@@ -239,28 +238,27 @@
         'photobucket.com',
         'imgur.com',
         'imageshack.us',
-        'tinypic.com',
-    );
+        'tinypic.com');
 }
 // -------------------------------------------------------------
 // -------------- STOP EDITING CONFIGURATION HERE --------------
 // -------------------------------------------------------------
 
-timthumb::start();
+Timthumb::start();
 
 /**
  * Class timthumb
  */
-class timthumb
+class Timthumb
 {
-    protected        $src                      = "";
+    protected        $src                      = '';
     protected        $is404                    = false;
-    protected        $docRoot                  = "";
+    protected        $docRoot                  = '';
     protected        $lastURLError             = false;
-    protected        $localImage               = "";
+    protected        $localImage               = '';
     protected        $localImageMTime          = 0.0;
     protected        $url                      = false;
-    protected        $myHost                   = "";
+    protected        $myHost                   = '';
     protected        $isURL                    = false;
     protected        $cachefile                = '';
     protected        $errors                   = array();
@@ -269,9 +267,9 @@ class timthumb
     protected        $startTime                = 0.0;
     protected        $lastBenchTime            = 0.0;
     protected        $cropTop                  = false;
-    protected        $salt                     = "";
+    protected        $salt                     = '';
     protected        $fileCacheVersion         = 1; //Generally if timthumb.php is modifed (upgraded) then the salt changes and all cache files are recreated. This is a backup mechanism to force regen.
-    protected        $filePrependSecurityBlock = "<?php die('Execution denied!'); //"; //Designed to have three letter mime type, space, question mark and greater than symbol appended. 6 bytes total.
+    protected        $filePrependSecurityBlock = "<?php exit('Execution denied!'); //"; //Designed to have three letter mime type, space, question mark and greater than symbol appended. 6 bytes total.
     protected static $curlDataWritten          = 0;
     protected static $curlFH                   = false;
 
@@ -301,23 +299,23 @@ public function __construct()
         global $ALLOWED_SITES;
         $this->startTime = microtime(true);
         date_default_timezone_set('UTC');
-        $this->debug(1, "Starting new request from " . $this->getIP() . " to " . XoopsRequest::getString('REQUEST_URI', '', 'SERVER'));
+        $this->debug(1, 'Starting new request from ' . $this->getIP() . ' to ' . XoopsRequest::getString('REQUEST_URI', '', 'SERVER'));
         $this->calcDocRoot();
         //On windows systems I'm assuming fileinode returns an empty string or a number that doesn't change. Check this.
         $this->salt = @filemtime(__FILE__) . '-' . @fileinode(__FILE__);
-        $this->debug(3, "Salt is: " . $this->salt);
+        $this->debug(3, 'Salt is: ' . $this->salt);
         if (FILE_CACHE_DIRECTORY) {
             if (!is_dir(FILE_CACHE_DIRECTORY)) {
                 @mkdir(FILE_CACHE_DIRECTORY);
                 if (!is_dir(FILE_CACHE_DIRECTORY)) {
-                    $this->error("Could not create the file cache directory.");
+                    $this->error('Could not create the file cache directory.');
 
                     return false;
                 }
             }
             $this->cacheDirectory = FILE_CACHE_DIRECTORY;
             if (!touch($this->cacheDirectory . '/index.html')) {
-                $this->error("Could not create the index.html file - to fix this create an empty file named index.html file in the cache directory.");
+                $this->error('Could not create the index.html file - to fix this create an empty file named index.html file in the cache directory.');
             }
         } else {
             $this->cacheDirectory = sys_get_temp_dir();
@@ -331,20 +329,18 @@ public function __construct()
         $this->src    = preg_replace('/https?:\/\/(?:www\.)?' . $this->myHost . '/i', '', $this->src);
 
         if (strlen($this->src) <= 3) {
-            $this->error("No image specified");
+            $this->error('No image specified');
 
             return false;
         }
         if (BLOCK_EXTERNAL_LEECHERS && array_key_exists('HTTP_REFERER', $_SERVER) && (!preg_match('/^https?:\/\/(?:www\.)?' . $this->myHost . '(?:$|\/)/i', $_SERVER['HTTP_REFERER']))) {
             // base64 encoded red image that says 'no hotlinkers'
             // nothing to worry about! :)
-            $imgData = base64_decode(
-                "R0lGODlhUAAMAIAAAP8AAP///yH5BAAHAP8ALAAAAABQAAwAAAJpjI+py+0Po5y0OgAMjjv01YUZ\nOGplhWXfNa6JCLnWkXplrcBmW+spbwvaVr/cDyg7IoFC2KbYVC2NQ5MQ4ZNao9Ynzjl9ScNYpneb\nDULB3RP6JuPuaGfuuV4fumf8PuvqFyhYtjdoeFgAADs="
-            );
+            $imgData = base64_decode("R0lGODlhUAAMAIAAAP8AAP///yH5BAAHAP8ALAAAAABQAAwAAAJpjI+py+0Po5y0OgAMjjv01YUZ\nOGplhWXfNa6JCLnWkXplrcBmW+spbwvaVr/cDyg7IoFC2KbYVC2NQ5MQ4ZNao9Ynzjl9ScNYpneb\nDULB3RP6JuPuaGfuuV4fumf8PuvqFyhYtjdoeFgAADs=");
             header('Content-Type: image/gif');
             header('Content-Length: ' . strlen($imgData));
             header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0');
-            header("Pragma: no-cache");
+            header('Pragma: no-cache');
             header('Expires: ' . gmdate('D, d M Y H:i:s', time()));
             echo $imgData;
 
@@ -352,32 +348,30 @@ public function __construct()
             exit(0);
         }
         if (preg_match('/^https?:\/\/[^\/]+/i', $this->src)) {
-            $this->debug(2, "Is a request for an external URL: " . $this->src);
+            $this->debug(2, 'Is a request for an external URL: ' . $this->src);
             $this->isURL = true;
         } else {
-            $this->debug(2, "Is a request for an internal file: " . $this->src);
+            $this->debug(2, 'Is a request for an internal file: ' . $this->src);
         }
         if ($this->isURL && (!ALLOW_EXTERNAL)) {
-            $this->error("You are not allowed to fetch images from an external website.");
+            $this->error('You are not allowed to fetch images from an external website.');
 
             return false;
         }
         if ($this->isURL) {
             if (ALLOW_ALL_EXTERNAL_SITES) {
-                $this->debug(2, "Fetching from all external sites is enabled.");
+                $this->debug(2, 'Fetching from all external sites is enabled.');
             } else {
-                $this->debug(2, "Fetching only from selected external sites is enabled.");
+                $this->debug(2, 'Fetching only from selected external sites is enabled.');
                 $allowed = false;
                 foreach ($ALLOWED_SITES as $site) {
-                    if ((strtolower(substr($this->url['host'], -strlen($site) - 1)) === strtolower(".$site")) || (strtolower($this->url['host']) === strtolower($site))) {
+                    if ((strtolower($this->url['host']) === strtolower($site)) || (strtolower(substr($this->url['host'], -strlen($site) - 1)) === strtolower(".$site"))) {
                         $this->debug(3, "URL hostname {$this->url['host']} matches $site so allowing.");
                         $allowed = true;
                     }
                 }
                 if (!$allowed) {
-                    return $this->error(
-                        "You may not fetch images from that site. To enable this site in timthumb, you can either add it to \$ALLOWED_SITES and set ALLOW_EXTERNAL=true. Or you can set ALLOW_ALL_EXTERNAL_SITES=true, depending on your security needs."
-                    );
+                    return $this->error("You may not fetch images from that site. To enable this site in timthumb, you can either add it to \$ALLOWED_SITES and set ALLOW_EXTERNAL=true. Or you can set ALLOW_ALL_EXTERNAL_SITES=true, depending on your security needs.");
                 }
             }
         }
@@ -391,7 +385,7 @@ public function __construct()
             $this->localImage = $this->getLocalImagePath($this->src);
             if (!$this->localImage) {
                 $this->debug(1, "Could not find the local image: {$this->localImage}");
-                $this->error("Could not find the internal image you specified.");
+                $this->error('Could not find the internal image you specified.');
                 $this->set404();
 
                 return false;
@@ -399,10 +393,9 @@ public function __construct()
             $this->debug(1, "Local image path is {$this->localImage}");
             $this->localImageMTime = @filemtime($this->localImage);
             //We include the mtime of the local file in case in changes on disk.
-            $this->cachefile
-                = $this->cacheDirectory . '/' . FILE_CACHE_PREFIX . $cachePrefix . md5($this->salt . $this->localImageMTime . $_SERVER ['QUERY_STRING'] . $this->fileCacheVersion) . FILE_CACHE_SUFFIX;
+            $this->cachefile = $this->cacheDirectory . '/' . FILE_CACHE_PREFIX . $cachePrefix . md5($this->salt . $this->localImageMTime . $_SERVER ['QUERY_STRING'] . $this->fileCacheVersion) . FILE_CACHE_SUFFIX;
         }
-        $this->debug(2, "Cache file is: " . $this->cachefile);
+        $this->debug(2, 'Cache file is: ' . $this->cachefile);
 
         return true;
     }
@@ -422,26 +415,26 @@ public function run()
     {
         if ($this->isURL) {
             if (!ALLOW_EXTERNAL) {
-                $this->debug(1, "Got a request for an external image but ALLOW_EXTERNAL is disabled so returning error msg.");
-                $this->error("You are not allowed to fetch images from an external website.");
+                $this->debug(1, 'Got a request for an external image but ALLOW_EXTERNAL is disabled so returning error msg.');
+                $this->error('You are not allowed to fetch images from an external website.');
 
                 return false;
             }
-            $this->debug(3, "Got request for external image. Starting serveExternalImage.");
+            $this->debug(3, 'Got request for external image. Starting serveExternalImage.');
             if ($this->param('webshot')) {
                 if (WEBSHOT_ENABLED) {
-                    $this->debug(3, "webshot param is set, so we're going to take a webshot.");
+                    $this->debug(3, 'webshot param is set, so we\'re going to take a webshot.');
                     $this->serveWebshot();
                 } else {
-                    $this->error("You added the webshot parameter but webshots are disabled on this server. You need to set WEBSHOT_ENABLED == true to enable webshots.");
+                    $this->error('You added the webshot parameter but webshots are disabled on this server. You need to set WEBSHOT_ENABLED == true to enable webshots.');
                 }
             } else {
-                $this->debug(3, "webshot is NOT set so we're going to try to fetch a regular image.");
+                $this->debug(3, 'webshot is NOT set so we\'re going to try to fetch a regular image.');
                 $this->serveExternalImage();
 
             }
         } else {
-            $this->debug(3, "Got request for internal image. Starting serveInternalImage()");
+            $this->debug(3, 'Got request for internal image. Starting serveInternalImage()');
             $this->serveInternalImage();
         }
 
@@ -458,14 +451,14 @@ protected function handleErrors()
                 if ($this->serveImg(NOT_FOUND_IMAGE)) {
                     exit(0);
                 } else {
-                    $this->error("Additionally, the 404 image that is configured could not be found or there was an error serving it.");
+                    $this->error('Additionally, the 404 image that is configured could not be found or there was an error serving it.');
                 }
             }
             if (ERROR_IMAGE) {
                 if ($this->serveImg(ERROR_IMAGE)) {
                     exit(0);
                 } else {
-                    $this->error("Additionally, the error image that is configured could not be found or there was an error serving it.");
+                    $this->error('Additionally, the error image that is configured could not be found or there was an error serving it.');
                 }
             }
             $this->serveErrors();
@@ -481,12 +474,12 @@ protected function handleErrors()
     protected function tryBrowserCache()
     {
         if (BROWSER_CACHE_DISABLE) {
-            $this->debug(3, "Browser caching is disabled");
+            $this->debug(3, 'Browser caching is disabled');
 
             return false;
         }
         if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
-            $this->debug(3, "Got a conditional get");
+            $this->debug(3, 'Got a conditional get');
             $mtime = false;
             //We've already checked if the real file exists in the constructor
             if (!is_file($this->cachefile)) {
@@ -507,18 +500,18 @@ protected function tryBrowserCache()
             $iftime = strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']);
             $this->debug(3, "The conditional get's if-modified-since unixtime is $iftime");
             if ($iftime < 1) {
-                $this->debug(3, "Got an invalid conditional get modified since time. Returning false.");
+                $this->debug(3, 'Got an invalid conditional get modified since time. Returning false.');
 
                 return false;
             }
             if ($iftime < $mtime) { //Real file or cache file has been modified since last request, so force refetch.
-                $this->debug(3, "File has been modified since last fetch.");
+                $this->debug(3, 'File has been modified since last fetch.');
 
                 return false;
             } else { //Otherwise serve a 304
-                $this->debug(3, "File has not been modified since last get, so serving a 304.");
+                $this->debug(3, 'File has not been modified since last get, so serving a 304.');
                 header($_SERVER['SERVER_PROTOCOL'] . ' 304 Not Modified');
-                $this->debug(1, "Returning 304 not modified");
+                $this->debug(1, 'Returning 304 not modified');
 
                 return true;
             }
@@ -532,23 +525,23 @@ protected function tryBrowserCache()
      */
     protected function tryServerCache()
     {
-        $this->debug(3, "Trying server cache");
+        $this->debug(3, 'Trying server cache');
         if (file_exists($this->cachefile)) {
             $this->debug(3, "Cachefile {$this->cachefile} exists");
             if ($this->isURL) {
-                $this->debug(3, "This is an external request, so checking if the cachefile is empty which means the request failed previously.");
+                $this->debug(3, 'This is an external request, so checking if the cachefile is empty which means the request failed previously.');
                 if (filesize($this->cachefile) < 1) {
-                    $this->debug(3, "Found an empty cachefile indicating a failed earlier request. Checking how old it is.");
+                    $this->debug(3, 'Found an empty cachefile indicating a failed earlier request. Checking how old it is.');
                     //Fetching error occured previously
                     if (time() - @filemtime($this->cachefile) > WAIT_BETWEEN_FETCH_ERRORS) {
-                        $this->debug(3, "File is older than " . WAIT_BETWEEN_FETCH_ERRORS . " seconds. Deleting and returning false so app can try and load file.");
+                        $this->debug(3, 'File is older than ' . WAIT_BETWEEN_FETCH_ERRORS . ' seconds. Deleting and returning false so app can try and load file.');
                         @unlink($this->cachefile);
 
                         return false; //to indicate we didn't serve from cache and app should try and load
                     } else {
-                        $this->debug(3, "Empty cachefile is still fresh so returning message saying we had an error fetching this image from remote host.");
+                        $this->debug(3, 'Empty cachefile is still fresh so returning message saying we had an error fetching this image from remote host.');
                         $this->set404();
-                        $this->error("An error occured fetching image.");
+                        $this->error('An error occured fetching image.');
 
                         return false;
                     }
@@ -621,22 +614,22 @@ protected function serveInternalImage()
     {
         $this->debug(3, "Local image path is $this->localImage");
         if (!$this->localImage) {
-            $this->sanityFail("localImage not set after verifying it earlier in the code.");
+            $this->sanityFail('localImage not set after verifying it earlier in the code.');
 
             return false;
         }
         $fileSize = filesize($this->localImage);
         if ($fileSize > MAX_FILE_SIZE) {
-            $this->error("The file you specified is greater than the maximum allowed file size.");
+            $this->error('The file you specified is greater than the maximum allowed file size.');
 
             return false;
         }
         if ($fileSize <= 0) {
-            $this->error("The file you specified is <= 0 bytes.");
+            $this->error('The file you specified is <= 0 bytes.');
 
             return false;
         }
-        $this->debug(3, "Calling processImageAndWriteToCache() for local image.");
+        $this->debug(3, 'Calling processImageAndWriteToCache() for local image.');
         if ($this->processImageAndWriteToCache($this->localImage)) {
             $this->serveCacheFile();
 
@@ -654,30 +647,30 @@ protected function cleanCache()
         if (FILE_CACHE_TIME_BETWEEN_CLEANS < 0) {
             return null;
         }
-        $this->debug(3, "cleanCache() called");
+        $this->debug(3, 'cleanCache() called');
         $lastCleanFile = $this->cacheDirectory . '/timthumb_cacheLastCleanTime.touch';
 
         //If this is a new timthumb installation we need to create the file
         if (!is_file($lastCleanFile)) {
             $this->debug(1, "File tracking last clean doesn't exist. Creating $lastCleanFile");
             if (!touch($lastCleanFile)) {
-                $this->error("Could not create cache clean timestamp file.");
+                $this->error('Could not create cache clean timestamp file.');
             }
 
             return null;
         }
         if (@filemtime($lastCleanFile) < (time() - FILE_CACHE_TIME_BETWEEN_CLEANS)) { //Cache was last cleaned more than 1 day ago
-            $this->debug(1, "Cache was last cleaned more than " . FILE_CACHE_TIME_BETWEEN_CLEANS . " seconds ago. Cleaning now.");
+            $this->debug(1, 'Cache was last cleaned more than ' . FILE_CACHE_TIME_BETWEEN_CLEANS . ' seconds ago. Cleaning now.');
             // Very slight race condition here, but worst case we'll have 2 or 3 servers cleaning the cache simultaneously once a day.
             if (!touch($lastCleanFile)) {
-                $this->error("Could not create cache clean timestamp file.");
+                $this->error('Could not create cache clean timestamp file.');
             }
             $files = glob($this->cacheDirectory . '/*' . FILE_CACHE_SUFFIX);
             if ($files) {
                 $timeAgo = time() - FILE_CACHE_MAX_FILE_AGE;
                 foreach ($files as $file) {
                     if (@filemtime($file) < $timeAgo) {
-                        $this->debug(3, "Deleting cache file $file older than max age: " . FILE_CACHE_MAX_FILE_AGE . " seconds");
+                        $this->debug(3, "Deleting cache file $file older than max age: " . FILE_CACHE_MAX_FILE_AGE . ' seconds');
                         @unlink($file);
                     }
                 }
@@ -685,7 +678,7 @@ protected function cleanCache()
 
             return true;
         } else {
-            $this->debug(3, "Cache was cleaned less than " . FILE_CACHE_TIME_BETWEEN_CLEANS . " seconds ago so no cleaning needed.");
+            $this->debug(3, 'Cache was cleaned less than ' . FILE_CACHE_TIME_BETWEEN_CLEANS . ' seconds ago so no cleaning needed.');
         }
 
         return false;
@@ -704,14 +697,14 @@ protected function processImageAndWriteToCache($localImage)
 
         $this->debug(3, "Mime type of image is $mimeType");
         if (!preg_match('/^image\/(?:gif|jpg|jpeg|png)$/i', $mimeType)) {
-            return $this->error("The image being resized is not a valid gif, jpg or png.");
+            return $this->error('The image being resized is not a valid gif, jpg or png.');
         }
 
         if (!function_exists('imagecreatetruecolor')) {
             return $this->error('GD Library Error: imagecreatetruecolor does not exist - please contact your webhost and ask them to install the GD library');
         }
 
-        if (function_exists('imagefilter') && defined('IMG_FILTER_NEGATE')) {
+        if (defined('IMG_FILTER_NEGATE') && function_exists('imagefilter')) {
             $imageFilters = array(
                 1  => array(IMG_FILTER_NEGATE, 0),
                 2  => array(IMG_FILTER_GRAYSCALE, 0),
@@ -723,13 +716,12 @@ protected function processImageAndWriteToCache($localImage)
                 8  => array(IMG_FILTER_GAUSSIAN_BLUR, 0),
                 9  => array(IMG_FILTER_SELECTIVE_BLUR, 0),
                 10 => array(IMG_FILTER_MEAN_REMOVAL, 0),
-                11 => array(IMG_FILTER_SMOOTH, 0),
-            );
+                11 => array(IMG_FILTER_SMOOTH, 0));
         }
 
         // get standard input properties
-        $new_width    = (int)abs($this->param('w', 0));
-        $new_height   = (int)abs($this->param('h', 0));
+        $newWidth    = (int)abs($this->param('w', 0));
+        $newHeight   = (int)abs($this->param('h', 0));
         $zoom_crop    = (int)$this->param('zc', DEFAULT_ZC);
         $quality      = (int)abs($this->param('q', DEFAULT_Q));
         $align        = $this->cropTop ? 't' : $this->param('a', 'c');
@@ -739,14 +731,14 @@ protected function processImageAndWriteToCache($localImage)
         $canvas_trans = (bool)$this->param('ct', '1');
 
         // set default width and height if neither are set already
-        if ($new_width == 0 && $new_height == 0) {
-            $new_width  = (int)DEFAULT_WIDTH;
-            $new_height = (int)DEFAULT_HEIGHT;
+        if ($newWidth == 0 && $newHeight == 0) {
+            $newWidth  = (int)DEFAULT_WIDTH;
+            $newHeight = (int)DEFAULT_HEIGHT;
         }
 
         // ensure size limits can not be abused
-        $new_width  = min($new_width, MAX_WIDTH);
-        $new_height = min($new_height, MAX_HEIGHT);
+        $newWidth  = min($newWidth, MAX_WIDTH);
+        $newHeight = min($newHeight, MAX_HEIGHT);
 
         // set memory limit to be able to have enough space to resize larger images
         $this->setMemoryLimit();
@@ -764,27 +756,26 @@ protected function processImageAndWriteToCache($localImage)
         $origin_y = 0;
 
         // generate new w/h if not provided
-        if ($new_width && !$new_height) {
-            $new_height = floor($height * ($new_width / $width));
-        } elseif ($new_height && !$new_width) {
-            $new_width = floor($width * ($new_height / $height));
+        if ($newWidth && !$newHeight) {
+            $newHeight = floor($height * ($newWidth / $width));
+        } elseif ($newHeight && !$newWidth) {
+            $newWidth = floor($width * ($newHeight / $height));
         }
 
         // scale down and add borders
         if ($zoom_crop == 3) {
+            $final_height = $height * ($newWidth / $width);
 
-            $final_height = $height * ($new_width / $width);
-
-            if ($final_height > $new_height) {
-                $new_width = $width * ($new_height / $height);
+            if ($final_height > $newHeight) {
+                $newWidth = $width * ($newHeight / $height);
             } else {
-                $new_height = $final_height;
+                $newHeight = $final_height;
             }
 
         }
 
         // create a new true color image
-        $canvas = imagecreatetruecolor($new_width, $new_height);
+        $canvas = imagecreatetruecolor($newWidth, $newHeight);
         imagealphablending($canvas, false);
 
         if (strlen($canvas_color) == 3) { //if is 3-char notation, edit string into 6-char notation
@@ -800,7 +791,7 @@ protected function processImageAndWriteToCache($localImage)
         // Create a new transparent color for image
         // If is a png and PNG_IS_TRANSPARENT is false then remove the alpha transparency
         // (and if is set a canvas color show it in the background)
-        if (preg_match('/^image\/png$/i', $mimeType) && !PNG_IS_TRANSPARENT && $canvas_trans) {
+        if (!PNG_IS_TRANSPARENT && $canvas_trans && preg_match('/^image\/png$/i', $mimeType)) {
             $color = imagecolorallocatealpha($canvas, $canvas_color_R, $canvas_color_G, $canvas_color_B, 127);
         } else {
             $color = imagecolorallocatealpha($canvas, $canvas_color_R, $canvas_color_G, $canvas_color_B, 0);
@@ -808,48 +799,37 @@ protected function processImageAndWriteToCache($localImage)
 
         // Completely fill the background of the new image with allocated color.
         imagefill($canvas, 0, 0, $color);
-
         // scale down and add borders
         if ($zoom_crop == 2) {
-
-            $final_height = $height * ($new_width / $width);
-
-            if ($final_height > $new_height) {
-
-                $origin_x  = $new_width / 2;
-                $new_width = $width * ($new_height / $height);
-                $origin_x  = round($origin_x - ($new_width / 2));
-
+            $final_height = $height * ($newWidth / $width);
+            if ($final_height > $newHeight) {
+                $origin_x  = $newWidth / 2;
+                $newWidth = $width * ($newHeight / $height);
+                $origin_x  = round($origin_x - ($newWidth / 2));
             } else {
-
-                $origin_y   = $new_height / 2;
-                $new_height = $final_height;
-                $origin_y   = round($origin_y - ($new_height / 2));
-
+                $origin_y   = $newHeight / 2;
+                $newHeight = $final_height;
+                $origin_y   = round($origin_y - ($newHeight / 2));
             }
-
         }
 
         // Restore transparency blending
         imagesavealpha($canvas, true);
 
         if ($zoom_crop > 0) {
-
             $src_x = $src_y = 0;
             $src_w = $width;
             $src_h = $height;
 
-            $cmp_x = $width / $new_width;
-            $cmp_y = $height / $new_height;
+            $cmp_x = $width / $newWidth;
+            $cmp_y = $height / $newHeight;
 
             // calculate x or y coordinate and width or height of source
             if ($cmp_x > $cmp_y) {
-
                 $src_w = round($width / $cmp_x * $cmp_y);
                 $src_x = round(($width - ($width / $cmp_x * $cmp_y)) / 2);
 
             } elseif ($cmp_y > $cmp_x) {
-
                 $src_h = round($height / $cmp_y * $cmp_x);
                 $src_y = round(($height - ($height / $cmp_y * $cmp_x)) / 2);
 
@@ -871,25 +851,21 @@ protected function processImageAndWriteToCache($localImage)
                 }
             }
 
-            imagecopyresampled($canvas, $image, $origin_x, $origin_y, $src_x, $src_y, $new_width, $new_height, $src_w, $src_h);
-
+            imagecopyresampled($canvas, $image, $origin_x, $origin_y, $src_x, $src_y, $newWidth, $newHeight, $src_w, $src_h);
         } else {
-
             // copy and resize part of an image with resampling
-            imagecopyresampled($canvas, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
+            imagecopyresampled($canvas, $image, 0, 0, 0, 0, $newWidth, $newHeight, $width, $height);
 
         }
 
-        if ($filters != '' && function_exists('imagefilter') && defined('IMG_FILTER_NEGATE')) {
+        if (defined('IMG_FILTER_NEGATE') && $filters != '' && function_exists('imagefilter')) {
             // apply filters to image
             $filterList = explode('|', $filters);
             foreach ($filterList as $fl) {
-
                 $filterSettings = explode(',', $fl);
-                if (isset ($imageFilters[$filterSettings[0]])) {
-
+                if (isset($imageFilters[$filterSettings[0]])) {
                     for ($i = 0; $i < 4; ++$i) {
-                        if (!isset ($filterSettings[$i])) {
+                        if (!isset($filterSettings[$i])) {
                             $filterSettings[$i] = null;
                         } else {
                             $filterSettings[$i] = (int)$filterSettings[$i];
@@ -897,32 +873,25 @@ protected function processImageAndWriteToCache($localImage)
                     }
 
                     switch ($imageFilters[$filterSettings[0]][1]) {
-
                         case 1:
-
                             imagefilter($canvas, $imageFilters[$filterSettings[0]][0], $filterSettings[1]);
                             break;
 
                         case 2:
-
                             imagefilter($canvas, $imageFilters[$filterSettings[0]][0], $filterSettings[1], $filterSettings[2]);
                             break;
 
                         case 3:
-
                             imagefilter($canvas, $imageFilters[$filterSettings[0]][0], $filterSettings[1], $filterSettings[2], $filterSettings[3]);
                             break;
 
                         case 4:
-
                             imagefilter($canvas, $imageFilters[$filterSettings[0]][0], $filterSettings[1], $filterSettings[2], $filterSettings[3], $filterSettings[4]);
                             break;
 
                         default:
-
                             imagefilter($canvas, $imageFilters[$filterSettings[0]][0]);
                             break;
-
                     }
                 }
             }
@@ -930,12 +899,10 @@ protected function processImageAndWriteToCache($localImage)
 
         // sharpen image
         if ($sharpen && function_exists('imageconvolution')) {
-
             $sharpenMatrix = array(
                 array(-1, -1, -1),
                 array(-1, 16, -1),
-                array(-1, -1, -1),
-            );
+                array(-1, -1, -1));
 
             $divisor = 8;
             $offset  = 0;
@@ -948,7 +915,7 @@ protected function processImageAndWriteToCache($localImage)
             imagetruecolortopalette($canvas, false, imagecolorstotal($image));
         }
 
-        $imgType  = "";
+        $imgType  = '';
         $tempfile = tempnam($this->cacheDirectory, 'timthumb_tmpimg_');
         if (preg_match('/^image\/(?:jpg|jpeg)$/i', $mimeType)) {
             $imgType = 'jpg';
@@ -960,10 +927,10 @@ protected function processImageAndWriteToCache($localImage)
             $imgType = 'gif';
             imagegif($canvas, $tempfile);
         } else {
-            return $this->sanityFail("Could not match mime type after verifying it previously.");
+            return $this->sanityFail('Could not match mime type after verifying it previously.');
         }
 
-        if ($imgType == 'png' && OPTIPNG_ENABLED && OPTIPNG_PATH && @is_file(OPTIPNG_PATH)) {
+        if ($imgType === 'png' && OPTIPNG_ENABLED && OPTIPNG_PATH && @is_file(OPTIPNG_PATH)) {
             $exec = OPTIPNG_PATH;
             $this->debug(3, "optipng'ing $tempfile");
             $presize = filesize($tempfile);
@@ -976,14 +943,14 @@ protected function processImageAndWriteToCache($localImage)
             } elseif ($sizeDrop < 0) {
                 $this->debug(1, "optipng increased size! Difference was: $sizeDrop");
             } else {
-                $this->debug(1, "optipng did not change image size.");
+                $this->debug(1, 'optipng did not change image size.');
             }
-        } elseif ($imgType == 'png' && PNGCRUSH_ENABLED && PNGCRUSH_PATH && @is_file(PNGCRUSH_PATH)) {
+        } elseif ($imgType === 'png' && PNGCRUSH_ENABLED && PNGCRUSH_PATH && @is_file(PNGCRUSH_PATH)) {
             $exec      = PNGCRUSH_PATH;
             $tempfile2 = tempnam($this->cacheDirectory, 'timthumb_tmpimg_');
             $this->debug(3, "pngcrush'ing $tempfile to $tempfile2");
             $out   = `$exec $tempfile $tempfile2`;
-            $todel = "";
+            $todel = '';
             if (is_file($tempfile2)) {
                 $sizeDrop = filesize($tempfile) - filesize($tempfile2);
                 if ($sizeDrop > 0) {
@@ -1001,7 +968,7 @@ protected function processImageAndWriteToCache($localImage)
             @unlink($todel);
         }
 
-        $this->debug(3, "Rewriting image with security header.");
+        $this->debug(3, 'Rewriting image with security header.');
         $tempfile4 = tempnam($this->cacheDirectory, 'timthumb_tmpimg_');
         $context   = stream_context_create();
         $fp        = fopen($tempfile, 'r', 0, $context);
@@ -1009,11 +976,11 @@ protected function processImageAndWriteToCache($localImage)
         file_put_contents($tempfile4, $fp, FILE_APPEND);
         fclose($fp);
         @unlink($tempfile);
-        $this->debug(3, "Locking and replacing cache file.");
+        $this->debug(3, 'Locking and replacing cache file.');
         $lockFile = $this->cachefile . '.lock';
         $fh       = fopen($lockFile, 'w');
         if (!$fh) {
-            return $this->error("Could not open the lockfile for writing an image.");
+            return $this->error('Could not open the lockfile for writing an image.');
         }
         if (flock($fh, LOCK_EX)) {
             @unlink($this->cachefile); //rename generally overwrites, but doing this in case of platform specific quirks. File might not exist yet.
@@ -1026,9 +993,9 @@ protected function processImageAndWriteToCache($localImage)
             @unlink($lockFile);
             @unlink($tempfile4);
 
-            return $this->error("Could not get a lock for writing.");
+            return $this->error('Could not get a lock for writing.');
         }
-        $this->debug(3, "Done image replace with security header. Cleaning up and running cleanCache()");
+        $this->debug(3, 'Done image replace with security header. Cleaning up and running cleanCache()');
         imagedestroy($canvas);
         imagedestroy($image);
 
@@ -1042,23 +1009,23 @@ protected function calcDocRoot()
             $docRoot = LOCAL_FILE_BASE_DIRECTORY;
         }
         if (!isset($docRoot)) {
-            $this->debug(3, "DOCUMENT_ROOT is not set. This is probably windows. Starting search 1.");
+            $this->debug(3, 'DOCUMENT_ROOT is not set. This is probably windows. Starting search 1.');
             if (isset($_SERVER['SCRIPT_FILENAME'])) {
                 $docRoot = str_replace('\\', '/', substr($_SERVER['SCRIPT_FILENAME'], 0, 0 - strlen($_SERVER['PHP_SELF'])));
                 $this->debug(3, "Generated docRoot using SCRIPT_FILENAME and PHP_SELF as: $docRoot");
             }
         }
         if (!isset($docRoot)) {
-            $this->debug(3, "DOCUMENT_ROOT still is not set. Starting search 2.");
+            $this->debug(3, 'DOCUMENT_ROOT still is not set. Starting search 2.');
             if (isset($_SERVER['PATH_TRANSLATED'])) {
                 $docRoot = str_replace('\\', '/', substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0 - strlen($_SERVER['PHP_SELF'])));
                 $this->debug(3, "Generated docRoot using PATH_TRANSLATED and PHP_SELF as: $docRoot");
             }
         }
-        if ($docRoot && $_SERVER['DOCUMENT_ROOT'] != '/') {
+        if ($docRoot && $_SERVER['DOCUMENT_ROOT'] !== '/') {
             $docRoot = preg_replace('/\/$/', '', $docRoot);
         }
-        $this->debug(3, "Doc root is: " . $docRoot);
+        $this->debug(3, 'Doc root is: ' . $docRoot);
         $this->docRoot = $docRoot;
 
     }
@@ -1072,16 +1039,14 @@ protected function getLocalImagePath($src)
     {
         $src = ltrim($src, '/'); //strip off the leading '/'
         if (!$this->docRoot) {
-            $this->debug(3, "We have no document root set, so as a last resort, lets check if the image is in the current dir and serve that.");
+            $this->debug(3, 'We have no document root set, so as a last resort, lets check if the image is in the current dir and serve that.');
             //We don't support serving images outside the current dir if we don't have a doc root for security reasons.
             $file = preg_replace('/^.*?([^\/\\\\]+)$/', '$1', $src); //strip off any path info and just leave the filename.
             if (is_file($file)) {
                 return $this->realpath($file);
             }
 
-            return $this->error(
-                "Could not find your website document root and the file specified doesn't exist in timthumbs directory. We don't support serving files outside timthumb's directory without a document root for security reasons."
-            );
+            return $this->error("Could not find your website document root and the file specified doesn't exist in timthumbs directory. We don't support serving files outside timthumb's directory without a document root for security reasons.");
         } else {
             if (!is_dir($this->docRoot)) {
                 $this->error("Server path does not exist. Ensure variable \$_SERVER['DOCUMENT_ROOT'] is set correctly");
@@ -1092,12 +1057,12 @@ protected function getLocalImagePath($src)
 
         //Try src under docRoot
         if (file_exists($this->docRoot . '/' . $src)) {
-            $this->debug(3, "Found file as " . $this->docRoot . '/' . $src);
+            $this->debug(3, 'Found file as ' . $this->docRoot . '/' . $src);
             $real = $this->realpath($this->docRoot . '/' . $src);
             if (stripos($real, $this->docRoot) === 0) {
                 return $real;
             } else {
-                $this->debug(1, "Security block: The file specified occurs outside the document root.");
+                $this->debug(1, 'Security block: The file specified occurs outside the document root.');
                 //allow search to continue
             }
         }
@@ -1106,12 +1071,12 @@ protected function getLocalImagePath($src)
         if ($absolute && file_exists($absolute)) { //realpath does file_exists check, so can probably skip the exists check here
             $this->debug(3, "Found absolute path: $absolute");
             if (!$this->docRoot) {
-                $this->sanityFail("docRoot not set when checking absolute path.");
+                $this->sanityFail('docRoot not set when checking absolute path.');
             }
             if (stripos($absolute, $this->docRoot) === 0) {
                 return $absolute;
             } else {
-                $this->debug(1, "Security block: The file specified occurs outside the document root.");
+                $this->debug(1, 'Security block: The file specified occurs outside the document root.');
                 //and continue search
             }
         }
@@ -1119,22 +1084,22 @@ protected function getLocalImagePath($src)
         $base = $this->docRoot;
 
         // account for Windows directory structure
-        if (strstr($_SERVER['SCRIPT_FILENAME'], ':')) {
-            $sub_directories = explode('\\', str_replace($this->docRoot, '', $_SERVER['SCRIPT_FILENAME']));
+        if (false !== strpos($_SERVER['SCRIPT_FILENAME'], ':')) {
+            $subDirectories = explode('\\', str_replace($this->docRoot, '', $_SERVER['SCRIPT_FILENAME']));
         } else {
-            $sub_directories = explode('/', str_replace($this->docRoot, '', $_SERVER['SCRIPT_FILENAME']));
+            $subDirectories = explode('/', str_replace($this->docRoot, '', $_SERVER['SCRIPT_FILENAME']));
         }
 
-        foreach ($sub_directories as $sub) {
+        foreach ($subDirectories as $sub) {
             $base .= $sub . '/';
-            $this->debug(3, "Trying file as: " . $base . $src);
+            $this->debug(3, 'Trying file as: ' . $base . $src);
             if (file_exists($base . $src)) {
-                $this->debug(3, "Found file as: " . $base . $src);
+                $this->debug(3, 'Found file as: ' . $base . $src);
                 $real = $this->realpath($base . $src);
                 if (stripos($real, $this->realpath($this->docRoot)) === 0) {
                     return $real;
                 } else {
-                    $this->debug(1, "Security block: The file specified occurs outside the document root.");
+                    $this->debug(1, 'Security block: The file specified occurs outside the document root.');
                     //And continue search
                 }
             }
@@ -1151,9 +1116,9 @@ protected function getLocalImagePath($src)
     protected function realpath($path)
     {
         //try to remove any relative paths
-        $remove_relatives = '/\w+\/\.\.\//';
-        while (preg_match($remove_relatives, $path)) {
-            $path = preg_replace($remove_relatives, '', $path);
+        $removeRelatives = '/\w+\/\.\.\//';
+        while (preg_match($removeRelatives, $path)) {
+            $path = preg_replace($removeRelatives, '', $path);
         }
         //if any remain use PHP realpath to strip them out, otherwise return $path
         //if using realpath, any symlinks will also be resolved
@@ -1174,13 +1139,13 @@ protected function toDelete($name)
      */
     protected function serveWebshot()
     {
-        $this->debug(3, "Starting serveWebshot");
-        $instr = "Please follow the instructions at http://code.google.com/p/timthumb/ to set your server up for taking website screenshots.";
+        $this->debug(3, 'Starting serveWebshot');
+        $instr = 'Please follow the instructions at http://code.google.com/p/timthumb/ to set your server up for taking website screenshots.';
         if (!is_file(WEBSHOT_CUTYCAPT)) {
             return $this->error("CutyCapt is not installed. $instr");
         }
         if (!is_file(WEBSHOT_XVFB)) {
-            return $this->Error("Xvfb is not installed. $instr");
+            return $this->error("Xvfb is not installed. $instr");
         }
         $cuty      = WEBSHOT_CUTYCAPT;
         $xv        = WEBSHOT_XVFB;
@@ -1197,7 +1162,7 @@ protected function serveWebshot()
         $tempfile  = tempnam($this->cacheDirectory, 'timthumb_webshot');
         $url       = $this->src;
         if (!preg_match('/^https?:\/\/[a-zA-Z0-9\.\-]+/i', $url)) {
-            return $this->error("Invalid URL supplied.");
+            return $this->error('Invalid URL supplied.');
         }
         $url = preg_replace('/[^A-Za-z0-9\-\.\_:\/\?\&\+\;\=]+/', '', $url); //RFC 3986 plus ()$ chars to prevent exploit below. Plus the following are also removed: @*!~#[]',
         // 2014 update by Mark Maunder: This exploit: http://cxsecurity.com/issue/WLB-2014060134
@@ -1207,11 +1172,9 @@ protected function serveWebshot()
         // We're doing this because we're passing this URL to the shell and need to make very sure it's not going to execute arbitrary commands.
         if (WEBSHOT_XVFB_RUNNING) {
             putenv('DISPLAY=:100.0');
-            $command
-                = "$cuty $proxy --max-wait=$timeout --user-agent=\"$ua\" --javascript=$jsOn --java=$javaOn --plugins=$pluginsOn --js-can-open-windows=off --url=\"$url\" --out-format=$format --out=$tempfile";
+            $command = "$cuty $proxy --max-wait=$timeout --user-agent=\"$ua\" --javascript=$jsOn --java=$javaOn --plugins=$pluginsOn --js-can-open-windows=off --url=\"$url\" --out-format=$format --out=$tempfile";
         } else {
-            $command
-                = "$xv --server-args=\"-screen 0, {$screenX}x{$screenY}x{$colDepth}\" $cuty $proxy --max-wait=$timeout --user-agent=\"$ua\" --javascript=$jsOn --java=$javaOn --plugins=$pluginsOn --js-can-open-windows=off --url=\"$url\" --out-format=$format --out=$tempfile";
+            $command = "$xv --server-args=\"-screen 0, {$screenX}x{$screenY}x{$colDepth}\" $cuty $proxy --max-wait=$timeout --user-agent=\"$ua\" --javascript=$jsOn --java=$javaOn --plugins=$pluginsOn --js-can-open-windows=off --url=\"$url\" --out-format=$format --out=$tempfile";
         }
         $this->debug(3, "Executing command: $command");
         $out = `$command`;
@@ -1219,11 +1182,11 @@ protected function serveWebshot()
         if (!is_file($tempfile)) {
             $this->set404();
 
-            return $this->error("The command to create a thumbnail failed.");
+            return $this->error('The command to create a thumbnail failed.');
         }
         $this->cropTop = true;
         if ($this->processImageAndWriteToCache($tempfile)) {
-            $this->debug(3, "Image processed successfully. Serving from cache");
+            $this->debug(3, 'Image processed successfully. Serving from cache');
 
             return $this->serveCacheFile();
         } else {
@@ -1237,7 +1200,7 @@ protected function serveWebshot()
     protected function serveExternalImage()
     {
         if (!preg_match('/^https?:\/\/[a-zA-Z0-9\-\.]+/i', $this->src)) {
-            $this->error("Invalid URL supplied.");
+            $this->error('Invalid URL supplied.');
 
             return false;
         }
@@ -1248,8 +1211,8 @@ protected function serveExternalImage()
         if (!$this->getURL($this->src, $tempfile)) {
             @unlink($this->cachefile);
             touch($this->cachefile);
-            $this->debug(3, "Error fetching URL: " . $this->lastURLError);
-            $this->error("Error reading the URL you specified from remote host." . $this->lastURLError);
+            $this->debug(3, 'Error fetching URL: ' . $this->lastURLError);
+            $this->error('Error reading the URL you specified from remote host.' . $this->lastURLError);
 
             return false;
         }
@@ -1264,7 +1227,7 @@ protected function serveExternalImage()
             return false;
         }
         if ($this->processImageAndWriteToCache($tempfile)) {
-            $this->debug(3, "Image processed successfully. Serving from cache");
+            $this->debug(3, 'Image processed successfully. Serving from cache');
 
             return $this->serveCacheFile();
         } else {
@@ -1302,7 +1265,7 @@ protected function serveCacheFile()
         }
         $fp = fopen($this->cachefile, 'rb');
         if (!$fp) {
-            return $this->error("Could not open cachefile.");
+            return $this->error('Could not open cachefile.');
         }
         fseek($fp, strlen($this->filePrependSecurityBlock), SEEK_SET);
         $imgType = fread($fp, 3);
@@ -1310,7 +1273,7 @@ protected function serveCacheFile()
         if (ftell($fp) != strlen($this->filePrependSecurityBlock) + 6) {
             @unlink($this->cachefile);
 
-            return $this->error("The cached image file seems to be corrupt.");
+            return $this->error('The cached image file seems to be corrupt.');
         }
         $imageDataSize = filesize($this->cachefile) - (strlen($this->filePrependSecurityBlock) + 6);
         $this->sendImageHeaders($imgType, $imageDataSize);
@@ -1323,11 +1286,11 @@ protected function serveCacheFile()
         if ($content !== false) {
             $content = substr($content, strlen($this->filePrependSecurityBlock) + 6);
             echo $content;
-            $this->debug(3, "Served using file_get_contents and echo");
+            $this->debug(3, 'Served using file_get_contents and echo');
 
             return true;
         } else {
-            $this->error("Cache file could not be loaded.");
+            $this->error('Cache file could not be loaded.');
 
             return false;
         }
@@ -1344,7 +1307,7 @@ protected function sendImageHeaders($mimeType, $dataSize)
         if (!preg_match('/^image\//i', $mimeType)) {
             $mimeType = 'image/' . $mimeType;
         }
-        if (strtolower($mimeType) == 'image/jpg') {
+        if (strtolower($mimeType) === 'image/jpg') {
             $mimeType = 'image/jpeg';
         }
         $gmdate_expires  = gmdate('D, d M Y H:i:s', strtotime('now +10 days')) . ' GMT';
@@ -1355,12 +1318,12 @@ protected function sendImageHeaders($mimeType, $dataSize)
         header('Last-Modified: ' . $gmdate_modified);
         header('Content-Length: ' . $dataSize);
         if (BROWSER_CACHE_DISABLE) {
-            $this->debug(3, "Browser cache is disabled so setting non-caching headers.");
+            $this->debug(3, 'Browser cache is disabled so setting non-caching headers.');
             header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0');
-            header("Pragma: no-cache");
+            header('Pragma: no-cache');
             header('Expires: ' . gmdate('D, d M Y H:i:s', time()));
         } else {
-            $this->debug(3, "Browser caching is enabled");
+            $this->debug(3, 'Browser caching is enabled');
             header('Cache-Control: max-age=' . BROWSER_CACHE_MAX_AGE . ', must-revalidate');
             header('Expires: ' . $gmdate_expires);
         }
@@ -1380,7 +1343,7 @@ protected function securityChecks()
      */
     protected function param($property, $default = '')
     {
-        if (isset ($_GET[$property])) {
+        if (isset($_GET[$property])) {
             return XoopsRequest::getString($property, '', 'GET');
         } else {
             return $default;
@@ -1412,7 +1375,7 @@ protected function openImage($mimeType, $src)
                 break;
 
             default:
-                $this->error("Unrecognised mimeType");
+                $this->error('Unrecognised mimeType');
         }
 
         return $image;
@@ -1423,9 +1386,9 @@ protected function openImage($mimeType, $src)
      */
     protected function getIP()
     {
-        $rem = @$_SERVER["REMOTE_ADDR"];
-        $ff  = @$_SERVER["HTTP_X_FORWARDED_FOR"];
-        $ci  = @$_SERVER["HTTP_CLIENT_IP"];
+        $rem = @$_SERVER['REMOTE_ADDR'];
+        $ff  = @$_SERVER['HTTP_X_FORWARDED_FOR'];
+        $ci  = @$_SERVER['HTTP_CLIENT_IP'];
         if (preg_match('/^(?:192\.168|172\.16|10\.|127\.)/', $rem)) {
             if ($ff) {
                 return $ff;
@@ -1446,7 +1409,7 @@ protected function getIP()
                 return $ci;
             }
 
-            return "UNKNOWN";
+            return 'UNKNOWN';
         }
     }
 
@@ -1463,7 +1426,7 @@ protected function debug($level, $msg)
                 $tick = sprintf('%.6f', microtime(true) - $this->lastBenchTime);
             }
             $this->lastBenchTime = microtime(true);
-            error_log("TimThumb Debug line " . __LINE__ . " [$execTime : $tick]: $msg");
+            error_log('TimThumb Debug line ' . __LINE__ . " [$execTime : $tick]: $msg");
         }
     }
 
@@ -1474,9 +1437,7 @@ protected function debug($level, $msg)
      */
     protected function sanityFail($msg)
     {
-        return $this->error(
-            "There is a problem in the timthumb code. Message: Please report this error at <a href='http://code.google.com/p/timthumb/issues/list'>timthumb's bug tracking page</a>: $msg"
-        );
+        return $this->error("There is a problem in the timthumb code. Message: Please report this error at <a href='http://code.google.com/p/timthumb/issues/list'>timthumb's bug tracking page</a>: $msg");
     }
 
     /**
@@ -1497,13 +1458,13 @@ protected function getMimeType($file)
     protected function setMemoryLimit()
     {
         $inimem   = ini_get('memory_limit');
-        $inibytes = timthumb::returnBytes($inimem);
-        $ourbytes = timthumb::returnBytes(MEMORY_LIMIT);
+        $inibytes = Timthumb::returnBytes($inimem);
+        $ourbytes = Timthumb::returnBytes(MEMORY_LIMIT);
         if ($inibytes < $ourbytes) {
             ini_set('memory_limit', MEMORY_LIMIT);
             $this->debug(3, "Increased memory from $inimem to " . MEMORY_LIMIT);
         } else {
-            $this->debug(3, "Not adjusting memory size because the current setting is " . $inimem . " and our size of " . MEMORY_LIMIT . " is smaller.");
+            $this->debug(3, 'Not adjusting memory size because the current setting is ' . $inimem . ' and our size of ' . MEMORY_LIMIT . ' is smaller.');
         }
     }
 
@@ -1540,7 +1501,7 @@ protected function getURL($url, $tempfile)
         $this->lastURLError = false;
         $url                = preg_replace('/ /', '%20', $url);
         if (function_exists('curl_init')) {
-            $this->debug(3, "Curl is installed so using it to fetch URL.");
+            $this->debug(3, 'Curl is installed so using it to fetch URL.');
             self::$curlFH = fopen($tempfile, 'w');
             if (!self::$curlFH) {
                 $this->error("Could not open $tempfile for writing.");
@@ -1551,7 +1512,7 @@ protected function getURL($url, $tempfile)
             $this->debug(3, "Fetching url with curl: $url");
             $curl = curl_init($url);
             curl_setopt($curl, CURLOPT_TIMEOUT, CURL_TIMEOUT);
-            curl_setopt($curl, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.122 Safari/534.30");
+            curl_setopt($curl, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.122 Safari/534.30');
             curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
             curl_setopt($curl, CURLOPT_HEADER, 0);
             curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
@@ -1566,7 +1527,7 @@ protected function getURL($url, $tempfile)
                 $this->set404();
             }
             if ($httpStatus == 302) {
-                $this->error("External Image is Redirecting. Try alternate image url");
+                $this->error('External Image is Redirecting. Try alternate image url');
 
                 return false;
             }
@@ -1589,7 +1550,7 @@ protected function getURL($url, $tempfile)
                 } else {
                     $this->lastURLError = $err;
                 }
-                if (preg_match('/404/', $this->lastURLError)) {
+                if (false !== strpos($this->lastURLError, '404')) {
                     $this->set404();
                 }
 
@@ -1620,7 +1581,7 @@ protected function serveImg($file)
         header('Content-Type: ' . $s['mime']);
         header('Content-Length: ' . filesize($file));
         header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0');
-        header("Pragma: no-cache");
+        header('Pragma: no-cache');
         $bytes = @readfile($file);
         if ($bytes > 0) {
             return true;
diff --git a/publisher/visit.php b/publisher/visit.php
index 4457fe9e..f03e7b8e 100644
--- a/publisher/visit.php
+++ b/publisher/visit.php
@@ -25,26 +25,26 @@
 $fileid = XoopsRequest::getInt('fileid', 0, 'GET');
 
 // Creating the item object for the selected item
-$fileObj = $publisher->getHandler('file')->get($fileid);
+$fileObj =& $publisher->getHandler('file')->get($fileid);
 
-if ($fileObj->getVar('status' != PublisherConstantsInterface::PUBLISHER_STATUS_FILE_ACTIVE)) {
-    redirect_header("javascript:history.go(-1)", 1, _NOPERM);
+if ($fileObj->getVar('status' !== PublisherConstantsInterface::PUBLISHER_STATUS_FILE_ACTIVE)) {
+    redirect_header('javascript:history.go(-1)', 1, _NOPERM);
 }
 
-$itemObj = $publisher->getHandler('item')->get($fileObj->getVar('itemid'));
+$itemObj =& $publisher->getHandler('item')->get($fileObj->getVar('itemid'));
 
 // Check user permissions to access this file
 if (!$itemObj->accessGranted()) {
-    redirect_header("javascript:history.go(-1)", 1, _NOPERM);
-//    exit();
+    redirect_header('javascript:history.go(-1)', 1, _NOPERM);
+    //    exit();
 }
 // Creating the category object that holds the selected ITEM
-$categoryObj = $itemObj->category();
+$categoryObj = $itemObj->getCategory();
 
 $fileObj->updateCounter();
 
 if (!preg_match("/^ed2k*:\/\//i", $fileObj->getFileUrl())) {
-    header("Location: " . $fileObj->getFileUrl());
+    header('Location: ' . $fileObj->getFileUrl());
 }
 
 echo "<html><head><meta http-equiv=\"Refresh\" content=\"0; URL=" . $myts->oopsHtmlSpecialChars($fileObj->getFileUrl()) . "\"/></head><body></body></html>";
diff --git a/publisher/xoops_version.php b/publisher/xoops_version.php
index 4fbd629d..5308267e 100644
--- a/publisher/xoops_version.php
+++ b/publisher/xoops_version.php
@@ -19,20 +19,20 @@
  * @version         $Id: xoops_version.php 11345 2013-04-03 22:35:51Z luciorota $
  */
 
-// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
-xoops_load('XoopsLocal');
+// defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
+//mb xoops_load('XoopsLocal');
 xoops_load('XoopsRequest');
 
 $moduleDirName = basename(__DIR__);
 xoops_load('xoopseditorhandler');
-$editor_handler = XoopsEditorHandler::getInstance();
+$editorHandler =& XoopsEditorHandler::getInstance();
 $xoops_url      = parse_url(XOOPS_URL);
 
 $modversion = array(
     'name'                => _MI_PUBLISHER_MD_NAME,
     'version'             => '1.02',
-    'module_status'       => 'RC1',
-    'release_date'        => "2015/05/26",
+    'module_status'       => 'RC3',
+    'release_date'        => '2015/11/14',
     'description'         => _MI_PUBLISHER_MD_DESC,
     'author'              => 'Trabis (www.Xuups.com)',
     'credits'             => 'w4z004, hsalazar, Mithrandir, fx2024, Ackbarr, Mariuss, Marco, Michiel, phppp, outch, Xvitry, Catzwolf, Shine, McDonald, trabis, Mowaffak, Bandit-x, Shiva',
@@ -40,7 +40,7 @@
     'module_website_name' => 'Support site',
     'help'                => 'page=help',
     'license'             => 'GNU GPL 2.0 or later',
-    'license_url'         => "www.gnu.org/licenses/gpl-2.0.html",
+    'license_url'         => 'www.gnu.org/licenses/gpl-2.0.html',
     'official'            => 1,
     // ------------------- Folders & Files -------------------
     'dirname'             => $moduleDirName,
@@ -48,13 +48,13 @@
     'icons16'             => 'Frameworks/moduleclasses/icons/16',
     'icons32'             => 'Frameworks/moduleclasses/icons/32',
     'image'               => 'assets/images/logo.png',
-    'release_file'        => XOOPS_URL . "/modules/" . $moduleDirName . "/docs/changelog.txt",
+    'release_file'        => XOOPS_URL . '/modules/' . $moduleDirName . '/docs/changelog.txt',
     // ------------------- Install/Update -------------------
     'onInstall'           => 'include/oninstall.php',
     'onUpdate'            => 'include/onupdate.php',
     // ------------------- Min Requirements -------------------
-    'min_php'             => '5.3.7',
-    'min_xoops'           => "2.5.7",
+    'min_php'             => '5.5',
+    'min_xoops'           => '2.5.7',
     'min_admin'           => '1.1',
     'min_db'              => array('mysql' => '5.0.7', 'mysqli' => '5.0.7'),
     // ------------------- Admin Menu -------------------
@@ -68,36 +68,34 @@
     'sqlfile'             => array('mysql' => 'sql/mysql.sql'),
     // ------------------- Tables -------------------
     'tables'              => array(
-        'publisher_categories',
-        'publisher_items',
-        'publisher_files',
-        'publisher_meta',
-        'publisher_mimetypes',
-        'publisher_rating'
-    )
-);
-
-//include_once $GLOBALS['xoops']->path("modules/" . $modversion['dirname'] . "/include/constants.php");
+        $moduleDirName . '_categories',
+        $moduleDirName . '_items',
+        $moduleDirName . '_files',
+        $moduleDirName . '_meta',
+        $moduleDirName . '_mimetypes',
+        $moduleDirName . '_rating'));
+
+//include_once $GLOBALS['xoops']->path('modules/' . $modversion['dirname'] . '/include/constants.php');
 xoops_load('constants', $moduleDirName);
 /*
-$logo_filename = $modversion['dirname'] . "_logo.png";
+$logo_filename = $modversion['dirname'] . '_logo.png';
 
-if (file_exists($GLOBALS['xoops']->path("modules/" . $modversion['dirname'] . "/assets/images/" . $logo_filename))) {
-    $modversion['image'] = "assets/images/{$logo_filename}";
+if (file_exists($GLOBALS['xoops']->path('modules/' . $modversion['dirname'] . '/assets/images/' . $logo_filename))) {
+    $modversion['image'] = 'assets/images/{$logo_filename}';
 } else {
-    $modversion['image'] = "assets/images/module_logo.png";
+    $modversion['image'] = 'assets/images/module_logo.png';
 }
 */
 
-$modversion['people']['testers'][] = "urban, AEIOU, pacho, mariane";
-//$modversion['people']['translaters'][] = "";
-//$modversion['people']['documenters'][] = "";
-$modversion['author_word'] = "";
+$modversion['people']['testers'][] = 'urban, AEIOU, pacho, mariane';
+//$modversion['people']['translaters'][] = '';
+//$modversion['people']['documenters'][] = '';
+$modversion['author_word'] = '';
 
 // Search
 $modversion['hasSearch']      = 1;
-$modversion['search']['file'] = "include/search.inc.php";
-$modversion['search']['func'] = "publisher_search";
+$modversion['search']['file'] = 'include/search.inc.php';
+$modversion['search']['func'] = 'publisher_search';
 
 if (is_object($GLOBALS['xoopsModule']) && $GLOBALS['xoopsModule']->getVar('dirname') == $modversion['dirname']) {
     $isAdmin = false;
@@ -105,280 +103,231 @@
         $isAdmin = $GLOBALS['xoopsUser']->isAdmin($GLOBALS['xoopsModule']->getVar('mid'));
     }
     // Add the Submit new item button
-    $allowsubmit = (isset($GLOBALS['xoopsModuleConfig']['perm_submit']) && $GLOBALS['xoopsModuleConfig']['perm_submit'] == 1) ? true : false;
-    $anonpost    = (isset($GLOBALS['xoopsModuleConfig']['permissions_anon_post']) && $GLOBALS['xoopsModuleConfig']['permissions_anon_post'] == 1) ? true : false;
+    $allowsubmit = (isset($GLOBALS['xoopsModuleConfig']['perm_submit']) && $GLOBALS['xoopsModuleConfig']['perm_submit'] == 1);
+    $anonpost    = (isset($GLOBALS['xoopsModuleConfig']['permissions_anon_post']) && $GLOBALS['xoopsModuleConfig']['permissions_anon_post'] == 1);
     if ($isAdmin || ($allowsubmit && (is_object($GLOBALS['xoopsUser']) || $anonpost))) {
         $modversion['sub'][] = array(
             'name' => _MI_PUBLISHER_SUB_SMNAME1,
-            'url'  => "submit.php?op=add");
+            'url'  => 'submit.php?op=add');
     }
 
-// ------------------- Search -------------------
-    $allowsearch = (isset($GLOBALS['xoopsModuleConfig']['perm_search']) && $GLOBALS['xoopsModuleConfig']['perm_search'] == 1) ? true : false;
+    // ------------------- Search -------------------
+    $allowsearch = (isset($GLOBALS['xoopsModuleConfig']['perm_search']) && $GLOBALS['xoopsModuleConfig']['perm_search'] == 1);
     if ($allowsearch) {
         $modversion['sub'][] = array(
             'name' => _MI_PUBLISHER_SUB_SMNAME3,
-            'url'  => "search.php");
+            'url'  => 'search.php');
     }
 }
 // Add the Archive button
 $modversion['sub'][] = array(
     'name' => _MI_PUBLISHER_SUB_ARCHIVE,
-    'url'  => "archive.php");
+    'url'  => 'archive.php');
 
 // ------------------- Blocks -------------------
 $modversion['blocks'][] = array(
-    'file'        => "items_new.php",
+    'file'        => 'items_new.php',
     'name'        => _MI_PUBLISHER_ITEMSNEW,
     'description' => _MI_PUBLISHER_ITEMSNEW_DSC,
-    'show_func'   => "publisher_items_new_show",
-    'edit_func'   => "publisher_items_new_edit",
-    'options'     => "0|datesub|0|5|65|none",
-    'template'    => 'publisher_items_new.tpl'
-);
+    'show_func'   => 'publisher_items_new_show',
+    'edit_func'   => 'publisher_items_new_edit',
+    'options'     => '0|datesub|0|5|65|none',
+    'template'    => 'publisher_items_new.tpl');
 
 $modversion['blocks'][] = array(
-    'file'        => "items_recent.php",
+    'file'        => 'items_recent.php',
     'name'        => _MI_PUBLISHER_RECENTITEMS,
     'description' => _MI_PUBLISHER_RECENTITEMS_DSC,
-    'show_func'   => "publisher_items_recent_show",
-    'edit_func'   => "publisher_items_recent_edit",
-    'options'     => "0|datesub|5|65",
-    'template'    => 'publisher_items_recent.tpl'
-);
+    'show_func'   => 'publisher_items_recent_show',
+    'edit_func'   => 'publisher_items_recent_edit',
+    'options'     => '0|datesub|5|65',
+    'template'    => 'publisher_items_recent.tpl');
 
 $modversion['blocks'][] = array(
-    'file'        => "items_spot.php",
+    'file'        => 'items_spot.php',
     'name'        => _MI_PUBLISHER_ITEMSPOT,
     'description' => _MI_PUBLISHER_ITEMSPOT_DSC,
-    'show_func'   => "publisher_items_spot_show",
-    'edit_func'   => "publisher_items_spot_edit",
-    'options'     => "1|5|0|0|1|1|bullet|0|0",
-    'template'    => 'publisher_items_spot.tpl'
-);
+    'show_func'   => 'publisher_items_spot_show',
+    'edit_func'   => 'publisher_items_spot_edit',
+    'options'     => '1|5|0|0|1|1|bullet|0|0',
+    'template'    => 'publisher_items_spot.tpl');
 
 $modversion['blocks'][] = array(
-    'file'        => "items_random_item.php",
+    'file'        => 'items_random_item.php',
     'name'        => _MI_PUBLISHER_ITEMSRANDOM_ITEM,
     'description' => _MI_PUBLISHER_ITEMSRANDOM_ITEM_DSC,
-    'show_func'   => "publisher_items_random_item_show",
-    'template'    => 'publisher_items_random_item.tpl'
-);
+    'show_func'   => 'publisher_items_random_item_show',
+    'template'    => 'publisher_items_random_item.tpl');
 
 $modversion['blocks'][] = array(
-    'file'        => "items_menu.php",
+    'file'        => 'items_menu.php',
     'name'        => _MI_PUBLISHER_ITEMSMENU,
     'description' => _MI_PUBLISHER_ITEMSMENU_DSC,
-    'show_func'   => "publisher_items_menu_show",
-    'edit_func'   => "publisher_items_menu_edit",
-    'options'     => "0|datesub|5",
-    'template'    => 'publisher_items_menu.tpl'
-);
+    'show_func'   => 'publisher_items_menu_show',
+    'edit_func'   => 'publisher_items_menu_edit',
+    'options'     => '0|datesub|5',
+    'template'    => 'publisher_items_menu.tpl');
 
 $modversion['blocks'][] = array(
-    'file'        => "latest_files.php",
+    'file'        => 'latest_files.php',
     'name'        => _MI_PUBLISHER_LATESTFILES,
     'description' => _MI_PUBLISHER_LATESTFILES_DSC,
-    'show_func'   => "publisher_latest_files_show",
-    'edit_func'   => "publisher_latest_files_edit",
-    'options'     => "0|datesub|5|0",
-    'template'    => 'publisher_latest_files.tpl'
-);
+    'show_func'   => 'publisher_latest_files_show',
+    'edit_func'   => 'publisher_latest_files_edit',
+    'options'     => '0|datesub|5|0',
+    'template'    => 'publisher_latest_files.tpl');
 
 $modversion['blocks'][] = array(
-    'file'        => "date_to_date.php",
+    'file'        => 'date_to_date.php',
     'name'        => _MI_PUBLISHER_DATE_TO_DATE,
     'description' => _MI_PUBLISHER_DATE_TO_DATE_DSC,
-    'show_func'   => "publisher_date_to_date_show",
-    'edit_func'   => "publisher_date_to_date_edit",
-    'options'     => "XoopsLocal::formatTimestamp(time(), 'm/j/Y') . " | " . XoopsLocal::formatTimestamp(time(), 'm/j/Y')",
-    'template'    => 'publisher_date_to_date.tpl'
-);
+    'show_func'   => 'publisher_date_to_date_show',
+    'edit_func'   => 'publisher_date_to_date_edit',
+    'options'     => "formatTimestamp(time(), 'm/j/Y') . " | " . formatTimestamp(time(), 'm/j/Y')",
+    'template'    => 'publisher_date_to_date.tpl');
 
 $modversion['blocks'][] = array(
-    'file'        => "items_columns.php",
+    'file'        => 'items_columns.php',
     'name'        => _MI_PUBLISHER_COLUMNS,
     'description' => _MI_PUBLISHER_COLUMNS_DSC,
-    'show_func'   => "publisher_items_columns_show",
-    'edit_func'   => "publisher_items_columns_edit",
-    'options'     => "2|0|4|256|normal",
-    'template'    => 'publisher_items_columns.tpl'
-);
+    'show_func'   => 'publisher_items_columns_show',
+    'edit_func'   => 'publisher_items_columns_edit',
+    'options'     => '2|0|4|256|normal',
+    'template'    => 'publisher_items_columns.tpl');
 
 $modversion['blocks'][] = array(
-    'file'        => "latest_news.php",
+    'file'        => 'latest_news.php',
     'name'        => _MI_PUBLISHER_LATEST_NEWS,
     'description' => _MI_PUBLISHER_LATEST_NEWS_DSC,
-    'show_func'   => "publisher_latest_news_show",
-    'edit_func'   => "publisher_latest_news_edit",
-    'options'     => "0|6|2|300|0|0|100|30|published|1|120|120|1|dcdcdc|RIGHT|1|1|1|1|1|1|1|1|1|1|1|1|1|extended|",
-    'template'    => 'publisher_latest_news.tpl'
-);
+    'show_func'   => 'publisher_latest_news_show',
+    'edit_func'   => 'publisher_latest_news_edit',
+    'options'     => '0|6|2|300|0|0|100|30|published|1|120|120|1|dcdcdc|RIGHT|1|1|1|1|1|1|1|1|1|1|1|1|1|extended|',
+    'template'    => 'publisher_latest_news.tpl');
 
 $modversion['blocks'][] = array(
-    'file'        => "search.php",
+    'file'        => 'search.php',
     'name'        => _MI_PUBLISHER_SEARCH,
     'description' => _MI_PUBLISHER_SEARCH_DSC,
-    'show_func'   => "publisher_search_show",
-    'template'    => 'publisher_search_block.tpl'
-);
+    'show_func'   => 'publisher_search_show',
+    'template'    => 'publisher_search_block.tpl');
 
 $modversion['blocks'][] = array(
-    'file'        => "category_items_sel.ph",
+    'file'        => 'category_items_sel.ph',
     'name'        => _MI_PUBLISHER_CATEGORY_ITEMS_SEL,
     'description' => _MI_PUBLISHER_CATEGORY_ITEMS_SEL_DSC,
-    'show_func'   => "publisher_category_items_sel_show",
-    'edit_func'   => "publisher_category_items_sel_edit",
-    'options'     => "0|datesub|5|65",
-    'template'    => 'publisher_category_items_sel.tpl'
-);
+    'show_func'   => 'publisher_category_items_sel_show',
+    'edit_func'   => 'publisher_category_items_sel_edit',
+    'options'     => '0|datesub|5|65',
+    'template'    => 'publisher_category_items_sel.tpl');
 
 // ------------------- Templates -------------------
 
 $modversion['templates'] = array(
     array(
         'file'        => 'publisher_header.tpl',
-        'description' => '_MI_PUBLISHER_HEADER_DSC'
-    ),
+        'description' => '_MI_PUBLISHER_HEADER_DSC'),
     array(
         'file'        => 'publisher_footer.tpl',
-        'description' => '_MI_PUBLISHER_FOOTER_DSC'
-    ),
-    array(
-        'file'        => 'publisher_footer.tpl',
-        'description' => '_MI_PUBLISHER_FOOTER_DSC'
-    ),
+        'description' => '_MI_PUBLISHER_FOOTER_DSC'),
     array(
         'file'        => 'publisher_singleitem.tpl',
-        'description' => '_MI_PUBLISHER_SINGLEITEM_DSC'
-    ),
+        'description' => '_MI_PUBLISHER_SINGLEITEM_DSC'),
     array(
         'file'        => 'publisher_categories_table.tpl',
-        'description' => '_MI_PUBLISHER_CATEGORIES_TABLE_DSC'
-    ),
+        'description' => '_MI_PUBLISHER_CATEGORIES_TABLE_DSC'),
     array(
         'file'        => 'publisher_display_list.tpl',
-        'description' => '_MI_PUBLISHER_DISPLAY_LIST_DSC'
-    ),
+        'description' => '_MI_PUBLISHER_DISPLAY_LIST_DSC'),
     array(
         'file'        => 'publisher_display_summary.tpl',
-        'description' => '_MI_PUBLISHER_DISPLAY_SUMMARY_DSC'
-    ),
+        'description' => '_MI_PUBLISHER_DISPLAY_SUMMARY_DSC'),
     array(
         'file'        => 'publisher_display_full.tpl',
-        'description' => '_MI_PUBLISHER_DISPLAY_FULL_DSC'
-    ),
+        'description' => '_MI_PUBLISHER_DISPLAY_FULL_DSC'),
     array(
         'file'        => 'publisher_display_wfsection.tpl',
-        'description' => '_MI_PUBLISHER_DISPLAY_WFSECTION_DSC'
-    ),
+        'description' => '_MI_PUBLISHER_DISPLAY_WFSECTION_DSC'),
     array(
         'file'        => 'publisher_item.tpl',
-        'description' => '_MI_PUBLISHER_ITEM_DSC'
-    ),
-    array(
-        'file'        => 'publisher_submit.tpl',
-        'description' => '_MI_PUBLISHER_SUBMIT_DSC'
-    ),
+        'description' => '_MI_PUBLISHER_ITEM_DSC'),
     array(
         'file'        => 'publisher_submit.tpl',
-        'description' => '_MI_PUBLISHER_SUBMIT_DSC'
-    ),
+        'description' => '_MI_PUBLISHER_SUBMIT_DSC'),
     array(
         'file'        => 'publisher_singleitem_block.tpl',
-        'description' => '_MI_PUBLISHER_SINGLEITEM_BLOCK_DSC'
-    ),
+        'description' => '_MI_PUBLISHER_SINGLEITEM_BLOCK_DSC'),
     array(
         'file'        => 'publisher_print.tpl',
-        'description' => '_MI_PUBLISHER_PRINT_DSC'
-    ),
+        'description' => '_MI_PUBLISHER_PRINT_DSC'),
     array(
         'file'        => 'publisher_rss.tpl',
-        'description' => '_MI_PUBLISHER_RSS_DSC'
-    ),
+        'description' => '_MI_PUBLISHER_RSS_DSC'),
     array(
         'file'        => 'publisher_addfile.tpl',
-        'description' => '_MI_PUBLISHER_ADDFILE_DSC'
-    ),
+        'description' => '_MI_PUBLISHER_ADDFILE_DSC'),
     array(
         'file'        => 'publisher_search.tpl',
-        'description' => '_MI_PUBLISHER_SEARCH_DSC'
-    ),
+        'description' => '_MI_PUBLISHER_SEARCH_DSC'),
     array(
         'file'        => 'publisher_author_items.tpl',
-        'description' => '_MI_PUBLISHER_AUTHOR_ITEMS_DSC'
-    ),
+        'description' => '_MI_PUBLISHER_AUTHOR_ITEMS_DSC'),
     array(
         'file'        => 'publisher_archive.tpl',
-        'description' => '_MI_PUBLISHER_ARCHIVE__DSC'
-    )
-);
+        'description' => '_MI_PUBLISHER_ARCHIVE__DSC'));
 
 // Config categories
 
 $modversion['configcat']['seo']      = array(
     'name'        => _MI_PUBLISHER_CONFCAT_SEO,
-    'description' => _MI_PUBLISHER_CONFCAT_SEO_DSC
-);
+    'description' => _MI_PUBLISHER_CONFCAT_SEO_DSC);
 $modversion['configcat']['indexcat'] = array(
     'name'        => _MI_PUBLISHER_CONFCAT_INDEXCAT,
-    'description' => _MI_PUBLISHER_CONFCAT_INDEXCAT_DSC
-);
+    'description' => _MI_PUBLISHER_CONFCAT_INDEXCAT_DSC);
 
 $modversion['configcat']['index'] = array(
     'name'        => _MI_PUBLISHER_CONFCAT_INDEX,
-    'description' => _MI_PUBLISHER_CONFCAT_INDEX_DSC
-);
+    'description' => _MI_PUBLISHER_CONFCAT_INDEX_DSC);
 
 $modversion['configcat']['category'] = array(
     'name'        => _MI_PUBLISHER_CONFCAT_CATEGORY,
-    'description' => _MI_PUBLISHER_CONFCAT_CATEGORY_DSC
-);
+    'description' => _MI_PUBLISHER_CONFCAT_CATEGORY_DSC);
 
 $modversion['configcat']['item'] = array(
     'name'        => _MI_PUBLISHER_CONFCAT_ITEM,
-    'description' => _MI_PUBLISHER_CONFCAT_ITEM_DSC
-);
+    'description' => _MI_PUBLISHER_CONFCAT_ITEM_DSC);
 
 $modversion['configcat']['print'] = array(
     'name'        => _MI_PUBLISHER_CONFCAT_PRINT,
-    'description' => _MI_PUBLISHER_CONFCAT_PRINT_DSC
-);
+    'description' => _MI_PUBLISHER_CONFCAT_PRINT_DSC);
 
 $modversion['configcat']['search'] = array(
     'name'        => _MI_PUBLISHER_CONFCAT_SEARCH,
-    'description' => _MI_PUBLISHER_CONFCAT_SEARCH_DSC
-);
+    'description' => _MI_PUBLISHER_CONFCAT_SEARCH_DSC);
 
 $modversion['configcat']['submit'] = array(
     'name'        => _MI_PUBLISHER_CONFCAT_SUBMIT,
-    'description' => _MI_PUBLISHER_CONFCAT_SUBMIT_DSC
-);
+    'description' => _MI_PUBLISHER_CONFCAT_SUBMIT_DSC);
 
 $modversion['configcat']['permissions'] = array(
     'name'        => _MI_PUBLISHER_CONFCAT_PERMISSIONS,
-    'description' => _MI_PUBLISHER_CONFCAT_PERMISSIONS_DSC
-);
+    'description' => _MI_PUBLISHER_CONFCAT_PERMISSIONS_DSC);
 
 $modversion['configcat']['format'] = array(
     'name'        => _MI_PUBLISHER_CONFCAT_FORMAT,
-    'description' => _MI_PUBLISHER_CONFCAT_FORMAT_DSC
-);
+    'description' => _MI_PUBLISHER_CONFCAT_FORMAT_DSC);
 
 //mb
 $modversion['configcat']['group_header'] = array(
     'name'        => _MI_PUBLISHER_CONFCAT_FORMAT,
-    'description' => _MI_PUBLISHER_CONFCAT_FORMAT_DSC
-);
+    'description' => _MI_PUBLISHER_CONFCAT_FORMAT_DSC);
 
 // Config Settings (only for modules that need config settings generated automatically)
 
-
 ################### SEO ####################
 
-//$isModuleAction = (!empty($_POST["fct"]) && "modulesadmin" == $_POST["fct"]) ? true : false;
-$isModuleAction = ('modulesadmin' == XoopsRequest::getString('fct', '', 'POST')) ? true : false;
-//if ($isModuleAction && (in_array(php_sapi_name(), array("apache", "apache2handler", "cgi-fcgi")))) {
+//$isModuleAction = (!empty($_POST['fct']) && 'modulesadmin' == $_POST['fct']) ? true : false;
+$isModuleAction = ('modulesadmin' === XoopsRequest::getString('fct', '', 'POST'));
+//if ($isModuleAction && (in_array(php_sapi_name(), array('apache', 'apache2handler', 'cgi-fcgi')))) {
 //    _MI_PUBLISHER_URL_REWRITE_HTACCESS => 'htaccess'
 //}
 
@@ -390,8 +339,7 @@
     'formtype'    => 'line_break',
     'valuetype'   => 'textbox',
     'default'     => 'odd',
-    'category'    => 'group_header'
-);
+    'category'    => 'group_header');
 
 $modversion['config'][] = array(
     'name'        => 'seo_url_rewrite',
@@ -400,13 +348,9 @@
     'formtype'    => 'select',
     'valuetype'   => 'text',
     'default'     => 'none',
-    'options'     => array_merge(array(_MI_PUBLISHER_URL_REWRITE_NONE => 'none'),
-                                 array(_MI_PUBLISHER_URL_REWRITE_PATHINFO => 'path-info'),
-        // Is performing module install/update?
-                                 ($isModuleAction && (in_array(php_sapi_name(), array("apache", "apache2handler", "cgi-fcgi")))) ? array(_MI_PUBLISHER_URL_REWRITE_HTACCESS => 'htaccess') : array()),
-
-    'category'    => 'seo'
-);
+    'options'     => array_merge(array(_MI_PUBLISHER_URL_REWRITE_NONE => 'none'), array(_MI_PUBLISHER_URL_REWRITE_PATHINFO => 'path-info'), // Is performing module install/update?
+                                 ($isModuleAction && (in_array(php_sapi_name(), array('apache', 'apache2handler', 'cgi-fcgi')))) ? array(_MI_PUBLISHER_URL_REWRITE_HTACCESS => 'htaccess') : array()),
+    'category'    => 'seo');
 
 $modversion['config'][] = array(
     'name'        => 'seo_module_name',
@@ -415,8 +359,7 @@
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
     'default'     => $modversion['dirname'],
-    'category'    => 'seo'
-);
+    'category'    => 'seo');
 $modversion['config'][] = array(
     'name'        => 'seo_meta_keywords',
     'title'       => '_MI_PUBLISHER_SEO_METAKEYWORDS',
@@ -424,8 +367,7 @@
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
     'default'     => '',
-    'category'    => 'seo'
-);
+    'category'    => 'seo');
 ################### INDEX PAGE ####################
 
 // group header
@@ -436,8 +378,7 @@
     'formtype'    => 'line_break',
     'valuetype'   => 'textbox',
     'default'     => 'even',
-    'category'    => 'group_header'
-);
+    'category'    => 'group_header');
 
 $modversion['config'][] = array(
     'name'        => 'index_title_and_welcome',
@@ -446,8 +387,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
-    'category'    => 'index'
-);
+    'category'    => 'index');
 
 $modversion['config'][] = array(
     'name'        => 'index_welcome_msg',
@@ -456,8 +396,7 @@
     'formtype'    => 'textarea',
     'valuetype'   => 'text',
     'default'     => _MI_PUBLISHER_INDEXMSGDEF,
-    'category'    => 'index'
-);
+    'category'    => 'index');
 
 $modversion['config'][] = array(
     'name'        => 'index_display_last_items',
@@ -466,8 +405,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
-    'category'    => 'index'
-);
+    'category'    => 'index');
 
 $modversion['config'][] = array(
     'name'        => 'index_footer',
@@ -476,8 +414,7 @@
     'formtype'    => 'textarea',
     'valuetype'   => 'text',
     'default'     => '',
-    'category'    => 'index'
-);
+    'category'    => 'index');
 ################### CATEGORY PAGE ####################
 // display_categeory_summary enabled by Freeform Solutions March 21 2006
 
@@ -489,8 +426,7 @@
     'formtype'    => 'line_break',
     'valuetype'   => 'textbox',
     'default'     => 'odd',
-    'category'    => 'group_header'
-);
+    'category'    => 'group_header');
 
 $modversion['config'][] = array(
     'name'        => 'cat_display_summary',
@@ -499,8 +435,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
-    'category'    => 'category'
-);
+    'category'    => 'category');
 
 $modversion['config'][] = array(
     'name'        => 'cat_list_image_width',
@@ -509,8 +444,7 @@
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
     'default'     => '90',
-    'category'    => 'category'
-);
+    'category'    => 'category');
 
 $modversion['config'][] = array(
     'name'        => 'cat_main_image_width',
@@ -519,8 +453,7 @@
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
     'default'     => '150',
-    'category'    => 'category'
-);
+    'category'    => 'category');
 ################### ITEM PAGE ####################
 // group header
 $modversion['config'][] = array(
@@ -530,8 +463,7 @@
     'formtype'    => 'line_break',
     'valuetype'   => 'textbox',
     'default'     => 'even',
-    'category'    => 'group_header'
-);
+    'category'    => 'group_header');
 
 $modversion['config'][] = array(
     'name'        => 'item_title_size',
@@ -540,8 +472,7 @@
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
     'default'     => '60',
-    'category'    => 'item'
-);
+    'category'    => 'item');
 
 $modversion['config'][] = array(
     'name'        => 'item_disp_comment_link',
@@ -550,8 +481,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
-    'category'    => 'item'
-);
+    'category'    => 'item');
 
 $modversion['config'][] = array(
     'name'        => 'item_disp_whowhen_link',
@@ -560,8 +490,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
-    'category'    => 'item'
-);
+    'category'    => 'item');
 
 $modversion['config'][] = array(
     'name'        => 'item_admin_hits',
@@ -570,8 +499,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 0,
-    'category'    => 'item'
-);
+    'category'    => 'item');
 
 $modversion['config'][] = array(
     'name'        => 'item_footer',
@@ -580,8 +508,7 @@
     'formtype'    => 'textarea',
     'valuetype'   => 'text',
     'default'     => '',
-    'category'    => 'item'
-);
+    'category'    => 'item');
 
 $modversion['config'][] = array(
     'name'        => 'item_other_items_type',
@@ -592,11 +519,9 @@
     'options'     => array(
         _MI_PUBLISHER_OTHER_ITEMS_TYPE_NONE          => 'none',
         _MI_PUBLISHER_OTHER_ITEMS_TYPE_PREVIOUS_NEXT => 'previous_next',
-        _MI_PUBLISHER_OTHER_ITEMS_TYPE_ALL           => 'all'
-    ),
+        _MI_PUBLISHER_OTHER_ITEMS_TYPE_ALL           => 'all'),
     'default'     => 'previous_next',
-    'category'    => 'item'
-);
+    'category'    => 'item');
 
 ################### INDEX AND CATEGORIES ####################
 // group header
@@ -607,8 +532,7 @@
     'formtype'    => 'line_break',
     'valuetype'   => 'textbox',
     'default'     => 'odd',
-    'category'    => 'group_header'
-);
+    'category'    => 'group_header');
 
 $modversion['config'][] = array(
     'name'        => 'idxcat_show_subcats',
@@ -621,10 +545,8 @@
         _MI_PUBLISHER_SHOW_SUBCATS_NO       => 'no',
         _MI_PUBLISHER_SHOW_SUBCATS_NOTEMPTY => 'nonempty',
         _MI_PUBLISHER_SHOW_SUBCATS_ALL      => 'all',
-        _MI_PUBLISHER_SHOW_SUBCATS_NOMAIN   => 'nomain'
-    ),
-    'category'    => 'indexcat'
-);
+        _MI_PUBLISHER_SHOW_SUBCATS_NOMAIN   => 'nomain'),
+    'category'    => 'indexcat');
 
 $modversion['config'][] = array(
     'name'        => 'idxcat_display_last_item',
@@ -633,8 +555,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
-    'category'    => 'indexcat'
-);
+    'category'    => 'indexcat');
 
 $modversion['config'][] = array(
     'name'        => 'idxcat_last_item_size',
@@ -643,8 +564,7 @@
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
     'default'     => '50',
-    'category'    => 'indexcat'
-);
+    'category'    => 'indexcat');
 
 $modversion['config'][] = array(
     'name'        => 'idxcat_items_display_type',
@@ -656,11 +576,9 @@
         _MI_PUBLISHER_DISPLAYTYPE_SUMMARY   => 'summary',
         _MI_PUBLISHER_DISPLAYTYPE_FULL      => 'full',
         _MI_PUBLISHER_DISPLAYTYPE_LIST      => 'list',
-        _MI_PUBLISHER_DISPLAYTYPE_WFSECTION => 'wfsection'
-    ),
+        _MI_PUBLISHER_DISPLAYTYPE_WFSECTION => 'wfsection'),
     'default'     => 'summary',
-    'category'    => 'indexcat'
-);
+    'category'    => 'indexcat');
 
 $modversion['config'][] = array(
     'name'        => 'idxcat_display_subcat_dsc',
@@ -669,8 +587,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
-    'category'    => 'indexcat'
-);
+    'category'    => 'indexcat');
 
 $modversion['config'][] = array(
     'name'        => 'idxcat_display_date_col',
@@ -679,8 +596,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
-    'category'    => 'indexcat'
-);
+    'category'    => 'indexcat');
 
 $modversion['config'][] = array(
     'name'        => 'idxcat_display_hits_col',
@@ -689,8 +605,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
-    'category'    => 'indexcat'
-);
+    'category'    => 'indexcat');
 
 $modversion['config'][] = array(
     'name'        => 'idxcat_show_rss_link',
@@ -699,8 +614,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
-    'category'    => 'indexcat'
-);
+    'category'    => 'indexcat');
 
 $modversion['config'][] = array(
     'name'        => 'idxcat_collaps_heading',
@@ -709,8 +623,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
-    'category'    => 'indexcat'
-);
+    'category'    => 'indexcat');
 
 $modversion['config'][] = array(
     'name'        => 'idxcat_cat_perpage',
@@ -720,8 +633,7 @@
     'valuetype'   => 'int',
     'default'     => 15,
     'options'     => array('5' => 5, '10' => 10, '15' => 15, '20' => 20, '25' => 25, '30' => 30, '50' => 50),
-    'category'    => 'indexcat'
-);
+    'category'    => 'indexcat');
 
 $modversion['config'][] = array(
     'name'        => 'idxcat_perpage',
@@ -731,8 +643,7 @@
     'valuetype'   => 'int',
     'default'     => 15,
     'options'     => array('5' => 5, '10' => 10, '15' => 15, '20' => 20, '25' => 25, '30' => 30, '50' => 50),
-    'category'    => 'indexcat'
-);
+    'category'    => 'indexcat');
 
 $modversion['config'][] = array(
     'name'        => 'idxcat_index_perpage',
@@ -742,8 +653,7 @@
     'valuetype'   => 'int',
     'default'     => 15,
     'options'     => array('5' => 5, '10' => 10, '15' => 15, '20' => 20, '25' => 25, '30' => 30, '50' => 50),
-    'category'    => 'indexcat'
-);
+    'category'    => 'indexcat');
 
 $modversion['config'][] = array(
     'name'        => 'idxcat_partial_view_text',
@@ -752,8 +662,7 @@
     'formtype'    => 'textarea',
     'valuetype'   => 'text',
     'default'     => _MI_PUBLISHER_PV_TEXT_DEF,
-    'category'    => 'indexcat'
-);
+    'category'    => 'indexcat');
 
 $modversion['config'][] = array(
     'name'        => 'idxcat_display_art_count',
@@ -762,8 +671,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 0,
-    'category'    => 'indexcat'
-);
+    'category'    => 'indexcat');
 
 ################### PRINT ####################
 // group header
@@ -774,8 +682,7 @@
     'formtype'    => 'line_break',
     'valuetype'   => 'textbox',
     'default'     => 'even',
-    'category'    => 'group_header'
-);
+    'category'    => 'group_header');
 
 $modversion['config'][] = array(
     'name'        => 'print_header',
@@ -784,8 +691,7 @@
     'formtype'    => 'textarea',
     'valuetype'   => 'text',
     'default'     => '',
-    'category'    => 'print'
-);
+    'category'    => 'print');
 
 $modversion['config'][] = array(
     'name'        => 'print_logourl',
@@ -794,8 +700,7 @@
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
     'default'     => XOOPS_URL . '/images/logo.gif',
-    'category'    => 'print'
-);
+    'category'    => 'print');
 
 $modversion['config'][] = array(
     'name'        => 'print_footer',
@@ -809,8 +714,7 @@
         _MI_PUBLISHER_INDEXFOOTER_SEL => 'index footer',
         _MI_PUBLISHER_BOTH_FOOTERS    => 'both',
         _MI_PUBLISHER_NO_FOOTERS      => 'none'),
-    'category'    => 'print'
-);
+    'category'    => 'print');
 
 ################### FORMAT ####################
 // group header
@@ -821,8 +725,7 @@
     'formtype'    => 'line_break',
     'valuetype'   => 'textbox',
     'default'     => 'odd',
-    'category'    => 'group_header'
-);
+    'category'    => 'group_header');
 
 $modversion['config'][] = array(
     'name'        => 'format_date',
@@ -831,8 +734,7 @@
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
     'default'     => 'd-M-Y H:i',
-    'category'    => 'format'
-);
+    'category'    => 'format');
 
 $modversion['config'][] = array(
     'name'        => 'format_order_by',
@@ -841,12 +743,15 @@
     'formtype'    => 'select',
     'valuetype'   => 'text',
     'options'     => array(
-        _MI_PUBLISHER_ORDERBY_TITLE  => 'title',
-        _MI_PUBLISHER_ORDERBY_DATE   => 'date',
-        _MI_PUBLISHER_ORDERBY_WEIGHT => 'weight'),
+        _MI_PUBLISHER_ORDERBY_TITLE    => 'title',
+        _MI_PUBLISHER_ORDERBY_DATE     => 'date',
+        _MI_PUBLISHER_ORDERBY_HITS     => 'counter',
+        _MI_PUBLISHER_ORDERBY_RATING   => 'rating',
+        _MI_PUBLISHER_ORDERBY_VOTES    => 'votes',
+        _MI_PUBLISHER_ORDERBY_COMMENTS => 'comments',
+        _MI_PUBLISHER_ORDERBY_WEIGHT   => 'weight'),
     'default'     => 'date',
-    'category'    => 'format'
-);
+    'category'    => 'format');
 
 $modversion['config'][] = array(
     'name'        => 'format_image_nav',
@@ -855,8 +760,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 0,
-    'category'    => 'format'
-);
+    'category'    => 'format');
 
 $modversion['config'][] = array(
     'name'        => 'format_realname',
@@ -865,8 +769,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 0,
-    'category'    => 'format'
-);
+    'category'    => 'format');
 
 $modversion['config'][] = array(
     'name'        => 'format_highlight_color',
@@ -875,8 +778,7 @@
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
     'default'     => '#FFFF80',
-    'category'    => 'format'
-);
+    'category'    => 'format');
 
 $modversion['config'][] = array(
     'name'        => 'format_linked_path',
@@ -885,8 +787,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
-    'category'    => 'format'
-);
+    'category'    => 'format');
 
 $modversion['config'][] = array(
     'name'        => 'format_breadcrumb_modname',
@@ -895,8 +796,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
-    'category'    => 'format'
-);
+    'category'    => 'format');
 
 ################### SEARCH ####################
 // group header
@@ -907,8 +807,7 @@
     'formtype'    => 'line_break',
     'valuetype'   => 'textbox',
     'default'     => 'even',
-    'category'    => 'group_header'
-);
+    'category'    => 'group_header');
 
 $modversion['config'][] = array(
     'name'        => 'search_cat_path',
@@ -917,8 +816,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 0,
-    'category'    => 'search'
-);
+    'category'    => 'search');
 
 ################### SUBMIT ####################
 // group header
@@ -929,8 +827,7 @@
     'formtype'    => 'line_break',
     'valuetype'   => 'textbox',
     'default'     => 'odd',
-    'category'    => 'group_header'
-);
+    'category'    => 'group_header');
 
 $modversion['config'][] = array(
     'name'        => 'submit_intro_msg',
@@ -939,11 +836,10 @@
     'formtype'    => 'textarea',
     'valuetype'   => 'text',
     'default'     => _MI_PUBLISHER_SUBMITMSGDEF,
-    'category'    => 'submit'
-);
+    'category'    => 'submit');
 
 xoops_load('XoopsEditorHandler');
-$editor_handler = XoopsEditorHandler::getInstance();
+$editorHandler =& XoopsEditorHandler::getInstance();
 
 $modversion['config'][] = array(
     'name'        => 'submit_editor',
@@ -951,10 +847,9 @@
     'description' => '_MI_PUBLISHER_EDITOR_DSC',
     'formtype'    => 'select',
     'valuetype'   => 'text',
-    'options'     => array_flip($editor_handler->getList()),
+    'options'     => array_flip($editorHandler->getList()),
     'default'     => 'dhtmltextarea',
-    'category'    => 'submit'
-);
+    'category'    => 'submit');
 
 $modversion['config'][] = array(
     'name'        => 'submit_editor_rows',
@@ -963,8 +858,7 @@
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
     'default'     => '35',
-    'category'    => 'submit'
-);
+    'category'    => 'submit');
 
 $modversion['config'][] = array(
     'name'        => 'submit_editor_cols',
@@ -973,8 +867,7 @@
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
     'default'     => '60',
-    'category'    => 'submit'
-);
+    'category'    => 'submit');
 
 $modversion['config'][] = array(
     'name'        => 'submit_editor_width',
@@ -983,8 +876,7 @@
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
     'default'     => '100%',
-    'category'    => 'submit'
-);
+    'category'    => 'submit');
 
 $modversion['config'][] = array(
     'name'        => 'submit_editor_height',
@@ -993,8 +885,7 @@
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
     'default'     => '400px',
-    'category'    => 'submit'
-);
+    'category'    => 'submit');
 
 $modversion['config'][] = array(
     'name'        => 'submit_status',
@@ -1006,11 +897,9 @@
         _MI_PUBLISHER_PUBLISHED => PublisherConstantsInterface::PUBLISHER_STATUS_PUBLISHED,
         _MI_PUBLISHER_OFFLINE   => PublisherConstantsInterface::PUBLISHER_STATUS_OFFLINE,
         _MI_PUBLISHER_SUBMITTED => PublisherConstantsInterface::PUBLISHER_STATUS_SUBMITTED,
-        _MI_PUBLISHER_REJECTED  => PublisherConstantsInterface::PUBLISHER_STATUS_REJECTED
-    ),
+        _MI_PUBLISHER_REJECTED  => PublisherConstantsInterface::PUBLISHER_STATUS_REJECTED),
     'default'     => PublisherConstantsInterface::PUBLISHER_STATUS_SUBMITTED,
-    'category'    => 'submit'
-);
+    'category'    => 'submit');
 
 $modversion['config'][] = array(
     'name'        => 'submit_allowcomments',
@@ -1019,8 +908,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
-    'category'    => 'submit'
-);
+    'category'    => 'submit');
 
 $modversion['config'][] = array(
     'name'        => 'submit_dohtml',
@@ -1029,8 +917,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
-    'category'    => 'submit'
-);
+    'category'    => 'submit');
 
 $modversion['config'][] = array(
     'name'        => 'submit_dosmiley',
@@ -1039,8 +926,7 @@
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
-    'category'    => 'submit'
-);
+    'category'    => 'submit');
 
 $modversion['config'][] = array(
     'name'        => 'submit_doxcode',
@@ -1078,8 +964,7 @@
     'formtype'    => 'line_break',
     'valuetype'   => 'textbox',
     'default'     => 'even',
-    'category'    => 'group_header'
-);
+    'category'    => 'group_header');
 
 $modversion['config'][] = array(
     'name'        => 'perm_submit',
@@ -1189,8 +1074,7 @@
     'formtype'    => 'line_break',
     'valuetype'   => 'textbox',
     'default'     => 'odd',
-    'category'    => 'group_header'
-);
+    'category'    => 'group_header');
 
 $modversion['config'][] = array(
     'name'        => 'display_breadcrumb',
@@ -1289,8 +1173,7 @@
     'name'           => 'global_item',
     'title'          => _MI_PUBLISHER_GLOBAL_ITEM_NOTIFY,
     'description'    => _MI_PUBLISHER_GLOBAL_ITEM_NOTIFY_DSC,
-    'subscribe_from' => "array('index.php', 'category.php', 'item.php')"
-);
+    'subscribe_from' => "array('index.php', 'category.php', 'item.php')");
 
 $modversion['notification']['category'][] = array(
     'name'           => 'category_item',
@@ -1298,16 +1181,14 @@
     'description'    => _MI_PUBLISHER_CATEGORY_ITEM_NOTIFY_DSC,
     'subscribe_from' => "array('index.php', 'category.php', 'item.php')",
     'item_name'      => 'categoryid',
-    'allow_bookmark' => 1
-);
+    'allow_bookmark' => 1);
 $modversion['notification']['category'][] = array(
     'name'           => 'item',
     'title'          => _MI_PUBLISHER_ITEM_NOTIFY,
     'description'    => _MI_PUBLISHER_ITEM_NOTIFY_DSC,
     'subscribe_from' => "array('item.php')",
     'item_name'      => 'itemid',
-    'allow_bookmark' => 1
-);
+    'allow_bookmark' => 1);
 
 $modversion['notification']['event'][] = array(
     'name'          => 'category_created',
@@ -1316,8 +1197,7 @@
     'caption'       => _MI_PUBLISHER_GLOBAL_ITEM_CATEGORY_CREATED_NOTIFY_CAP,
     'description'   => _MI_PUBLISHER_GLOBAL_ITEM_CATEGORY_CREATED_NOTIFY_DSC,
     'mail_template' => 'global_item_category_created',
-    'mail_subject'  => _MI_PUBLISHER_GLOBAL_ITEM_CATEGORY_CREATED_NOTIFY_SBJ
-);
+    'mail_subject'  => _MI_PUBLISHER_GLOBAL_ITEM_CATEGORY_CREATED_NOTIFY_SBJ);
 $modversion['notification']['event'][] = array(
     'name'          => 'submitted',
     'category'      => 'global_item',
@@ -1326,8 +1206,7 @@
     'caption'       => _MI_PUBLISHER_GLOBAL_ITEM_SUBMITTED_NOTIFY_CAP,
     'description'   => _MI_PUBLISHER_GLOBAL_ITEM_SUBMITTED_NOTIFY_DSC,
     'mail_template' => 'global_item_submitted',
-    'mail_subject'  => _MI_PUBLISHER_GLOBAL_ITEM_SUBMITTED_NOTIFY_SBJ
-);
+    'mail_subject'  => _MI_PUBLISHER_GLOBAL_ITEM_SUBMITTED_NOTIFY_SBJ);
 $modversion['notification']['event'][] = array(
     'name'          => 'published',
     'category'      => 'global_item',
@@ -1335,8 +1214,7 @@
     'caption'       => _MI_PUBLISHER_GLOBAL_ITEM_PUBLISHED_NOTIFY_CAP,
     'description'   => _MI_PUBLISHER_GLOBAL_ITEM_PUBLISHED_NOTIFY_DSC,
     'mail_template' => 'global_item_published',
-    'mail_subject'  => _MI_PUBLISHER_GLOBAL_ITEM_PUBLISHED_NOTIFY_SBJ
-);
+    'mail_subject'  => _MI_PUBLISHER_GLOBAL_ITEM_PUBLISHED_NOTIFY_SBJ);
 $modversion['notification']['event'][] = array(
     'name'          => 'submitted',
     'category'      => 'category_item',
@@ -1345,8 +1223,7 @@
     'caption'       => _MI_PUBLISHER_CATEGORY_ITEM_SUBMITTED_NOTIFY_CAP,
     'description'   => _MI_PUBLISHER_CATEGORY_ITEM_SUBMITTED_NOTIFY_DSC,
     'mail_template' => 'category_item_submitted',
-    'mail_subject'  => _MI_PUBLISHER_CATEGORY_ITEM_SUBMITTED_NOTIFY_SBJ
-);
+    'mail_subject'  => _MI_PUBLISHER_CATEGORY_ITEM_SUBMITTED_NOTIFY_SBJ);
 $modversion['notification']['event'][] = array(
     'name'          => 'published',
     'category'      => 'category_item',
@@ -1354,8 +1231,7 @@
     'caption'       => _MI_PUBLISHER_CATEGORY_ITEM_PUBLISHED_NOTIFY_CAP,
     'description'   => _MI_PUBLISHER_CATEGORY_ITEM_PUBLISHED_NOTIFY_DSC,
     'mail_template' => 'category_item_published',
-    'mail_subject'  => _MI_PUBLISHER_CATEGORY_ITEM_PUBLISHED_NOTIFY_SBJ
-);
+    'mail_subject'  => _MI_PUBLISHER_CATEGORY_ITEM_PUBLISHED_NOTIFY_SBJ);
 $modversion['notification']['event'][] = array(
     'name'          => 'rejected',
     'category'      => 'item',
@@ -1364,8 +1240,7 @@
     'caption'       => _MI_PUBLISHER_ITEM_REJECTED_NOTIFY_CAP,
     'description'   => _MI_PUBLISHER_ITEM_REJECTED_NOTIFY_DSC,
     'mail_template' => 'item_rejected',
-    'mail_subject'  => _MI_PUBLISHER_ITEM_REJECTED_NOTIFY_SBJ
-);
+    'mail_subject'  => _MI_PUBLISHER_ITEM_REJECTED_NOTIFY_SBJ);
 $modversion['notification']['event'][] = array(
     'name'          => 'approved',
     'category'      => 'item',
@@ -1374,5 +1249,4 @@
     'caption'       => _MI_PUBLISHER_ITEM_APPROVED_NOTIFY_CAP,
     'description'   => _MI_PUBLISHER_ITEM_APPROVED_NOTIFY_DSC,
     'mail_template' => 'item_approved',
-    'mail_subject'  => _MI_PUBLISHER_ITEM_APPROVED_NOTIFY_SBJ
-);
+    'mail_subject'  => _MI_PUBLISHER_ITEM_APPROVED_NOTIFY_SBJ);