A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

[mailer.git] / inc / modules / admin / what-refbanner.php

diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php
index 229a8beadf8aeef470ce83a04fb2c42a70287b07..c60def4c5b81c47ff7b483b7aeee0bc23bc9a474 100644 (file)
--- a/inc/modules/admin/what-refbanner.php
+++ b/inc/modules/admin/what-refbanner.php
@@ -49,7 +49,7 @@ if ((!REQUEST_ISSET_POST(('url'))) || (!REQUEST_ISSET_POST(('alternate')))) {
 }
 
 // Check selection count
-if (REQUEST_ISSET_POST(('sel'))) $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
+if (REQUEST_ISSET_POST('sel')) $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
 
 if (IS_FORM_SENT()) {
        // Fix older calls from add-new-banner-form
@@ -90,18 +90,18 @@ VALUES ('%s','%s','%s')",
        }
 
        if (SQL_AFFECTEDROWS() == 1) {
-               $content = SETTINGS_SAVED;
+               $content = getMessage('SETTINGS_SAVED');
        } else {
                $content = "<span class=\"admin_failed\">{--SETTINGS_NOT_SAVED--}</span>";
        }
        LOAD_TEMPLATE("admin_settings_saved", false, $content);
-} elseif (($SEL > 0) && (REQUEST_ISSET_POST(('edit')))) {
+} elseif (($SEL > 0) && (REQUEST_ISSET_POST('edit'))) {
        // Edit banner
        $SW = ""; $OUT = "";
        foreach (REQUEST_POST('sel') as $id => $sel) {
                // Load data
                $result = SQL_QUERY_ESC("SELECT url, alternate, visible FROM `{!_MYSQL_PREFIX!}_refbanner` WHERE id=%s LIMIT 1",
-                array(bigintval($id)), __FILE__, __LINE__);
+                       array(bigintval($id)), __FILE__, __LINE__);
                list($url, $alt, $vis) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
@@ -118,13 +118,14 @@ VALUES ('%s','%s','%s')",
                $OUT .= LOAD_TEMPLATE("admin_refbanner_edit_row", true, $content);
                $SW = 3 - $SW;
        }
+
+       // @TODO Rewrite this constant
        define('__BANNER_ROWS', $OUT);
 
        // Load main template
        LOAD_TEMPLATE("admin_refbanner_edit");
 } else {
-       if (($SEL > 0) && (REQUEST_ISSET_POST(('del'))))
-       {
+       if (($SEL > 0) && (REQUEST_ISSET_POST('del'))) {
                // Delete banner
                foreach (REQUEST_POST('sel') as $id => $sel) {
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_refbanner` WHERE id=%s LIMIT 1",
@@ -133,22 +134,22 @@ VALUES ('%s','%s','%s')",
        }
 
        // Referal levels
-       $result = SQL_QUERY("SELECT id, url, alternate, visible, counter, clicks FROM `{!_MYSQL_PREFIX!}_refbanner` ORDER BY url", __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) > 0)
-       {
+       $result = SQL_QUERY("SELECT id, url, alternate, visible, counter, clicks FROM `{!_MYSQL_PREFIX!}_refbanner` ORDER BY url",
+               __FILE__, __LINE__);
+       if (SQL_NUMROWS($result) > 0) {
                // Make referal banner editable and deletable
-               $SW = 2; $OUT = "";
-               while (list($id, $url, $alt, $vis, $cntr, $clks) = SQL_FETCHROW($result))
-               {
+               $OUT = ""; $SW = 2;
+               while ($content = SQL_FETCHARRAY($result)) {
                        // Preapre data for the row
+                       // @TODO Rewritings: alt->alternate,cnt->counter,clx->clicks in template
                        $content = array(
                                'sw'  => $SW,
-                               'id'  => $id,
-                               'url' => $url,
-                               'alt' => $alt,
-                               'vis' => TRANSLATE_YESNO($vis),
-                               'cnt' => $cntr,
-                               'clx' => $clks
+                               'id'  => $content['id'],
+                               'url' => $content['url'],
+                               'alt' => $content['alternate'],
+                               'vis' => TRANSLATE_YESNO($content['visible']),
+                               'cnt' => $content['counter'],
+                               'clx' => $content['clicks']
                        );
 
                        // Load row template and switch color
@@ -158,6 +159,8 @@ VALUES ('%s','%s','%s')",
 
                // Free memory
                SQL_FREERESULT($result);
+
+               // @TODO Rewrite this constant
                define('__BANNER_ROWS', $OUT);
 
                // Load main template