Counter for pending surfbar added

diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php
index f990cb8173f85d555bddfbdddf84eaee17d2e731..7e35f3e1701125658c8b9cb3ab2721229e112cd3 100644 (file)
--- 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 423f9cd30f01c11627939ad88a52271449cb18f6..efd481e01508f8df7d9f8df2b544cf7b92421662 100644 (file)
--- 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&uuml;r die Surfbar eingestellt.<br />\nBitte installieren Sie die Erweiterung <strong>surfbar</strong> neu.");
@@ -63,7 +64,7 @@ define('ADMIN_SURFBAR_LOCK_REASON', "Sperrgrund");
 define('ADMIN_SURFBAR_EDIT_URL', "URL &auml;ndern");
 define('ADMIN_SURFBAR_DEL_URL', "URL l&ouml;schen");
 define('ADMIN_SURFBAR_UNLOCK_URL', "URL ent-/sperren");
-define('ADMIN_CONFIG_SURFBAR_NOTE', "(*): Es sind auch die &Uuml;bertragungen der URLs aus der Mailbuchung einbezogen.");
+define('ADMIN_CONFIG_SURFBAR_NOTE', "(*): Es sind auch die &Uuml;bertragungen der URLs aus der Mailbuchung einbezogen. Es wird empfohlen, die Ruhezeit etwas l&auml;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 e82ababe57c41d23935cdf23cf3375132ceea986..6ad36f950fdfb078e02fbb9ca6a127ac99d36612 100644 (file)
--- 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 be53f0094c9385af0045926a29685bc7acbd58ed..f2c47234eae731392fc33b08f36f6beb67442425 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -72,8 +72,14 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
                        OUTPUT_HTML("<br />");
                        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 3b093322a0eb37e28325f2abef07ff6f380a2c60..ec4b62260680a760728c1b97d9cb558aeb198b7f 100644 (file)
--- a/templates/de/html/admin/admin_config_surfbar.tpl
+++ b/templates/de/html/admin/admin_config_surfbar.tpl
@@ -23,6 +23,7 @@
                        <INPUT type="text" name="surfbar_static_costs" size="6" maxlength="20" value="$content[surfbar_static_costs]" /> {!POINTS!}
                </TD>
        </TR>
+       <TR><TD height="3" colspan="2" class="seperator">&nbsp;</TD></TR>
        <TR>
                <TD height="30" align="right" style="padding-right:5px">
                        {--ADMIN_CONFIG_SURFBAR_STATIC_TIME--}
@@ -58,6 +59,15 @@
                        <INPUT type="text" name="surfbar_max_order" size="6" maxlength="20" value="$content[surfbar_max_order]" />
                </TD>
        </TR>
+       <TR><TD height="3" colspan="2" class="seperator">&nbsp;</TD></TR>
+       <TR>
+               <TD height="30" align="right" style="padding-right:5px">
+                       {--ADMIN_CONFIG_SURFBAR_RESTART_TIME--}
+               </TD>
+               <TD>
+                       <INPUT type="text" name="surfbar_restart_time" size="6" maxlength="20" value="$content[surfbar_restart_time]" />
+               </TD>
+       </TR>
        <TR><TD height="8" colspan="2" class="seperator bottom2">&nbsp;</TD></TR>
        <TR>
                <TD align="center" colspan="2" class="admin_footer bottom2">

diff --git a/templates/de/html/surfbar/surfbar_stopped.tpl b/templates/de/html/surfbar/surfbar_stopped.tpl
index 4ce5779f74f489951b28635684b6d069db59d3c3..9e39f077fe021b30ffce62c0bedc67e9106e1bd2 100644 (file)
--- a/templates/de/html/surfbar/surfbar_stopped.tpl
+++ b/templates/de/html/surfbar/surfbar_stopped.tpl
@@ -4,6 +4,35 @@
                        <strong>Surfbar angehalten!</strong>
                </div>
 
-               Keine URLs mehr verf&uuml;rgbar oder Datenbankfehler liegt vor.
+               Keine URLs mehr verf&uuml;rgbar oder Datenbankfehler liegt vor.<br />
+               Neustart in <span id="surfbar_restart">$content[start]</span> Sekunden
        </div>
 </div>
+
+<script language="JavaScript" type="text/javascript">
+<!--
+var counter = "$content[restart]";
+var timer   = document.getElementById("surfbar_restart");
+
+function Restart() {
+       this.location.reload();
+}
+
+function Counter () {
+       if (counter == 0) {
+               Restart();
+       } else {
+               counter--;
+               timer.innerHTML = counter;
+       }
+}
+
+function Init () {
+       window.setInterval("Counter()", 1000);
+       timer.innerHTML = "$content[restart]";
+}
+
+window.setTimeout("Init()", 500);
+
+//-->
+</script>
\ No newline at end of file

diff --git a/theme/business/css/surfbar.css b/theme/business/css/surfbar.css
index 0b7be083d3e8b4551edb11b63e1e6e687e54291e..1f1f41db9097f83e27f6ac7aebf8afbc10850386 100644 (file)
--- 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 0b7be083d3e8b4551edb11b63e1e6e687e54291e..a1329e5cce6ef147f1b2316d40194044249dc640 100644 (file)
--- 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 37e270cffc1524a8147a21828c9feb195383ac43..03743cee104aca10728004b4556f5afe37382dfd 100644 (file)
--- a/theme/desert/css/surfbar.css
+++ b/theme/desert/css/surfbar.css
@@ -7,6 +7,8 @@
 }
 .surfbar_points {
 }
+#surfbar_restart {
+}
 #surfbar_counter {
 }
 #counter_word {