]> git.mxchange.org Git - mailer.git/commitdiff
Extension ext-network continued, "translation" function introduced:
authorRoland Häder <roland@mxchange.org>
Tue, 23 Aug 2011 14:57:56 +0000 (14:57 +0000)
committerRoland Häder <roland@mxchange.org>
Tue, 23 Aug 2011 14:57:56 +0000 (14:57 +0000)
- 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

22 files changed:
.gitattributes
DOCS/TODOs.txt
inc/extensions/ext-network.php
inc/functions.php
inc/language/de.php
inc/language/network_de.php
inc/libs/network_functions.php
inc/modules/admin/what-config_network_types.php
inc/template-functions.php
templates/de/html/admin/admin_add_config_network_type_form.tpl
templates/de/html/admin/admin_add_payment.tpl
templates/de/html/admin/admin_config_home.tpl
templates/de/html/admin/admin_config_network_types_row.tpl
templates/de/html/admin/admin_delete_payments_row.tpl
templates/de/html/admin/admin_edit_config_network_type_form.tpl [new file with mode: 0644]
templates/de/html/admin/admin_edit_payments_row.tpl
templates/de/html/admin/admin_list_payments_row.tpl
templates/de/html/admin/admin_list_yoomedia_tm_already.tpl
templates/de/html/admin/admin_list_yoomedia_tm_row.tpl
templates/de/html/admin/admin_send_yoomedia.tpl
templates/de/html/admin/admin_show_config_network_type.tpl [new file with mode: 0644]
templates/de/html/tlock_message.tpl

index 7ba18324b036cf319ed676fa85096f979000c798..2f0da48bae7a2fc7864c288de00fd0981b952ba3 100644 (file)
@@ -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
index 606ca207f73a943a9ada02e80de0c556f261c79e..e5126e5795e7b298b2bd82e268c7fb9d3e199730 100644 (file)
@@ -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.
index 678630558bdd625438b269a0d5ad4a3070389a4d..7ae48128ce425c3db7f9dadd79cc2318479ba358 100644 (file)
@@ -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,
index 393c44efcfb732ca570b7328bdc6112fcbfb53ee..f3320812ecbc8abdb59fc0427895e803065060e0 100644 (file)
@@ -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);
index 443973fe7d988296808abb56c54fc4553e98c0c9..72129a8f2c1efb3a54e37845f24fdef8f8ceb8a8 100644 (file)
@@ -863,13 +863,14 @@ addMessages(array(
        'ADMIN_TASK_NO_SQL_TITLE' => "Aufgabe ohne SQL-Anweisungen",
        'MEMBER_UNCONFIRMED_LOCKED' => "Anzahl zu best. Mails f&uuml;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&uuml;tige EMail-Adresse eingegeben.",
index 16dd62c66c0482fae60a54b43428c1dd646a6aac..6a35494f55722f200d468e4027abd4d0600e96bc 100644 (file)
@@ -84,7 +84,9 @@ addMessages(array(
        'ADMIN_ADD_NETWORK_API_TRANSLATION_TITLE' => "Werbenetzwerk verwalten - Neues API-Arrayelement hinzuf&uuml;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 &auml;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&uuml;gen",
        'ADMIN_ADD_CONFIG_NETWORK_TYPE_SUBMIT' => "Jetzt den Werbeart-Handler einrichten",
        'ADMIN_ADD_CONFIG_NETWORK_TYPE_FORM_SUBMIT' => "Werbeart-Handlerdaten hinzuf&uuml;gen",
+       'ADMIN_EDIT_CONFIG_NETWORK_TYPE_SUBMIT' => "Konfiguration &auml;ndern",
+       'ADMIN_EDIT_CONFIG_NETWORK_TYPE_FORM_SUBMIT' => "Werbeart-Handler &auml;ndern",
        // - Success titles
        'ADMIN_NETWORK_ADDED_TITLE' => "Allgemeine Werbenetzwerkdaten hinzugef&uuml;gt",
        'ADMIN_NETWORK_TYPES_ADDED_TITLE' => "Werbeart-Handler hinzugef&uuml;gt",
@@ -130,8 +134,9 @@ addMessages(array(
        'ADMIN_LIST_NETWORK_API_TRANSLATION_NOTE' => "Seien Sie mit dem Editieren bzw. L&ouml;schen von Array-Elementen sehr vorsichtig, die API-Abfrage k&ouml;ntte unerwartete Ergebnisse bzw. Fehler zur&uuml;ckliefern.",
        'ADMIN_NETWORK_REQUIRE_ID_CARD_NOTE' => "Unter <strong>{--ADMIN_NETWORK_REQUIRE_ID_CARD--}</strong> ist das durch den Webnetzwerkbetreiber Verlangen einerPersonalausweiskopie bzw. Gerwerbescheins zu verstehen. Mehr dazu erfahen Sie <a href=\"http://forum.mxchange.org/topic-499.html\" rel=\"external\" target=\"_blank\">im Forum</a>.",
        'ADMIN_CONFIG_NETWORK_API_NOTE' => "Geben Sie unter <strong>{--ADMIN_CONFIG_NETWORK_API_ENTER_REFERRAL_BUTTON--}</strong> 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 <strong>keinen</strong> HTML-Code ein.",
-       'ADMIN_CONFIG_NETWORK_TYPES_NOTE' => "F&uuml;r jede Werbeart sind unterschiedliche Reloadsperren, Mindestauffenthalte und mehr einstellbar. Damit ist es m&ouml;glich, dass Sie z.B. f&uuml;r Forced-Banner eine k&uuml;rzere/l&auml;ngere Reloadsperre eingeben k&ouml;nnen als f&uuml;r Paidmails. An den angezeigten URLs (API-, Klick- und Banner-URL brauchen Sie meistens nichts &auml;ndern. Dies wird vom {?TITLE?}-Entwicklerteam aktuell gehalten.",
-       'ADMIN_ADD_CONFIG_NETWORK_TYPE_FORM_NOTE' => "Bitte beachten Sie, dass es sich beim Feld <strong>{--ADMIN_ADD_CONFIG_NETWORK_TYPE_ALLOW_EROTIC--}</strong> 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 <strong>{--ADMIN_ADD_CONFIG_NETWORK_TYPE_MAX_RELOAD_TIME--}</strong> nur Werte ein, die auch vom Werbenetzwerk unterst&uuml;tzt werden. Die meisten werden zwar Stunden anbieten, es sollen aber auch Werbenetzwerke mit anderen Reloadsperreinheiten als Stunden unsterst&uuml;tzt werden. Sp&auml;ter bei der API-Abfrage wird der eingestellte Wert auf die gr&ouml;&szlig;tm&ouml;gliche Einheit aufgerundet.",
+       'ADMIN_CONFIG_NETWORK_TYPES_NOTE' => "F&uuml;r jede Werbeart sind unterschiedliche Reloadsperren, Mindestauffenthalte und mehr einstellbar. Damit ist es m&ouml;glich, dass Sie z.B. f&uuml;r Forced-Banner eine k&uuml;rzere/l&auml;ngere Reloadsperre eingeben k&ouml;nnen als f&uuml;r Paidmails.",
+       'ADMIN_ADD_CONFIG_NETWORK_TYPE_FORM_NOTE' => "Bitte beachten Sie, dass es sich beim Feld <strong>{--ADMIN_CONFIG_NETWORK_TYPE_ALLOW_EROTIC--}</strong> 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 <strong>{--ADMIN_CONFIG_NETWORK_TYPE_MAX_RELOAD_TIME--}</strong> nur Werte ein, die auch vom Werbenetzwerk unterst&uuml;tzt werden. Die meisten werden zwar Stunden anbieten, es sollen aber auch Werbenetzwerke mit anderen Reloadsperreinheiten als Stunden unsterst&uuml;tzt werden. Sp&auml;ter bei der API-Abfrage wird der eingestellte Wert auf die gr&ouml;&szlig;tm&ouml;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&auml;hlten Werbeart-Handlers angezeigt.",
        'ADMIN_LIST_NETWORK_API_TRANSLATION_LIMITED_TO_TYPE' => "Es wurden nur die Array-Element-&Uuml;bersetzungen des ausgew&auml;hlten Werbeart-Handlers angezeigt.",
@@ -228,13 +233,16 @@ addMessages(array(
        'ADMIN_CONFIG_NETWORK_TYPES_404' => "Es wurden keine Daten zur Werbenetzwerk-Id <span class=\"data\">%s</span> 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&auml;chstes ein und f&uuml;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 &uuml;brige Klicks:",
-       'ADMIN_ADD_CONFIG_NETWORK_TYPE_MIN_PAYMENT' => "Mindestverg&uuml;tung (maximal f&uuml;nf Stellen hinterm Komma):",
-       'ADMIN_ADD_CONFIG_NETWORK_TYPE_ALLOW_EROTIC' => "Wert f&uuml;r das Zulassen von Erotikkampagnen:",
-       'ADMIN_NETWORK_TYPE_HANDLER_CONFIG_SAVED' => "Werbeart-Handler wurde gespeichert und ist sofort g&uuml;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&uuml;r Reloadsperre:",
+       'ADMIN_CONFIG_NETWORK_TYPE_MIN_WAITING_TIME' => "Mindestauffenthalt in Sekunden:",
+       'ADMIN_CONFIG_NETWORK_TYPE_MIN_REMAIN_CLICKS' => "Mindestanzahl noch &uuml;brige Klicks:",
+       'ADMIN_CONFIG_NETWORK_TYPE_MIN_PAYMENT' => "Mindestverg&uuml;tung (maximal f&uuml;nf Stellen hinterm Komma):",
+       'ADMIN_CONFIG_NETWORK_TYPE_ALLOW_EROTIC' => "Wert f&uuml;r das Zulassen von Erotikkampagnen:",
+       'ADMIN_CONFIG_NETWORK_TYPE_HANDLER_SAVED' => "Werbeart-Handler wurde gespeichert und ist sofort g&uuml;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&auml;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&uuml;ltig",
index db3196125f93239771b5a5c9632c0917c7a7e4a8..1f865f76a8be377a832510477b0bdf75590470af 100644 (file)
@@ -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--}');
        }
 }
 
index a8c418d13f180bb0c5e6b153a542a1e60c14c689..13d1bc5c13c2bad74501994ac98cb5e8790da9ab 100644 (file)
@@ -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);
index e13e09a291b367c6623711527c98867f4762d2a9..59e5aadb9fe4b3dcced24ef4df74112d454ddaae 100644 (file)
@@ -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 .= '<tr>';
 
                if (isInString('Y', $display) || (empty($display))) {
-                       $OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--_YEARS--}</strong></td>';
+                       $OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--TIME_UNIT_YEAR--}</strong></td>';
                } // END - if
 
                if (isInString('M', $display) || (empty($display))) {
-                       $OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--_MONTHS--}</strong></td>';
+                       $OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--TIME_UNIT_MONTH--}</strong></td>';
                } // END - if
 
                if (isInString('W', $display) || (empty($display))) {
-                       $OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--_WEEKS--}</strong></td>';
+                       $OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--TIME_UNIT_WEEK--}</strong></td>';
                } // END - if
 
                if (isInString('D', $display) || (empty($display))) {
-                       $OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--_DAYS--}</strong></td>';
+                       $OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--TIME_UNIT_DAY--}</strong></td>';
                } // END - if
 
                if (isInString('h', $display) || (empty($display))) {
-                       $OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--_HOURS--}</strong></td>';
+                       $OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--TIME_UNIT_HOUR--}</strong></td>';
                } // END - if
 
                if (isInString('m', $display) || (empty($display))) {
-                       $OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--_MINUTES--}</strong></td>';
+                       $OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--TIME_UNIT_MINUTE--}</strong></td>';
                } // END - if
 
                if (isInString('s', $display) || (empty($display))) {
-                       $OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--_SECONDS--}</strong></td>';
+                       $OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--TIME_UNIT_SECOND--}</strong></td>';
                } // END - if
 
                $OUT .= '</tr>';
@@ -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  = '<select name="gender" size="1" class="form_select">';
 
-       // Add the options
+       // Add options
        $out .= generateOptionList('/ARRAY/', array('M', 'F', 'C'), array('{--GENDER_M--}', '{--GENDER_F--}', '{--GENDER_C--}'), $selectedGender);
 
        // Finish HTML code
@@ -1793,6 +1837,30 @@ function generateGenderSelectionBox ($selectedGender = '') {
        return $out;
 }
 
+// Generates a selection box for given default value
+function generateTimeUnitSelectionBox ($defaultUnit, $fieldName, $unitArray) {
+       // Init variables
+       $messageIds = array();
+
+       // Generate message id array
+       foreach ($unitArray as $unit) {
+               // "Translate" it
+               $messageIds[] = translateTimeUnit($unit);
+       } // END - foreach
+
+       // Start the HTML code
+       $out = '<select name="' . $fieldName . '" size="1" class="form_select">';
+
+       // Add options
+       $out .= generateOptionList('/ARRAY/', $unitArray, $messageIds, $defaultUnit);
+
+       // Finish HTML code
+       $out .= '</select>';
+
+       // 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?
index 6dba79b337160737eaf902631efc7f69ea042faf..8d47e6ef424d37f35ccadbcdb3a5857283437b93 100644 (file)
                </div>
        </div>
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               {--ADMIN_ADD_CONFIG_NETWORK_TYPE_MAX_RELOAD_TIME--}<br />
+               {--ADMIN_CONFIG_NETWORK_TYPE_MAX_RELOAD_TIME--}<br />
                $content[network_max_reload_time]
        </div>
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               {--ADMIN_ADD_CONFIG_NETWORK_TYPE_MIN_WAITING_TIME--}<br />
+               {--ADMIN_CONFIG_NETWORK_TYPE_RELOAD_TIME_UNIT--}<br />
+               $content[network_reload_time_unit]
+       </div>
+       <div class="bottom" style="padding-top:3px;padding-bottom:3px">
+               {--ADMIN_CONFIG_NETWORK_TYPE_MIN_WAITING_TIME--}<br />
                <input type="text" class="form_normal" name="network_min_waiting_time" size="5" maxlength="20" value="$content[network_min_waiting_time]" />
        </div>
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               {--ADMIN_ADD_CONFIG_NETWORK_TYPE_MIN_REMAIN_CLICKS--}<br />
+               {--ADMIN_CONFIG_NETWORK_TYPE_MIN_REMAIN_CLICKS--}<br />
                <input type="text" class="form_normal" name="network_min_remain_clicks" size="5" maxlength="20" value="$content[network_min_remain_clicks]" />
        </div>
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               {--ADMIN_ADD_CONFIG_NETWORK_TYPE_MIN_PAYMENT--}<br />
+               {--ADMIN_CONFIG_NETWORK_TYPE_MIN_PAYMENT--}<br />
                <input type="text" class="form_normal" name="network_min_payment" size="5" maxlength="20" value="$content[network_min_payment]" />
        </div>
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               {--ADMIN_ADD_CONFIG_NETWORK_TYPE_ALLOW_EROTIC--}<br />
+               {--ADMIN_CONFIG_NETWORK_TYPE_ALLOW_EROTIC--}<br />
                <input type="text" class="form_normal" name="network_allow_erotic" size="5" maxlength="20" value="$content[network_allow_erotic]" />
        </div>
        <div class="table_footer">
index cf198177cb8f5d3125d66e52520886f0640c695e..851322593918b9527787489451f91429a377ef0a 100644 (file)
@@ -9,7 +9,7 @@
        <tr>
                <td align="right">{--ADMIN_ENTER_PAYMENT_TIME--}:</td>
                <td>
-                       <input type="text" class="form_field" name="t_wait" size="3" maxlength="3" /> {--_SECONDS--}
+                       <input type="text" class="form_field" name="t_wait" size="3" maxlength="3" /> {--TIME_UNIT_SECOND--}
                </td>
        </tr>
        <tr>
index a186d50bf2c6ef20972d22eca3b001fdbe86ad62..52eefd2de430d2a7f534b234666b8cbd88f8cb59 100644 (file)
                                <option value="-1"$content[-1]>{--ADMIN_INDEX_NO_DELAY--}</option>
                                <option value="0"$content[0]>{--ADMIN_INDEX_MANUAL_FORWARD--}</option>
                                <!-- Fuehren Sie dies einfach so weiter, wenn Sie mehr Werte brauchen //-->
-                               <option value="1"$content[1]>1 {--_SECONDS--} (JavaScript+HTML)</option>
-                               <option value="2"$content[2]>2 {--_SECONDS--} (JavaScript+HTML)</option>
-                               <option value="3"$content[3]>3 {--_SECONDS--} (JavaScript+HTML)</option>
-                               <option value="4"$content[4]>4 {--_SECONDS--} (JavaScript+HTML)</option>
-                               <option value="5"$content[5]>5 {--_SECONDS--} (JavaScript+HTML)</option>
-                               <option value="10"$content[10]>10 {--_SECONDS--} (JavaScript+HTML)</option>
-                               <option value="15"$content[15]>15 {--_SECONDS--} (JavaScript+HTML)</option>
-                               <option value="30"$content[30]>30 {--_SECONDS--} (JavaScript+HTML)</option>
+                               <option value="1"$content[1]>1 {--TIME_UNIT_SECOND--} (JavaScript+HTML)</option>
+                               <option value="2"$content[2]>2 {--TIME_UNIT_SECOND--} (JavaScript+HTML)</option>
+                               <option value="3"$content[3]>3 {--TIME_UNIT_SECOND--} (JavaScript+HTML)</option>
+                               <option value="4"$content[4]>4 {--TIME_UNIT_SECOND--} (JavaScript+HTML)</option>
+                               <option value="5"$content[5]>5 {--TIME_UNIT_SECOND--} (JavaScript+HTML)</option>
+                               <option value="10"$content[10]>10 {--TIME_UNIT_SECOND--} (JavaScript+HTML)</option>
+                               <option value="15"$content[15]>15 {--TIME_UNIT_SECOND--} (JavaScript+HTML)</option>
+                               <option value="30"$content[30]>30 {--TIME_UNIT_SECOND--} (JavaScript+HTML)</option>
                                <!-- Laenger sollte es aber nun nicht dauern! //-->
                        </select>
                </td>
index 6a26d82bf153970d9f406ce0e21c09c6e09bd7c9..de978e4fed5a841adde99530c12b40995e520403 100644 (file)
@@ -1,9 +1,9 @@
 <tr>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">
+       <td class="{%template,ColorSwitch%} bottom right" align="center" width="7%">
                {--ID_SELECT--}<br />
                <strong>$content[network_type_id]</strong>
        </td>
-       <td class="{%template,ColorSwitch%} bottom" align="center">
+       <td class="{%template,ColorSwitch%} bottom" align="center" width="93%">
                {--ADMIN_NETWORK_TYPES_HANDLE--}<br />
                <strong>{%pipe,translateNetworkTypeHandler=$content[network_type_handle]%}</strong>
        </td>
index aabac23676e0eef4c658ce98656fa24b4d4e8111..c84c60a93e2c3aa9dc98225d8a6bd01b69c6ee93 100644 (file)
@@ -5,7 +5,7 @@
 </tr>
 <tr>
        <td align="center" class="{%template,ColorSwitch%} bottom">
-               $content[time] {--_SECONDS--} ($content[mail_title])
+               $content[time] {--TIME_UNIT_SECOND--} ($content[mail_title])
                <input type="hidden" name="id[$content[id]]" value="1" />
        </td>
 </tr>
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 (file)
index 0000000..50ce515
--- /dev/null
@@ -0,0 +1,45 @@
+<div align="center">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_network_types&amp;network_id=$content[network_id]&amp;network_type_id=$content[network_type_id]&amp;do=edit_network_types_config%}" method="post">
+<div class="table dashed">
+       <div class="table_header bottom">
+               <div>
+                       <strong>{%message,ADMIN_EDIT_CONFIG_NETWORK_TYPE_TITLE=$content[network_type_handle]%}</strong>
+               </div>
+               <div class="tiny">
+                       (<a href="{%network,getNetworkDataById,network_reflink=%network_id%%}" target="_blank" title="{%network,getNetworkDataById,network_title=%network_id%%}">{%network,getNetworkDataById,network_title=%network_id%%}</a>)
+               </div>
+       </div>
+       <div class="bottom" style="padding-top:3px;padding-bottom:3px">
+               {--ADMIN_CONFIG_NETWORK_TYPE_MAX_RELOAD_TIME--}<br />
+               $content[network_max_reload_time]
+       </div>
+       <div class="bottom" style="padding-top:3px;padding-bottom:3px">
+               {--ADMIN_CONFIG_NETWORK_TYPE_RELOAD_TIME_UNIT--}<br />
+               $content[network_reload_time_unit]
+       </div>
+       <div class="bottom" style="padding-top:3px;padding-bottom:3px">
+               {--ADMIN_CONFIG_NETWORK_TYPE_MIN_WAITING_TIME--}<br />
+               <input type="text" class="form_normal" name="network_min_waiting_time" size="5" maxlength="20" value="$content[network_min_waiting_time]" />
+       </div>
+       <div class="bottom" style="padding-top:3px;padding-bottom:3px">
+               {--ADMIN_CONFIG_NETWORK_TYPE_MIN_REMAIN_CLICKS--}<br />
+               <input type="text" class="form_normal" name="network_min_remain_clicks" size="5" maxlength="20" value="$content[network_min_remain_clicks]" />
+       </div>
+       <div class="bottom" style="padding-top:3px;padding-bottom:3px">
+               {--ADMIN_CONFIG_NETWORK_TYPE_MIN_PAYMENT--}<br />
+               <input type="text" class="form_normal" name="network_min_payment" size="5" maxlength="20" value="$content[network_min_payment]" />
+       </div>
+       <div class="bottom" style="padding-top:3px;padding-bottom:3px">
+               {--ADMIN_CONFIG_NETWORK_TYPE_ALLOW_EROTIC--}<br />
+               <input type="text" class="form_normal" name="network_allow_erotic" size="5" maxlength="20" value="$content[network_allow_erotic]" />
+       </div>
+       <div class="table_footer">
+               <input type="hidden" name="network_data_id" value="$content[network_data_id]" />
+               <input type="submit" class="form_submit" name="ok" value="{--ADMIN_EDIT_CONFIG_NETWORK_TYPE_FORM_SUBMIT--}" />
+       </div>
+</form>
+</div>
+
+<div class="notice">
+       {--ADMIN_EDIT_CONFIG_NETWORK_TYPE_FORM_NOTE--}
+</div>
index b02ea92df8ec85a1adef03a943152658bbce019f..ed2180cecdf7b78b5924e68ca9a644313acada52 100644 (file)
@@ -6,7 +6,7 @@
 <tr>
        <td class="{%template,ColorSwitch%}" align="right">{--ADMIN_PAYMENT_TIME--}:</td>
        <td class="{%template,ColorSwitch%}">
-               <input type="text" class="form_field" name="time[$content[id]]" value="$content[time]" size="3" maxlength="5" />{--_SECONDS--}
+               <input type="text" class="form_field" name="time[$content[id]]" value="$content[time]" size="3" maxlength="5" />{--TIME_UNIT_SECOND--}
        </td>
 </tr>
 <tr>
index fec54b23842e4487c3c845fc20825aafe2f9c4cc..3ddced75def626bf6164afc30218b2ebd49cb74d 100644 (file)
@@ -3,7 +3,7 @@
                <input type="checkbox" class="form_field" title="{--ID_SELECT--} $content[id]" name="sel[$content[id]]" value="1" />
        </td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
-               $content[time] {--_SECONDS--}
+               $content[time] {--TIME_UNIT_SECOND--}
        </td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
                {%pipe,translateComma=$content[payment]%}
index c6f49b7877591d1e1ed8095f3ea2f75e2cab8c74..844b99f157374a7818382ab5fda9451697f86719 100644 (file)
@@ -1,8 +1,8 @@
 <tr>
        <td class="{%template,ColorSwitch%} bottom right" align="center">$content[id]</td>
        <td class="{%template,ColorSwitch%} bottom right">$content[name]</td>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">$content[reload] {--_HOURS--}</td>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">$content[wait] {--_SECONDS--}</td>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">$content[reload] {--TIME_UNIT_HOUR--}</td>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">$content[wait] {--TIME_UNIT_SECOND--}</td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">{%pipe,translateComma=$content[remain]%}</td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">$content[pay] &euro;</td>
        <td class="{%template,ColorSwitch%} bottom">
index 945e30ff9ba997aad363a4681631c021aca16150..15efee514b431b1998306dc103c6a543374473cb 100644 (file)
@@ -1,8 +1,8 @@
 <tr>
        <td class="{%template,ColorSwitch%} bottom right" align="center">$content[id]</td>
        <td class="{%template,ColorSwitch%} bottom right">$content[name]</td>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">$content[reload] {--_HOURS--}</td>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">$content[wait] {--_SECONDS--}</td>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">$content[reload] {--TIME_UNIT_HOUR--}</td>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">$content[wait] {--TIME_UNIT_SECOND--}</td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">{%pipe,translateComma=$content[remain]%}</td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">$content[pay] &euro;</td>
        <td class="{%template,ColorSwitch%} bottom" align="center" style="padding-left:1px;padding-right:1px;padding-top:2px;padding-bottom:2px">
index 07b87f6bf6df073436a081996b17a31d3b832e55..80c94a2f603b64af26859c5cdfc9c30f8d684680 100644 (file)
@@ -31,7 +31,7 @@
 <tr>
        <td align="right" style="padding-right:5px">{--ENTER_SECONDS--}:</td>
        <td>
-               <input type="text" class="form_field" name="seconds" size="4" maxlength="5" value="$content[wait]" /> {--_SECONDS--}
+               <input type="text" class="form_field" name="seconds" size="4" maxlength="5" value="$content[wait]" /> {--TIME_UNIT_SECOND--}
        </td>
 </tr>
 <tr>
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 (file)
index 0000000..3c35f37
--- /dev/null
@@ -0,0 +1,35 @@
+<div align="center">
+<form accept-charset="UTF-8" action="{%url=modules.php%}" method="get">
+<div class="dashed">
+       <div class="table_header bottom">
+               <strong>{%message,ADMIN_SHOW_CONFIG_NETWORK_TYPE_TITLE=$content[network_type_handle]%}</strong>
+       </div>
+       <div>
+               {--ADMIN_CONFIG_NETWORK_TYPE_MAX_RELOAD_TIME--} ({--TIME_UNIT--})<br />
+               <strong>{%pipe,createFancyTime=$content[network_max_reload_time]%} ({%pipe,translateTimeUnit=$content[network_reload_time_unit]%})</strong>
+       </div>
+       <div>
+               {--ADMIN_CONFIG_NETWORK_TYPE_MIN_WAITING_TIME--}<br />
+               <strong>{%pipe,translateComma=$content[network_min_waiting_time]%}</strong>
+       </div>
+       <div>
+               {--ADMIN_CONFIG_NETWORK_TYPE_MIN_REMAIN_CLICKS--}<br />
+               <strong>{%pipe,translateComma=$content[network_min_remain_clicks]%}</strong>
+       </div>
+       <div>
+               {--ADMIN_CONFIG_NETWORK_TYPE_MIN_PAYMENT--}<br />
+               <strong>{%pipe,translateComma=$content[network_min_payment]%}</strong>
+       </div>
+       <div class="bottom">
+               {--ADMIN_CONFIG_NETWORK_TYPE_ALLOW_EROTIC--}<br />
+               <strong>{%pipe,fixEmptyContentToDashes=$content[network_allow_erotic]%}</strong>
+       </div>
+       <div class="table_footer">
+               <input type="hidden" name="module" value="admin" />
+               <input type="hidden" name="what" value="config_network_types" />
+               <input type="hidden" name="network_id" value="$content[network_id]" />
+               <input type="hidden" name="network_type_id" value="$content[network_type_id]" />
+               <input type="submit" class="form_submit" value="{--ADMIN_EDIT_CONFIG_NETWORK_TYPE_SUBMIT--}" />
+       </div>
+</form>
+</div>
index 2e918eeb618c22181c0c7a9e2624cf248ba35692..40e648b7f951e4166a36e1b7c261bd1f5dbf9401 100644 (file)
@@ -3,9 +3,9 @@
 </div>
 <div>
        {--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--}
 </div>
 <div>
        {--MEMBER_LAST_TIME_LOCK--}: $content[timestamp]