Even more fixes for surfbar, EL rewrites

diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php
index b9ac1fc7b6791fd204ca7bd95fac40672c9d581a..a10e786b29ba99c66b57501bf41ff41bf6b226f5 100644 (file)
--- 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 c3ecb5783475fc6dfed2e6db3b071e9bc7685d59..768cf677c45cb627d5372797c3281dc2222a60fd 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -351,8 +351,6 @@ function loadTemplate ($template, $return = false, $content = array()) {
 <div class="para">
        {--TEMPLATE_CONTENT--}
        <pre>' . print_r($content, true) . '</pre>
-       {--TEMPLATE_DATA--}
-       <pre>' . print_r($DATA, true) . '</pre>
 </div>';
                } else {
                        // No file!

diff --git a/templates/de/html/guest/guest_doubler.tpl b/templates/de/html/guest/guest_doubler.tpl
index de737c5e17ffecdbeb27d14cea37909395e5af10..4c4e70f77b3ed53d0d6fa022349e447b77ac5a85 100644 (file)
--- a/templates/de/html/guest/guest_doubler.tpl
+++ b/templates/de/html/guest/guest_doubler.tpl
@@ -21,7 +21,7 @@
                        <li>{--DOUBLER_REFERAL_LINK--}</li>
                        <li>{--DOUBLER_TIMEOUT_1--} <strong>{%config,createFancyTime=doubler_timeout%}</strong> {--DOUBLER_TIMEOUT_2--}</li>
                        <li>{--DOUBLER_HAVE_FUN--}</li>
-                       <li><strong><a href="{?URL?}/doubler.php">{--DOUBLER_WANNA_TRY--}</a></strong></li>
+                       <li><strong><a href="{%url=doubler.php%}">{--DOUBLER_WANNA_TRY--}</a></strong></li>
                        </ul>
                </td>
        </tr>
@@ -32,7 +32,7 @@
        <tr>
                <td class="doubler_main" style="padding-left: 0px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
                        <ul>
-                       <li>{--DOUBLER_NOT_YET_REGISTERED--} <a href="{?URL?}/ref.php?refid={%pipe,determineReferalId%}">{--DOUBLER_REGISTER_NOW--}</a></li>
+                       <li>{--DOUBLER_NOT_YET_REGISTERED--} <a href="{%url=ref.php?refid={%pipe,determineReferalId%}%}">{--DOUBLER_REGISTER_NOW--}</a></li>
                        <li>{--DOUBLER_YOUR_ADVERTISING_HERE--} <a href="{%url=modules.php?module=index&amp;what=impressum&amp;refid={%pipe,determineReferalId%}%}">{--DOUBLER_CONTACT_US--}</a></li>
                        </ul>
                </td>

diff --git a/templates/de/html/install/install_fatal_errors.tpl b/templates/de/html/install/install_fatal_errors.tpl
index 0203ed7335808c065f5a552995836308c5911621..3d91e8282050cedfb08fff5b0aa9581f9fed5698 100644 (file)
--- a/templates/de/html/install/install_fatal_errors.tpl
+++ b/templates/de/html/install/install_fatal_errors.tpl
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/install.php?page=2" method="post">
+<form accept-charset="utf-8" action="{%url=install.php?page=2%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="install_main">
 <tr>
   <td align="center">

diff --git a/templates/de/html/install/install_page1.tpl b/templates/de/html/install/install_page1.tpl
index fbf144edea8d1375a49a1c628610b5bc30e4acd2..78e26d2f6300c85ab5b68e31d0e8458d78fa4f18 100644 (file)
--- a/templates/de/html/install/install_page1.tpl
+++ b/templates/de/html/install/install_page1.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/install.php?page=2" method="post" target="_self">
+<form accept-charset="utf-8" action="{%url=install.php?page=2%}" method="post" target="_self">
 <table border="0" cellspacing="0" cellpadding="0" class="install_main">
        <tr>
                <td colspan="2" align="center">

diff --git a/templates/de/html/install/install_page2.tpl b/templates/de/html/install/install_page2.tpl
index 9ca1743d558c693e77f64b053e57964114f77718..0a4f2c2e79eef7c214db5039cb77e781a6d26567 100644 (file)
--- a/templates/de/html/install/install_page2.tpl
+++ b/templates/de/html/install/install_page2.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/install.php?page=3" method="post" target="_self">
+<form accept-charset="utf-8" action="{%url=install.php?page=3%}" method="post" target="_self">
 <table border="0" cellspacing="0" cellpadding="0" class="install_table">
        <tr>
                <td colspan="2" align="center" class="install_title">
@@ -68,4 +68,4 @@
        </tr>
 </table>
 </form>
-</div>
\ No newline at end of file
+</div>

diff --git a/templates/de/html/install/install_page3.tpl b/templates/de/html/install/install_page3.tpl
index 8f9d5384ec912572fbbc382605d9666ed14846f4..a9d7793d9ba1fcea4e3ef873807a5a3cddfa001d 100644 (file)
--- a/templates/de/html/install/install_page3.tpl
+++ b/templates/de/html/install/install_page3.tpl
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/install.php?page=5" method="post" target="_self">
+<form accept-charset="utf-8" action="{%url=install.php?page=5%}" method="post" target="_self">
 <table border="0" cellspacing="0" cellpadding="0" class="install_table">
        <tr>
                <td colspan="2" align="center">

diff --git a/templates/de/html/install/install_page5.tpl b/templates/de/html/install/install_page5.tpl
index 0065b2525d4106e0a62d1d37dba8fe92b62caa9f..9b2880d59651426e836bf6d66413a53800b0ba20 100644 (file)
--- a/templates/de/html/install/install_page5.tpl
+++ b/templates/de/html/install/install_page5.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/install.php?page=finalize" method="POST" target="_self">
+<form accept-charset="utf-8" action="{%url=install.php?page=finalize%}" method="POST" target="_self">
 <table border="0" cellspacing="0" cellpadding="0" class="install_main">
 <tr>
        <td colspan="2" align="center">

diff --git a/templates/de/html/js/js_surfbar_stopped.tpl b/templates/de/html/js/js_surfbar_stopped.tpl
index 5bd1175d84c0fdac904ec6d006ee093abd008616..800e246c1ba66c09dd52cfa6eda8ec1c2cc70b60 100644 (file)
--- 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 = "<form accept-charset='utf-8' action='{?URL?}/surfbar.php' target='_self' method='GET'><input type='hidden' name='frame' value='top' /><input type='submit' id='member_submit' value='Surfbar erneut starten' /></form>";
+       buttonDiv.innerHTML = "<form accept-charset='utf-8' action='{%url=surfbar.php%}' target='_self' method='GET'><input type='hidden' name='frame' value='top' /><input type='submit' id='member_submit' value='Surfbar erneut starten' /></form>";
 }
 
 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 74c27aa5452456303b0ad754340a19e105d0f4d7..199a1443d67c53935d2e66a23cdca13a0064c77b 100644 (file)
--- a/templates/de/html/surfbar/surfbar_stopped.tpl
+++ b/templates/de/html/surfbar/surfbar_stopped.tpl
@@ -6,10 +6,10 @@
 
                <div id="surfbar_button">
                        Keine URLs mehr verf&uuml;gbar oder Datenbankfehler liegt vor.<br />
-                       Neustart in <span class="surfbar_counter">$content[start]</span> Sekunden
+                       Neustart in <span id="surfbar_counter" class="surfbar_counter">$content[start]</span> Sekunden
                </div>
        </div>
 </div>
 
-<script src="{%url=js.php?js=surfbar_stopped%}{%ext,version=surfbar%}&amp;restart={?surfbar_restart_time?}&amp;autostart=$content[autostart]"
+<script src="{%url=js.php?js=surfbar_stopped%}{%ext,version=surfbar%}&amp;autostart=$content[autostart]"
  type="text/javascript"></script>