@@ -22,13 +21,11 @@
use XoopsModules\Publisher;
-
require_once dirname(__DIR__) . '/preloads/autoloader.php';
$moduleDirName = basename(dirname(__DIR__));
$moduleDirNameUpper = mb_strtoupper($moduleDirName);
-/** @var Publisher\Helper $helper */
$helper = Publisher\Helper::getInstance();
$helper->loadLanguage('common');
$helper->loadLanguage('feedback');
@@ -63,6 +60,15 @@
'link' => 'admin/item.php',
'icon' => $pathIcon32 . '/content.png',
];
+
+// Trello
+$adminmenu[] = [
+ 'title' => _MI_PUBLISHER_ADMENU7,
+ 'link' => 'admin/trello.php',
+ 'icon' => $pathIcon32 . '/extention.png',
+];
+
+
// Permissions
$adminmenu[] = [
'title' => _MI_PUBLISHER_ADMENU4,
diff --git a/admin/migrate.php b/admin/migrate.php
index e62ee881..f6d2d209 100644
--- a/admin/migrate.php
+++ b/admin/migrate.php
@@ -55,13 +55,11 @@
//XoopsLoad::load('migrate', 'newbb');
-/** @var Publisher\Common\Configurator $configurator */
$configurator = new Publisher\Common\Configurator();
-/** @var \XoopsModules\Publisher\Common\Migrate $migrator */
-$migrator = new \XoopsModules\Publisher\Common\Migrate($configurator);
+$migrator = new \XoopsModules\Publisher\Common\Migrate($configurator = null);
-$op = Request::getCmd('op', 'default');
+$op = Request::getCmd('op', 'show');
$opShow = Request::getCmd('show', null, 'POST');
$opMigrate = Request::getCmd('migrate', null, 'POST');
$opSchema = Request::getCmd('schema', null, 'POST');
@@ -73,6 +71,7 @@
switch ($op) {
case 'show':
+ default:
$queue = $migrator->getSynchronizeDDL();
if (!empty($queue)) {
echo "\n";
@@ -84,15 +83,16 @@
break;
case 'migrate':
$migrator->synchronizeSchema();
- $message = 'Database migrated to current schema.';
+ $message = constant('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_OK');
break;
case 'schema':
- xoops_confirm(['op' => 'confirmwrite'], 'migrate.php', 'Warning! This is intended for developers only. Confirm write schema file from current database.', 'Confirm');
+ xoops_confirm(['op' => 'confirmwrite'], 'migrate.php', constant('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_WARNING'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'));
break;
case 'confirmwrite':
if ($GLOBALS['xoopsSecurity']->check()) {
$migrator->saveCurrentSchema();
- $message = 'Current schema file written';
+
+ $message = constant('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_SCHEMA_OK');
}
break;
}
diff --git a/admin/mimetypes.php b/admin/mimetypes.php
index dd742069..e3120561 100644
--- a/admin/mimetypes.php
+++ b/admin/mimetypes.php
@@ -14,8 +14,6 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Admin
- * @subpackage Action
* @since 1.0
* @author trabis
* @author The SmartFactory
@@ -23,6 +21,7 @@
use Xmf\Request;
use XoopsModules\Publisher;
+use XoopsModules\Publisher\MimetypesUtility;
require_once __DIR__ . '/admin_header.php';
xoops_load('XoopsPagenav');
@@ -52,31 +51,31 @@
switch ($op) {
case 'add':
- Publisher\MimetypesUtility::add();
+ MimetypesUtility::add();
break;
case 'delete':
- Publisher\MimetypesUtility::delete();
+ MimetypesUtility::delete();
break;
case 'edit':
- Publisher\MimetypesUtility::edit();
+ MimetypesUtility::edit();
break;
case 'search':
- Publisher\MimetypesUtility::search();
+ MimetypesUtility::search();
break;
case 'updateMimeValue':
- Publisher\MimetypesUtility::updateMimeValue();
+ MimetypesUtility::updateMimeValue();
break;
case 'confirmUpdateMimeValue':
- Publisher\MimetypesUtility::confirmUpdateMimeValue();
+ MimetypesUtility::confirmUpdateMimeValue();
break;
case 'clearAddSession':
- Publisher\MimetypesUtility::clearAddSession();
+ MimetypesUtility::clearAddSession();
break;
case 'clearEditSession':
- Publisher\MimetypesUtility::clearEditSession();
+ MimetypesUtility::clearEditSession();
break;
case 'manage':
default:
- Publisher\MimetypesUtility::manage();
+ MimetypesUtility::manage();
break;
}
diff --git a/admin/pagewrap.php b/admin/pagewrap.php
index bf547e25..f3809fc7 100644
--- a/admin/pagewrap.php
+++ b/admin/pagewrap.php
@@ -14,22 +14,22 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
* @since 1.0
* @author trabis
* @author The SmartFactory
*/
use XoopsModules\Publisher;
+use XoopsModules\Publisher\Utility;
require_once __DIR__ . '/admin_header.php';
-Publisher\Utility::cpHeader();
+Utility::cpHeader();
//publisher_adminMenu(-1, _AM_PUBLISHER_ITEMS . " > " . _AM_PUBLISHER_PAGEWRAP);
-Publisher\Utility::openCollapsableBar('pagewraptable', 'pagewrapicon', _AM_PUBLISHER_PAGEWRAP, _AM_PUBLISHER_PAGEWRAPDSC);
+Utility::openCollapsableBar('pagewraptable', 'pagewrapicon', _AM_PUBLISHER_PAGEWRAP, _AM_PUBLISHER_PAGEWRAPDSC);
-$dir = Publisher\Utility::getUploadDir(true, 'content');
+$dir = Utility::getUploadDir(true, 'content');
if (false !== mb_strpos(decoct(fileperms($dir)), '777')) {
echo "" . _AM_PUBLISHER_PERMERROR . '
';
@@ -47,7 +47,7 @@
// Delete File
$form = new \XoopsThemeForm(_CO_PUBLISHER_DELETEFILE, 'form_name', 'pw_delete_file.php');
-$pWrapSelect = new \XoopsFormSelect(Publisher\Utility::getUploadDir(true, 'content'), 'address');
+$pWrapSelect = new \XoopsFormSelect(Utility::getUploadDir(true, 'content'), 'address');
$folder = dir($dir);
while ($file == $folder->read()) {
if ('.' !== $file && '..' !== $file) {
@@ -63,6 +63,6 @@
$form->addElement($submit);
$form->display();
-Publisher\Utility::closeCollapsableBar('pagewraptable', 'pagewrapicon');
+Utility::closeCollapsableBar('pagewraptable', 'pagewrapicon');
require_once __DIR__ . '/admin_footer.php';
diff --git a/admin/permissions.php b/admin/permissions.php
index c0970ce1..9d5fcd7d 100644
--- a/admin/permissions.php
+++ b/admin/permissions.php
@@ -14,7 +14,6 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
* @since 1.0
* @author trabis
* @author The SmartFactory
@@ -22,21 +21,21 @@
use XoopsModules\Publisher;
use XoopsModules\Publisher\Constants;
+use XoopsModules\Publisher\Utility;
require_once __DIR__ . '/admin_header.php';
require_once dirname(__DIR__) . '/include/common.php';
require_once $GLOBALS['xoops']->path('class/xoopsform/grouppermform.php');
$myts = \MyTextSanitizer::getInstance();
-Publisher\Utility::cpHeader();
+Utility::cpHeader();
//publisher_adminMenu(3, _AM_PUBLISHER_PERMISSIONS);
-/** @var Publisher\Helper $helper */
$helper = Publisher\Helper::getInstance();
// View Categories permissions
$item_list_view = [];
$block_view = [];
-Publisher\Utility::openCollapsableBar('permissionstable_view', 'permissionsicon_view', _AM_PUBLISHER_PERMISSIONSVIEWMAN, _AM_PUBLISHER_VIEW_CATS);
+Utility::openCollapsableBar('permissionstable_view', 'permissionsicon_view', _AM_PUBLISHER_PERMISSIONSVIEWMAN, _AM_PUBLISHER_VIEW_CATS);
$result_view = $GLOBALS['xoopsDB']->query('SELECT categoryid, name FROM ' . $GLOBALS['xoopsDB']->prefix($helper->getDirname() . '_categories') . ' ');
if ($GLOBALS['xoopsDB']->getRowsNum($result_view)) {
@@ -48,11 +47,11 @@
} else {
echo _AM_PUBLISHER_NOPERMSSET;
}
-Publisher\Utility::closeCollapsableBar('permissionstable_view', 'permissionsicon_view');
+Utility::closeCollapsableBar('permissionstable_view', 'permissionsicon_view');
// Submit Categories permissions
echo "
\n";
-Publisher\Utility::openCollapsableBar('permissionstable_submit', 'permissionsicon_submit', _AM_PUBLISHER_PERMISSIONS_CAT_SUBMIT, _AM_PUBLISHER_PERMISSIONS_CAT_SUBMIT_DSC);
+Utility::openCollapsableBar('permissionstable_submit', 'permissionsicon_submit', _AM_PUBLISHER_PERMISSIONS_CAT_SUBMIT, _AM_PUBLISHER_PERMISSIONS_CAT_SUBMIT_DSC);
$result_view = $GLOBALS['xoopsDB']->query('SELECT categoryid, name FROM ' . $GLOBALS['xoopsDB']->prefix($helper->getDirname() . '_categories') . ' ');
if ($GLOBALS['xoopsDB']->getRowsNum($result_view)) {
$form_submit = new \XoopsGroupPermForm('', $helper->getModule()->mid(), 'item_submit', '', 'admin/permissions.php');
@@ -63,11 +62,11 @@
} else {
echo _AM_PUBLISHER_NOPERMSSET;
}
-Publisher\Utility::closeCollapsableBar('permissionstable_submit', 'permissionsicon_submit');
+Utility::closeCollapsableBar('permissionstable_submit', 'permissionsicon_submit');
// Moderators Categories permissions
echo "
\n";
-Publisher\Utility::openCollapsableBar('permissionstable_moderation', 'permissionsicon_moderation', _AM_PUBLISHER_PERMISSIONS_CAT_MODERATOR, _AM_PUBLISHER_PERMISSIONS_CAT_MODERATOR_DSC);
+Utility::openCollapsableBar('permissionstable_moderation', 'permissionsicon_moderation', _AM_PUBLISHER_PERMISSIONS_CAT_MODERATOR, _AM_PUBLISHER_PERMISSIONS_CAT_MODERATOR_DSC);
$result_view = $GLOBALS['xoopsDB']->query('SELECT categoryid, name FROM ' . $GLOBALS['xoopsDB']->prefix($helper->getDirname() . '_categories') . ' ');
if ($GLOBALS['xoopsDB']->getRowsNum($result_view)) {
$form_submit = new \XoopsGroupPermForm('', $helper->getModule()->mid(), 'category_moderation', '', 'admin/permissions.php');
@@ -78,11 +77,11 @@
} else {
echo _AM_PUBLISHER_NOPERMSSET;
}
-Publisher\Utility::closeCollapsableBar('permissionstable_moderation', 'permissionsicon_moderation');
+Utility::closeCollapsableBar('permissionstable_moderation', 'permissionsicon_moderation');
// Form permissions
echo "
\n";
-Publisher\Utility::openCollapsableBar('permissionstable_form', 'permissionsicon_form', _AM_PUBLISHER_PERMISSIONS_FORM, _AM_PUBLISHER_PERMISSIONS_FORM_DSC);
+Utility::openCollapsableBar('permissionstable_form', 'permissionsicon_form', _AM_PUBLISHER_PERMISSIONS_FORM, _AM_PUBLISHER_PERMISSIONS_FORM_DSC);
$form_options = [
Constants::PUBLISHER_SUMMARY => _AM_PUBLISHER_SUMMARY,
//Constants::PUBLISHER_DISPLAY_SUMMARY => _CO_PUBLISHER_DISPLAY_SUMMARY,
@@ -118,23 +117,23 @@
}
unset($key, $value);
echo $form_submit->render();
-Publisher\Utility::closeCollapsableBar('permissionstable_form', 'permissionsicon_form');
+Utility::closeCollapsableBar('permissionstable_form', 'permissionsicon_form');
// Editors permissions
echo "
\n";
-Publisher\Utility::openCollapsableBar('permissionstable_editors', 'permissions_editors', _AM_PUBLISHER_PERMISSIONS_EDITORS, _AM_PUBLISHER_PERMISSIONS_EDITORS_DSC);
-$editors = Publisher\Utility::getEditors();
+Utility::openCollapsableBar('permissionstable_editors', 'permissions_editors', _AM_PUBLISHER_PERMISSIONS_EDITORS, _AM_PUBLISHER_PERMISSIONS_EDITORS_DSC);
+$editors = Utility::getEditors();
$form_submit = new \XoopsGroupPermForm('', $helper->getModule()->mid(), 'editors', '', 'admin/permissions.php');
foreach ($editors as $key => $value) {
$form_submit->addItem($key, $value['title']);
}
unset($key, $value);
echo $form_submit->render();
-Publisher\Utility::closeCollapsableBar('permissionstable_editors', 'permissionsicon_editors');
+Utility::closeCollapsableBar('permissionstable_editors', 'permissionsicon_editors');
// Global permissions
echo "
\n";
-Publisher\Utility::openCollapsableBar('permissionstable_global', 'permissionsicon_global', _AM_PUBLISHER_PERMISSIONS_GLOBAL, _AM_PUBLISHER_PERMISSIONS_GLOBAL_DSC);
+Utility::openCollapsableBar('permissionstable_global', 'permissionsicon_global', _AM_PUBLISHER_PERMISSIONS_GLOBAL, _AM_PUBLISHER_PERMISSIONS_GLOBAL_DSC);
$form_options = [
Constants::PUBLISHER_SEARCH => _AM_PUBLISHER_SEARCH,
Constants::PUBLISHER_RATE => _AM_PUBLISHER_RATE,
@@ -145,6 +144,6 @@
}
unset($key, $value);
echo $form_submit->render();
-Publisher\Utility::closeCollapsableBar('permissionstable_global', 'permissionsicon_global');
+Utility::closeCollapsableBar('permissionstable_global', 'permissionsicon_global');
require_once __DIR__ . '/admin_footer.php';
diff --git a/admin/preferences.php b/admin/preferences.php
index 175ec61a..50098db9 100644
--- a/admin/preferences.php
+++ b/admin/preferences.php
@@ -14,7 +14,6 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
* @since 1.0
* @author trabis
* @author Kazumi Ono (AKA onokazu)
@@ -22,10 +21,10 @@
use Xmf\Request;
use XoopsModules\Publisher;
+use XoopsModules\Publisher\Utility;
require_once __DIR__ . '/admin_header.php';
-/** @var Publisher\Helper $helper */
$helper = Publisher\Helper::getInstance();
$module = $helper->getModule();
@@ -66,7 +65,7 @@
$xv_configs = $module->getInfo('config');
$config_cats = $module->getInfo('configcat');
- if (!array_key_exists('others', $config_cats)) {
+ if (is_array($config_cats) && !array_key_exists('others', $config_cats)) {
$config_cats['others'] = [
'name' => _MI_PUBLISHER_CONFCAT_OTHERS,
'description' => _MI_PUBLISHER_CONFCAT_OTHERS_DSC,
@@ -86,10 +85,12 @@
xoops_load('XoopsFormLoader');
- foreach ($config_cats as $formCat => $info) {
- $$formCat = new \XoopsThemeForm($info['name'], 'pref_form_' . $formCat, 'preferences.php', 'post', true);
+ if (is_array($config_cats)) {
+ foreach ($config_cats as $formCat => $info) {
+ $$formCat = new \XoopsThemeForm($info['name'], 'pref_form_' . $formCat, 'preferences.php', 'post', true);
+ }
+ unset($formCat, $info);
}
- unset($formCat, $info);
for ($i = 0; $i < $count; ++$i) {
foreach ($xv_configs as $xv_config) {
@@ -102,7 +103,7 @@
$formCat = $xv_config['category'] ?? '';
unset($xv_config);
- if (!array_key_exists($formCat, $config_cats)) {
+ if (is_array($config_cats) && !array_key_exists($formCat, $config_cats)) {
$formCat = 'others';
$cat_others_used = true;
}
@@ -177,12 +178,14 @@
break;
}
$hidden = new \XoopsFormHidden('conf_ids[]', $config[$i]->getVar('conf_id'));
- $$formCat->addElement($ele);
- $$formCat->addElement($hidden);
- unset($ele, $hidden);
+ if (isset($$formCat) && null !== $$formCat) {
+ $$formCat->addElement($ele);
+ $$formCat->addElement($hidden);
+ unset($ele, $hidden);
+ }
}
- Publisher\Utility::cpHeader();
+ Utility::cpHeader();
//publisher_adminMenu(5, _PREFERENCES);
foreach ($config_cats as $formCat => $info) {
if ('others' === $formCat && !$cat_others_used) {
@@ -190,9 +193,9 @@
}
$$formCat->addElement(new \XoopsFormHidden('op', 'save'));
$$formCat->addElement(new \XoopsFormButton('', 'button', _GO, 'submit'));
- Publisher\Utility::openCollapsableBar($formCat . '_table', $formCat . '_icon', $info['name'], $info['description']);
+ Utility::openCollapsableBar($formCat . '_table', $formCat . '_icon', $info['name'], $info['description']);
$$formCat->display();
- Publisher\Utility::closeCollapsableBar($formCat . '_table', $formCat . '_icon');
+ Utility::closeCollapsableBar($formCat . '_table', $formCat . '_icon');
}
unset($formCat, $info);
xoops_cp_footer();
diff --git a/admin/pw_delete_file.php b/admin/pw_delete_file.php
index 2b4f500e..6deffb04 100644
--- a/admin/pw_delete_file.php
+++ b/admin/pw_delete_file.php
@@ -14,7 +14,6 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
* @since 1.0
* @author trabis
* @author The SmartFactory
diff --git a/admin/pw_upload_file.php b/admin/pw_upload_file.php
index bad30106..a653ecc9 100644
--- a/admin/pw_upload_file.php
+++ b/admin/pw_upload_file.php
@@ -14,7 +14,6 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
* @since 1.0
* @author trabis
* @author The SmartFactory
@@ -22,6 +21,7 @@
use Xmf\Request;
use XoopsModules\Publisher;
+use XoopsModules\Publisher\Utility;
require_once __DIR__ . '/admin_header.php';
@@ -45,7 +45,6 @@ function publisher_pagewrap_upload(&$errors)
// require_once PUBLISHER_ROOT_PATH . '/class/uploader.php';
xoops_load('XoopsMediaUploader');
- /** @var Publisher\Helper $helper */
$helper = Publisher\Helper::getInstance();
$postField = 'fileupload';
@@ -53,13 +52,13 @@ function publisher_pagewrap_upload(&$errors)
$maxImageWidth = $helper->getConfig('maximum_image_width');
$maxImageHeight = $helper->getConfig('maximum_image_height');
- if (!is_dir(Publisher\Utility::getUploadDir(true, 'content'))) {
- if (!mkdir($concurrentDirectory = Publisher\Utility::getUploadDir(true, 'content'), 0757) && !is_dir($concurrentDirectory)) {
+ if (!is_dir(Utility::getUploadDir(true, 'content'))) {
+ if (!mkdir($concurrentDirectory = Utility::getUploadDir(true, 'content'), 0757) && !is_dir($concurrentDirectory)) {
throw new \RuntimeException(sprintf('Directory "%s" was not created', $concurrentDirectory));
}
}
$allowedMimeTypes = ['text/html', 'text/plain', 'application/xhtml+xml'];
- $uploader = new \XoopsMediaUploader(Publisher\Utility::getUploadDir(true, 'content') . '/', $allowedMimeTypes, $maxFileSize, $maxImageWidth, $maxImageHeight);
+ $uploader = new \XoopsMediaUploader(Utility::getUploadDir(true, 'content') . '/', $allowedMimeTypes, $maxFileSize, $maxImageWidth, $maxImageHeight);
if ($uploader->fetchMedia($postField)) {
$uploader->setTargetFileName($uploader->getMediaName());
if ($uploader->upload()) {
diff --git a/admin/trello.php b/admin/trello.php
new file mode 100644
index 00000000..96dd9962
--- /dev/null
+++ b/admin/trello.php
@@ -0,0 +1,38 @@
+displayNavigation(basename(__FILE__));
+
+$statusArray = [
+ Constants::PUBLISHER_STATUS_SUBMITTED => \_CO_PUBLISHER_SUBMITTED,
+ Constants::PUBLISHER_STATUS_PUBLISHED => \_CO_PUBLISHER_PUBLISHED,
+ Constants::PUBLISHER_STATUS_OFFLINE => \_CO_PUBLISHER_OFFLINE,
+ Constants::PUBLISHER_STATUS_REJECTED => \_CO_PUBLISHER_REJECTED,
+];
+
+$projectName = 'StartTuts';
+$trelloManagement = new TrelloManagement();
+$statusResult = $trelloManagement->getAllStatus();
+
+foreach ($statusResult as $statusRow) {
+// $itemResult[] = $trelloManagement->getProjectTaskByStatus($statusRow['id'], $projectName);
+// $itemResult[] = $trelloManagement->getProjectTaskByStatus($statusRow['itemid'], $statusRow['itemid']);
+}
+
+//$xoopsTpl->assign('taskResult', $itemResult);
+$xoopsTpl->assign('statusResult', $statusResult);
+$xoopsTpl->assign('itemResult', $statusResult);
+$xoopsTpl->assign('statusArray', $statusArray);
+$xoopsTpl->assign('publisher_url', PUBLISHER_URL);
+
+
+require_once __DIR__ . '/admin_footer.php';
diff --git a/admin/trellostatus.php b/admin/trellostatus.php
new file mode 100644
index 00000000..147ec2a8
--- /dev/null
+++ b/admin/trellostatus.php
@@ -0,0 +1,10 @@
+editTaskStatus($statusId, $itemId);
diff --git a/archive.php b/archive.php
index 5c22c441..e5c5f775 100644
--- a/archive.php
+++ b/archive.php
@@ -14,7 +14,6 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
* @since 1.0
* @author Bandit-X
* @author trabis
@@ -163,18 +162,18 @@
$xoopsTpl->assign('lang_actions', _MD_PUBLISHER_ACTIONS);
$xoopsTpl->assign('lang_date', _MD_PUBLISHER_DATE);
$xoopsTpl->assign('lang_views', _MD_PUBLISHER_HITS);
- $xoopsTpl->assign('lang_category', _MD_PUBLISHER_CATEGORY);
+ $xoopsTpl->assign('lang_category', _MD_PUBLISHER_CATEGORY);
$xoopsTpl->assign('lang_author', _MD_PUBLISHER_AUTHOR);
-
+
// must adjust the selected time to server timestamp
- $timeoffset = $useroffset - $GLOBALS['xoopsConfig']['server_TZ'];
- $timeoffsethours = (int)$timeoffset;
- $timeoffsetminutes = intval(($timeoffset - $timeoffsethours) * 60);
+ $timeoffset = $useroffset - $GLOBALS['xoopsConfig']['server_TZ'];
+ $timeoffsethours = (int)$timeoffset;
+ $timeoffsetminutes = ($timeoffset - $timeoffsethours) * 60;
$monthstart = mktime(0 - $timeoffsethours, 0 - $timeoffsetminutes, 0, $frommonth, 1, $fromyear);
$monthend = mktime(23 - $timeoffsethours, 59 - $timeoffsetminutes, 59, $frommonth + 1, 0, $fromyear);
- $monthend = ($monthend > time()) ? time() : $monthend;
+ $monthend = ($monthend > time()) ? time() : $monthend;
$count = 0;
@@ -203,33 +202,33 @@
foreach ($storyarray as $item) {
$story = [];
- $htmltitle = '';
+ $htmltitle = '';
$story['title'] = "' . $item->getTitle() . '';
$story['cleantitle'] = strip_tags($item->getTitle());
- $story['itemurl'] = $item->getItemUrl();
- $story['category'] = "" . $item->getCategoryName() . '';
- $story['counter'] = $item->counter();
+ $story['itemurl'] = $item->getItemUrl();
+ $story['category'] = "" . $item->getCategoryName() . '';
+ $story['counter'] = $item->counter();
$story['date'] = $item->getDatesub();
$story['print_link'] = XOOPS_URL . '/modules/' . PUBLISHER_DIRNAME . '/print.php?itemid=' . $item->itemid();
$story['mail_link'] = 'mailto:?subject=' . sprintf(_CO_PUBLISHER_INTITEM, $GLOBALS['xoopsConfig']['sitename']) . '&body=' . sprintf(_CO_PUBLISHER_INTITEMFOUND, $GLOBALS['xoopsConfig']['sitename']) . ': ' . $item->getItemUrl();
$story['pdf_link'] = XOOPS_URL . '/modules/' . PUBLISHER_DIRNAME . '/makepdf.php?itemid=' . $item->itemid();
$story['author'] = $item->getWho();
- $story['summary'] = $item->getSummary();
- $story['cancomment'] = $item->cancomment();
-
- $mainImage = $item->getMainImage();
- if (empty($mainImage['image_path'])) {
- $mainImage['image_path'] = PUBLISHER_URL . '/assets/images/default_image.jpg';
- }
- //check to see if GD function exist
+ $story['summary'] = $item->getSummary();
+ $story['cancomment'] = $item->cancomment();
+
+ $mainImage = $item->getMainImage();
+ if (empty($mainImage['image_path'])) {
+ $mainImage['image_path'] = PUBLISHER_URL . '/assets/images/default_image.jpg';
+ }
+ //check to see if GD function exist
if (!empty($mainImage['image_path']) && !function_exists('imagecreatetruecolor')) {
- $story['item_image'] = $mainImage['path'];
+ $story['item_image'] = $mainImage['path'];
} else {
- $story['item_image'] = PUBLISHER_URL . '/thumb.php?src=' . $mainImage['image_path'] . '';
- $story['image_path'] = $mainImage['image_path'];
- }
-
- $comments = $item->comments();
+ $story['item_image'] = PUBLISHER_URL . '/thumb.php?src=' . $mainImage['image_path'] . '';
+ $story['image_path'] = $mainImage['image_path'];
+ }
+
+ $comments = $item->comments();
if ($comments > 0) {
//shows 1 comment instead of 1 comm. if comments ==1
//langugage file modified accordingly
@@ -239,11 +238,11 @@
$story['comment'] = ' ' . $comments . ' ' . _MD_PUBLISHER_COMMENTS . ' ';
}
} else {
- $story['comment'] = ' ' . _MD_PUBLISHER_NO_COMMENTS . ' ';
+ $story['comment'] = ' ' . _MD_PUBLISHER_NO_COMMENTS . ' ';
}
$xoopsTpl->append('stories', $story);
}
- //unset($item);
+ //unset($item);
}
$xoopsTpl->assign('lang_printer', _MD_PUBLISHER_PRINTERFRIENDLY);
$xoopsTpl->assign('lang_sendstory', _MD_PUBLISHER_SENDSTORY);
@@ -251,7 +250,7 @@
} else {
$xoopsTpl->assign('show_articles', false);
}
-
+
$xoopsTpl->assign('lang_newsarchives', _MD_PUBLISHER_ARCHIVES);
require_once $GLOBALS['xoops']->path('footer.php');
diff --git a/assets/css/publisher.css b/assets/css/publisher.css
index c3ab737b..08f39b85 100644
--- a/assets/css/publisher.css
+++ b/assets/css/publisher.css
@@ -269,7 +269,7 @@ ul.publisher_breadcrumb li {
}
ul.publisher_breadcrumb li+li:before {
padding: 8px;
- color: black;
+ color: #000000;
content: "/\00a0";
}
ul.publisher_breadcrumb li a {
diff --git a/assets/css/trello.css b/assets/css/trello.css
new file mode 100644
index 00000000..d01cace2
--- /dev/null
+++ b/assets/css/trello.css
@@ -0,0 +1,73 @@
+body {
+ font-family: arial;
+}
+.task-board {
+ background: #2c7cbc;
+ display: inline-block;
+ padding: 12px;
+ border-radius: 3px;
+ width: 98%;
+ white-space: nowrap;
+ overflow-x: scroll;
+ min-height: 300px;
+}
+
+.status-card {
+ width: 250px;
+ margin-right: 8px;
+ background: #e2e4e6;
+ border-radius: 3px;
+ display: inline-block;
+ vertical-align: top;
+ font-size: 0.9em;
+}
+
+.status-card:last-child {
+ margin-right: 0px;
+}
+
+.card-header {
+ width: 100%;
+ padding: 10px 10px 0px 10px;
+ box-sizing: border-box;
+ border-radius: 3px;
+ display: block;
+ font-weight: bold;
+}
+
+.card-header-text {
+ display: block;
+}
+
+ul.sortable {
+ padding-bottom: 10px;
+}
+
+ul.sortable li:last-child {
+ margin-bottom: 0px;
+}
+
+ul {
+ list-style: none;
+ margin: 0;
+ padding: 0px;
+}
+
+.text-row {
+ padding: 15px 10px;
+ margin: 10px;
+ background: #fff;
+ box-sizing: border-box;
+ border-radius: 3px;
+ border-bottom: 1px solid #ccc;
+ cursor: pointer;
+ font-size: 0.8em;
+ white-space: normal;
+ line-height: 20px;
+}
+
+.ui-sortable-placeholder {
+ visibility: inherit !important;
+ background: transparent;
+ border: #666 2px dashed;
+}
diff --git a/assets/js/trello.js b/assets/js/trello.js
new file mode 100644
index 00000000..85e22176
--- /dev/null
+++ b/assets/js/trello.js
@@ -0,0 +1,15 @@
+$( function() {
+ var url = 'trellostatus.php';
+ $('ul[itemid^="sort"]').sortable({
+ connectWith: ".sortable",
+ receive: function (e, ui) {
+ var status_id = $(ui.item).parent(".sortable").data("status-id");
+ var item_id = $(ui.item).data("item-id");
+ $.ajax({
+ url: url+'?status='+status_id+'&itemid='+item_id,
+ success: function(response){
+ }
+ });
+ }
+ }).disableSelection();
+} );
diff --git a/author_items.php b/author_items.php
index d4698f8f..44c92919 100644
--- a/author_items.php
+++ b/author_items.php
@@ -14,8 +14,6 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
- * @subpackage Action
* @since 1.0
* @author trabis
*/
@@ -59,8 +57,8 @@
$xoopsTpl->assign('permRating', $helper->getConfig('perm_rating'));
xoops_load('XoopsUserUtility');
-$author_name = \XoopsUserUtility::getUnameFromId($uid, $helper->getConfig('format_realname'), true);
-$xoopsTpl->assign('author_name_with_link', $author_name);
+$authorName = \XoopsUserUtility::getUnameFromId($uid, $helper->getConfig('format_realname'), true);
+$xoopsTpl->assign('author_name_with_link', $authorName);
$xoopsTpl->assign('user_avatarurl', XOOPS_URL . '/uploads/' . $thisuser->getVar('user_avatar'));
//$xoopsLocal = new \XoopsLocal();
$categories = [];
@@ -77,55 +75,53 @@
];
}
//mb start
- $mainImage = $item->getMainImage();
- if (empty($mainImage['image_path'])) {
+ $mainImage = $item->getMainImage();
+ if (empty($mainImage['image_path'])) {
$mainImage['image_path'] = PUBLISHER_URL . '/assets/images/default_image.jpg';
- }
+ }
// check to see if GD function exist
if (!empty($mainImage['image_path']) && !function_exists('imagecreatetruecolor')) {
$image = $mainImage['image_path'];
} else {
- $image = PUBLISHER_URL . '/thumb.php?src=' . $mainImage['image_path'] . '';
- }
+ $image = PUBLISHER_URL . '/thumb.php?src=' . $mainImage['image_path'] . '';
+ }
//mb end
- $comments = $item->comments();
- if ($comments > 0) {
- //shows 1 comment instead of 1 comm. if comments ==1
- //langugage file modified accordingly
- if (1 == $comments) {
- $comment = ' ' . _MB_PUBLISHER_ONECOMMENT . ' ';
- } else {
- $comment = ' ' . $comments . ' ' . _MB_PUBLISHER_COMMENTS . ' ';
- }
+ $comments = $item->comments();
+ if ($comments > 0) {
+ //shows 1 comment instead of 1 comm. if comments ==1
+ //langugage file modified accordingly
+ if (1 == $comments) {
+ $comment = ' ' . _MB_PUBLISHER_ONECOMMENT . ' ';
} else {
- $comment = ' ' . _MB_PUBLISHER_NO_COMMENTS . ' ';
+ $comment = ' ' . $comments . ' ' . _MB_PUBLISHER_COMMENTS . ' ';
}
-
-
-
+ } else {
+ $comment = ' ' . _MB_PUBLISHER_NO_COMMENTS . ' ';
+ }
+
$categories[$catId]['count_items']++;
$categories[$catId]['count_hits'] += $item->counter();
$categories[$catId]['items'][] = [
- 'title' => $item->getTitle(),
- 'cleantitle'=> strip_tags($item->getTitle()),
- 'itemurl' => $item->getItemUrl(),
- 'summary' => $item->getSummary(),
- 'comment' => $comment,
- 'cancomment'=> $item->cancomment(),
- 'hits' => $item->counter(),
- 'link' => $item->getItemLink(),
- 'published' => $item->getDatesub(),
- //'published' => $item->getDatesub(_SHORTDATESTRING),
+ 'title' => $item->getTitle(),
+ 'cleantitle' => strip_tags($item->getTitle()),
+ 'itemurl' => $item->getItemUrl(),
+ 'summary' => $item->getSummary(),
+ 'comment' => $comment,
+ 'cancomment' => $item->cancomment(),
+ 'hits' => $item->counter(),
+ 'link' => $item->getItemLink(),
+ 'published' => $item->getDatesub(),
+ //'published' => $item->getDatesub(_SHORTDATESTRING),
//'rating' => $xoopsLocal->number_format((float)$item->rating())
- 'rating' => $item->rating(),
- 'image' => $image,
+ 'rating' => $item->rating(),
+ 'image' => $image,
];
}
}
unset($item);
$xoopsTpl->assign('categories', $categories);
-$title = _MD_PUBLISHER_ITEMS_SAME_AUTHOR . ' - ' . $author_name;
+$title = _MD_PUBLISHER_ITEMS_SAME_AUTHOR . ' - ' . $authorName;
/**
* Generating meta information for this page
diff --git a/backend.php b/backend.php
index 24846f9e..e145f047 100644
--- a/backend.php
+++ b/backend.php
@@ -14,15 +14,12 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
- * @subpackage Action
* @since 1.0
* @author trabis
* @author The SmartFactory
*/
use Xmf\Request;
-use XoopsModules\Publisher;
require_once __DIR__ . '/header.php';
//xoops_load('XoopsLocal'); //mb
@@ -35,10 +32,10 @@
mb_http_output('pass');
}
-$categoryid = Request::getInt('categoryid', -1, 'GET');
+$categoryId = Request::getInt('categoryid', -1, 'GET');
-if (-1 != $categoryid) {
- $categoryObj = $helper->getHandler('Category')->get($categoryid);
+if (-1 != $categoryId) {
+ $categoryObj = $helper->getHandler('Category')->get($categoryId);
}
header('Content-Type:text/xml; charset=' . _CHARSET);
@@ -46,15 +43,15 @@
$tpl->caching = 2;
//$tpl->xoops_setCacheTime(0);
$tpl->cache_lifetime = 0;
-$myts = \MyTextSanitizer::getInstance();
+$myts = \MyTextSanitizer::getInstance();
if (!$tpl->is_cached('db:publisher_rss.tpl')) {
// xoops_load('XoopsLocal');
- $channel_category = $helper->getModule()->name();
+ $channelCategory = $helper->getModule()->name();
// Check if ML Hack is installed, and if yes, parse the $content in formatForML
if (method_exists($myts, 'formatForML')) {
$GLOBALS['xoopsConfig']['sitename'] = $myts->formatForML($GLOBALS['xoopsConfig']['sitename']);
$GLOBALS['xoopsConfig']['slogan'] = $myts->formatForML($GLOBALS['xoopsConfig']['slogan']);
- $channel_category = $myts->formatForML($channel_category);
+ $channelCategory = $myts->formatForML($channelCategory);
}
$tpl->assign('channel_charset', _CHARSET);
$tpl->assign('channel_title', htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES | ENT_HTML5));
@@ -65,11 +62,11 @@
$tpl->assign('channel_webmaster', $GLOBALS['xoopsConfig']['adminmail'] . '( ' . htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES | ENT_HTML5) . ' )');
$tpl->assign('channel_editor', $GLOBALS['xoopsConfig']['adminmail'] . '( ' . htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES | ENT_HTML5) . ' )');
- if (-1 != $categoryid) {
- $channel_category .= ' > ' . $categoryObj->name();
+ if (-1 != $categoryId) {
+ $channelCategory .= ' > ' . $categoryObj->name();
}
- $tpl->assign('channel_category', htmlspecialchars($channel_category, ENT_QUOTES | ENT_HTML5));
+ $tpl->assign('channelCategory', htmlspecialchars($channelCategory, ENT_QUOTES | ENT_HTML5));
$tpl->assign('channel_generator', $helper->getModule()->name());
$tpl->assign('channel_language', _LANGCODE);
$tpl->assign('image_url', XOOPS_URL . '/images/logo.png');
@@ -85,18 +82,18 @@
$height = round($height, 0, PHP_ROUND_HALF_UP);
$tpl->assign('image_width', $width);
$tpl->assign('image_height', $height);
- $sarray = $helper->getHandler('Item')->getAllPublished(10, 0, $categoryid);
+ $sarray = $helper->getHandler('Item')->getAllPublished(10, 0, $categoryId);
if (!empty($sarray) && is_array($sarray)) {
$count = $sarray;
foreach ($sarray as $item) {
$tpl->append(
'items',
[
- 'title' => htmlspecialchars($item->getTitle(), ENT_QUOTES | ENT_HTML5),
- 'link' => htmlspecialchars($item->getItemUrl(), ENT_QUOTES | ENT_HTML5),
- 'guid' => $item->getItemUrl(),
- //mb 'pubdate' => XoopsLocal::formatTimestamp($item->getVar('datesub'), 'rss'),
- 'pubdate' => formatTimestamp($item->getVar('datesub'), 'rss'),
+ 'title' => htmlspecialchars($item->getTitle(), ENT_QUOTES | ENT_HTML5),
+ 'link' => htmlspecialchars($item->getItemUrl(), ENT_QUOTES | ENT_HTML5),
+ 'guid' => $item->getItemUrl(),
+ //mb 'pubdate' => XoopsLocal::formatTimestamp($item->getVar('datesub'), 'rss'),
+ 'pubdate' => formatTimestamp($item->getVar('datesub'), 'rss'),
'description' => htmlspecialchars($item->getBlockSummary(300, true), ENT_QUOTES | ENT_HTML5),
]
);
diff --git a/blocks/category_items_sel.php b/blocks/category_items_sel.php
index 98e42e05..149eb164 100644
--- a/blocks/category_items_sel.php
+++ b/blocks/category_items_sel.php
@@ -14,16 +14,13 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
- * @subpackage Blocks
* @since 1.0
* @author trabis
*/
use XoopsModules\Publisher;
use XoopsModules\Publisher\Constants;
-
-
+use XoopsModules\Publisher\Utility;
require_once dirname(__DIR__) . '/include/common.php';
@@ -34,7 +31,6 @@
*/
function publisher_category_items_sel_show($options)
{
- /** @var Publisher\Helper $helper */
$helper = Publisher\Helper::getInstance();
$block = $item = [];
@@ -49,14 +45,14 @@ function publisher_category_items_sel_show($options)
$selectedcatids = explode(',', $options[0]);
$sort = $options[1];
- $order = Publisher\Utility::getOrderBy($sort);
+ $order = Utility::getOrderBy($sort);
$limit = $options[2];
$start = 0;
// creating the ITEM objects that belong to the selected category
$block['categories'] = [];
foreach ($categories as $catId => $catObj) {
- if (!in_array(0, $selectedcatids) && !in_array($catId, $selectedcatids)) {
+ if (!in_array(0, $selectedcatids, true) && !in_array($catId, $selectedcatids, true)) {
continue;
}
@@ -95,10 +91,6 @@ function publisher_category_items_sel_show($options)
unset($items, $categories, $itemObj, $catId, $catObj);
- if (0 === count($block['categories'])) {
- return $block;
- }
-
return $block;
}
@@ -114,7 +106,7 @@ function publisher_category_items_sel_edit($options)
$form = new Publisher\BlockForm();
- $catEle = new \XoopsFormLabel(_MB_PUBLISHER_SELECTCAT, Publisher\Utility::createCategorySelect($options[0]), 'options[0]');
+ $catEle = new \XoopsFormLabel(_MB_PUBLISHER_SELECTCAT, Utility::createCategorySelect($options[0]), 'options[0]');
$orderEle = new \XoopsFormSelect(_MB_PUBLISHER_ORDER, 'options[1]', $options[1]);
$orderEle->addOptionArray(
[
diff --git a/blocks/date_to_date.php b/blocks/date_to_date.php
index 2abf5e6d..904a6391 100644
--- a/blocks/date_to_date.php
+++ b/blocks/date_to_date.php
@@ -14,8 +14,6 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
- * @subpackage Blocks
* @since 1.0
* @author trabis
* @author The SmartFactory
@@ -23,8 +21,6 @@
use XoopsModules\Publisher;
-
-
require_once dirname(__DIR__) . '/include/common.php';
/**
@@ -35,7 +31,6 @@
function publisher_date_to_date_show($options)
{
$myts = \MyTextSanitizer::getInstance();
- /** @var Publisher\Helper $helper */
$helper = Publisher\Helper::getInstance();
$block = $newItems = [];
diff --git a/blocks/items_columns.php b/blocks/items_columns.php
index f1fbde02..b4bf72e3 100644
--- a/blocks/items_columns.php
+++ b/blocks/items_columns.php
@@ -14,30 +14,26 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
- * @subpackage Blocks
* @since 1.0
* @author trabis
* @author Bandit-x
*/
use XoopsModules\Publisher;
-
-
+use XoopsModules\Publisher\Utility;
require_once dirname(__DIR__) . '/include/common.php';
/***
* Function To Show Publisher Items From Categories In Their Own Columns
*
- * @param array $options Block Options
+ * @param array $options Block Options
*
* @return bool|array
*/
function publisher_items_columns_show($options)
{
// global $xoTheme;
- /** @var Publisher\Helper $helper */
$helper = Publisher\Helper::getInstance();
/** @var Publisher\CategoryHandler $categoryHandler */
$categoryHandler = $helper->getHandler('Category');
@@ -60,9 +56,9 @@ function publisher_items_columns_show($options)
$categoriesObj = $categoryHandler->getCategories(0, 0, -1);
//if not selected 'all', let's get the selected ones
- if (!in_array(0, $selCategories)) {
+ if (!in_array(0, $selCategories, true)) {
foreach ($categoriesObj as $key => $value) {
- if (in_array($key, $selCategories)) {
+ if (in_array($key, $selCategories, true)) {
$selCategoriesObj[$key] = $value;
}
}
@@ -98,10 +94,10 @@ function publisher_items_columns_show($options)
$mainItem['itemurl'] = $thisItem->getItemUrl();
$mainItem['date'] = $thisItem->getDatesub();
- $mainImage = $thisItem->getMainImage();
+ $mainImage = $thisItem->getMainImage();
if (empty($mainImage['image_path'])) {
- $mainImage['image_path'] = PUBLISHER_URL . '/assets/images/default_image.jpg';
- }
+ $mainImage['image_path'] = PUBLISHER_URL . '/assets/images/default_image.jpg';
+ }
// check to see if GD function exist
$mainItem['item_image'] = $mainImage['image_path'];
if (!empty($mainImage['image_path']) && function_exists('imagecreatetruecolor')) {
@@ -118,15 +114,15 @@ function publisher_items_columns_show($options)
//The Rest
if ($scount > 1) {
- // while ((list($itemid, $thisItem) = each($categoryItemsObj)) !== false) {
- foreach ($categoryItemsObj as $itemid => $thisItem) {
+ // while ((list($itemId, $thisItem) = each($categoryItemsObj)) !== false) {
+ foreach ($categoryItemsObj as $itemId => $thisItem) {
//TODO do I need to start with 2nd element?
$subItem['title'] = $thisItem->getTitle();
$subItem['cleantitle'] = strip_tags($thisItem->getTitle());
$subItem['link'] = $thisItem->getItemLink();
$subItem['itemurl'] = $thisItem->getItemUrl();
$subItem['summary'] = $thisItem->getBlockSummary($optCatTruncate);
- $subItem['date'] = $thisItem->getDatesub();
+ $subItem['date'] = $thisItem->getDatesub();
$mainItem['subitem'][] = $subItem;
unset($subItem);
}
@@ -142,11 +138,11 @@ function publisher_items_columns_show($options)
}
unset($categoryId, $mainItemCatObj);
- $block['template'] = $options[4];
- $block['columns'] = $columns;
- $block['columnwidth'] = (int)(100 / $optNumColumns);
- $block['display_datemainitem'] = $options[5];
- $block['display_datesubitem'] = $options[6];
+ $block['template'] = $options[4];
+ $block['columns'] = $columns;
+ $block['columnwidth'] = (int)(100 / $optNumColumns);
+ $block['display_datemainitem'] = $options[5] ?? '';
+ $block['display_datesubitem'] = $options[6] ?? '';
$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . '/modules/' . PUBLISHER_DIRNAME . '/assets/css/publisher.css');
@@ -156,7 +152,7 @@ function publisher_items_columns_show($options)
/***
* Edit Function For Multi-Column Category Items Display Block
*
- * @param array $options Block Options
+ * @param array $options Block Options
*
* @return string
*/
@@ -169,34 +165,36 @@ function publisher_items_columns_edit($options)
$colEle = new \XoopsFormSelect(_MB_PUBLISHER_NUMBER_COLUMN_VIEW, 'options[0]', $options[0]);
$colEle->addOptionArray(
[
- '1' => 1,
- '2' => 2,
- '3' => 3,
- '4' => 4,
- '5' => 5,
+ '1' => 1,
+ '2' => 2,
+ '3' => 3,
+ '4' => 4,
+ '5' => 5,
]
);
- $catEle = new \XoopsFormLabel(_MB_PUBLISHER_SELECTCAT, Publisher\Utility::createCategorySelect($options[1], 0, true, 'options[1]'));
+ $catEle = new \XoopsFormLabel(_MB_PUBLISHER_SELECTCAT, Utility::createCategorySelect($options[1], 0, true, 'options[1]'));
- $cItemsEle = new \XoopsFormText(_MB_PUBLISHER_NUMBER_ITEMS_CAT, 'options[2]', 4, 255, $options[2]);
+ $cItemsEle = new \XoopsFormText(_MB_PUBLISHER_NUMBER_ITEMS_CAT, 'options[2]', 4, 255, $options[2]);
$truncateEle = new \XoopsFormText(_MB_PUBLISHER_TRUNCATE, 'options[3]', 4, 255, $options[3]);
$tempEle = new \XoopsFormSelect(_MB_PUBLISHER_TEMPLATE, 'options[4]', $options[4]);
$tempEle->addOptionArray(
[
- 'normal' => _MB_PUBLISHER_TEMPLATE_NORMAL,
- 'extended' => _MB_PUBLISHER_TEMPLATE_EXTENDED,
- ]);
+ 'normal' => _MB_PUBLISHER_TEMPLATE_NORMAL,
+ 'extended' => _MB_PUBLISHER_TEMPLATE_EXTENDED,
+ ]
+ );
$dateMain = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_DATE_MAINITEM, 'options[5]', $options[5]);
- $dateSub = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_DATE_SUBITEM, 'options[6]', $options[6]);
+ $dateSub = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_DATE_SUBITEM, 'options[6]', $options[6]);
$form->addElement($colEle);
$form->addElement($catEle);
$form->addElement($cItemsEle);
$form->addElement($truncateEle);
$form->addElement($tempEle);
- $form->addElement($dateMain);
- $form->addElement($dateSub);
+ $form->addElement($dateMain);
+ $form->addElement($dateSub);
+
return $form->render();
}
diff --git a/blocks/items_menu.php b/blocks/items_menu.php
index b5a92ef8..acbcc93e 100644
--- a/blocks/items_menu.php
+++ b/blocks/items_menu.php
@@ -14,8 +14,6 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
- * @subpackage Blocks
* @since 1.0
* @author trabis
* @author The SmartFactory
@@ -23,8 +21,7 @@
use Xmf\Request;
use XoopsModules\Publisher;
-
-
+use XoopsModules\Publisher\Utility;
require_once dirname(__DIR__) . '/include/common.php';
@@ -37,7 +34,6 @@ function publisher_items_menu_show($options)
{
$block = [];
- /** @var Publisher\Helper $helper */
$helper = Publisher\Helper::getInstance();
// Getting all top cats
@@ -54,13 +50,13 @@ function publisher_items_menu_show($options)
$catLinkClass = 'menuMain';
- $categoryid = 0;
+ $categoryId = 0;
if ($block['inModule']) {
// Are we in a category and if yes, in which one ?
- $categoryid = Request::getInt('categoryid', 0, 'GET');
+ $categoryId = Request::getInt('categoryid', 0, 'GET');
- if (0 != $categoryid) {
+ if (0 != $categoryId) {
// if we are in a category, then the $categoryObj is already defined in publisher/category.php
global $categoryObj;
$block['currentcat'] = $categoryObj->getCategoryLink('menuTop');
@@ -69,7 +65,7 @@ function publisher_items_menu_show($options)
}
foreach ($blockCategoriesObj as $catId => $blockCategoryObj) {
- if ($catId != $categoryid) {
+ if ($catId != $categoryId) {
$block['categories'][$catId]['categoryLink'] = $blockCategoryObj->getCategoryLink($catLinkClass);
}
}
@@ -89,7 +85,7 @@ function publisher_items_menu_edit($options)
$form = new Publisher\BlockForm();
- $catEle = new \XoopsFormLabel(_MB_PUBLISHER_SELECTCAT, Publisher\Utility::createCategorySelect($options[0], 0, true, 'options[0]'));
+ $catEle = new \XoopsFormLabel(_MB_PUBLISHER_SELECTCAT, Utility::createCategorySelect($options[0], 0, true, 'options[0]'));
$orderEle = new \XoopsFormSelect(_MB_PUBLISHER_ORDER, 'options[1]', $options[1]);
$orderEle->addOptionArray(
[
diff --git a/blocks/items_new.php b/blocks/items_new.php
index 537a2a68..42b0377b 100644
--- a/blocks/items_new.php
+++ b/blocks/items_new.php
@@ -14,8 +14,6 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
- * @subpackage Blocks
* @since 1.0
* @author trabis
* @author The SmartFactory
@@ -24,8 +22,6 @@
use XoopsModules\Publisher;
use XoopsModules\Publisher\Constants;
-
-
require_once dirname(__DIR__) . '/include/common.php';
/**
@@ -35,7 +31,6 @@
*/
function publisher_items_new_show($options)
{
- /** @var Publisher\Helper $helper */
$helper = Publisher\Helper::getInstance();
/** @var Publisher\ItemHandler $itemHandler */
$itemHandler = $helper->getHandler('Item');
@@ -44,7 +39,7 @@ function publisher_items_new_show($options)
$block = [];
$allcats = false;
- if (in_array(0, $selectedcatids)) {
+ if (in_array(0, $selectedcatids, true)) {
$allcats = true;
}
@@ -62,42 +57,42 @@ function publisher_items_new_show($options)
$criteria->add(new \Criteria('categoryid', '(' . $options[0] . ')', 'IN'));
}
- $publisherIsAdmin = $helper->isUserAdmin();
- if (!$publisherIsAdmin) {
- if (null === $criteria) {
- $criteria = new \CriteriaCompo();
- }
- $criteriaDateSub = new \Criteria('datesub', time(), '<=');
- $criteria->add($criteriaDateSub);
+ $publisherIsAdmin = $helper->isUserAdmin();
+ if (!$publisherIsAdmin) {
+ if (null === $criteria) {
+ $criteria = new \CriteriaCompo();
}
+ $criteriaDateSub = new \Criteria('datesub', time(), '<=');
+ $criteria->add($criteriaDateSub);
+ }
-// $optCatItems = (int)$options[2];
-// $categoryId = -1;
-// $categoryItemsObj = $itemHandler->getAllPublished($optCatItems, 0, $categoryId);
+ // $optCatItems = (int)$options[2];
+ // $categoryId = -1;
+ // $categoryItemsObj = $itemHandler->getAllPublished($optCatItems, 0, $categoryId);
$itemsObj = $itemHandler->getItems($limit, $start, [Constants::PUBLISHER_STATUS_PUBLISHED], -1, $sort, $order, '', true, $criteria, 'none');
$totalitems = count($itemsObj);
if ($totalitems > 0) {
foreach ($itemsObj as $iValue) {
- $item = [];
- $item['itemurl']= $iValue->getItemUrl();
- $item['link'] = $iValue->getItemLink(false, $options[4] ?? 65);
- $item['id'] = $iValue->itemid();
- $item['poster'] = $iValue->posterName(); // for make poster name linked, use getLinkedPosterName() instead of posterName()
+ $item = [];
+ $item['itemurl'] = $iValue->getItemUrl();
+ $item['link'] = $iValue->getItemLink(false, $options[4] ?? 65);
+ $item['id'] = $iValue->itemid();
+ $item['poster'] = $iValue->posterName(); // for make poster name linked, use getLinkedPosterName() instead of posterName()
$item['categorylink'] = $iValue->getCategoryLink();
- $item['date'] = $iValue->getDatesub();
- $item['hits'] = $iValue->counter();
- $item['summary'] = $iValue->getBlockSummary(300, true); //show complete summary but truncate to 300 if only body available
- $item['rating'] = $iValue->rating();
- $item['votes'] = $iValue->votes();
- $item['lang_fullitem'] = _MB_PUBLISHER_FULLITEM;
- $item['lang_poster'] = _MB_PUBLISHER_POSTEDBY;
- $item['lang_date'] = _MB_PUBLISHER_ON;
- $item['lang_category'] = _MB_PUBLISHER_CATEGORY;
- $item['lang_hits'] = _MB_PUBLISHER_TOTALHITS;
- $item['cancomment'] = $iValue->cancomment();
- $comments = $iValue->comments();
+ $item['date'] = $iValue->getDatesub();
+ $item['hits'] = $iValue->counter();
+ $item['summary'] = $iValue->getBlockSummary(300, true); //show complete summary but truncate to 300 if only body available
+ $item['rating'] = $iValue->rating();
+ $item['votes'] = $iValue->votes();
+ $item['lang_fullitem'] = _MB_PUBLISHER_FULLITEM;
+ $item['lang_poster'] = _MB_PUBLISHER_POSTEDBY;
+ $item['lang_date'] = _MB_PUBLISHER_ON;
+ $item['lang_category'] = _MB_PUBLISHER_CATEGORY;
+ $item['lang_hits'] = _MB_PUBLISHER_TOTALHITS;
+ $item['cancomment'] = $iValue->cancomment();
+ $comments = $iValue->comments();
if ($comments > 0) {
//shows 1 comment instead of 1 comm. if comments ==1
//langugage file modified accordingly
@@ -109,25 +104,22 @@ function publisher_items_new_show($options)
} else {
$item['comment'] = ' ' . _MB_PUBLISHER_NO_COMMENTS . ' ';
}
-
-
-
if ('article' === $image) {
- $item['image'] = PUBLISHER_URL . '/assets/images/default_image.jpg';
+ $item['image'] = PUBLISHER_URL . '/assets/images/default_image.jpg';
$item['image_name'] = '';
$images = $iValue->getImages();
-
- if (empty($images['image_path'])) {
- $images['image_path'] = PUBLISHER_URL . '/assets/images/default_image.jpg';
- }
+
+ if (empty($images['image_path'])) {
+ $images['image_path'] = PUBLISHER_URL . '/assets/images/default_image.jpg';
+ }
if (is_object($images['main'])) {
// check to see if GD function exist
if (!function_exists('imagecreatetruecolor')) {
$item['image'] = XOOPS_URL . '/uploads/' . $images['main']->getVar('image_name');
} else {
- $item['image'] = PUBLISHER_URL . '/thumb.php?src=' . XOOPS_URL . '/uploads/' . $images['main']->getVar('image_name') . '';
- $item['image_path'] = XOOPS_URL . '/uploads/' . $images['main']->getVar('image_name') . '';
+ $item['image'] = PUBLISHER_URL . '/thumb.php?src=' . XOOPS_URL . '/uploads/' . $images['main']->getVar('image_name') . '';
+ $item['image_path'] = XOOPS_URL . '/uploads/' . $images['main']->getVar('image_name') . '';
}
$item['image_name'] = $images['main']->getVar('image_nicename');
}
@@ -146,14 +138,13 @@ function publisher_items_new_show($options)
$item['image'] = PUBLISHER_URL . '/thumb.php?src=' . XOOPS_URL . '/uploads/' . $images['main']->getVar('image_name') . '&w=50';
}
}
- } else {
// check to see if GD function exist
- if (!function_exists('imagecreatetruecolor')) {
- $item['image'] = XOOPS_URL . '/uploads/' . $iValue->posterAvatar();
- } else {
- $item['image'] = PUBLISHER_URL . '/thumb.php?src=' . XOOPS_URL . '/uploads/' . $iValue->posterAvatar() . '&w=50';
- }
+ } elseif (!function_exists('imagecreatetruecolor')) {
+ $item['image'] = XOOPS_URL . '/uploads/' . $iValue->posterAvatar();
+ } else {
+ $item['image'] = PUBLISHER_URL . '/thumb.php?src=' . XOOPS_URL . '/uploads/' . $iValue->posterAvatar() . '&w=50';
}
+
$item['image_name'] = $iValue->posterName();
}
@@ -177,14 +168,15 @@ function publisher_items_new_show($options)
}
}
- $block['show_order'] = $options[2];
- $block['show_summary'] = $options[6];
- $block['show_poster'] =$options[7];
- $block['show_date'] =$options[8];
- $block['show_category'] =$options[9];
- $block['show_hits'] =$options[10];
- $block['show_comment'] =$options[11];
- $block['show_rating'] =$options[12];
+ $block['show_order'] = $options[2];
+ $block['show_summary'] = $options[6];
+ $block['show_poster'] = $options[7];
+ $block['show_date'] = $options[8];
+ $block['show_category'] = $options[9];
+ $block['show_hits'] = $options[10];
+ $block['show_comment'] = $options[11];
+ $block['show_rating'] = $options[12];
+
return $block;
}
@@ -204,12 +196,12 @@ function publisher_items_new_edit($options)
$orderEle = new \XoopsFormSelect(_MB_PUBLISHER_ORDER, 'options[1]', $options[1]);
$orderEle->addOptionArray(
[
- 'datesub' => _MB_PUBLISHER_DATE,
- 'counter' => _MB_PUBLISHER_HITS,
- 'weight' => _MB_PUBLISHER_WEIGHT,
- 'rating' => _MI_PUBLISHER_ORDERBY_RATING,
- 'votes' => _MI_PUBLISHER_ORDERBY_VOTES,
- 'comments' => _MI_PUBLISHER_ORDERBY_COMMENTS,
+ 'datesub' => _MB_PUBLISHER_DATE,
+ 'counter' => _MB_PUBLISHER_HITS,
+ 'weight' => _MB_PUBLISHER_WEIGHT,
+ 'rating' => _MI_PUBLISHER_ORDERBY_RATING,
+ 'votes' => _MI_PUBLISHER_ORDERBY_VOTES,
+ 'comments' => _MI_PUBLISHER_ORDERBY_COMMENTS,
]
);
@@ -220,19 +212,19 @@ function publisher_items_new_edit($options)
$imageEle = new \XoopsFormSelect(_MB_PUBLISHER_IMAGE_TO_DISPLAY, 'options[5]', $options[5]);
$imageEle->addOptionArray(
[
- 'none' => _NONE,
- 'article' => _MB_PUBLISHER_IMAGE_ARTICLE,
- 'category' => _MB_PUBLISHER_IMAGE_CATEGORY,
- 'avatar' => _MB_PUBLISHER_IMAGE_AVATAR,
+ 'none' => _NONE,
+ 'article' => _MB_PUBLISHER_IMAGE_ARTICLE,
+ 'category' => _MB_PUBLISHER_IMAGE_CATEGORY,
+ 'avatar' => _MB_PUBLISHER_IMAGE_AVATAR,
]
);
$showSummary = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_SUMMARY, 'options[6]', $options[6]);
- $showPoster = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_POSTEDBY, 'options[7]', $options[7]);
- $showDate = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_POSTTIME, 'options[8]', $options[8]);
- $showCategory = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_TOPICLINK, 'options[9]', $options[9]);
- $showHits = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_READ, 'options[10]', $options[10]);
+ $showPoster = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_POSTEDBY, 'options[7]', $options[7]);
+ $showDate = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_POSTTIME, 'options[8]', $options[8]);
+ $showCategory = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_TOPICLINK, 'options[9]', $options[9]);
+ $showHits = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_READ, 'options[10]', $options[10]);
$showComment = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_COMMENT, 'options[11]', $options[11]);
- $showRating = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_RATING, 'options[12]', $options[12]);
+ $showRating = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_RATING, 'options[12]', $options[12]);
$form->addElement($catEle);
$form->addElement($orderEle);
@@ -240,12 +232,12 @@ function publisher_items_new_edit($options)
$form->addElement($dispEle);
$form->addElement($charsEle);
$form->addElement($imageEle);
- $form->addElement($showSummary);
+ $form->addElement($showSummary);
$form->addElement($showPoster);
$form->addElement($showDate);
- $form->addElement($showCategory);
- $form->addElement($showHits);
- $form->addElement($showComment);
+ $form->addElement($showCategory);
+ $form->addElement($showHits);
+ $form->addElement($showComment);
$form->addElement($showRating);
return $form->render();
diff --git a/blocks/items_random_item.php b/blocks/items_random_item.php
index 59874a0b..6cabaa64 100644
--- a/blocks/items_random_item.php
+++ b/blocks/items_random_item.php
@@ -14,8 +14,6 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
- * @subpackage Blocks
* @since 1.0
* @author trabis
* @author The SmartFactory
@@ -24,8 +22,6 @@
use XoopsModules\Publisher;
use XoopsModules\Publisher\Constants;
-
-
require_once dirname(__DIR__) . '/include/common.php';
/**
@@ -38,8 +34,7 @@
function publisher_items_random_item_show($options)
{
$block = [];
-
- /** @var Publisher\Helper $helper */
+
$helper = Publisher\Helper::getInstance();
/** @var Publisher\ItemHandler $itemHandler */
$itemHandler = $helper->getHandler('Item');
@@ -54,54 +49,54 @@ function publisher_items_random_item_show($options)
$block['id'] = $itemsObj->itemid();
$block['url'] = $itemsObj->getItemUrl();
$block['lang_fullitem'] = _MB_PUBLISHER_FULLITEM;
- $block['lang_poster'] = _MB_PUBLISHER_POSTEDBY;
- $block['lang_date'] = _MB_PUBLISHER_ON;
- $block['lang_category'] = _MB_PUBLISHER_CATEGORY;
- $block['lang_reads'] = _MB_PUBLISHER_HITS;
- $block['titlelink'] = $itemsObj->getItemLink('titlelink');
- $block['alt'] = strip_tags($itemsObj->getItemLink());
+ $block['lang_poster'] = _MB_PUBLISHER_POSTEDBY;
+ $block['lang_date'] = _MB_PUBLISHER_ON;
+ $block['lang_category'] = _MB_PUBLISHER_CATEGORY;
+ $block['lang_reads'] = _MB_PUBLISHER_HITS;
+ $block['titlelink'] = $itemsObj->getItemLink('titlelink');
+ $block['alt'] = strip_tags($itemsObj->getItemLink());
$block['date'] = $itemsObj->getDatesub();
$block['poster'] = $itemsObj->getLinkedPosterName();
$block['categorylink'] = $itemsObj->getCategoryLink();
- $block['hits'] = ' ' . $itemsObj->counter() . ' ' . _READS . '';
-
- $mainImage = $itemsObj->getMainImage(); // check to see if GD function exist
- if (empty($mainImage['image_path'])) {
- $mainImage['image_path'] = PUBLISHER_URL . '/assets/images/default_image.jpg';
- }
- if (!function_exists('imagecreatetruecolor')) {
- $block['item_image'] = $mainImage['image_path'];
- } else {
- $block['item_image'] = PUBLISHER_URL . '/thumb.php?src=' . $mainImage['image_path'] . '';
- $block['image_path'] = $mainImage['image_path'];
- }
-
- $block['cancomment'] = $itemsObj->cancomment();
- $comments = $itemsObj->comments();
- if ($comments > 0) {
- //shows 1 comment instead of 1 comm. if comments ==1
- //langugage file modified accordingly
- if (1 == $comments) {
- $block['comment'] = ' ' . _MB_PUBLISHER_ONECOMMENT . ' ';
- } else {
- $block['comment'] = ' ' . $comments . ' ' . _MB_PUBLISHER_COMMENTS . ' ';
- }
- } else {
- $block['comment'] = ' ' . _MB_PUBLISHER_NO_COMMENTS . ' ';
- }
- $block['display_summary'] =$options[0];
- $block['display_item_image'] =$options[1];
- $block['display_poster'] =$options[2];
- $block['display_date'] =$options[3];
- $block['display_categorylink'] =$options[4];
- $block['display_hits'] =$options[5];
- $block['display_comment'] =$options[6];
- $block['display_lang_fullitem'] =$options[7];
-
- $block['items'][] = $block;
- return $block;
-
- }
+ $block['hits'] = ' ' . $itemsObj->counter() . ' ' . _READS . '';
+
+ $mainImage = $itemsObj->getMainImage(); // check to see if GD function exist
+ if (empty($mainImage['image_path'])) {
+ $mainImage['image_path'] = PUBLISHER_URL . '/assets/images/default_image.jpg';
+ }
+ if (!function_exists('imagecreatetruecolor')) {
+ $block['item_image'] = $mainImage['image_path'];
+ } else {
+ $block['item_image'] = PUBLISHER_URL . '/thumb.php?src=' . $mainImage['image_path'] . '';
+ $block['image_path'] = $mainImage['image_path'];
+ }
+
+ $block['cancomment'] = $itemsObj->cancomment();
+ $comments = $itemsObj->comments();
+ if ($comments > 0) {
+ //shows 1 comment instead of 1 comm. if comments ==1
+ //langugage file modified accordingly
+ if (1 == $comments) {
+ $block['comment'] = ' ' . _MB_PUBLISHER_ONECOMMENT . ' ';
+ } else {
+ $block['comment'] = ' ' . $comments . ' ' . _MB_PUBLISHER_COMMENTS . ' ';
+ }
+ } else {
+ $block['comment'] = ' ' . _MB_PUBLISHER_NO_COMMENTS . ' ';
+ }
+ $block['display_summary'] = $options[0];
+ $block['display_item_image'] = $options[1];
+ $block['display_poster'] = $options[2];
+ $block['display_date'] = $options[3];
+ $block['display_categorylink'] = $options[4];
+ $block['display_hits'] = $options[5];
+ $block['display_comment'] = $options[6];
+ $block['display_lang_fullitem'] = $options[7];
+
+ $block['items'][] = $block;
+
+ return $block;
+}
/**
* @param $options
@@ -112,24 +107,24 @@ function publisher_items_random_item_edit($options)
// require_once PUBLISHER_ROOT_PATH . '/class/blockform.php';
xoops_load('XoopsFormLoader');
- $form = new Publisher\BlockForm();
- $showSummary = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_SUMMARY, 'options[0]', $options[0]);
- $showImage = new \XoopsFormRadioYN(_MB_PUBLISHER_IMGDISPLAY, 'options[1]', $options[1]);
- $showPoster = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_POSTEDBY, 'options[2]', $options[2]);
- $showDate = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_POSTTIME, 'options[3]', $options[3]);
- $showCategory = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_TOPICLINK, 'options[4]', $options[4]);
- $showHits = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_READ, 'options[5]', $options[5]);
+ $form = new Publisher\BlockForm();
+ $showSummary = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_SUMMARY, 'options[0]', $options[0]);
+ $showImage = new \XoopsFormRadioYN(_MB_PUBLISHER_IMGDISPLAY, 'options[1]', $options[1]);
+ $showPoster = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_POSTEDBY, 'options[2]', $options[2]);
+ $showDate = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_POSTTIME, 'options[3]', $options[3]);
+ $showCategory = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_TOPICLINK, 'options[4]', $options[4]);
+ $showHits = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_READ, 'options[5]', $options[5]);
$showComment = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_COMMENT, 'options[6]', $options[6]);
- $dispMoreEle = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_READ_FULLITEM, 'options[7]', $options[7]);
-
- $form->addElement($showSummary);
+ $dispMoreEle = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_READ_FULLITEM, 'options[7]', $options[7]);
+
+ $form->addElement($showSummary);
$form->addElement($showImage);
$form->addElement($showPoster);
$form->addElement($showDate);
- $form->addElement($showCategory);
- $form->addElement($showHits);
- $form->addElement($showComment);
- $form->addElement($dispMoreEle);
-
+ $form->addElement($showCategory);
+ $form->addElement($showHits);
+ $form->addElement($showComment);
+ $form->addElement($dispMoreEle);
+
return $form->render();
}
diff --git a/blocks/items_recent.php b/blocks/items_recent.php
index 86420624..f58a39ea 100644
--- a/blocks/items_recent.php
+++ b/blocks/items_recent.php
@@ -14,8 +14,6 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
- * @subpackage Blocks
* @since 1.0
* @author trabis
* @author The SmartFactory
@@ -24,8 +22,6 @@
use XoopsModules\Publisher;
use XoopsModules\Publisher\Constants;
-
-
require_once dirname(__DIR__) . '/include/common.php';
/**
@@ -35,7 +31,6 @@
*/
function publisher_items_recent_show($options)
{
- /** @var Publisher\Helper $helper */
$helper = Publisher\Helper::getInstance();
/** @var Publisher\ItemHandler $itemHandler */
$itemHandler = $helper->getHandler('Item');
@@ -79,9 +74,9 @@ function publisher_items_recent_show($options)
if ($itemsObj && $totalItems > 0) {
foreach ($itemsObj as $iValue) {
$newItems['itemid'] = $iValue->itemid();
- $newItems['itemurl'] = $iValue->getItemUrl();
+ $newItems['itemurl'] = $iValue->getItemUrl();
$newItems['title'] = $iValue->getTitle();
- $newItems['alt'] = strip_tags($iValue->getItemLink());
+ $newItems['alt'] = strip_tags($iValue->getItemLink());
$newItems['categoryname'] = $iValue->getCategoryName();
$newItems['categoryid'] = $iValue->categoryid();
$newItems['date'] = $iValue->getDatesub();
@@ -89,20 +84,20 @@ function publisher_items_recent_show($options)
$newItems['itemlink'] = $iValue->getItemLink(false, $options[3] ?? 65);
$newItems['categorylink'] = $iValue->getCategoryLink();
$newItems['hits'] = ' ' . $iValue->counter() . ' ' . _READS . '';
- $newItems['summary'] = $iValue->getBlockSummary(300, true); //show complete summary but truncate to 300 if only body available
-
- $mainImage = $iValue->getMainImage(); // check to see if GD function exist
- if (empty($mainImage['image_path'])) {
- $mainImage['image_path'] = PUBLISHER_URL . '/assets/images/default_image.jpg';
- }
- if (!function_exists('imagecreatetruecolor')) {
- $newItems['item_image'] = $mainImage['image_path'];
- } else {
- $newItems['item_image'] = PUBLISHER_URL . '/thumb.php?src=' . $mainImage['image_path'] . '';
- $newItems['image_path'] = $mainImage['image_path'];
- }
- $newItems['cancomment'] = $iValue->cancomment();
- $comments = $iValue->comments();
+ $newItems['summary'] = $iValue->getBlockSummary(300, true); //show complete summary but truncate to 300 if only body available
+
+ $mainImage = $iValue->getMainImage(); // check to see if GD function exist
+ if (empty($mainImage['image_path'])) {
+ $mainImage['image_path'] = PUBLISHER_URL . '/assets/images/default_image.jpg';
+ }
+ if (!function_exists('imagecreatetruecolor')) {
+ $newItems['item_image'] = $mainImage['image_path'];
+ } else {
+ $newItems['item_image'] = PUBLISHER_URL . '/thumb.php?src=' . $mainImage['image_path'] . '';
+ $newItems['image_path'] = $mainImage['image_path'];
+ }
+ $newItems['cancomment'] = $iValue->cancomment();
+ $comments = $iValue->comments();
if ($comments > 0) {
//shows 1 comment instead of 1 comm. if comments ==1
//langugage file modified accordingly
@@ -112,31 +107,28 @@ function publisher_items_recent_show($options)
$newItems['comment'] = ' ' . $comments . ' ' . _MB_PUBLISHER_COMMENTS . ' ';
}
} else {
- $newItems['comment'] = ' ' . _MB_PUBLISHER_NO_COMMENTS . ' ';
+ $newItems['comment'] = ' ' . _MB_PUBLISHER_NO_COMMENTS . ' ';
}
-
-
-
+
$block['items'][] = $newItems;
}
- $block['publisher_url'] = PUBLISHER_URL;
+ $block['publisher_url'] = PUBLISHER_URL;
$block['lang_title'] = _MB_PUBLISHER_ITEMS;
$block['lang_category'] = _MB_PUBLISHER_CATEGORY;
$block['lang_poster'] = _MB_PUBLISHER_POSTEDBY;
$block['lang_date'] = _MB_PUBLISHER_DATE;
$moduleName = $myts->displayTarea($helper->getModule()->getVar('name'));
$block['lang_visitItem'] = _MB_PUBLISHER_VISITITEM . ' ' . $moduleName;
-
- $block['show_image'] = $options[4];
- $block['show_summary'] = $options[5];
- $block['show_category'] =$options[6];
- $block['show_poster'] =$options[7];
- $block['show_date'] =$options[8];
- $block['show_hits'] =$options[9];
- $block['show_comment'] =$options[10];
- $block['show_morelink'] =$options[11];
-
- }
+
+ $block['show_image'] = $options[4];
+ $block['show_summary'] = $options[5];
+ $block['show_category'] = $options[6];
+ $block['show_poster'] = $options[7];
+ $block['show_date'] = $options[8];
+ $block['show_hits'] = $options[9];
+ $block['show_comment'] = $options[10];
+ $block['show_morelink'] = $options[11];
+ }
return $block;
}
@@ -162,29 +154,29 @@ function publisher_items_recent_edit($options)
'weight' => _MB_PUBLISHER_WEIGHT,
]
);
- $dispEle = new \XoopsFormText(_MB_PUBLISHER_DISP, 'options[2]', 10, 255, $options[2]);
- $charsEle = new \XoopsFormText(_MB_PUBLISHER_CHARS, 'options[3]', 10, 255, $options[3]);
- $showImage = new \XoopsFormRadioYN(_MB_PUBLISHER_IMGDISPLAY, 'options[4]', $options[4]);
+ $dispEle = new \XoopsFormText(_MB_PUBLISHER_DISP, 'options[2]', 10, 255, $options[2]);
+ $charsEle = new \XoopsFormText(_MB_PUBLISHER_CHARS, 'options[3]', 10, 255, $options[3]);
+ $showImage = new \XoopsFormRadioYN(_MB_PUBLISHER_IMGDISPLAY, 'options[4]', $options[4]);
$showSummary = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_SUMMARY, 'options[5]', $options[5]);
- $showCategory = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_TOPICLINK, 'options[6]', $options[6]);
- $showPoster = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_POSTEDBY, 'options[7]', $options[7]);
- $showDate = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_POSTTIME, 'options[8]', $options[8]);
- $showHits = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_READ, 'options[9]', $options[9]);
+ $showCategory = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_TOPICLINK, 'options[6]', $options[6]);
+ $showPoster = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_POSTEDBY, 'options[7]', $options[7]);
+ $showDate = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_POSTTIME, 'options[8]', $options[8]);
+ $showHits = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_READ, 'options[9]', $options[9]);
$showComment = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_COMMENT, 'options[10]', $options[10]);
- $dispMoreEle = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_MORELINK, 'options[11]', $options[11]);
-
-
+ $dispMoreEle = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_MORELINK, 'options[11]', $options[11]);
+
$form->addElement($catEle);
$form->addElement($orderEle);
$form->addElement($dispEle);
$form->addElement($charsEle);
- $form->addElement($showImage);
- $form->addElement($showSummary);
- $form->addElement($showCategory);
- $form->addElement($showPoster);
+ $form->addElement($showImage);
+ $form->addElement($showSummary);
+ $form->addElement($showCategory);
+ $form->addElement($showPoster);
$form->addElement($showDate);
- $form->addElement($showHits);
- $form->addElement($showComment);
+ $form->addElement($showHits);
+ $form->addElement($showComment);
$form->addElement($dispMoreEle);
+
return $form->render();
}
diff --git a/blocks/items_spot.php b/blocks/items_spot.php
index ffeccf65..b0f0e801 100644
--- a/blocks/items_spot.php
+++ b/blocks/items_spot.php
@@ -14,16 +14,13 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
- * @subpackage Blocks
* @since 1.0
* @author trabis
* @author The SmartFactory
*/
use XoopsModules\Publisher;
-
-
+use XoopsModules\Publisher\Utility;
require_once dirname(__DIR__) . '/include/common.php';
@@ -35,32 +32,31 @@
function publisher_items_spot_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');
- xoops_loadLanguage('main', 'publisher');
+ xoops_loadLanguage('main', 'publisher');
+
+ $optDisplayLast = $options[0];
+ $optItemsCount = $options[1];
+ $optCategoryId = $options[2];
+ $selItems = isset($options[3]) ? explode(',', $options[3]) : '';
+ $optDisplayPoster = $options[4];
+ $optDisplayComment = $options[5];
+ $optDisplayType = $options[6];
+ $optTruncate = (int)$options[7];
+ $optCatImage = $options[8];
+ $optSortOrder = $options[9] ?? '';
+ $optBtnDisplayMore = $options[10] ?? '';
+ $optDisplayReads = $options[11] ?? '';
+ $optdisplayitemimage = $options[12] ?? '';
+ $optdisplaywhenlink = $options[13] ?? '';
+ $optdisplaycategorylink = $options[14] ?? '';
+ $optdisplayadminlink = $options[15] ?? '';
+ $optdisplayreadmore = $options[16] ?? '';
- $optDisplayLast = $options[0];
- $optItemsCount = $options[1];
- $optCategoryId = $options[2];
- $selItems = isset($options[3]) ? explode(',', $options[3]) : '';
- $optDisplayPoster = $options[4];
- $optDisplayComment = $options[5];
- $optDisplayType = $options[6];
- $optTruncate = (int)$options[7];
- $optCatImage = $options[8];
- $optSortOrder = $options[9] ?? '';
- $optBtnDisplayMore = $options[10] ?? '';
- $optDisplayReads = $options[11] ?? '';
- $optdisplayitemimage=$options[12];
- $optdisplaywhenlink=$options[13];
- $optdisplaycategorylink=$options[14];
- $optdisplayadminlink=$options[15];
- $optdisplayreadmore =$options[16];
-
if (0 == $optCategoryId) {
$optCategoryId = -1;
}
@@ -106,7 +102,7 @@ function publisher_items_spot_show($options)
$category['name'] = $cat->name;
$category['categoryurl'] = $cat->getCategoryUrl();
if ('blank.png' !== $cat->getImage()) {
- $category['image_path'] = Publisher\Utility::getImageDir('category', false) . $cat->getImage();
+ $category['image_path'] = Utility::getImageDir('category', false) . $cat->getImage();
} else {
$category['image_path'] = '';
}
@@ -145,7 +141,7 @@ function publisher_items_spot_show($options)
}
if ($optTruncate > 0) {
$block['truncate'] = true;
- $item['summary'] = Publisher\Utility::truncateHtml($item['summary'], $optTruncate);
+ $item['summary'] = Utility::truncateHtml($item['summary'], $optTruncate);
}
$block['items'][] = $item;
++$i;
@@ -156,25 +152,25 @@ function publisher_items_spot_show($options)
if (!isset($block['items']) || 0 == count($block['items'])) {
return false;
}
- $block['lang_reads'] = _MB_PUBLISHER_READS;
- $block['lang_comments'] = _MB_PUBLISHER_COMMENTS;
- $block['lang_readmore'] = _MB_PUBLISHER_READMORE;
- $block['lang_poster'] = _MB_PUBLISHER_POSTEDBY;
- $block['lang_date'] = _MB_PUBLISHER_ON;
- $block['lang_category'] = _MB_PUBLISHER_CATEGORY;
-
+ $block['lang_reads'] = _MB_PUBLISHER_READS;
+ $block['lang_comments'] = _MB_PUBLISHER_COMMENTS;
+ $block['lang_readmore'] = _MB_PUBLISHER_READMORE;
+ $block['lang_poster'] = _MB_PUBLISHER_POSTEDBY;
+ $block['lang_date'] = _MB_PUBLISHER_ON;
+ $block['lang_category'] = _MB_PUBLISHER_CATEGORY;
+
$block['display_whowhen_link'] = $optDisplayPoster;
- $block['display_who_link'] = $optDisplayPoster;
+ $block['display_who_link'] = $optDisplayPoster;
$block['display_comment_link'] = $optDisplayComment;
$block['display_type'] = $optDisplayType;
$block['display_reads'] = $optDisplayReads;
- $block['display_cat_image'] = $optCatImage;
- $block['display_item_image'] =$optdisplayitemimage;
- $block['display_when_link'] =$optdisplaywhenlink;
- $block['display_categorylink'] =$optdisplaycategorylink;
- $block['display_adminlink'] =$optdisplayadminlink;
- $block['display_readmore'] =$optdisplayreadmore;
-
+ $block['display_cat_image'] = $optCatImage;
+ $block['display_item_image'] = $optdisplayitemimage;
+ $block['display_when_link'] = $optdisplaywhenlink;
+ $block['display_categorylink'] = $optdisplaycategorylink;
+ $block['display_adminlink'] = $optdisplayadminlink;
+ $block['display_readmore'] = $optdisplayreadmore;
+
if ($optBtnDisplayMore) {
$block['lang_displaymore'] = _MB_PUBLISHER_MORE_ITEMS;
}
@@ -197,8 +193,7 @@ function publisher_items_spot_edit($options)
$form = new Publisher\BlockForm();
$autoEle = new \XoopsFormRadioYN(_MB_PUBLISHER_AUTO_LAST_ITEMS, 'options[0]', $options[0]);
$countEle = new \XoopsFormText(_MB_PUBLISHER_LAST_ITEMS_COUNT, 'options[1]', 2, 255, $options[1]);
- $catEle = new \XoopsFormLabel(_MB_PUBLISHER_SELECTCAT, Publisher\Utility::createCategorySelect($options[2], 0, true, 'options[2]', false));
- /** @var Publisher\Helper $helper */
+ $catEle = new \XoopsFormLabel(_MB_PUBLISHER_SELECTCAT, Utility::createCategorySelect($options[2], 0, true, 'options[2]', false));
$helper = Publisher\Helper::getInstance();
/** @var Publisher\ItemHandler $itemHandler */
$itemHandler = $helper->getHandler('Item');
@@ -220,8 +215,8 @@ function publisher_items_spot_edit($options)
$typeEle = new \XoopsFormSelect(_MB_PUBLISHER_DISPLAY_TYPE, 'options[6]', $options[6]);
$typeEle->addOptionArray(
[
- 'block' => _MB_PUBLISHER_DISPLAY_TYPE_BLOCK,
- 'bullet' => _MB_PUBLISHER_DISPLAY_TYPE_BULLET,
+ 'block' => _MB_PUBLISHER_DISPLAY_TYPE_BLOCK,
+ 'bullet' => _MB_PUBLISHER_DISPLAY_TYPE_BULLET,
]
);
$truncateEle = new \XoopsFormText(_MB_PUBLISHER_TRUNCATE, 'options[7]', 4, 255, $options[7]);
@@ -229,39 +224,40 @@ function publisher_items_spot_edit($options)
$sortEle = new \XoopsFormSelect(_MI_PUBLISHER_ORDERBY, 'options[9]', $options[9]);
$sortEle->addOptionArray(
[
- 'title' => _MI_PUBLISHER_ORDERBY_TITLE,
- 'date' => _MI_PUBLISHER_ORDERBY_DATE,
- 'counter' => _MI_PUBLISHER_ORDERBY_HITS,
- 'rating' => _MI_PUBLISHER_ORDERBY_RATING,
- 'votes' => _MI_PUBLISHER_ORDERBY_VOTES,
- 'comments' => _MI_PUBLISHER_ORDERBY_COMMENTS,
- 'weight' => _MI_PUBLISHER_ORDERBY_WEIGHT,
+ 'title' => _MI_PUBLISHER_ORDERBY_TITLE,
+ 'date' => _MI_PUBLISHER_ORDERBY_DATE,
+ 'counter' => _MI_PUBLISHER_ORDERBY_HITS,
+ 'rating' => _MI_PUBLISHER_ORDERBY_RATING,
+ 'votes' => _MI_PUBLISHER_ORDERBY_VOTES,
+ 'comments' => _MI_PUBLISHER_ORDERBY_COMMENTS,
+ 'weight' => _MI_PUBLISHER_ORDERBY_WEIGHT,
]
);
- $dispMoreEle = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_MORELINK, 'options[10]', $options[10]);
- $readsEle = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_READ, 'options[11]', $options[11]);
- $dispImage = new \XoopsFormRadioYN(_MB_PUBLISHER_IMGDISPLAY, 'options[12]', $options[12]);
- $dispDate = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_POSTTIME, 'options[13]', $options[13]);
- $dispCategory = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_TOPICLINK, 'options[14]', $options[14]);
- $dispAdminlink = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_ADMINLINK, 'options[15]', $options[15]);
- $dispReadmore = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_READ_FULLITEM, 'options[16]', $options[16]);
-
+ $dispMoreEle = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_MORELINK, 'options[10]', $options[10]);
+ $readsEle = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_READ, 'options[11]', $options[11]);
+ $dispImage = new \XoopsFormRadioYN(_MB_PUBLISHER_IMGDISPLAY, 'options[12]', $options[12]);
+ $dispDate = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_POSTTIME, 'options[13]', $options[13]);
+ $dispCategory = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_TOPICLINK, 'options[14]', $options[14]);
+ $dispAdminlink = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_ADMINLINK, 'options[15]', $options[15]);
+ $dispReadmore = new \XoopsFormRadioYN(_MB_PUBLISHER_DISPLAY_READ_FULLITEM, 'options[16]', $options[16]);
+
$form->addElement($autoEle);
$form->addElement($countEle);
$form->addElement($catEle);
$form->addElement($itemEle);
$form->addElement($whoEle);
- $form->addElement($comEle);
+ $form->addElement($comEle);
$form->addElement($typeEle);
$form->addElement($truncateEle);
$form->addElement($imageEle);
$form->addElement($sortEle);
$form->addElement($dispMoreEle);
$form->addElement($readsEle);
- $form->addElement($dispImage);
- $form->addElement($dispDate);
- $form->addElement($dispCategory);
- $form->addElement($dispAdminlink);
- $form->addElement($dispReadmore);
+ $form->addElement($dispImage);
+ $form->addElement($dispDate);
+ $form->addElement($dispCategory);
+ $form->addElement($dispAdminlink);
+ $form->addElement($dispReadmore);
+
return $form->render();
}
diff --git a/blocks/latest_files.php b/blocks/latest_files.php
index 9b89ee8e..496fa314 100644
--- a/blocks/latest_files.php
+++ b/blocks/latest_files.php
@@ -14,8 +14,6 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
- * @subpackage Blocks
* @since 1.0
* @author trabis
* @author The SmartFactory
@@ -23,8 +21,7 @@
use XoopsModules\Publisher;
use XoopsModules\Publisher\Constants;
-
-
+use XoopsModules\Publisher\Utility;
require_once dirname(__DIR__) . '/include/common.php';
@@ -35,7 +32,6 @@
*/
function publisher_latest_files_show($options)
{
- /** @var Publisher\Helper $helper */
$helper = Publisher\Helper::getInstance();
/** @var Publisher\FileHandler $fileHandler */
$fileHandler = $helper->getHandler('File');
@@ -50,7 +46,7 @@ function publisher_latest_files_show($options)
$block = [];
$sort = $options[1];
- $order = Publisher\Utility::getOrderBy($sort);
+ $order = Utility::getOrderBy($sort);
$limit = $options[2];
$directDownload = $options[3];
@@ -84,7 +80,7 @@ function publisher_latest_files_edit($options)
$form = new Publisher\BlockForm();
- $catEle = new \XoopsFormLabel(_MB_PUBLISHER_SELECTCAT, Publisher\Utility::createCategorySelect($options[0], 0, true, 'options[0]'));
+ $catEle = new \XoopsFormLabel(_MB_PUBLISHER_SELECTCAT, Utility::createCategorySelect($options[0], 0, true, 'options[0]'));
$orderEle = new \XoopsFormSelect(_MB_PUBLISHER_ORDER, 'options[1]', $options[1]);
$orderEle->addOptionArray(
[
diff --git a/blocks/latest_news.php b/blocks/latest_news.php
index 74a676dd..530e12c0 100644
--- a/blocks/latest_news.php
+++ b/blocks/latest_news.php
@@ -14,8 +14,6 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
- * @subpackage Blocks
* @since 1.0
* @author trabis
* @author Bandit-x
@@ -24,8 +22,7 @@
use XoopsModules\Publisher;
use XoopsModules\Publisher\Constants;
-
-
+use XoopsModules\Publisher\Utility;
require_once dirname(__DIR__) . '/include/common.php';
@@ -38,7 +35,6 @@ function publisher_latest_news_show($options)
{
$block = [];
- /** @var Publisher\Helper $helper */
$helper = Publisher\Helper::getInstance();
$helper->loadLanguage('main');
/** @var Publisher\ItemHandler $itemHandler */
@@ -51,7 +47,7 @@ function publisher_latest_news_show($options)
$letters = $options[3];
$selectedStories = $options[4];
$sort = $options[9];
- $order = Publisher\Utility::getOrderBy($sort);
+ $order = Utility::getOrderBy($sort);
$imgWidth = $options[11];
$imgHeight = $options[12];
$border = $options[13];
@@ -62,7 +58,7 @@ function publisher_latest_news_show($options)
$allcats = false;
if (!isset($options[31])) {
$allcats = true;
- } elseif (in_array(0, explode(',', $options[31]))) {
+ } elseif (in_array(0, explode(',', $options[31]), true)) {
$allcats = true;
}
@@ -100,7 +96,7 @@ function publisher_latest_news_show($options)
$k = 0;
$columns = [];
- foreach ($itemsObj as $itemid => $itemObj) {
+ foreach ($itemsObj as $itemId => $itemObj) {
$item = [];
$item['itemurl'] = $itemObj->getItemUrl();
$item['title'] = $itemObj->getItemLink();
@@ -108,19 +104,19 @@ function publisher_latest_news_show($options)
$mainImage = $itemObj->getMainImage();
if (empty($mainImage['image_path'])) {
$mainImage['image_path'] = PUBLISHER_URL . '/assets/images/default_image.jpg';
- }
+ }
// check to see if GD function exist
if (!empty($mainImage['image_path']) && !function_exists('imagecreatetruecolor')) {
$item['item_image'] = $mainImage['image_path'];
} else {
$item['item_image'] = PUBLISHER_URL . '/thumb.php?src=' . $mainImage['image_path'] . '&w=' . $imgWidth; // No $imgHeight for autoheight option
$item['image_path'] = $mainImage['image_path'];
- }
- $item['text'] = $itemObj->getBlockSummary($letters);
- $item['display_item_image'] =$options[10];
- $item['display_summary'] =$options[16];
- $item['display_adminlink'] =$options[29];
- $item = $itemObj->getMainImage($item); //returns an array
+ }
+ $item['text'] = $itemObj->getBlockSummary($letters);
+ $item['display_item_image'] = $options[10];
+ $item['display_summary'] = $options[16];
+ $item['display_adminlink'] = $options[29];
+ $item = $itemObj->getMainImage($item); //returns an array
$lsHeight = $imgPosition = $lsMargin = '';
if (0 != $options[12]) {
@@ -128,24 +124,24 @@ function publisher_latest_news_show($options)
} // set height = 0 in block option for auto height
if ('LEFT' === $options[15]) {
- $imgPosition = 'float: left';
- $lsMargin = '-right';
- $block['position'] = $imgPosition;
- $block['margin'] = $lsMargin;
+ $imgPosition = 'float: left';
+ $lsMargin = '-right';
+ $block['position'] = $imgPosition;
+ $block['margin'] = $lsMargin;
}
if ('CENTER' === $options[15]) {
- $imgPosition = 'text-align:center';
- $lsMargin = '';
- $block['position'] = $imgPosition;
- $block['margin'] = $lsMargin;
+ $imgPosition = 'text-align:center';
+ $lsMargin = '';
+ $block['position'] = $imgPosition;
+ $block['margin'] = $lsMargin;
}
if ('RIGHT' === $options[15]) {
- $imgPosition = 'float: right';
- $lsMargin = '-left';
- $block['position'] = $imgPosition;
- $block['margin'] = $lsMargin;
+ $imgPosition = 'float: right';
+ $lsMargin = '-left';
+ $block['position'] = $imgPosition;
+ $block['margin'] = $lsMargin;
}
//Image
@@ -166,11 +162,11 @@ function publisher_latest_news_show($options)
}
$block['topiclink'] = '';
-
+
if (1 == $options[16]) {
- $block['text'] = $itemObj->getBlockSummary($letters);
+ $block['text'] = $itemObj->getBlockSummary($letters);
}
-
+
$block['archivelink'] = '';
if (1 == $options[17]) {
$block['archivelink'] = '| ' . _MB_PUBLISHER_ARCHIVE . ' ';
@@ -184,30 +180,30 @@ function publisher_latest_news_show($options)
$item['poster'] = '';
if (1 == $options[19]) {
- $item['poster'] = $itemObj->posterName();
- $block['lang_poster'] = _MB_PUBLISHER_POSTEDBY;
+ $item['poster'] = $itemObj->posterName();
+ $block['lang_poster'] = _MB_PUBLISHER_POSTEDBY;
}
$item['posttime'] = '';
if (1 == $options[20]) {
- $item['posttime'] = $itemObj->getDatesub();
- $block['lang_date'] = _MB_PUBLISHER_ON;
+ $item['posttime'] = $itemObj->getDatesub();
+ $block['lang_date'] = _MB_PUBLISHER_ON;
}
$item['topic_title'] = '';
if (1 == $options[21]) {
- $item['topic_title'] = $itemObj->getCategoryLink();
- $item['category'] = strip_tags($itemObj->getCategoryLink());
- $block['lang_category'] = _MB_PUBLISHER_CATEGORY;
- }
+ $item['topic_title'] = $itemObj->getCategoryLink();
+ $item['category'] = strip_tags($itemObj->getCategoryLink());
+ $block['lang_category'] = _MB_PUBLISHER_CATEGORY;
+ }
$item['read'] = '';
if (1 == $options[22]) {
- $item['read'] = $itemObj->counter();
- $block['lang_reads'] = _MB_PUBLISHER_READS;
+ $item['read'] = $itemObj->counter();
+ $block['lang_reads'] = _MB_PUBLISHER_READS;
}
- $item['cancomment'] = $itemObj->cancomment();
- $comments = $itemObj->comments();
+ $item['cancomment'] = $itemObj->cancomment();
+ $comments = $itemObj->comments();
if (1 == $options[23]) {
if ($comments > 0) {
//shows 1 comment instead of 1 comm. if comments ==1
@@ -228,14 +224,14 @@ function publisher_latest_news_show($options)
}
$item['pdf'] = '';
-
- if (1 == $options[25]) {
- $item['pdf'] = "![" . _CO_PUBLISHER_PDF . "](" . PUBLISHER_URL . "/assets/images/links/pdf.gif "\" . _CO_PUBLISHER_PDF . \"")
";
- }
-
+
+ if (1 == $options[25]) {
+ $item['pdf'] = " ";
+ }
+
$item['email'] = '';
- if (1 == $options[26]) {
- $maillink = 'mailto:?subject=' . sprintf(_CO_PUBLISHER_INTITEM, $GLOBALS['xoopsConfig']['sitename']) . '&body=' . sprintf(_CO_PUBLISHER_INTITEMFOUND, $GLOBALS['xoopsConfig']['sitename']) . ': ' . $itemObj->getItemUrl();
+ if (1 == $options[26]) {
+ $maillink = 'mailto:?subject=' . sprintf(_CO_PUBLISHER_INTITEM, $GLOBALS['xoopsConfig']['sitename']) . '&body=' . sprintf(_CO_PUBLISHER_INTITEMFOUND, $GLOBALS['xoopsConfig']['sitename']) . ': ' . $itemObj->getItemUrl();
$item['email'] = '
';
}
@@ -260,12 +256,12 @@ function publisher_latest_news_show($options)
$block['template'] = $options[30];
- $block['imgwidth'] = $options[11];
- $block['imgheight'] = $options[12];
- $block['border'] = $options[13];
+ $block['imgwidth'] = $options[11];
+ $block['imgheight'] = $options[12];
+ $block['border'] = $options[13];
$block['bordercolor'] = $options[14];
-
- $block['letters'] = $letters;
+
+ $block['letters'] = $letters;
$columns[$k][] = $item;
++$k;
@@ -429,7 +425,7 @@ function publisher_latest_news_edit($options)
//Select Which Categories To Show
$form .= $tabletag3 . _MB_PUBLISHER_TOPICSCONFIG . $tabletag4; // Topics Options
$form .= $tabletag1 . _MB_PUBLISHER_TOPICSDISPLAY . $tabletag2;
- $form .= Publisher\Utility::createCategorySelect($options[31], 0, true, 'options[31]');
+ $form .= Utility::createCategorySelect($options[31], 0, true, 'options[31]');
$form .= '';
$form .= '';
diff --git a/blocks/search.php b/blocks/search.php
index 84e2c9f4..b3fc0f73 100644
--- a/blocks/search.php
+++ b/blocks/search.php
@@ -14,8 +14,6 @@
/**
* @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
- * @subpackage Blocks
* @since 1.0
* @author trabis
* @author phppp
@@ -24,8 +22,6 @@
use Xmf\Request;
use XoopsModules\Publisher;
-
-
require_once dirname(__DIR__) . '/include/common.php';
/**
@@ -36,7 +32,6 @@
function publisher_search_show($options)
{
$block = [];
- /** @var Publisher\Helper $helper */
$helper = Publisher\Helper::getInstance();
/** @var Publisher\CategoryHandler $categoryHandler */
$categoryHandler = $helper->getHandler('Category');
@@ -63,15 +58,15 @@ function publisher_search_show($options)
//mb TODO simplify next lines with category
$category = Request::getArray('category', [], 'POST') ?: Request::getArray('category', null, 'GET');
- if (empty($category) || (is_array($category) && in_array('all', $category))) {
+ if (empty($category) || (is_array($category) && in_array('all', $category, true))) {
$category = [];
} else {
$category = (!is_array($category)) ? explode(',', $category) : $category;
$category = array_map('\intval', $category);
}
- $andor = in_array(mb_strtoupper($andor), ['OR', 'AND', 'EXACT']) ? mb_strtoupper($andor) : 'OR';
- $sortby = in_array(mb_strtolower($sortby), ['itemid', 'datesub', 'title', 'categoryid']) ? mb_strtolower($sortby) : 'itemid';
+ $andor = in_array(mb_strtoupper($andor), ['OR', 'AND', 'EXACT'], true) ? mb_strtoupper($andor) : 'OR';
+ $sortby = in_array(mb_strtolower($sortby), ['itemid', 'datesub', 'title', 'categoryid'], true) ? mb_strtolower($sortby) : 'itemid';
/* type */
$typeSelect = '
\n" . "