Updates

XoopsModules25x · May 24, 2017 · f77b628 · f77b628
1 parent 019813d
commit f77b628
Show file tree

Hide file tree

Showing 69 changed files with 153 additions and 155 deletions.
diff --git a/admin/admin_header.php b/admin/admin_header.php
@@ -19,7 +19,7 @@
  */
 
 require_once __DIR__ . '/../../../include/cp_header.php';
-//include_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
+//require_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
 
 //require_once __DIR__ . '/../include/common.php';
 
@@ -55,6 +55,6 @@
 $myts = MyTextSanitizer::getInstance();
 
 if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof XoopsTpl)) {
-    include_once $GLOBALS['xoops']->path('class/template.php');
+    require_once $GLOBALS['xoops']->path('class/template.php');
     $xoopsTpl = new XoopsTpl();
 }
diff --git a/admin/category.php b/admin/category.php
@@ -224,7 +224,7 @@
             $categoryid = '0';
         }
         echo "</table>\n";
-        include_once $GLOBALS['xoops']->path('class/pagenav.php');
+        require_once $GLOBALS['xoops']->path('class/pagenav.php');
         $pagenav = new XoopsPageNav($totalCategories, $publisher->getConfig('idxcat_perpage'), $startcategory, 'startcategory');
         echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
         echo '<br>';

diff --git a/admin/clone.php b/admin/clone.php
@@ -67,7 +67,7 @@
     }
     echo $msg;
 } else {
-    include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+    require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
     $form  = new XoopsThemeForm(sprintf(_AM_PUBLISHER_CLONE_TITLE, $publisher->getModule()->getVar('name', 'E')), 'clone', 'clone.php', 'post', true);
     $clone = new XoopsFormText(_AM_PUBLISHER_CLONE_NAME, 'clone', 20, 20, '');
     $clone->setDescription(_AM_PUBLISHER_CLONE_NAME_DSC);

diff --git a/admin/file.php b/admin/file.php
@@ -32,7 +32,7 @@
 function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
 {
     $publisher = PublisherPublisher::getInstance();
-    include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+    require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 
     // if there is a parameter, and the id exists, retrieve data: we're editing a file
     if ($fileid != 0) {
@@ -90,7 +90,7 @@ function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
         }
 
         PublisherUtility::cpHeader();
-        include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+        require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 
         publisher_editFile(true, $fileid, $itemid);
         break;

diff --git a/admin/import.php b/admin/import.php
@@ -28,7 +28,7 @@
     case 'importExecute':
         $importfile      = Request::getString('importfile', 'nonselected', 'POST');
         $importfile_path = $GLOBALS['xoops']->path('modules/' . $publisher->getModule()->dirname() . '/admin/import/' . $importfile . '.php');
-        include_once $importfile_path;
+        require_once $importfile_path;
         break;
 
     case 'default':

diff --git a/admin/import/ams.php b/admin/import/ams.php
@@ -21,7 +21,7 @@
 
 use Xmf\Request;
 
-include_once dirname(__DIR__) . '/admin_header.php';
+require_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
 $importFromModuleName = 'AMS ' . Request::getString('ams_version', '', 'POST');
@@ -43,7 +43,7 @@
     if ($totalCat == 0) {
         echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_PUBLISHER_IMPORT_NO_CATEGORY . '</span>';
     } else {
-        include_once $GLOBALS['xoops']->path('class/xoopstree.php');
+        require_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
         $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('nw_stories'));
         list($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
@@ -167,7 +167,7 @@
 if ($op === 'go') {
     PublisherUtility::cpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
-    include_once dirname(dirname(__DIR__)) . '/include/common.php';
+    require_once dirname(dirname(__DIR__)) . '/include/common.php';
     PublisherUtility::openCollapsableBar('amsimportgo', 'amsimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
     /* @var  $moduleHandler XoopsModuleHandler */
     $moduleHandler = xoops_getHandler('module');

diff --git a/admin/import/cjaycontent.php b/admin/import/cjaycontent.php
@@ -21,7 +21,7 @@
 
 use Xmf\Request;
 
-include_once dirname(__DIR__) . '/admin_header.php';
+require_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
 $importFromModuleName = 'cjaycontent ' . Request::getString('cjaycontent_version', '', 'POST');
@@ -89,7 +89,7 @@
 if ($op === 'go') {
     PublisherUtility::cpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
-    include_once dirname(dirname(__DIR__)) . '/include/common.php';
+    require_once dirname(dirname(__DIR__)) . '/include/common.php';
     PublisherUtility::openCollapsableBar('cjaycontentimportgo', 'cjaycontentimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
     /* @var  $moduleHandler XoopsModuleHandler */
     $moduleHandler         = xoops_getHandler('module');

diff --git a/admin/import/fmcontent.php b/admin/import/fmcontent.php
@@ -22,7 +22,7 @@
 
 use Xmf\Request;
 
-include_once dirname(__DIR__) . '/admin_header.php';
+require_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
 $importFromModuleName = 'FmContent ' . Request::getString('fmcontent_version', '', 'POST');
@@ -48,7 +48,7 @@
     if (empty($fmTopicCount)) {
         echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . '</span>';
     } else {
-        include_once $GLOBALS['xoops']->path('www/class/xoopstree.php');
+        require_once $GLOBALS['xoops']->path('www/class/xoopstree.php');
         $fmContentHdlr  = xoops_getModuleHandler('page', 'fmcontent');
         $fmContentCount = $fmContentHdlr->getCount(new Criteria('content_modid', $fm_module_id));
 

diff --git a/admin/import/news.php b/admin/import/news.php
@@ -21,7 +21,7 @@
 
 use Xmf\Request;
 
-include_once dirname(__DIR__) . '/admin_header.php';
+require_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
 $importFromModuleName = 'News ' . Request::getString('news_version', '', 'POST');
@@ -43,7 +43,7 @@
     if ($totalCat == 0) {
         echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_PUBLISHER_IMPORT_NO_CATEGORY . '</span>';
     } else {
-        include_once $GLOBALS['xoops']->path('class/xoopstree.php');
+        require_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
         $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('news_stories'));
         list($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);

diff --git a/admin/import/smartsection.php b/admin/import/smartsection.php
@@ -21,7 +21,7 @@
 
 use Xmf\Request;
 
-include_once dirname(__DIR__) . '/admin_header.php';
+require_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
 $importFromModuleName = 'Smartsection ' . Request::getString('smartsection_version', '', 'POST');
@@ -43,7 +43,7 @@
     if ($totalCat == 0) {
         echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_PUBLISHER_IMPORT_NO_CATEGORY . '</span>';
     } else {
-        include_once $GLOBALS['xoops']->path('class/xoopstree.php');
+        require_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
         $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('smartsection_items'));
         list($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);

diff --git a/admin/import/wfsection.php b/admin/import/wfsection.php
@@ -21,7 +21,7 @@
 
 use Xmf\Request;
 
-include_once dirname(__DIR__) . '/admin_header.php';
+require_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
 $importFromModuleName = 'WF-Section ' . Request::getString('wfs_version', '', 'POST');
@@ -43,7 +43,7 @@
     if ($totalCat == 0) {
         echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_PUBLISHER_IMPORT_NOCATSELECTED . '</span>';
     } else {
-        include_once $GLOBALS['xoops']->path('class/xoopstree.php');
+        require_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
         $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('wfs_article'));
         list($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);

diff --git a/admin/import/xfsection.php b/admin/import/xfsection.php
@@ -21,7 +21,7 @@
 
 use Xmf\Request;
 
-include_once dirname(__DIR__) . '/admin_header.php';
+require_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
 $importFromModuleName = 'XF-Section ' . Request::getString('xfs_version', '', 'POST');
@@ -43,7 +43,7 @@
     if ($totalCat == 0) {
         echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_PUBLISHER_IMPORT_NOCATSELECTED . '</span>';
     } else {
-        include_once $GLOBALS['xoops']->path('class/xoopstree.php');
+        require_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
         $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('xfs_article'));
         list($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);

diff --git a/admin/import/xnews.php b/admin/import/xnews.php
@@ -21,7 +21,7 @@
 
 use Xmf\Request;
 
-include_once dirname(__DIR__) . '/admin_header.php';
+require_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
 $importFromModuleName = 'xNews ' . Request::getString('xnews_version', '', 'POST');
@@ -43,7 +43,7 @@
     if ($totalCat == 0) {
         echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_PUBLISHER_IMPORT_NO_CATEGORY . '</span>';
     } else {
-        include_once $GLOBALS['xoops']->path('class/xoopstree.php');
+        require_once $GLOBALS['xoops']->path('class/xoopstree.php');
 
         $result = $GLOBALS['xoopsDB']->query('SELECT COUNT(*) FROM ' . $GLOBALS['xoopsDB']->prefix('nw_stories'));
         list($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
@@ -168,7 +168,7 @@
 if ($op === 'go') {
     PublisherUtility::cpHeader();
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
-    include_once dirname(dirname(__DIR__)) . '/include/common.php';
+    require_once dirname(dirname(__DIR__)) . '/include/common.php';
     PublisherUtility::openCollapsableBar('xnewsimportgo', 'xnewsimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
     /* @var  $moduleHandler XoopsModuleHandler */
     $moduleHandler   = xoops_getHandler('module');

diff --git a/admin/index.php b/admin/index.php
@@ -20,7 +20,7 @@
  */
 
 require_once __DIR__ . '/admin_header.php';
-include_once dirname(__DIR__) . '/class/utility.php';
+require_once dirname(__DIR__) . '/class/utility.php';
 
 xoops_cp_header();
 xoops_loadLanguage('main', PUBLISHER_DIRNAME);

diff --git a/admin/main.php b/admin/main.php
@@ -21,8 +21,8 @@
 use Xmf\Request;
 
 require_once __DIR__ . '/admin_header.php';
-include_once $GLOBALS['xoops']->path('class/xoopslists.php');
-include_once $GLOBALS['xoops']->path('class/pagenav.php');
+require_once $GLOBALS['xoops']->path('class/xoopslists.php');
+require_once $GLOBALS['xoops']->path('class/pagenav.php');
 require_once __DIR__ . '/../class/utility.php';
 
 $itemid = Request::getInt('itemid', 0, 'POST');

diff --git a/admin/menu.php b/admin/menu.php
@@ -38,7 +38,7 @@
 $moduleHelper->loadLanguage('modinfo');
 $moduleHelper->loadLanguage('admin');
 
-include_once dirname(__DIR__) . '/include/config.php';
+require_once dirname(__DIR__) . '/include/config.php';
 
 $adminmenu = array(
     array(

diff --git a/admin/permissions.php b/admin/permissions.php
@@ -19,7 +19,7 @@
  */
 
 require_once __DIR__ . '/admin_header.php';
-include_once $GLOBALS['xoops']->path('class/xoopsform/grouppermform.php');
+require_once $GLOBALS['xoops']->path('class/xoopsform/grouppermform.php');
 $myts = MyTextSanitizer::getInstance();
 
 PublisherUtility::cpHeader();

diff --git a/admin/preferences.php b/admin/preferences.php
@@ -135,19 +135,19 @@
                 $ele = new XoopsFormRadioYN($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), _YES, _NO);
                 break;
             case 'group':
-                include_once $GLOBALS['xoops']->path('class/xoopslists.php');
+                require_once $GLOBALS['xoops']->path('class/xoopslists.php');
                 $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
                 break;
             case 'group_multi':
-                include_once $GLOBALS['xoops']->path('class/xoopslists.php');
+                require_once $GLOBALS['xoops']->path('class/xoopslists.php');
                 $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
                 break;
             case 'user':
-                include_once $GLOBALS['xoops']->path('class/xoopslists.php');
+                require_once $GLOBALS['xoops']->path('class/xoopslists.php');
                 $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
                 break;
             case 'user_multi':
-                include_once $GLOBALS['xoops']->path('class/xoopslists.php');
+                require_once $GLOBALS['xoops']->path('class/xoopslists.php');
                 $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
                 break;
             case 'password':

diff --git a/admin/pw_upload_file.php b/admin/pw_upload_file.php
@@ -39,7 +39,7 @@
  */
 function publisher_pagewrap_upload(&$errors)
 {
-    //    include_once PUBLISHER_ROOT_PATH . '/class/uploader.php';
+    //    require_once PUBLISHER_ROOT_PATH . '/class/uploader.php';
     xoops_load('XoopsMediaUploader');
 
     $publisher = PublisherPublisher::getInstance();

diff --git a/archive.php b/archive.php
@@ -28,8 +28,8 @@
 require_once __DIR__ . '/header.php';
 $GLOBALS['xoopsOption']['template_main'] = 'publisher_archive.tpl';
 
-include_once $GLOBALS['xoops']->path('header.php');
-include_once PUBLISHER_ROOT_PATH . '/footer.php';
+require_once $GLOBALS['xoops']->path('header.php');
+require_once PUBLISHER_ROOT_PATH . '/footer.php';
 xoops_loadLanguage('calendar');
 //mb xoops_load('XoopsLocal');
 
@@ -231,4 +231,4 @@
 
 $xoopsTpl->assign('lang_newsarchives', _MD_PUBLISHER_ARCHIVES);
 
-include_once $GLOBALS['xoops']->path('footer.php');
+require_once $GLOBALS['xoops']->path('footer.php');
diff --git a/author_items.php b/author_items.php
@@ -43,8 +43,8 @@
 $myts = MyTextSanitizer::getInstance();
 
 $GLOBALS['xoopsOption']['template_main'] = 'publisher_author_items.tpl';
-include_once $GLOBALS['xoops']->path('header.php');
-include_once PUBLISHER_ROOT_PATH . '/footer.php';
+require_once $GLOBALS['xoops']->path('header.php');
+require_once PUBLISHER_ROOT_PATH . '/footer.php';
 
 $criteria = new CriteriaCompo(new Criteria('datesub', time(), '<='));
 $criteria->add(new Criteria('uid', $uid));
@@ -98,4 +98,4 @@
 $publisherMetagen = new PublisherMetagen($title, '', $title);
 $publisherMetagen->createMetaTags();
 
-include_once $GLOBALS['xoops']->path('footer.php');
+require_once $GLOBALS['xoops']->path('footer.php');
diff --git a/backend.php b/backend.php
@@ -27,7 +27,7 @@
 error_reporting(0);
 $GLOBALS['xoopsLogger']->activated = false;
 
-include_once $GLOBALS['xoops']->path('class/template.php');
+require_once $GLOBALS['xoops']->path('class/template.php');
 if (function_exists('mb_http_output')) {
     mb_http_output('pass');
 }

diff --git a/blocks/category_items_sel.php b/blocks/category_items_sel.php
@@ -20,7 +20,7 @@
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once dirname(__DIR__) . '/include/common.php';
+require_once dirname(__DIR__) . '/include/common.php';
 
 /**
  * @param $options
@@ -88,7 +88,7 @@ function publisher_category_items_sel_show($options)
  */
 function publisher_category_items_sel_edit($options)
 {
-    include_once PUBLISHER_ROOT_PATH . '/class/blockform.php';
+    require_once PUBLISHER_ROOT_PATH . '/class/blockform.php';
     xoops_load('XoopsFormLoader');
 
     $form = new PublisherBlockForm();

diff --git a/blocks/date_to_date.php b/blocks/date_to_date.php
@@ -21,7 +21,7 @@
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once dirname(__DIR__) . '/include/common.php';
+require_once dirname(__DIR__) . '/include/common.php';
 
 /**
  * @param $options
@@ -77,7 +77,7 @@ function publisher_date_to_date_show($options)
  */
 function publisher_date_to_date_edit($options)
 {
-    include_once PUBLISHER_ROOT_PATH . '/class/blockform.php';
+    require_once PUBLISHER_ROOT_PATH . '/class/blockform.php';
     xoops_load('XoopsFormLoader');
     xoops_load('XoopsFormTextDateSelect');