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

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

Revision: 12849
          http://sourceforge.net/p/xoops/svn/12849
Author:   beckmi
Date:     2014-11-16 11:00:20 +0000 (Sun, 16 Nov 2014)
Log Message:
-----------
Cosmetic changes/updates (mamba)

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/class/userutility.php
    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/editor_registry.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopscode.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsquote.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/xoopstopic.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/templates/system_banner.html

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt	2014-11-16 11:00:20 UTC (rev 12849)
@@ -4,14 +4,21 @@
 NOT RELEASED: Version 2.5.8 Beta 1
 ===============================
 - replaced "dirname(__FILE__)" with "__DIR__" since the min. PHP is now 5.3.7, and __DIR__ is faster  (mamba)
-- updating some copyright notices
+- updating some copyright notices (mamba)
 - Fix issues when protector 'id_forceintval' preference is enabled, that manifests as an error when deleting private messages.  (rgriffith)
 - fix for Update setting Template import date to 0 (timgno/mamba)
-- adding Adding language constants for Protector's Prefix Manager (slider84/mamba)
+- Adding language constants for Protector's Prefix Manager (slider84/mamba)
 - allowing for "https" URL in YouTube links in Textsanitizer (mamba)
 - converting $i++ to ++$i for improved performance (mamba)
 - reverting couple of $i++ conversions (zyspec/mamba)
+- updated xBootstrap to Bootstrap 3.3.1 (Angelo Rocha)
+- Some code cleanup for private messages (Dingjie （Daniel） Yang/rgriffith)
 
+Security fixes
+- ID: 1295 Added X-Frame-Options header to prevent clickjacking in modern browsers, reported by Narendra Bhati. 
+  By default set to 'sameorigin', but can be overridden by setting desired value in 'xFrameOptions' key in xoopsconfig.  (rgriffith)
+
+
 ===============================
 2014-06-20: Version 2.5.7 Final (Patch)
 ===============================

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php	2014-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -62,7 +62,7 @@
         /**
          * version is rev of this class
          */
-        Include_once 'xoops_version.php';
+        include_once 'xoops_version.php';
         $version = XOOPS_FRAMEWORKS_MODULEADMIN_VERSION;
 
         return $version;
@@ -77,7 +77,7 @@
         /**
          * version is rev of this class
          */
-        Include_once 'xoops_version.php';
+        include_once 'xoops_version.php';
         $releasedate = XOOPS_FRAMEWORKS_MODULEADMIN_RELEASEDATE;
 
         return $releasedate;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php	2014-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1032,7 +1032,7 @@
 
         $arg_list = array();
         foreach($attrs as $arg_name => $arg_value) {
-            if($arg_name != 'file' AND $arg_name != 'once' AND $arg_name != 'assign') {
+            if($arg_name != 'file' && $arg_name != 'once' && $arg_name != 'assign') {
                 if(is_bool($arg_value))
                     $arg_value = $arg_value ? 'true' : 'false';
                 $arg_list[] = "'$arg_name' => $arg_value";

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/userutility.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/userutility.php	2014-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/userutility.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -223,23 +223,17 @@
         $proxy_ip = '';
         if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
             $proxy_ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
-        } else
-            if (!empty($_SERVER['HTTP_X_FORWARDED'])) {
+        } elseif (!empty($_SERVER['HTTP_X_FORWARDED'])) {
                 $proxy_ip = $_SERVER['HTTP_X_FORWARDED'];
-            } else
-                if (! empty($_SERVER['HTTP_FORWARDED_FOR'])) {
+            } elseif (! empty($_SERVER['HTTP_FORWARDED_FOR'])) {
                     $proxy_ip = $_SERVER['HTTP_FORWARDED_FOR'];
-                } else
-                    if (!empty($_SERVER['HTTP_FORWARDED'])) {
+                } elseif (!empty($_SERVER['HTTP_FORWARDED'])) {
                         $proxy_ip = $_SERVER['HTTP_FORWARDED'];
-                    } else
-                        if (!empty($_SERVER['HTTP_VIA'])) {
+                    } elseif (!empty($_SERVER['HTTP_VIA'])) {
                             $proxy_ip = $_SERVER['HTTP_VIA'];
-                        } else
-                            if (!empty($_SERVER['HTTP_X_COMING_FROM'])) {
+                        } elseif (!empty($_SERVER['HTTP_X_COMING_FROM'])) {
                                 $proxy_ip = $_SERVER['HTTP_X_COMING_FROM'];
-                            } else
-                                if (!empty($_SERVER['HTTP_COMING_FROM'])) {
+                            } elseif (!empty($_SERVER['HTTP_COMING_FROM'])) {
                                     $proxy_ip = $_SERVER['HTTP_COMING_FROM'];
                                 }
         if (!empty($proxy_ip) && $is_ip = preg_match('/^([0-9]{1,3}.){3,3}[0-9]{1,3}/', $proxy_ip, $regs) && count($regs) > 0) {

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined( 'XOOPS_ROOT_PATH' ) or die( 'Restricted access' );
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 xoops_load('XoopsEditor');
 

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/editor_registry.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/editor_registry.php	2014-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/editor_registry.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -16,7 +16,7 @@
  * @version         $Id$
  * @package         xoopseditor
  */
-defined( 'XOOPS_ROOT_PATH' ) or die( 'Restricted access' );
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 return $config = array( 'class' => 'FormDhtmlTextArea',
 	'file' => XOOPS_ROOT_PATH . '/class/xoopseditor/dhtmltextarea/dhtmltextarea.php',

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopscode.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopscode.php	2014-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopscode.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -11,7 +11,7 @@
  * @version         $Id$
  */
 
-if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); }
+defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 
 // Add your code here to check access by groups
 

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php	2014-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -11,7 +11,7 @@
  * @version         $Id$
  */
 
-if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); }
+defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 
 include_once XOOPS_ROOT_PATH . "/modules/system/constants.php";
 // Add your code here to check access by groups

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php	2014-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -11,7 +11,7 @@
  * @version         $Id$
  */
 
-if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); }
+defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 
 // check categories readability by group
 $groups = is_object( $GLOBALS["xoopsUser"] ) ? $GLOBALS["xoopsUser"]->getGroups() : array( XOOPS_GROUP_ANONYMOUS );

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php	2014-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -11,7 +11,7 @@
  * @version         $Id$
  */
 
-if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); }
+defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 
 // Xlanguage
 if ( $GLOBALS["module_handler"]->getByDirname("xlanguage") && defined("XLANGUAGE_LANG_TAG") ) {

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php	2014-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -11,7 +11,7 @@
  * @version         $Id$
  */
 
-if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); }
+defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 
 // Add your code here to check access by groups
 

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -20,7 +20,7 @@
 }
 $xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/"));
 include_once $xoops_root_path . "/mainfile.php";
-if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); }
+defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 // load mainfile.php - end
 
 // get current filename

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -20,7 +20,7 @@
 }
 $xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/"));
 include_once $xoops_root_path . "/mainfile.php";
-if (!defined("XOOPS_ROOT_PATH")) exit();
+defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 
 /**
  * This code was moved to the top to avoid overriding variables that do not come from post

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -20,7 +20,7 @@
 }
 $xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/"));
 include_once $xoops_root_path . "/mainfile.php";
-if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); }
+defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 
 // include
 include_once XOOPS_ROOT_PATH."/modules/system/constants.php";

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -20,7 +20,7 @@
 }
 $xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/"));
 include_once $xoops_root_path . "/mainfile.php";
-if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); }
+defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 // load mainfile.php - end
 
 function langDropdown() {

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopstopic.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopstopic.php	2014-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopstopic.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -18,9 +18,8 @@
  * @deprecated
  */
 
-if (!defined('XOOPS_ROOT_PATH')) {
-    exit();
-}
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
+
 $GLOBALS['xoopsLogger']->addDeprecated("'/class/xoopstopic.php' is deprecated since XOOPS 2.5.4, please create your own class instead.");
 
 include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/about.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,7 +1,7 @@
 <?php
 
-require '../../../mainfile.php' ;
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ;
+require dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mydirname = basename( dirname(__DIR__) ) ;
 $mydirpath = dirname(__DIR__) ;

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/admin_menu.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,6 +1,6 @@
 <?php
 
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mydirname = basename( dirname(__DIR__) ) ;
 $mydirpath = dirname(__DIR__) ;

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/advisory.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,7 +1,7 @@
 <?php
 
-require '../../../mainfile.php' ;
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ;
+require dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mydirname = basename( dirname(__DIR__) ) ;
 $mydirpath = dirname(__DIR__) ;

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/center.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,7 +1,7 @@
 <?php
 
-require '../../../mainfile.php' ;
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ;
+require dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mydirname = basename( dirname(__DIR__) ) ;
 $mydirpath = dirname(__DIR__) ;

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/index.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,7 +1,7 @@
 <?php
 
-require '../../../mainfile.php' ;
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ;
+require dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mydirname = basename( dirname(__DIR__) ) ;
 $mydirpath = dirname(__DIR__) ;

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/prefix_manager.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,7 +1,7 @@
 <?php
 
-require '../../../mainfile.php' ;
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ;
+require dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mydirname = basename( dirname(__DIR__) ) ;
 $mydirpath = dirname(__DIR__) ;

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/blocks/blocks.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,6 +1,6 @@
 <?php
 
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mydirname = basename( dirname(  __DIR__ ) ) ;
 $mydirpath = dirname(__DIR__) ;

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/index.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,7 +1,7 @@
 <?php
 
-require '../../mainfile.php' ;
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ;
+require dirname(dirname(__DIR__)) . '/mainfile.php';
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mydirname = basename(__DIR__) ;
 $mydirpath = __DIR__ ;

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/module_icon.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,9 +1,9 @@
 <?php
 
 $xoopsOption['nocommon'] = true ;
-require '../../mainfile.php' ;
+require dirname(dirname(__DIR__)) . '/mainfile.php';
 
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mydirname = basename(__DIR__) ;
 $mydirpath = __DIR__ ;

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/mytrustdirname.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,6 +1,6 @@
 <?php
 // edit for xoops 2.4 core by phppp and trabis
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mytrustdirname = 'protector';
 

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,6 +1,6 @@
 <?php
 
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mydirname = basename(__DIR__) ;
 $mydirpath = __DIR__ ;

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification_update.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,6 +1,6 @@
 <?php
-require '../../mainfile.php' ;
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ;
+require dirname(dirname(__DIR__)) . '/mainfile.php';
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mydirname = basename(__DIR__) ;
 $mydirpath = __DIR__ ;

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/oninstall.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,6 +1,6 @@
 <?php
 
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mydirname = basename(__DIR__) ;
 $mydirpath = __DIR__ ;

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onuninstall.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,6 +1,6 @@
 <?php
 
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mydirname = basename(__DIR__) ;
 $mydirpath = __DIR__ ;

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onupdate.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,6 +1,6 @@
 <?php
 
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mydirname = basename(__DIR__) ;
 $mydirpath = __DIR__ ;

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/search.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,6 +1,6 @@
 <?php
 
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mydirname = basename(__DIR__) ;
 $mydirpath = __DIR__ ;

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-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/xoops_version.php	2014-11-16 11:00:20 UTC (rev 12849)
@@ -1,6 +1,6 @@
 <?php
 
-if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
+defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php');
 
 $mydirname = basename(__DIR__) ;
 $mydirpath = __DIR__ ;

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/templates/system_banner.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/templates/system_banner.html	2014-11-16 10:46:18 UTC (rev 12848)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/templates/system_banner.html	2014-11-16 11:00:20 UTC (rev 12849)
@@ -67,4 +67,4 @@
 	<tr>
 		<td class="head" colspan="7">&nbsp;</td>
 	</tr>
-</table><br />
\ No newline at end of file
+</table><br />