From 067dc339f4058c7834f5e5d2f7d8d44ce6d7cea3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 27 Nov 2009 00:22:48 +0000 Subject: [PATCH] New generic template added (new CSS classes), some inconsistencies fixed: - New generic template 'admin_settings_unsaved' added - Some inconsistencies fixed in ext-network (naming) - More TODOs for ext-network added --- .gitattributes | 1 + DOCS/de/network/README.txt | 1 + inc/extensions/ext-network.php | 10 ++- inc/language/de.php | 1 + inc/language/network_de.php | 37 ++++++---- inc/libs/network_functions.php | 32 ++++---- inc/modules/admin/admin-inc.php | 2 +- .../admin/what-list_network_params.php | 18 ++++- inc/modules/admin/what-list_network_types.php | 73 +++++++++++++++++++ .../html/admin/admin_add_network_params.tpl | 10 ++- .../de/html/admin/admin_add_network_type.tpl | 14 +--- .../html/admin/admin_list_network_params.tpl | 7 +- .../admin/admin_list_network_params_row.tpl | 5 +- .../de/html/admin/admin_settings_unsaved.tpl | 12 +++ theme/business/css/general.css | 6 ++ theme/default/css/general.css | 6 ++ theme/desert/css/general.css | 6 ++ 17 files changed, 188 insertions(+), 53 deletions(-) create mode 100644 templates/de/html/admin/admin_settings_unsaved.tpl diff --git a/.gitattributes b/.gitattributes index 6965d271ce..f3c1ca3a6b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/DOCS/de/network/README.txt b/DOCS/de/network/README.txt index cac1d42da2..64e39ad85c 100644 --- a/DOCS/de/network/README.txt +++ b/DOCS/de/network/README.txt @@ -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. diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php index 60cd543943..ae3657213c 100644 --- a/inc/extensions/ext-network.php +++ b/inc/extensions/ext-network.php @@ -17,6 +17,12 @@ * 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%', ''), diff --git a/inc/language/de.php b/inc/language/de.php index 3bf2f04963..a5870fed28 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -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 %s nicht gespeichert.", 'USER_ACCOUNT_404' => "User-Account %s nicht gefunden.", diff --git a/inc/language/network_de.php b/inc/language/network_de.php index 493aa2a717..5d6e08d77f 100644 --- a/inc/language/network_de.php +++ b/inc/language/network_de.php @@ -109,19 +109,26 @@ addMessages(array( 'ADMIN_NETWORK_PARAMS_ADD_NOTE' => "Fügen Sie hier weitere Abfrageparameter dem ausgwä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öschen und Editieren von API-Abfrageparameter sehr vorsichtig. Sie sollten hierzu Rücksprache im Forum halten. Dokumentation zu den Abfragenamen (%FOO%, %BAR% 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ä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ütung", 'ADMIN_NETWORK_PARAMS_SIZE' => "Werbemittelgrösse", 'ADMIN_NETWORK_PARAMS_EROTIC' => "Erotik erlaubt", + 'ADMIN_NETWORK_PARAMS_EXTRA' => "Extra-Parameter", )); // [EOF] diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index cc0309615d..af53bf4b3c 100644 --- a/inc/libs/network_functions.php +++ b/inc/libs/network_functions.php @@ -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'))); } } diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 66e71dc159..47d8c45e2d 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -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... :) diff --git a/inc/modules/admin/what-list_network_params.php b/inc/modules/admin/what-list_network_params.php index ef5f8443f8..0fd8157b1d 100644 --- a/inc/modules/admin/what-list_network_params.php +++ b/inc/modules/admin/what-list_network_params.php @@ -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'] diff --git a/inc/modules/admin/what-list_network_types.php b/inc/modules/admin/what-list_network_types.php index 1542f10b22..59d3e7530c 100644 --- a/inc/modules/admin/what-list_network_types.php +++ b/inc/modules/admin/what-list_network_types.php @@ -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 { diff --git a/templates/de/html/admin/admin_add_network_params.tpl b/templates/de/html/admin/admin_add_network_params.tpl index 4dd1a03b90..6b38c07aef 100644 --- a/templates/de/html/admin/admin_add_network_params.tpl +++ b/templates/de/html/admin/admin_add_network_params.tpl @@ -26,11 +26,17 @@ - {--ADMIN_NETWORK_PARAMS_VALUE--}: - + {--ADMIN_NETWORK_PARAMS_VALUE--}: + + + {--ADMIN_NETWORK_PARAMS_DEFAULT--}: + + + + diff --git a/templates/de/html/admin/admin_add_network_type.tpl b/templates/de/html/admin/admin_add_network_type.tpl index 8c144f85c3..afb83eed96 100644 --- a/templates/de/html/admin/admin_add_network_type.tpl +++ b/templates/de/html/admin/admin_add_network_type.tpl @@ -13,19 +13,7 @@ {--ADMIN_NETWORK_TYPES_HANDLE--}: diff --git a/templates/de/html/admin/admin_list_network_params.tpl b/templates/de/html/admin/admin_list_network_params.tpl index 9fca66edbe..005e2da178 100644 --- a/templates/de/html/admin/admin_list_network_params.tpl +++ b/templates/de/html/admin/admin_list_network_params.tpl @@ -2,7 +2,7 @@
- - + + $content[rows] - - + diff --git a/templates/de/html/admin/admin_settings_unsaved.tpl b/templates/de/html/admin/admin_settings_unsaved.tpl new file mode 100644 index 0000000000..3300157271 --- /dev/null +++ b/templates/de/html/admin/admin_settings_unsaved.tpl @@ -0,0 +1,12 @@ +
+ +
+
+ {--WARNING_MESSAGE_HEADER--} +
+
+ $content +
+
+ +
diff --git a/theme/business/css/general.css b/theme/business/css/general.css index 6a2ad42304..fd913fd360 100644 --- a/theme/business/css/general.css +++ b/theme/business/css/general.css @@ -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%; diff --git a/theme/default/css/general.css b/theme/default/css/general.css index 0692451807..220fdaa812 100644 --- a/theme/default/css/general.css +++ b/theme/default/css/general.css @@ -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%; diff --git a/theme/desert/css/general.css b/theme/desert/css/general.css index c341f70bf9..36d407e7f8 100644 --- a/theme/desert/css/general.css +++ b/theme/desert/css/general.css @@ -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%; -- 2.39.2
+
{--ADMIN_NETWORK_PARAMS_LIST_TITLE--}
@@ -15,11 +15,12 @@ 		{--ID_SELECT--} {--ADMIN_NETWORK_TYPES_HANDLE--} {--ADMIN_NETWORK_PARAMS_KEY--}{--ADMIN_NETWORK_PARAMS_VALUE--}{--ADMIN_NETWORK_PARAMS_VALUE--}{--ADMIN_NETWORK_PARAMS_DEFAULT--}
+ diff --git a/templates/de/html/admin/admin_list_network_params_row.tpl b/templates/de/html/admin/admin_list_network_params_row.tpl index 5f54a60a90..3ec8ccb402 100644 --- a/templates/de/html/admin/admin_list_network_params_row.tpl +++ b/templates/de/html/admin/admin_list_network_params_row.tpl @@ -8,7 +8,10 @@ $content[request_param_key] + $content[request_param_value] + $content[request_param_default] +