Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1498) +++ branches/2.8.x/CHANGELOG (revision 1499) @@ -12,6 +12,8 @@ =============================== FEATURES FREEZE ================================ ----------------------------------- Fixes 2.8.2 -------------------------------- +11 Aug-2011 Build 1499 Werner v.d.Decken(DarkViper) +# little fix in calling globalExceptionHandler from inner core files 11 Aug-2011 Build 1498 Werner v.d.Decken(DarkViper) # fixed secureform 11 Aug-2011 Build 1497 Werner v.d.Decken(DarkViper) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1498) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1499) @@ -52,4 +52,4 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.2'); -if(!defined('REVISION')) define('REVISION', '1498'); +if(!defined('REVISION')) define('REVISION', '1499'); Index: branches/2.8.x/wb/framework/module.functions.php =================================================================== --- branches/2.8.x/wb/framework/module.functions.php (revision 1498) +++ branches/2.8.x/wb/framework/module.functions.php (revision 1499) @@ -33,8 +33,10 @@ /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -require_once('globalExceptionHandler.php'); -if(!defined('WB_PATH')) { throw new IllegalFileException(); } +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} /* -------------------------------------------------------- */ /* Index: branches/2.8.x/wb/framework/SecureForm.mtab.php =================================================================== --- branches/2.8.x/wb/framework/SecureForm.mtab.php (revision 1498) +++ branches/2.8.x/wb/framework/SecureForm.mtab.php (revision 1499) @@ -47,8 +47,10 @@ */ /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -require_once('globalExceptionHandler.php'); -if(!defined('WB_PATH')) { throw new IllegalFileException(); } +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} /* -------------------------------------------------------- */ class SecureForm { Index: branches/2.8.x/wb/framework/class.admin.php =================================================================== --- branches/2.8.x/wb/framework/class.admin.php (revision 1498) +++ branches/2.8.x/wb/framework/class.admin.php (revision 1499) @@ -15,11 +15,12 @@ * @lastmodified $Date$ * */ - /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -require_once('globalExceptionHandler.php'); -if(!defined('WB_PATH')) { throw new IllegalFileException(); } +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} /* -------------------------------------------------------- */ require_once(WB_PATH.'/framework/class.wb.php'); Index: branches/2.8.x/wb/framework/functions-utf8.php =================================================================== --- branches/2.8.x/wb/framework/functions-utf8.php (revision 1498) +++ branches/2.8.x/wb/framework/functions-utf8.php (revision 1499) @@ -42,11 +42,12 @@ // entities_to_7bit() // entities_to_umlauts2() // umlauts_to_entities2() - /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -require_once('globalExceptionHandler.php'); -if(!defined('WB_PATH')) { throw new IllegalFileException(); } +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} /* -------------------------------------------------------- */ /* * check for mb_string support Index: branches/2.8.x/wb/framework/initialize.php =================================================================== --- branches/2.8.x/wb/framework/initialize.php (revision 1498) +++ branches/2.8.x/wb/framework/initialize.php (revision 1499) @@ -18,7 +18,7 @@ /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -require_once('globalExceptionHandler.php'); +require_once(dirname(__FILE__).'/globalExceptionHandler.php'); if(!defined('WB_PATH')) { throw new IllegalFileException(); } /* -------------------------------------------------------- */ //set_include_path(get_include_path() . PATH_SEPARATOR . WB_PATH); Index: branches/2.8.x/wb/framework/DseTwo.php =================================================================== --- branches/2.8.x/wb/framework/DseTwo.php (revision 1498) +++ branches/2.8.x/wb/framework/DseTwo.php (revision 1499) @@ -15,8 +15,10 @@ */ /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -require_once('globalExceptionHandler.php'); -if(!defined('WB_PATH')) { throw new IllegalFileException(); } +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} /* -------------------------------------------------------- */ class DseTwo { Index: branches/2.8.x/wb/framework/class.wbmailer.php =================================================================== --- branches/2.8.x/wb/framework/class.wbmailer.php (revision 1498) +++ branches/2.8.x/wb/framework/class.wbmailer.php (revision 1499) @@ -22,11 +22,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -require_once('globalExceptionHandler.php'); -if(!defined('WB_PATH')) { throw new IllegalFileException(); } +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} /* -------------------------------------------------------- */ // Include PHPMailer class require_once(WB_PATH."/include/phpmailer/class.phpmailer.php"); Index: branches/2.8.x/wb/framework/class.database.php =================================================================== --- branches/2.8.x/wb/framework/class.database.php (revision 1498) +++ branches/2.8.x/wb/framework/class.database.php (revision 1499) @@ -15,20 +15,17 @@ * @lastmodified $Date$ * */ - /* - Database class - This class will be used to interface between the database and the Website Baker code - */ - /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -require_once('globalExceptionHandler.php'); -if(!defined('WB_PATH')) { throw new IllegalFileException(); } +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} /* -------------------------------------------------------- */ if(!defined('DB_URL')) { //define('DB_URL', DB_TYPE.'://'.DB_USERNAME.':'.DB_PASSWORD.'@'.DB_HOST.'/'.DB_NAME); Index: branches/2.8.x/wb/framework/functions.php =================================================================== --- branches/2.8.x/wb/framework/functions.php (revision 1498) +++ branches/2.8.x/wb/framework/functions.php (revision 1499) @@ -15,11 +15,12 @@ * @lastmodified $Date$ * */ - /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -require_once('globalExceptionHandler.php'); -if(!defined('WB_PATH')) { throw new IllegalFileException(); } +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} /* -------------------------------------------------------- */ // Define that this file has been loaded define('FUNCTIONS_FILE_LOADED', true); Index: branches/2.8.x/wb/framework/SecureForm.php =================================================================== --- branches/2.8.x/wb/framework/SecureForm.php (revision 1498) +++ branches/2.8.x/wb/framework/SecureForm.php (revision 1499) @@ -16,6 +16,13 @@ * @lastmodified $Date$ * @description */ +/* -------------------------------------------------------- */ +// Must include code to stop this file being accessed directly +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} +/* -------------------------------------------------------- */ class SecureForm { Index: branches/2.8.x/wb/framework/class.login.php =================================================================== --- branches/2.8.x/wb/framework/class.login.php (revision 1498) +++ branches/2.8.x/wb/framework/class.login.php (revision 1499) @@ -15,11 +15,12 @@ * @lastmodified $Date$ * */ - /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -require_once('globalExceptionHandler.php'); -if(!defined('WB_PATH')) { throw new IllegalFileException(); } +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} /* -------------------------------------------------------- */ define('LOGIN_CLASS_LOADED', true); Index: branches/2.8.x/wb/framework/class.wb.php =================================================================== --- branches/2.8.x/wb/framework/class.wb.php (revision 1498) +++ branches/2.8.x/wb/framework/class.wb.php (revision 1499) @@ -15,11 +15,12 @@ * @lastmodified $Date$ * */ - /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -require_once('globalExceptionHandler.php'); -if(!defined('WB_PATH')) { throw new IllegalFileException(); } +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} /* -------------------------------------------------------- */ // Include PHPLIB template class require_once(WB_PATH."/include/phplib/template.inc"); Index: branches/2.8.x/wb/framework/globalExceptionHandler.php =================================================================== --- branches/2.8.x/wb/framework/globalExceptionHandler.php (revision 1498) +++ branches/2.8.x/wb/framework/globalExceptionHandler.php (revision 1499) @@ -21,14 +21,13 @@ * define Exception to show error after accessing a forbidden file */ class IllegalFileException extends LogicException { - public function __toString() { $file = str_replace(dirname(dirname(__FILE__)), '', $this->getFile()); - $out = '



Illegale file access

'; + $out = '

'; + $out .= '

Illegale file access

'; $out .= '

'.$file.'

'; return $out; } - } // end of class /** Index: branches/2.8.x/wb/framework/class.order.php =================================================================== --- branches/2.8.x/wb/framework/class.order.php (revision 1498) +++ branches/2.8.x/wb/framework/class.order.php (revision 1499) @@ -17,8 +17,10 @@ */ /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -require_once('globalExceptionHandler.php'); -if(!defined('WB_PATH')) { throw new IllegalFileException(); } +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} /* -------------------------------------------------------- */ define('ORDERING_CLASS_LOADED', true); // Load the other required class files if they are not already loaded Index: branches/2.8.x/wb/framework/addon.precheck.inc.php =================================================================== --- branches/2.8.x/wb/framework/addon.precheck.inc.php (revision 1498) +++ branches/2.8.x/wb/framework/addon.precheck.inc.php (revision 1499) @@ -18,8 +18,10 @@ /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -require_once('globalExceptionHandler.php'); -if(!defined('WB_PATH')) { throw new IllegalFileException(); } +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} /* -------------------------------------------------------- */ function getVersion($version, $strip_suffix = true) { Index: branches/2.8.x/wb/framework/class.frontend.php =================================================================== --- branches/2.8.x/wb/framework/class.frontend.php (revision 1498) +++ branches/2.8.x/wb/framework/class.frontend.php (revision 1499) @@ -15,11 +15,12 @@ * @lastmodified $Date$ * */ - /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -require_once('globalExceptionHandler.php'); -if(!defined('WB_PATH')) { throw new IllegalFileException(); } +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} /* -------------------------------------------------------- */ require_once(WB_PATH.'/framework/class.wb.php'); //require_once(WB_PATH.'/framework/SecureForm.php'); Index: branches/2.8.x/wb/framework/charsets_table.php =================================================================== --- branches/2.8.x/wb/framework/charsets_table.php (revision 1498) +++ branches/2.8.x/wb/framework/charsets_table.php (revision 1499) @@ -22,11 +22,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -require_once('globalExceptionHandler.php'); -if(!defined('WB_PATH')) { throw new IllegalFileException(); } +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} /* -------------------------------------------------------- */ global $iso_8859_2_to_utf8; $iso_8859_2_to_utf8 = array( Index: branches/2.8.x/wb/framework/frontend.functions.php =================================================================== --- branches/2.8.x/wb/framework/frontend.functions.php (revision 1498) +++ branches/2.8.x/wb/framework/frontend.functions.php (revision 1499) @@ -15,11 +15,12 @@ * @lastmodified $Date$ * */ - /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -require_once('globalExceptionHandler.php'); -if(!defined('WB_PATH')) { throw new IllegalFileException(); } +if(!defined('WB_PATH')) { + require_once(dirname(__FILE__).'/globalExceptionHandler.php'); + throw new IllegalFileException(); +} /* -------------------------------------------------------- */ // compatibility mode for versions before 2.8.1 $admin = $wb;