New (template) wrapper function fixEmptyContentToDashes() introduced, EL rewrites:

[mailer.git] / mailid_top.php

diff --git a/mailid_top.php b/mailid_top.php
index ec0417eafcc66f0da42d785d8720d0f1937f884e..e9afe997ddc1b326fb1f7472949e5d798a2af586 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -80,19 +80,18 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 
        // Maybe he wants to confirm an email?
        if ($url_mid > 0) {
-               $result = SQL_QUERY_ESC("SELECT `id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
+               $result_main = SQL_QUERY_ESC("SELECT `id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
                        array($url_mid, $url_userid), __FILE__, __LINE__);
                $type = 'mailid'; $urlId = $url_mid;
        } elseif ($url_bid > 0) {
-               $result = SQL_QUERY_ESC("SELECT `id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
+               $result_main = SQL_QUERY_ESC("SELECT `id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
                        array($url_bid, $url_userid), __FILE__, __LINE__);
                $type = 'bonusid'; $urlId = $url_bid;
        }
 
-       if (SQL_NUMROWS($result) == 1) {
+       if (SQL_NUMROWS($result_main) == 1) {
                // Is the stats id valid?
-               list($lid, $ltype) = SQL_FETCHROW($result);
-               SQL_FREERESULT($result);
+               list($lid, $ltype) = SQL_FETCHROW($result_main);
 
                // Init result here with invalid to avoid possible missing variable
                $result_mailid = false;
@@ -122,9 +121,6 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
                        // Correct notification switch in non-bonus mails
                        if (($notify != 'Y') && ($notify != 'N')) $notify = 'N';
 
-                       // Free some memory
-                       SQL_FREERESULT($result_mailid);
-
                        // Set sender to 0 when we have a bonus mail
                        if ($ltype == 'BONUS') $sender = '0';
 
@@ -232,7 +228,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
                                                                                // Update random confirmed as well?
                                                                                if (isExtensionInstalledAndNewer('user', '0.3.4')) {
                                                                                        // Update second counter
-                                                                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET rand_confirmed=rand_confirmed + 1 WHERE `userid`=%s LIMIT 1",
+                                                                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `rand_confirmed`=`rand_confirmed` + 1 WHERE `userid`=%s LIMIT 1",
                                                                                                array($url_userid), __FILE__, __LINE__);
                                                                                } // END - if
                                                                        } // END - if
@@ -364,21 +360,24 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
                                        $mode = 'failed';
                                }
                        } else {
-                               SQL_FREERESULT($result);
                                loadTemplate('admin_settings_saved', false, '<div class="member_failed">{--MAIL_ALREADY_CONFIRMED--} (3)</div>');
                                $mode = 'failed';
                        }
                } else {
-                       SQL_FREERESULT($result);
                        loadTemplate('admin_settings_saved', false, '<div class="member_failed">{--MAIL_ALREADY_CONFIRMED--} (2)</div>');
                        $mode = 'failed';
                }
+
+               // Free result
+               SQL_FREERESULT($result_mailid);
        } else {
-               SQL_FREERESULT($result);
                loadTemplate('admin_settings_saved', false, '<div class="member_failed">{--MAIL_ALREADY_CONFIRMED--} (1)</div>');
                $mode = 'failed';
        }
 
+       // Free result
+       SQL_FREERESULT($result_main);
+
        // Insert footer if no image
        if ($mode != 'img') {
                // Write footer