Extension ext-network continued:
authorRoland Häder <roland@mxchange.org>
Sat, 13 Aug 2011 20:30:35 +0000 (20:30 +0000)
committerRoland Häder <roland@mxchange.org>
Sat, 13 Aug 2011 20:30:35 +0000 (20:30 +0000)
- Stub script added for network types configuration
- GET request parameter 'network' renamed to 'network_id' for clear naming
- TODOs.txt updated

26 files changed:
.gitattributes
DOCS/TODOs.txt
inc/libs/network_functions.php
inc/modules/admin/what-config_network_api.php
inc/modules/admin/what-config_network_types.php [new file with mode: 0644]
inc/modules/admin/what-list_network_api_translation.php
inc/modules/admin/what-list_network_params.php
inc/modules/admin/what-list_network_types.php
inc/template-functions.php
templates/de/html/admin/admin_add_network_api_translation.tpl
templates/de/html/admin/admin_add_network_params.tpl
templates/de/html/admin/admin_add_network_type.tpl
templates/de/html/admin/admin_config_network_api.tpl
templates/de/html/admin/admin_delete_network_params.tpl
templates/de/html/admin/admin_delete_network_types.tpl
templates/de/html/admin/admin_edit_network_params.tpl
templates/de/html/admin/admin_edit_network_types.tpl
templates/de/html/admin/admin_list_network_api_translation.tpl
templates/de/html/admin/admin_list_network_params.tpl
templates/de/html/admin/admin_list_network_types.tpl
templates/de/html/admin/admin_list_networks_row.tpl
templates/de/html/admin/admin_network_added.tpl
templates/de/html/admin/admin_network_api_translation_added.tpl
templates/de/html/admin/admin_network_request_param_added.tpl
templates/de/html/admin/admin_network_type_added.tpl
templates/de/html/select/select_network_type_box.tpl

index 635adebf99c308616db58b7fd81fbb4344deb92e..ca79db6e05f528f73bd23ce52c953a00d20a2c21 100644 (file)
@@ -480,6 +480,7 @@ inc/modules/admin/what-config_mediadata.php svneol=native#text/plain
 inc/modules/admin/what-config_menu.php svneol=native#text/plain
 inc/modules/admin/what-config_mods.php svneol=native#text/plain
 inc/modules/admin/what-config_network_api.php svneol=native#text/plain
+inc/modules/admin/what-config_network_types.php svneol=native#text/plain
 inc/modules/admin/what-config_networks.php svneol=native#text/plain
 inc/modules/admin/what-config_newsletter.php svneol=native#text/plain
 inc/modules/admin/what-config_nickname.php svneol=native#text/plain
index 662189be18262e5b168d808a6b119861a61cde03..ddb63903adaa819c2ff4daff8b7ebf56b506d5df 100644 (file)
 ./inc/filter/bonus_filter.php:56:              // @TODO This query isn't right, it will only update if the user was for a longer time away!
 ./inc/filter/cache_filter.php:92:              // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal.
 ./inc/filter/forced_filter.php:73:             // @TODO This part is unfinished
-./inc/functions.php:1183:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
-./inc/functions.php:1271:                      // @TODO Are these convertions still required?
-./inc/functions.php:1291:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:1185:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
+./inc/functions.php:1273:                      // @TODO Are these convertions still required?
+./inc/functions.php:1293:// @TODO Rewrite this function to use readFromFile() and writeToFile()
 ./inc/functions.php:156:// @TODO Rewrite this to an extension 'smtp'
-./inc/functions.php:1901:      // @TODO Find a way to cache this
-./inc/functions.php:2002:      // @TODO This is still very static, rewrite it somehow
-./inc/functions.php:2197:      // @TODO Rename column data_type to e.g. mail_status
+./inc/functions.php:1903:      // @TODO Find a way to cache this
+./inc/functions.php:2004:      // @TODO This is still very static, rewrite it somehow
+./inc/functions.php:2199:      // @TODO Rename column data_type to e.g. mail_status
 ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
 ./inc/install-functions.php:57:        // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
 ./inc/language/de.php:1074:    // @TODO Rewrite these two constants
 ./inc/modules/admin/what-admins_mails.php:58:                          // @TODO Can this be rewritten to an API function?
 ./inc/modules/admin/what-bonus.php:46:// @TODO Unused at the moment
 ./inc/modules/admin/what-config_mods.php:55:                   // @TODO This can be moved into mysql-function.php, see checkModulePermissions() function
+./inc/modules/admin/what-config_network_types.php:60:  // @TODO Do something here
 ./inc/modules/admin/what-config_points.php:110:                        // @TODO Rewrite this to a filter
 ./inc/modules/admin/what-config_rallye_prices.php:195:                 // @TODO Rewrite these two constants
 ./inc/modules/admin/what-config_rallye_prices.php:227:                 // @TODO rename: start->start_time, end->end_time
index 57e512bbcb597bb20b47dc6531a4d47f55d2e2cf..0c71a5269b071282c9a52cb1054abee17311d5cf 100644 (file)
@@ -404,7 +404,9 @@ function generateAdminNetworkList () {
 
        // Query for all networks
        $result = SQL_QUERY('SELECT
-       `network_id`,`network_short_name`,`network_title`
+       `network_id`,
+       `network_short_name`,
+       `network_title`
 FROM
        `{?_MYSQL_PREFIX?}_network_data`
 ORDER BY
@@ -423,7 +425,7 @@ ORDER BY
                } // END - while
 
                // Generate the selection box
-               $content = generateSelectionBoxFromArray($rows, 'network', 'network_id');
+               $content = generateSelectionBoxFromArray($rows, 'network_id', 'network_id', '', '', 'network');
        } else {
                // Nothing selected
                $content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
@@ -543,7 +545,7 @@ function generateNetworkTypeOptions ($networkId) {
                        '',
                        sprintf(
                                "WHERE `network_id`=%s",
-                               bigintval(getRequestElement('network'))
+                               bigintval(getRequestElement('network_id'))
                        ),
                        '',
                        'translateNetworkTypeHandler'
@@ -887,7 +889,7 @@ function doAdminNetworkProcessHandleNetworkType () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // Load network data
-               $networkData = getNetworkDataById(getRequestElement('network'));
+               $networkData = getNetworkDataById(getRequestElement('network_id'));
 
                // Something has been selected, so start displaying one by one
                $OUT = '';
@@ -942,7 +944,7 @@ function doAdminNetworkProcessHandleRequestParams () {
                $GLOBALS['network_params_disabled'] = array();
 
                // Load network data
-               $networkData = getNetworkDataById(getRequestElement('network'));
+               $networkData = getNetworkDataById(getRequestElement('network_id'));
 
                // Something has been selected, so start displaying one by one
                $OUT = '';
@@ -1069,7 +1071,7 @@ function doAdminNetworkProcessRemoveNetwork () {
 // Add a network type handler if not yet found
 function doAdminNetworkProcessAddNetworkType () {
        // Is the network type handle already used with given network?
-       if (isNetworkTypeHandleValid(postRequestElement('network_type_handle'), getRequestElement('network'))) {
+       if (isNetworkTypeHandleValid(postRequestElement('network_type_handle'), getRequestElement('network_id'))) {
                // Already added
                loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED=' . postRequestElement('network_type_handle') . '%}');
 
@@ -1081,7 +1083,7 @@ function doAdminNetworkProcessAddNetworkType () {
        unsetPostRequestElement('ok');
 
        // Add id
-       setPostRequestElement('network_id', bigintval(getRequestElement('network')));
+       setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
        // Is network_type_banner_url set?
        if (postRequestElement('network_type_banner_url') == '') {
@@ -1265,7 +1267,7 @@ function doAdminNetworkProcessRemoveNetworkParam () {
 // Adds a request parameter to given network and type
 function doAdminNetworkProcessAddNetworkParam () {
        // Is the request parameter already used with given network?
-       if (isNetworkRequestElementValid(postRequestElement('network_request_param_key'), postRequestElement('network_type_id'), getRequestElement('network'))) {
+       if (isNetworkRequestElementValid(postRequestElement('network_request_param_key'), postRequestElement('network_type_id'), getRequestElement('network_id'))) {
                // Already added
                loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_request_param_key') . '%}');
 
@@ -1277,7 +1279,7 @@ function doAdminNetworkProcessAddNetworkParam () {
        unsetPostRequestElement('ok');
 
        // Add id
-       setPostRequestElement('network_id', bigintval(getRequestElement('network')));
+       setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
        // Is network_request_param_default set?
        if (postRequestElement('network_request_param_default') == '') {
@@ -1301,7 +1303,7 @@ function doAdminNetworkProcessAddNetworkParam () {
 // Adds a API response array entry
 function doAdminNetworkProcessAddNetworkApiTranslation () {
        // Is the request parameter already used with given network?
-       if (isNetworkApiTranslationValid(postRequestElement('network_api_index'), postRequestElement('network_type_id'), getRequestElement('network'))) {
+       if (isNetworkApiTranslationValid(postRequestElement('network_api_index'), postRequestElement('network_type_id'), getRequestElement('network_id'))) {
                // Already added
                loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_ALREADY_ADDED=' . postRequestElement('network_api_index') . '%}');
 
@@ -1313,7 +1315,7 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
        unsetPostRequestElement('ok');
 
        // Add id
-       setPostRequestElement('network_id', bigintval(getRequestElement('network')));
+       setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
        // Add sorting
        setPostRequestElement('sort', (countSumTotalData(
@@ -1344,7 +1346,7 @@ function doAdminNetworkProcessNetworkApiConfig () {
        unsetPostRequestElement('ok');
 
        // Add id
-       setPostRequestElement('network_id', bigintval(getRequestElement('network')));
+       setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
        // Is network_api_referral_button set?
        if (postRequestElement('network_api_referral_button') == '') {
@@ -1353,7 +1355,7 @@ function doAdminNetworkProcessNetworkApiConfig () {
        } // END - if
 
        // Is there already an entry?
-       if (isNetworkApiConfigured(getRequestElement('network'))) {
+       if (isNetworkApiConfigured(getRequestElement('network_id'))) {
                // Generate SQL query
                $SQL = getUpdateSqlFromArray(postRequestArray(), 'network_api_config', 'network_id', postRequestElement('network_id'), array('network_id'));
        } else {
index 3711063bbf0ddfb4e6d2e8db41753f00bf0432f7..2a5ffb83503626999b55125c2c703fdda5932687 100644 (file)
@@ -56,7 +56,7 @@ if ($GLOBALS['network_display'] === false) {
 } // END - if
 
 // Do we have a network selected?
-if (isGetRequestElementSet('network')) {
+if (isGetRequestElementSet('network_id')) {
        // Check all networks that doesn't have a configuration entry
        $result = SQL_QUERY_ESC('SELECT
        `network_id`,
@@ -76,7 +76,7 @@ WHERE
        `network_id`=%s
 LIMIT 1',
                array(
-                       bigintval(getRequestElement('network'))
+                       bigintval(getRequestElement('network_id'))
                ), __FILE__, __LINE__);
 
        // Do we have an entry?
@@ -98,7 +98,7 @@ WHERE
        `network_id`=%s
 LIMIT 1',
                        array(
-                               bigintval(getRequestElement('network'))
+                               bigintval(getRequestElement('network_id'))
                        ), __FUNCTION__, __LINE__);
 
                // Do we have an entry?
diff --git a/inc/modules/admin/what-config_network_types.php b/inc/modules/admin/what-config_network_types.php
new file mode 100644 (file)
index 0000000..0871c70
--- /dev/null
@@ -0,0 +1,67 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 08/13/2011 *
+ * ===================                          Last change: 08/13/2011 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-config_network_types.php                    *
+ * -------------------------------------------------------------------- *
+ * Short description : Handler types configuration                      *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Werbe-Handler-Konfiguration                      *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
+} // END - if
+
+// Add description as navigation point
+addYouAreHereLink('admin', __FILE__);
+
+// By default we should display list/add new forms
+$GLOBALS['network_display'] = true;
+
+// Handle form here
+doNetworkHandleForm();
+
+// Display forms?
+if ($GLOBALS['network_display'] === false) {
+       // Abort here
+       return;
+} // END - if
+
+// Do we have a network selected?
+if (isGetRequestElementSet('network_id')) {
+       // @TODO Do something here
+} else {
+       // Generate network list for this script
+       outputHtml(generateAdminNetworkList());
+}
+
+// [EOF]
+?>
index 4645fb0f95dc3f2a8ea1c89b0d57b4d3baa95cd1..aebd42702313b480b8eb08a2224ba3a3c9e99c52 100644 (file)
@@ -62,9 +62,9 @@ if ($GLOBALS['network_display'] === false) {
 } // END - if
 
 // Do we have a network selected?
-if (isGetRequestElementSet('network')) {
+if (isGetRequestElementSet('network_id')) {
        // Get its data for template
-       $networkData = getNetworkDataById(getRequestElement('network'));
+       $networkData = getNetworkDataById(getRequestElement('network_id'));
 
        // Init type
        $networkData['network_type_id'] = 0;
@@ -101,7 +101,7 @@ ORDER BY
        t.`network_type_handle` ASC,
        p.`network_api_id` ASC",
                array(
-                       bigintval(getRequestElement('network'))
+                       bigintval(getRequestElement('network_id'))
                ), __FILE__, __LINE__);
 
        // Do we have entries?
index 459ce9819377c16bd67d2a3e6900f776a2811c2c..12fc5b7cff2c74cdee5ee790cdd47facfc9900d2 100644 (file)
@@ -62,9 +62,9 @@ if ($GLOBALS['network_display'] === false) {
 } // END - if
 
 // Do we have a network selected?
-if (isGetRequestElementSet('network')) {
+if (isGetRequestElementSet('network_id')) {
        // Get its data for template
-       $networkData = getNetworkDataById(getRequestElement('network'));
+       $networkData = getNetworkDataById(getRequestElement('network_id'));
        $networkData['network_type_id'] = 0;
 
        // Init disabled list
@@ -102,7 +102,7 @@ WHERE
 ORDER BY
        t.`network_type_handle` ASC,
        p.`network_param_id` ASC",
-               array(getRequestElement('network')), __FILE__, __LINE__);
+               array(getRequestElement('network_id')), __FILE__, __LINE__);
 
        // Do we have entries?
        if (!SQL_HASZERONUMS($result)) {
index 4e3cf4297c4e840c173483955633adf0c1559598..93a72bdb3c920c5a365f8b8e188f2ff9d518ec39 100644 (file)
@@ -62,9 +62,9 @@ if ($GLOBALS['network_display'] === false) {
 } // END - if
 
 // Do we have a network selected?
-if (isGetRequestElementSet('network')) {
+if (isGetRequestElementSet('network_id')) {
        // Get its data for template
-       $networkData = getNetworkDataById(getRequestElement('network'));
+       $networkData = getNetworkDataById(getRequestElement('network_id'));
 
        // Init disabled list
        $GLOBALS['network_types_disabled'] = array();
@@ -78,7 +78,7 @@ WHERE
        `network_id`=%s
 ORDER BY
        `network_type_handle` ASC",
-               array(getRequestElement('network')), __FILE__, __LINE__);
+               array(getRequestElement('network_id')), __FILE__, __LINE__);
 
        // Do we have entries?
        if (!SQL_HASZERONUMS($result)) {
index e8bbe8171ae416d8010e76d70d0fe0dc253b22f8..ee0e92585de7e8d9f6a7d197cde06e1f4f6f6916 100644 (file)
@@ -1638,7 +1638,7 @@ function sendModeMails ($mod, $modes) {
 }
 
 // Generates a 'selection box' from given array
-function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent = '', $extraName = '') {
+function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent = '', $extraName = '', $templateName = '') {
        // Start the output
        $OUT = '<select name="' . $name . '" size="1" class="form_select">
 <option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>';
@@ -1647,8 +1647,14 @@ function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionCo
        foreach ($options as $option) {
                // Add the <option> entry from ...
                if (empty($optionContent)) {
-                       // ... template
-                       $OUT .= loadTemplate('select_' . $name . $extraName . '_option', true, $option);
+                       // Is a template name given?
+                       if (empty($templateName)) {
+                               // ... $name template
+                               $OUT .= loadTemplate('select_' . $name . $extraName . '_option', true, $option);
+                       } else {
+                               // ... $templateName template
+                               $OUT .= loadTemplate('select_' . $templateName . $extraName . '_option', true, $option);
+                       }
                } else {
                        // ... direct HTML code
                        $OUT .= '<option value="' . $option[$optionValue] . '">' . $option[$optionContent] . '</option>';
@@ -1664,7 +1670,13 @@ function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionCo
        );
 
        // Load template and return it
-       return loadTemplate('select_' . $name . $extraName . '_box', true, $content);
+       if (empty($templateName)) {
+               // Use name from $name + $extraName
+               return loadTemplate('select_' . $name . $extraName . '_box', true, $content);
+       } else {
+               // Use name from $templateName + $extraName
+               return loadTemplate('select_' . $templateName . $extraName . '_box', true, $content);
+       }
 }
 
 // Prepares the header for HTML output
index 9c90964a0d8ba2b9f9d1702de52daaac0524b80e..c5cc8e535d32f1521b4edf3261ee67d2a02a25bf 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_api_translation&amp;do=add_network_api_translation&amp;network={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_api_translation&amp;do=add_network_api_translation&amp;network_id={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
index f1670d09d436e532f03d3a9e612789e68db669aa..6b889f3b88868bfbe36fd5b653d938d48817ee98 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;do=add_network_param&amp;network={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;do=add_network_param&amp;network_id={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
index 88d04697d46df21dbb882eedc5336c937ee45663..ee8dfd7c20f1acd4d8bd8538e8177bd65c20a43c 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=add_network_type&amp;network={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=add_network_type&amp;network_id={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
index fcb9fe9ec1dadc26cd17a75efa728ba48cee606e..bc1363f0f9a6f3c23e419bbf726f3420d83ed384 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_network_api&amp;do=network_api_config&amp;network=$content[network_id]%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_network_api&amp;do=network_api_config&amp;network_id=$content[network_id]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="table_header bottom" colspan="2" align="center">
index afe17d072565524834cd9494f5f6670dec14cf53..34b46ea250049ec5ffe8edc0e2f6df11972f94de 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;do=remove_network_param&amp;network={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;do=remove_network_param&amp;network_id={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="2">
index b7eafbc3dfb1744de83737d3949f881da7f55bcc..4a721d40f11801fcbd50c7069616d22dcf31a2d2 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=remove_network_type&amp;network={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=remove_network_type&amp;network_id={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="2">
index 26aa5bfa6f5dbd5744cb6c0dcf08f72e9cbb9968..36931cdce5d7b205e4f4a61dce15b844913e9a5b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;do=change_network_param&amp;network={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;do=change_network_param&amp;network_id={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="2">
index dabd34c6ab6f9a8cf56b2b27b6532bf5f110ce5a..3b90bf843655724576c355304a9613929d1c724d 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=change_network_type&amp;network={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=change_network_type&amp;network_id={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="2">
index dacbd9c82e2af368a0675e548db62a5c1d63ec57..a51144359ed5ddc97dedb82b29e57ba4b095b504 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_api_translation&amp;do=handle_api_translation&amp;network={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_api_translation&amp;do=handle_api_translation&amp;network_id={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">
index 3e016e2cad797137ec6c64486008377a10ada740..9b9c1034974d3da3026154b42e1b9d6b98390f16 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;do=handle_request_params&amp;network={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;do=handle_request_params&amp;network_id={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">
index 2fe523e44b0e833b1cc6c2e0071418cceb3b92f4..a6a6fb6c1edcbb4f2d798ad688f37a5c0af50960 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=handle_network_type&amp;network={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=handle_network_type&amp;network_id={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">
index 4d27bfdabf75c6844a18723dd796d3ecb8da46b3..c1719b35be6782c9afb4483b8ce5215e5aafa3c1 100644 (file)
@@ -5,11 +5,11 @@
        <td class="{%template,ColorSwitch%} bottom right" align="center">
                $content[network_short_name]:<br />
                [<a
-                href="{%url=modules.php?module=admin&amp;what=config_network_api&amp;network=$content[network_id]%}" title="{--ADMIN_NETWORK_CONFIG_LINK_TITLE--}">C</a>|<a
-                href="{%url=modules.php?module=admin&amp;what=list_network_types&amp;network=$content[network_id]%}" title="{--ADMIN_LIST_NETWORK_TYPES_LINK_TITLE--}">T</a>|<a
-                href="{%url=modules.php?module=admin&amp;what=list_network_params&amp;network=$content[network_id]%}" title="{--ADMIN_LIST_NETWORK_PARAMS_LINK_TITLE--}">P</a>|<a
-                href="{%url=modules.php?module=admin&amp;what=list_network_api_translation&amp;network=$content[network_id]%}" title="{--ADMIN_LIST_NETWORK_API_TRANSLATION_LINK_TITLE--}">RC</a>|<a
-                href="{%url=modules.php?module=admin&amp;what=list_network_error_codes&amp;network=$content[network_id]%}" title="{--ADMIN_LIST_NETWORK_ERROR_CODES_LINK_TITLE--}">EC</a>]
+                href="{%url=modules.php?module=admin&amp;what=config_network_api&amp;network_id=$content[network_id]%}" title="{--ADMIN_NETWORK_CONFIG_LINK_TITLE--}">C</a>|<a
+                href="{%url=modules.php?module=admin&amp;what=list_network_types&amp;network_id=$content[network_id]%}" title="{--ADMIN_LIST_NETWORK_TYPES_LINK_TITLE--}">T</a>|<a
+                href="{%url=modules.php?module=admin&amp;what=list_network_params&amp;network_id=$content[network_id]%}" title="{--ADMIN_LIST_NETWORK_PARAMS_LINK_TITLE--}">P</a>|<a
+                href="{%url=modules.php?module=admin&amp;what=list_network_api_translation&amp;network_id=$content[network_id]%}" title="{--ADMIN_LIST_NETWORK_API_TRANSLATION_LINK_TITLE--}">RC</a>|<a
+                href="{%url=modules.php?module=admin&amp;what=list_network_error_codes&amp;network_id=$content[network_id]%}" title="{--ADMIN_LIST_NETWORK_ERROR_CODES_LINK_TITLE--}">EC</a>]
        </td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">
                [<a href="$content[network_reflink]" target="_blank" title="$content[network_title]">$content[network_title]</a>]
index b3e62792c050f56305987d1892c2d0d8934d1917..1c03b55e893650a3e76937bdafc84af4fa26c158 100644 (file)
@@ -6,7 +6,7 @@
        </div>
        <div class="message">
                Das Werbenetzwerk $content[network_title] wurde soeben hinzugef&uuml;gt.
-               Sie sollten nun als n&auml;chstes die <a href="{%url=modules.php?module=admin&amp;what=list_network_types&amp;network=$content[network_id]%}">Werbearten hinzuf&uuml;gen</a>.
+               Sie sollten nun als n&auml;chstes die <a href="{%url=modules.php?module=admin&amp;what=list_network_types&amp;network_id=$content[network_id]%}">Werbearten hinzuf&uuml;gen</a>.
        </div>
 </div>
 
index b79f81d2e1dabd2c5de4d43fba8744e70a7cb30c..b363121c97f9a981bdb360f73e4feb441c7d301c 100644 (file)
@@ -5,8 +5,10 @@
                {--ADMIN_NETWORK_API_TRANSLATION_ADDED_TITLE--}
        </div>
        <div class="message">
-               Die Array-Element-&Uuml;bersetzung $content[network_api_index] wurde soeben hinzugef&uuml;gt.
-               Sie sollten nun als n&auml;chstes die <a href="{%url=modules.php?module=admin&amp;what=list_network_error_codes&amp;network=$content[network_id]%}">Fehlercodes hinzuf&uuml;gen</a>.
+               Die Array-Element-&Uuml;bersetzung $content[network_api_index] wurde
+               soeben hinzugef&uuml;gt. Sie sollten nun als n&auml;chstes die <a
+                href="{%url=modules.php?module=admin&amp;what=list_network_error_codes&amp;network_id=$content[network_id]%}">Fehlercodes
+               hinzuf&uuml;gen</a>.
        </div>
 </div>
 
index dbe8e0b12799e2544f30d61067c438117fb3a34a..0a6f8f81162fc5cbf4afa0909797aad84a0e12fb 100644 (file)
@@ -7,7 +7,7 @@
        <div class="message">
                Der API-Abfrageparameter $content[network_request_param_key]/$content[network_request_param_value]
                wurde soeben hinzugef&uuml;gt. Sie sollten nun als n&auml;chstes die
-               <a href="{%url=modules.php?module=admin&amp;what=list_network_api_translation&amp;network=$content[network_id]%}">API-Arrayelemente hinzuf&uuml;gen</a>.
+               <a href="{%url=modules.php?module=admin&amp;what=list_network_api_translation&amp;network_id=$content[network_id]%}">API-Arrayelemente hinzuf&uuml;gen</a>.
        </div>
 </div>
 
index dfc2249d7fcde5313fdb5f6025b7fd604f4ec21a..ce230b292799278be22ba1fbcd4f8125a9df1365 100644 (file)
@@ -6,7 +6,7 @@
        </div>
        <div class="message">
                Der Werbeart-Handler $content[network_type_handle] wurde soeben hinzugef&uuml;gt.
-               Sie sollten nun als n&auml;chstes die <a href="{%url=modules.php?module=admin&amp;what=list_network_params&amp;network=$content[network_id]%}">Abfrageparameter hinzuf&uuml;gen</a>.
+               Sie sollten nun als n&auml;chstes die <a href="{%url=modules.php?module=admin&amp;what=list_network_params&amp;network_id=$content[network_id]%}">Abfrageparameter hinzuf&uuml;gen</a>.
        </div>
 </div>
 
index ea431d1268b04c2c11bf89446aab09f01f2a4ea5..b8bc5ef57cdad67a04e3d1d9f6606229d6ac58e0 100644 (file)
@@ -2,7 +2,7 @@
 <form accept-charset="UTF-8" action="{?URL?}/modules.php" method="get">
 <input type="hidden" name="module" value="{%pipe,getModule%}" />
 <input type="hidden" name="what" value="{%pipe,getWhat%}" />
-<input type="hidden" name="network" value="{%network,getNetworkDataById,network_id=%network%%}" />
+<input type="hidden" name="network_id" value="{%network,getNetworkDataById,network_id=%network%%}" />
 <div class="table dashed">
        <div class="table_header bottom">
                <div>