1.05 RC1

XoopsModules25x · May 14, 2017 · f6055e7 · f6055e7
1 parent 37f96f6
commit f6055e7
Show file tree

Hide file tree

Showing 46 changed files with 189 additions and 77 deletions.
diff --git a/admin/category.php b/admin/category.php
@@ -18,7 +18,7 @@
  * @author          The SmartFactory <www.smartfactory.ca>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 require_once __DIR__ . '/admin_header.php';
 

diff --git a/admin/clone.php b/admin/clone.php
@@ -17,7 +17,7 @@
  * @author          trabis <[email protected]>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 require_once __DIR__ . '/admin_header.php';
 

diff --git a/admin/file.php b/admin/file.php
@@ -18,7 +18,7 @@
  * @author          The SmartFactory <www.smartfactory.ca>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 require_once __DIR__ . '/admin_header.php';
 

diff --git a/admin/import.php b/admin/import.php
@@ -18,7 +18,7 @@
  * @author          The SmartFactory <www.smartfactory.ca>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 require_once __DIR__ . '/admin_header.php';
 

diff --git a/admin/import/ams.php b/admin/import/ams.php
@@ -19,7 +19,7 @@
  * @author          Marius Scurtescu <[email protected]>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 include_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();

diff --git a/admin/import/cjaycontent.php b/admin/import/cjaycontent.php
@@ -19,7 +19,7 @@
  * @author          Marius Scurtescu <[email protected]>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 include_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();

diff --git a/admin/import/fmcontent.php b/admin/import/fmcontent.php
@@ -20,7 +20,7 @@
  * @author          ZySpec <[email protected]>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 include_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();

diff --git a/admin/import/news.php b/admin/import/news.php
@@ -19,7 +19,7 @@
  * @author          Marius Scurtescu <[email protected]>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 include_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();

diff --git a/admin/import/smartsection.php b/admin/import/smartsection.php
@@ -19,7 +19,7 @@
  * @author          Marius Scurtescu <[email protected]>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 include_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();

diff --git a/admin/import/wfsection.php b/admin/import/wfsection.php
@@ -19,7 +19,7 @@
  * @author          Marius Scurtescu <[email protected]>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 include_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();

diff --git a/admin/import/xfsection.php b/admin/import/xfsection.php
@@ -19,7 +19,7 @@
  * @author          ohwada
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 include_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();

diff --git a/admin/import/xnews.php b/admin/import/xnews.php
@@ -19,7 +19,7 @@
  * @author          Marius Scurtescu <[email protected]>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 include_once dirname(__DIR__) . '/admin_header.php';
 $myts = MyTextSanitizer::getInstance();

diff --git a/admin/item.php b/admin/item.php
@@ -19,7 +19,7 @@
  * @author          The SmartFactory <www.smartfactory.ca>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 require_once __DIR__ . '/admin_header.php';
 

diff --git a/admin/main.php b/admin/main.php
@@ -18,7 +18,7 @@
  * @author          The SmartFactory <www.smartfactory.ca>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 require_once __DIR__ . '/admin_header.php';
 include_once $GLOBALS['xoops']->path('class/xoopslists.php');

diff --git a/admin/preferences.php b/admin/preferences.php
@@ -18,7 +18,7 @@
  * @author          Kazumi Ono (AKA onokazu)
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 require_once __DIR__ . '/admin_header.php';
 

diff --git a/admin/pw_upload_file.php b/admin/pw_upload_file.php
@@ -18,7 +18,7 @@
  * @author          The SmartFactory <www.smartfactory.ca>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 require_once __DIR__ . '/admin_header.php';
 

diff --git a/archive.php b/archive.php
@@ -23,7 +23,7 @@
 # [11-may-2001] Kenneth Lee - http://www.nexgear.com/
 ######################################################################
 
-use \Xmf\Request;
+use Xmf\Request;
 
 require_once __DIR__ . '/header.php';
 $GLOBALS['xoopsOption']['template_main'] = 'publisher_archive.tpl';

diff --git a/author_items.php b/author_items.php
@@ -18,7 +18,7 @@
  * @author          trabis <[email protected]>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 require_once __DIR__ . '/header.php';
 

diff --git a/backend.php b/backend.php
@@ -19,7 +19,7 @@
  * @author          The SmartFactory <www.smartfactory.ca>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 require_once __DIR__ . '/header.php';
 //xoops_load('XoopsLocal'); //mb

diff --git a/blocks/items_menu.php b/blocks/items_menu.php
@@ -19,7 +19,7 @@
  * @author          The SmartFactory <www.smartfactory.ca>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 

diff --git a/blocks/search.php b/blocks/search.php
@@ -19,7 +19,7 @@
  * @author          phppp
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 

diff --git a/category.php b/category.php
@@ -19,7 +19,7 @@
  * @author          The SmartFactory <www.smartfactory.ca>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 require_once __DIR__ . '/header.php';
 

diff --git a/class/form/category.php b/class/form/category.php
@@ -19,7 +19,7 @@
  * @author          trabis <[email protected]>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 // defined('XOOPS_ROOT_PATH') || exit("XOOPS root path not defined");
 

diff --git a/class/form/item.php b/class/form/item.php
@@ -20,7 +20,7 @@
  * @author          trabis <[email protected]>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 // defined('XOOPS_ROOT_PATH') || exit("XOOPS root path not defined");
 

diff --git a/class/item.php b/class/item.php
@@ -17,7 +17,7 @@
  * @author          The SmartFactory <www.smartfactory.ca>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 //namespace Publisher;
 

diff --git a/class/utility.php b/class/utility.php
@@ -19,7 +19,7 @@
  *
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 include_once dirname(__DIR__) . '/include/common.php';
 

diff --git a/comment_new.php b/comment_new.php
@@ -18,7 +18,7 @@
  * @author          trabis <[email protected]>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 include_once dirname(dirname(__DIR__)) . '/mainfile.php';
 require_once __DIR__ . '/include/common.php';

diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,3 +1,12 @@
+<h5>1.05 RC 1       (NOT RELEASED)</h5>
+- fixed Pagination issues (geekwright)
+- check nonce and file path (geekwright)
+- escape search string (geekwright)
+- min XOOPS version: 2.5.9 (geekwright)
+- added ModuleConfigurator class (mamba)
+- updated disclaimer.html (mamba)
+- cosmetics (mamba)
+
 <h5>1.05 Beta 1       (NOT RELEASED)</h5>
 - PSR-2 code cosmetics (mamba)
 - addNavigation(basename(__FILE__))  (mamba)
@@ -14,7 +23,6 @@
 - short array syntax (mamba)
 - added install checks for PHP 5.5 and XOOPS 2.5.9 (mamba)
 - added auto-creation of upload folders (mamba)
-
 - changed static call to XoopsLocal::number_format to dynamic (mamba)
 - added bold to column headers in publisher_author_items.tpl (mamba)
 - fixed cloning of module image (masel/mamba)
@@ -23,7 +31,7 @@
 - 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)
+- eliminate line feed at EOF  (geekwright)
 - different bugs (bleekk)
 - changed min_db to 5.5 (mamba)
 - changed 'include_once' to 'require_once' (mamba)

diff --git a/file.php b/file.php
@@ -18,7 +18,7 @@
  * @author          The SmartFactory <www.smartfactory.ca>
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 require_once __DIR__ . '/header.php';
 xoops_loadLanguage('admin', PUBLISHER_DIRNAME);

diff --git a/include/ajax_rating.php b/include/ajax_rating.php
@@ -17,7 +17,7 @@
 //  URL: http://www.xuups.com
 //  E-Mail: [email protected]
 
-use \Xmf\Request;
+use Xmf\Request;
 
 include_once dirname(__DIR__) . '/header.php';
 

diff --git a/include/ajax_upload.php b/include/ajax_upload.php
@@ -17,7 +17,7 @@
  * @author         XOOPS Development Team
  */
 
-use \Xmf\Request;
+use Xmf\Request;
 
 error_reporting(0);
 include dirname(dirname(dirname(__DIR__))) . '/mainfile.php';

diff --git a/include/config.php b/include/config.php
@@ -42,6 +42,7 @@
 defined($capsDirName . '_UPLOAD_PATH') or define($capsDirName . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . constant($capsDirName . '_DIRNAME')); // WITHOUT Trailing slash
 
 //Configurator
+/*
 return array(
     'name'           => 'Module Configurator',
     'uploadFolders'  => array(
@@ -79,3 +80,61 @@
         '/tcpdf',
     ),
 );
+*/
+
+/**
+ * Class ModuleConfigurator
+ */
+class ModuleConfigurator
+{
+    public $uploadFolders   = [];
+    public $blankFiles  = [];
+    public $templateFolders = [];
+    public $oldFiles        = [];
+    public $oldFolders      = [];
+    public $name;
+
+    /**
+     * ModuleConfigurator constructor.
+     */
+    public function __construct()
+    {
+        $moduleDirName        = basename(dirname(__DIR__));
+        $capsDirName          = strtoupper($moduleDirName);
+        $this->name           = 'Module Configurator';
+        $this->uploadFolders  = [
+            constant($capsDirName . '_UPLOAD_PATH'),
+            constant($capsDirName . '_UPLOAD_PATH') . '/content',
+            constant($capsDirName . '_UPLOAD_PATH') . '/images',
+            constant($capsDirName . '_UPLOAD_PATH') . '/images/category',
+            constant($capsDirName . '_UPLOAD_PATH') . '/images/thumbnails',
+        ];
+        $this->blankFiles = [
+            constant($capsDirName . '_UPLOAD_PATH'),
+            constant($capsDirName . '_UPLOAD_PATH') . '/images/category',
+            constant($capsDirName . '_UPLOAD_PATH') . '/images/thumbnails',
+        ];
+
+        $this->templateFolders = [
+            '/templates/',
+            '/templates/blocks/',
+            '/templates/admin/'
+
+        ];
+        $this->oldFiles        = [
+            '/class/request.php',
+            '/class/registry.php',
+            '/class/utilities.php',
+            '/class/util.php',
+            '/include/constants.php',
+            '/include/functions.php',
+            '/ajaxrating.txt'
+        ];
+        $this->oldFolders      = [
+            '/images',
+            '/css',
+            '/js',
+            '/tcpdf',
+        ];
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ @@
      *
      */
-    use \Xmf\Request;
+    use Xmf\Request;
     include_once dirname(__DIR__) . '/include/common.php';
@@ Expand Down @@