From: <be...@us...> - 2014-09-03 23:16:04
|
Revision: 12774 http://sourceforge.net/p/xoops/svn/12774 Author: beckmi Date: 2014-09-03 23:15:49 +0000 (Wed, 03 Sep 2014) Log Message: ----------- replaced dirname(__FILE__) with __DIR__ Modified Paths: -------------- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/about.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/admin_header.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/index.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/main.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pagewrap.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/permissions.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_delete_file.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/backend.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/date_to_date.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_menu.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_new.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_random_item.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_recent.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_spot.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_files.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/search.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/file.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/formdatetime.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/groupperm.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/metagen.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/permission.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/rating.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/session.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_delete.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_edit.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_new.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_post.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_reply.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/header.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_upload.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/notification.inc.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/search.inc.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/seo_functions.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/list.tag.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/notification_update.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/pop.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/print.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/search.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/submit.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_singleitem.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_submit.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/view.tag.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/visit.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/xoops_version.php Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/about.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/about.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/about.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ * @version $Id: about.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; xoops_cp_header(); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/admin_header.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/admin_header.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/admin_header.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,8 +19,8 @@ * @version $Id: admin_header.php 10661 2013-01-04 19:22:48Z trabis $ */ -include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php'; -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; +include_once dirname(__DIR__) . '/include/common.php'; include_once XOOPS_ROOT_PATH . '/include/cp_header.php'; //xoops_loadLanguage('admin', PUBLISHER_DIRNAME); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,7 +19,7 @@ * @version $Id: category.php 10661 2013-01-04 19:22:48Z trabis $ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; $op = PublisherRequest::getString('op'); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -18,7 +18,7 @@ * @version $Id: clone.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(__FILE__) . "/admin_header.php"; +include_once __DIR__ . "/admin_header.php"; publisher_cpHeader(); //publisher_adminMenu(-1, _AM_PUBLISHER_CLONE); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,7 +19,7 @@ * @version $Id: file.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; $op = PublisherRequest::getString('op'); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ * @version $Id$ */ -include_once dirname(dirname(__FILE__)) . '/admin_header.php'; +include_once dirname(__DIR__) . '/admin_header.php'; $myts = MyTextSanitizer::getInstance(); $importFromModuleName = "xNews " . @$_POST['ams_version']; @@ -173,7 +173,7 @@ if ($op == 'go') { publisher_cpHeader(); //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT); - include_once (dirname(dirname(dirname(__FILE__)))) . '/include/common.php'; + include_once (dirname(dirname(__DIR__))) . '/include/common.php'; publisher_openCollapsableBar('amsimportgo', 'amsimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT); $module_handler = xoops_gethandler('module'); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ * @version $Id$ */ -include_once dirname(dirname(__FILE__)) . '/admin_header.php'; +include_once dirname(__DIR__) . '/admin_header.php'; $myts = MyTextSanitizer::getInstance(); $importFromModuleName = "AMS " . @$_POST['ams_version']; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ * @version $Id$ */ -include_once dirname(dirname(__FILE__)) . '/admin_header.php'; +include_once dirname(__DIR__) . '/admin_header.php'; $myts = MyTextSanitizer::getInstance(); $importFromModuleName = "cjaycontent " . @$_POST['cjaycontent_version']; @@ -98,7 +98,7 @@ if ($op == 'go') { publisher_cpHeader(); //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT); - include_once (dirname(dirname(dirname(__FILE__)))) . '/include/common.php'; + include_once (dirname(dirname(__DIR__))) . '/include/common.php'; publisher_openCollapsableBar( 'cjaycontentimportgo', 'cjaycontentimportgoicon', Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ * @version $Id: news.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(dirname(__FILE__)) . '/admin_header.php'; +include_once dirname(__DIR__) . '/admin_header.php'; $myts = MyTextSanitizer::getInstance(); $importFromModuleName = "News " . @$_POST['news_version']; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ * @version $Id: smartsection.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(dirname(__FILE__)) . '/admin_header.php'; +include_once dirname(__DIR__) . '/admin_header.php'; $myts = MyTextSanitizer::getInstance(); $importFromModuleName = "Smartsection " . @$_POST['smartsection_version']; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ * @version $Id: wfsection.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(dirname(__FILE__)) . '/admin_header.php'; +include_once dirname(__DIR__) . '/admin_header.php'; $myts = MyTextSanitizer::getInstance(); $importFromModuleName = "WF-Section " . @$_POST['wfs_version']; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ * @version $Id: xfsection.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(dirname(__FILE__)) . '/admin_header.php'; +include_once dirname(__DIR__) . '/admin_header.php'; $myts = MyTextSanitizer::getInstance(); $importFromModuleName = "XF-Section " . @$_POST['xfs_version']; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ * @version $Id$ */ -include_once dirname(dirname(__FILE__)) . '/admin_header.php'; +include_once dirname(__DIR__) . '/admin_header.php'; $myts = MyTextSanitizer::getInstance(); $importFromModuleName = "xNews " . @$_POST['xnews_version']; @@ -188,7 +188,7 @@ if ($op == 'go') { publisher_cpHeader(); //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT); - include_once (dirname(dirname(dirname(__FILE__)))) . '/include/common.php'; + include_once (dirname(dirname(__DIR__))) . '/include/common.php'; publisher_openCollapsableBar( 'xnewsimportgo', 'xnewsimportgoicon', Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,7 +19,7 @@ * @version $Id: import.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(__FILE__) . "/admin_header.php"; +include_once __DIR__ . "/admin_header.php"; $op = 'none'; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/index.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/index.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/index.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ * @version $Id: index.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; xoops_cp_header(); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ * @version $Id: item.php 10661 2013-01-04 19:22:48Z trabis $ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; $itemid = PublisherRequest::getInt('itemid'); $op = ($itemid > 0 || isset($_POST['editor'])) ? 'mod' : ''; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/main.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/main.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/main.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,7 +19,7 @@ * @version $Id:main.php 335 2011-12-05 20:24:01Z lus...@gm... $ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; include_once XOOPS_ROOT_PATH . '/class/xoopslists.php'; include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -21,7 +21,7 @@ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -$dirname = basename(dirname(dirname(__FILE__))); +$dirname = basename(dirname(__DIR__)); $module_handler = xoops_gethandler('module'); $module = $module_handler->getByDirname($dirname); $pathIcon32 = $module->getInfo('icons32'); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ * @version $Id: mimetypes.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; xoops_load('XoopsPagenav'); $start = $limit = 0; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pagewrap.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pagewrap.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pagewrap.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,7 +19,7 @@ * @version $Id: pagewrap.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; publisher_cpHeader(); //publisher_adminMenu(-1, _AM_PUBLISHER_ITEMS . " > " . _AM_PUBLISHER_PAGEWRAP); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/permissions.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/permissions.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/permissions.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,7 +19,7 @@ * @version $Id: permissions.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php'; $myts = MyTextSanitizer::getInstance(); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,7 +19,7 @@ * @version $Id: preferences.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; $module = $publisher->getModule(); $mod = $module->mid(); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_delete_file.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_delete_file.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_delete_file.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,7 +19,7 @@ * @version $Id: pw_delete_file.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; if (isset($_POST["op"]) && ($_POST["op"] == "delfileok")) { $dir = publisher_getUploadDir(true, 'content'); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,7 +19,7 @@ * @version $Id: pw_upload_file.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; $errors = array(); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -24,7 +24,7 @@ # [11-may-2001] Kenneth Lee - http://www.nexgear.com/ ###################################################################### -include_once dirname(__FILE__) . '/header.php'; +include_once __DIR__ . '/header.php'; $xoopsOption['template_main'] = 'publisher_archive.tpl'; include_once XOOPS_ROOT_PATH . '/header.php'; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,7 +19,7 @@ * @version $Id: author_items.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(__FILE__) . '/header.php'; +include_once __DIR__ . '/header.php'; $uid = PublisherRequest::getInt('uid'); if (empty($uid)) { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/backend.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/backend.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/backend.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ * @version $Id: backend.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(__FILE__) . '/header.php'; +include_once __DIR__ . '/header.php'; xoops_load('XoopsLocal'); error_reporting(0); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -21,7 +21,7 @@ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; function publisher_category_items_sel_show($options) { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/date_to_date.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/date_to_date.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/date_to_date.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -22,7 +22,7 @@ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; function publisher_date_to_date_show($options) { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -22,7 +22,7 @@ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; /*** * Function To Show Publisher Items From Categories In Their Own Columns Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_menu.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_menu.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_menu.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -22,7 +22,7 @@ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; function publisher_items_menu_show($options) { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_new.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_new.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_new.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -22,7 +22,7 @@ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; function publisher_items_new_show($options) { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_random_item.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_random_item.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_random_item.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -22,7 +22,7 @@ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; function publisher_items_random_item_show($options) { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_recent.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_recent.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_recent.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -22,7 +22,7 @@ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; function publisher_items_recent_show($options) { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_spot.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_spot.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_spot.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ */ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; function publisher_items_spot_show($options) { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_files.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_files.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_files.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -22,7 +22,7 @@ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; function publisher_latest_files_show($options) { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -23,7 +23,7 @@ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; function publisher_latest_news_show($options) { @@ -196,7 +196,7 @@ } $item['pdf'] = ''; - if ($publisher->getConfig('display_pdf')) { + if ($this->publisher->getConfig('display_pdf')) { if ($options[25] == 1) { $item['pdf'] = "<a href='" . PUBLISHER_URL . "/makepdf.php?itemid=" . $itemObj->itemid() . "' rel='nofollow'><img src='" . PUBLISHER_URL . "/assets/images/links/pdf.gif' title='" . _CO_PUBLISHER_PDF . "' alt='" . _CO_PUBLISHER_PDF . "' /></a> "; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/search.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/search.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/search.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -22,7 +22,7 @@ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; function publisher_search_show($options) { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ * @version $Id: category.php 10746 2013-01-10 20:54:35Z trabis $ */ -include_once dirname(__FILE__) . '/header.php'; +include_once __DIR__ . '/header.php'; $categoryid = PublisherRequest::getInt('categoryid'); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,7 +19,7 @@ */ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; class PublisherCategory extends XoopsObject { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/file.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/file.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/file.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,7 +19,7 @@ */ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; // File status define("_PUBLISHER_STATUS_FILE_NOTSET", -1); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -22,7 +22,7 @@ // defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined"); -include_once dirname(dirname(dirname(__FILE__))) . '/include/common.php'; +include_once dirname(dirname(__DIR__)) . '/include/common.php'; xoops_load('XoopsFormLoader'); include_once XOOPS_ROOT_PATH . '/class/tree.php'; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -22,7 +22,7 @@ // defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined"); -include_once dirname(dirname(dirname(__FILE__))) . '/include/common.php'; +include_once dirname(dirname(__DIR__)) . '/include/common.php'; xoops_load('XoopsFormLoader'); //todo: move to admin? Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -23,7 +23,7 @@ // defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined"); -include_once dirname(dirname(dirname(__FILE__))) . '/include/common.php'; +include_once dirname(dirname(__DIR__)) . '/include/common.php'; xoops_load('XoopsFormLoader'); xoops_load('XoopsLists'); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/formdatetime.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/formdatetime.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/formdatetime.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ */ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; class PublisherFormDateTime extends XoopsFormElementTray { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/groupperm.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/groupperm.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/groupperm.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -24,7 +24,7 @@ include_once XOOPS_ROOT_PATH . '/kernel/groupperm.php'; -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; class PublisherGroupPermHandler extends XoopsGroupPermHandler { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -18,7 +18,7 @@ * @version $Id: item.php 10728 2013-01-09 22:09:22Z trabis $ */ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; class PublisherItem extends XoopsObject { /** @@ -580,7 +580,7 @@ return sprintf(_CO_PUBLISHER_POSTEDBY, $posterName, $postdate); } - + /** * @return string */ @@ -589,7 +589,7 @@ $posterName = $this->linkedPosterName(); return $posterName; } - + /** * @return string */ @@ -851,7 +851,7 @@ if (substr($color, 0, 1) != '#') { $color = '#' . $color; } - include_once dirname(__FILE__) . '/highlighter.php'; + include_once __DIR__ . '/highlighter.php'; $highlighter = new PublisherHighlighter(); $highlighter->setReplacementString('<span style="font-weight: bolder; background-color: ' . $color . ';">\1</span>'); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/metagen.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/metagen.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/metagen.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,7 +19,7 @@ */ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; class PublisherMetagen { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -21,7 +21,7 @@ */ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; /** * PublisherBaseObjectHandler class Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/permission.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/permission.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/permission.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -21,7 +21,7 @@ * @version $Id: permission.php 10661 2013-01-04 19:22:48Z trabis $ */ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; class PublisherPermissionHandler extends XoopsObjectHandler { /** Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -33,7 +33,7 @@ protected function __construct($debug) { $this->debug = $debug; - $this->dirname = basename(dirname(dirname(__FILE__))); + $this->dirname = basename(dirname(__DIR__)); } static function &getInstance($debug = false) Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/rating.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/rating.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/rating.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ */ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; class PublisherRating extends XoopsObject { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/session.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/session.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/session.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -21,7 +21,7 @@ */ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; class PublisherSession { @@ -92,7 +92,7 @@ session_destroy(); } - static public function &getInstance() + public static function &getInstance() { static $_sess; if (!isset($_sess)) { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -21,7 +21,7 @@ */ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; /** * XoopsThemeTabForm Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_delete.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_delete.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_delete.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,5 +19,5 @@ * @version $Id: comment_delete.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once '../../mainfile.php'; +include dirname(dirname(__DIR__)) . '/mainfile.php'; include_once XOOPS_ROOT_PATH . '/include/comment_delete.php'; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_edit.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_edit.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_edit.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,5 +19,5 @@ * @version $Id: comment_edit.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once '../../mainfile.php'; +include dirname(dirname(__DIR__)) . '/mainfile.php'; include_once XOOPS_ROOT_PATH . '/include/comment_edit.php'; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_new.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_new.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_new.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,8 +19,8 @@ * @version $Id: comment_new.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(dirname(dirname(__FILE__))) . '/mainfile.php'; -include_once dirname(__FILE__) . '/include/common.php'; +include_once dirname(dirname(__DIR__)) . '/mainfile.php'; +include_once __DIR__ . '/include/common.php'; $com_itemid = isset($_GET['com_itemid']) ? intval($_GET['com_itemid']) : 0; if ($com_itemid > 0) { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_post.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_post.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_post.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,5 +19,5 @@ * @version $Id: comment_post.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once '../../mainfile.php'; +include dirname(dirname(__DIR__)) . '/mainfile.php'; include_once XOOPS_ROOT_PATH . '/include/comment_post.php'; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_reply.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_reply.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_reply.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,5 +19,5 @@ * @version $Id: comment_reply.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once '../../mainfile.php'; +include dirname(dirname(__DIR__)) . '/mainfile.php'; include_once XOOPS_ROOT_PATH . '/include/comment_reply.php'; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,7 +19,7 @@ * @version $Id: file.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(__FILE__) . '/header.php'; +include_once __DIR__ . '/header.php'; xoops_loadLanguage('admin', PUBLISHER_DIRNAME); $op = PublisherRequest::getString('op'); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/header.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/header.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/header.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,8 +19,8 @@ * @version $Id: header.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(dirname(dirname(__FILE__))) . '/mainfile.php'; -include_once dirname(__FILE__) . '/include/common.php'; +include_once dirname(dirname(__DIR__)) . '/mainfile.php'; +include_once __DIR__ . '/include/common.php'; $myts = MyTextSanitizer::getInstance(); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -17,7 +17,7 @@ // URL: http://www.xuups.com // E-Mail: lus...@gm... -include_once dirname(dirname(__FILE__)) . '/header.php'; +include_once dirname(__DIR__) . '/header.php'; error_reporting(0); $xoopsLogger->activated = false; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_upload.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_upload.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_upload.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -26,11 +26,11 @@ // ------------------------------------------------------------------------ // error_reporting(0); -include dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php'; -include_once dirname(__FILE__) . '/common.php'; +include dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; +include_once __DIR__ . '/common.php'; $GLOBALS['xoopsLogger']->activated = false; -xoops_loadLanguage('common', basename(dirname(dirname(__FILE__)))); +xoops_loadLanguage('common', basename(dirname(__DIR__))); if (!is_object($xoopsUser)) { $group = array(XOOPS_GROUP_ANONYMOUS); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -21,7 +21,7 @@ */ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -define("PUBLISHER_DIRNAME", basename(dirname(dirname(__FILE__)))); +define("PUBLISHER_DIRNAME", basename(dirname(__DIR__))); define("PUBLISHER_URL", XOOPS_URL . '/modules/' . PUBLISHER_DIRNAME); define("PUBLISHER_IMAGES_URL", PUBLISHER_URL . '/assets/images'); define("PUBLISHER_ADMIN_URL", PUBLISHER_URL . '/admin'); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -21,7 +21,7 @@ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(__FILE__) . '/common.php'; +include_once __DIR__ . '/common.php'; /** * Includes scripts in HTML header Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/notification.inc.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/notification.inc.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/notification.inc.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -22,7 +22,7 @@ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(__FILE__) . '/seo_functions.php'; +include_once __DIR__ . '/seo_functions.php'; function publisher_notify_iteminfo($category, $item_id) { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/search.inc.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/search.inc.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/search.inc.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -19,7 +19,7 @@ */ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__DIR__) . '/include/common.php'; function publisher_search($queryarray, $andor, $limit, $offset, $userid, $categories = array(), $sortby = 0, $searchin = "", $extra = "") { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/seo_functions.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/seo_functions.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/seo_functions.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -21,7 +21,7 @@ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -include_once dirname(__FILE__) . '/common.php'; +include_once __DIR__ . '/common.php'; function publisher_seo_title($title = '', $withExt = true) { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ * @version $Id: index.php 10727 2013-01-09 22:03:19Z trabis $ */ -include_once dirname(__FILE__) . '/header.php'; +include_once __DIR__ . '/header.php'; // At which record shall we start for the Categories $catstart = PublisherRequest::getInt('catstart'); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php 2014-09-03 11:33:58 UTC (rev 12773) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php 2014-09-03 23:15:49 UTC (rev 12774) @@ -20,7 +20,7 @@ * @version $Id: item.php 10374 2012-12-12 23:39:48Z trabis $ */ -include_once dirname(__FILE__) . '/header.php'; +include_once __DIR__ . '/header.php'; $itemid = PublisherRequest::getInt('itemid'); $item_page_id = PublisherRequest::getInt('page', -1); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publis... [truncated message content] |