Fixes for wrong tewmplate names, new network added:

- Fixed a lot templates names which was renamed in mass CSS updated
- Added new advertising network 'Fusion-Ads'
- Editing of request type in ext-network works again
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index dc5b084729cb64b6ffdc9df4cd73c316e92f6acb..f0f933ba63c58dd0a0164a18f79d5f53c17e744c 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -20,7 +20,7 @@
 ./inc/extensions/ext-network.php:26: * @TODO AllAds4You: Traffic from abroad, High-Forced banner            *
 ./inc/extensions/ext-network.php:27: * @TODO FuCoExSponsor: No High-Forced banner, HTML is BASE64 encoded   *
 ./inc/extensions/ext-network.php:28: * @TODO FuCoExSponsor: Textlink-View is JavaScript!                    *
 ./inc/extensions/ext-network.php:26: * @TODO AllAds4You: Traffic from abroad, High-Forced banner            *
 ./inc/extensions/ext-network.php:27: * @TODO FuCoExSponsor: No High-Forced banner, HTML is BASE64 encoded   *
 ./inc/extensions/ext-network.php:28: * @TODO FuCoExSponsor: Textlink-View is JavaScript!                    *

-./inc/extensions/ext-network.php:29: * @TODO Fusion-Ads: Has click/banner URL in API response, really UTF-8 *
+./inc/extensions/ext-network.php:29: * @TODO Fusion-Ads: Has click/banner URL in API response               *

 ./inc/extensions/ext-network.php:30: * @TODO GolloX: Which charset?                                         *
 ./inc/extensions/ext-network.php:31: * @TODO paid4ad: Which URLs for click and banner?                      *
 ./inc/extensions/ext-network.php:32: * @TODO VIPads: HTML text is send encoded with BASE64                  *
 ./inc/extensions/ext-network.php:30: * @TODO GolloX: Which charset?                                         *
 ./inc/extensions/ext-network.php:31: * @TODO paid4ad: Which URLs for click and banner?                      *
 ./inc/extensions/ext-network.php:32: * @TODO VIPads: HTML text is send encoded with BASE64                  *

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index b2827e423a4b3711516a30cafcf07890b16aa8e0..26307a43d49ff91b2cb602b2a554586bc5f2df1f 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -26,7 +26,7 @@
  * @TODO AllAds4You: Traffic from abroad, High-Forced banner            *
  * @TODO FuCoExSponsor: No High-Forced banner, HTML is BASE64 encoded   *
  * @TODO FuCoExSponsor: Textlink-View is JavaScript!                    *
  * @TODO AllAds4You: Traffic from abroad, High-Forced banner            *
  * @TODO FuCoExSponsor: No High-Forced banner, HTML is BASE64 encoded   *
  * @TODO FuCoExSponsor: Textlink-View is JavaScript!                    *

- * @TODO Fusion-Ads: Has click/banner URL in API response, really UTF-8 *
+ * @TODO Fusion-Ads: Has click/banner URL in API response               *

  * @TODO GolloX: Which charset?                                         *
  * @TODO paid4ad: Which URLs for click and banner?                      *
  * @TODO VIPads: HTML text is send encoded with BASE64                  *
  * @TODO GolloX: Which charset?                                         *
  * @TODO paid4ad: Which URLs for click and banner?                      *
  * @TODO VIPads: HTML text is send encoded with BASE64                  *


@@ -216,58 +216,58 @@ PRIMARY KEY (`network_reload_id`)
 ) TYPE={?_TABLE_TYPE?} COMMENT='Reload locks'");
 
                // Insert API response array translations, these will be used for calling the right filter function
 ) TYPE={?_TABLE_TYPE?} COMMENT='Reload locks'");
 
                // Insert API response array translations, these will be used for calling the right filter function

-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_translations` (`network_translation_id`, `network_translation_name`) VALUES
-(1, 'id'),
-(2, 'name'),
-(3, 'alternate_text'),
-(4, 'reload'),
-(5, 'remain'),
-(6, 'reward'),
-(7, 'banner_id'),
-(8, 'size'),
-(9, 'text'),
-(10, 'minimum_stay'),
-(11, 'textlink_id'),
-(12, 'surfbar_id'),
-(13, 'mail_id'),
-(14, 'layer_id'),
-(15, 'popup_id'),
-(16, 'popdown_id'),
-(17, 'lead_id'),
-(18, 'sale_id'),
-(19, 'banner_url1'),
-(20, 'banner_url2'),
-(21, 'banner_url3'),
-(22, 'textlink1'),
-(23, 'textlink2'),
-(24, 'textlink3'),
-(25, 'description'),
-(26, 'traffic_id'),
-(27, 'country_code'),
-(28, 'banner_url4'),
-(29, 'banner_url5'),
-(30, 'banner_url6'),
-(31, 'banner_url7'),
-(32, 'banner_url8'),
-(33, 'banner_url9'),
-(34, 'banner_url10'),
-(35, 'textlink4'),
-(36, 'textlink5'),
-(37, 'subject'),
-(38, 'click_url'),
-(39, 'media_url')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_translations` (`network_translation_name`) VALUES
+('id'),
+('name'),
+('alternate_text'),
+('reload'),
+('remain'),
+('reward'),
+('banner_id'),
+('size'),
+('text'),
+('minimum_stay'),
+('textlink_id'),
+('surfbar_id'),
+('mail_id'),
+('layer_id'),
+('popup_id'),
+('popdown_id'),
+('lead_id'),
+('sale_id'),
+('banner_url1'),
+('banner_url2'),
+('banner_url3'),
+('textlink1'),
+('textlink2'),
+('textlink3'),
+('description'),
+('traffic_id'),
+('country_code'),
+('banner_url4'),
+('banner_url5'),
+('banner_url6'),
+('banner_url7'),
+('banner_url8'),
+('banner_url9'),
+('banner_url10'),
+('textlink4'),
+('textlink5'),
+('subject'),
+('click_url'),
+('media_url')");

 
                // Insert error code types
 
                // Insert error code types

-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code_id`, `network_code`) VALUES
-(1, 'AFF_ID_PASS_WRONG'),
-(2, 'SITE_ID_NOT_ASSIGNED'),
-(3, 'SITE_ID_LOCKED'),
-(4, 'INTERFACE_DATA_ERROR'),
-(5, 'REQUESTS_DEPLETED'),
-(6, 'NO_CAMPAIGNS_FOUND'),
-(7, 'NO_CAMPAIGNS_FOUND_INTERFACE'),
-(8, 'SITE_ID_NOT_ALLOWED_TYPE'),
-(9, 'REQUEST_PARAMETER_INCOMPLETE')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code`) VALUES
+('AFF_ID_PASS_WRONG'),
+('SITE_ID_NOT_ASSIGNED'),
+('SITE_ID_LOCKED'),
+('INTERFACE_DATA_ERROR'),
+('REQUESTS_DEPLETED'),
+('NO_CAMPAIGNS_FOUND'),
+('NO_CAMPAIGNS_FOUND_INTERFACE'),
+('SITE_ID_NOT_ALLOWED_TYPE'),
+('REQUEST_PARAMETER_INCOMPLETE')");

 
                // Sponsor networks
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_data` (`network_short_name`, `network_title`, `network_reflink`, `network_data_seperator`, `network_row_seperator`, `network_request_type`, `network_charset`) VALUES
 
                // Sponsor networks
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_data` (`network_short_name`, `network_title`, `network_reflink`, `network_data_seperator`, `network_row_seperator`, `network_request_type`, `network_charset`) VALUES


@@ -283,7 +283,7 @@ PRIMARY KEY (`network_reload_id`)
 ('allads4you', 'AllAds4You', 'http://www.allads4you.de?ref=1146', '|', '|', 'GET', 'ISO-8859-1'),
 ('alster', 'Alster-Marketing', 'http://www.alstermarketing.de?ref=1851', '|', '|', 'GET', 'ISO-8859-16'),
 ('bonus', 'BonusSponsor', 'http://www.bonussponsor.de?ref=1286', '|', '|', 'GET', 'WINDOWS-1252'),
 ('allads4you', 'AllAds4You', 'http://www.allads4you.de?ref=1146', '|', '|', 'GET', 'ISO-8859-1'),
 ('alster', 'Alster-Marketing', 'http://www.alstermarketing.de?ref=1851', '|', '|', 'GET', 'ISO-8859-16'),
 ('bonus', 'BonusSponsor', 'http://www.bonussponsor.de?ref=1286', '|', '|', 'GET', 'WINDOWS-1252'),

-('fusion', 'Fusion-Ads', 'http://www.fusion-ads.de/?ref=84', '|', '|', 'GET', 'UTF-8'),
+('fusion', 'Fusion-Ads', 'http://www.fusion-ads.de/?ref=84', '|', '|', 'GET', 'ISO-8859-1'),

 ('gigapromo', 'GigaPromo', 'http://www.gigapromo.de/index.php?ref=953', '|', '|', 'GET', 'WINDOWS-1252'),
 ('hpsonsor', 'HPSponsor', 'http://hpsponsor.at?ref=29', '|', '|', 'GET', 'WINDOWS-1252'),
 ('make-euros', 'Make-Euros.de', 'http://www.make-euros.de?ref=1184', '|', '|', 'GET', 'ISO-8859-1'),
 ('gigapromo', 'GigaPromo', 'http://www.gigapromo.de/index.php?ref=953', '|', '|', 'GET', 'WINDOWS-1252'),
 ('hpsonsor', 'HPSponsor', 'http://hpsponsor.at?ref=29', '|', '|', 'GET', 'WINDOWS-1252'),
 ('make-euros', 'Make-Euros.de', 'http://www.make-euros.de?ref=1184', '|', '|', 'GET', 'ISO-8859-1'),


@@ -487,6 +487,9 @@ PRIMARY KEY (`network_reload_id`)
 (289, 29, 'traffic', 'http://fucoexsponsor.net/int/get.php', 'http://fucoexsponsor.net/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', NULL)");
 
                // Network type handlers - Fusion-Ads
 (289, 29, 'traffic', 'http://fucoexsponsor.net/int/get.php', 'http://fucoexsponsor.net/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', NULL)");
 
                // Network type handlers - Fusion-Ads

+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`, `network_type_handle`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`) VALUES
+(290, 13, 'forcedbanner', 'http://www.fusion-ads.de/data/get.php', 'http://www.fusion-ads.de/data/werbung.php?uid=%UID%&kid=%CID%&sid=%SID%&art=32&step=1', 'http://www.fusion-ads.de/data/werbung.php?uid=%UID%&kid=%CID%&sid=%SID%&art=32'),
+(291, 13, 'textmail', 'http://www.fusion-ads.de/data/get.php', 'ttp://www.fusion-ads.de/data/werbung.php?uid=%UID%&kid=%CID%&sid=%SID%&art=33', NULL)");

 
                // Network type handlers - GigaPromo
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`, `network_type_handle`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`) VALUES
 
                // Network type handlers - GigaPromo
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`, `network_type_handle`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`) VALUES


@@ -1701,6 +1704,21 @@ PRIMARY KEY (`network_reload_id`)
 (29, 289, 'sid', 'sid', NULL)");
 
                // Request parameters per type handler - Fusion-Ads
 (29, 289, 'sid', 'sid', NULL)");
 
                // Request parameters per type handler - Fusion-Ads

+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES
+(13, 290, 'extra', 'art', 'Forcedbanner'),
+(13, 290, 'id', 'uid', NULL),
+(13, 290, 'password', 'pw', NULL),
+(13, 290, 'reload', 'reload', NULL),
+(13, 290, 'remain', 'offen', NULL),
+(13, 290, 'reward', 'verguetung', NULL),
+(13, 290, 'sid', 'sid', NULL),
+(13, 291, 'extra', 'art', 'Paidmail'),
+(13, 291, 'id', 'uid', NULL),
+(13, 291, 'password', 'pw', NULL),
+(13, 291, 'reload', 'reload', NULL),
+(13, 291, 'remain', 'offen', NULL),
+(13, 291, 'reward', 'verguetung', NULL),
+(13, 291, 'sid', 'sid', NULL)");

 
                // Request parameters per type handler - GigapPromo
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES
 
                // Request parameters per type handler - GigapPromo
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES


@@ -3669,6 +3687,23 @@ PRIMARY KEY (`network_reload_id`)
 (29, 289, 10, 6)");
 
                // API array elements - Fusion-Ads
 (29, 289, 10, 6)");
 
                // API array elements - Fusion-Ads

+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES
+(13, 290, 1, 1),
+(13, 290, 2, 2),
+(13, 290, 6, 3),
+(13, 290, 4, 4),
+(13, 290, 5, 5),
+(13, 290, 39, 6),
+(13, 290, 38, 7),
+(13, 290, 10, 8),
+(13, 291, 1, 1),
+(13, 291, 2, 2),
+(13, 291, 6, 3),
+(13, 291, 4, 4),
+(13, 291, 5, 5),
+(13, 291, 38, 6),
+(13, 291, 9, 7),
+(13, 291, 10, 8)");

 
                // API array elements - GigaPromo
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES
 
                // API array elements - GigaPromo
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 2643cba2c1c50334032c842ce418b1c6a63cc03d..99f026b48052a0f218e423385005e4cd50849e8f 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -318,12 +318,12 @@ function adminsEditAdminAccount ($postData) {
                        $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMINS_GLOBAL_LA_SETTING--}', '{--ADMINS_OLD_LA_SETTING--}', '{--ADMINS_NEW_LA_SETTING--}'), $content['la_mode']);
 
                        // Load row template and switch color
                        $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMINS_GLOBAL_LA_SETTING--}', '{--ADMINS_OLD_LA_SETTING--}', '{--ADMINS_NEW_LA_SETTING--}'), $content['la_mode']);
 
                        // Load row template and switch color

-                       $OUT .= loadTemplate('form_submit_admins_row', true, $content);
+                       $OUT .= loadTemplate('admin_edit_admins_row', true, $content);

                } // END - if
        } // END - foreach
 
        // Load template
                } // END - if
        } // END - foreach
 
        // Load template

-       loadTemplate('form_submit_admins', false, $OUT);
+       loadTemplate('admin_edit_admins', false, $OUT);

 }
 
 // Delete given admin accounts
 }
 
 // Delete given admin accounts

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index f28386f9a7c29533dba0ddc44643d3ace76a56a2..ae47871fa8b25d058b8dfc3603d721258facfe6f 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -776,7 +776,7 @@ function doAdminNetworkProcessHandleNetwork () {
                                if (count($networkData) > 0) {
                                        if (isFormSent('edit')) {
                                                // Add row template for editing
                                if (count($networkData) > 0) {
                                        if (isFormSent('edit')) {
                                                // Add row template for editing

-                                               $OUT .= loadTemplate('form_submit_networks_row', true, $networkData);
+                                               $OUT .= loadTemplate('admin_edit_networks_row', true, $networkData);

                                        } elseif (isFormSent('del')) {
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_del_networks_row', true, $networkData);
                                        } elseif (isFormSent('del')) {
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_del_networks_row', true, $networkData);


@@ -792,7 +792,7 @@ function doAdminNetworkProcessHandleNetwork () {
                if (!empty($OUT)) {
                        // Output main template
                        if (isFormSent('edit')) {
                if (!empty($OUT)) {
                        // Output main template
                        if (isFormSent('edit')) {

-                               loadTemplate('form_submit_networks', false, $OUT);
+                               loadTemplate('admin_edit_networks', false, $OUT);

                        } elseif (isFormSent('del')) {
                                loadTemplate('admin_del_networks', false, $OUT);
                        } else {
                        } elseif (isFormSent('del')) {
                                loadTemplate('admin_del_networks', false, $OUT);
                        } else {


@@ -828,7 +828,7 @@ function doAdminNetworkProcessHandleNetworkType () {
                                if (count($networkTypeData) > 0) {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting
                                if (count($networkTypeData) > 0) {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting

-                                               $OUT .= loadTemplate('form_submit_network_types_row', true, $networkTypeData);
+                                               $OUT .= loadTemplate('admin_edit_network_types_row', true, $networkTypeData);

                                        } elseif (isFormSent('del')) {
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_del_network_types_row', true, $networkTypeData);
                                        } elseif (isFormSent('del')) {
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_del_network_types_row', true, $networkTypeData);


@@ -844,7 +844,7 @@ function doAdminNetworkProcessHandleNetworkType () {
                if (!empty($OUT)) {
                        // Output main template
                        if (isFormSent('edit')) {
                if (!empty($OUT)) {
                        // Output main template
                        if (isFormSent('edit')) {

-                               loadTemplate('form_submit_network_types', false, $OUT);
+                               loadTemplate('admin_edit_network_types', false, $OUT);

                        } elseif (isFormSent('del')) {
                                loadTemplate('admin_del_network_types', false, $OUT);
                        } else {
                        } elseif (isFormSent('del')) {
                                loadTemplate('admin_del_network_types', false, $OUT);
                        } else {


@@ -883,7 +883,7 @@ function doAdminNetworkProcessHandleRequestParams () {
                                if (count($networkRequestData) > 0) {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting
                                if (count($networkRequestData) > 0) {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting

-                                               $OUT .= loadTemplate('form_submit_network_params_row', true, $networkRequestData);
+                                               $OUT .= loadTemplate('admin_edit_network_params_row', true, $networkRequestData);

                                        } elseif (isFormSent('del')) {
                                                // Get type data
                                                $networkRequestData['network_type_data'] = getNetworkTypeDataById($networkRequestData['network_type_id']);
                                        } elseif (isFormSent('del')) {
                                                // Get type data
                                                $networkRequestData['network_type_data'] = getNetworkTypeDataById($networkRequestData['network_type_id']);


@@ -902,7 +902,7 @@ function doAdminNetworkProcessHandleRequestParams () {
                if (!empty($OUT)) {
                        // Output main template
                        if (isFormSent('edit')) {
                if (!empty($OUT)) {
                        // Output main template
                        if (isFormSent('edit')) {

-                               loadTemplate('form_submit_network_params', false, $OUT);
+                               loadTemplate('admin_edit_network_params', false, $OUT);

                        } elseif (isFormSent('del')) {
                                loadTemplate('admin_del_network_params', false, $OUT);
                        } else {
                        } elseif (isFormSent('del')) {
                                loadTemplate('admin_del_network_params', false, $OUT);
                        } else {

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index d8c339cfdc4938e6d60c3c05a603514bc31b1f24..874fa092f56376d3aa4da2598166701c2597d25c 100644 (file)
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -79,7 +79,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load row template
                                );
 
                                // Load row template

-                               $OUT .= loadTemplate('form_submit_admin_menu_row', true, $data);
+                               $OUT .= loadTemplate('admin_edit_admin_menu_row', true, $data);

                        } else {
                                // Entry not found?
                                $data = array(
                        } else {
                                // Entry not found?
                                $data = array(


@@ -99,7 +99,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $content['cnt'] = $cnt;
 
        // Load template
        $content['cnt'] = $cnt;
 
        // Load template

-       loadTemplate('form_submit_admin_menu_form', false, $content);
+       loadTemplate('admin_edit_admin_menu_form', false, $content);

 } elseif ((isFormSent('del')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Prepare misc content
        $content['sub'] = $SUB;
 } elseif ((isFormSent('del')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Prepare misc content
        $content['sub'] = $SUB;


@@ -282,7 +282,7 @@ LIMIT 1",
                SQL_FREERESULT($result);
 
                // Load template
                SQL_FREERESULT($result);
 
                // Load template

-               loadTemplate('form_submit_admin_menu', false, $content);
+               loadTemplate('admin_edit_admin_menu', false, $content);

        } else {
                // Menu entries are missing... (???)
                loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');
        } else {
                // Menu entries are missing... (???)
                loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');

diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index 6b381b3dc38c515e8dc757ffb852022a1500974c..1649e42a4247a45d862424da736ee65a1a0003cc 100644 (file)
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -137,11 +137,11 @@ if (isFormSent('add')) {
                $content['visible_selection'] = addSelectionBox('yn', $content['visible'], 'visible', $content['id']);
 
                // Load row template and switch colors
                $content['visible_selection'] = addSelectionBox('yn', $content['visible'], 'visible', $content['id']);
 
                // Load row template and switch colors

-               $OUT .= loadTemplate('form_submit_cats_row', true, $content);
+               $OUT .= loadTemplate('admin_edit_cats_row', true, $content);

        } // END - foreach
 
        // Load main template
        } // END - foreach
 
        // Load main template

-       loadTemplate('form_submit_cats', false, $OUT);
+       loadTemplate('admin_edit_cats', false, $OUT);

 } else {
        // Init variable here
        $CATS = '';
 } else {
        // Init variable here
        $CATS = '';

diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index abae1058a99cb1b1e3477d5ee4564e150204087f..11c41ffef6e1997591fb69e245ca02b1660a2ef2 100644 (file)
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -210,11 +210,11 @@ WHERE
                        SQL_FREERESULT($result);
 
                        // Load row template and switch color
                        SQL_FREERESULT($result);
 
                        // Load row template and switch color

-                       $OUT .= loadTemplate('form_submit_reflevel_row', true, $content);
+                       $OUT .= loadTemplate('admin_edit_reflevel_row', true, $content);

                } // END - foreach
 
                // Load main template
                } // END - foreach
 
                // Load main template

-               loadTemplate('form_submit_reflevel', false, $OUT);
+               loadTemplate('admin_edit_reflevel', false, $OUT);

        } else {
                // Referal levels
                $result = SQL_QUERY("SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC", __FILE__, __LINE__);
        } else {
                // Referal levels
                $result = SQL_QUERY("SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC", __FILE__, __LINE__);

diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index a4d49bed3694f6a242d5dedc2985e6a09b58b598..230c7069255eb9b47ecfce500c737360e6bd82a8 100644 (file)
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -71,7 +71,7 @@ if (!SQL_HASZERONUMS($result)) {
                SQL_FREERESULT($result);
 
                // Load template
                SQL_FREERESULT($result);
 
                // Load template

-               loadTemplate('form_submit_email', false, $content);
+               loadTemplate('admin_edit_email', false, $content);

        } elseif (isPostRequestParameterSet('save')) {
                // Save changes
                SQL_QUERY_ESC("UPDATE
        } elseif (isPostRequestParameterSet('save')) {
                // Save changes
                SQL_QUERY_ESC("UPDATE


@@ -103,14 +103,14 @@ LIMIT 1",
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template and switch colors
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template and switch colors

-                       $OUT .= loadTemplate('form_submit_email_row', true, $content);
+                       $OUT .= loadTemplate('admin_edit_email_row', true, $content);

                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load email template
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load email template

-               loadTemplate('form_submit_email_select', false, $OUT);
+               loadTemplate('admin_edit_email_select', false, $OUT);

        }
 } else {
        // No mail orders left in pool
        }
 } else {
        // No mail orders left in pool

diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php
index 0220db1dee474160ac2aade4068a3a6fc0c90320..81d68c22284844be1c10787b320c9d846ab76505 100644 (file)
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.php
@@ -76,7 +76,7 @@ LIMIT 1",
                $content['warning_interval'] = createTimeSelections($content['warning_interval'], 'warning_interval', 'MWDh');
 
                // Init variables here
                $content['warning_interval'] = createTimeSelections($content['warning_interval'], 'warning_interval', 'MWDh');
 
                // Init variables here

-               $TPL = sprintf("form_submit_sponsor_%s", getRequestParameter('mode'));
+               $TPL = sprintf("admin_edit_sponsor_%s", getRequestParameter('mode'));

                initSqls();
 
                // Sponsor was found
                initSqls();
 
                // Sponsor was found

diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php
index 83bc543e7b18337b2fbcdd0a4189621a401f33ab..3249ff100474df586d3e8a133ebe85d77f8b844f 100644 (file)
--- a/inc/modules/admin/what-edit_user.php
+++ b/inc/modules/admin/what-edit_user.php
@@ -132,7 +132,7 @@ LIMIT 1",
                $content['gender_' . strtolower($content['gender'])] = ' selected="selected"';
 
                // Load template
                $content['gender_' . strtolower($content['gender'])] = ' selected="selected"';
 
                // Load template

-               loadTemplate('form_submit_user', false, $content);
+               loadTemplate('admin_edit_user', false, $content);

        }
 } else {
        // Account does not exists!
        }
 } else {
        // Account does not exists!

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index 88f185e987c877da1b7d6adff10c92ffa6aeede5..722b9eea4efef82d519769095d0fda82d0ccfaec 100644 (file)
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -79,7 +79,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load row template
                                );
 
                                // Load row template

-                               $OUT .= loadTemplate('form_submit_guest_menu_row', true, $DATA);
+                               $OUT .= loadTemplate('admin_edit_guest_menu_row', true, $DATA);

                        } else {
                                // Entry not found
                                $DATA = array(
                        } else {
                                // Entry not found
                                $DATA = array(


@@ -97,7 +97,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $content['cnt']  = $cnt;
 
        // Load template
        $content['cnt']  = $cnt;
 
        // Load template

-       loadTemplate('form_submit_guest_menu_form', false, $content);
+       loadTemplate('admin_edit_guest_menu_form', false, $content);

 } elseif ((isFormSent('del')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Del menu entries with or without confirmation
        $content['sub'] = $SUB;
 } elseif ((isFormSent('del')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Del menu entries with or without confirmation
        $content['sub'] = $SUB;


@@ -309,7 +309,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                SQL_FREERESULT($result);
 
                // Load template
                SQL_FREERESULT($result);
 
                // Load template

-               loadTemplate('form_submit_guest_menu', false, $content);
+               loadTemplate('admin_edit_guest_menu', false, $content);

        } else {
                // Menu entries are missing... (???)
                loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');
        } else {
                // Menu entries are missing... (???)
                loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');

diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index e55c5bbd3b1a44bd8b854ce07c97f3e69b828c7d..6abadda9757a8bc6cfb24f8936aa0b2352a32caa 100644 (file)
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -219,11 +219,11 @@ LIMIT 1",
                        $content['id']         = $id;
 
                        // Output row
                        $content['id']         = $id;
 
                        // Output row

-                       $OUT .= loadTemplate('form_submit_rallyes_row', true, $content);
+                       $OUT .= loadTemplate('admin_edit_rallyes_row', true, $content);

                } // END - foreach
 
                // Load final template
                } // END - foreach
 
                // Load final template

-               loadTemplate('form_submit_rallyes', false, $OUT);
+               loadTemplate('admin_edit_rallyes', false, $OUT);

        } else {
                // Nothing selected to edit
                loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SELECTED--}');
        } else {
                // Nothing selected to edit
                loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SELECTED--}');

diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index d3c27d7c0fc949cca03d7c055df3f8542eab5242..658f45675cc87a83e3965e671218a315cb4d3d50 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -76,7 +76,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load template
                                );
 
                                // Load template

-                               $OUT .= loadTemplate('form_submit_member_menu_row', true, $data);
+                               $OUT .= loadTemplate('admin_edit_member_menu_row', true, $data);

                        } else {
                                // Entry not found?
                                $data = array(
                        } else {
                                // Entry not found?
                                $data = array(


@@ -95,7 +95,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $content['cnt'] = $cnt;
 
        // Load template
        $content['cnt'] = $cnt;
 
        // Load template

-       loadTemplate('form_submit_member_menu', false, $content);
+       loadTemplate('admin_edit_member_menu', false, $content);

 } elseif ((isFormSent('del')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Del menu entries with or without confirmation
        $content['sub'] = $SUB;
 } elseif ((isFormSent('del')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Del menu entries with or without confirmation
        $content['sub'] = $SUB;

diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php
index abd2e1fcf302810a27bb9a3480b7fe255871b0ec..436eebd078c16099a5d54a88ffc022ffd293d9e6 100644 (file)
--- a/inc/modules/admin/what-payments.php
+++ b/inc/modules/admin/what-payments.php
@@ -113,11 +113,11 @@ if (isFormSent()) {
                SQL_FREERESULT($result);
 
                // Load row template and switch colors
                SQL_FREERESULT($result);
 
                // Load row template and switch colors

-               $OUT .= loadTemplate('form_submit_payments_row', true, $content);
+               $OUT .= loadTemplate('admin_edit_payments_row', true, $content);

        } // END - foreach
 
        // Load main template
        } // END - foreach
 
        // Load main template

-       loadTemplate('form_submit_payments', false, $OUT);
+       loadTemplate('admin_edit_payments', false, $OUT);

 } else {
        // Referal levels
        $result = SQL_QUERY("SELECT `id`, `time`, `payment`, `mail_title`, `price` FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `time` ASC", __FILE__, __LINE__);
 } else {
        // Referal levels
        $result = SQL_QUERY("SELECT `id`, `time`, `payment`, `mail_title`, `price` FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `time` ASC", __FILE__, __LINE__);

diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php
index fc1cfaecde92d8f6d93b9a6aad814ee01397e97f..92009735a150a9cb9b697c8b7902a7fc1dd544ad 100644 (file)
--- a/inc/modules/admin/what-refbanner.php
+++ b/inc/modules/admin/what-refbanner.php
@@ -118,11 +118,11 @@ VALUES ('%s','%s','%s')",
                $content['visible'] = addSelectionBox('yn', $content['visible'], 'visible');
 
                // Load row template and switch color
                $content['visible'] = addSelectionBox('yn', $content['visible'], 'visible');
 
                // Load row template and switch color

-               $OUT .= loadTemplate('form_submit_refbanner_row', true, $content);
+               $OUT .= loadTemplate('admin_edit_refbanner_row', true, $content);

        } // END - foreach
 
        // Load main template
        } // END - foreach
 
        // Load main template

-       loadTemplate('form_submit_refbanner', false, $OUT);
+       loadTemplate('admin_edit_refbanner', false, $OUT);

 } else {
        if ((ifPostContainsSelections()) && (isFormSent('del'))) {
                // Delete banner
 } else {
        if ((ifPostContainsSelections()) && (isFormSent('del'))) {
                // Delete banner

diff --git a/templates/de/html/admin/admin_edit_networks_row.tpl b/templates/de/html/admin/admin_edit_networks_row.tpl
index c8177f39984647b034797367ad79b2e16393aad4..187fa50d1ead0fbe371324a958aefbd43d98188e 100644 (file)
--- a/templates/de/html/admin/admin_edit_networks_row.tpl
+++ b/templates/de/html/admin/admin_edit_networks_row.tpl
@@ -23,7 +23,7 @@
        <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_TYPE--}:</td>
        <td class="{%template,ColorSwitch%}">
                <select name="network_request_type[$content[network_id]]" class="form_select" size="1">
        <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_TYPE--}:</td>
        <td class="{%template,ColorSwitch%}">
                <select name="network_request_type[$content[network_id]]" class="form_select" size="1">

-                       $content[network_request_type]
+                       {%pipe,generateNetworkRequestTypeOptions=$content[network_request_type]%}

                </select>
        </td>
        <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_ROW_SEPERATOR--}:</td>
                </select>
        </td>
        <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_ROW_SEPERATOR--}:</td>