From: <be...@us...> - 2014-06-29 01:45:05
|
Revision: 12663 http://sourceforge.net/p/xoops/svn/12663 Author: beckmi Date: 2014-06-29 01:44:58 +0000 (Sun, 29 Jun 2014) Log Message: ----------- replaced "dirname(__FILE__)" with "__DIR__" Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/extras/altsys_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xoopscache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/recaptcha.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/xoopsfile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/xoopsmodel.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty.class.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/censor/censor.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/flash/flash.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/image/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/mms/mms.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/rtsp/rtsp.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/soundcloud/soundcloud.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/textfilter/textfilter.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wiki/wiki.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wmp/wmp.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/formtinymce.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/xoopseditor.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/edituser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/imagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/cp_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/findusers.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/formdhtmltextarea_preview.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php XoopsCore/branches/2.5.x/2.5.8/htdocs/lostpass.php XoopsCore/branches/2.5.x/2.5.8/htdocs/misc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/prune.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/pmlite.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/readpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/viewpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/activate.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/category.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/deactivate.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/field.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/permissions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/step.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/visibility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/changemail.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/changepass.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/edituser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/include/update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/lostpass.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/register.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/userinfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groupperm.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/legacy/legacy.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php XoopsCore/branches/2.5.x/2.5.8/htdocs/notifications.php XoopsCore/branches/2.5.x/2.5.8/htdocs/pda.php XoopsCore/branches/2.5.x/2.5.8/htdocs/pmlite.php XoopsCore/branches/2.5.x/2.5.8/htdocs/readpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/register.php XoopsCore/branches/2.5.x/2.5.8/htdocs/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/blocks/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/category.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/item.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/item.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/userinfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/viewpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xmlrpc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/advisory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/center.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/mymenu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/ProtectorFilter.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/protector.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4everyone.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4guest.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/postcheck.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/postcheck_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/precheck.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/precheck_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Bootstrap.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/LanguageFactory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.auto.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.kses.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.path.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.safe-includes.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/module_icon.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/notification.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/oninstall.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/onuninstall.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/onupdate.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/upgrade/cnt-2.2.x-to-2.3.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.0-to-2.3.1/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.3-to-2.4.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.0-to-2.4.1/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.x-to-2.5.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.5.4-to-2.5.5/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.5.5-to-2.5.6/index.php Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8/extras/mainfile.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-06-29 01:44:58 UTC (rev 12663) @@ -3,9 +3,18 @@ =============================== NOT RELEASED: Version 2.5.8 Beta 1 =============================== -Bugfixes: +- replaced "dirname(__FILE__)" with "__DIR__" since the min. PHP is now 5.3.7, and __DIR__ is faster (mamba) =============================== +2014-06-20: Version 2.5.7 Final (Patch) +=============================== + +- Updating docu for the correct version of tablesorter (mamba) +- Fix path specified for include (rgriffith, mamba) +- added mainfile.php to /extras for use on servers where write to root is not possible (rgriffith) +- fix for array issue in pm/viempmsg.php (Roby73/mamba) + +=============================== 2014/06/14: Version 2.5.7 Final =============================== - updated XoopsMediaUploader to use system memory values from php.ini, and to offer random file names (mamba/luciorota/zyspec) @@ -30,7 +39,7 @@ Bugfixes: - fixed System Module image manager html/js bugs (luciorota) - replaced "array_diff_assoc" with "array_diff_key" in /class/theme_blocks.php (masel/mamba) -- icons for active module sections in System module not shown correctly (Slider84/mamba) +- icons for active module sections in System module not shown correctly (Slider84/mamba) - added two new language definitions (see lang_diff.txt) - added Office 2007 MIME types (Voltan) - added xml MIME type (Goffy) @@ -837,4 +846,4 @@ - modules/system/class/users.php: User Class Manager (Add) * Manage user with a specific class - modules/system/language/english/admin/users.php: User variable (Modify) - * Changed define name to follow XOOPS standard \ No newline at end of file + * Changed define name to follow XOOPS standard Modified: XoopsCore/branches/2.5.x/2.5.8/extras/altsys_functions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/altsys_functions.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/extras/altsys_functions.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -33,7 +33,7 @@ foreach( $mymenu_find_paths as $mymenu_find_path ) { if( file_exists( $mymenu_find_path ) ) { include $mymenu_find_path ; - include_once dirname(__FILE__).'/adminmenu_functions.php' ; + include_once __DIR__.'/adminmenu_functions.php' ; altsys_adminmenu_insert_mymenu( $xoopsModule ) ; altsys_adminmenu_hack_ft() ; break ; @@ -120,4 +120,4 @@ } -?> \ No newline at end of file +?> Added: XoopsCore/branches/2.5.x/2.5.8/extras/mainfile.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/mainfile.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8/extras/mainfile.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -0,0 +1,19 @@ +<?php +/** + * This is a dummy placeholder for mainfile.php, the XOOPS configuration file + * + * This is only needed for installation on servers that cannot write a file directly + * into the main XOOPS root directory. On these servers, the install will stop + * progressing after configuring the database (install/page_dbconnection.php) + * + * If you experience this problem: + * - copy this file to the XOOPS root directory + * - set the file permissions to make it writeable + * - rerun the install + * + * Typical writable permission would be 665 (user read/write, group read/write, other read) + * If problems persist, escalate permission to 777 (world read/write/execute) as a last resort. + */ +if (! defined('XOOPS_INSTALL')) { + header('Location: install/index.php'); +} Property changes on: XoopsCore/branches/2.5.x/2.5.8/extras/mainfile.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -14,7 +14,7 @@ if(!defined("FRAMEWORKS_ART_FUNCTIONS_ADMIN")): define("FRAMEWORKS_ART_FUNCTIONS_ADMIN", true); -defined("FRAMEWORKS_ART_FUNCTIONS_INI") || include_once dirname(__FILE__) . "/functions.ini.php"; +defined("FRAMEWORKS_ART_FUNCTIONS_INI") || include_once __DIR__ . "/functions.ini.php"; /** * @param $currentoption Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -14,7 +14,7 @@ if (defined('XOOPS_ART_FUNCTIONS')) return false; define('XOOPS_ART_FUNCTIONS', true); -include_once dirname(__FILE__) . "/functions.ini.php"; +include_once __DIR__ . "/functions.ini.php"; load_functions("cache"); load_functions("user"); @@ -22,7 +22,7 @@ load_functions("admin"); if (!class_exists('ArtObject')) - include_once dirname(__FILE__) . "/object.php"; + include_once __DIR__ . "/object.php"; /** * get MySQL server version Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -15,7 +15,7 @@ */ $xoopsOption['pagetype'] = 'admin'; -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'mainfile.php'; include_once $GLOBALS['xoops']->path('include/cp_functions.php'); /** * Admin Authentication Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -15,7 +15,7 @@ * @version $Id$ */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'mainfile.php'; $GLOBALS['xoopsLogger']->activated = false; if (function_exists('mb_http_output')) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -20,7 +20,7 @@ */ $xoopsOption['pagetype'] = 'banners'; -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'mainfile.php'; /********************************************/ /* Function to let your client login to see */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -21,7 +21,7 @@ defined('NWLINE')or define('NWLINE', "\n"); $xoopsOption['nocommon'] = true; -require_once dirname(__FILE__) . DS . 'mainfile.php'; +require_once __DIR__ . DS . 'mainfile.php'; error_reporting(0); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xoopscache.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xoopscache.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xoopscache.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -86,7 +86,7 @@ function loadEngine($name) { if (!class_exists('XoopsCache' . ucfirst($name))) { - if (file_exists($file = dirname(__FILE__) . '/' . strtolower($name) . '.php')) { + if (file_exists($file = __DIR__ . '/' . strtolower($name) . '.php')) { include $file; } else { trigger_error('File :' . $file . ' not found in file : ' . __FILE__ . ' at line: ' . __LINE__, E_USER_WARNING); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/recaptcha.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/recaptcha.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/recaptcha.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -42,7 +42,7 @@ */ function render() { - require_once dirname(__FILE__) . '/recaptcha/recaptchalib.php'; + require_once __DIR__ . '/recaptcha/recaptchalib.php'; $form = "<script type=\"text/javascript\"> var RecaptchaOptions = { theme : '" . $this->config['theme']."', @@ -64,7 +64,7 @@ function verify($sessionName) { $is_valid = false; - require_once dirname(__FILE__) . '/recaptcha/recaptchalib.php'; + require_once __DIR__ . '/recaptcha/recaptchalib.php'; if (!empty($_POST['recaptcha_response_field'])) { $resp = recaptcha_check_answer( $this->config['private_key'], Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/xoopsfile.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/xoopsfile.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/xoopsfile.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -71,7 +71,7 @@ switch ($name) { case 'folder': if (!class_exists('XoopsFolderHandler')) { - if (file_exists($folder = dirname(__FILE__) . '/folder.php')) { + if (file_exists($folder = __DIR__ . '/folder.php')) { include $folder; } else { trigger_error('Require Item : ' . str_replace(XOOPS_ROOT_PATH, '', $folder) . ' In File ' . __FILE__ . ' at Line ' . __LINE__, E_USER_WARNING); @@ -83,7 +83,7 @@ case 'file': default: if (!class_exists('XoopsFileHandler')) { - if (file_exists($file = dirname(__FILE__) . '/file.php')) { + if (file_exists($file = __DIR__ . '/file.php')) { include $file; } else { trigger_error('Require File : ' . str_replace(XOOPS_ROOT_PATH, '', $file) . ' In File ' . __FILE__ . ' at Line ' . __LINE__, E_USER_WARNING); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/xoopsmodel.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/xoopsmodel.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/xoopsmodel.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -79,7 +79,7 @@ { static $handlers; if (!isset($handlers[$name])) { - if (file_exists($file = dirname(__FILE__) . '/' . $name . '.php')) { + if (file_exists($file = __DIR__ . '/' . $name . '.php')) { include_once $file; $className = 'XoopsModel' . ucfirst($name); $handler = new $className(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty.class.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty.class.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty.class.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -46,7 +46,7 @@ */ if (!defined('SMARTY_DIR')) { - define('SMARTY_DIR', dirname(__FILE__) . DIRECTORY_SEPARATOR); + define('SMARTY_DIR', __DIR__ . DIRECTORY_SEPARATOR); } if (!defined('SMARTY_CORE_DIR')) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/censor/censor.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/censor/censor.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/censor/censor.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -40,7 +40,7 @@ if (!isset($censorConf)) { $config_handler = & xoops_gethandler('config'); $censorConf = $config_handler->getConfigsByCat(XOOPS_CONF_CENSOR); - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); //merge and allow config override $censorConf = array_merge($censorConf, $config); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/flash/flash.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/flash/flash.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/flash/flash.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -31,7 +31,7 @@ */ function encode($textarea_id) { - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); $code = "<img src='{$this->image_path}/swf.gif' alt='" . _XOOPS_FORM_ALTFLASH . "' title='" . _XOOPS_FORM_ALTFLASH . "' '" . "' onclick='xoopsCodeFlash(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERFLASHURL, ENT_QUOTES) . "\",\"" . htmlspecialchars(_XOOPS_FORM_ALT_ENTERHEIGHT, ENT_QUOTES) . "\",\"" @@ -98,7 +98,7 @@ */ static function decode($url, $width, $height) { - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); if ((empty($width) || empty($height)) && !empty($config['detect_dimension'])) { if (!$dimension = @getimagesize($url)) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/image/image.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/image/image.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/image/image.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -35,7 +35,7 @@ { static $jsLoaded; - $config = $this->loadConfig(dirname(__FILE__)); + $config = $this->loadConfig(__DIR__); $ts->patterns[] = "/\[img align=(['\"]?)(left|center|right)\\1 width=(['\"]?)([0-9]*)\\3]([^\"\(\)\?\&'<>]*)\[\/img\]/sU"; $ts->patterns[] = "/\[img align=(['\"]?)(left|center|right)\\1]([^\"\(\)\?\&'<>]*)\[\/img\]/sU"; $ts->patterns[] = "/\[img width=(['\"]?)([0-9]*)\\1]([^\"\(\)\?\&'<>]*)\[\/img\]/sU"; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/mms/mms.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/mms/mms.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/mms/mms.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -31,7 +31,7 @@ */ function encode($textarea_id) { - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); $code = "<img src='{$this->image_path}/mmssrc.gif' alt='" . _XOOPS_FORM_ALTMMS . "' title='" . _XOOPS_FORM_ALTMMS . "' '" . "' onclick='xoopsCodeMms(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERMMSURL, ENT_QUOTES) . "\",\"" . htmlspecialchars(_XOOPS_FORM_ALT_ENTERHEIGHT, ENT_QUOTES) . "\",\"" Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt 2014-06-29 01:44:58 UTC (rev 12663) @@ -14,7 +14,7 @@ function encode($textarea_id) { // If the extension has config data, load it - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); // Make sure that the icon is available /images/form/mycode.gif $code = "<img src='{$this->image_path}/mycode.gif' alt='" . _XOOPS_FORM_ALTMYCODE . "' onclick='xoopsCodeMycode(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERMYCODETERM, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> "; $javascript = <<<EOH @@ -39,26 +39,26 @@ // Return the scripts to be displayed in editor form and the javascript for relevant actions return array($code, $javascript); } - + // The code parser - function load(&$ts) + function load(&$ts) { $ts->patterns[] = "/\[mycode\]([^\]]*)\[\/mycode\]/esU"; - $ts->replacements[] = __CLASS__."::decode( '\\1' )"; + $ts->replacements[] = __CLASS__."::decode( '\\1' )"; } - + // Processing the text function decode($text) { // Load config data if any - $config = parent::loadConfig( dirname(__FILE__) ); + $config = parent::loadConfig( __DIR__ ); if ( empty($text) || empty($config['enabled']) ) return $text; $ret = someFunctionToConvertTheTextToDefinedFormat($text); return $ret; } } -config.custom.php: +config.custom.php: return $config = array( "extensions" => array( "iframe" => 0, Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/rtsp/rtsp.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/rtsp/rtsp.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/rtsp/rtsp.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -31,7 +31,7 @@ */ function encode($textarea_id) { - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); $code = "<img src='{$this->image_path}/rtspimg.gif' alt='" . _XOOPS_FORM_ALTRTSP . "' title='" . _XOOPS_FORM_ALTRTSP . "' '" . "' onclick='xoopsCodeRtsp(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERRTSPURL, ENT_QUOTES) . "\",\"" . htmlspecialchars(_XOOPS_FORM_ALT_ENTERHEIGHT, ENT_QUOTES) . "\",\"" Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/soundcloud/soundcloud.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/soundcloud/soundcloud.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/soundcloud/soundcloud.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -12,7 +12,7 @@ */ public function encode($textarea_id) { - $config = parent::loadConfig( dirname(__FILE__) ); + $config = parent::loadConfig( __DIR__ ); $code = "<img src='{$this->image_path}/soundcloud.png' alt='" . _XOOPS_FORM_ALT_SOUNDCLOUD . "' title='" . _XOOPS_FORM_ALT_SOUNDCLOUD . "' '" @@ -57,7 +57,7 @@ public static function myCallback($match) { $url = $match[1] . $match[2]; - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); if (!preg_match("/^http[s]?:\/\/(www\.)?soundcloud\.com\/(.*)/i", $url, $matches)) { trigger_error("Not matched: {$url}", E_USER_WARNING); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -33,7 +33,7 @@ */ function load(&$ts, $source, $language) { - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); if (empty($config['highlight'])) { return "<pre>{$source}</pre>"; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/textfilter/textfilter.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/textfilter/textfilter.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/textfilter/textfilter.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -55,7 +55,7 @@ $tags = array(); $search = array(); $replace = array(); - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); if (!empty($config["patterns"])) { foreach ($config["patterns"] as $pattern) { if (empty($pattern['search'])) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wiki/wiki.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wiki/wiki.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wiki/wiki.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -34,7 +34,7 @@ */ function encode($textarea_id) { - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); $code = "<img src='{$this->image_path}/wiki.gif' alt='" . _XOOPS_FORM_ALTWIKI . "' title='" . _XOOPS_FORM_ALTWIKI . "' '" . "' onclick='xoopsCodeWiki(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERWIKITERM, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> "; @@ -94,7 +94,7 @@ */ static function decode($text) { - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); if (empty($text) || empty($config['link'])) { return $text; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wmp/wmp.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wmp/wmp.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wmp/wmp.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -31,7 +31,7 @@ */ function encode($textarea_id) { - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); $code = "<img src='{$this->image_path}/wmp.gif' alt='" . _XOOPS_FORM_ALTWMP . "' title='" . _XOOPS_FORM_ALTWMP . "' '" . "' onclick='xoopsCodeWmp(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERWMPURL, ENT_QUOTES) . "\",\"" . htmlspecialchars(_XOOPS_FORM_ALT_ENTERHEIGHT, ENT_QUOTES) . "\",\"" Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -27,7 +27,7 @@ */ function encode($textarea_id) { - $config = parent::loadConfig( dirname(__FILE__) ); + $config = parent::loadConfig( __DIR__ ); $code = "<img src='{$this->image_path}/youtube.gif' alt='" . _XOOPS_FORM_ALTYOUTUBE . "' title='" . _XOOPS_FORM_ALTYOUTUBE . "' '" . "' onclick='xoopsCodeYoutube(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERYOUTUBEURL, ENT_QUOTES) . "\",\"" . htmlspecialchars(_XOOPS_FORM_ALT_ENTERHEIGHT, ENT_QUOTES) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/formtinymce.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/formtinymce.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/formtinymce.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -54,7 +54,7 @@ $this->configs["area_height"] = isset($this->configs["height"]) ? $this->configs["height"] : $this->height; $this->configs["fonts"] = $this->getFonts(); - require_once dirname(__FILE__) . "/tinymce.php"; + require_once __DIR__ . "/tinymce.php"; $this->editor = new TinyMCE($this->configs); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -14,7 +14,7 @@ */ // load mainfile.php - start -$current_path = dirname(__FILE__); +$current_path = __DIR__; if (DIRECTORY_SEPARATOR != "/") { $current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -14,7 +14,7 @@ */ // load mainfile.php -$current_path = dirname(__FILE__); +$current_path = __DIR__; if (DIRECTORY_SEPARATOR != "/") { $current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -14,7 +14,7 @@ */ // load mainfile.php -$current_path = dirname(__FILE__); +$current_path = __DIR__; if (DIRECTORY_SEPARATOR != "/") { $current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -14,7 +14,7 @@ */ // load mainfile.php - start -$current_path = dirname(__FILE__); +$current_path = __DIR__; if (DIRECTORY_SEPARATOR != "/") { $current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -90,7 +90,7 @@ // Load default settings if ( ! ($this->setting = @include( $GLOBALS['xoops']->path( "var/configs/tinymce.php" ) ) ) ) { - $this->setting = include dirname(__FILE__) . "/settings.php"; + $this->setting = include __DIR__ . "/settings.php"; } // get editor language (from ...) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/xoopseditor.inc.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/xoopseditor.inc.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/xoopseditor.inc.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -32,7 +32,7 @@ return true; } -$mainfile = dirname(dirname(dirname(__FILE__))) . '/mainfile.php'; +$mainfile = dirname(dirname(__DIR__)) . '/mainfile.php'; if (DIRECTORY_SEPARATOR != '/') { $mainfile = str_replace(DIRECTORY_SEPARATOR, '/', $mainfile); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/edituser.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/edituser.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/edituser.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -16,7 +16,7 @@ * @version $Id$ */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'mainfile.php'; $xoopsPreload =& XoopsPreload::getInstance(); $xoopsPreload->triggerEvent('core.edituser.start'); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/image.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/image.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/image.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -78,7 +78,7 @@ } $xoopsOption['nocommon'] = true; -require_once dirname(__FILE__) . DS . 'mainfile.php'; +require_once __DIR__ . DS . 'mainfile.php'; include_once XOOPS_ROOT_PATH . DS . 'include' . DS .'defines.php'; include_once XOOPS_ROOT_PATH . DS . 'include' . DS . 'functions.php'; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/imagemanager.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/imagemanager.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/imagemanager.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -16,7 +16,7 @@ * @version $Id$ */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'mainfile.php'; XoopsLoad::load('XoopsFilterInput'); if (isset($_REQUEST['target'])) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/cp_header.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/cp_header.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/cp_header.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -21,7 +21,7 @@ * the file that will include this file must be located under xoops_url/modules/module_directory_name/admin_directory_name/ */ $xoopsOption['pagetype'] = 'admin'; -include_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'mainfile.php'; include_once $GLOBALS['xoops']->path('include/cp_functions.php'); $moduleperm_handler =& xoops_gethandler('groupperm'); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/findusers.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/findusers.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/findusers.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -16,7 +16,7 @@ * @author Taiwen Jiang <ph...@us...> * @version $Id$ */ -include_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'mainfile.php'; xoops_header(false); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/formdhtmltextarea_preview.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/formdhtmltextarea_preview.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/formdhtmltextarea_preview.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -17,7 +17,7 @@ * @author Taiwen Jiang <ph...@us...> * @version $Id$ */ -include_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'mainfile.php'; $xoopsLogger->activated = false; $myts =& MyTextSanitizer::getInstance(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -1143,5 +1143,5 @@ return $domain; } -include_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'functions.encoding.php'; -include_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'functions.legacy.php'; +include_once __DIR__ . DIRECTORY_SEPARATOR . 'functions.encoding.php'; +include_once __DIR__ . DIRECTORY_SEPARATOR . 'functions.legacy.php'; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/version.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/version.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -25,7 +25,7 @@ * It is highly discouraged to use the license file * It will be depreciated and removed */ -@include_once dirname(__FILE__) . '/license.php'; +@include_once __DIR__ . '/license.php'; /** * Define XOOPS version Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/index.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/index.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/index.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -19,11 +19,11 @@ * @version $Id$ */ -if (file_exists(dirname(__FILE__) . '/mainfile.php')) { - include dirname(__FILE__) . '/mainfile.php'; +if (file_exists(__DIR__ . '/mainfile.php')) { + include __DIR__ . '/mainfile.php'; } if (!defined('XOOPS_MAINFILE_INCLUDED')) { - if (file_exists(dirname(__FILE__) . '/install/index.php')) { + if (file_exists(__DIR__ . '/install/index.php')) { header('Location: install/index.php'); exit; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/functions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/functions.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/functions.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -491,7 +491,7 @@ // Private Key $xoops_serdat['file'] = $func(__FILE__); $xoops_serdat['basename'] = $func(basename(__FILE__)); - $xoops_serdat['path'] = $func(dirname(__FILE__)); + $xoops_serdat['path'] = $func(__DIR__); foreach ($_SERVER as $key => $data) { $xoops_serdat[$key] = substr($func(serialize($data)),0, 4); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -343,5 +343,5 @@ { set_time_limit(180); - return xoPutLicenseKey(xoBuildLicenceKey(), XOOPS_ROOT_PATH . '/include/license.php', dirname(__FILE__) . '/license.dist.php'); + return xoPutLicenseKey(xoBuildLicenceKey(), XOOPS_ROOT_PATH . '/include/license.php', __DIR__ . '/license.dist.php'); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -880,7 +880,7 @@ } $loaded = 1; - $path = empty($this->plugin_path) ? dirname(__FILE__) . '/filters' : $this->plugin_path; + $path = empty($this->plugin_path) ? __DIR__ . '/filters' : $this->plugin_path; if (file_exists($file = $path . '/filter.php')) { include_once $file; foreach ($this->_filters as $f) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/lostpass.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/lostpass.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/lostpass.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -16,7 +16,7 @@ * @version $Id$ */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'mainfile.php'; $xoopsPreload =& XoopsPreload::getInstance(); $xoopsPreload->triggerEvent('core.lostpass.start'); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/misc.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/misc.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/misc.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -16,7 +16,7 @@ * @version $Id$ */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'mainfile.php'; xoops_loadLanguage('misc'); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -17,9 +17,9 @@ * @version $Id $ **/ -include_once dirname(__FILE__) . '/../../../include/cp_header.php'; +include_once __DIR__ . '/../../../include/cp_header.php'; include '../../../class/xoopsformloader.php'; -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; xoops_cp_header(); $aboutAdmin = new ModuleAdmin(); @@ -27,5 +27,5 @@ echo $aboutAdmin->addNavigation('about.php'); echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false); -include_once dirname(__FILE__) . '/admin_footer.php'; +include_once __DIR__ . '/admin_footer.php'; //xoops_cp_footer(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -17,7 +17,7 @@ * @version $Id$ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; xoops_cp_header(); $indexAdmin = new ModuleAdmin(); @@ -25,5 +25,5 @@ echo $indexAdmin->addNavigation('admin.php'); echo $indexAdmin->renderIndex(); -include_once dirname(__FILE__) . '/admin_footer.php'; +include_once __DIR__ . '/admin_footer.php'; //xoops_cp_footer(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin_header.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin_header.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin_header.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -18,7 +18,7 @@ */ -$path = dirname(dirname(dirname(dirname(__FILE__)))); +$path = dirname(dirname(dirname(__DIR__))); include_once $path . '/mainfile.php'; include_once $path . '/include/cp_functions.php'; require_once $path . '/include/cp_header.php'; @@ -28,7 +28,7 @@ $thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); //if functions.php file exist -//require_once dirname(dirname(__FILE__)) . '/include/functions.php'; +//require_once dirname(__DIR__) . '/include/functions.php'; // Load language files xoops_loadLanguage('admin', $thisModuleDir); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/menu.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/menu.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/menu.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -19,10 +19,10 @@ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -$path = dirname(dirname(dirname(dirname(__FILE__)))); +$path = dirname(dirname(dirname(__DIR__))); include_once $path . '/mainfile.php'; -$dirname = basename(dirname(dirname(__FILE__))); +$dirname = basename(dirname(__DIR__)); $module_handler = xoops_gethandler('module'); $module = $module_handler->getByDirname($dirname); $pathIcon32 = $module->getInfo('icons32'); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/prune.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/prune.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/prune.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -17,7 +17,7 @@ * @author Taiwen Jiang <ph...@us...> * @version $Id$ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; xoops_cp_header(); $indexAdmin = new ModuleAdmin(); @@ -84,5 +84,5 @@ redirect_header('admin.php', 2, sprintf(_PM_AM_MESSAGESPRUNED, $deletedrows)); break; } -include_once dirname(__FILE__) . '/admin_footer.php'; +include_once __DIR__ . '/admin_footer.php'; //xoops_cp_footer(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/update.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/update.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/update.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -17,7 +17,7 @@ * @version $Id$ */ -$path = dirname(dirname(dirname(dirname(__FILE__)))); +$path = dirname(dirname(dirname(__DIR__))); require_once $path . DIRECTORY_SEPARATOR . 'include' . DIRECTORY_SEPARATOR . 'cp_header.php'; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/pmlite.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/pmlite.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/pmlite.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -19,7 +19,7 @@ */ if (!defined('XOOPS_MAINFILE_INCLUDED')) { - include_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php'; + include_once dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'mainfile.php'; } else { chdir(XOOPS_ROOT_PATH . '/modules/pm/'); xoops_loadLanguage('main', 'pm'); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/readpmsg.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/readpmsg.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/readpmsg.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -18,7 +18,7 @@ * @version $Id$ */ -include_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include_once dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'mainfile.php'; if (!is_object($GLOBALS['xoopsUser'])) { redirect_header(XOOPS_URL, 3, _NOPERM); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/viewpmsg.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/viewpmsg.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/viewpmsg.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -18,7 +18,7 @@ * @version $Id$ */ -include_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include_once dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'mainfile.php'; if (!is_object($GLOBALS['xoopsUser'])) { redirect_header(XOOPS_URL, 3, _NOPERM); @@ -44,7 +44,7 @@ } else { $clean_msg_id = json_decode($_POST['msg_id'], true, 2); if (!empty($clean_msg_id)) { - $clean_msg_id = array_map("intval", $clean_msg_id); + $clean_msg_id = array_map("intval", (array) $clean_msg_id); } $size = count($clean_msg_id); $msg =& $clean_msg_id; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/activate.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/activate.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/activate.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -19,7 +19,7 @@ */ $xoopsOption['pagetype'] = "user"; -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'header.php'; include $GLOBALS['xoops']->path('header.php'); if (!empty($_GET['id']) && !empty($_GET['actkey'])) { @@ -62,7 +62,7 @@ } else { printf(_US_ACTVMAILOK, $thisuser->getVar('uname') ); } - include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php'; + include __DIR__ . DIRECTORY_SEPARATOR . 'footer.php'; } else { redirect_header(XOOPS_URL . '/user.php', 5, _US_ACTLOGIN, false); } @@ -106,4 +106,4 @@ } $xoBreadcrumbs[] = array('title' => _PROFILE_MA_REGISTER); -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'footer.php'; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -17,8 +17,8 @@ * @version $Id $ **/ -include_once dirname(__FILE__) . '/../../../include/cp_header.php'; -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/../../../include/cp_header.php'; +include_once __DIR__ . '/admin_header.php'; xoops_cp_header(); $module_info =& $module_handler->get($xoopsModule->getVar("mid")); @@ -28,4 +28,4 @@ echo $aboutAdmin->addNavigation('about.php'); echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false); -include_once dirname(__FILE__) . '/admin_footer.php'; +include_once __DIR__ . '/admin_footer.php'; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/admin_header.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/admin_header.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/admin_header.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -17,7 +17,7 @@ * @version $Id$ */ -$path = dirname(dirname(dirname(dirname(__FILE__)))); +$path = dirname(dirname(dirname(__DIR__))); include_once $path . '/mainfile.php'; include_once $path . '/include/cp_functions.php'; require_once $path . '/include/cp_header.php'; @@ -27,7 +27,7 @@ $thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); //if functions.php file exis... [truncated message content] |