Even more fixes #2

diff --git a/inc/filters.php b/inc/filters.php
index e2ddb66c1d66fc33044cffb3639fcd32267cbeae..4e9356c2c89a978a48de96f6c1ccc4d812077074 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -448,7 +448,7 @@ function FILTER_COMPILE_EXTENSION ($code) {
        // Compile {%cmd=some_value%} to get extension data
        // Support cmd is:
        //   - version -> getExtensionVersion() call
        // Compile {%cmd=some_value%} to get extension data
        // Support cmd is:
        //   - version -> getExtensionVersion() call

-       preg_match_all('/\{%(([a-zA-Z0-9-_,]+)=([^%\}]+))%\}/', $code, $matches);
+       preg_match_all('/\{%(([a-zA-Z0-9-_,]+)=([^\}]+))%\}/', $code, $matches);

        //* DEBUG: */ print('<pre>'.print_r($matches, true).'</pre>');
 
        // Default is from OUTPUT_HTML
        //* DEBUG: */ print('<pre>'.print_r($matches, true).'</pre>');
 
        // Default is from OUTPUT_HTML

diff --git a/inc/functions.php b/inc/functions.php
index 7ed051a28a3d75725f660c2ee592038d659e00d6..9e3240ea54feb9c9ae6009f5765e6b80727da1ef 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -3581,7 +3581,7 @@ function determinePageTitle () {
                $pageTitle = $TITLE;
        } elseif ((isInstalled()) && (isAdminRegistered())) {
                // Installed, admin registered but no ext-sql_patches
                $pageTitle = $TITLE;
        } elseif ((isInstalled()) && (isAdminRegistered())) {
                // Installed, admin registered but no ext-sql_patches

-               $pageTitle = '[-- ' . getConfig('MAIN_TITLE').' - '.getModuleTitle(getModule()) . ' --]';
+               $pageTitle = '[-- ' . getConfig('MAIN_TITLE') . ' - ' . getModuleTitle(getModule()) . ' --]';

        } elseif ((isInstalled()) && (!isAdminRegistered())) {
                // Installed but no admin registered
                $pageTitle = sprintf(getMessage('SETUP_OF_MXCHANGE'), getConfig('MAIN_TITLE'));
        } elseif ((isInstalled()) && (!isAdminRegistered())) {
                // Installed but no admin registered
                $pageTitle = sprintf(getMessage('SETUP_OF_MXCHANGE'), getConfig('MAIN_TITLE'));


@@ -3597,7 +3597,7 @@ function determinePageTitle () {
        }
 
        // Return title
        }
 
        // Return title

-       return $pageTitle;
+       return decodeEntities($pageTitle);

 }
 
 // Checks wethere there is a cache file there. This function is cached.
 }
 
 // Checks wethere there is a cache file there. This function is cached.

diff --git a/templates/de/html/mailid/mailid_confirm_buttom.tpl b/templates/de/html/mailid/mailid_confirm_buttom.tpl
index e8a28191cd6b5de9fdaf546b9abd75cf53fe0252..829e830688809cba94c084be0d4edc622f5838bc 100644 (file)
--- a/templates/de/html/mailid/mailid_confirm_buttom.tpl
+++ b/templates/de/html/mailid/mailid_confirm_buttom.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">

-                       <form accept-charset="utf-8" action="{%url=mailid_top.php?userid=$content[userid]&amp;$content[type]=$content[data]?m?mode=add&amp;code=$content[code]%}" method="post">
+                       <form accept-charset="utf-8" action="{%url=mailid_top.php?userid=$content[userid]&amp;$content[type]=$content[data]&amp;mode=add&amp;code=$content[code]%}" method="post">

                                {--MAILID_CLICK_BUTTON--}:<br />
                                <input type="hidden" name="gfx_check" value="$content[gfx]" />
                                <input type="submit" class="member_submit" name="ok" value="{--SUBMIT_CODE--}" />
                                {--MAILID_CLICK_BUTTON--}:<br />
                                <input type="hidden" name="gfx_check" value="$content[gfx]" />
                                <input type="submit" class="member_submit" name="ok" value="{--SUBMIT_CODE--}" />

diff --git a/templates/de/html/mailid/mailid_enter_code.tpl b/templates/de/html/mailid/mailid_enter_code.tpl
index 8d73e468017619380a4ac55cc6b42c2a794f559b..d0df8ab82f3903f1b42797685874ca6fd363d513 100644 (file)
--- a/templates/de/html/mailid/mailid_enter_code.tpl
+++ b/templates/de/html/mailid/mailid_enter_code.tpl
@@ -3,7 +3,7 @@
                <td width="220" align="center">
                        <form
                                accept-charset="utf-8"
                <td width="220" align="center">
                        <form
                                accept-charset="utf-8"

-                               action="{%url=mailid_top.php?userid=$content[userid]&amp;$content[type]=$content[data]?m?mode=add&amp;code=$content[code]%}"
+                               action="{%url=mailid_top.php?userid=$content[userid]&amp;$content[type]=$content[data]&amp;mode=add&amp;code=$content[code]%}"

                                method="post">
                                        {--ENTER_CODE--}:
                                        $content[image]<br />
                                method="post">
                                        {--ENTER_CODE--}:
                                        $content[image]<br />

diff --git a/templates/de/html/mailid/mailid_timer.tpl b/templates/de/html/mailid/mailid_timer.tpl
index 164799939dc7b60d3175927b731e37ef71f568a3..d585ea915e3f9dedad3b5a973bc534442fd7d659 100644 (file)
--- a/templates/de/html/mailid/mailid_timer.tpl
+++ b/templates/de/html/mailid/mailid_timer.tpl
@@ -14,7 +14,7 @@ function StartCounter() {
        Timer--;
        document.confirm.counter.value = Timer;
        if (Timer == 0) {
        Timer--;
        document.confirm.counter.value = Timer;
        if (Timer == 0) {

-               document.location.href = '{%url,js=mailid_top.php?userid=$content[userid]&$content[type]=$content[data?mode=confirm&code=$content[rand]%}';
+               document.location.href = '{%url,js=mailid_top.php?userid=$content[userid]&$content[type]=$content[data]&mode=confirm&code=$content[rand]%}';

                clearInterval(Counter);
        }
 }
                clearInterval(Counter);
        }
 }


@@ -29,7 +29,7 @@ function StartCounter() {
                                <form accept-charset="utf-8" name="confirm" style="margin-top: 0px;margin-bottom:0px">
                                {--MEMBER_TIME_COUNTER_1--} <input type="text" name="counter"
                                        size="$content[tim2]" readonly class="member_normal"
                                <form accept-charset="utf-8" name="confirm" style="margin-top: 0px;margin-bottom:0px">
                                {--MEMBER_TIME_COUNTER_1--} <input type="text" name="counter"
                                        size="$content[tim2]" readonly class="member_normal"

-                                       value="$content[time]">&nbsp;{--_SECONDS--}
+                                       value="$content[time]"> {--_SECONDS--}

                                {--MEMBER_TIME_COUNTER_2--}</form>
                                </td>
                        </tr>
                                {--MEMBER_TIME_COUNTER_2--}</form>
                                </td>
                        </tr>