[Astrospaces-commits] SF.net SVN: astrospaces: [62] trunk/functions
Brought to you by:
p3net
From: <cal...@us...> - 2007-07-31 00:54:42
|
Revision: 62 http://astrospaces.svn.sourceforge.net/astrospaces/?rev=62&view=rev Author: caleb870 Date: 2007-07-30 17:54:43 -0700 (Mon, 30 Jul 2007) Log Message: ----------- Moved remotely Added Paths: ----------- trunk/functions/adodb/adodb-errorhandler.inc.php Removed Paths: ------------- trunk/functions/adodb-errorhandler.inc.php Copied: trunk/functions/adodb/adodb-errorhandler.inc.php (from rev 61, trunk/functions/adodb-errorhandler.inc.php) =================================================================== --- trunk/functions/adodb/adodb-errorhandler.inc.php (rev 0) +++ trunk/functions/adodb/adodb-errorhandler.inc.php 2007-07-31 00:54:43 UTC (rev 62) @@ -0,0 +1,79 @@ +<?php +/** + * @version V4.66 28 Sept 2005 (c) 2000-2005 John Lim (jl...@na...). All rights reserved. + * Released under both BSD license and Lesser GPL library license. + * Whenever there is any discrepancy between the two licenses, + * the BSD license will take precedence. + * + * Set tabs to 4 for best viewing. + * + * Latest version is available at http://php.weblogs.com + * +*/ + +// added Claudio Bustos clbustos#entelchile.net +if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR); + +if (!defined('ADODB_ERROR_HANDLER')) define('ADODB_ERROR_HANDLER','ADODB_Error_Handler'); + +/** +* Default Error Handler. This will be called with the following params +* +* @param $dbms the RDBMS you are connecting to +* @param $fn the name of the calling function (in uppercase) +* @param $errno the native error number from the database +* @param $errmsg the native error msg from the database +* @param $p1 $fn specific parameter - see below +* @param $p2 $fn specific parameter - see below +* @param $thisConn $current connection object - can be false if no connection object created +*/ + +function ADODB_Error_Handler($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection) +{ + if (error_reporting() == 0) + return; // obey @ protocol + + switch($fn) { + case 'EXECUTE': + $sql = $p1; + $inputparams = $p2; + $s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")\n"; + break; + + case 'PCONNECT': + case 'CONNECT': + $host = $p1; + $database = $p2; + $s = "$dbms error: [$errno: $errmsg] in $fn($host, '****', '****', $database)\n"; + break; + + default: + $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n"; + break; + } + /* + * Log connection error somewhere + * 0 message is sent to PHP's system logger, using the Operating System's system + * logging mechanism or a file, depending on what the error_log configuration + * directive is set to. + * 1 message is sent by email to the address in the destination parameter. + * This is the only message type where the fourth parameter, extra_headers is used. + * This message type uses the same internal function as mail() does. + * 2 message is sent through the PHP debugging connection. + * This option is only available if remote debugging has been enabled. + * In this case, the destination parameter specifies the host name or IP address + * and optionally, port number, of the socket receiving the debug information. + * 3 message is appended to the file destination + */ + if (defined('ADODB_ERROR_LOG_TYPE')) { + $t = date('Y-m-d H:i:s'); + if (defined('ADODB_ERROR_LOG_DEST')) + error_log("($t) $s", ADODB_ERROR_LOG_TYPE, ADODB_ERROR_LOG_DEST); + else + error_log("($t) $s", ADODB_ERROR_LOG_TYPE); + } + + //print "<p>$s</p>"; + trigger_error($s, ADODB_ERROR_HANDLER_TYPE); +} +?> Deleted: trunk/functions/adodb-errorhandler.inc.php =================================================================== --- trunk/functions/adodb-errorhandler.inc.php 2007-07-31 00:54:05 UTC (rev 61) +++ trunk/functions/adodb-errorhandler.inc.php 2007-07-31 00:54:43 UTC (rev 62) @@ -1,79 +0,0 @@ -<?php -/** - * @version V4.66 28 Sept 2005 (c) 2000-2005 John Lim (jl...@na...). All rights reserved. - * Released under both BSD license and Lesser GPL library license. - * Whenever there is any discrepancy between the two licenses, - * the BSD license will take precedence. - * - * Set tabs to 4 for best viewing. - * - * Latest version is available at http://php.weblogs.com - * -*/ - -// added Claudio Bustos clbustos#entelchile.net -if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR); - -if (!defined('ADODB_ERROR_HANDLER')) define('ADODB_ERROR_HANDLER','ADODB_Error_Handler'); - -/** -* Default Error Handler. This will be called with the following params -* -* @param $dbms the RDBMS you are connecting to -* @param $fn the name of the calling function (in uppercase) -* @param $errno the native error number from the database -* @param $errmsg the native error msg from the database -* @param $p1 $fn specific parameter - see below -* @param $p2 $fn specific parameter - see below -* @param $thisConn $current connection object - can be false if no connection object created -*/ - -function ADODB_Error_Handler($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection) -{ - if (error_reporting() == 0) - return; // obey @ protocol - - switch($fn) { - case 'EXECUTE': - $sql = $p1; - $inputparams = $p2; - $s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")\n"; - break; - - case 'PCONNECT': - case 'CONNECT': - $host = $p1; - $database = $p2; - $s = "$dbms error: [$errno: $errmsg] in $fn($host, '****', '****', $database)\n"; - break; - - default: - $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n"; - break; - } - /* - * Log connection error somewhere - * 0 message is sent to PHP's system logger, using the Operating System's system - * logging mechanism or a file, depending on what the error_log configuration - * directive is set to. - * 1 message is sent by email to the address in the destination parameter. - * This is the only message type where the fourth parameter, extra_headers is used. - * This message type uses the same internal function as mail() does. - * 2 message is sent through the PHP debugging connection. - * This option is only available if remote debugging has been enabled. - * In this case, the destination parameter specifies the host name or IP address - * and optionally, port number, of the socket receiving the debug information. - * 3 message is appended to the file destination - */ - if (defined('ADODB_ERROR_LOG_TYPE')) { - $t = date('Y-m-d H:i:s'); - if (defined('ADODB_ERROR_LOG_DEST')) - error_log("($t) $s", ADODB_ERROR_LOG_TYPE, ADODB_ERROR_LOG_DEST); - else - error_log("($t) $s", ADODB_ERROR_LOG_TYPE); - } - - //print "<p>$s</p>"; - trigger_error($s, ADODB_ERROR_HANDLER_TYPE); -} -?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |