geekwright / XoopsCore

htdocs/modules/publisher/admin/import/wfsection.php

Spacing +31 added lines, -31 removed lines

@@ -26,10 +26,10 @@ 
 use Xoops\Form\ThemeForm;
 use XoopsModules\Publisher;
 
-require_once dirname(__DIR__) . '/admin_header.php';
+require_once dirname(__DIR__).'/admin_header.php';
 $myts = Sanitizer::getInstance();
 
-$importFromModuleName = 'WF-Section ' . @$_POST['wfs_version'];
+$importFromModuleName = 'WF-Section '.@$_POST['wfs_version'];
 
 $scriptname = 'wfsection.php';
 
@@ -44,26 +44,26 @@ 
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     Publisher\Utils::openCollapsableBar('wfsectionimport', 'wfsectionimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
-    $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('wfs_category'));
+    $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('wfs_category'));
     [$totalCat] = $xoopsDB->fetchRow($result);
 
     if (0 == $totalCat) {
-        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 {
-        require_once XoopsBaseConfig::get('root-path') . '/class/xoopstree.php';
+        require_once XoopsBaseConfig::get('root-path').'/class/xoopstree.php';
 
-        $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('wfs_article'));
+        $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('wfs_article'));
         [$totalArticles] = $xoopsDB->fetchRow($result);
 
         if (0 == $totalArticles) {
-            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 ThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
+            $form = new ThemeForm(_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 ' . $xoopsDB->prefix('wfs_category') . ' AS cat INNER JOIN ' . $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 '.$xoopsDB->prefix('wfs_category').' AS cat INNER JOIN '.$xoopsDB->prefix('wfs_article').' AS art ON cat.id=art.categoryid GROUP BY art.categoryid';
             $result = $xoopsDB->query($sql);
             $cat_cbox_values = [];
             $cat_cbox_options = [];
@@ -114,7 +114,7 @@ 
         $orders = 'orders';
     }
     //$sql = "SELECT * FROM ".$xoopsDB->prefix("wfs_category")." ORDER by orders";
-    $sql = 'SELECT * FROM ' . $xoopsDB->prefix('wfs_category') . " ORDER by $orders";
+    $sql = 'SELECT * FROM '.$xoopsDB->prefix('wfs_category')." ORDER by $orders";
     //end added to support 2.0.7
     $resultCat = $xoopsDB->query($sql);
 
@@ -139,13 +139,13 @@ 
 
         // Category image
         if (('blank.gif' !== $arrCat['imgurl']) && $arrCat['imgurl']) {
-            if (copy(XOOPS_ROOT_PATH . '/modules/wfsection/images/category/' . $arrCat['imgurl'], PUBLISHER_UPLOADS_PATH . '/images/category/' . $arrCat['imgurl'])) {
+            if (copy(XOOPS_ROOT_PATH.'/modules/wfsection/images/category/'.$arrCat['imgurl'], PUBLISHER_UPLOADS_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;
         }
 
@@ -156,9 +156,9 @@ 
 
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->getVar('name')) . "<br\>";
+        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->getVar('name'))."<br\>";
 
-        $sql = 'SELECT * FROM ' . $xoopsDB->prefix('wfs_article') . ' WHERE categoryid=' . $arrCat['id'] . ' ORDER BY weight';
+        $sql = 'SELECT * FROM '.$xoopsDB->prefix('wfs_article').' WHERE categoryid='.$arrCat['id'].' ORDER BY weight';
         $resultArticles = $xoopsDB->query($sql);
         while (false !== ($arrArticle = $xoopsDB->fetchArray($resultArticles))) {
             // insert article
@@ -180,29 +180,29 @@ 
 
             // HTML Wrap
             if ($arrArticle['htmlpage']) {
-                $pagewrap_filename = XoopsBaseConfig::get('root-path') . '/modules/wfsection/html/' . $arrArticle['htmlpage'];
+                $pagewrap_filename = XoopsBaseConfig::get('root-path').'/modules/wfsection/html/'.$arrArticle['htmlpage'];
                 if (XoopsLoad::fileExists($pagewrap_filename)) {
-                    if (copy($pagewrap_filename, PUBLISHER_UPLOADS_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_UPLOADS_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;
             }
 
             // Linkes files
 
-            $sql = 'SELECT * FROM ' . $xoopsDB->prefix('wfs_files') . ' WHERE articleid=' . $arrArticle['articleid'];
+            $sql = 'SELECT * FROM '.$xoopsDB->prefix('wfs_files').' WHERE articleid='.$arrArticle['articleid'];
             $resultFiles = $xoopsDB->query($sql);
             $allowed_mimetypes = '';
             while (false !== ($arrFile = $xoopsDB->fetchArray($resultFiles))) {
-                $filename = XoopsBaseConfig::get('root-path') . '/modules/wfsection/cache/uploaded/' . $arrFile['filerealname'];
+                $filename = XoopsBaseConfig::get('root-path').'/modules/wfsection/cache/uploaded/'.$arrFile['filerealname'];
                 if (XoopsLoad::fileExists($filename)) {
-                    if (copy($filename, PUBLISHER_UPLOADS_PATH . '/' . $arrFile['filerealname'])) {
+                    if (copy($filename, PUBLISHER_UPLOADS_PATH.'/'.$arrFile['filerealname'])) {
                         $fileObj = $helper->getFileHandler()->create();
                         $fileObj->setVar('name', $arrFile['fileshowname']);
                         $fileObj->setVar('description', $arrFile['filedescript']);
@@ -215,14 +215,14 @@ 
                         $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->getVar('itemid');
-            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()).'<br>';
             ++$cnt_imported_articles;
         }
         $newCatArray[$newCat['oldid']] = $newCat;
@@ -244,7 +244,7 @@ 
     }
 
     // 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');
     $moduleObj = $moduleHandler->getByDirname('wfsection');
@@ -261,16 +261,16 @@ 
         $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>';
         }
     }
 
     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 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>';
 
     Publisher\Utils::closeCollapsableBar('wfsectionimportgo', 'wfsectionimportgoicon');
     $xoops->footer();

htdocs/modules/publisher/admin/import/smartsection.php

Spacing +27 added lines, -27 removed lines

@@ -26,10 +26,10 @@ 
 use Xoops\Form\ThemeForm;
 use XoopsModules\Publisher;
 
-require_once dirname(__DIR__) . '/admin_header.php';
+require_once dirname(__DIR__).'/admin_header.php';
 $myts = Sanitizer::getInstance();
 
-$importFromModuleName = 'Smartsection ' . @$_POST['smartsection_version'];
+$importFromModuleName = 'Smartsection '.@$_POST['smartsection_version'];
 
 $scriptname = 'smartsection.php';
 
@@ -44,26 +44,26 @@ 
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     Publisher\Utils::openCollapsableBar('newsimport', 'newsimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
-    $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('smartsection_categories'));
+    $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('smartsection_categories'));
     [$totalCat] = $xoopsDB->fetchRow($result);
 
     if (0 == $totalCat) {
-        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 {
-        require_once XoopsBaseConfig::get('root-path') . '/class/xoopstree.php';
+        require_once XoopsBaseConfig::get('root-path').'/class/xoopstree.php';
 
-        $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('smartsection_items'));
+        $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('smartsection_items'));
         [$totalArticles] = $xoopsDB->fetchRow($result);
 
         if (0 == $totalArticles) {
-            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 ThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/{$scriptname}");
+            $form = new ThemeForm(_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 ' . $xoopsDB->prefix('smartsection_categories') . ' AS cat INNER JOIN ' . $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 '.$xoopsDB->prefix('smartsection_categories').' AS cat INNER JOIN '.$xoopsDB->prefix('smartsection_items').' AS art ON cat.categoryid=art.categoryid GROUP BY art.categoryid';
 
             $result = $xoopsDB->query($sql);
             $cat_cbox_options = [];
@@ -116,7 +116,7 @@ 
 
     $parentId = $_POST['parent_category'];
 
-    $sql = 'SELECT * FROM ' . $xoopsDB->prefix('smartsection_categories');
+    $sql = 'SELECT * FROM '.$xoopsDB->prefix('smartsection_categories');
 
     $resultCat = $xoopsDB->query($sql);
 
@@ -136,20 +136,20 @@ 
 
         // Copy category image
         if (('blank.gif' !== $arrCat['image']) && ('' != $arrCat['image'])) {
-            copy(XoopsBaseConfig::get('root-path') . '/uploads/smartsection/images/category/' . $arrCat['image'], XoopsBaseConfig::get('root-path') . '/uploads/publisher/images/category/' . $arrCat['image']);
+            copy(XoopsBaseConfig::get('root-path').'/uploads/smartsection/images/category/'.$arrCat['image'], XoopsBaseConfig::get('root-path').'/uploads/publisher/images/category/'.$arrCat['image']);
         }
 
         if (!$helper->getCategoryHandler()->insert($categoryObj)) {
-            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['name']) . '<br>';
+            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['name']).'<br>';
             continue;
         }
 
         $newCat['newid'] = $categoryObj->getVar('categoryid');
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->getVar('name')) . "<br\>";
+        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->getVar('name'))."<br\>";
 
-        $sql = 'SELECT * FROM ' . $xoopsDB->prefix('smartsection_items') . ' WHERE categoryid=' . $arrCat['categoryid'];
+        $sql = 'SELECT * FROM '.$xoopsDB->prefix('smartsection_items').' WHERE categoryid='.$arrCat['categoryid'];
         $resultArticles = $xoopsDB->query($sql);
 
         while (false !== ($arrArticle = $xoopsDB->fetchArray($resultArticles))) {
@@ -177,31 +177,31 @@ 
             */
 
             if (!$itemObj->store()) {
-                echo sprintf('  ' . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . '<br>';
+                echo sprintf('  '._AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']).'<br>';
                 continue;
             }
 
             // Linkes files
-            $sql = 'SELECT * FROM ' . $xoopsDB->prefix('smartsection_files') . ' WHERE itemid=' . $arrArticle['itemid'];
+            $sql = 'SELECT * FROM '.$xoopsDB->prefix('smartsection_files').' WHERE itemid='.$arrArticle['itemid'];
             $resultFiles = $xoopsDB->query($sql);
             $allowed_mimetypes = null;
             while (false !== ($arrFile = $xoopsDB->fetchArray($resultFiles))) {
-                $filename = XoopsBaseConfig::get('root-path') . '/uploads/smartsection/' . $arrFile['filename'];
+                $filename = XoopsBaseConfig::get('root-path').'/uploads/smartsection/'.$arrFile['filename'];
                 if (XoopsLoad::fileExists($filename)) {
-                    if (copy($filename, XoopsBaseConfig::get('root-path') . '/uploads/publisher/' . $arrFile['filename'])) {
+                    if (copy($filename, XoopsBaseConfig::get('root-path').'/uploads/publisher/'.$arrFile['filename'])) {
                         $fileObj = $helper->getFileHandler()->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->getVar('itemid');
-            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()).'<br>';
             ++$cnt_imported_articles;
         }
 
@@ -231,7 +231,7 @@ 
     }
 
     // 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 = $helper->getModule()->mid();
 
@@ -244,16 +244,16 @@ 
         $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>';
         }
     }
 
     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 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>';
 
     Publisher\Utils::closeCollapsableBar('newsimportgo', 'newsimportgoicon');
     $xoops->footer();

htdocs/modules/publisher/admin/about.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  */
 use Xoops\Module\Admin;
 
-require __DIR__ . '/admin_header.php';
+require __DIR__.'/admin_header.php';
 
 $xoops = Xoops::getInstance();
 $xoops->header();

htdocs/modules/publisher/admin/admin_header.php

Spacing +2 added lines, -2 removed lines

@@ -23,12 +23,12 @@
 use XoopsModules\Publisher;
 use XoopsModules\Publisher\Helper;
 
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
 
 $xoops = Xoops::getInstance();
 
 $helper = Helper::getInstance();
 $helper->loadLanguage('modinfo');
 
-XoopsLoad::loadFile($xoops->path(dirname(__DIR__) . '/include/common.php'));
+XoopsLoad::loadFile($xoops->path(dirname(__DIR__).'/include/common.php'));
 //XoopsLoad::loadFile($xoops->path(XOOPS_ROOT_PATH . '/include/cp_header.php'));

htdocs/modules/publisher/admin/item.php

Indentation +5 added lines, -5 removed lines

@@ -159,11 +159,11 @@
         } else {
             $xoops->header();
             echo $xoops->confirm([
-                                     'op' => 'del',
-                                     'itemid' => $itemObj->getVar('itemid'),
-                                     'confirm' => 1,
-                                     'name' => $itemObj->title(),
-                                 ], 'item.php', _AM_PUBLISHER_DELETETHISITEM . " <br>'" . $itemObj->title() . "'. <br> <br>", _AM_PUBLISHER_DELETE);
+                                        'op' => 'del',
+                                        'itemid' => $itemObj->getVar('itemid'),
+                                        'confirm' => 1,
+                                        'name' => $itemObj->title(),
+                                    ], 'item.php', _AM_PUBLISHER_DELETETHISITEM . " <br>'" . $itemObj->title() . "'. <br> <br>", _AM_PUBLISHER_DELETE);
             $xoops->footer();
         }
         exit();

Spacing +66 added lines, -66 removed lines

@@ -27,7 +27,7 @@ 
  * @author          trabis <lusopoemas@gmail.com>
  * @author          The SmartFactory <www.smartfactory.ca>
  */
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $xoops = Xoops::getInstance();
 
@@ -127,7 +127,7 @@ 
 
         // Storing the item
         if (!$itemObj->store()) {
-            $xoops->redirect('javascript:history.go(-1)', 3, $error_msg . Publisher\Utils::formatErrors($itemObj->getErrors()));
+            $xoops->redirect('javascript:history.go(-1)', 3, $error_msg.Publisher\Utils::formatErrors($itemObj->getErrors()));
         }
 
         // attach file if any
@@ -152,7 +152,7 @@ 
 
         if ($confirm) {
             if (!$helper->getItemHandler()->delete($itemObj)) {
-                $xoops->redirect('item.php', 2, _AM_PUBLISHER_ITEM_DELETE_ERROR . Publisher\Utils::formatErrors($itemObj->getErrors()));
+                $xoops->redirect('item.php', 2, _AM_PUBLISHER_ITEM_DELETE_ERROR.Publisher\Utils::formatErrors($itemObj->getErrors()));
                 exit();
             }
             $xoops->redirect('item.php', 2, sprintf(_AM_PUBLISHER_ITEMISDELETED, $itemObj->title()));
@@ -163,7 +163,7 @@ 
                                      'itemid' => $itemObj->getVar('itemid'),
                                      'confirm' => 1,
                                      'name' => $itemObj->title(),
-                                 ], 'item.php', _AM_PUBLISHER_DELETETHISITEM . " <br>'" . $itemObj->title() . "'. <br> <br>", _AM_PUBLISHER_DELETE);
+                                 ], 'item.php', _AM_PUBLISHER_DELETETHISITEM." <br>'".$itemObj->title()."'. <br> <br>", _AM_PUBLISHER_DELETE);
             $xoops->footer();
         }
         exit();
@@ -175,7 +175,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 "<input type='button' name='button' onclick=\"location='item.php?op=mod'\" value='"._AM_PUBLISHER_CREATEITEM."'>&nbsp;&nbsp;";
         echo '</div></form>';
 
         $orderBy = 'datesub';
@@ -193,40 +193,40 @@ 
 
         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_ITEMCATEGORYNAME . '</strong></td>';
-        echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_TITLE . '</strong></td>';
-        echo "<td width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . '</strong></td>';
-        echo "<td width='80' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+        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_ITEMCATEGORYNAME.'</strong></td>';
+        echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_TITLE.'</strong></td>';
+        echo "<td width='90' class='bg3' align='center'><strong>"._AM_PUBLISHER_CREATED.'</strong></td>';
+        echo "<td 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();
 
-                $approve = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/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]->getVar('itemid')."'><img src='".PUBLISHER_URL."/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]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'></a>";
+                $delete = "<a href='item.php?op=del&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/delete.png' title='"._AM_PUBLISHER_DELETEITEM."' alt='"._AM_PUBLISHER_DELETEITEM."'></a>";
                 $modify = '';
 
                 echo '<tr>';
-                echo "<td class='head' align='center'>" . $itemsObj[$i]->getVar('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]->getVar('itemid') . "'>" . $itemsObj[$i]->title() . '</a></td>';
-                echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub() . '</td>';
+                echo "<td class='head' align='center'>".$itemsObj[$i]->getVar('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]->getVar('itemid')."'>".$itemsObj[$i]->title().'</a></td>';
+                echo "<td class='even' align='center'>".$itemsObj[$i]->datesub().'</td>';
                 echo "<td class='even' align='center'> $approve $clone $modify $delete </td>";
                 echo '</tr>';
             }
         } else {
             $itemid = 0;
             echo '<tr>';
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS_SUBMITTED . '</td>';
+            echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOITEMS_SUBMITTED.'</td>';
             echo '</tr>';
         }
         echo "</table>\n";
         echo "<br>\n";
 
         $pagenav = new XoopsPageNav($totalitems, $helper->getConfig('idxcat_perpage'), $submittedstartitem, 'submittedstartitem');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
 
         Publisher\Utils::closeCollapsableBar('submiteditemstable', 'submiteditemsicon');
 
@@ -242,44 +242,44 @@ 
 
         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_ITEMCATEGORYNAME . '</strong></td>';
-        echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_TITLE . '</strong></td>';
-        echo "<td width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . '</strong></td>';
-        echo "<td width='80' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+        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_ITEMCATEGORYNAME.'</strong></td>';
+        echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_TITLE.'</strong></td>';
+        echo "<td width='90' class='bg3' align='center'><strong>"._AM_PUBLISHER_CREATED.'</strong></td>';
+        echo "<td 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();
 
-                $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "'></a>";
-                $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'></a>";
-                $clone = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/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]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/edit.gif' title='"._AM_PUBLISHER_EDITITEM."' alt='"._AM_PUBLISHER_EDITITEM."'></a>";
+                $delete = "<a href='item.php?op=del&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/delete.png' title='"._AM_PUBLISHER_DELETEITEM."' alt='"._AM_PUBLISHER_DELETEITEM."'></a>";
+                $clone = "<a href='item.php?op=clone&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/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]->getVar('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='head' align='center'>".$itemsObj[$i]->getVar('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'> $clone $modify $delete </td>";
                 echo '</tr>';
             }
         } else {
             $itemid = 0;
             echo '<tr>';
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS . '</td>';
+            echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOITEMS.'</td>';
             echo '</tr>';
         }
         echo "</table>\n";
         echo "<br>\n";
 
         $pagenav = new XoopsPageNav($totalitems, $helper->getConfig('idxcat_perpage'), $publishedstartitem, 'publishedstartitem');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
 
         Publisher\Utils::closeCollapsableBar('item_publisheditemstable', 'item_publisheditemsicon');
 
         // Display Offline articles
-        Publisher\Utils::openCollapsableBar('offlineitemstable', 'offlineitemsicon', _AM_PUBLISHER_ITEMS . ' ' . _CO_PUBLISHER_OFFLINE, _AM_PUBLISHER_OFFLINE_EXP);
+        Publisher\Utils::openCollapsableBar('offlineitemstable', 'offlineitemsicon', _AM_PUBLISHER_ITEMS.' '._CO_PUBLISHER_OFFLINE, _AM_PUBLISHER_OFFLINE_EXP);
 
         $totalitems = $helper->getItemHandler()->getItemsCount(-1, [_PUBLISHER_STATUS_OFFLINE]);
 
@@ -289,39 +289,39 @@ 
 
         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_ITEMCATEGORYNAME . '</strong></td>';
-        echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_TITLE . '</strong></td>';
-        echo "<td width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . '</strong></td>';
-        echo "<td width='80' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+        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_ITEMCATEGORYNAME.'</strong></td>';
+        echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_TITLE.'</strong></td>';
+        echo "<td width='90' class='bg3' align='center'><strong>"._AM_PUBLISHER_CREATED.'</strong></td>';
+        echo "<td 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();
 
-                $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "'></a>";
-                $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'></a>";
-                $clone = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/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]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/edit.gif' title='"._AM_PUBLISHER_EDITITEM."' alt='"._AM_PUBLISHER_EDITITEM."'></a>";
+                $delete = "<a href='item.php?op=del&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/delete.png' title='"._AM_PUBLISHER_DELETEITEM."' alt='"._AM_PUBLISHER_DELETEITEM."'></a>";
+                $clone = "<a href='item.php?op=clone&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/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]->getVar('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='head' align='center'>".$itemsObj[$i]->getVar('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'> $clone $modify $delete </td>";
                 echo '</tr>';
             }
         } else {
             $itemid = 0;
             echo '<tr>';
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS_OFFLINE . '</td>';
+            echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOITEMS_OFFLINE.'</td>';
             echo '</tr>';
         }
         echo "</table>\n";
         echo "<br>\n";
 
         $pagenav = new XoopsPageNav($totalitems, $helper->getConfig('idxcat_perpage'), $offlinestartitem, 'offlinestartitem');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
 
         Publisher\Utils::closeCollapsableBar('offlineitemstable', 'offlineitemsicon');
 
@@ -337,39 +337,39 @@ 
 
         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_ITEMCATEGORYNAME . '</strong></td>';
-        echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_TITLE . '</strong></td>';
-        echo "<td width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . '</strong></td>';
-        echo "<td width='80' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+        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_ITEMCATEGORYNAME.'</strong></td>';
+        echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_TITLE.'</strong></td>';
+        echo "<td width='90' class='bg3' align='center'><strong>"._AM_PUBLISHER_CREATED.'</strong></td>';
+        echo "<td 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();
 
-                $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "'></a>";
-                $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'></a>";
-                $clone = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->getVar('itemid') . "'><img src='" . PUBLISHER_URL . "/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]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/edit.gif' title='"._AM_PUBLISHER_EDITITEM."' alt='"._AM_PUBLISHER_EDITITEM."'></a>";
+                $delete = "<a href='item.php?op=del&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/images/links/delete.png' title='"._AM_PUBLISHER_DELETEITEM."' alt='"._AM_PUBLISHER_DELETEITEM."'></a>";
+                $clone = "<a href='item.php?op=clone&itemid=".$itemsObj[$i]->getVar('itemid')."'><img src='".PUBLISHER_URL."/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]->getVar('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='head' align='center'>".$itemsObj[$i]->getVar('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'> $clone $modify $delete </td>";
                 echo '</tr>';
             }
         } else {
             $itemid = 0;
             echo '<tr>';
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS_REJECTED . '</td>';
+            echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOITEMS_REJECTED.'</td>';
             echo '</tr>';
         }
         echo "</table>\n";
         echo "<br>\n";
 
         $pagenav = new XoopsPageNav($totalitems, $helper->getConfig('idxcat_perpage'), $rejectedstartitem, 'rejectedstartitem');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
 
         Publisher\Utils::closeCollapsableBar('Rejecteditemstable', 'rejecteditemsicon');
         break;
@@ -448,7 +448,7 @@ 
 
         if (!$clone) {
             echo '<form><div style="margin-bottom: 10px;">';
-            echo "<input type='button' name='button' onclick=\"location='item.php?op=clone&itemid=" . $itemObj->getVar('itemid') . "'\" value='" . _AM_PUBLISHER_CLONE_ITEM . "'>&nbsp;&nbsp;";
+            echo "<input type='button' name='button' onclick=\"location='item.php?op=clone&itemid=".$itemObj->getVar('itemid')."'\" value='"._AM_PUBLISHER_CLONE_ITEM."'>&nbsp;&nbsp;";
             echo '</div></form>';
         }
     } else {
@@ -479,15 +479,15 @@ 
     $dir = Publisher\Utils::getUploadDir(true, 'content');
 
     if (false === mb_strpos(decoct(fileperms($dir)), '777')) {
-        echo '<span style="color: FF0000; "><h4>' . _AM_PUBLISHER_PERMERROR . '</h4></span>';
+        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 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 "<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>';

htdocs/modules/publisher/admin/index.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  */
 use Xoops\Module\Admin;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $xoops = Xoops::getInstance();
 $xoops->header();

htdocs/modules/publisher/admin/main.php

Indentation +130 added lines, -130 removed lines

@@ -223,140 +223,140 @@ 
             case _PUBLISHER_STATUS_SUBMITTED:
                 $statustxt = _CO_PUBLISHER_SUBMITTED;
                 $approve = "<a href='item.php?op=mod&itemid="
-                             . $itemsObj[$i]->getVar('itemid')
-                             . "'><img src='"
-                             . XoopsBaseConfig::get('url')
-                             . '/modules/'
-                             . $helper->getModule()->dirname()
-                             . "/images/links/approve.gif' title='"
-                             . _AM_PUBLISHER_SUBMISSION_MODERATE
-                             . "' alt='"
-                             . _AM_PUBLISHER_SUBMISSION_MODERATE
-                             . "'></a>&nbsp;";
+                                . $itemsObj[$i]->getVar('itemid')
+                                . "'><img src='"
+                                . XoopsBaseConfig::get('url')
+                                . '/modules/'
+                                . $helper->getModule()->dirname()
+                                . "/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]->getVar('itemid')
-                             . "'><img src='"
-                             . XoopsBaseConfig::get('url')
-                             . '/modules/'
-                             . $helper->getModule()->dirname()
-                             . "/images/links/delete.png' title='"
-                             . _AM_PUBLISHER_DELETEITEM
-                             . "' alt='"
-                             . _AM_PUBLISHER_DELETEITEM
-                             . "'></a>";
+                                . $itemsObj[$i]->getVar('itemid')
+                                . "'><img src='"
+                                . XoopsBaseConfig::get('url')
+                                . '/modules/'
+                                . $helper->getModule()->dirname()
+                                . "/images/links/delete.png' title='"
+                                . _AM_PUBLISHER_DELETEITEM
+                                . "' alt='"
+                                . _AM_PUBLISHER_DELETEITEM
+                                . "'></a>";
                 $modify = '';
                 break;
             case _PUBLISHER_STATUS_PUBLISHED:
                 $statustxt = _CO_PUBLISHER_PUBLISHED;
                 $approve = '';
                 $clone = "<a href='item.php?op=clone&itemid="
-                             . $itemsObj[$i]->getVar('itemid')
-                             . "'><img src='"
-                             . XoopsBaseConfig::get('url')
-                             . '/modules/'
-                             . $helper->getModule()->dirname()
-                             . "/images/links/clone.gif' title='"
-                             . _AM_PUBLISHER_CLONE_ITEM
-                             . "' alt='"
-                             . _AM_PUBLISHER_CLONE_ITEM
-                             . "'></a>&nbsp;";
+                                . $itemsObj[$i]->getVar('itemid')
+                                . "'><img src='"
+                                . XoopsBaseConfig::get('url')
+                                . '/modules/'
+                                . $helper->getModule()->dirname()
+                                . "/images/links/clone.gif' title='"
+                                . _AM_PUBLISHER_CLONE_ITEM
+                                . "' alt='"
+                                . _AM_PUBLISHER_CLONE_ITEM
+                                . "'></a>&nbsp;";
                 $modify = "<a href='item.php?op=mod&itemid="
-                             . $itemsObj[$i]->getVar('itemid')
-                             . "'><img src='"
-                             . XoopsBaseConfig::get('url')
-                             . '/modules/'
-                             . $helper->getModule()->dirname()
-                             . "/images/links/edit.gif' title='"
-                             . _AM_PUBLISHER_ITEM_EDIT
-                             . "' alt='"
-                             . _AM_PUBLISHER_ITEM_EDIT
-                             . "'></a>&nbsp;";
+                                . $itemsObj[$i]->getVar('itemid')
+                                . "'><img src='"
+                                . XoopsBaseConfig::get('url')
+                                . '/modules/'
+                                . $helper->getModule()->dirname()
+                                . "/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]->getVar('itemid')
-                             . "'><img src='"
-                             . XoopsBaseConfig::get('url')
-                             . '/modules/'
-                             . $helper->getModule()->dirname()
-                             . "/images/links/delete.png' title='"
-                             . _AM_PUBLISHER_DELETEITEM
-                             . "' alt='"
-                             . _AM_PUBLISHER_DELETEITEM
-                             . "'></a>";
+                                . $itemsObj[$i]->getVar('itemid')
+                                . "'><img src='"
+                                . XoopsBaseConfig::get('url')
+                                . '/modules/'
+                                . $helper->getModule()->dirname()
+                                . "/images/links/delete.png' title='"
+                                . _AM_PUBLISHER_DELETEITEM
+                                . "' alt='"
+                                . _AM_PUBLISHER_DELETEITEM
+                                . "'></a>";
                 break;
             case _PUBLISHER_STATUS_OFFLINE:
                 $statustxt = _CO_PUBLISHER_OFFLINE;
                 $approve = '';
                 $clone = "<a href='item.php?op=clone&itemid="
-                             . $itemsObj[$i]->getVar('itemid')
-                             . "'><img src='"
-                             . XoopsBaseConfig::get('url')
-                             . '/modules/'
-                             . $helper->getModule()->dirname()
-                             . "/images/links/clone.gif' title='"
-                             . _AM_PUBLISHER_CLONE_ITEM
-                             . "' alt='"
-                             . _AM_PUBLISHER_CLONE_ITEM
-                             . "'></a>&nbsp;";
+                                . $itemsObj[$i]->getVar('itemid')
+                                . "'><img src='"
+                                . XoopsBaseConfig::get('url')
+                                . '/modules/'
+                                . $helper->getModule()->dirname()
+                                . "/images/links/clone.gif' title='"
+                                . _AM_PUBLISHER_CLONE_ITEM
+                                . "' alt='"
+                                . _AM_PUBLISHER_CLONE_ITEM
+                                . "'></a>&nbsp;";
                 $modify = "<a href='item.php?op=mod&itemid="
-                             . $itemsObj[$i]->getVar('itemid')
-                             . "'><img src='"
-                             . XoopsBaseConfig::get('url')
-                             . '/modules/'
-                             . $helper->getModule()->dirname()
-                             . "/images/links/edit.gif' title='"
-                             . _AM_PUBLISHER_ITEM_EDIT
-                             . "' alt='"
-                             . _AM_PUBLISHER_ITEM_EDIT
-                             . "'></a>&nbsp;";
+                                . $itemsObj[$i]->getVar('itemid')
+                                . "'><img src='"
+                                . XoopsBaseConfig::get('url')
+                                . '/modules/'
+                                . $helper->getModule()->dirname()
+                                . "/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]->getVar('itemid')
-                             . "'><img src='"
-                             . XoopsBaseConfig::get('url')
-                             . '/modules/'
-                             . $helper->getModule()->dirname()
-                             . "/images/links/delete.png' title='"
-                             . _AM_PUBLISHER_DELETEITEM
-                             . "' alt='"
-                             . _AM_PUBLISHER_DELETEITEM
-                             . "'></a>";
+                                . $itemsObj[$i]->getVar('itemid')
+                                . "'><img src='"
+                                . XoopsBaseConfig::get('url')
+                                . '/modules/'
+                                . $helper->getModule()->dirname()
+                                . "/images/links/delete.png' title='"
+                                . _AM_PUBLISHER_DELETEITEM
+                                . "' alt='"
+                                . _AM_PUBLISHER_DELETEITEM
+                                . "'></a>";
                 break;
             case _PUBLISHER_STATUS_REJECTED:
                 $statustxt = _CO_PUBLISHER_REJECTED;
                 $approve = '';
                 $clone = "<a href='item.php?op=clone&itemid="
-                             . $itemsObj[$i]->getVar('itemid')
-                             . "'><img src='"
-                             . XoopsBaseConfig::get('url')
-                             . '/modules/'
-                             . $helper->getModule()->dirname()
-                             . "/images/links/clone.gif' title='"
-                             . _AM_PUBLISHER_CLONE_ITEM
-                             . "' alt='"
-                             . _AM_PUBLISHER_CLONE_ITEM
-                             . "'></a>&nbsp;";
+                                . $itemsObj[$i]->getVar('itemid')
+                                . "'><img src='"
+                                . XoopsBaseConfig::get('url')
+                                . '/modules/'
+                                . $helper->getModule()->dirname()
+                                . "/images/links/clone.gif' title='"
+                                . _AM_PUBLISHER_CLONE_ITEM
+                                . "' alt='"
+                                . _AM_PUBLISHER_CLONE_ITEM
+                                . "'></a>&nbsp;";
                 $modify = "<a href='item.php?op=mod&itemid="
-                             . $itemsObj[$i]->getVar('itemid')
-                             . "'><img src='"
-                             . XoopsBaseConfig::get('url')
-                             . '/modules/'
-                             . $helper->getModule()->dirname()
-                             . "/images/links/edit.gif' title='"
-                             . _AM_PUBLISHER_REJECTED_EDIT
-                             . "' alt='"
-                             . _AM_PUBLISHER_REJECTED_EDIT
-                             . "'></a>&nbsp;";
+                                . $itemsObj[$i]->getVar('itemid')
+                                . "'><img src='"
+                                . XoopsBaseConfig::get('url')
+                                . '/modules/'
+                                . $helper->getModule()->dirname()
+                                . "/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]->getVar('itemid')
-                             . "'><img src='"
-                             . XoopsBaseConfig::get('url')
-                             . '/modules/'
-                             . $helper->getModule()->dirname()
-                             . "/images/links/delete.png' title='"
-                             . _AM_PUBLISHER_DELETEITEM
-                             . "' alt='"
-                             . _AM_PUBLISHER_DELETEITEM
-                             . "'></a>";
+                                . $itemsObj[$i]->getVar('itemid')
+                                . "'><img src='"
+                                . XoopsBaseConfig::get('url')
+                                . '/modules/'
+                                . $helper->getModule()->dirname()
+                                . "/images/links/delete.png' title='"
+                                . _AM_PUBLISHER_DELETEITEM
+                                . "' alt='"
+                                . _AM_PUBLISHER_DELETEITEM
+                                . "'></a>";
                 break;
             case 'default':
             default:
@@ -364,27 +364,27 @@ 
                 $approve = '';
                 $clone = '';
                 $modify = "<a href='item.php?op=mod&itemid="
-                             . $itemsObj[$i]->getVar('itemid')
-                             . "'><img src='"
-                             . XoopsBaseConfig::get('url')
-                             . '/modules/'
-                             . $helper->getModule()->dirname()
-                             . "/images/links/edit.gif' title='"
-                             . _AM_PUBLISHER_REJECTED_EDIT
-                             . "' alt='"
-                             . _AM_PUBLISHER_REJECTED_EDIT
-                             . "'></a>&nbsp;";
+                                . $itemsObj[$i]->getVar('itemid')
+                                . "'><img src='"
+                                . XoopsBaseConfig::get('url')
+                                . '/modules/'
+                                . $helper->getModule()->dirname()
+                                . "/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]->getVar('itemid')
-                             . "'><img src='"
-                             . XoopsBaseConfig::get('url')
-                             . '/modules/'
-                             . $helper->getModule()->dirname()
-                             . "/images/links/delete.png' title='"
-                             . _AM_PUBLISHER_DELETEITEM
-                             . "' alt='"
-                             . _AM_PUBLISHER_DELETEITEM
-                             . "'></a>";
+                                . $itemsObj[$i]->getVar('itemid')
+                                . "'><img src='"
+                                . XoopsBaseConfig::get('url')
+                                . '/modules/'
+                                . $helper->getModule()->dirname()
+                                . "/images/links/delete.png' title='"
+                                . _AM_PUBLISHER_DELETEITEM
+                                . "' alt='"
+                                . _AM_PUBLISHER_DELETEITEM
+                                . "'></a>";
                 break;
         }
 

Spacing +47 added lines, -47 removed lines

@@ -20,7 +20,7 @@ 
  */
 use XoopsModules\Publisher;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $xoops = Xoops::getInstance();
 
@@ -79,16 +79,16 @@ 
 Publisher\Utils::openCollapsableBar('inventorytable', 'inventoryicon', _AM_PUBLISHER_INVENTORY);
 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 "<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 "<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>';
 
 Publisher\Utils::closeCollapsableBar('inventorytable', 'inventoryicon');
@@ -147,54 +147,54 @@ 
     case _PUBLISHER_STATUS_SUBMITTED:
         $selectedtxt1 = "selected='selected'";
         $caption = _CO_PUBLISHER_SUBMITTED;
-        $cond = ' WHERE status = ' . _PUBLISHER_STATUS_SUBMITTED . ' ';
+        $cond = ' WHERE status = '._PUBLISHER_STATUS_SUBMITTED.' ';
         $status_explaination = _AM_PUBLISHER_SUBMITTED_EXP;
         break;
     case _PUBLISHER_STATUS_PUBLISHED:
         $selectedtxt2 = "selected='selected'";
         $caption = _CO_PUBLISHER_PUBLISHED;
-        $cond = ' WHERE status = ' . _PUBLISHER_STATUS_PUBLISHED . ' ';
+        $cond = ' WHERE status = '._PUBLISHER_STATUS_PUBLISHED.' ';
         $status_explaination = _AM_PUBLISHER_PUBLISHED_EXP;
         break;
     case _PUBLISHER_STATUS_OFFLINE:
         $selectedtxt3 = "selected='selected'";
         $caption = _CO_PUBLISHER_OFFLINE;
-        $cond = ' WHERE status = ' . _PUBLISHER_STATUS_OFFLINE . ' ';
+        $cond = ' WHERE status = '._PUBLISHER_STATUS_OFFLINE.' ';
         $status_explaination = _AM_PUBLISHER_OFFLINE_EXP;
         break;
     case _PUBLISHER_STATUS_REJECTED:
         $selectedtxt4 = "selected='selected'";
         $caption = _CO_PUBLISHER_REJECTED;
-        $cond = ' WHERE status = ' . _PUBLISHER_STATUS_REJECTED . ' ';
+        $cond = ' WHERE status = '._PUBLISHER_STATUS_REJECTED.' ';
         $status_explaination = _AM_PUBLISHER_REJECTED_ITEM_EXP;
         break;
 }
 
 /* -- Code to show selected terms -- */
-echo "<form name='pick' id='pick' action='" . $_SERVER['PHP_SELF'] . "' method='POST' style='margin: 0;'>";
+echo "<form name='pick' id='pick' action='".$_SERVER['PHP_SELF']."' method='POST' style='margin: 0;'>";
 
 echo "
     <table width='100%' cellspacing='1' cellpadding='2' border='0' style='border-left: 1px solid #c0c0c0; border-top: 1px solid #c0c0c0; border-right: 1px solid #c0c0c0;'>
         <tr>
-            <td><span style='font-weight: bold; font-variant: small-caps;'>" . _AM_PUBLISHER_SHOWING . ' ' . $caption . "</span></td>
-            <td align='right'>" . _AM_PUBLISHER_SELECT_SORT . "
+            <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='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>
                 </select>
                 <select name='ordersel' onchange='submit()'>
-                    <option value='ASC' $ordertxtasc>" . _AM_PUBLISHER_ASC . "</option>
-                    <option value='DESC' $ordertxtdesc>" . _AM_PUBLISHER_DESC . '</option>
+                    <option value='ASC' $ordertxtasc>"._AM_PUBLISHER_ASC."</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>
-                    <option value='2' $selectedtxt2>" . _CO_PUBLISHER_PUBLISHED . " [$totalpublished]</option>
-                    <option value='3' $selectedtxt3>" . _CO_PUBLISHER_OFFLINE . " [$totaloffline]</option>
-                    <option value='4' $selectedtxt4>" . _CO_PUBLISHER_REJECTED . " [$totalrejected]</option>
+                    <option value='0' $selectedtxt0>"._AM_PUBLISHER_ALL." [$totalitems]</option>
+                    <option value='1' $selectedtxt1>"._CO_PUBLISHER_SUBMITTED." [$totalsubmitted]</option>
+                    <option value='2' $selectedtxt2>"._CO_PUBLISHER_PUBLISHED." [$totalpublished]</option>
+                    <option value='3' $selectedtxt3>"._CO_PUBLISHER_OFFLINE." [$totaloffline]</option>
+                    <option value='4' $selectedtxt4>"._CO_PUBLISHER_REJECTED." [$totalrejected]</option>
                 </select>
             </td>
         </tr>
@@ -389,18 +389,18 @@ 
         }
 
         echo '<tr>';
-        echo "<td class='head' align='center'>" . $itemsObj[$i]->getVar('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 "<td class='head' align='center'>".$itemsObj[$i]->getVar('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>';
     }
 } 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 "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOITEMSSEL.'</td>';
     echo '</tr>';
 }
 echo "</table>\n";
@@ -408,9 +408,9 @@ 
 $pagenav = new XoopsPageNav($numrows, $helper->getConfig('idxcat_perpage'), $startentry, 'startentry', "statussel=$statussel&amp;sortsel=$sortsel&amp;ordersel=$ordersel");
 
 if (1 == $helper->getConfig('format_image_nav')) {
-    echo '<div style="text-align:right; background-color: #ffffff; margin: 10px 0;">' . $pagenav->renderImageNav() . '</div>';
+    echo '<div style="text-align:right; background-color: #ffffff; margin: 10px 0;">'.$pagenav->renderImageNav().'</div>';
 } else {
-    echo '<div style="text-align:right; background-color: #ffffff; margin: 10px 0;">' . $pagenav->renderNav() . '</div>';
+    echo '<div style="text-align:right; background-color: #ffffff; margin: 10px 0;">'.$pagenav->renderNav().'</div>';
 }
 // ENDs code to show active entries
 Publisher\Utils::closeCollapsableBar('allitemstable', 'allitemsicon');
@@ -436,8 +436,8 @@ 
         $res = Publisher\Utils::mkdir($thePath);
 
         if ($res) {
-            $source = PUBLISHER_ROOT_PATH . '/images/blank.png';
-            $dest = $thePath . 'blank.png';
+            $source = PUBLISHER_ROOT_PATH.'/images/blank.png';
+            $dest = $thePath.'blank.png';
             Publisher\Utils::copyr($source, $dest);
         }
         $msg = $res ? _AM_PUBLISHER_DIRCREATED : _AM_PUBLISHER_DIRNOTCREATED;
@@ -448,8 +448,8 @@ 
         $res = Publisher\Utils::mkdir($thePath);
 
         if ($res) {
-            $source = PUBLISHER_ROOT_PATH . '/images/blank.png';
-            $dest = $thePath . 'blank.png';
+            $source = PUBLISHER_ROOT_PATH.'/images/blank.png';
+            $dest = $thePath.'blank.png';
             Publisher\Utils::copyr($source, $dest);
         }
         $msg = $res ? _AM_PUBLISHER_DIRCREATED : _AM_PUBLISHER_DIRNOTCREATED;
@@ -460,8 +460,8 @@ 
         $res = Publisher\Utils::mkdir($thePath);
 
         if ($res) {
-            $source = PUBLISHER_ROOT_PATH . '/images/blank.png';
-            $dest = $thePath . 'blank.png';
+            $source = PUBLISHER_ROOT_PATH.'/images/blank.png';
+            $dest = $thePath.'blank.png';
             Publisher\Utils::copyr($source, $dest);
         }
         $msg = $res ? _AM_PUBLISHER_DIRCREATED : _AM_PUBLISHER_DIRNOTCREATED;
@@ -478,11 +478,11 @@ 
 {
     echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
     echo '<tr>';
-    echo "<td width='40px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . '</strong></td>';
-    echo "<td width='100px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMCAT . '</strong></td>';
-    echo "<td class='bg3' align='center'><strong>" . _AM_PUBLISHER_TITLE . '</strong></td>';
-    echo "<td width='90px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . '</strong></td>';
-    echo "<td width='90px' class='bg3' align='center'><strong>" . _CO_PUBLISHER_STATUS . '</strong></td>';
-    echo "<td width='90px' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+    echo "<td width='40px' class='bg3' align='center'><strong>"._AM_PUBLISHER_ITEMID.'</strong></td>';
+    echo "<td width='100px' class='bg3' align='center'><strong>"._AM_PUBLISHER_ITEMCAT.'</strong></td>';
+    echo "<td class='bg3' align='center'><strong>"._AM_PUBLISHER_TITLE.'</strong></td>';
+    echo "<td width='90px' class='bg3' align='center'><strong>"._AM_PUBLISHER_CREATED.'</strong></td>';
+    echo "<td width='90px' class='bg3' align='center'><strong>"._CO_PUBLISHER_STATUS.'</strong></td>';
+    echo "<td width='90px' class='bg3' align='center'><strong>"._AM_PUBLISHER_ACTION.'</strong></td>';
     echo '</tr>';
 }

htdocs/modules/publisher/admin/file.php

Spacing +8 added lines, -8 removed lines

@@ -23,7 +23,7 @@ 
  * @author          The SmartFactory <www.smartfactory.ca>
  * @version         $Id$
  */
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 $xoops = Xoops::getInstance();
 
 $op = Request::getString('op');
@@ -53,8 +53,8 @@ 
         }
 
         echo "<br>\n";
-        echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 06 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 06 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>';
         Publisher\Utils::openCollapsableBar('editfile', 'editfileicon', _AM_PUBLISHER_FILE_INFORMATIONS);
     } else {
         // there's no parameter, so we're adding an item
@@ -63,8 +63,8 @@ 
         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 06 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 06 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>';
         Publisher\Utils::openCollapsableBar('addfile', 'addfileicon', _AM_PUBLISHER_FILE_INFORMATIONS);
     }
 
@@ -119,11 +119,11 @@ 
 
         // Storing the file
         if (!$fileObj->store()) {
-            $xoops->redirect('item.php?op=mod&itemid=' . $fileObj->getVar('itemid'), 3, _AM_PUBLISHER_FILE_EDITING_ERROR . Publisher\Utils::formatErrors($fileObj->getErrors()));
+            $xoops->redirect('item.php?op=mod&itemid='.$fileObj->getVar('itemid'), 3, _AM_PUBLISHER_FILE_EDITING_ERROR.Publisher\Utils::formatErrors($fileObj->getErrors()));
             exit;
         }
 
-        $xoops->redirect('item.php?op=mod&itemid=' . $fileObj->getVar('itemid'), 2, _AM_PUBLISHER_FILE_EDITING_SUCCESS);
+        $xoops->redirect('item.php?op=mod&itemid='.$fileObj->getVar('itemid'), 2, _AM_PUBLISHER_FILE_EDITING_SUCCESS);
         exit();
         break;
     case 'del':
@@ -146,7 +146,7 @@ 
             $fileid = isset($_GET['fileid']) ? (int)$_GET['fileid'] : 0;
 
             Publisher\Utils::cpHeader();
-            echo $xoops->confirm(['op' => 'del', 'fileid' => $fileObj->getVar('fileid'), 'confirm' => 1, 'name' => $fileObj->getVar('name')], 'file.php', _AM_PUBLISHER_DELETETHISFILE . ' <br>' . $fileObj->getVar('name') . ' <br> <br>', _AM_PUBLISHER_DELETE);
+            echo $xoops->confirm(['op' => 'del', 'fileid' => $fileObj->getVar('fileid'), 'confirm' => 1, 'name' => $fileObj->getVar('name')], 'file.php', _AM_PUBLISHER_DELETETHISFILE.' <br>'.$fileObj->getVar('name').' <br> <br>', _AM_PUBLISHER_DELETE);
             $xoops->footer();
         }
         exit();

htdocs/modules/publisher/admin/menu.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 use XoopsModules\Publisher\Helper;
 
-require_once dirname(__DIR__) . '/include/common.php';
+require_once dirname(__DIR__).'/include/common.php';
 
 $helper = Helper::getInstance();
 $helper->loadLanguage('admin');