[xoops-svn] SF.net SVN: xoops-svn:[12664] XoopsCore/branches/2.5.x/2.5.8

[<be...@us...>]

Revision: 12664
          http://sourceforge.net/p/xoops/svn/12664
Author:   beckmi
Date:     2014-06-29 03:11:49 +0000 (Sun, 29 Jun 2014)
Log Message:
-----------
replaced "dirname(__FILE__)" with "__DIR__" (part 2)

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt
    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/youtube/youtube.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.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/protector/admin/about.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/admin_menu.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/advisory.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/center.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/index.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/prefix_manager.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/blocks/blocks.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/index.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/module_icon.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/mytrustdirname.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification_update.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/oninstall.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onuninstall.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onupdate.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/search.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/xoops_version.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/jquery.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.class.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/header.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.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/blocks.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/gtickets.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/install_extramodcheck.inc.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/main.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

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-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt	2014-06-29 03:11:49 UTC (rev 12664)
@@ -51,7 +51,7 @@
     function decode($text)
     {
         // Load config data if any
-        $config = parent::loadConfig( __DIR__ );
+        $config = parent::loadConfig(__DIR__);
         if ( empty($text) || empty($config['enabled']) ) return $text;
         $ret = someFunctionToConvertTheTextToDefinedFormat($text);
         return $ret;

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-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/soundcloud/soundcloud.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -12,7 +12,7 @@
      */
     public function encode($textarea_id)
     {
-        $config = parent::loadConfig( __DIR__ );
+        $config = parent::loadConfig(__DIR__);
 
         $code = "<img src='{$this->image_path}/soundcloud.png' alt='" . _XOOPS_FORM_ALT_SOUNDCLOUD
             . "' title='" .  _XOOPS_FORM_ALT_SOUNDCLOUD . "' '"

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-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -27,7 +27,7 @@
      */
     function encode($textarea_id)
     {
-        $config = parent::loadConfig( __DIR__ );
+        $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/dhtmltextarea/dhtmltextarea.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -48,7 +48,7 @@
     function __construct($options = array())
     {
         parent::__construct( $options );
-        $this->rootPath = '/class/xoopseditor/' . basename( dirname( __FILE__ ) );
+        $this->rootPath = '/class/xoopseditor/' . basename(__DIR__);
         $hiddenText = isset( $this->configs['hiddenText'] ) ? $this->configs['hiddenText'] : $this->_hiddenText;
         xoops_load('XoopsFormDhtmlTextArea');
         $this->renderer = new XoopsFormDhtmlTextArea( '', $this->getName(), $this->getValue(), $this->getRows(), $this->getCols(), $hiddenText, $this->configs );

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-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -18,7 +18,7 @@
  **/
 
 include_once __DIR__ . '/../../../include/cp_header.php';
-include '../../../class/xoopsformloader.php';
+include_once __DIR__ . '/../../../class/xoopsformloader.php';
 include_once __DIR__ . '/admin_header.php';
 xoops_cp_header();
 

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/about.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/about.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/about.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -3,8 +3,8 @@
 require '../../../mainfile.php' ;
 if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ;
 
-$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-$mydirpath = dirname( dirname( __FILE__ ) ) ;
+$mydirname = basename( dirname(__DIR__) ) ;
+$mydirpath = dirname(__DIR__) ;
 require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
 
 require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin/about.php' ;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/admin_menu.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/admin_menu.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/admin_menu.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -2,8 +2,8 @@
 
 if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
 
-$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-$mydirpath = dirname( dirname( __FILE__ ) ) ;
+$mydirname = basename( dirname(__DIR__) ) ;
+$mydirpath = dirname(__DIR__) ;
 require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
 
 require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin_menu.php' ;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/advisory.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/advisory.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/advisory.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -3,8 +3,8 @@
 require '../../../mainfile.php' ;
 if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ;
 
-$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-$mydirpath = dirname( dirname( __FILE__ ) ) ;
+$mydirname = basename( dirname(__DIR__) ) ;
+$mydirpath = dirname(__DIR__) ;
 require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
 
 require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin/advisory.php' ;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/center.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/center.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/center.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -3,8 +3,8 @@
 require '../../../mainfile.php' ;
 if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ;
 
-$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-$mydirpath = dirname( dirname( __FILE__ ) ) ;
+$mydirname = basename( dirname(__DIR__) ) ;
+$mydirpath = dirname(__DIR__) ;
 require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
 
 //require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin.php' ;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/index.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/index.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/index.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -3,8 +3,8 @@
 require '../../../mainfile.php' ;
 if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ;
 
-$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-$mydirpath = dirname( dirname( __FILE__ ) ) ;
+$mydirname = basename( dirname(__DIR__) ) ;
+$mydirpath = dirname(__DIR__) ;
 require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
 
 require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin/index.php' ;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/prefix_manager.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/prefix_manager.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/prefix_manager.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -3,8 +3,8 @@
 require '../../../mainfile.php' ;
 if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ;
 
-$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-$mydirpath = dirname( dirname( __FILE__ ) ) ;
+$mydirname = basename( dirname(__DIR__) ) ;
+$mydirpath = dirname(__DIR__) ;
 require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
 
 require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin/prefix_manager.php' ;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/blocks/blocks.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/blocks/blocks.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/blocks/blocks.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -2,8 +2,8 @@
 
 if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
 
-$mydirname = basename( dirname(  dirname( __FILE__ ) ) ) ;
-$mydirpath = dirname( dirname( __FILE__ ) ) ;
+$mydirname = basename( dirname(  __DIR__ ) ) ;
+$mydirpath = dirname(__DIR__) ;
 require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
 
 require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/blocks.php' ;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/index.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/index.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/index.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -3,8 +3,8 @@
 require '../../mainfile.php' ;
 if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ;
 
-$mydirname = basename( dirname( __FILE__ ) ) ;
-$mydirpath = dirname( __FILE__ ) ;
+$mydirname = basename(__DIR__) ;
+$mydirpath = __DIR__ ;
 require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
 
 if( @$_GET['mode'] == 'admin' ) {

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/module_icon.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/module_icon.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/module_icon.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -5,8 +5,8 @@
 
 if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
 
-$mydirname = basename( dirname( __FILE__ ) ) ;
-$mydirpath = dirname( __FILE__ ) ;
+$mydirname = basename(__DIR__) ;
+$mydirpath = __DIR__ ;
 require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
 
 require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/module_icon.php' ;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/mytrustdirname.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/mytrustdirname.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/mytrustdirname.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -6,7 +6,7 @@
 
 include_once XOOPS_TRUST_PATH . '/modules/' . $mytrustdirname . '/class/registry.php';
 $registry =& ProtectorRegistry::getInstance();
-$registry->setEntry('mydirname',  basename(dirname( __FILE__ )));
-$registry->setEntry('mydirpath',  dirname( __FILE__ ));
+$registry->setEntry('mydirname',  basename(__DIR__));
+$registry->setEntry('mydirpath',  __DIR__);
 $registry->setEntry('mytrustdirname', $mytrustdirname);
 $registry->setEntry('language', empty($xoopsConfig['language']) ? "english" : $xoopsConfig['language']);

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -2,8 +2,8 @@
 
 if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
 
-$mydirname = basename( dirname( __FILE__ ) ) ;
-$mydirpath = dirname( __FILE__ ) ;
+$mydirname = basename(__DIR__) ;
+$mydirpath = __DIR__ ;
 require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
 
 require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/notification.php' ;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification_update.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification_update.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification_update.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -2,8 +2,8 @@
 require '../../mainfile.php' ;
 if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ;
 
-$mydirname = basename( dirname( __FILE__ ) ) ;
-$mydirpath = dirname( __FILE__ ) ;
+$mydirname = basename(__DIR__) ;
+$mydirpath = __DIR__ ;
 $mydirurl = XOOPS_URL.'/modules/'.$mydirname;
 
 require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/oninstall.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/oninstall.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/oninstall.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -2,8 +2,8 @@
 
 if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
 
-$mydirname = basename( dirname( __FILE__ ) ) ;
-$mydirpath = dirname( __FILE__ ) ;
+$mydirname = basename(__DIR__) ;
+$mydirpath = __DIR__ ;
 require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
 
 require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/oninstall.php' ;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onuninstall.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onuninstall.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onuninstall.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -2,8 +2,8 @@
 
 if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
 
-$mydirname = basename( dirname( __FILE__ ) ) ;
-$mydirpath = dirname( __FILE__ ) ;
+$mydirname = basename(__DIR__) ;
+$mydirpath = __DIR__ ;
 require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
 
 require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/onuninstall.php' ;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onupdate.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onupdate.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onupdate.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -2,8 +2,8 @@
 
 if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
 
-$mydirname = basename( dirname( __FILE__ ) ) ;
-$mydirpath = dirname( __FILE__ ) ;
+$mydirname = basename(__DIR__) ;
+$mydirpath = __DIR__ ;
 require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
 
 require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/onupdate.php' ;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/search.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/search.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/search.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -2,8 +2,8 @@
 
 if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
 
-$mydirname = basename( dirname( __FILE__ ) ) ;
-$mydirpath = dirname( __FILE__ ) ;
+$mydirname = basename(__DIR__) ;
+$mydirpath = __DIR__ ;
 require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
 
 require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/search.php' ;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/xoops_version.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/xoops_version.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -2,8 +2,8 @@
 
 if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
 
-$mydirname = basename( dirname( __FILE__ ) ) ;
-$mydirpath = dirname( __FILE__ ) ;
+$mydirname = basename(__DIR__) ;
+$mydirpath = __DIR__ ;
 require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
 
 require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/xoops_version.php' ;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/jquery.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/jquery.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/jquery.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -17,7 +17,7 @@
  * @version     $Id$
  */
 
-include dirname( dirname( dirname( __FILE__ ) ) ) . '/header.php';
+include dirname( dirname(__DIR__) ) . '/header.php';
 
 // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 

Modified: 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.config.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.config.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -9,7 +9,7 @@
 //            THIS CONFIG FILE ONLY APPLIES TO phpThumb.php //
 //                                                         ///
 //////////////////////////////////////////////////////////////
-require dirname( dirname( dirname( __FILE__ ) ) ) . '/header.php';
+require dirname( dirname(__DIR__) ) . '/header.php';
 ob_start();
 if (!file_exists(__DIR__.'/phpthumb.functions.php') || !include_once(__DIR__.'/phpthumb.functions.php')) {
     ob_end_flush();

Modified: 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/class/thumbs/phpthumb.class.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -9,9 +9,9 @@
 //////////////////////////////////////////////////////////////
 
 ob_start();
-if (!include_once(__DIR__.'/phpthumb.functions.php')) {
+if (!include_once(__DIR__ . '/phpthumb.functions.php')) {
     ob_end_flush();
-    die('failed to include_once("'.realpath(__DIR__.'/phpthumb.functions.php').'")');
+    die('failed to include_once("'.realpath(__DIR__ . '/phpthumb.functions.php').'")');
 }
 ob_end_clean();
 

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/header.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/header.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/header.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -15,7 +15,7 @@
  */
 
 // Include XOOPS control panel header
-include_once dirname( dirname( dirname( __FILE__ ) ) ) . '/include/cp_header.php';
+include_once dirname( dirname(__DIR__) ) . '/include/cp_header.php';
 // Check user rights
 if (is_object($xoopsUser)) {
     $admintest = 0;

Modified: 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/mymenu.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/mymenu.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -3,7 +3,7 @@
 if( defined( 'XOOPS_ORETEKI' ) ) return ;
 
 global $xoopsModule;
-$mydirpath = dirname( dirname( __FILE__ ) ) ;
+$mydirpath = dirname(__DIR__) ;
 
 if( ! is_object( $xoopsModule ) ) die( '$xoopsModule is not set' )  ;
 

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -8,8 +8,8 @@
 $language   = $registry->getEntry('language');
 // end hack by Trabis
 
-$mytrustdirname = basename( dirname( __FILE__ ) ) ;
-$mytrustdirpath = dirname( __FILE__ ) ;
+$mytrustdirname = basename(__DIR__) ;
+$mytrustdirpath = __DIR__ ;
 
 // environment
 require_once XOOPS_ROOT_PATH.'/class/template.php' ;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/blocks.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/blocks.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/blocks.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -8,8 +8,8 @@
 $language   = $registry->getEntry('language');
 // end hack by Trabis
 
-$mytrustdirname = basename( dirname( __FILE__ ) ) ;
-$mytrustdirpath = dirname( __FILE__ ) ;
+$mytrustdirname = basename(__DIR__) ;
+$mytrustdirpath = __DIR__ ;
 
 // language files
 //$language = empty( $GLOBALS['xoopsConfig']['language'] ) ? 'english' : $GLOBALS['xoopsConfig']['language'] ;  //hack by Trabis

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/gtickets.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/gtickets.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/gtickets.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -19,8 +19,8 @@
 
         // language file
         if ( defined( 'XOOPS_ROOT_PATH' ) && ! empty( $xoopsConfig['language'] ) && ! strstr( $xoopsConfig['language'] , '/' ) ) {
-            if ( file_exists( dirname( dirname( __FILE__ ) ) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml' ) ) {
-                include dirname( dirname( __FILE__ ) ) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml' ;
+            if ( file_exists( dirname(__DIR__) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml' ) ) {
+                include dirname(__DIR__) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml' ;
             }
         }
 

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/install_extramodcheck.inc.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/install_extramodcheck.inc.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/install_extramodcheck.inc.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -8,5 +8,5 @@
  */
 function get_writeoks_from_protector( $xoops_root_path , $mytrustdirname )
 {
-    return array( dirname(dirname( __FILE__ )) . '/configs' ) ;
+    return array( __DIR__ . '/configs' ) ;
 }

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/main.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/main.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -8,8 +8,8 @@
 $language   = $registry->getEntry('language');
 // end hack by Trabis
 
-$mytrustdirname = basename( dirname( __FILE__ ) ) ;
-$mytrustdirpath = dirname( __FILE__ ) ;
+$mytrustdirname = basename(__DIR__) ;
+$mytrustdirpath = __DIR__ ;
 
 // check permission of 'module_read' of this module
 // (already checked by common.php)

Modified: 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.0.18-to-2.3.0/index.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/index.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -179,7 +179,7 @@
     {
         $allowWebChanges = $GLOBALS['xoopsDB']->allowWebChanges;
         $GLOBALS['xoopsDB']->allowWebChanges = true;
-        $result = $GLOBALS['xoopsDB']->queryFromFile( __DIR__ . "/mysql.structure.sql" );
+        $result = $GLOBALS['xoopsDB']->queryFromFile(__DIR__ . "/mysql.structure.sql" );
         $GLOBALS['xoopsDB']->allowWebChanges = $allowWebChanges;
 
         return $result;

Modified: 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.0-to-2.3.1/index.php	2014-06-29 01:44:58 UTC (rev 12663)
+++ XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.0-to-2.3.1/index.php	2014-06-29 03:11:49 UTC (rev 12664)
@@ -72,7 +72,7 @@
     {
         $allowWebChanges = $GLOBALS['xoopsDB']->allowWebChanges;
         $GLOBALS['xoopsDB']->allowWebChanges = true;
-        $result = $GLOBALS['xoopsDB']->queryFromFile( __DIR__ . "/mysql.structure.sql" );
+        $result = $GLOBALS['xoopsDB']->queryFromFile(__DIR__ . "/mysql.structure.sql" );
         $GLOBALS['xoopsDB']->allowWebChanges = $allowWebChanges;
         return $result;
     }