Debug comments rewritten

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 02eeb4f87c6a07152a723363ad7dd903672be6c9..414cdc5273c908eb66c3593e7b8af5fd6b2aa754 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1671,28 +1671,28 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
        $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 }
 //
-function META_DESCRIPTION($mod, $wht)
-{
+function META_DESCRIPTION ($mod, $wht) {
        global $_CONFIG, $DEPTH;
-       if (($mod != "admin") && ($mod != "login"))
-       {
-               // Exclude admin and member's area
+
+       // Exclude admin and member's area
+       if (($mod != "admin") && ($mod != "login")) {
+               // Construct dynamic description
                $DESCR = MAIN_TITLE." ".trim($_CONFIG['title_middle'])." ".ADD_DESCR("guest", "what-".$wht, true);
-               unset($DEPTH);
-               OUTPUT_HTML("<META name=\"description\" content=\"".$DESCR."\">");
-       }
+
+               // Output it directly
+               OUTPUT_HTML("<meta name=\"description\" content=\"".$DESCR."\" />");
+       } // END - if
+
+       // Remove depth
+       unset($DEPTH);
 }
 //
-function ADD_JACKPOT($points)
-{
+function ADD_JACKPOT($points) {
        $result = SQL_QUERY("SELECT points FROM "._MYSQL_PREFIX."_jackpot WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) == 0)
-       {
+       if (SQL_NUMROWS($result) == 0) {
                // Create line
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_jackpot (ok, points) VALUES ('ok','%s')", array($points), __FILE__, __LINE__);
-       }
-        else
-       {
+       } else {
                // Free memory
                SQL_FREERESULT($result);
 
@@ -1702,33 +1702,28 @@ function ADD_JACKPOT($points)
        }
 }
 //
-function SUB_JACKPOT($points)
-{
+function SUB_JACKPOT($points) {
        // First failed
        $ret = "-1";
 
        // Get current points
        $result = SQL_QUERY("SELECT points FROM "._MYSQL_PREFIX."_jackpot WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) == 0)
-       {
+       if (SQL_NUMROWS($result) == 0) {
                // Create line
-               $result = SQL_QUERY("INSERT INTO "._MYSQL_PREFIX."_jackpot (ok, points) VALUES ('ok', 0.00000)", __FILE__, __LINE__);
-       }
-        else
-       {
-               // Free memory
-               SQL_FREERESULT($result);
-
+               SQL_QUERY("INSERT INTO "._MYSQL_PREFIX."_jackpot (ok, points) VALUES ('ok', 0.00000)", __FILE__, __LINE__);
+       } else {
                // Read points
                list($jackpot) = SQL_FETCHROW($result);
-               if ($jackpot >= $points)
-               {
+               if ($jackpot >= $points) {
                        // Update points when there are enougth points in jackpot
-                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_jackpot SET points=points-%s WHERE ok='ok' LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_jackpot SET points=points-%s WHERE ok='ok' LIMIT 1",
                                array($points), __FILE__, __LINE__);
                        $ret = $jackpot - $points;
-               }
+               } // END - if
        }
+
+       // Free memory
+       SQL_FREERESULT($result);
 }
 //
 function IS_DEMO() {
@@ -1796,8 +1791,7 @@ function GET_WHAT($modCheck) {
        return $wht;
 }
 //
-function MODULE_HAS_MENU($mod, $forceDb = false)
-{
+function MODULE_HAS_MENU($mod, $forceDb = false) {
        global $cacheArray, $_CONFIG;
 
        // All is false by default
@@ -1874,6 +1868,9 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
                                if (($values[$idx] + 0) === $values[$idx]) {
                                        // Number detected
                                        $all .= sprintf("%s=%s,", $entry, (float)$values[$idx]);
+                               } elseif ($values[$idx] == "UNIX_TIMESTAMP()") {
+                                       // Function UNIX_TIMESTAMP() detected
+                                       $all .= sprintf("%s=%s,", $entry, $values[$idx]);
                                } else {
                                        // String detected
                                        $all .= sprintf("%s='%s',", $entry, SQL_ESCAPE($values[$idx]));
@@ -1892,7 +1889,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
        }
 
        // Run database update
-       //DEBUG_LOG(__FUNCTION__, __LINE__, "entries={$entries}");
+       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "entries={$entries}");
        SQL_QUERY("UPDATE "._MYSQL_PREFIX."_config SET ".$entries." WHERE config=0 LIMIT 1", __FILE__, __LINE__);
 
        // Get affected rows
@@ -2266,8 +2263,14 @@ ORDER BY ur.refid ASC",
                        // Get unconfirmed mails
                        $row['unconfirmed']  = GET_TOTAL_DATA($row['refid'], "user_links", "id", "userid", true);
 
-                       // Calculate clickrate
-                       $row['clickrate'] = ($row['mails_confirmed'] / $row['emails_received'] * 100);
+                       // Init clickrate with zero
+                       $row['clickrate'] = 0;
+
+                       // Is at least one mail received?
+                       if ($row['emails_received'] > 0) {
+                               // Calculate clickrate
+                               $row['clickrate'] = ($row['mails_confirmed'] / $row['emails_received'] * 100);
+                       } // END - if
 
                        // Activity is "active" by default because if autopurge is not installed
                        $row['activity'] = MEMBER_ACTIVITY_ACTIVE;