From: Roland Häder Date: Fri, 2 Jul 2010 13:19:28 +0000 (+0000) Subject: Some code cosmetics and fixes X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3e3d42e0bfae0d293a27aabe15d20489dd592964;p=mailer.git Some code cosmetics and fixes --- diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php index 13dc80bb44..7f1447e226 100644 --- a/inc/db/lib-mysql3.php +++ b/inc/db/lib-mysql3.php @@ -81,7 +81,7 @@ function SQL_QUERY ($sqlString, $F, $L) { // Run SQL command //* DEBUG: */ debugOutput('F=' . basename($F) . ',L=' . $L . 'sql=' . encodeEntities($GLOBALS['last_sql'])); $result = mysql_query($GLOBALS['last_sql'], SQL_GET_LINK()) - or debug_report_bug($F, $L, 'file='. $F . ',line=' . $L . ':mysql_error()=' . mysql_error() . "\n". + or debug_report_bug($F, $L, 'file='. basename($F) . ',line=' . $L . ':mysql_error()=' . mysql_error() . "\n". 'Query string:' . $GLOBALS['last_sql']); //* DEBUG: */ logDebugMessage($F, $L, 'sql=' . $GLOBALS['last_sql'] . ',affected=' . SQL_AFFECTEDROWS()); diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php index deb3f600a9..a5283734b9 100644 --- a/inc/modules/admin/what-list_notifications.php +++ b/inc/modules/admin/what-list_notifications.php @@ -57,7 +57,7 @@ if (isExtensionActive('bonus')) { // Bonus mails sent by you $SQL2 = "SELECT `id`, `subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, - `mails_sent`, `clicks`, (`mails_sent` - `clicks) AS `unconfirmed` + `mails_sent`, `clicks`, (`mails_sent` - `clicks`) AS `unconfirmed` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE @@ -78,7 +78,7 @@ $add = ' LIMIT ' . (bigintval(getRequestParameter('offset')) * bigintval(getRequ // Add limitation if (!empty($SQL2)) $SQL2 .= $add; -if ((isExtensionActive('bonus')) && (!SQL_HASHZERONUMS($result_max)) && (!empty($SQL2))) { +if ((isExtensionActive('bonus')) && (!SQL_HASZERONUMS($result_max)) && (!empty($SQL2))) { // Run SQL query for notification mails $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__); diff --git a/inc/template-functions.php b/inc/template-functions.php index 59354c3b2a..4f1ad6f8e5 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -1165,7 +1165,7 @@ function debug_report_bug ($F, $L, $message = '', $sendEmail = true) { // Is this already called? if (isset($GLOBALS[__FUNCTION__])) { // Other backtrace - print 'Message:'.$message.'
Backtrace:
';
+		print 'Message:' . $message . '
Backtrace:
';
 		debug_print_backtrace();
 		die('
'); } // END - if