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

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

diff --git a/inc/modules/admin/what-config_rewrite.php b/inc/modules/admin/what-config_rewrite.php
index 00bfce4a4e4a09f714f4bad238ac58db4efaaff8..3da28b7a3c6e18e1aebc082c4f57d96d9b89e6c4 100644 (file)
--- a/inc/modules/admin/what-config_rewrite.php
+++ b/inc/modules/admin/what-config_rewrite.php
@@ -53,20 +53,20 @@ if (IS_FORM_SENT()) {
 
        // Implode array to string and remove posted mod array
        REQUEST_SET_POST('rewrite_skip', implode(":", $MODs));
 
        // Implode array to string and remove posted mod array
        REQUEST_SET_POST('rewrite_skip', implode(":", $MODs));

-       REQUEST_UNSET_POST(('mod'));
+       REQUEST_UNSET_POST('mod');

 
        // Save settings
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Load existing modules and generate TR rows for the template
        $result = SQL_QUERY("SELECT module, title FROM `{!_MYSQL_PREFIX!}_mod_reg` ORDER BY module", __FILE__, __LINE__);
 
        // Save settings
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Load existing modules and generate TR rows for the template
        $result = SQL_QUERY("SELECT module, title FROM `{!_MYSQL_PREFIX!}_mod_reg` ORDER BY module", __FILE__, __LINE__);

-       $SW = 2; $OUT = "";
-       while (list($mod, $title) = SQL_FETCHROW($result)) {
+       $OUT = ""; $SW = 2;
+       while ($content = SQL_FETCHARRAY($result)) {

                // Set title to three dashes when no title is supplied
                // Set title to three dashes when no title is supplied

-               if (empty($title)) $title = "---";
+               if (empty($content['title'])) $content['title'] = "---";

 
                // Already registered module?
 
                // Already registered module?

-               if (ereg($mod, getConfig('rewrite_skip'))) {
+               if (ereg($content['module'], getConfig('rewrite_skip'))) {

                        // Found
                        $y = " checked=\"checked\"";
                        $n = "";
                        // Found
                        $y = " checked=\"checked\"";
                        $n = "";


@@ -77,13 +77,9 @@ if (IS_FORM_SENT()) {
                }
 
                // Remember data in array for the dynamic row template
                }
 
                // Remember data in array for the dynamic row template

-               $content = array(
-                       'module'    => $mod,
-                       'title'     => $title,
-                       'y_default' => $y,
-                       'n_default' => $n,
-                       'sw'        => $SW,
-               );
+               $content['y_default'] = $y;
+               $content['n_default'] = $n;
+               $content['sw']        = $SW;

 
                // Load template and switch colors
                $OUT .= LOAD_TEMPLATE("admin_config_rewrite_rows", true, $content);
 
                // Load template and switch colors
                $OUT .= LOAD_TEMPLATE("admin_config_rewrite_rows", true, $content);


@@ -92,10 +88,13 @@ if (IS_FORM_SENT()) {
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Free memory
        SQL_FREERESULT($result);

+
+       // @TODO Rewrite this constant

        define('__MODULE_ROWS', $OUT);
 
        // Load main template
        LOAD_TEMPLATE("admin_config_rewrite");
 }
        define('__MODULE_ROWS', $OUT);
 
        // Load main template
        LOAD_TEMPLATE("admin_config_rewrite");
 }

+

 //
 ?>
 //
 ?>