mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-09-01 02:21:58 +02:00
Code Issues Releases Wiki Activity

install shutdown error handler for php; Resolve

Browse Source 
error reporting issue(s) by consolidating debug error
 reporting in a single Show_ALL() function.  Fixed an undefined var along the way.
This commit is contained in:
mrpete
2006-12-05 09:33:20 +00:00
parent a8f2dfe48d
commit 76c1196f3a
3 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
e107_themes/templates/footer_default.php
View File

@@ -3,7 +3,7 @@
+ ----------------------------------------------------------------------------+
| e107 website system
|
| ???Steve Dunstan 2001-2002
| <EFBFBD>Steve Dunstan 2001-2002
| http://e107.org
| jalist@e107.org
|
@@ -11,12 +11,13 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/footer_default.php,v $
| $Revision: 1.1.1.1 $
| $Date: 2006-12-02 04:36:13 $
| $Author: mcfly_e107 $
| $Revision: 1.2 $
| $Date: 2006-12-05 09:33:20 $
| $Author: mrpete $
+----------------------------------------------------------------------------+
*/
if (!defined('e107_INIT')) { exit; }
$In_e107_Footer = TRUE; // For registered shutdown function
global $eTraffic, $error_handler, $db_time, $sql, $sql2, $mySQLserver, $mySQLuser, $mySQLpassword, $mySQLdefaultdb, $CUSTOMFOOTER, $FOOTER, $e107;
@@ -25,6 +26,7 @@ global $eTraffic, $error_handler, $db_time, $sql, $sql2, $mySQLserver, $mySQLuse
//
// The following items have been carefully designed so page processing will finish properly
// Please DO NOT re-order these items without asking first! You WILL break something ;)
// These letters match the USER footer (that's why there may be B.1,B.2)
//
// A Ensure sql and traffic objects exist
// [Next few ONLY if a regular page; not done for popups]
@@ -79,37 +81,9 @@ if(varset($e107_popup)!=1){
if ((ADMIN || $pref['developer']) && E107_DEBUG_LEVEL) {
global $db_debug,$ns;
global $db_debug;
echo "\n<!-- DEBUG -->\n";
if (!isset($ns)) {
echo "Why did ns go away?<br/>";
$ns = new e107table;
}
$tmp = $eTraffic->Display();
if (strlen($tmp)) {
$ns->tablerender('Traffic Counters', $tmp);
}
$tmp = $db_debug->Show_Performance();
if (strlen($tmp)) {
$ns->tablerender('Time Analysis', $tmp);
}
$tmp = $db_debug->Show_SQL_Details();
if (strlen($tmp)) {
$ns->tablerender('SQL Analysis', $tmp);
}
$tmp = $db_debug->Show_SC_BB();
if (strlen($tmp)) {
$ns->tablerender('Shortcodes / BBCode',$tmp);
}
$tmp = $db_debug->Show_PATH();
if (strlen($tmp)) {
$ns->tablerender('Paths', $tmp);
}
$tmp = $db_debug->Show_DEPRECATED();
if (strlen($tmp)) {
$ns->tablerender('Deprecated Function Usage', $tmp);
}
$db_debug->Show_All();
}
/*
@@ -184,7 +158,8 @@ if((ADMIN == true || $pref['developer']) && $error_handler->debug == true) {
//
// E Last themed footer code, usually JS
//
if (function_exists('theme_foot')) {
if (function_exists('theme_foot'))
{
echo theme_foot();
}
@@ -252,4 +227,7 @@ if($pref['compress_output'] == true && $server_support == true && $browser_suppo
echo $page;
}
unset($In_e107_Footer);
$e107_Clean_Exit=TRUE; // For registered shutdown function -- let it know all is well!
?>

12
e107_themes/templates/header_default.php
View File

@@ -6,9 +6,9 @@
| Released under the terms and conditions of the GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/header_default.php,v $
| $Revision: 1.1.1.1 $
| $Date: 2006-12-02 04:36:13 $
| $Author: mcfly_e107 $
| $Revision: 1.2 $
| $Date: 2006-12-05 09:33:20 $
| $Author: mrpete $
+-----------------------------------------------------------------------------------------------+
*/
@@ -74,7 +74,7 @@ if (!function_exists("parseheader")) {
header("Content-type: text/html; charset=".CHARSET, true);
echo (defined("STANDARDS_MODE") ? "" : "<?xml version='1.0' encoding='".CHARSET."' "."?".">")."<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n";
echo (defined("STANDARDS_MODE") ? "" : "<?xml version='1.0' encoding='".CHARSET."' "."?".">\n")."<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n";
//
// C: Send start of HTML
@@ -188,6 +188,8 @@ echo "<meta http-equiv='content-type' content='text/html; charset=".CHARSET."' /
echo (defined("CORE_LC")) ? "<meta http-equiv='content-language' content='".CORE_LC."' />\n" : "";
// --- Load plugin Meta files and eplug_ before others --------
if (is_array($pref['e_meta_list']))
{
foreach($pref['e_meta_list'] as $val)
{
if(is_readable(e_PLUGIN.$val."/e_meta.php"))
@@ -196,7 +198,7 @@ foreach($pref['e_meta_list'] as $val)
require_once(e_PLUGIN.$val."/e_meta.php");
}
}
}
$diz_merge = (defined("META_MERGE") && META_MERGE != FALSE && $pref['meta_description'][e_LANGUAGE]) ? $pref['meta_description'][e_LANGUAGE]." " : "";
$key_merge = (defined("META_MERGE") && META_MERGE != FALSE && $pref['meta_keywords'][e_LANGUAGE]) ? $pref['meta_keywords'][e_LANGUAGE]."," : "";