From f6055e707edc8bb0dc31383b0333401a92721b91 Mon Sep 17 00:00:00 2001 From: mambax7 Date: Sun, 14 May 2017 00:40:29 -0400 Subject: [PATCH] 1.05 RC1 --- admin/category.php | 2 +- admin/clone.php | 2 +- admin/file.php | 2 +- admin/import.php | 2 +- admin/import/ams.php | 2 +- admin/import/cjaycontent.php | 2 +- admin/import/fmcontent.php | 2 +- admin/import/news.php | 2 +- admin/import/smartsection.php | 2 +- admin/import/wfsection.php | 2 +- admin/import/xfsection.php | 2 +- admin/import/xnews.php | 2 +- admin/item.php | 2 +- admin/main.php | 2 +- admin/preferences.php | 2 +- admin/pw_upload_file.php | 2 +- archive.php | 2 +- author_items.php | 2 +- backend.php | 2 +- blocks/items_menu.php | 2 +- blocks/search.php | 2 +- category.php | 2 +- class/form/category.php | 2 +- class/form/item.php | 2 +- class/item.php | 2 +- class/utility.php | 2 +- comment_new.php | 2 +- docs/changelog.txt | 12 +++++- file.php | 2 +- include/ajax_rating.php | 2 +- include/ajax_upload.php | 2 +- include/config.php | 59 +++++++++++++++++++++++++++ include/oninstall.php | 55 ++++++++++++++++++------- include/onupdate.php | 48 +++++++++++++++------- include/seo.inc.php | 2 +- index.php | 2 +- item.php | 2 +- language/english/help/disclaimer.html | 6 +-- makepdf.php | 2 +- print.php | 2 +- rate.php | 2 +- search.php | 2 +- submit.php | 2 +- thumb.php | 2 +- visit.php | 2 +- xoops_version.php | 6 +-- 46 files changed, 189 insertions(+), 77 deletions(-) diff --git a/admin/category.php b/admin/category.php index 57ac3fb8..74e3ad01 100644 --- a/admin/category.php +++ b/admin/category.php @@ -18,7 +18,7 @@ * @author The SmartFactory */ -use \Xmf\Request; +use Xmf\Request; require_once __DIR__ . '/admin_header.php'; diff --git a/admin/clone.php b/admin/clone.php index d66ae9ed..898ee349 100644 --- a/admin/clone.php +++ b/admin/clone.php @@ -17,7 +17,7 @@ * @author trabis */ -use \Xmf\Request; +use Xmf\Request; require_once __DIR__ . '/admin_header.php'; diff --git a/admin/file.php b/admin/file.php index 831843ac..91af19e5 100644 --- a/admin/file.php +++ b/admin/file.php @@ -18,7 +18,7 @@ * @author The SmartFactory */ -use \Xmf\Request; +use Xmf\Request; require_once __DIR__ . '/admin_header.php'; diff --git a/admin/import.php b/admin/import.php index 650351e5..eb6e110e 100644 --- a/admin/import.php +++ b/admin/import.php @@ -18,7 +18,7 @@ * @author The SmartFactory */ -use \Xmf\Request; +use Xmf\Request; require_once __DIR__ . '/admin_header.php'; diff --git a/admin/import/ams.php b/admin/import/ams.php index abfca555..1697f81a 100644 --- a/admin/import/ams.php +++ b/admin/import/ams.php @@ -19,7 +19,7 @@ * @author Marius Scurtescu */ -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 index ce36d340..e7024d22 100644 --- a/admin/import/cjaycontent.php +++ b/admin/import/cjaycontent.php @@ -19,7 +19,7 @@ * @author Marius Scurtescu */ -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 index 7f58bdf5..50c9ed68 100644 --- a/admin/import/fmcontent.php +++ b/admin/import/fmcontent.php @@ -20,7 +20,7 @@ * @author ZySpec */ -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 index 6ad3b9d2..6de314d5 100644 --- a/admin/import/news.php +++ b/admin/import/news.php @@ -19,7 +19,7 @@ * @author Marius Scurtescu */ -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 index 570f02a6..de5e8eff 100644 --- a/admin/import/smartsection.php +++ b/admin/import/smartsection.php @@ -19,7 +19,7 @@ * @author Marius Scurtescu */ -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 index 0e1463f1..58a0243b 100644 --- a/admin/import/wfsection.php +++ b/admin/import/wfsection.php @@ -19,7 +19,7 @@ * @author Marius Scurtescu */ -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 index 11a7b2e8..8d23d22c 100644 --- 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 index 52ee390a..f17d7626 100644 --- a/admin/import/xnews.php +++ b/admin/import/xnews.php @@ -19,7 +19,7 @@ * @author Marius Scurtescu */ -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 index fab76b44..780a71e2 100644 --- a/admin/item.php +++ b/admin/item.php @@ -19,7 +19,7 @@ * @author The SmartFactory */ -use \Xmf\Request; +use Xmf\Request; require_once __DIR__ . '/admin_header.php'; diff --git a/admin/main.php b/admin/main.php index ce9c15c2..344d071f 100644 --- a/admin/main.php +++ b/admin/main.php @@ -18,7 +18,7 @@ * @author The SmartFactory */ -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 index 7c6237b5..7f0c25f9 100644 --- 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 index 9a0f748d..babedfb6 100644 --- a/admin/pw_upload_file.php +++ b/admin/pw_upload_file.php @@ -18,7 +18,7 @@ * @author The SmartFactory */ -use \Xmf\Request; +use Xmf\Request; require_once __DIR__ . '/admin_header.php'; diff --git a/archive.php b/archive.php index 2e391846..4398817d 100644 --- 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 index 1debbef8..f2c00e38 100644 --- a/author_items.php +++ b/author_items.php @@ -18,7 +18,7 @@ * @author trabis */ -use \Xmf\Request; +use Xmf\Request; require_once __DIR__ . '/header.php'; diff --git a/backend.php b/backend.php index fee9397c..18609f21 100644 --- a/backend.php +++ b/backend.php @@ -19,7 +19,7 @@ * @author The SmartFactory */ -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 index eff2dc01..e780897e 100644 --- a/blocks/items_menu.php +++ b/blocks/items_menu.php @@ -19,7 +19,7 @@ * @author The SmartFactory */ -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 index 28579e28..4de13784 100644 --- 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 index dff10bd7..f54321e2 100644 --- a/category.php +++ b/category.php @@ -19,7 +19,7 @@ * @author The SmartFactory */ -use \Xmf\Request; +use Xmf\Request; require_once __DIR__ . '/header.php'; diff --git a/class/form/category.php b/class/form/category.php index 8d5dd019..cabc0893 100644 --- a/class/form/category.php +++ b/class/form/category.php @@ -19,7 +19,7 @@ * @author trabis */ -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 index 0752705b..b4067494 100644 --- a/class/form/item.php +++ b/class/form/item.php @@ -20,7 +20,7 @@ * @author trabis */ -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 index bdd3e62f..3e5cb799 100644 --- a/class/item.php +++ b/class/item.php @@ -17,7 +17,7 @@ * @author The SmartFactory */ -use \Xmf\Request; +use Xmf\Request; //namespace Publisher; diff --git a/class/utility.php b/class/utility.php index 08adff54..35b3e420 100644 --- 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 index ee7c9ad2..5527d70b 100644 --- a/comment_new.php +++ b/comment_new.php @@ -18,7 +18,7 @@ * @author trabis */ -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 index 5a0588c3..18b0d06e 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -1,3 +1,12 @@ +
1.05 RC 1 (NOT RELEASED)
+- 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) +
1.05 Beta 1 (NOT RELEASED)
- 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 index 04632a83..80759bff 100644 --- a/file.php +++ b/file.php @@ -18,7 +18,7 @@ * @author The SmartFactory */ -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 index c099c88b..51da6970 100644 --- a/include/ajax_rating.php +++ b/include/ajax_rating.php @@ -17,7 +17,7 @@ // URL: http://www.xuups.com // E-Mail: lusopoemas@gmail.com -use \Xmf\Request; +use Xmf\Request; include_once dirname(__DIR__) . '/header.php'; diff --git a/include/ajax_upload.php b/include/ajax_upload.php index 7c27c78d..1d9c1366 100644 --- 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 index 56cae2e2..c25d4db7 100644 --- 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', + ]; + } +} diff --git a/include/oninstall.php b/include/oninstall.php index 1a8036af..bf98695d 100644 --- a/include/oninstall.php +++ b/include/oninstall.php @@ -57,30 +57,57 @@ function xoops_module_pre_install_publisher(XoopsModule $xoopsModule) */ function xoops_module_install_publisher(XoopsModule $xoopsModule) { - include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; + require_once __DIR__ . '/../../../mainfile.php'; + require_once __DIR__ . '/../include/config.php'; + if (!isset($moduleDirName)) { $moduleDirName = basename(dirname(__DIR__)); } - xoops_loadLanguage('admin', $moduleDirName); - xoops_loadLanguage('modinfo', $moduleDirName); + if (false !== ($moduleHelper = Xmf\Module\Helper::getHelper($moduleDirName))) { + } else { + $moduleHelper = Xmf\Module\Helper::getHelper('system'); + } + + // Load language files + $moduleHelper->loadLanguage('admin'); + $moduleHelper->loadLanguage('modinfo'); + + $configurator = new ModuleConfigurator(); + $classUtility = ucfirst($moduleDirName) . 'Utility'; + if (!class_exists($classUtility)) { + xoops_load('utility', $moduleDirName); + } // $moduleDirName = $xoopsModule->getVar('dirname'); - $configurator = include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/config.php'); - - if (count($configurator['uploadFolders']) > 0) { - foreach (array_keys($configurator['uploadFolders']) as $i) { - PublisherUtility::createFolder($configurator['uploadFolders'][$i]); +// include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/config.php'); + + // --- CREATE FOLDERS --------------- + if (count($configurator->uploadFolders) > 0) { + // foreach (array_keys($GLOBALS['uploadFolders']) as $i) { + foreach (array_keys($configurator->uploadFolders) as $i) { + $classUtility::createFolder($configurator->uploadFolders[$i]); } } - - if (count($configurator['blankFiles']) > 0) { - $file = PUBLISHER_ROOT_PATH . '/assets/images/blank.png'; - foreach (array_keys($configurator['blankFiles']) as $i) { - $dest = $configurator['blankFiles'][$i] . '/blank.png'; - PublisherUtility::copyFile($file, $dest); + + // --- COPY blank.png FILES --------------- + if (count($configurator->blankFiles) > 0) { + $file = __DIR__ . '/../assets/images/blank.png'; + foreach (array_keys($configurator->blankFiles) as $i) { + $dest = $configurator->blankFiles[$i] . '/blank.png'; + $classUtility::copyFile($file, $dest); } } +/* + foreach (array_keys($uploadFolders) as $i) { + PublisherUtility::createFolder($uploadFolders[$i]); + } + $file = PUBLISHER_ROOT_PATH . '/assets/images/blank.png'; + foreach (array_keys($blankFiles) as $i) { + $dest = $blankFiles[$i] . '/blank.png'; + PublisherUtility::copyFile($file, $dest); + } +*/ return true; } diff --git a/include/onupdate.php b/include/onupdate.php index e986e0bc..e15cce83 100644 --- a/include/onupdate.php +++ b/include/onupdate.php @@ -57,9 +57,28 @@ function xoops_module_pre_update_publisher(XoopsModule $module) function xoops_module_update_publisher(XoopsModule $module, $previousVersion = null) { global $xoopsDB; + require_once __DIR__ . '/../../../mainfile.php'; + require_once __DIR__ . '/../include/config.php'; + if (!isset($moduleDirName)) { $moduleDirName = basename(dirname(__DIR__)); } + + if (false !== ($moduleHelper = Xmf\Module\Helper::getHelper($moduleDirName))) { + } else { + $moduleHelper = Xmf\Module\Helper::getHelper('system'); + } + + // Load language files + $moduleHelper->loadLanguage('admin'); + $moduleHelper->loadLanguage('modinfo'); + + $configurator = new ModuleConfigurator(); + $classUtility = ucfirst($moduleDirName) . 'Utility'; + if (!class_exists($classUtility)) { + xoops_load('utility', $moduleDirName); + } + //delete .html entries from the tpl table $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $module->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'"; $xoopsDB->queryF($sql); @@ -78,15 +97,14 @@ function xoops_module_update_publisher(XoopsModule $module, $previousVersion = n $sql = ' ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix($module->getVar('dirname', 'n') . '_categories') . ' MODIFY `meta_description` TEXT NULL'; $xoopsDB->queryF($sql); - $configurator = include __DIR__ . '/config.php'; $classUtility = ucfirst($moduleDirName) . 'Utility'; if (!class_exists($classUtility)) { xoops_load('utility', $moduleDirName); } //delete old HTML templates - if (count($configurator['templateFolders']) > 0) { - foreach ($configurator['templateFolders'] as $folder) { + if (count($configurator->templateFolders) > 0) { + foreach ($configurator->templateFolders as $folder) { $templateFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $folder); if (is_dir($templateFolder)) { $templateList = array_diff(scandir($templateFolder), array('..', '.')); @@ -103,10 +121,10 @@ function xoops_module_update_publisher(XoopsModule $module, $previousVersion = n } // --- DELETE OLD FILES --------------- - if (count($configurator['oldFiles']) > 0) { + if (count($configurator->oldFiles) > 0) { // foreach (array_keys($GLOBALS['uploadFolders']) as $i) { - foreach (array_keys($configurator['oldFiles']) as $i) { - $tempFile = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator['oldFiles'][$i]); + foreach (array_keys($configurator->oldFiles) as $i) { + $tempFile = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFiles[$i]); if (is_file($tempFile)) { unlink($tempFile); } @@ -115,10 +133,10 @@ function xoops_module_update_publisher(XoopsModule $module, $previousVersion = n // --- DELETE OLD FOLDERS --------------- xoops_load('XoopsFile'); - if (count($configurator['oldFolders']) > 0) { + if (count($configurator->oldFolders) > 0) { // foreach (array_keys($GLOBALS['uploadFolders']) as $i) { - foreach (array_keys($configurator['oldFolders']) as $i) { - $tempFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator['oldFolders'][$i]); + foreach (array_keys($configurator->oldFolders) as $i) { + $tempFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFolders[$i]); /** @var XoopsObjectHandler $folderHandler */ $folderHandler = XoopsFile::getHandler('folder', $tempFolder); $folderHandler->delete($tempFolder); @@ -126,18 +144,18 @@ function xoops_module_update_publisher(XoopsModule $module, $previousVersion = n } // --- CREATE FOLDERS --------------- - if (count($configurator['uploadFolders']) > 0) { + if (count($configurator->uploadFolders) > 0) { // foreach (array_keys($GLOBALS['uploadFolders']) as $i) { - foreach (array_keys($configurator['uploadFolders']) as $i) { - $classUtility::createFolder($configurator['uploadFolders'][$i]); + foreach (array_keys($configurator->uploadFolders) as $i) { + $classUtility::createFolder($configurator->uploadFolders[$i]); } } // --- COPY blank.png FILES --------------- - if (count($configurator['copyFiles']) > 0) { + if (count($configurator->blankFiles) > 0) { $file = __DIR__ . '/../assets/images/blank.png'; - foreach (array_keys($configurator['copyFiles']) as $i) { - $dest = $configurator['copyFiles'][$i] . '/blank.png'; + foreach (array_keys($configurator->blankFiles) as $i) { + $dest = $configurator->blankFiles[$i] . '/blank.png'; $classUtility::copyFile($file, $dest); } } diff --git a/include/seo.inc.php b/include/seo.inc.php index abe9bd53..e1c56c6b 100644 --- a/include/seo.inc.php +++ b/include/seo.inc.php @@ -19,7 +19,7 @@ * @author Sudhaker Raj */ -use \Xmf\Request; +use Xmf\Request; // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined'); diff --git a/index.php b/index.php index e1256d3b..9dfa7d92 100644 --- a/index.php +++ b/index.php @@ -19,7 +19,7 @@ * @author The SmartFactory */ -use \Xmf\Request; +use Xmf\Request; require_once __DIR__ . '/header.php'; diff --git a/item.php b/item.php index fe91d951..e63f57f1 100644 --- a/item.php +++ b/item.php @@ -19,7 +19,7 @@ * @author The SmartFactory */ -use \Xmf\Request; +use Xmf\Request; require_once __DIR__ . '/header.php'; diff --git a/language/english/help/disclaimer.html b/language/english/help/disclaimer.html index 218fa90d..fdf1b05c 100644 --- a/language/english/help/disclaimer.html +++ b/language/english/help/disclaimer.html @@ -6,7 +6,7 @@

DISCLAIMER

Software downloaded from the XOOPS web site is provided 'as is' without warranty of any kind, either express or implied, including, but not limited to, the implied warranties of fitness for a purpose, or the warranty of non-infringement. Without - limiting the foregoing, WF-Projects team makes no warranty that:

+ limiting the foregoing, XOOPS Projects team makes no warranty that:


  1. the software will meet your requirements
    2. @@ -35,11 +35,11 @@

    DISCLAIMER


    In no event shall XOOPS team be liable to you or any third parties for any special, punitive, incidental, indirect or consequential damages of any kind, or any damages whatsoever, including, without limitation, those resulting from loss - of use, data or profits, whether or not WF-Sections has been advised of the possibility + of use, data or profits, whether or not XOOPS Project has been advised of the possibility of such damages, and on any theory of liability, arising out of or in connection with the use of this software.


    -

    The use of the software downloaded through XOOPS site is done at your own discretion +

    The use of the software downloaded through any XOOPS site is done at your own discretion and risk and with agreement that you will be solely responsible for any damage to your computer system or loss of data that results from such activities. No advice or information, whether oral or written, obtained by you from XOOPS or from XOOPS diff --git a/makepdf.php b/makepdf.php index 6089d26f..b8cc4ccc 100644 --- a/makepdf.php +++ b/makepdf.php @@ -5,7 +5,7 @@ * Created by montuy337513 / philodenelle - http://www.chg-web.org */ -use \Xmf\Request; +use Xmf\Request; error_reporting(E_ALL); diff --git a/print.php b/print.php index 825a6757..4f4bd18c 100644 --- a/print.php +++ b/print.php @@ -19,7 +19,7 @@ * @author The SmartFactory */ -use \Xmf\Request; +use Xmf\Request; require_once __DIR__ . '/header.php'; require_once $GLOBALS['xoops']->path('class/template.php'); diff --git a/rate.php b/rate.php index 1681df5f..9f89899e 100644 --- a/rate.php +++ b/rate.php @@ -18,7 +18,7 @@ * @author trabis */ -use \Xmf\Request; +use Xmf\Request; require_once __DIR__ . '/header.php'; diff --git a/search.php b/search.php index 701995d8..6a86c279 100644 --- a/search.php +++ b/search.php @@ -19,7 +19,7 @@ * @author Taiwen Jiang */ -use \Xmf\Request; +use Xmf\Request; require_once __DIR__ . '/header.php'; xoops_loadLanguage('search'); diff --git a/submit.php b/submit.php index 48a0c8b7..f4bd47d5 100644 --- a/submit.php +++ b/submit.php @@ -19,7 +19,7 @@ * @author The SmartFactory */ -use \Xmf\Request; +use Xmf\Request; require_once __DIR__ . '/header.php'; xoops_loadLanguage('admin', PUBLISHER_DIRNAME); diff --git a/thumb.php b/thumb.php index f12873dd..83366f16 100644 --- a/thumb.php +++ b/thumb.php @@ -21,7 +21,7 @@ * everytime you download a new version */ -use \Xmf\Request; +use Xmf\Request; require_once __DIR__ . '/header.php'; diff --git a/visit.php b/visit.php index fd0aefd7..bd42cd48 100644 --- a/visit.php +++ b/visit.php @@ -19,7 +19,7 @@ * @author The SmartFactory */ -use \Xmf\Request; +use Xmf\Request; require_once __DIR__ . '/header.php'; diff --git a/xoops_version.php b/xoops_version.php index 33bf6026..0e352719 100644 --- a/xoops_version.php +++ b/xoops_version.php @@ -18,7 +18,7 @@ * @author The SmartFactory */ -use \Xmf\Request; +use Xmf\Request; // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined'); @@ -29,8 +29,8 @@ $modversion = array( 'version' => '1.05', - 'module_status' => 'Beta 1', - 'release_date' => '2017/05/05', + 'module_status' => 'RC 1', + 'release_date' => '2017/05/14', 'name' => _MI_PUBLISHER_MD_NAME, 'description' => _MI_PUBLISHER_MD_DESC, 'author' => 'Trabis (www.Xuups.com)',