Internal TODO added

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 4545846423668f31b61935d1a004fa80c1cf823c..96ed81d53fce6b42cc5d3125751ec6d31882fc60 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -11,9 +11,9 @@
  * Kurzbeschreibung  : Viele Nicht-MySQL-Funktionen (auch Dateizugriff) *
  * -------------------------------------------------------------------- *
  * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
+ * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -245,7 +245,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
        if ($template == "member_support_form") {
                // Support request of a member
                $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-                       array($GLOBALS['userid']), __FUNCTION__, __LINE__);
+                       array(getUserId()), __FUNCTION__, __LINE__);
 
                // Is content an array?
                if (is_array($content)) {
@@ -1257,7 +1257,7 @@ function generateRandomCodde ($length, $code, $uid, $DATA="") {
 
        // Add more additional data
        if (isSessionVariableSet('u_hash'))                     $data .= ":".get_session('u_hash');
-       if (isset($GLOBALS['userid']))                          $data .= ":".$GLOBALS['userid'];
+       if (isUserIdSet())                                                      $data .= ":".getUserId();
        if (isSessionVariableSet('mxchange_theme'))             $data .= ":".get_session('mxchange_theme');
        if (isSessionVariableSet('mx_lang'))                    $data .= ":".GET_LANGUAGE();
        if (isset($GLOBALS['refid']))                                   $data .= ":".$GLOBALS['refid'];
@@ -2714,11 +2714,12 @@ function debug_report_bug ($message = "") {
        } // END - if
 
        // Add output
-       $debug .= ("Please report this error at <a href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">bugs.mxchange.org</a>:<pre>");
-       $debug .= (debug_get_printable_backtrace());
-       $debug .= ("</pre>Thank you for your help finding bugs.");
+       $debug .= "Please report this error at <a href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">bugs.mxchange.org</a>:<pre>";
+       $debug .= debug_get_printable_backtrace();
+       $debug .= "</pre>Thank you for finding bugs.";
 
        // And abort here
+       // @TODO This cannot be rewritten to mxchange_die(), try to find a solution for this.
        die($debug);
 }
 
@@ -3521,6 +3522,31 @@ function shutdown () {
        exit;
 }
 
+// Setter for userid
+function setUserId ($userid) {
+       $GLOBALS['userid'] = bigintval($userid);
+}
+
+// Getter for userid or returns zero
+function getUserId () {
+       // Default userid
+       $userid = 0;
+
+       // Is the userid set?
+       if (isUserIdSet()) {
+               // Then use it
+               $userid = $GLOBALS['userid'];
+       } // END - if
+
+       // Return it
+       return $userid;
+}
+
+// Checks ether the userid is set
+function isUserIdSet () {
+       return (isset($GLOBALS['userid']));
+}
+
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////