From 71da088be0643264f37c976e33048fde7676e7d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 23 Aug 2011 14:57:56 +0000 Subject: [PATCH] Extension ext-network continued, "translation" function introduced: - Already added network type handler configuration can now be displayed (shown) and changed - Most advertising networks require "hours" for reload time, but other may require different time units, therefore a new entry has been added to table 'network_types_config' to reflect these differences - "Translation" function 'translateTimeUnit()' introduced which can "translate" time units (like W for weeks) into human-readable - Function createFancyTime() uses now EL code (see newly introduced function) - TODOs.txt updated --- .gitattributes | 2 + DOCS/TODOs.txt | 4 +- inc/extensions/ext-network.php | 1 + inc/functions.php | 6 +- inc/language/de.php | 15 +-- inc/language/network_de.php | 26 +++-- inc/libs/network_functions.php | 60 +++++++++++- .../admin/what-config_network_types.php | 16 ++- inc/template-functions.php | 98 ++++++++++++++++--- .../admin_add_config_network_type_form.tpl | 14 ++- templates/de/html/admin/admin_add_payment.tpl | 2 +- templates/de/html/admin/admin_config_home.tpl | 16 +-- .../admin/admin_config_network_types_row.tpl | 4 +- .../html/admin/admin_delete_payments_row.tpl | 2 +- .../admin_edit_config_network_type_form.tpl | 45 +++++++++ .../de/html/admin/admin_edit_payments_row.tpl | 2 +- .../de/html/admin/admin_list_payments_row.tpl | 2 +- .../admin/admin_list_yoomedia_tm_already.tpl | 4 +- .../html/admin/admin_list_yoomedia_tm_row.tpl | 4 +- .../de/html/admin/admin_send_yoomedia.tpl | 2 +- .../admin/admin_show_config_network_type.tpl | 35 +++++++ templates/de/html/tlock_message.tpl | 6 +- 22 files changed, 298 insertions(+), 68 deletions(-) create mode 100644 templates/de/html/admin/admin_edit_config_network_type_form.tpl create mode 100644 templates/de/html/admin/admin_show_config_network_type.tpl diff --git a/.gitattributes b/.gitattributes index 7ba18324b0..2f0da48bae 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1203,6 +1203,7 @@ templates/de/html/admin/admin_edit_bank_packages_row.tpl svneol=native#text/plai templates/de/html/admin/admin_edit_bonus_email.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_cats.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_cats_row.tpl svneol=native#text/plain +templates/de/html/admin/admin_edit_config_network_type_form.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_country_row.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_email.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_email_max_rec.tpl svneol=native#text/plain @@ -1470,6 +1471,7 @@ templates/de/html/admin/admin_send_reset_link.tpl svneol=native#text/plain templates/de/html/admin/admin_send_yoomedia.tpl svneol=native#text/plain templates/de/html/admin/admin_settings_saved.tpl svneol=native#text/plain templates/de/html/admin/admin_settings_unsaved.tpl svneol=native#text/plain +templates/de/html/admin/admin_show_config_network_type.tpl svneol=native#text/plain templates/de/html/admin/admin_sponsor_paytypes.tpl svneol=native#text/plain templates/de/html/admin/admin_sub_points.tpl svneol=native#text/plain templates/de/html/admin/admin_sub_points_all.tpl svneol=native#text/plain diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 606ca207f7..e5126e5795 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -54,8 +54,8 @@ ./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/language/de.php:1090: // @TODO Rewrite these three constants +./inc/language/de.php:1075: // @TODO Rewrite these two constants +./inc/language/de.php:1091: // @TODO Rewrite these three constants ./inc/language/de.php:758:// @TODO Are these constants longer used? ./inc/language-functions.php:255: // @TODO These are all valid languages, again hard-coded ./inc/language-functions.php:44:// @TODO Rewrite all language constants to this function. diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php index 678630558b..7ae48128ce 100644 --- a/inc/extensions/ext-network.php +++ b/inc/extensions/ext-network.php @@ -174,6 +174,7 @@ UNIQUE INDEX `affiliate_site` (`network_api_affiliate_id`,`network_api_site_id`) `network_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `network_type_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `network_max_reload_time` BIGINT(20) UNSIGNED NULL DEFAULT NULL, +`network_reload_time_unit` ENUM('s','m','h','D','W') NULL DEFAULT NULL, `network_min_waiting_time` BIGINT(20) UNSIGNED NULL DEFAULT NULL, `network_min_remain_clicks` BIGINT(20) UNSIGNED NULL DEFAULT NULL, `network_min_payment` FLOAT(20,5) UNSIGNED NULL DEFAULT NULL, diff --git a/inc/functions.php b/inc/functions.php index 393c44efcf..f3320812ec 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -767,7 +767,7 @@ function createFancyTime ($stamp) { foreach ($data as $k => $v) { if ($v > 0) { // Value is greater than 0 "eval" data to return string - $ret .= ', ' . $v . ' {--_' . strtoupper($k) . '--}'; + $ret .= ', ' . $v . ' {%pipe,translateTimeUnit=' . $k . '%}'; break; } // END - if } // END - foreach @@ -778,7 +778,7 @@ function createFancyTime ($stamp) { $ret = substr($ret, 2); } else { // Zero seconds - $ret = '0 {--_SECONDS--}'; + $ret = '0 {--TIME_UNIT_SECOND--}'; } // Return fancy time string @@ -801,7 +801,7 @@ function isEmailValid ($email) { } // Function taken from user comments on www.php.net / function isInStringIgnoreCase() -function isUrlValid ($url, $compile=true) { +function isUrlValid ($url, $compile = true) { // Trim URL a little $url = trim(urldecode($url)); //* DEBUG: */ debugOutput($url); diff --git a/inc/language/de.php b/inc/language/de.php index 443973fe7d..72129a8f2c 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -863,13 +863,14 @@ addMessages(array( 'ADMIN_TASK_NO_SQL_TITLE' => "Aufgabe ohne SQL-Anweisungen", 'MEMBER_UNCONFIRMED_LOCKED' => "Anzahl zu best. Mails für Willkommensgutschrift", 'MEMBER_CONFIRMED_MAILS' => "Bereits best. Mails", - '_YEARS' => "Jahre", - '_MONTHS' => "Monate", - '_WEEKS' => "Wochen", - '_DAYS' => "Tage", - '_HOURS' => "Stunden", - '_MINUTES' => "Minuten", - '_SECONDS' => "Sekunden", + 'TIME_UNIT' => "Zeiteinheit", + 'TIME_UNIT_YEAR' => "Jahr(e)", + 'TIME_UNIT_MONTH' => "Monat(e)", + 'TIME_UNIT_WEEK' => "Woche(n)", + 'TIME_UNIT_DAY' => "Tag(e)", + 'TIME_UNIT_HOUR' => "Stunden", + 'TIME_UNIT_MINUTE' => "Minute(n)", + 'TIME_UNIT_SECOND' => "Sekunde(n)", 'SORT_ASCENDING' => "Aufsteigend", 'SORT_DESCENDING' => "Absteigend", 'INVALID_EMAIL_ENTERED' => "Ungütige EMail-Adresse eingegeben.", diff --git a/inc/language/network_de.php b/inc/language/network_de.php index 16dd62c66c..6a35494f55 100644 --- a/inc/language/network_de.php +++ b/inc/language/network_de.php @@ -84,7 +84,9 @@ addMessages(array( 'ADMIN_ADD_NETWORK_API_TRANSLATION_TITLE' => "Werbenetzwerk verwalten - Neues API-Arrayelement hinzufügen", 'ADMIN_LIST_NETWORK_API_TRANSLATION_TITLE' => "API-Arrayelemente auflisten und verwalten", 'ADMIN_ADD_CONFIG_NETWORK_TYPE_TITLE' => "Werbeart-Handler einrichten - {%%pipe,translateNetworkTypeHandler=%s%%}", + 'ADMIN_SHOW_CONFIG_NETWORK_TYPE_TITLE' => "Eingerichteter Werbeart-Handler - {%%pipe,translateNetworkTypeHandler=%s%%}", 'ADMIN_CONFIG_NETWORK_TYPES_TITLE' => "Werbeart-Handler einrichten", + 'ADMIN_EDIT_CONFIG_NETWORK_TYPE_TITLE' => "Werbeart-Handler ändern - {%%pipe,translateNetworkTypeHandler=%s%%}", // - Link titles 'ADMIN_NETWORK_CONFIG_LINK_TITLE' => "Weiter zur API-Konfiguration", 'ADMIN_LIST_NETWORK_TYPES_LINK_TITLE' => "Weiter zu den Werbearten", @@ -106,6 +108,8 @@ addMessages(array( 'ADMIN_ADD_NETWORK_API_TRANSLATION_SUBMIT' => "API-Arrayelement hinzufügen", 'ADMIN_ADD_CONFIG_NETWORK_TYPE_SUBMIT' => "Jetzt den Werbeart-Handler einrichten", 'ADMIN_ADD_CONFIG_NETWORK_TYPE_FORM_SUBMIT' => "Werbeart-Handlerdaten hinzufügen", + 'ADMIN_EDIT_CONFIG_NETWORK_TYPE_SUBMIT' => "Konfiguration ändern", + 'ADMIN_EDIT_CONFIG_NETWORK_TYPE_FORM_SUBMIT' => "Werbeart-Handler ändern", // - Success titles 'ADMIN_NETWORK_ADDED_TITLE' => "Allgemeine Werbenetzwerkdaten hinzugefügt", 'ADMIN_NETWORK_TYPES_ADDED_TITLE' => "Werbeart-Handler hinzugefügt", @@ -130,8 +134,9 @@ addMessages(array( 'ADMIN_LIST_NETWORK_API_TRANSLATION_NOTE' => "Seien Sie mit dem Editieren bzw. Löschen von Array-Elementen sehr vorsichtig, die API-Abfrage köntte unerwartete Ergebnisse bzw. Fehler zurückliefern.", 'ADMIN_NETWORK_REQUIRE_ID_CARD_NOTE' => "Unter {--ADMIN_NETWORK_REQUIRE_ID_CARD--} ist das durch den Webnetzwerkbetreiber Verlangen einerPersonalausweiskopie bzw. Gerwerbescheins zu verstehen. Mehr dazu erfahen Sie im Forum.", 'ADMIN_CONFIG_NETWORK_API_NOTE' => "Geben Sie unter {--ADMIN_CONFIG_NETWORK_API_ENTER_REFERRAL_BUTTON--} einen Button im Format 88x31 ein. Sollte das Werbenetzwerk keinen anbieten, lassen Sie dieses Feld einfach leer. Andere Formate als 88x31 werden auf 88x31 geschrumpft dargestellt. Bitte geben Sie nur die URLs und keinen HTML-Code ein.", - 'ADMIN_CONFIG_NETWORK_TYPES_NOTE' => "Für jede Werbeart sind unterschiedliche Reloadsperren, Mindestauffenthalte und mehr einstellbar. Damit ist es möglich, dass Sie z.B. für Forced-Banner eine kürzere/längere Reloadsperre eingeben können als für Paidmails. An den angezeigten URLs (API-, Klick- und Banner-URL brauchen Sie meistens nichts ändern. Dies wird vom {?TITLE?}-Entwicklerteam aktuell gehalten.", - 'ADMIN_ADD_CONFIG_NETWORK_TYPE_FORM_NOTE' => "Bitte beachten Sie, dass es sich beim Feld {--ADMIN_ADD_CONFIG_NETWORK_TYPE_ALLOW_EROTIC--} um ein frei eingebares Feld handelt. Den genauen Wert entnehmen Sie bitte derzeit aus Ihrem Affiliate-Bereich, da dieser nicht bei allen Werbenetzwerken einheitlich ist. Sollte das Werbenetzwerk Ihnen einen Wert nicht angeben, so lassen Sie das entsprechende Feld einfach leer. Stellen Sie unter {--ADMIN_ADD_CONFIG_NETWORK_TYPE_MAX_RELOAD_TIME--} nur Werte ein, die auch vom Werbenetzwerk unterstützt werden. Die meisten werden zwar Stunden anbieten, es sollen aber auch Werbenetzwerke mit anderen Reloadsperreinheiten als Stunden unsterstützt werden. Später bei der API-Abfrage wird der eingestellte Wert auf die größtmögliche Einheit aufgerundet.", + 'ADMIN_CONFIG_NETWORK_TYPES_NOTE' => "Für jede Werbeart sind unterschiedliche Reloadsperren, Mindestauffenthalte und mehr einstellbar. Damit ist es möglich, dass Sie z.B. für Forced-Banner eine kürzere/längere Reloadsperre eingeben können als für Paidmails.", + 'ADMIN_ADD_CONFIG_NETWORK_TYPE_FORM_NOTE' => "Bitte beachten Sie, dass es sich beim Feld {--ADMIN_CONFIG_NETWORK_TYPE_ALLOW_EROTIC--} um ein frei eingebares Feld handelt. Den genauen Wert entnehmen Sie bitte derzeit aus Ihrem Affiliate-Bereich, da dieser nicht bei allen Werbenetzwerken einheitlich ist. Sollte das Werbenetzwerk Ihnen einen Wert nicht angeben, so lassen Sie das entsprechende Feld einfach leer. Stellen Sie unter {--ADMIN_CONFIG_NETWORK_TYPE_MAX_RELOAD_TIME--} nur Werte ein, die auch vom Werbenetzwerk unterstützt werden. Die meisten werden zwar Stunden anbieten, es sollen aber auch Werbenetzwerke mit anderen Reloadsperreinheiten als Stunden unsterstützt werden. Später bei der API-Abfrage wird der eingestellte Wert auf die größtmögliche Einheit aufgerundet.", + 'ADMIN_EDIT_CONFIG_NETWORK_TYPE_FORM_NOTE' => "{--ADMIN_ADD_CONFIG_NETWORK_TYPE_FORM_NOTE--}", // - Other messages 'ADMIN_NETWORK_REQUEST_PARAMETER_LIST_LIMITED_TO_TYPE' => "Es wurden nur die API-Parameter des ausgewählten Werbeart-Handlers angezeigt.", 'ADMIN_LIST_NETWORK_API_TRANSLATION_LIMITED_TO_TYPE' => "Es wurden nur die Array-Element-Übersetzungen des ausgewählten Werbeart-Handlers angezeigt.", @@ -228,13 +233,16 @@ addMessages(array( 'ADMIN_CONFIG_NETWORK_TYPES_404' => "Es wurden keine Daten zur Werbenetzwerk-Id %s gefunden. Bitte benachrichtigen Sie das Entwickler-Team.", 'ADMIN_ADD_CONFIG_NETWORK_TYPE_404' => "Dieser Werbeart-Handler wurde noch nicht eingerichtet. {--ADMIN_ADD_CONFIG_NETWORK_TYPE_404_NOTE--} Bitte richten Sie diesen als nächstes ein und führen Sie danach eine Testabfrage aus.", 'ADMIN_ADD_CONFIG_NETWORK_TYPE_404_NOTE' => "Damit das Script auch das Interface des Werbenetzwerks ansprechen kann, muss ein Werbeart-Handler eingerichtet werden.", - 'ADMIN_ADD_CONFIG_NETWORK_TYPE_MAX_RELOAD_TIME' => "Reloadsperre:", - 'ADMIN_ADD_CONFIG_NETWORK_TYPE_MIN_WAITING_TIME' => "Mindestauffenthalt in Sekunden:", - 'ADMIN_ADD_CONFIG_NETWORK_TYPE_MIN_REMAIN_CLICKS' => "Mindestanzahl noch übrige Klicks:", - 'ADMIN_ADD_CONFIG_NETWORK_TYPE_MIN_PAYMENT' => "Mindestvergütung (maximal fünf Stellen hinterm Komma):", - 'ADMIN_ADD_CONFIG_NETWORK_TYPE_ALLOW_EROTIC' => "Wert für das Zulassen von Erotikkampagnen:", - 'ADMIN_NETWORK_TYPE_HANDLER_CONFIG_SAVED' => "Werbeart-Handler wurde gespeichert und ist sofort gültig.", - 'ADMIN_NETWORK_TYPE_HANDLER_CONFIG_NOT_SAVED' => "Werbeart-Handler wurde NICHT gespeichert.", + 'ADMIN_CONFIG_NETWORK_TYPE_MAX_RELOAD_TIME' => "Reloadsperre:", + 'ADMIN_CONFIG_NETWORK_TYPE_RELOAD_TIME_UNIT' => "Zeieinheit für Reloadsperre:", + 'ADMIN_CONFIG_NETWORK_TYPE_MIN_WAITING_TIME' => "Mindestauffenthalt in Sekunden:", + 'ADMIN_CONFIG_NETWORK_TYPE_MIN_REMAIN_CLICKS' => "Mindestanzahl noch übrige Klicks:", + 'ADMIN_CONFIG_NETWORK_TYPE_MIN_PAYMENT' => "Mindestvergütung (maximal fünf Stellen hinterm Komma):", + 'ADMIN_CONFIG_NETWORK_TYPE_ALLOW_EROTIC' => "Wert für das Zulassen von Erotikkampagnen:", + 'ADMIN_CONFIG_NETWORK_TYPE_HANDLER_SAVED' => "Werbeart-Handler wurde gespeichert und ist sofort gültig.", + 'ADMIN_CONFIG_NETWORK_TYPE_HANDLER_NOT_SAVED' => "Werbeart-Handler wurde NICHT gespeichert.", + 'ADMIN_NETWORK_TYPE_HANDLER_NOT_CONFIGURED' => "Werart-Handler wurde noch nicht eingerichtet. Bitte verwenden Sie dazu das passende Formular.", + 'ADMIN_CONFIG_NETWORK_TYPE_HANDLER_NOT_CHANGED' => "Werbeart-Handler wurde NICHT geändert.", // Error codes 'ADMIN_NETWORK_AFF_ID_PASS_WRONG_ERROR_CODE' => "Affiliate-Id oder -Passwort falsch", 'ADMIN_NETWORK_SITE_ID_NOT_ASSIGNED_ERROR_CODE' => "Seiten-Id nicht zugewiesen/ungültig", diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index db3196125f..1f865f76a8 100644 --- a/inc/libs/network_functions.php +++ b/inc/libs/network_functions.php @@ -1444,10 +1444,66 @@ function doAdminNetworkProcessAddNetworkTypesConfig () { // Output message if (!SQL_HASZEROAFFECTED()) { // Successfully added - displayMessage('{--ADMIN_NETWORK_TYPE_HANDLER_CONFIG_SAVED--}'); + displayMessage('{--ADMIN_CONFIG_NETWORK_TYPE_HANDLER_SAVED--}'); } else { // Not added - loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_CONFIG_NOT_SAVED--}'); + loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_TYPE_HANDLER_NOT_SAVED--}'); + } +} + +// Only changes network type configuration if not yet present +function doAdminNetworkProcessEditNetworkTypesConfig () { + // Remove the 'ok' part + unsetPostRequestElement('ok'); + + // Add both ids + setPostRequestElement('network_id', bigintval(getRequestElement('network_id'))); + setPostRequestElement('network_type_id', bigintval(getRequestElement('network_type_id'))); + + /* + * Some parameters are optional, at least one must be given so check a bunch + * of parameters. + */ + foreach (array('network_min_waiting_time', 'network_min_remain_clicks', 'network_min_payment', 'network_allow_erotic') as $element) { + // Is this element empty? + if (postRequestElement($element) == '') { + // Then unset it to get a NULL for optional parameter + unsetPostRequestElement($element); + } // END - if + } // END - foreach + + // Initialize variables + $content = array(); + $id = 'network_max_reload_time_ye'; + $skip = false; + $postData = postRequestArray(); + + // Convert "reload time selections" + convertSelectionsToEpocheTime($postData, $content, $id, $skip); + + // Set the POST array back + setPostRequestArray($postData); + + // Is there already an entry? + if (!isNetworkTypeHandlerConfigured(getRequestElement('network_id'), getRequestElement('network_type_id'))) { + // This network type handler is not configured + displayMessage('{--ADMIN_NETWORK_TYPE_HANDLER_NOT_CONFIGURED--}'); + return; + } // END - if + + // Get SQL query for new entry + $SQL = getUpdateSqlFromArray(postRequestArray(), 'network_types_config', 'network_data_id', postRequestElement('network_data_id'), array('network_data_id')); + + // Run the query + SQL_QUERY($SQL, __FUNCTION__, __LINE__); + + // Output message + if (!SQL_HASZEROAFFECTED()) { + // Successfully added + displayMessage('{--ADMIN_CONFIG_NETWORK_TYPE_HANDLER_SAVED--}'); + } else { + // Not added + loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_TYPE_HANDLER_NOT_CHANGED--}'); } } diff --git a/inc/modules/admin/what-config_network_types.php b/inc/modules/admin/what-config_network_types.php index a8c418d13f..13d1bc5c13 100644 --- a/inc/modules/admin/what-config_network_types.php +++ b/inc/modules/admin/what-config_network_types.php @@ -69,6 +69,7 @@ if (isGetRequestElementSet('network_id')) { `network_type_handle`, NULL AS `network_data_id`, NULL AS `network_max_reload_time`, + NULL AS `network_reload_time_unit`, NULL AS `network_min_waiting_time`, NULL AS `network_min_remain_clicks`, NULL AS `network_min_payment`, @@ -93,6 +94,7 @@ LIMIT 1', $result_config = SQL_QUERY_ESC('SELECT `network_data_id`, `network_max_reload_time`, + `network_reload_time_unit`, `network_min_waiting_time` `network_min_remain_clicks`, `network_min_payment`, @@ -108,20 +110,27 @@ LIMIT 1', bigintval($content['network_type_id']) ), __FUNCTION__, __LINE__); + // Use template for adding + $templateName = 'admin_add_config_network_type_form'; + // Do we also have configuration? if (SQL_NUMROWS($result_config) == 1) { // Load as well and merge it $content = merge_array($content, SQL_FETCHARRAY($result_config)); + + // Use template for editing + $templateName = 'admin_edit_config_network_type_form'; } // END - if // Free result SQL_FREERESULT($result_config); // "Translate" some values - $content['network_max_reload_time'] = createTimeSelections($content['network_max_reload_time'], 'network_max_reload_time', 'WDhms'); + $content['network_max_reload_time'] = createTimeSelections($content['network_max_reload_time'], 'network_max_reload_time', 'WDhms'); + $content['network_reload_time_unit'] = generateTimeUnitSelectionBox($content['network_reload_time_unit'], 'network_reload_time_unit', array('W', 'D', 'h', 'm', 's')); // Load template - loadTemplate('admin_add_config_network_type_form', false, $content); + loadTemplate($templateName, false, $content); // Abort here return; @@ -160,6 +169,7 @@ ORDER BY $result_config = SQL_QUERY_ESC('SELECT `network_data_id`, `network_max_reload_time`, + `network_reload_time_unit`, `network_min_waiting_time`, `network_min_remain_clicks`, `network_min_payment`, @@ -178,7 +188,7 @@ LIMIT 1', // Do we have an entry? if (SQL_NUMROWS($result_config) == 1) { // Load this data as well - $contentConfig = SQL_FETCHARRAY($result_config); + $contentConfig = merge_array($content, SQL_FETCHARRAY($result_config)); // Add it with extra template $content['network_type_config_content'] = loadTemplate('admin_show_config_network_type', true, $contentConfig); diff --git a/inc/template-functions.php b/inc/template-functions.php index e13e09a291..59e5aadb9f 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -909,13 +909,13 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = if ($asArray === true) { // Just put all data in an array for later use $OUT = array( - 'YEARS' => $Y, - 'MONTHS' => $M, - 'WEEKS' => $W, - 'DAYS' => $D, - 'HOURS' => $h, - 'MINUTES' => $m, - 'SECONDS' => $s + 'Y' => $Y, + 'M' => $M, + 'W' => $W, + 'D' => $D, + 'h' => $h, + 'm' => $m, + 's' => $s ); } else { // Generate table @@ -924,31 +924,31 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = $OUT .= ''; if (isInString('Y', $display) || (empty($display))) { - $OUT .= '
{--_YEARS--}'; + $OUT .= '
{--TIME_UNIT_YEAR--}'; } // END - if if (isInString('M', $display) || (empty($display))) { - $OUT .= '
{--_MONTHS--}'; + $OUT .= '
{--TIME_UNIT_MONTH--}'; } // END - if if (isInString('W', $display) || (empty($display))) { - $OUT .= '
{--_WEEKS--}'; + $OUT .= '
{--TIME_UNIT_WEEK--}'; } // END - if if (isInString('D', $display) || (empty($display))) { - $OUT .= '
{--_DAYS--}'; + $OUT .= '
{--TIME_UNIT_DAY--}'; } // END - if if (isInString('h', $display) || (empty($display))) { - $OUT .= '
{--_HOURS--}'; + $OUT .= '
{--TIME_UNIT_HOUR--}'; } // END - if if (isInString('m', $display) || (empty($display))) { - $OUT .= '
{--_MINUTES--}'; + $OUT .= '
{--TIME_UNIT_MINUTE--}'; } // END - if if (isInString('s', $display) || (empty($display))) { - $OUT .= '
{--_SECONDS--}'; + $OUT .= '
{--TIME_UNIT_SECOND--}'; } // END - if $OUT .= ''; @@ -1772,6 +1772,50 @@ function translatePoolType ($type) { return sprintf("{--POOL_TYPE_%s--}", strtoupper($type)); } +// "Translates" given time unit +function translateTimeUnit ($unit) { + // Default is unknown + $message = '{%message,TIME_UNIT_UNKNOWN=' . $unit . '%}'; + + // "Detect" it + switch ($unit) { + case 'Y': // Years + $message = '{--TIME_UNIT_YEAR--}'; + break; + + case 'M': // Months + $message = '{--TIME_UNIT_MONTH--}'; + break; + + case 'W': // Weeks + $message = '{--TIME_UNIT_WEEK--}'; + break; + + case 'D': // Days + $message = '{--TIME_UNIT_DAY--}'; + break; + + case 'h': // Hours + $message = '{--TIME_UNIT_HOUR--}'; + break; + + case 'm': // Minute + $message = '{--TIME_UNIT_MINUTE--}'; + break; + + case 's': // Seconds + $message = '{--TIME_UNIT_SECOND--}'; + break; + + default: // Unknown value detected + logDebugMessage(__FUNCTION__, __LINE__, 'Unknown time unit ' . $unit . ' detected.'); + break; + } // END - switch + + // Return message + return $message; +} + // Displays given message in admin_settings_saved template function displayMessage ($message, $return = false) { // Load the template @@ -1783,7 +1827,7 @@ function generateGenderSelectionBox ($selectedGender = '') { // Start the HTML code $out = ''; + + // Add options + $out .= generateOptionList('/ARRAY/', $unitArray, $messageIds, $defaultUnit); + + // Finish HTML code + $out .= ''; + + // Return the code + return $out; +} + // Function to add style tag (wether display:none/block) function addStyleMenuContent ($menuMode, $mainAction, $action) { // Do we have foo_menu_javascript enabled? diff --git a/templates/de/html/admin/admin_add_config_network_type_form.tpl b/templates/de/html/admin/admin_add_config_network_type_form.tpl index 6dba79b337..8d47e6ef42 100644 --- a/templates/de/html/admin/admin_add_config_network_type_form.tpl +++ b/templates/de/html/admin/admin_add_config_network_type_form.tpl @@ -10,23 +10,27 @@
- {--ADMIN_ADD_CONFIG_NETWORK_TYPE_MAX_RELOAD_TIME--}
+ {--ADMIN_CONFIG_NETWORK_TYPE_MAX_RELOAD_TIME--}
$content[network_max_reload_time]
- {--ADMIN_ADD_CONFIG_NETWORK_TYPE_MIN_WAITING_TIME--}
+ {--ADMIN_CONFIG_NETWORK_TYPE_RELOAD_TIME_UNIT--}
+ $content[network_reload_time_unit] +
+
+ {--ADMIN_CONFIG_NETWORK_TYPE_MIN_WAITING_TIME--}
- {--ADMIN_ADD_CONFIG_NETWORK_TYPE_MIN_REMAIN_CLICKS--}
+ {--ADMIN_CONFIG_NETWORK_TYPE_MIN_REMAIN_CLICKS--}
- {--ADMIN_ADD_CONFIG_NETWORK_TYPE_MIN_PAYMENT--}
+ {--ADMIN_CONFIG_NETWORK_TYPE_MIN_PAYMENT--}
- {--ADMIN_ADD_CONFIG_NETWORK_TYPE_ALLOW_EROTIC--}
+ {--ADMIN_CONFIG_NETWORK_TYPE_ALLOW_EROTIC--}
diff --git a/templates/de/html/admin/admin_add_payment.tpl b/templates/de/html/admin/admin_add_payment.tpl index cf198177cb..8513225939 100644 --- a/templates/de/html/admin/admin_add_payment.tpl +++ b/templates/de/html/admin/admin_add_payment.tpl @@ -9,7 +9,7 @@ {--ADMIN_ENTER_PAYMENT_TIME--}: - {--_SECONDS--} + {--TIME_UNIT_SECOND--} diff --git a/templates/de/html/admin/admin_config_home.tpl b/templates/de/html/admin/admin_config_home.tpl index a186d50bf2..52eefd2de4 100644 --- a/templates/de/html/admin/admin_config_home.tpl +++ b/templates/de/html/admin/admin_config_home.tpl @@ -15,14 +15,14 @@ - - - - - - - - + + + + + + + + diff --git a/templates/de/html/admin/admin_config_network_types_row.tpl b/templates/de/html/admin/admin_config_network_types_row.tpl index 6a26d82bf1..de978e4fed 100644 --- a/templates/de/html/admin/admin_config_network_types_row.tpl +++ b/templates/de/html/admin/admin_config_network_types_row.tpl @@ -1,9 +1,9 @@ - + {--ID_SELECT--}
$content[network_type_id] - + {--ADMIN_NETWORK_TYPES_HANDLE--}
{%pipe,translateNetworkTypeHandler=$content[network_type_handle]%} diff --git a/templates/de/html/admin/admin_delete_payments_row.tpl b/templates/de/html/admin/admin_delete_payments_row.tpl index aabac23676..c84c60a93e 100644 --- a/templates/de/html/admin/admin_delete_payments_row.tpl +++ b/templates/de/html/admin/admin_delete_payments_row.tpl @@ -5,7 +5,7 @@ - $content[time] {--_SECONDS--} ($content[mail_title]) + $content[time] {--TIME_UNIT_SECOND--} ($content[mail_title]) diff --git a/templates/de/html/admin/admin_edit_config_network_type_form.tpl b/templates/de/html/admin/admin_edit_config_network_type_form.tpl new file mode 100644 index 0000000000..50ce515b46 --- /dev/null +++ b/templates/de/html/admin/admin_edit_config_network_type_form.tpl @@ -0,0 +1,45 @@ +
+
+
+
+
+ {%message,ADMIN_EDIT_CONFIG_NETWORK_TYPE_TITLE=$content[network_type_handle]%} +
+
+ ({%network,getNetworkDataById,network_title=%network_id%%}) +
+
+
+ {--ADMIN_CONFIG_NETWORK_TYPE_MAX_RELOAD_TIME--}
+ $content[network_max_reload_time] +
+
+ {--ADMIN_CONFIG_NETWORK_TYPE_RELOAD_TIME_UNIT--}
+ $content[network_reload_time_unit] +
+
+ {--ADMIN_CONFIG_NETWORK_TYPE_MIN_WAITING_TIME--}
+ +
+
+ {--ADMIN_CONFIG_NETWORK_TYPE_MIN_REMAIN_CLICKS--}
+ +
+
+ {--ADMIN_CONFIG_NETWORK_TYPE_MIN_PAYMENT--}
+ +
+
+ {--ADMIN_CONFIG_NETWORK_TYPE_ALLOW_EROTIC--}
+ +
+
+ + +
+ +
+ +
+ {--ADMIN_EDIT_CONFIG_NETWORK_TYPE_FORM_NOTE--} +
diff --git a/templates/de/html/admin/admin_edit_payments_row.tpl b/templates/de/html/admin/admin_edit_payments_row.tpl index b02ea92df8..ed2180cecd 100644 --- a/templates/de/html/admin/admin_edit_payments_row.tpl +++ b/templates/de/html/admin/admin_edit_payments_row.tpl @@ -6,7 +6,7 @@ {--ADMIN_PAYMENT_TIME--}: - {--_SECONDS--} + {--TIME_UNIT_SECOND--} diff --git a/templates/de/html/admin/admin_list_payments_row.tpl b/templates/de/html/admin/admin_list_payments_row.tpl index fec54b2384..3ddced75de 100644 --- a/templates/de/html/admin/admin_list_payments_row.tpl +++ b/templates/de/html/admin/admin_list_payments_row.tpl @@ -3,7 +3,7 @@ - $content[time] {--_SECONDS--} + $content[time] {--TIME_UNIT_SECOND--} {%pipe,translateComma=$content[payment]%} diff --git a/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl b/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl index c6f49b7877..844b99f157 100644 --- a/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl +++ b/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl @@ -1,8 +1,8 @@ $content[id] $content[name] - $content[reload] {--_HOURS--} - $content[wait] {--_SECONDS--} + $content[reload] {--TIME_UNIT_HOUR--} + $content[wait] {--TIME_UNIT_SECOND--} {%pipe,translateComma=$content[remain]%} $content[pay] € diff --git a/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl b/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl index 945e30ff9b..15efee514b 100644 --- a/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl +++ b/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl @@ -1,8 +1,8 @@ $content[id] $content[name] - $content[reload] {--_HOURS--} - $content[wait] {--_SECONDS--} + $content[reload] {--TIME_UNIT_HOUR--} + $content[wait] {--TIME_UNIT_SECOND--} {%pipe,translateComma=$content[remain]%} $content[pay] € diff --git a/templates/de/html/admin/admin_send_yoomedia.tpl b/templates/de/html/admin/admin_send_yoomedia.tpl index 07b87f6bf6..80c94a2f60 100644 --- a/templates/de/html/admin/admin_send_yoomedia.tpl +++ b/templates/de/html/admin/admin_send_yoomedia.tpl @@ -31,7 +31,7 @@ {--ENTER_SECONDS--}: - {--_SECONDS--} + {--TIME_UNIT_SECOND--} diff --git a/templates/de/html/admin/admin_show_config_network_type.tpl b/templates/de/html/admin/admin_show_config_network_type.tpl new file mode 100644 index 0000000000..3c35f37626 --- /dev/null +++ b/templates/de/html/admin/admin_show_config_network_type.tpl @@ -0,0 +1,35 @@ +
+
+
+
+ {%message,ADMIN_SHOW_CONFIG_NETWORK_TYPE_TITLE=$content[network_type_handle]%} +
+
+ {--ADMIN_CONFIG_NETWORK_TYPE_MAX_RELOAD_TIME--} ({--TIME_UNIT--})
+ {%pipe,createFancyTime=$content[network_max_reload_time]%} ({%pipe,translateTimeUnit=$content[network_reload_time_unit]%}) +
+
+ {--ADMIN_CONFIG_NETWORK_TYPE_MIN_WAITING_TIME--}
+ {%pipe,translateComma=$content[network_min_waiting_time]%} +
+
+ {--ADMIN_CONFIG_NETWORK_TYPE_MIN_REMAIN_CLICKS--}
+ {%pipe,translateComma=$content[network_min_remain_clicks]%} +
+
+ {--ADMIN_CONFIG_NETWORK_TYPE_MIN_PAYMENT--}
+ {%pipe,translateComma=$content[network_min_payment]%} +
+
+ {--ADMIN_CONFIG_NETWORK_TYPE_ALLOW_EROTIC--}
+ {%pipe,fixEmptyContentToDashes=$content[network_allow_erotic]%} +
+
+ + + + + +
+ +
diff --git a/templates/de/html/tlock_message.tpl b/templates/de/html/tlock_message.tpl index 2e918eeb61..40e648b7f9 100644 --- a/templates/de/html/tlock_message.tpl +++ b/templates/de/html/tlock_message.tpl @@ -3,9 +3,9 @@
{--CONFIG_URL_TIME_LOCK--} - $content[hours] {--_HOURS--}, - $content[minutes] {--_MINUTES--} {--_AND--} - $content[seconds] {--_SECONDS--} + $content[hours] {--TIME_UNIT_HOUR--}, + $content[minutes] {--TIME_UNIT_MINUTE--} {--_AND--} + $content[seconds] {--TIME_UNIT_SECOND--}
{--MEMBER_LAST_TIME_LOCK--}: $content[timestamp] -- 2.39.5