New generic template added (new CSS classes), some inconsistencies fixed:
authorRoland Häder <roland@mxchange.org>
Fri, 27 Nov 2009 00:22:48 +0000 (00:22 +0000)
committerRoland Häder <roland@mxchange.org>
Fri, 27 Nov 2009 00:22:48 +0000 (00:22 +0000)
- New generic template 'admin_settings_unsaved' added
- Some inconsistencies fixed in ext-network (naming)
- More TODOs for ext-network added

17 files changed:
.gitattributes
DOCS/de/network/README.txt
inc/extensions/ext-network.php
inc/language/de.php
inc/language/network_de.php
inc/libs/network_functions.php
inc/modules/admin/admin-inc.php
inc/modules/admin/what-list_network_params.php
inc/modules/admin/what-list_network_types.php
templates/de/html/admin/admin_add_network_params.tpl
templates/de/html/admin/admin_add_network_type.tpl
templates/de/html/admin/admin_list_network_params.tpl
templates/de/html/admin/admin_list_network_params_row.tpl
templates/de/html/admin/admin_settings_unsaved.tpl [new file with mode: 0644]
theme/business/css/general.css
theme/default/css/general.css
theme/desert/css/general.css

index 6965d27..f3c1ca3 100644 (file)
@@ -1232,6 +1232,7 @@ templates/de/html/admin/admin_send_bonus_select.tpl -text
 templates/de/html/admin/admin_send_reset_link.tpl -text
 templates/de/html/admin/admin_send_yoomedia.tpl -text
 templates/de/html/admin/admin_settings_saved.tpl -text
+templates/de/html/admin/admin_settings_unsaved.tpl -text
 templates/de/html/admin/admin_sponsor_paytypes.tpl -text
 templates/de/html/admin/admin_sub_points.tpl -text
 templates/de/html/admin/admin_sub_points_all.tpl -text
index cac1d42..64e39ad 100644 (file)
@@ -4,6 +4,7 @@ Verwendbar Platzhalter fuer URLs:
 ID  = Ihre Werbenetz-Id (meistens die Sie zum Einloggen verwenden)
 SID = Die Seiten-Id Ihrer Eingetragen Webseite
 BID = Banner-Id (z.B. Forcedbanner oder Bannerklick/-view)
+CID = Kampagnen-Id (z.B. Textmail-Id aus Textmails)
 
 Diese Platzhalter muessen in Prozenten eingeschlossen in die URL eingebunden sein.
 
index 60cd543..ae36572 100644 (file)
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
+ * @TODO Ad-Magnet: Layer(klick?). Layerviews.Skybannerklick/-view,     *
+ * @TODO Ad-Magnet: Banner-View, Textlink-Klick/-View. Page-Peel        *
+ * @TODO ADCocktail: Traffic, BIDausKAS???                              *
+ * @TODO Ads4.de: Traffic                                               *
+ * @TODO Ads4Webbis: Traffic                                            *
+ * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
@@ -77,6 +83,7 @@ PRIMARY KEY (`network_id`)
 `network_type_api_url` VARCHAR(255) NOT NULL DEFAULT '',
 `network_type_click_url` VARCHAR(255) NOT NULL DEFAULT '',
 `network_type_banner_url` VARCHAR(255) NOT NULL DEFAULT '',
+`network_param_default` VARCHAR(255) NULL DEFAULT NULL,
 UNIQUE `provider_type` (`network_id`,`network_type_handle`),
 PRIMARY KEY (`network_type_id`)
 ) TYPE={?_TABLE_TYPE?} COMMENT='Types provideable by networks'");
@@ -89,6 +96,7 @@ PRIMARY KEY (`network_type_id`)
 `network_type_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `request_param_key` VARCHAR(10) NOT NULL DEFAULT 'invalid',
 `request_param_value` VARCHAR(10) NOT NULL DEFAULT 'invalid',
+`request_param_default` VARCHAR(10) NULL DEFAULT NULL,
 UNIQUE `provider_type_key` (`network_id`,`network_type_id`,`request_param_key`),
 UNIQUE `provider_type_value` (`network_id`,`network_type_id`,`request_param_value`),
 PRIMARY KEY (`network_param_id`)
@@ -218,7 +226,7 @@ PRIMARY KEY (`network_reload_id`)
                // Network type handlers - Yoo!Media (Please use http://www.yoomedia.de?ref=1715 for signing up)
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_id`,`network_type_handle`,`network_type_api_url`,`network_type_click_url`,`network_type_banner_url`) VALUES (1, 'banner', 'http://www.yoomedia.de/interface_2.0/out_banner.php', 'http://www.yoomedia.de/code/z-bannerklf.php?id=%ID%&sid=%SID%', 'http://www.yoomedia.de/code/z-banner.php?id=%ID%&sid=%SID%&bid=%BID%'),
 (1, 'surfbar', 'http://www.yoomedia.de/interface_2.0/out_sbanner.php', 'http://www.yoomedia.de/code/s-bannerklf.php?id=%ID%&sid=%SID%', 'http://www.yoomedia.de/code/s-banner.php?id=%ID%&sid=%SID%&bid=%BID%'),
-(1, 'foredbanner', 'http://www.yoomedia.de/interface_2.0/out_fbanner.php', 'http://www.yoomedia.de/code/f-bannerklf.php?id=%ID%&sid=%SID%', 'http://www.yoomedia.de/code/f-banner.php?id=%ID%&sid=%SID%&bid=%BID%'),
+(1, 'focredbanner', 'http://www.yoomedia.de/interface_2.0/out_fbanner.php', 'http://www.yoomedia.de/code/f-bannerklf.php?id=%ID%&sid=%SID%', 'http://www.yoomedia.de/code/f-banner.php?id=%ID%&sid=%SID%&bid=%BID%'),
 (1, 'textlink', 'http://www.yoomedia.de/interface_2.0/out_textlink.php', 'http://www.yoomedia.de/code/t-textlink.php?id=%ID%&sid=%SID%', ''),
 (1, 'layer', 'http://www.yoomedia.de/interface_2.0/out_layer.php', 'http://www.yoomedia.de/code/l-layer.php?id=%ID%&sid=%SID%', ''),
 (1, 'popup', 'http://www.yoomedia.de/interface_2.0/out_popup.php', 'http://www.yoomedia.de/code/p-popup.php?id=%ID%&sid=%SID%', ''),
index 3bf2f04..a5870fe 100644 (file)
@@ -1019,6 +1019,7 @@ addMessages(array(
        'ADMIN_LINK_ADD_POINTS_TITLE' => "{?POINTS?} aufbuchen",
        'ADMIN_LINK_SUB_POINTS_TITLE' => "{?POINTS?} abziehen",
        'MESSAGE_HEADER' => "Hinweis:",
+       'WARNING_MESSAGE_HEADER' => "Warnung:",
        'ADMIN_ALPHA_SELCTION' => "Alphabetische Suche:",
        'CATEGORY_NOT_SAVED' => "Kategorie <span class=\"data\">%s</span> nicht gespeichert.",
        'USER_ACCOUNT_404' => "User-Account <span class=\"data\">%s</span> nicht gefunden.",
index 493aa2a..5d6e08d 100644 (file)
@@ -109,19 +109,26 @@ addMessages(array(
        'ADMIN_NETWORK_PARAMS_ADD_NOTE' => "F&uuml;gen Sie hier weitere Abfrageparameter dem ausgw&auml;hlten Werbenetzwerk hinzu. Geben Sie keine Werte an, wie z.B. 5 Sekunden oder 30 Mails, geben Sie bei Abfrageparameter den GET- bzw. POST-Parameternamen an.",
        'ADMIN_NETWORK_PARAMS_LIST_NOTE' => "Seien Sie mit dem L&ouml;schen und Editieren von API-Abfrageparameter sehr vorsichtig. Sie sollten hierzu R&uuml;cksprache <a href=\"http://forum.mxchange.org/forum-43.html\" target=\"_blank\" title=\"Direktlink zum Forum\">im Forum</a> halten. Dokumentation zu den Abfragenamen (&#37;FOO&#37;, &#37;BAR&#37; usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.",
        // - Advertise types
-       'ADMIN_NETWORK_TYPES_BANNERCLICK' => "Banner-Klick",
-       'ADMIN_NETWORK_TYPES_BANNERVIEW' => "Banner-View",
-       'ADMIN_NETWORK_TYPES_BANNERCLICK_VIEW' => "Banner-Klick/-View",
-       'ADMIN_NETWORK_TYPES_SURFBARCLICK' => "Surfbar-Klick",
-       'ADMIN_NETWORK_TYPES_SURFBARVIEW' => "Surfbar-View",
-       'ADMIN_NETWORK_TYPES_SURFBARCLICK_VIEW' => "Surfbar-Klick/-View",
-       'ADMIN_NETWORK_TYPES_FORCEDBANNER' => "Forced-Banner",
-       'ADMIN_NETWORK_TYPES_TEXTLINKCLICK' => "Textlink-Klick",
-       'ADMIN_NETWORK_TYPES_TEXTLINKVIEW' => "Textlink-View",
-       'ADMIN_NETWORK_TYPES_TEXTLINKCLICK_VIEW' => "Textlink-Klick/-View",
-       'ADMIN_NETWORK_TYPES_LAYERCLICK' => "Layer-Klick",
-       'ADMIN_NETWORK_TYPES_LAYERVIEW' => "Layer-View",
-       'ADMIN_NETWORK_TYPES_LAYERCLICK_VIEW' => "Layer-Klick/-View",
+       'ADMIN_NETWORK_TYPES_BANNER_CLICK' => "Banner-Klick",
+       'ADMIN_NETWORK_TYPES_BANNER_VIEW' => "Banner-View",
+       'ADMIN_NETWORK_TYPES_BANNER_CLICK_VIEW' => "Banner-Klick/-View",
+       'ADMIN_NETWORK_TYPES_BUTTON_CLICK' => "Button-Klick",
+       'ADMIN_NETWORK_TYPES_BUTTON_VIEW' => "Button-View",
+       'ADMIN_NETWORK_TYPES_BUTTON_CLICK_VIEW' => "Button-Klick/-View",
+       'ADMIN_NETWORK_TYPES_SURFBAR_CLICK' => "Surfbar-Klick",
+       'ADMIN_NETWORK_TYPES_SURFBAR_VIEW' => "Surfbar-View",
+       'ADMIN_NETWORK_TYPES_SURFBAR_CLICK_VIEW' => "Surfbar-Klick/-View",
+       'ADMIN_NETWORK_TYPES_FORCED_BANNER' => "Forced-Banner",
+       'ADMIN_NETWORK_TYPES_FORCED_TEXTLINK' => "Forced-Textlink",
+       'ADMIN_NETWORK_TYPES_TEXTLINK_CLICK' => "Textlink-Klick",
+       'ADMIN_NETWORK_TYPES_TEXTLINK_VIEW' => "Textlink-View",
+       'ADMIN_NETWORK_TYPES_TEXTLINK_CLICK_VIEW' => "Textlink-Klick/-View",
+       'ADMIN_NETWORK_TYPES_SKYBANNER_CLICK' => "Sky-Klick",
+       'ADMIN_NETWORK_TYPES_SKYBANNER_VIEW' => "Sky-View",
+       'ADMIN_NETWORK_TYPES_SKYBANNER_CLICK_VIEW' => "Sky-Klick/-View",
+       'ADMIN_NETWORK_TYPES_LAYER_CLICK' => "Layer-Klick",
+       'ADMIN_NETWORK_TYPES_LAYER_VIEW' => "Layer-View",
+       'ADMIN_NETWORK_TYPES_LAYER_CLICK_VIEW' => "Layer-Klick/-View",
        'ADMIN_NETWORK_TYPES_POPUP' => "PopUp",
        'ADMIN_NETWORK_TYPES_POPDOWN' => "PopDown",
        'ADMIN_NETWORK_TYPES_TEXTMAIL' => "Textmail",
@@ -153,15 +160,19 @@ addMessages(array(
        'ADMIN_NETWORK_TYPE_SELECT' => "Werbeart-Handler ausw&auml;hlen",
        'ADMIN_NETWORK_PARAMS_KEY' => "Abfragename",
        'ADMIN_NETWORK_PARAMS_VALUE' => "Abfrageparameter",
+       'ADMIN_NETWORK_PARAMS_DEFAULT' => "Standartwert",
        'ADMIN_NETWORK_PARAMS_ID' => "Kundennummer (Id)",
        'ADMIN_NETWORK_PARAMS_SID' => "Webseiten-Id",
        'ADMIN_NETWORK_PARAMS_PASSWORD' => "Interface-Kennwort",
        'ADMIN_NETWORK_PARAMS_RELOAD' => "Maximale Reloadsperre",
        'ADMIN_NETWORK_PARAMS_MINIMUM_STAY' => "Mindestauffenthalt",
+       'ADMIN_NETWORK_PARAMS_MAXIMUM_STAY' => "Maximaler Auffenthalt",
+       'ADMIN_NETWORK_PARAMS_TYPE' => "Typ (z.B. klick/view)",
        'ADMIN_NETWORK_PARAMS_REMAIN' => "Mindestanzahl der restlichen Klicks",
        'ADMIN_NETWORK_PARAMS_REWARD' => "Mindestverg&uuml;tung",
        'ADMIN_NETWORK_PARAMS_SIZE' => "Werbemittelgr&ouml;sse",
        'ADMIN_NETWORK_PARAMS_EROTIC' => "Erotik erlaubt",
+       'ADMIN_NETWORK_PARAMS_EXTRA' => "Extra-Parameter",
 ));
 
 // [EOF]
index cc03096..af53bf4 100644 (file)
@@ -51,7 +51,7 @@ function doNetworkHandleForm () {
                        doAdminNetworkProcessForm();
                } else {
                        // No 'do' found
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_DO_404'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_DO_404'));
                }
        } // END - if
 }
@@ -61,11 +61,11 @@ function doAdminNetworkProcessForm () {
        // Form really sent?
        if ((!isFormSent()) && (!isPostRequestParameterSet('edit')) && (!isPostRequestParameterSet('del')) && (!isPostRequestParameterSet('change')) && (!isPostRequestParameterSet('remove'))) {
                // Abort here
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_FORM_NOT_SENT'));
+               loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_FORM_NOT_SENT'));
                return;
        } elseif (!isGetRequestParameterSet('do')) {
                // No 'do' found
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_DO_404'));
+               loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_DO_404'));
                return;
        }
 
@@ -258,7 +258,7 @@ ORDER BY
                $content = generateSelectionBoxFromArray($rows, 'network', 'network_id', 'network_title');
        } else {
                // Nothing selected
-               $content = loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ENTRIES_404'));
+               $content = loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_ENTRIES_404'));
        }
 
        // Free the result
@@ -277,7 +277,7 @@ function doAdminNetworkProcessAddnetworkForm () {
        // We can say here, the form is sent, so check if the network is already added
        if (isNetworkNameValid(postRequestParameter('network_short_name'))) {
                // Already there
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_ALREADY_ADDED', postRequestParameter('network_short_name')));
+               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_ALREADY_ADDED', postRequestParameter('network_short_name')));
                return false;
        } // END - if
 
@@ -302,7 +302,7 @@ function doAdminNetworkProcessAddnetworkForm () {
                loadTemplate('admin_network_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_DATA_NOT_ADDED', postRequestParameter('network_short_name')));
+               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_DATA_NOT_ADDED', postRequestParameter('network_short_name')));
        }
 }
 
@@ -370,7 +370,7 @@ function doAdminNetworkProcessHandlenetworkForm () {
                        $GLOBALS['network_display'] = false;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_NOTHING_FOUND'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_NOTHING_FOUND'));
                }
        } // END - if
 }
@@ -437,7 +437,7 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
                        $GLOBALS['network_display'] = false;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_FOUND'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_FOUND'));
                }
        } // END - if
 }
@@ -482,7 +482,7 @@ function doAdminNetworkProcessChangenetworkForm () {
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_UPDATED', $updated));
                } else {
                        // Nothing changed
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_NOTHING_CHANGED'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_NOTHING_CHANGED'));
                }
        } // END - if
 }
@@ -509,7 +509,7 @@ function doAdminNetworkProcessRemovenetworkForm () {
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REMOVED', $removed));
                } else {
                        // Nothing removed
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_NOTHING_REMOVED'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_NOTHING_REMOVED'));
                }
        } // END - if
 }
@@ -519,7 +519,7 @@ function doAdminNetworkProcessAddnetworktypeForm () {
        // Is the network type handle already used with given network?
        if (isNetworkTypeHandleValid(postRequestParameter('network_type_handle'), getRequestParameter('network'))) {
                // Already added
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED', postRequestParameter('network_type_handle')));
+               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED', postRequestParameter('network_type_handle')));
 
                // ... so abort here
                return false;
@@ -546,7 +546,7 @@ function doAdminNetworkProcessAddnetworktypeForm () {
                loadTemplate('admin_network_type_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_NOT_ADDED', postRequestParameter('network_type_handle')));
+               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_NOT_ADDED', postRequestParameter('network_type_handle')));
        }
 }
 
@@ -590,7 +590,7 @@ function doAdminNetworkProcessChangenetworktypeForm () {
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_UPDATED', $updated));
                } else {
                        // Nothing changed
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_CHANGED'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_CHANGED'));
                }
        } // END - if
 }
@@ -617,7 +617,7 @@ function doAdminNetworkProcessRemovenetworktypeForm () {
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_REMOVED', $removed));
                } else {
                        // Nothing removed
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_REMOVED'));
+                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_REMOVED'));
                }
        } // END - if
 }
@@ -627,7 +627,7 @@ function doAdminNetworkProcessAddnetworkparamForm () {
        // Is the request parameter already used with given network?
        if (isNetworkRequestParameterValid(postRequestParameter('request_param_key'), postRequestParameter('network_type_id'), getRequestParameter('network'))) {
                // Already added
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED', postRequestParameter('request_param_key')));
+               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED', postRequestParameter('request_param_key')));
 
                // ... so abort here
                return false;
@@ -654,7 +654,7 @@ function doAdminNetworkProcessAddnetworkparamForm () {
                loadTemplate('admin_network_request_param_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED', postRequestParameter('request_param_key')));
+               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED', postRequestParameter('request_param_key')));
        }
 }
 
index 66e71dc..47d8c45 100644 (file)
@@ -584,7 +584,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
                        convertSelectionsToTimestamp($postData, $tableData, $id, $skip);
 
                        // Shall we process this id? It muss not be empty, of course
-                       if (($skip === false) && (!empty($id)) && (!isset($GLOBALS['skip_config'][$id]))) {
+                       if (($skip === false) && (!empty($id)) && ((!isset($GLOBALS['skip_config'][$id]))) || ($tableName != '_config')) {
                                // Translate the value? (comma to dot!)
                                if ((is_array($translateComma)) && (in_array($id, $translateComma))) {
                                        // Then do it here... :)
index ef5f844..0fd8157 100644 (file)
@@ -72,7 +72,7 @@ if (isGetRequestParameterSet('network')) {
 
        // Load all advert types for given network
        $result = SQL_QUERY_ESC("SELECT
-       p.`network_param_id`, t.`network_type_id`, t.`network_type_handle`, p.`request_param_key`, p.`request_param_value`
+       p.`network_param_id`, t.`network_type_id`, t.`network_type_handle`, p.`request_param_key`, p.`request_param_value`, p.`request_param_default`
 FROM
        `{?_MYSQL_PREFIX?}_network_request_params` AS p
 INNER JOIN
@@ -100,6 +100,12 @@ ORDER BY
                                $networkData['disabled'][$row['request_param_key']] = true;
                        } // END - if
 
+                       // Is default value empty or null?
+                       if ((is_null($row['request_param_default'])) || (trim($row['request_param_default']) == '')) {
+                               // Fix it to three dashes
+                               $row['request_param_default'] = '---';
+                       } // END - if
+
                        // Add row template and switch color
                        $OUT .= loadTemplate('admin_list_network_params_row', true, $row);
                        $SW = 3 - $SW;
@@ -141,22 +147,28 @@ ORDER BY
                        'sid',
                        'password',
                        'reload',
+                       'max_stay',
                        'min_stay',
+                       'type',
                        'remain',
                        'reward',
                        'size',
-                       'erotic'
+                       'erotic',
+                       'extra'
                ),
                array(
                        '{--ADMIN_NETWORK_PARAMS_ID--}',
                        '{--ADMIN_NETWORK_PARAMS_SID--}',
                        '{--ADMIN_NETWORK_PARAMS_PASSWORD--}',
                        '{--ADMIN_NETWORK_PARAMS_RELOAD--}',
+                       '{--ADMIN_NETWORK_PARAMS_MAXIMUM_STAY--}',
                        '{--ADMIN_NETWORK_PARAMS_MINIMUM_STAY--}',
+                       '{--ADMIN_NETWORK_PARAMS_TYPE--}',
                        '{--ADMIN_NETWORK_PARAMS_REMAIN--}',
                        '{--ADMIN_NETWORK_PARAMS_REWARD--}',
                        '{--ADMIN_NETWORK_PARAMS_SIZE--}',
-                       '{--ADMIN_NETWORK_PARAMS_EROTIC--}'
+                       '{--ADMIN_NETWORK_PARAMS_EROTIC--}',
+                       '{--ADMIN_NETWORK_PARAMS_EXTRA--}'
                ),
                '', '', '',
                $networkData['disabled']
index 1542f10..59d3e75 100644 (file)
@@ -67,6 +67,9 @@ if (isGetRequestParameterSet('network')) {
        // Get its data for template
        $networkData = getNetworkDataById(getRequestParameter('network'));
 
+       // Init disabled list
+       $networkData['disabled'] = array();
+
        // Load all advert types for given network
        $result = SQL_QUERY_ESC("SELECT
        `network_type_id`, `network_type_handle`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`
@@ -87,6 +90,9 @@ ORDER BY
                        $row['sw'] = $SW;
                        if (trim($row['network_type_banner_url']) == '') $row['network_type_banner_url'] = '---';
 
+                       // Set disabled entry
+                       $networkData['disabled'][$row['network_type_handle']] = true;
+
                        // Add row template and switch color
                        $OUT .= loadTemplate('admin_list_network_types_row', true, $row);
                        $SW = 3 - $SW;
@@ -110,6 +116,73 @@ ORDER BY
        // Free result
        SQL_FREERESULT($result);
 
+       // Add type option list
+       $networkData['type_options'] = generateOptionList(
+               '/ARRAY/',
+               array(
+                       'banner',
+                       'banner_click',
+                       'banner_view',
+                       'button',
+                       'button_click',
+                       'button_view',
+                       'surfbar',
+                       'surfbar_click',
+                       'surfbar_view',
+                       'focredbanner',
+                       'forcedtextlink',
+                       'textlink',
+                       'textlink_click',
+                       'textlink_view',
+                       'skybanner',
+                       'skybanner_click',
+                       'skybanner_view',
+                       'layer',
+                       'layer_click',
+                       'layer_view',
+                       'popup',
+                       'popdown',
+                       'textmail',
+                       'htmlmail',
+                       'lead',
+                       'sale',
+                       'payperactive',
+                       'pagepeel'
+               ),
+               array(
+                       '{--ADMIN_NETWORK_TYPES_BANNER_CLICK_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_BANNER_CLICK--}',
+                       '{--ADMIN_NETWORK_TYPES_BANNER_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_BUTTON_CLICK_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_BUTTON_CLICK--}',
+                       '{--ADMIN_NETWORK_TYPES_BUTTON_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_SURFBAR_CLICK_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_SURFBAR_CLICK--}',
+                       '{--ADMIN_NETWORK_TYPES_SURFBAR_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_FORCED_BANNER--}',
+                       '{--ADMIN_NETWORK_TYPES_FORCED_TEXTLINK--}',
+                       '{--ADMIN_NETWORK_TYPES_TEXTLINK_CLICK_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_TEXTLINK_CLICK--}',
+                       '{--ADMIN_NETWORK_TYPES_TEXTLINK_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_SKYBANNER_CLICK_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_SKYBANNER_CLICK--}',
+                       '{--ADMIN_NETWORK_TYPES_SKYBANNER_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_LAYER_CLICK_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_LAYER_CLICK--}',
+                       '{--ADMIN_NETWORK_TYPES_LAYER_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_POPUP--}',
+                       '{--ADMIN_NETWORK_TYPES_POPDOWN--}',
+                       '{--ADMIN_NETWORK_TYPES_TEXTMAIL--}',
+                       '{--ADMIN_NETWORK_TYPES_HTMLMAIL--}',
+                       '{--ADMIN_NETWORK_TYPES_LEAD--}',
+                       '{--ADMIN_NETWORK_TYPES_SALE--}',
+                       '{--ADMIN_NETWORK_TYPES_PAYPERACTIVE--}',
+                       '{--ADMIN_NETWORK_TYPES_PAGEPEEL--}'
+               ),
+               '', '', '',
+               $networkData['disabled']
+       );
+
        // Add form for adding new types
        loadTemplate('admin_add_network_type', false, $networkData);
 } else {
index 4dd1a03..6b38c07 100644 (file)
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right" width="250">{--ADMIN_NETWORK_PARAMS_VALUE--}:</td>
-               <td class="bottom">
+               <td align="right" width="250">{--ADMIN_NETWORK_PARAMS_VALUE--}:</td>
+               <td>
                        <input type="text" name="request_param_value" class="admin_normal" size="10" maxlength="10" />
                </td>
        </tr>
        <tr>
+               <td class="bottom" align="right" width="250">{--ADMIN_NETWORK_PARAMS_DEFAULT--}:</td>
+               <td class="bottom">
+                       <input type="text" name="request_param_default" class="admin_normal" size="10" maxlength="10" />
+               </td>
+       </tr>
+       <tr>
                <td class="admin_footer" colspan="2" align="center">
                        <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="ok" class="admin_submit" value="{--ADMIN_NETWORK_PARAMS_ADD--}" />
index 8c144f8..afb83ee 100644 (file)
                <td align="right" width="250">{--ADMIN_NETWORK_TYPES_HANDLE--}:</td>
                <td>
                        <select name="network_type_handle" class="admin_select" size="1">
-                               <option value="banner">{--ADMIN_NETWORK_TYPES_BANNERCLICK_VIEW--}</option>
-                               <option value="surfbar">{--ADMIN_NETWORK_TYPES_SURFBARCLICK_VIEW--}</option>
-                               <option value="foredbanner">{--ADMIN_NETWORK_TYPES_FORCEDBANNER--}</option>
-                               <option value="textlink">{--ADMIN_NETWORK_TYPES_TEXTLINKCLICK_VIEW--}</option>
-                               <option value="layer">{--ADMIN_NETWORK_TYPES_LAYERCLICK_VIEW--}</option>
-                               <option value="popup">{--ADMIN_NETWORK_TYPES_POPUP--}</option>
-                               <option value="popdown">{--ADMIN_NETWORK_TYPES_POPDOWN--}</option>
-                               <option value="textmail">{--ADMIN_NETWORK_TYPES_TEXTMAIL--}</option>
-                               <option value="htmlmail">{--ADMIN_NETWORK_TYPES_HTMLMAIL--}</option>
-                               <option value="lead">{--ADMIN_NETWORK_TYPES_LEAD--}</option>
-                               <option value="sale">{--ADMIN_NETWORK_TYPES_SALE--}</option>
-                               <option value="payperactive">{--ADMIN_NETWORK_TYPES_PAYPERACTIVE--}</option>
-                               <option value="pagepeel">{--ADMIN_NETWORK_TYPES_PAGEPEEL--}</option>
+                               $content[type_options]
                        </select>
                </td>
        </tr>
index 9fca66e..005e2da 100644 (file)
@@ -2,7 +2,7 @@
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;network=$content[network_id]&amp;do=handlerequestparams%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
-               <td colspan="4" align="center" class="admin_title bottom">
+               <td colspan="5" align="center" class="admin_title bottom">
                        <div>
                                <strong>{--ADMIN_NETWORK_PARAMS_LIST_TITLE--}</strong>
                        </div>
                <td align="center" class="header_column bottom right" height="25"><strong>{--ID_SELECT--}</strong></td>
                <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_TYPES_HANDLE--}</strong></td>
                <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_PARAMS_KEY--}</strong></td>
-               <td align="center" class="header_column bottom"><strong>{--ADMIN_NETWORK_PARAMS_VALUE--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_PARAMS_VALUE--}</strong></td>
+               <td align="center" class="header_column bottom"><strong>{--ADMIN_NETWORK_PARAMS_DEFAULT--}</strong></td>
        </tr>
        $content[rows]
        <tr>
-               <td colspan="4" class="admin_footer">
+               <td colspan="5" class="admin_footer">
                        <input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />
                        <input type="submit" name="edit" class="admin_submit" value="{--ADMIN_NETWORK_PARAMS_EDIT--}" />
                        <input type="submit" name="del" class="admin_delete" value="{--ADMIN_NETWORK_PARAMS_DELETE--}" />
index 5f54a60..3ec8ccb 100644 (file)
@@ -8,7 +8,10 @@
        <td class="switch_sw$content[sw] bottom right" align="center">
                $content[request_param_key]
        </td>
-       <td class="switch_sw$content[sw] bottom" align="center">
+       <td class="switch_sw$content[sw] bottom right" align="center">
                $content[request_param_value]
        </td>
+       <td class="switch_sw$content[sw] bottom" align="center">
+               $content[request_param_default]
+       </td>
 </tr>
diff --git a/templates/de/html/admin/admin_settings_unsaved.tpl b/templates/de/html/admin/admin_settings_unsaved.tpl
new file mode 100644 (file)
index 0000000..3300157
--- /dev/null
@@ -0,0 +1,12 @@
+<div align="center" style="margin-top:10px;margin-bottom:10px">
+
+<div style="width:550px" class="admin_warning_table dashed">
+       <div class="admin_title bottom">
+               {--WARNING_MESSAGE_HEADER--}
+       </div>
+       <div class="admin_warning">
+               $content
+       </div>
+</div>
+
+</div>
index 6a2ad42..fd913fd 100644 (file)
@@ -179,6 +179,12 @@ a.admin_logout {
        margin: 5px;
 }
 
+.admin_warning_table {
+       background-color: #ff8888;
+       width: 660px;
+       margin: 5px;
+}
+
 .admin_editmenu {
        min-width: 500px;
        max-width: 90%;
index 0692451..220fdaa 100644 (file)
@@ -224,6 +224,12 @@ a.admin_logout {
        margin: 5px;
 }
 
+.admin_warning_table {
+       background-color: #ff8888;
+       width: 660px;
+       margin: 5px;
+}
+
 .admin_editmenu {
        min-width: 500px;
        max-width: 90%;
index c341f70..36d407e 100644 (file)
@@ -179,6 +179,12 @@ a.admin_logout {
        margin: 5px;
 }
 
+.admin_warning_table {
+       background-color: #ff8888;
+       width: 660px;
+       margin: 5px;
+}
+
 .admin_editmenu {
        min-width: 500px;
        max-width: 90%;