Referal system refactured (and some parts fixed), wrapper function introduced:

[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 05397487ce4e89ebc0816498585e9a02d7349ae6..40418c251c8ff6b3e7c201657fcfc8e9d71317ce 100644 (file)
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -82,7 +82,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
        if (count(postRequestParameter('id')) > 0) {
                if (isFormSent('edit')) {
                        // Edit template
-                       $row    = 'admin_list_country_edit_row';
+                       $row    = 'admin_edit_country_row';
                        $post   = 'modify';
                        $class  = 'form_submit';
                        $submit = '{--ADMIN_COUNTRY_EDIT_NOW--}';
@@ -90,7 +90,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
                        $reset  = '<input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" /> ';
                } else {
                        // Delete template
-                       $row    = 'admin_list_country_del_row';
+                       $row    = 'admin_delete_country_row';
                        $post   = 'remove';
                        $class  = 'form_delete';
                        $submit = '{--ADMIN_COUNTRY_DELETE_NOW--}';
@@ -108,13 +108,8 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
                                // Load data
                                $content = SQL_FETCHARRAY($result);
 
-                               if ($post == 'modify') {
-                                       // Generate default selection in edit-mode
-                                       $content['is_active'] = generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $isActive);
-                               } else {
-                                       // Only display status when in delete-mode
-                                       $content['is_active'] = '{%pipe,translateYesNo=' . $isActive . '%}';
-                               }
+                               // Add $isActive
+                               $content['is_active'] = $isActive;
 
                                // Insert row template and switch color
                                $OUT .= loadTemplate($row, true, $content);