Renamed more:

[mailer.git] / inc / template-functions.php

diff --git a/inc/template-functions.php b/inc/template-functions.php
index df0f3d8257df21f316519ede4682ba3e23b9b9a2..1f891af2e18f5398d6b50ece9641bb028f11abea 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -1162,16 +1162,16 @@ function generateEmailLink ($email, $table = 'admins') {
  * functionality like logging and admin notification (which you can configure
  * through your admin area).
  *
- * @param      $F                      Function or file basename where the error came from
- * @param      $L                      Line number where the error came from
+ * @param      $file           Function or file basename where the error came from
+ * @param      $line           Line number where the error came from
  * @param      $message        Message which shall be output to web
  * @return     void
  */
-function app_exit ($F, $L, $message) {
+function app_exit ($file, $line, $message) {
        // Check if Script is already dieing and not let it kill itself another 1000 times
        if (isset($GLOBALS['app_died'])) {
                // Script tried to kill itself twice
-               die('[' . __FUNCTION__ . ':' . __LINE__ . ']: Script wanted to kill itself more than once! Raw message=' . $message . ', file/function=' . $F . ', line=' . $L);
+               die('[' . __FUNCTION__ . ':' . __LINE__ . ']: Script wanted to kill itself more than once! Raw message=' . $message . ', file/function=' . $file . ', line=' . $line);
        } // END - if
 
        // Make sure, that the script realy realy diese here and now
@@ -1192,8 +1192,8 @@ function app_exit ($F, $L, $message) {
        // Rewrite message for output
        $message = sprintf(
                getMessage('MAILER_HAS_DIED'),
-               basename($F),
-               $L,
+               basename($file),
+               $line,
                $message
        );
 
@@ -1258,16 +1258,16 @@ function displayParsingTime () {
  * app_exit() is more a "private" function and will only output a bug message to
  * the user, no email and no logging.
  *
- * @param      $F                      Function or file basename where the error came from
- * @param      $L                      Line number where the error came from
+ * @param      $file           Function or file basename where the error came from
+ * @param      $line           Line number where the error came from
  * @param      $sendEmail      Wether to send an email to all configured administrators
  * @return     void
  */
-function reportBug ($F, $L, $message = '', $sendEmail = TRUE) {
+function reportBug ($file, $line, $message = '', $sendEmail = TRUE) {
        // Is this already called?
        if (isset($GLOBALS[__FUNCTION__])) {
                // Other backtrace
-               print '[' . $F . ':' . $L . ':] ' . __FUNCTION__ . ' has already died! Message:' . $message . '<br />Backtrace:<pre>';
+               print '[' . $file . ':' . $line . ':] ' . __FUNCTION__ . ' has already died! Message:' . $message . '<br />Backtrace:<pre>';
                debug_print_backtrace();
                die('</pre>');
        } // END - if
@@ -1289,7 +1289,7 @@ function reportBug ($F, $L, $message = '', $sendEmail = TRUE) {
                );
 
                // @TODO Add a little more infos here
-               logDebugMessage($F, $L, strip_tags($message));
+               logDebugMessage($file, $line, strip_tags($message));
        } // END - if
 
        // Add output
@@ -1314,7 +1314,7 @@ function reportBug ($F, $L, $message = '', $sendEmail = TRUE) {
        // Is there HTML/CSS/AJAX mode?
        if (((isHtmlOutputMode()) || (isCssOutputMode()) || (isAjaxOutputMode())) && (isDebugModeEnabled())) {
                // And abort here
-               app_exit($F, $L, $debug);
+               app_exit($file, $line, $debug);
        } else {
                // Raw/image output mode and all other modes doesn't work well with text ...
                die();