From: Roland Häder Date: Sat, 6 Sep 2008 17:54:21 +0000 (+0000) Subject: Counter for pending surfbar added X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c3ea029c279923888cebf39020fe152c4540fbe8;p=mailer.git Counter for pending surfbar added --- diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php index f990cb8173..7e35f3e170 100644 --- a/inc/extensions/ext-surfbar.php +++ b/inc/extensions/ext-surfbar.php @@ -113,6 +113,7 @@ PRIMARY KEY(`id`) $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_notify_admin_unlock` ENUM('N','Y') NOT NULL DEFAULT 'N'"; $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_dynamic_percent` FLOAT(10,5) UNSIGNED NOT NULL DEFAULT '10.00000'"; $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_max_order` INT(7) UNSIGNED NOT NULL DEFAULT '10'"; + $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_restart_time` BIGINT(20) UNSIGNED NOT NULL DEFAULT '".(60*61)."'"; // Member menus $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('surfbar',NULL,'Surfbar','Y','Y',5)"; diff --git a/inc/language/surfbar_de.php b/inc/language/surfbar_de.php index 423f9cd30f..efd481e015 100644 --- a/inc/language/surfbar_de.php +++ b/inc/language/surfbar_de.php @@ -49,6 +49,7 @@ define('ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_DYNAMIC', "Dynamische Werte errechnen define('ADMIN_CONFIG_SURFBAR_NOTIFY_ADMIN_UNLOCK', "Admin bei Freigabe von Mailbuchungen informieren, dass die URL in die Surfbar aufgenommen wurde?"); define('ADMIN_CONFIG_SURFBAR_DYNAMIC_PERCENT', "Prozent auf dynamische Vergütung:"); define('ADMIN_CONFIG_SURFBAR_MAX_ORDER', "Maximal durch Mitglied in Surfbar buchbare URLs:(*)"); +define('ADMIN_CONFIG_SURFBAR_RESTART_TIME', "Ruhezeit der Surfbar, wenn alle URLs in Reload-Lock sind:"); define('ADMIN_SURFBAR_NOTIFY_UNLOCK_YES', "Ja, Admin(s) informieren."); define('ADMIN_SURFBAR_NOTIFY_UNLOCK_NO', "Nein, nicht informieren."); define('ADMIN_SURFBAR_NO_REF_LEVELS_FOUND', "Zur Zeit sind keine Referal-Ebenen für die Surfbar eingestellt.
\nBitte installieren Sie die Erweiterung surfbar neu."); @@ -63,7 +64,7 @@ define('ADMIN_SURFBAR_LOCK_REASON', "Sperrgrund"); define('ADMIN_SURFBAR_EDIT_URL', "URL ändern"); define('ADMIN_SURFBAR_DEL_URL', "URL löschen"); define('ADMIN_SURFBAR_UNLOCK_URL', "URL ent-/sperren"); -define('ADMIN_CONFIG_SURFBAR_NOTE', "(*): Es sind auch die Übertragungen der URLs aus der Mailbuchung einbezogen."); +define('ADMIN_CONFIG_SURFBAR_NOTE', "(*): Es sind auch die Übertragungen der URLs aus der Mailbuchung einbezogen. Es wird empfohlen, die Ruhezeit etwas länger als die Reload-Sperre einzustellen."); // Subject lines for admins define('ADMIN_SURFBAR_NOTIFY_URL_UNLOCK_SUBJECT', "URL in Surfbar gebucht"); diff --git a/inc/modules/admin/what-config_surfbar.php b/inc/modules/admin/what-config_surfbar.php index e82ababe57..6ad36f950f 100644 --- a/inc/modules/admin/what-config_surfbar.php +++ b/inc/modules/admin/what-config_surfbar.php @@ -53,7 +53,10 @@ if (isset($_POST['ok'])) { $content = array( 'surfbar_static_reward' => TRANSLATE_COMMA($_CONFIG['surfbar_static_reward']), 'surfbar_static_costs' => TRANSLATE_COMMA($_CONFIG['surfbar_static_costs']), + // @TODO Rewrite this to tiny selection boxes 'surfbar_static_time' => $_CONFIG['surfbar_static_time'], + // @TODO Rewrite this to tiny selection boxes + 'surfbar_restart_time' => $_CONFIG['surfbar_restart_time'], 'surfbar_static_lock' => $_CONFIG['surfbar_static_lock'], 'surfbar_dynamic_percent' => TRANSLATE_COMMA($_CONFIG['surfbar_dynamic_percent']), 'surfbar_max_order' => $_CONFIG['surfbar_max_order'] diff --git a/surfbar.php b/surfbar.php index be53f0094c..f2c47234ea 100644 --- a/surfbar.php +++ b/surfbar.php @@ -72,8 +72,14 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install OUTPUT_HTML("
"); LOAD_TEMPLATE("surfbar_start_banner"); } else { + // Prepare content + $content = array( + 'restart' => $_CONFIG['surfbar_restart_time'], + 'start' => str_repeat("X", strlen($_CONFIG['surfbar_restart_time'])) + ); + // Load template for stopped surfbar - LOAD_TEMPLATE("surfbar_stopped"); + LOAD_TEMPLATE("surfbar_stopped", false, $content); } } elseif ((isset($_GET['check'])) && (isset($_GET['id'])) && (isset($_GET['salt']))) { // Dummy next id get diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl index 3b093322a0..ec4b622606 100644 --- a/templates/de/html/admin/admin_config_surfbar.tpl +++ b/templates/de/html/admin/admin_config_surfbar.tpl @@ -23,6 +23,7 @@ {!POINTS!} +   {--ADMIN_CONFIG_SURFBAR_STATIC_TIME--} @@ -58,6 +59,15 @@ +   + + + {--ADMIN_CONFIG_SURFBAR_RESTART_TIME--} + + + + +   diff --git a/templates/de/html/surfbar/surfbar_stopped.tpl b/templates/de/html/surfbar/surfbar_stopped.tpl index 4ce5779f74..9e39f077fe 100644 --- a/templates/de/html/surfbar/surfbar_stopped.tpl +++ b/templates/de/html/surfbar/surfbar_stopped.tpl @@ -4,6 +4,35 @@ Surfbar angehalten! - Keine URLs mehr verfürgbar oder Datenbankfehler liegt vor. + Keine URLs mehr verfürgbar oder Datenbankfehler liegt vor.
+ Neustart in $content[start] Sekunden + + \ No newline at end of file diff --git a/theme/business/css/surfbar.css b/theme/business/css/surfbar.css index 0b7be083d3..1f1f41db90 100644 --- a/theme/business/css/surfbar.css +++ b/theme/business/css/surfbar.css @@ -8,6 +8,8 @@ } #surfbar_counter { } +#surfbar_restart { +} #counter_word { } .surfbar_reload { diff --git a/theme/default/css/surfbar.css b/theme/default/css/surfbar.css index 0b7be083d3..a1329e5cce 100644 --- a/theme/default/css/surfbar.css +++ b/theme/default/css/surfbar.css @@ -6,6 +6,8 @@ } .surfbar_points { } +#surfbar_restart { +} #surfbar_counter { } #counter_word { diff --git a/theme/desert/css/surfbar.css b/theme/desert/css/surfbar.css index 37e270cffc..03743cee10 100644 --- a/theme/desert/css/surfbar.css +++ b/theme/desert/css/surfbar.css @@ -7,6 +7,8 @@ } .surfbar_points { } +#surfbar_restart { +} #surfbar_counter { } #counter_word {