From fbc924b41ebc7af982dda4f2e8b2968555663660 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 29 Jun 2010 22:49:30 +0000 Subject: [PATCH] Even more fixes for surfbar, EL rewrites --- inc/extensions/ext-surfbar.php | 6 ++++++ inc/template-functions.php | 2 -- templates/de/html/guest/guest_doubler.tpl | 4 ++-- templates/de/html/install/install_fatal_errors.tpl | 2 +- templates/de/html/install/install_page1.tpl | 2 +- templates/de/html/install/install_page2.tpl | 4 ++-- templates/de/html/install/install_page3.tpl | 2 +- templates/de/html/install/install_page5.tpl | 2 +- templates/de/html/js/js_surfbar_stopped.tpl | 6 +++--- templates/de/html/surfbar/surfbar_stopped.tpl | 4 ++-- 10 files changed, 19 insertions(+), 15 deletions(-) diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php index b9ac1fc7b6..a10e786b29 100644 --- a/inc/extensions/ext-surfbar.php +++ b/inc/extensions/ext-surfbar.php @@ -194,6 +194,9 @@ UNIQUE KEY `status_action` (`actions_status`,`actions_action`) addAdminMenuSql('surfbar','config_surfbar','Einstellungen','Einstellungen an der Surfbar ändern, wie Festvergütung, prozentuale Ref-Vergütung und vieles mehr.',4); addAdminMenuSql('surfbar','surfbar_stats','Statistiken','Detailierte Statistiken zu einer ausgewählten URL anzeigen.',5); addAdminMenuSql('surfbar','list_surfbar_actions','Mitgliederaktionen','Listet alle Mitgliederaktionen auf.',6); + + // Register module + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg` (`module`,`locked`,`hidden`,`admin_only`,`mem_only`) VALUES('surfbar','Y','Y','N','N')"); break; case 'remove': // Do stuff when removing extension @@ -205,6 +208,9 @@ UNIQUE KEY `status_action` (`actions_status`,`actions_action`) addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_surfbar_urls`'); addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='surfbar'"); addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='surfbar'"); + + // Unregister module + addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='surfbar' LIMIT 1"); break; case 'activate': // Do stuff when admin activates this extension diff --git a/inc/template-functions.php b/inc/template-functions.php index c3ecb57834..768cf677c4 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -351,8 +351,6 @@ function loadTemplate ($template, $return = false, $content = array()) {
{--TEMPLATE_CONTENT--} 
' . print_r($content, true) . '
- {--TEMPLATE_DATA--} - 
' . print_r($DATA, true) . '
'; } else { // No file! diff --git a/templates/de/html/guest/guest_doubler.tpl b/templates/de/html/guest/guest_doubler.tpl index de737c5e17..4c4e70f77b 100644 --- a/templates/de/html/guest/guest_doubler.tpl +++ b/templates/de/html/guest/guest_doubler.tpl @@ -21,7 +21,7 @@
  • {--DOUBLER_REFERAL_LINK--}
  • {--DOUBLER_TIMEOUT_1--} {%config,createFancyTime=doubler_timeout%} {--DOUBLER_TIMEOUT_2--}
  • {--DOUBLER_HAVE_FUN--}
    • -
  • {--DOUBLER_WANNA_TRY--}
    • +
  • {--DOUBLER_WANNA_TRY--}
    • @@ -32,7 +32,7 @@ diff --git a/templates/de/html/install/install_fatal_errors.tpl b/templates/de/html/install/install_fatal_errors.tpl index 0203ed7335..3d91e82820 100644 --- a/templates/de/html/install/install_fatal_errors.tpl +++ b/templates/de/html/install/install_fatal_errors.tpl @@ -1,4 +1,4 @@ -
    +
    diff --git a/templates/de/html/install/install_page1.tpl b/templates/de/html/install/install_page1.tpl index fbf144edea..78e26d2f63 100644 --- a/templates/de/html/install/install_page1.tpl +++ b/templates/de/html/install/install_page1.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/install/install_page2.tpl b/templates/de/html/install/install_page2.tpl index 9ca1743d55..0a4f2c2e79 100644 --- a/templates/de/html/install/install_page2.tpl +++ b/templates/de/html/install/install_page2.tpl @@ -1,5 +1,5 @@
    - +
    @@ -68,4 +68,4 @@
    -
    \ No newline at end of file + diff --git a/templates/de/html/install/install_page3.tpl b/templates/de/html/install/install_page3.tpl index 8f9d5384ec..a9d7793d9b 100644 --- a/templates/de/html/install/install_page3.tpl +++ b/templates/de/html/install/install_page3.tpl @@ -1,4 +1,4 @@ -
    +
    diff --git a/templates/de/html/install/install_page5.tpl b/templates/de/html/install/install_page5.tpl index 0065b2525d..9b2880d596 100644 --- a/templates/de/html/install/install_page5.tpl +++ b/templates/de/html/install/install_page5.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/js/js_surfbar_stopped.tpl b/templates/de/html/js/js_surfbar_stopped.tpl index 5bd1175d84..800e246c1b 100644 --- a/templates/de/html/js/js_surfbar_stopped.tpl +++ b/templates/de/html/js/js_surfbar_stopped.tpl @@ -1,5 +1,5 @@ var interval = null; -var countDown = "{%pipe,getRequestParameter,bigintval=restart%}"; +var countDown = "{?surfbar_restart_time?}"; var timer = document.getElementById("surfbar_counter"); var buttonDiv = document.getElementById("surfbar_button"); @@ -8,7 +8,7 @@ function restart () { } function showButton () { - buttonDiv.innerHTML = ""; + buttonDiv.innerHTML = "
    "; } function counter () { @@ -27,7 +27,7 @@ function counter () { function init () { interval = window.setInterval("counter()", 1000); - timer.innerHTML = "$content[restart]"; + timer.innerHTML = "{?surfbar_restart_time?}"; } window.setTimeout("init()", 500); diff --git a/templates/de/html/surfbar/surfbar_stopped.tpl b/templates/de/html/surfbar/surfbar_stopped.tpl index 74c27aa545..199a1443d6 100644 --- a/templates/de/html/surfbar/surfbar_stopped.tpl +++ b/templates/de/html/surfbar/surfbar_stopped.tpl @@ -6,10 +6,10 @@
    Keine URLs mehr verfügbar oder Datenbankfehler liegt vor.
    - Neustart in $content[start] Sekunden + Neustart in $content[start] Sekunden
    - -- 2.39.5