reversing to old way of checking editors, updates

XoopsModules25x · Aug 1, 2018 · 6a20f5d · 6a20f5d
1 parent 6f22aa9
commit 6a20f5d
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 34 deletions.
diff --git a/admin/file.php b/admin/file.php
@@ -61,6 +61,7 @@ function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
     }
 
     // FILES UPLOAD FORM
+    /** @var Publisher\File $fileObj */
     $uploadForm = $fileObj->getForm();
     $uploadForm->display();
 

diff --git a/admin/import/fmcontent.php b/admin/import/fmcontent.php
@@ -44,6 +44,7 @@
     $moduleObj     = $moduleHandler->getByDirname('fmcontent');
     $fm_module_id  = $moduleObj->getVar('mid');
 
+    /** @var \XoopsPersistableObjectHandler $fmTopicHdlr */
     $fmTopicHdlr  = xoops_getModuleHandler('topic', 'fmcontent');
     $fmTopicCount = $fmTopicHdlr->getCount(new \Criteria('topic_modid', $fm_module_id));
 

diff --git a/admin/import/xnews.php b/admin/import/xnews.php
@@ -313,6 +313,7 @@
             $itemObj->setVar('notifypub', $arrArticle['notifypub']);
             //-------- image
 
+            /** @var \XoopsImageHandler $imgHandler */
             $imgHandler = xoops_getHandler('image');
 
             $criteria   = new \Criteria('image_name', $arrArticle['picture']);

diff --git a/admin/preferences.php b/admin/preferences.php
@@ -31,6 +31,7 @@
 $modname = $module->name();
 $dirName = $helper->getDirname();
 
+/** @var \XoopsModuleHandler $moduleHandler */
 $moduleHandler = xoops_getHandler('module');
 $xoopsModule0  = $moduleHandler->getByDirname(basename(dirname(__DIR__)));
 global $xoopsModule;
@@ -51,6 +52,7 @@
 $configcat = Request::getString('configcat', '', 'GET');
 
 if ('showmod' === $op) {
+    /** @var \XoopsConfigHandler $configHandler */
     $configHandler = xoops_getHandler('config');
 
     $config = $configHandler->getConfigs(new \Criteria('conf_modid', $modId));

diff --git a/blocks/date_to_date.php b/blocks/date_to_date.php
@@ -45,7 +45,9 @@ function publisher_date_to_date_show($options)
     $criteria->setOrder('DESC');
 
     // creating the ITEM objects that belong to the selected category
-    $itemsObj = $helper->getHandler('Item')->getObjects($criteria);
+    /** @var Publisher\ItemHandler $itemHandler */
+    $itemHandler = $helper->getHandler('Item');
+    $itemsObj    = $itemHandler->getObjects($criteria);
     //    $totalItems = count($itemsObj);
 
     if (is_array($itemsObj) && count($itemsObj) > 0) {

diff --git a/blocks/items_columns.php b/blocks/items_columns.php
@@ -37,7 +37,10 @@ function publisher_items_columns_show($options)
     //    global $xoTheme;
     /** @var Publisher\Helper $helper */
     $helper = Publisher\Helper::getInstance();
-
+    /** @var Publisher\CategoryHandler $categoryHandler */
+    $categoryHandler = $helper->getHandler('Category');
+    /** @var Publisher\ItemHandler $itemHandler */
+    $itemHandler = $helper->getHandler('Item');
     //Column Settings
     $optNumColumns  = isset($options[0]) ? (int)$options[0] : '2';
     $selCategories  = isset($options[1]) ? explode(',', $options[1]) : [];
@@ -52,8 +55,6 @@ function publisher_items_columns_show($options)
     $selCategoriesObj = [];
 
     //get permited categories only once
-    /** @var Publisher\CategoryHandler $categoryHandler */
-    $categoryHandler = $helper->getHandler('Category');
     $categoriesObj   = $categoryHandler->getCategories(0, 0, -1);
 
     //if not selected 'all', let's get the selected ones
@@ -82,7 +83,7 @@ function publisher_items_columns_show($options)
     $columns = $mainItem = $subItem = [];
 
     foreach ($selCategoriesObj as $categoryId => $mainItemCatObj) {
-        $categoryItemsObj = $helper->getHandler('Item')->getAllPublished($optCatItems, 0, $categoryId);
+        $categoryItemsObj = $itemHandler->getAllPublished($optCatItems, 0, $categoryId);
         $scount           = count($categoryItemsObj);
         if ($scount > 0 && is_array($categoryItemsObj)) {
             reset($categoryItemsObj);

diff --git a/blocks/items_spot.php b/blocks/items_spot.php
@@ -37,6 +37,9 @@ function publisher_items_spot_show($options)
     $helper = Publisher\Helper::getInstance();
     /** @var Publisher\CategoryHandler $categoryHandler */
     $categoryHandler   = $helper->getHandler('Category');
+    /** @var Publisher\ItemHandler $itemHandler */
+    $itemHandler = $helper->getHandler('Item');
+
     $optDisplayLast    = $options[0];
     $optItemsCount     = $options[1];
     $optCategoryId     = $options[2];
@@ -51,11 +54,12 @@ function publisher_items_spot_show($options)
     }
     $block = [];
     if (1 == $optDisplayLast) {
-        $itemsObj   = $helper->getHandler('Item')->getAllPublished($optItemsCount, 0, $optCategoryId, $sort = 'datesub', $order = 'DESC', 'summary');
+        $itemsObj   = $itemHandler->getAllPublished($optItemsCount, 0, $optCategoryId, $sort = 'datesub', $order = 'DESC', 'summary');
         $i          = 1;
         $itemsCount = count($itemsObj);
         if ($itemsObj) {
             if (-1 != $optCategoryId && $optCatImage) {
+                /** @var Publisher\Category $cat */
                 $cat                     = $categoryHandler->get($optCategoryId);
                 $category['name']        = $cat->name();
                 $category['categoryurl'] = $cat->getCategoryUrl();
@@ -84,10 +88,11 @@ function publisher_items_spot_show($options)
         $i          = 1;
         $itemsCount = count($selItems);
         foreach ($selItems as $itemId) {
-            $itemObj = $helper->getHandler('Item')->get($itemId);
+            /** @var Publisher\Item $itemObj */
+            $itemObj = $itemHandler->get($itemId);
             if (!$itemObj->notLoaded()) {
                 $item             = $itemObj->toArraySimple();
-                $item['who_when'] = sprintf(_MB_PUBLISHER_WHO_WHEN, $itemObj->posterName(), $itemObj->getDatesub());
+                $item['who_when'] = sprintf(_MB_PUBLISHER_WHO_WHEN, $itemObj->posterName, $itemObj->getDatesub);
                 if ($i < $itemsCount) {
                     $item['showline'] = true;
                 } else {

diff --git a/class/Category.php b/class/Category.php
@@ -41,6 +41,20 @@ class Category extends \XoopsObject
      * @var array
      */
     public $categoryPath = false;
+    public $categoryid;
+    public $parentid;
+    public $name;
+    public $description;
+    public $image;
+    public $total;
+    public $weight;
+    public $created;
+    public $template;
+    public $header;
+    public $meta_keywords;
+    public $meta_description;
+    public $short_url;
+    public $moderator;
 
     /**
      * constructor
@@ -101,7 +115,7 @@ public function checkPermission()
         if ($GLOBALS['publisherIsAdmin']) {
             return true;
         }
-        if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->getVar('uid') == $this->moderator()) {
+        if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->getVar('uid') == $this->moderator) {
             return true;
         }
         /** @var \XoopsModules\Publisher\PermissionHandler $permissionHandler */
@@ -152,7 +166,9 @@ public function getCategoryPath($withAllLink = true)
             }
             $parentid = $this->parentid();
             if (0 != $parentid) {
-                $parentObj = $this->helper->getHandler('Category')->get($parentid);
+                /** @var Publisher\CategoryHandler $categoryHandler */
+                $categoryHandler = $this->helper->getHandler('Category');
+                $parentObj      = $categoryHandler->get($parentid);
                 //                if ($parentObj->notLoaded()) {
                 //                    exit;
                 //                }
@@ -183,7 +199,9 @@ public function getCategoryPathForMetaTitle()
         $ret      = '';
         $parentid = $this->parentid();
         if (0 != $parentid) {
-            $parentObj = $this->helper->getHandler('Category')->get($parentid);
+            /** @var Publisher\CategoryHandler $categoryHandler */
+            $categoryHandler = $this->helper->getHandler('Category');
+            $parentObj = $categoryHandler->get($parentid);
             //            if ($parentObj->notLoaded()) {
             //                exit('NOT LOADED');
             //            }
@@ -210,23 +228,29 @@ public function getCategoryPathForMetaTitle()
      */
     public function getGroupsRead()
     {
-        return $this->helper->getHandler('Permission')->getGrantedGroupsById('category_read', $this->categoryid());
+        /** @var Publisher\PermissionHandler $permissionHandler */
+        $permissionHandler = $this->helper->getHandler('Permission');
+        return $permissionHandler->getGrantedGroupsById('category_read', $this->categoryid());
     }
 
     /**
      * @return array|null
      */
     public function getGroupsSubmit()
     {
-        return $this->helper->getHandler('Permission')->getGrantedGroupsById('item_submit', $this->categoryid());
+        /** @var Publisher\PermissionHandler $permissionHandler */
+        $permissionHandler = $this->helper->getHandler('Permission');
+        return $permissionHandler->getGrantedGroupsById('item_submit', $this->categoryid());
     }
 
     /**
      * @return array|null
      */
     public function getGroupsModeration()
     {
-        return $this->helper->getHandler('Permission')->getGrantedGroupsById('category_moderation', $this->categoryid());
+        /** @var Publisher\PermissionHandler $permissionHandler */
+        $permissionHandler = $this->helper->getHandler('Permission');
+        return $permissionHandler->getGrantedGroupsById('category_moderation', $this->categoryid());
     }
 
     /**

diff --git a/class/CategoryHandler.php b/class/CategoryHandler.php
@@ -84,18 +84,19 @@ public function get($id = null, $fields = null)
     public function insert(\XoopsObject $category, $force = false) //insert(&$category, $force = false)
     {
         // Auto create meta tags if empty
-        if (!$category->meta_keywords() || !$category->meta_description()) {
-            $publisherMetagen = new Publisher\Metagen($category->name(), $category->getVar('meta_keywords'), $category->getVar('description'));
-            if (!$category->meta_keywords()) {
+        /** @var \XoopsModules\Publisher\Category $category */
+        if (!$category->meta_keywords || !$category->meta_description) {
+            $publisherMetagen = new Publisher\Metagen($category->name, $category->getVar('meta_keywords'), $category->getVar('description'));
+            if (!$category->meta_keywords) {
                 $category->setVar('meta_keywords', $publisherMetagen->keywords);
             }
-            if (!$category->meta_description()) {
+            if (!$category->meta_description) {
                 $category->setVar('meta_description', $publisherMetagen->description);
             }
         }
         // Auto create short_url if empty
-        if (!$category->short_url()) {
-            $category->setVar('short_url', Metagen::generateSeoTitle($category->name('n'), false));
+        if (!$category->short_url) {
+            $category->setVar('short_url', Publisher\Metagen::generateSeoTitle($category->name('n'), false));
         }
         $ret = parent::insert($category, $force);
 
@@ -112,12 +113,13 @@ public function insert(\XoopsObject $category, $force = false) //insert(&$catego
      */
     public function delete(\XoopsObject $category, $force = false) //delete(&$category, $force = false)
     {
+        /** @var \XoopsModules\Publisher\Category $category */
         // Deleting this category ITEMs
-        $criteria = new \Criteria('categoryid', $category->categoryid());
+        $criteria = new \Criteria('categoryid', $category->categoryid);
         $this->helper->getHandler('Item')->deleteAll($criteria);
         unset($criteria);
         // Deleting the sub categories
-        $subcats =& $this->getCategories(0, 0, $category->categoryid());
+        $subcats =& $this->getCategories(0, 0, $category->categoryid);
         foreach ($subcats as $subcat) {
             $this->delete($subcat);
         }
@@ -127,9 +129,9 @@ public function delete(\XoopsObject $category, $force = false) //delete(&$catego
             return false;
         }
         $moduleId = $this->helper->getModule()->getVar('mid');
-        xoops_groupperm_deletebymoditem($moduleId, 'category_read', $category->categoryid());
-        xoops_groupperm_deletebymoditem($moduleId, 'item_submit', $category->categoryid());
-        xoops_groupperm_deletebymoditem($moduleId, 'category_moderation', $category->categoryid());
+        xoops_groupperm_deletebymoditem($moduleId, 'category_read', $category->categoryid);
+        xoops_groupperm_deletebymoditem($moduleId, 'item_submit', $category->categoryid);
+        xoops_groupperm_deletebymoditem($moduleId, 'category_moderation', $category->categoryid);
 
         return true;
     }
@@ -180,7 +182,9 @@ public function &getCategories($limit = 0, $start = 0, $parentid = 0, $sort = 'w
             $criteria->add(new \Criteria('parentid', $parentid));
         }
         if (!$GLOBALS['publisherIsAdmin']) {
-            $categoriesGranted = $this->helper->getHandler('Permission')->getGrantedItems('category_read');
+            /** @var Publisher\PermissionHandler $permissionHandler */
+            $permissionHandler = $this->helper->getHandler('Permission');
+            $categoriesGranted = $permissionHandler->getGrantedItems('category_read');
             if (count($categoriesGranted) > 0) {
                 $criteria->add(new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
             } else {
@@ -406,6 +410,8 @@ public function publishedItemsCount($catId = 0)
      */
     public function itemsCount($catId = 0, $status = '')
     {
-        return $this->helper->getHandler('Item')->getCountsByCat($catId, $status);
+        /** @var Publisher\ItemHandler $itemHandler */
+        $itemHandler = $this->helper->getHandler('Item');
+        return $itemHandler->getCountsByCat($catId, $status);
     }
 }
diff --git a/class/File.php b/class/File.php
@@ -91,14 +91,16 @@ public function __call($method, $args)
      */
     public function checkUpload($postField, $allowedMimetypes, &$errors)
     {
-        $errors = [];
-        if (!$this->helper->getHandler('Mimetype')->checkMimeTypes($postField)) {
+        /** @var Publisher\MimetypeHandler $mimetypeHandler */
+        $mimetypeHandler = $this->helper->getHandler('Mimetype');
+        $errors          = [];
+        if (!$mimetypeHandler->checkMimeTypes($postField)) {
             $errors[] = _CO_PUBLISHER_MESSAGE_WRONG_MIMETYPE;
 
             return false;
         }
         if (0 === count($allowedMimetypes)) {
-            $allowedMimetypes = $this->helper->getHandler('Mimetype')->getArrayByType();
+            $allowedMimetypes = $mimetypeHandler->getArrayByType();
         }
         $maxfilesize   = $this->helper->getConfig('maximum_filesize');
         $maxfilewidth  = $this->helper->getConfig('maximum_image_width');
@@ -122,9 +124,11 @@ public function checkUpload($postField, $allowedMimetypes, &$errors)
      */
     public function storeUpload($postField, $allowedMimetypes, &$errors)
     {
+        /** @var Publisher\MimetypeHandler $mimetypeHandler */
+        $mimetypeHandler = $this->helper->getHandler('Mimetype');
         $itemid = $this->getVar('itemid');
         if (0 === count($allowedMimetypes)) {
-            $allowedMimetypes = $this->helper->getHandler('Mimetype')->getArrayByType();
+            $allowedMimetypes = $mimetypeHandler->getArrayByType();
         }
         $maxfilesize   = $this->helper->getConfig('maximum_filesize');
         $maxfilewidth  = $this->helper->getConfig('maximum_image_width');

diff --git a/class/ItemHandler.php b/class/ItemHandler.php
@@ -113,7 +113,7 @@ public function insert(\XoopsObject $item, $force = false)  //insert(&$item, $fo
             }
             // Auto create short_url if empty
             if (!$item->short_url()) {
-                $item->setVar('short_url', mb_substr(Metagen::generateSeoTitle($item->getVar('title', 'n'), false), 0, 254));
+                $item->setVar('short_url', mb_substr(Publisher\Metagen::generateSeoTitle($item->getVar('title', 'n'), false), 0, 254));
             }
         }
         if (!parent::insert($item, $force)) {

diff --git a/class/Utility.php b/class/Utility.php
@@ -1309,7 +1309,8 @@ public static function getEditors($allowedEditors = null)
         $nohtml = false;
         xoops_load('XoopsEditorHandler');
         $editorHandler = \XoopsEditorHandler::getInstance();
-        $editors       = array_flip($editorHandler->getList()); //$editorHandler->getList($nohtml);
+//        $editors       = array_flip($editorHandler->getList()); //$editorHandler->getList($nohtml);
+        $editors       = $editorHandler->getList($nohtml);
         foreach ($editors as $name => $title) {
             $key = static::stringToInt($name);
             if (is_array($allowedEditors)) {

diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,7 +1,8 @@
 <h5>1.06 Final       [2018-08-01]</h5>  Dev: XOOPS 2.5.9, PHP 7.2.8
 <hr>
 - cosmetics (mamba)
-- fixes (mamba)
+- reversing to old way of checking editors (mamba)
+- fix installation error (mamba)
 
 <h5>1.06 RC 1       [2018-07-15]</h5>  Dev: XOOPS 2.5.9, PHP 7.2.7
 <hr>