Extension templates rewritten, the configuration was inserted while an extension...

[mailer.git] / mailid_top.php

diff --git a/mailid_top.php b/mailid_top.php
index ff1cecd9a49baebb0d4b6f54676f8b3e72271cb5..ec0417eafcc66f0da42d785d8720d0f1937f884e 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -110,7 +110,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
                                break;
 
                        default: // Unknown type
-                               debug_report_bug('Unknown mail type ' . $ltype . ' detected.');
+                               debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
                                break;
                }
 
@@ -166,7 +166,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
                                                        break;
 
                                                default: // Unknown type
-                                                       debug_report_bug('Unknown mail type ' . $ltype . ' detected.');
+                                                       debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
                                                        break;
                                        }
 
@@ -194,7 +194,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
                                                                                                array($url_mid), __FILE__, __LINE__);
 
                                                                                        // Update mediadata as well
-                                                                                       if (getExtensionVersion('mediadata') >= '0.0.4') {
+                                                                                       if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
                                                                                                // Update database
                                                                                                updateMediadataEntry(array('total_clicks', 'normal_clicks'), 'add', 1);
                                                                                        } // END - if
@@ -206,7 +206,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
                                                                                                array($url_bid), __FILE__, __LINE__);
 
                                                                                        // Update mediadata as well
-                                                                                       if (getExtensionVersion('mediadata') >= '0.0.4') {
+                                                                                       if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
                                                                                                // Update database
                                                                                                updateMediadataEntry(array('total_clicks', 'bonus_clicks'), 'add', 1);
                                                                                        } // END - if
@@ -214,7 +214,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
                                                                                        break;
 
                                                                                default: // Unknown type
-                                                                                       debug_report_bug('Unknown mail type ' . $ltype . ' detected.');
+                                                                                       debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
                                                                                        break;
                                                                        } // END - switch
 
@@ -224,13 +224,13 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 
                                                                        // Only when user extension = v0.1.2: Update mails-confirmed counter
                                                                        // @TODO Rewrite these blocks to filter
-                                                                       if (getExtensionVersion('user') >= '0.1.2') {
+                                                                       if (isExtensionInstalledAndNewer('user', '0.1.2')) {
                                                                                // Update counter
                                                                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET mails_confirmed=mails_confirmed + 1 WHERE `userid`=%s LIMIT 1",
                                                                                        array($url_userid), __FILE__, __LINE__);
 
                                                                                // Update random confirmed as well?
-                                                                               if (getExtensionVersion('user') >= '0.3.4') {
+                                                                               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",
                                                                                                array($url_userid), __FILE__, __LINE__);
@@ -263,7 +263,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
                                                                                addPointsThroughReferalSystem('mailid_okay', $url_userid, $payment, false, 0, $locked);
 
                                                                                // Shall I add bonus points for "turbo clickers" ?
-                                                                               if (getExtensionVersion('bonus') >= '0.2.2') {
+                                                                               if (isExtensionInstalledAndNewer('bonus', '0.2.2')) {
                                                                                        // Is an active-rallye running and this is not a notification mail?
                                                                                        if ((getConfig('bonus_active') == 'Y') && ($notify != 'Y')) {
                                                                                                // Shall I exclude the webmaster's own userid from the active-rallye?
@@ -328,7 +328,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
                                                                                loadTemplate($templ, false, $content);
                                                                        } else {
                                                                                // Cannot confirm!
-                                                                               debug_report_bug('No code given.');
+                                                                               debug_report_bug(__FILE__, __LINE__, 'No code given.');
                                                                        }
                                                                        break;
 
@@ -348,7 +348,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
                                                                        break;
 
                                                                default: // Unknown mode
-                                                                       debug_report_bug('Unknown mode ' . $mode . ' detected.');
+                                                                       debug_report_bug(__FILE__, __LINE__, 'Unknown mode ' . $mode . ' detected.');
                                                                        break;
                                                        } // END - switch
                                                } else {