scrutinizer cosmetics

liomj · Jul 6, 2020 · be1eb5e · be1eb5e
1 parent f1e7b31
commit be1eb5e
Show file tree

Hide file tree

Showing 87 changed files with 471 additions and 449 deletions.
diff --git a/admin/admin_header.php b/admin/admin_header.php
@@ -18,22 +18,25 @@
  * @author          trabis <[email protected]>
  * @author          The SmartFactory <www.smartfactory.ca>
  */
+
+use Xmf\Module\Admin;
+use XoopsModules\Publisher\Helper;
+
 require dirname(__DIR__) . '/preloads/autoloader.php';
 
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once dirname(__DIR__, 3) . '/include/cp_header.php';
 //require_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
 
 require_once dirname(__DIR__) . '/include/common.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 
-/** @var \XoopsModules\Publisher\Helper $helper */
-$helper = \XoopsModules\Publisher\Helper::getInstance();
+$helper = Helper::getInstance();
 /** @var Xmf\Module\Admin $adminObject */
-$adminObject = \Xmf\Module\Admin::getInstance();
+$adminObject = Admin::getInstance();
 
-$pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16);
-$pathIcon32 = \Xmf\Module\Admin::iconUrl('', 32);
+$pathIcon16 = Admin::iconUrl('', 16);
+$pathIcon32 = Admin::iconUrl('', 32);
 if (is_object($helper->getModule())) {
     $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 }

diff --git a/admin/blocksadmin.php b/admin/blocksadmin.php
@@ -16,6 +16,7 @@
  * @license         GNU GPL 2 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  */
 
+use Xmf\Module\Admin;
 use Xmf\Request;
 
 require __DIR__ . '/admin_header.php';
@@ -294,7 +295,7 @@ function cloneBlock($bid)
         xoops_cp_header();
 
         /** @var \Xmf\Module\Admin $adminObject */
-        $adminObject = \Xmf\Module\Admin::getInstance();
+        $adminObject = Admin::getInstance();
         $adminObject->displayNavigation(basename(__FILE__));
         $moduleDirName      = basename(dirname(__DIR__));
         $moduleDirNameUpper = mb_strtoupper($moduleDirName); //$capsDirName
@@ -355,7 +356,6 @@ function isBlockCloned($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule,
         xoops_loadLanguage('admin/blocksadmin', 'system');
         xoops_loadLanguage('admin/groups', 'system');
 
-        /** @var \XoopsBlock $block */
         $block = new \XoopsBlock($bid);
         $clone = $block->xoopsClone();
         if (empty($bmodule)) {
@@ -439,7 +439,7 @@ function editBlock($bid)
         require_once __DIR__ . '/admin_header.php';
         xoops_cp_header();
         /** @var \Xmf\Module\Admin $adminObject */
-        $adminObject = \Xmf\Module\Admin::getInstance();
+        $adminObject = Admin::getInstance();
         $adminObject->displayNavigation(basename(__FILE__));
         $moduleDirName      = basename(dirname(__DIR__));
         $moduleDirNameUpper = mb_strtoupper($moduleDirName); //$capsDirName
@@ -562,7 +562,7 @@ function updateBlock($bid, $btitle, $bside, $bweight, $bvisible, $bcachetime, $b
             if ($oldtitle[$i] !== $title[$i] || $oldweight[$i] !== $weight[$i] || $oldvisible[$i] !== $visible[$i]
                 || $oldside[$i] !== $side[$i]
                 || $oldbcachetime[$i] !== $bcachetime[$i]) {
-                setOrder($bid[$i], $title[$i], $weight[$i], $visible[$i], $side[$i], $bcachetime[$i], $bmodule[$i]);
+                setOrder($bid[$i], $title[$i], $weight[$i], $visible[$i], $side[$i], $bcachetime[$i], $bmodule[$i]=null);
             }
             if (!empty($bmodule[$i]) && count($bmodule[$i]) > 0) {
                 $sql = sprintf('DELETE FROM `%s` WHERE block_id = %u', $GLOBALS['xoopsDB']->prefix('block_module_link'), $bid[$i]);

diff --git a/admin/category.php b/admin/category.php
@@ -21,6 +21,7 @@
 
 use Xmf\Request;
 use XoopsModules\Publisher;
+use XoopsModules\Publisher\Utility;
 
 require_once __DIR__ . '/admin_header.php';
 
@@ -55,8 +56,8 @@
         $nb_subcats += Request::getInt('nb_sub_yet', 4, 'POST');
         //end of fx2024 code
 
-        Publisher\Utility::cpHeader();
-        Publisher\Utility::editCategory(true, $categoryid, $nb_subcats);
+        Utility::cpHeader();
+        Utility::editCategory(true, $categoryid, $nb_subcats);
         break;
     case 'addcategory':
         global $modify;
@@ -81,13 +82,13 @@
                 $max_size          = $helper->getConfig('maximum_filesize');
                 $max_imgwidth      = $helper->getConfig('maximum_image_width');
                 $max_imgheight     = $helper->getConfig('maximum_image_height');
-                $allowed_mimetypes = Publisher\Utility::getAllowedImagesTypes();
+                $allowed_mimetypes = Utility::getAllowedImagesTypes();
                 if (('' == $temp['tmp_name']) || !is_readable($temp['tmp_name'])) {
                     redirect_header('<script>javascript:history.go(-1)</script>', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR);
                 }
 
                 xoops_load('XoopsMediaUploader');
-                $uploader = new \XoopsMediaUploader(Publisher\Utility::getImageDir('category'), $allowed_mimetypes, $max_size, $max_imgwidth, $max_imgheight);
+                $uploader = new \XoopsMediaUploader(Utility::getImageDir('category'), $allowed_mimetypes, $max_size, $max_imgwidth, $max_imgheight);
                 if ($uploader->fetchMedia($filename) && $uploader->upload()) {
                     $categoryObj->setVar('image', $uploader->getSavedFileName());
                 } else {
@@ -127,12 +128,12 @@
         }
 
         if (!$categoryObj->store()) {
-            redirect_header('<script>javascript:history.go(-1)</script>', 3, _AM_PUBLISHER_CATEGORY_SAVE_ERROR . Publisher\Utility::formatErrors($categoryObj->getErrors()));
+            redirect_header('<script>javascript:history.go(-1)</script>', 3, _AM_PUBLISHER_CATEGORY_SAVE_ERROR . Utility::formatErrors($categoryObj->getErrors()));
         }
         // TODO : put this function in the category class
-        Publisher\Utility::saveCategoryPermissions($grpread, $categoryObj->categoryid(), 'category_read');
-        Publisher\Utility::saveCategoryPermissions($grpsubmit, $categoryObj->categoryid(), 'item_submit');
-        Publisher\Utility::saveCategoryPermissions($grpmoderation, $categoryObj->categoryid(), 'category_moderation');
+        Utility::saveCategoryPermissions($grpread, $categoryObj->categoryid(), 'category_read');
+        Utility::saveCategoryPermissions($grpsubmit, $categoryObj->categoryid(), 'item_submit');
+        Utility::saveCategoryPermissions($grpmoderation, $categoryObj->categoryid(), 'category_moderation');
 
         //Added by fx2024
         $parentCat = $categoryObj->categoryid();
@@ -146,12 +147,12 @@
                 $categoryObj->setVar('parentid', $parentCat);
 
                 if (!$categoryObj->store()) {
-                    redirect_header('<script>javascript:history.go(-1)</script>', 3, _AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR . Publisher\Utility::formatErrors($categoryObj->getErrors()));
+                    redirect_header('<script>javascript:history.go(-1)</script>', 3, _AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR . Utility::formatErrors($categoryObj->getErrors()));
                 }
                 // TODO : put this function in the category class
-                Publisher\Utility::saveCategoryPermissions($grpread, $categoryObj->categoryid(), 'category_read');
-                Publisher\Utility::saveCategoryPermissions($grpsubmit, $categoryObj->categoryid(), 'item_submit');
-                Publisher\Utility::saveCategoryPermissions($grpmoderation, $categoryObj->categoryid(), 'category_moderation');
+                Utility::saveCategoryPermissions($grpread, $categoryObj->categoryid(), 'category_read');
+                Utility::saveCategoryPermissions($grpsubmit, $categoryObj->categoryid(), 'item_submit');
+                Utility::saveCategoryPermissions($grpmoderation, $categoryObj->categoryid(), 'category_moderation');
             }
         }
         //end of fx2024 code
@@ -171,8 +172,8 @@
             $categoryObj->setVar('parentid', $parentCat);
         }
 
-        Publisher\Utility::cpHeader();
-        Publisher\Utility::editCategory(true, $categoryid, $nb_subcats, $categoryObj);
+        Utility::cpHeader();
+        Utility::editCategory(true, $categoryid, $nb_subcats, $categoryObj);
         exit();
         break;
     //end of fx2024 code
@@ -182,7 +183,7 @@
         break;
     case 'default':
     default:
-        Publisher\Utility::cpHeader();
+        Utility::cpHeader();
         //publisher_adminMenu(1, _AM_PUBLISHER_CATEGORIES);
 
         echo "<br>\n";
@@ -194,7 +195,7 @@
         // Creating the objects for top categories
         $categoriesObj = $helper->getHandler('Category')->getCategories($helper->getConfig('idxcat_perpage'), $startcategory, 0);
 
-        Publisher\Utility::openCollapsableBar('createdcategories', 'createdcategoriesicon', _AM_PUBLISHER_CATEGORIES_TITLE, _AM_PUBLISHER_CATEGORIES_DSC);
+        Utility::openCollapsableBar('createdcategories', 'createdcategoriesicon', _AM_PUBLISHER_CATEGORIES_TITLE, _AM_PUBLISHER_CATEGORIES_DSC);
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo '<tr>';
@@ -206,7 +207,7 @@
         $totalCategories = $helper->getHandler('Category')->getCategoriesCount(0);
         if (count($categoriesObj) > 0) {
             foreach ($categoriesObj as $key => $thiscat) {
-                Publisher\Utility::displayCategory($thiscat);
+                Utility::displayCategory($thiscat);
             }
             unset($key, $thiscat);
         } else {
@@ -220,7 +221,7 @@
         $pagenav = new \XoopsPageNav($totalCategories, $helper->getConfig('idxcat_perpage'), $startcategory, 'startcategory');
         echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
         echo '<br>';
-        Publisher\Utility::closeCollapsableBar('createdcategories', 'createdcategoriesicon');
+        Utility::closeCollapsableBar('createdcategories', 'createdcategoriesicon');
         echo '<br>';
         //editcat(false);
         break;

diff --git a/admin/clone.php b/admin/clone.php
@@ -20,12 +20,13 @@
 
 use Xmf\Request;
 use XoopsModules\Publisher;
+use XoopsModules\Publisher\Utility;
 
 require_once __DIR__ . '/admin_header.php';
 
-Publisher\Utility::cpHeader();
+Utility::cpHeader();
 //publisher_adminMenu(-1, _AM_PUBLISHER_CLONE);
-Publisher\Utility::openCollapsableBar('clone', 'cloneicon', _AM_PUBLISHER_CLONE, _AM_PUBLISHER_CLONE_DSC);
+Utility::openCollapsableBar('clone', 'cloneicon', _AM_PUBLISHER_CLONE, _AM_PUBLISHER_CLONE_DSC);
 
 if ('submit' === Request::getString('op', '', 'POST')) {
     if (!$GLOBALS['xoopsSecurity']->check()) {
@@ -78,7 +79,7 @@
 }
 
 // End of collapsable bar
-Publisher\Utility::closeCollapsableBar('clone', 'cloneicon');
+Utility::closeCollapsableBar('clone', 'cloneicon');
 
 require_once __DIR__ . '/admin_footer.php';
 

diff --git a/admin/feedback.php b/admin/feedback.php
@@ -22,12 +22,13 @@
  */
 
 use Xmf\Request;
+use \XoopsModules\Publisher\Common\ModuleFeedback;
 
 require __DIR__ . '/admin_header.php';
 
 $adminObject = \Xmf\Module\Admin::getInstance();
 
-$feedback = new \XoopsModules\Publisher\Common\ModuleFeedback();
+$feedback = new ModuleFeedback();
 
 // It recovered the value of argument op in URL$
 $op                 = Request::getString('op', 'list');
@@ -44,8 +45,7 @@
         $feedback->name  = $GLOBALS['xoopsUser']->getVar('name');
         $feedback->email = $GLOBALS['xoopsUser']->getVar('email');
         $feedback->site  = XOOPS_URL;
-        /** @var \XoopsThemeForm $form */
-        $form = $feedback->getFormFeedback();
+    $form = $feedback->getFormFeedback();
         echo $form->display();
         break;
     case 'send':

diff --git a/admin/file.php b/admin/file.php
@@ -21,6 +21,8 @@
 
 use Xmf\Request;
 use XoopsModules\Publisher;
+use XoopsModules\Publisher\Helper;
+use XoopsModules\Publisher\Utility;
 
 require_once __DIR__ . '/admin_header.php';
 
@@ -33,8 +35,7 @@
  */
 function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
 {
-    /** @var Publisher\Helper $helper */
-    $helper = Publisher\Helper::getInstance();
+    $helper = Helper::getInstance();
     require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 
     // if there is a parameter, and the id exists, retrieve data: we're editing a file
@@ -50,14 +51,14 @@ 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>';
-        Publisher\Utility::openCollapsableBar('editfile', 'editfileicon', _AM_PUBLISHER_FILE_INFORMATIONS);
+        Utility::openCollapsableBar('editfile', 'editfileicon', _AM_PUBLISHER_FILE_INFORMATIONS);
     } else {
         // there's no parameter, so we're adding an item
         $fileObj = $helper->getHandler('File')->create();
         $fileObj->setVar('itemid', $itemid);
         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>';
-        Publisher\Utility::openCollapsableBar('addfile', 'addfileicon', _AM_PUBLISHER_FILE_INFORMATIONS);
+        Utility::openCollapsableBar('addfile', 'addfileicon', _AM_PUBLISHER_FILE_INFORMATIONS);
     }
 
     // FILES UPLOAD FORM
@@ -66,21 +67,21 @@ function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
     $uploadForm->display();
 
     if (0 != $fileid) {
-        Publisher\Utility::closeCollapsableBar('editfile', 'editfileicon');
+        Utility::closeCollapsableBar('editfile', 'editfileicon');
     } else {
-        Publisher\Utility::closeCollapsableBar('addfile', 'addfileicon');
+        Utility::closeCollapsableBar('addfile', 'addfileicon');
     }
 }
 
 $false = false;
 /* -- Available operations -- */
 switch ($op) {
     case 'uploadfile':
-        Publisher\Utility::uploadFile(false, true, $false);
+        Utility::uploadFile(false, true, $false);
         exit;
         break;
     case 'uploadanother':
-        Publisher\Utility::uploadFile(true, true, $false);
+        Utility::uploadFile(true, true, $false);
         exit;
         break;
     case 'mod':
@@ -90,7 +91,7 @@ function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
             redirect_header('<script>javascript:history.go(-1)</script>', 3, _AM_PUBLISHER_NOITEMSELECTED);
         }
 
-        Publisher\Utility::cpHeader();
+        Utility::cpHeader();
         require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 
         publisher_editFile(true, $fileid, $itemid);
@@ -112,7 +113,7 @@ function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
 
         // Storing the file
         if (!$fileObj->store()) {
-            redirect_header('item.php?op=mod&itemid=' . $fileObj->itemid() . '#tab_2', 3, _AM_PUBLISHER_FILE_EDITING_ERROR . Publisher\Utility::formatErrors($fileObj->getErrors()));
+            redirect_header('item.php?op=mod&itemid=' . $fileObj->itemid() . '#tab_2', 3, _AM_PUBLISHER_FILE_EDITING_ERROR . Utility::formatErrors($fileObj->getErrors()));
         }
 
         redirect_header('item.php?op=mod&itemid=' . $fileObj->itemid() . '#tab_2', 2, _AM_PUBLISHER_FILE_EDITING_SUCCESS);
@@ -136,7 +137,7 @@ function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
             // no confirm: show deletion condition
             $fileid = Request::getInt('fileid', 0, 'GET');
 
-            Publisher\Utility::cpHeader();
+            Utility::cpHeader();
             xoops_confirm(['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();
         }
@@ -145,7 +146,7 @@ function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
         break;
     case 'default':
     default:
-        Publisher\Utility::cpHeader();
+        Utility::cpHeader();
         //publisher_adminMenu(2, _AM_PUBLISHER_ITEMS);
         break;
 }

diff --git a/admin/import.php b/admin/import.php
@@ -21,6 +21,7 @@
 
 use Xmf\Request;
 use XoopsModules\Publisher;
+use XoopsModules\Publisher\Utility;
 
 require_once __DIR__ . '/admin_header.php';
 
@@ -36,10 +37,10 @@
     default:
         $importfile = 'none';
 
-        Publisher\Utility::cpHeader();
+        Utility::cpHeader();
         //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
 
-        Publisher\Utility::openCollapsableBar('import', 'importicon', _AM_PUBLISHER_IMPORT_TITLE, _AM_PUBLISHER_IMPORT_INFO);
+        Utility::openCollapsableBar('import', 'importicon', _AM_PUBLISHER_IMPORT_TITLE, _AM_PUBLISHER_IMPORT_INFO);
 
         xoops_load('XoopsFormLoader');
         /** @var \XoopsModuleHandler $moduleHandler */
@@ -174,7 +175,7 @@
 
         // End of collapsable bar
 
-        Publisher\Utility::closeCollapsableBar('import', 'importicon');
+        Utility::closeCollapsableBar('import', 'importicon');
 
         break;
 }