A lot variables renamed from all upper-case to hungarian notation

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

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index 3d3c3806c968aa525e918cdbf4580d01cbcf6e55..2a151aa1e7351357f8e4ff4c5efcc217dc3a7a29 100644 (file)
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Country codes verwalten                          *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -55,18 +60,18 @@ if ((REQUEST_ISSET_POST(('add'))) && (REQUEST_ISSET_POST(('code'))) && (REQUEST_
                        ), __FILE__, __LINE__);
 
                // Country added
-               $MSG = ADMIN_COUNTRY_ADDED_1.strtoupper(REQUEST_POST('descr')).ADMIN_COUNTRY_ADDED_2;
+               $message = sprintf(getMessage('ADMIN_COUNTRY_ADDED'), strtoupper(REQUEST_POST('descr')));
        } else {
                // Free memory
                SQL_FREERESULT($result);
 
                // Does already exist
-               $MSG = ADMIN_COUNTRY_ALREADY_1.strtoupper(REQUEST_POST('code')).ADMIN_COUNTRY_ALREADY_2;
+               $message = sprintf(getMessage('ADMIN_COUNTRY_ALREADY'), strtoupper(REQUEST_POST('code')));
        }
 
        // Display message
-       LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
-} elseif ((REQUEST_ISSET_POST(('change'))) && (REQUEST_ISSET_POST(('id')))) {
+       LOAD_TEMPLATE("admin_settings_saved", false, $message);
+} elseif ((REQUEST_ISSET_POST('change')) && (REQUEST_ISSET_POST(('id')))) {
        // Change all status
        ADMIN_CHANGE_ACTIVATION_STATUS(REQUEST_POST('id'), "countries", "is_active");
 
@@ -75,23 +80,23 @@ if ((REQUEST_ISSET_POST(('add'))) && (REQUEST_ISSET_POST(('code'))) && (REQUEST_
                'url'   => "modules.php?module=admin&what=list_country",
                'title' => getMessage('ADMIN_COUNTRY_ACTIVATION_NEXT_LINK')
        ));
-} elseif (((REQUEST_ISSET_POST('edit')) || (REQUEST_ISSET_POST(('delete')))) && (REQUEST_ISSET_POST(('id')))) {
+} elseif (((REQUEST_ISSET_POST('edit')) || (REQUEST_ISSET_POST('delete'))) && (REQUEST_ISSET_POST(('id')))) {
        if (count(REQUEST_POST('id')) > 0) {
                if (REQUEST_ISSET_POST('edit')) {
                        // Edit template
                        $row    = "admin_list_country_edit_row";
                        $post   = "modify";
                        $class  = "admin_submit";
-                       $submit = ADMIN_COUNTRY_EDIT_NOW;
-                       $title  = ADMIN_COUNTRY_EDIT_TITLE;
+                       $submit = getMessage('ADMIN_COUNTRY_EDIT_NOW');
+                       $title  = getMessage('ADMIN_COUNTRY_EDIT_TITLE');
                        $reset  = "<input type=\"reset\" class=\"admin_reset\" value=\"{!UNDO_SELECTIONS!}\" />&nbsp;*\n";
                } else {
                        // Delete template
                        $row    = "admin_list_country_del_row";
                        $post   = "remove";
                        $class  = "admin_delete";
-                       $submit = ADMIN_COUNTRY_DELETE_NOW;
-                       $title  = ADMIN_COUNTRY_DELETE_TITLE;
+                       $submit = getMessage('ADMIN_COUNTRY_DELETE_NOW');
+                       $title  = getMessage('ADMIN_COUNTRY_DELETE_TITLE');
                        $reset  = "";
                }
 
@@ -139,7 +144,7 @@ if ((REQUEST_ISSET_POST(('add'))) && (REQUEST_ISSET_POST(('code'))) && (REQUEST_
        }
 } else {
        // Shall we modify / remove entries now?
-       $MSG = ""; INIT_SQLS();
+       $message = ""; INIT_SQLS();
        if ((REQUEST_ISSET_POST(('modify'))) && (REQUEST_ISSET_POST(('id')))) {
                // Modify
                foreach (REQUEST_POST('id') as $id => $sel) {
@@ -147,22 +152,22 @@ if ((REQUEST_ISSET_POST(('add'))) && (REQUEST_ISSET_POST(('code'))) && (REQUEST_
                }
 
                // Create message
-               $MSG = getMessage('ADMIN_COUNTRIES_MODIFIED');
-       } elseif ((REQUEST_ISSET_POST(('remove'))) && (REQUEST_ISSET_POST(('id')))) {
+               $message = getMessage('ADMIN_COUNTRIES_MODIFIED');
+       } elseif ((REQUEST_ISSET_POST('remove')) && (REQUEST_ISSET_POST(('id')))) {
                // Remove
                $IDs = implode(",", array_keys(REQUEST_POST('id')));
                ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_countries` WHERE id IN (".$IDs.") LIMIT ".count(REQUEST_POST('id'))."");
 
                // Create message
-               $MSG = getMessage('ADMIN_COUNTRIES_REMOVED');
+               $message = getMessage('ADMIN_COUNTRIES_REMOVED');
        }
 
-       if ((!empty($MSG)) && (COUNT_SQLS() > 0)) {
+       if ((!empty($message)) && (COUNT_SQLS() > 0)) {
                // Run SQL commands
                runFilterChain('run_sqls');
 
                // Display message
-               LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
+               LOAD_TEMPLATE("admin_settings_saved", false, $message);
        }
 
        // Load currenty setup country codes to list
@@ -170,15 +175,16 @@ if ((REQUEST_ISSET_POST(('add'))) && (REQUEST_ISSET_POST(('code'))) && (REQUEST_
        if (SQL_NUMROWS($result) > 0) {
                // List all countries
                $OUT = ""; $SW = 2;
-               while (list($id, $code, $descr, $active) = SQL_FETCHROW($result)) {
+               while ($content = SQL_FETCHARRAY($result)) {
                        // Prepare array for the template
+                       // @TODO Rewritings: name->descr,status->is_active in template
                        $content = array(
-                               'id'     => $id,
-                               'code'   => $code,
-                               'name'   => $descr,
-                               'active' => TRANSLATE_YESNO($active),
+                               'id'     => $content['id'],
+                               'code'   => $content['code'],
+                               'name'   => $content['descr'],
+                               'active' => TRANSLATE_YESNO($content['is_active']),
                                'sw'     => $SW,
-                               'status' => $active,
+                               'status' => $content['is_active'],
                        );
 
                        // Load row template and switch colors