changed 'include_once' to 'require_once'

XoopsModules25x · May 6, 2017 · c8cc848 · c8cc848
1 parent 06b1149
commit c8cc848
Show file tree

Hide file tree

Showing 29 changed files with 87 additions and 68 deletions.
diff --git a/admin/about.php b/admin/about.php
@@ -23,7 +23,7 @@
 xoops_cp_header();
 
 $adminObject->displayNavigation(basename(__FILE__));
-\Xmf\Module\Admin::setPaypal('6KJ7RW5DR3VTJ');
+\Xmf\Module\Admin::setPaypal('[email protected]');
 $adminObject->displayAbout(false);
 
 require_once __DIR__ . '/admin_footer.php';
diff --git a/admin/admin_header.php b/admin/admin_header.php
@@ -18,13 +18,13 @@
  * @author          The SmartFactory <www.smartfactory.ca>
  */
 
-include_once __DIR__ . '/../../../include/cp_header.php';
+require_once __DIR__ . '/../../../include/cp_header.php';
 //include_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
 
 //require_once __DIR__ . '/../include/common.php';
 
-require __DIR__ . '/../class/utility.php';
-include_once __DIR__ . '/../include/config.php';
+require_once __DIR__  . '/../class/utility.php';
+require_once __DIR__ . '/../include/config.php';
 
 if (!isset($moduleDirName)) {
     $moduleDirName = basename(dirname(__DIR__));

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

diff --git a/archive.php b/archive.php
@@ -25,7 +25,7 @@
 
 use \Xmf\Request;
 
-include_once __DIR__ . '/header.php';
+require_once __DIR__ . '/header.php';
 $GLOBALS['xoopsOption']['template_main'] = 'publisher_archive.tpl';
 
 include_once $GLOBALS['xoops']->path('header.php');

diff --git a/author_items.php b/author_items.php
@@ -20,7 +20,7 @@
 
 use \Xmf\Request;
 
-include_once __DIR__ . '/header.php';
+require_once __DIR__ . '/header.php';
 
 $uid = Request::getInt('uid', 0, 'GET');
 if (0 == $uid) {

diff --git a/backend.php b/backend.php
@@ -21,7 +21,7 @@
 
 use \Xmf\Request;
 
-include_once __DIR__ . '/header.php';
+require_once __DIR__ . '/header.php';
 //xoops_load('XoopsLocal'); //mb
 
 error_reporting(0);

diff --git a/category.php b/category.php
@@ -21,7 +21,7 @@
 
 use \Xmf\Request;
 
-include_once __DIR__ . '/header.php';
+require_once __DIR__ . '/header.php';
 
 $categoryid = Request::getInt('categoryid', 0, 'GET');
 

diff --git a/class/item.php b/class/item.php
@@ -930,7 +930,7 @@ public function highlight($content, $keywords)
         if (0 !== strpos($color, '#')) {
             $color = '#' . $color;
         }
-        include_once __DIR__ . '/highlighter.php';
+        require_once __DIR__ . '/highlighter.php';
         $highlighter = new PublisherHighlighter();
         $highlighter->setReplacementString('<span style="font-weight: bolder; background-color: ' . $color . ';">\1</span>');
 

diff --git a/class/uploader.php b/class/uploader.php
@@ -20,7 +20,7 @@
 /**
  * !
  * Example
- * include_once __DIR__ . '/uploader.php';
+ * require_once __DIR__ . '/uploader.php';
  * $allowed_mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png');
  * $maxfilesize = 50000;
  * $maxfilewidth = 120;
@@ -42,7 +42,7 @@
  * Upload Media files
  * Example of usage:
  * <code>
- * include_once __DIR__ . '/uploader.php';
+ * require_once __DIR__ . '/uploader.php';
  * $allowed_mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png');
  * $maxfilesize = 50000;
  * $maxfilewidth = 120;

diff --git a/comment_new.php b/comment_new.php
@@ -21,7 +21,7 @@
 use \Xmf\Request;
 
 include_once dirname(dirname(__DIR__)) . '/mainfile.php';
-include_once __DIR__ . '/include/common.php';
+require_once __DIR__ . '/include/common.php';
 
 $com_itemid = Request::getInt('com_itemid', 0, 'GET');
 if ($com_itemid > 0) {

diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -21,6 +21,13 @@
 - moved functions to Utility class (mamba)
 - changed to use XoopsFormSelectUser (geekwright/mamba)
 - started conversion to XMF (mamba)
+- move jquery and popeye to template due to conflicts when overriding in theme (geekwright)
+- switch to a color neutral skin for popeye (geekwright)
+- Eliminate line feed at EOF  (geekwright)
+- different bugs (bleekk)
+- changed min_db to 5.5 (mamba)
+- changed 'include_once' to 'require_once' (mamba)
+
 
 
 <h5>1.04 FINAL       (2015-10-21)</h5>

diff --git a/file.php b/file.php
@@ -20,7 +20,7 @@
 
 use \Xmf\Request;
 
-include_once __DIR__ . '/header.php';
+require_once __DIR__ . '/header.php';
 xoops_loadLanguage('admin', PUBLISHER_DIRNAME);
 
 $op     = Request::getString('op', Request::getString('op', '', 'GET'), 'POST');

diff --git a/header.php b/header.php
@@ -19,7 +19,7 @@
  */
 
 include_once dirname(dirname(__DIR__)) . '/mainfile.php';
-include_once __DIR__ . '/include/common.php';
+require_once __DIR__ . '/include/common.php';
 
 $myts = MyTextSanitizer::getInstance();
 

diff --git a/include/ajax_upload.php b/include/ajax_upload.php
@@ -21,7 +21,7 @@
 
 error_reporting(0);
 include dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
-include_once __DIR__ . '/common.php';
+require_once __DIR__ . '/common.php';
 
 $GLOBALS['xoopsLogger']->activated = false;
 xoops_loadLanguage('common', basename(dirname(__DIR__)));

diff --git a/include/common.php b/include/common.php
@@ -20,7 +20,7 @@
  */
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-//include_once __DIR__ . '/config.php';
+//require_once __DIR__ . '/config.php';
 
 define('PUBLISHER_DIRNAME', basename(dirname(__DIR__)));
 define('PUBLISHER_URL', XOOPS_URL . '/modules/' . PUBLISHER_DIRNAME);

diff --git a/include/notification.inc.php b/include/notification.inc.php
@@ -21,7 +21,7 @@
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once __DIR__ . '/seo_functions.php';
+require_once __DIR__ . '/seo_functions.php';
 
 /**
  * @param $category

diff --git a/include/seo_functions.php b/include/seo_functions.php
@@ -21,7 +21,7 @@
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once __DIR__ . '/common.php';
+require_once __DIR__ . '/common.php';
 
 /**
  * Class PublisherSeo
@@ -50,36 +50,36 @@ public static function getTitle($title = '', $withExt = true)
         $title = rawurlencode(strtolower($title));
 
         // Transformation des ponctuations
-    $pattern = array(
-        '/%09/', // Tab
-        '/%20/', // Space
-        '/%21/', // !
-        '/%22/', // "
-        '/%23/', // #
-        '/%25/', // %
-        '/%26/', // &
-        '/%27/', // '
-        '/%28/', // (
-        '/%29/', // )
-        '/%2C/', // ,
-        '/%2F/', // /
-        '/%3A/', // :
-        '/%3B/', // ;
-        '/%3C/', // <
-        '/%3D/', // =
-        '/%3E/', // >
-        '/%3F/', // ?
-        '/%40/', // @
-        '/%5B/', // [
-        '/%5C/', // \
-        '/%5D/', // ]
-        '/%5E/', // ^
-        '/%7B/', // {
-        '/%7C/', // |
-        '/%7D/', // }
-        '/%7E/', // ~
-        "/\./" // .
-    );
+        $pattern    = array(
+            '/%09/', // Tab
+            '/%20/', // Space
+            '/%21/', // !
+            '/%22/', // "
+            '/%23/', // #
+            '/%25/', // %
+            '/%26/', // &
+            '/%27/', // '
+            '/%28/', // (
+            '/%29/', // )
+            '/%2C/', // ,
+            '/%2F/', // /
+            '/%3A/', // :
+            '/%3B/', // ;
+            '/%3C/', // <
+            '/%3D/', // =
+            '/%3E/', // >
+            '/%3F/', // ?
+            '/%40/', // @
+            '/%5B/', // [
+            '/%5C/', // \
+            '/%5D/', // ]
+            '/%5E/', // ^
+            '/%7B/', // {
+            '/%7C/', // |
+            '/%7D/', // }
+            '/%7E/', // ~
+            "/\./" // .
+        );
         $repPattern = array('-', '-', '', '', '', '-100', '', '-', '', '', '', '-', '', '', '', '-', '', '', '-at-', '', '-', '', '-', '', '-', '', '-', '');
         $title      = preg_replace($pattern, $repPattern, $title);
 

diff --git a/index.php b/index.php
@@ -21,7 +21,7 @@
 
 use \Xmf\Request;
 
-include_once __DIR__ . '/header.php';
+require_once __DIR__ . '/header.php';
 
 // At which record shall we start for the Categories
 $catstart = Request::getInt('catstart', 0, 'GET');

diff --git a/item.php b/item.php
@@ -21,7 +21,7 @@
 
 use \Xmf\Request;
 
-include_once __DIR__ . '/header.php';
+require_once __DIR__ . '/header.php';
 
 $itemId     = Request::getInt('itemid', 0, 'GET');
 $itemPageId = Request::getInt('page', -1, 'GET');
@@ -46,7 +46,7 @@
 //$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
 //$xoTheme->addScript(PUBLISHER_URL . '/assets/js/jquery.popeye-2.1.js');
 //$xoTheme->addScript(PUBLISHER_URL . '/assets/js/publisher.js');
-
+//
 //$xoTheme->addStylesheet(PUBLISHER_URL . '/assets/css/jquery.popeye.css');
 //$xoTheme->addStylesheet(PUBLISHER_URL . '/assets/css/jquery.popeye.style.css');
 //$xoTheme->addStylesheet(PUBLISHER_URL . '/assets/css/publisher.css');

diff --git a/makepdf.php b/makepdf.php
@@ -9,7 +9,7 @@
 
 error_reporting(E_ALL);
 
-include_once __DIR__ . '/header.php';
+require_once __DIR__ . '/header.php';
 $itemid       = Request::getInt('itemid', 0, 'GET');
 $item_page_id = Request::getInt('page', -1, 'GET');
 if ($itemid == 0) {

diff --git a/pop.php b/pop.php
@@ -22,4 +22,4 @@
 $doNotStartPrint = true;
 $noTitle         = true;
 $smartPopup      = true;
-include_once __DIR__ . '/print.php';
+require_once __DIR__ . '/print.php';
diff --git a/print.php b/print.php
@@ -21,7 +21,7 @@
 
 use \Xmf\Request;
 
-include_once __DIR__ . '/header.php';
+require_once __DIR__ . '/header.php';
 require_once $GLOBALS['xoops']->path('class/template.php');
 
 $itemid = Request::getInt('itemid', 0, 'GET');

diff --git a/rate.php b/rate.php
@@ -20,7 +20,7 @@
 
 use \Xmf\Request;
 
-include_once __DIR__ . '/header.php';
+require_once __DIR__ . '/header.php';
 
 //getting the values
 $rating = Request::getInt('rating', 0, 'GET');

diff --git a/search.php b/search.php
@@ -21,7 +21,7 @@
 
 use \Xmf\Request;
 
-include_once __DIR__ . '/header.php';
+require_once __DIR__ . '/header.php';
 xoops_loadLanguage('search');
 //Checking general permissions
 $configHandler     = xoops_getHandler('config');

diff --git a/submit.php b/submit.php
@@ -21,7 +21,7 @@
 
 use \Xmf\Request;
 
-include_once __DIR__ . '/header.php';
+require_once __DIR__ . '/header.php';
 xoops_loadLanguage('admin', PUBLISHER_DIRNAME);
 
 // Get the total number of categories

diff --git a/testdata/index.php b/testdata/index.php
@@ -15,7 +15,7 @@
  * @author          Michael Beck (aka Mamba)
  */
 
-include_once __DIR__ . '/../../../mainfile.php';
+require_once __DIR__ . '/../../../mainfile.php';
 
 if (!isset($moduleDirName)) {
     $moduleDirName = basename(dirname(__DIR__));
@@ -43,5 +43,5 @@ function loadSampleData()
     \Xmf\Database\TableLoad::loadTableFromArray('publisher_categories', $cat);
     \Xmf\Database\TableLoad::loadTableFromArray('publisher_items', $items);
 
-    redirect_header( '../admin/item.php', 1, _AM_PUBLISHER_SAMPLEDATA_SUCCESS);
+    redirect_header('../admin/item.php', 1, _AM_PUBLISHER_SAMPLEDATA_SUCCESS);
 }
diff --git a/view.tag.php b/view.tag.php
@@ -19,5 +19,5 @@
  */
 
 //todo: check this file
-include_once __DIR__ . '/header.php';
+require_once __DIR__ . '/header.php';
 include_once $GLOBALS['xoops']->path('modules/tag/view.tag.php');
diff --git a/visit.php b/visit.php
@@ -21,7 +21,7 @@
 
 use \Xmf\Request;
 
-include_once __DIR__ . '/header.php';
+require_once __DIR__ . '/header.php';
 
 $fileid = Request::getInt('fileid', 0, 'GET');
 
@@ -48,5 +48,5 @@
     header('Location: ' . $fileObj->getFileUrl());
 }
 
-echo "<html><head><meta http-equiv=\"Refresh\" content=\"0; URL=" . $myts->oopsHtmlSpecialChars($fileObj->getFileUrl()) . "\"/></head><body></body></html>";
+echo '<html><head><meta http-equiv="Refresh" content="0; URL=' . $myts->oopsHtmlSpecialChars($fileObj->getFileUrl()) . '"/></head><body></body></html>';
 exit();