More template fixes

diff --git a/inc/databases.php b/inc/databases.php
index c0b063e836457c7d9aa0e3001a668387dd21bd36..4ed7bc1b29804ca2c9f3e6ce5729dc8000949886 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -113,7 +113,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_SVN_REVISION', "512");
+define('CURR_SVN_REVISION', "513");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php
index f289d5f079dde4b7901d022d860529593acb62d2..f5e8466ac1e29e9a30ecdbbc6190396f5b12d879 100644 (file)
--- a/inc/extensions/ext-surfbar.php
+++ b/inc/extensions/ext-surfbar.php
@@ -121,6 +121,7 @@ INDEX (`status`)
        // Member actions
        $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('PENDING','RETREAT','DELETED')";
        $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('PENDING','FRAMETEST',NULL)";
+       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('PENDING','EDIT',NULL)";
        $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('ACTIVE','EDIT','PENDING')";
        $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('ACTIVE','DELETE','DELETED')";
        $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('ACTIVE','PAUSE','STOPPED')";

diff --git a/inc/language/surfbar_de.php b/inc/language/surfbar_de.php
index d056fc3c0fa921d3362b913ee136d7efe9572c9b..2690cff77bb23f98cd00609aa85067d4171344e8 100644 (file)
--- a/inc/language/surfbar_de.php
+++ b/inc/language/surfbar_de.php
@@ -110,8 +110,10 @@ define('ADMIN_SURFBAR_CURRENT_STATUS', "Aktueller Status");
 define('ADMIN_SURFBAR_NEW_STATUS', "Neuer Status");
 define('ADMIN_SURFBAR_EDIT_ACTIONS', "Mitgliedsaktionen editieren");
 define('ADMIN_LIST_SURFBAR_ACTIONS_NOTE', "<strong>Hinweise:</strong> Sie sollten zur Sicherheit Ihres {!MT_WORD2!} den neuen Status nie auf <u>{--SURFBAR_URL_STATUS_ACTIVE--}</u> z.B. bei der Mitgliedaktion <u>{--MEMBER_SURFBAR_ACTION_UNPAUSE_SUBMIT--}</u> einstellen.");
+define('ADMIN_SURFBAR_URL', "Gebuchte URL");
 
 // Admin titles
+define('ADMIN_UNLOCK_SURFBAR_URLS_TITLE', "Surfbar - URLs freihschalten/ablehnen");
 define('ADMIN_SURFBAR_LIST_URLS_TITLE', "Surfbar - URLs aufisten");
 define('ADMIN_SURFBAR_DELETE_URLS_TITLE', "Surfbar - URLs entfernen");
 define('ADMIN_SURFBAR_EDIT_URLS_TITLE', "Surfbar - URLs editieren");

diff --git a/inc/mails/birthday_mails.php b/inc/mails/birthday_mails.php
index c4dab04700104eea6215fbdf820e5e07286858fa..ca8ac5241476cef9bda411007593917a24f076b5 100644 (file)
--- a/inc/mails/birthday_mails.php
+++ b/inc/mails/birthday_mails.php
@@ -76,7 +76,7 @@ if (SQL_NUMROWS($result_birthday) > 0) {
                        // Prepare array for loading template
                        $content = array(
                                'age'    => $AGE,
-                               'points' => $_CONFIG['birthday_points'],
+                               'points' => TRANSLATE_COMMA($_CONFIG['birthday_points']),
                                'check'  => "",
                        );
 

diff --git a/inc/modules/admin/what-list_surfbar_actions.php b/inc/modules/admin/what-list_surfbar_actions.php
index c3fb242a1fb63a9e3131d1cdd4e2540c187959ab..e431db90876c3b2aee3c01c8beb08741e87f648f 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_actions.php
+++ b/inc/modules/admin/what-list_surfbar_actions.php
@@ -41,7 +41,9 @@ if ((!defined('__SECURITY')) || (!is_admin())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load all actions
-$result = SQL_QUERY("SELECT  id, status, action, new_status FROM "._MYSQL_PREFIX."_surfbar_actions ORDER BY id ASC", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT `id`, `status`, `action`, `new_status`
+FROM `"._MYSQL_PREFIX."_surfbar_actions`
+ORDER BY `status` ASC, `action` ASC", __FILE__, __LINE__);
 
 // Entries found?
 if (SQL_NUMROWS($result) > 0) {

diff --git a/inc/modules/admin/what-unlock_surfbar_urls.php b/inc/modules/admin/what-unlock_surfbar_urls.php
index 879e9ab93b21c3f70c86b340799b73ec489e440d..e6ea703afce88cc908e5693ff0c8ea421555a3a3 100644 (file)
--- a/inc/modules/admin/what-unlock_surfbar_urls.php
+++ b/inc/modules/admin/what-unlock_surfbar_urls.php
@@ -73,10 +73,10 @@ if (SQL_NUMROWS($result) > 0) {
        $OUT = ""; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
                // "Translate"/add content
-               $content['sw']         = $SW;
-               $content['userid']     = ADMIN_USER_PROFILE_LINK($content['userid']);
-               $content['url']        = FRAMETESTER($content['url']);
-               $content['registered'] = MAKE_DATETIME($content['registered'], 2);
+               $content['sw']          = $SW;
+               $content['userid']      = ADMIN_USER_PROFILE_LINK($content['userid']);
+               $content['framekiller'] = FRAMETESTER($content['url']);
+               $content['registered']  = MAKE_DATETIME($content['registered'], 2);
 
                // Load row template
                $OUT .= LOAD_TEMPLATE("admin_unlock_surfbar_urls_row", true, $content);

diff --git a/templates/de/emails/member/member_birthday_confirm.tpl b/templates/de/emails/member/member_birthday_confirm.tpl
index 7e9c08894036148434c32a39191c2db6f543eda0..498b20e0b9b6540b33b147a3277b06efd694afd7 100644 (file)
--- a/templates/de/emails/member/member_birthday_confirm.tpl
+++ b/templates/de/emails/member/member_birthday_confirm.tpl
@@ -2,7 +2,7 @@ Hallo $content[gender] $content[surname] $content[family],
 
 Wir das Team von {!MAIN_TITLE!} wuenschen Ihnen alles Gute und Gesundheit zu Ihrem $content[age]. Geburtstag!
 
-Wenn Sie den folgenden Link anklicken, erhalten Sie $config[points] {!POINTS!} Ihrem Account sofort gutgeschrieben!
+Wenn Sie den folgenden Link anklicken, erhalten Sie $content[points] {!POINTS!} Ihrem Account sofort gutgeschrieben!
 
 ----------------------------------------------------------------------
 {!URL!}/birthday_confirm.php?uid=$UID&check=$content[check]

diff --git a/templates/de/html/admin/admin_add_sponsor.tpl b/templates/de/html/admin/admin_add_sponsor.tpl
index ad4e80229a5d01d394cc44ec75218458d86c0499..c6b2aa7544b7c731dd62e14c66fec89574de8491 100644 (file)
--- a/templates/de/html/admin/admin_add_sponsor.tpl
+++ b/templates/de/html/admin/admin_add_sponsor.tpl
@@ -257,12 +257,12 @@
   <TD>
     <SELECT name="warning_interval" class="admin_select" size="1">
       <OPTION value="0">{--SELECT_NONE--}</OPTION>
-      <OPTION value="{--(ONE_DAY*1)--}">1 {--DAYS--}</OPTION>
-      <OPTION value="{--(ONE_DAY*3)--}">3 {--DAYS--}</OPTION>
-      <OPTION value="{--(ONE_DAY*7)--}" selected>1 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--(ONE_DAY*14)--}">2 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--(ONE_DAY*28)--}">4 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--(ONE_DAY*56)--}">8 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*1)--}">1 {--DAYS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*3)--}">3 {--DAYS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*7)--}" selected>1 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*14)--}">2 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*28)--}">4 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*56)--}">8 {--LIFE_WEEKS--}</OPTION>
     </SELECT>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>

diff --git a/templates/de/html/admin/admin_list_surfbar_actions.tpl b/templates/de/html/admin/admin_list_surfbar_actions.tpl
index 35df65b0f0e87d09661448819c4d84402184622c..a242b226afb999fa3ef8182f9aadb00a7054124b 100644 (file)
--- a/templates/de/html/admin/admin_list_surfbar_actions.tpl
+++ b/templates/de/html/admin/admin_list_surfbar_actions.tpl
@@ -10,10 +10,10 @@
                <strong>{--ID_SELECT--}</strong>
        </td>
        <td align="center" class="admin_header bottom2 right2 switch_sw$content[sw]">
-               <strong>{--ADMIN_SURFBAR_MEMBER_ACTION--}</strong>
+               <strong>{--ADMIN_SURFBAR_CURRENT_STATUS--}</strong>
        </td>
        <td align="center" class="admin_header bottom2 right2 switch_sw$content[sw]">
-               <strong>{--ADMIN_SURFBAR_CURRENT_STATUS--}</strong>
+               <strong>{--ADMIN_SURFBAR_MEMBER_ACTION--}</strong>
        </td>
        <td align="center" class="admin_header bottom2 switch_sw$content[sw]">
                <strong>{--ADMIN_SURFBAR_NEW_STATUS--}</strong>

diff --git a/templates/de/html/admin/admin_list_surfbar_actions_row.tpl b/templates/de/html/admin/admin_list_surfbar_actions_row.tpl
index 08d8e58a802e0ea68181861b0221242e624381b7..5eca3a2ae6ef0eecaa430107119cee0a7258fa4b 100644 (file)
--- a/templates/de/html/admin/admin_list_surfbar_actions_row.tpl
+++ b/templates/de/html/admin/admin_list_surfbar_actions_row.tpl
@@ -3,10 +3,10 @@
                <input type="checkbox" name="id[$content[id]]" value="1" class="admin_normal" />
        </td>
        <td align="center" class="bottom2 right2 switch_sw$content[sw]">
-               $content[action]
+               $content[status]
        </td>
        <td align="center" class="bottom2 right2 switch_sw$content[sw]">
-               $content[status]
+               $content[action]
        </td>
        <td align="center" class="bottom2 switch_sw$content[sw]">
                $content[new_status]

diff --git a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl
index f1f99f3831412bdd57660f7587e8de5e9364f97c..54256750996141cc41fc7d14037fbaeb93ef4ab5 100644 (file)
--- a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl
+++ b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl
@@ -1,19 +1,20 @@
 <FORM action="{!URL!}/modules.php?module=admin&amp;what=unlock_surfbar_urls" method="POST">
-<TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
+<TABLE border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="600">
 <TR>
-       <TD align="center" colspan="4" class="admin_title" height="30">
-               <STRONG>{--EDIT_DEL_REFDEPTH--}</STRONG>
+       <TD align="center" colspan="5" class="admin_title" height="30">
+               <STRONG>{--ADMIN_UNLOCK_SURFBAR_URLS_TITLE--}</STRONG>
        </TD>
 </TR>
 <TR>
        <TD class="admin_title bottom2 right2" align="center"><STRONG>{--ID_SELECT--}</STRONG></TD>
        <TD class="admin_title bottom2 right2" align="center"><STRONG>{--_UID--}</STRONG></TD>
+       <TD class="admin_title bottom2 right2" align="center"><STRONG>{--ADMIN_SURFBAR_URL--}</STRONG></TD>
        <TD class="admin_title bottom2 right2" align="center"><STRONG>{--ADMIN_TEST_URL--}</STRONG></TD>
        <TD class="admin_title bottom2" align="center"><STRONG>{--ADMIN_SURFBAR_REGISTERED--}</STRONG></TD>
 </TR>
 $content
 <TR>
-       <TD class="admin_footer" colspan="4">
+       <TD class="admin_footer" colspan="5">
                <INPUT type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />
                <INPUT type="submit" name="reject" class="admin_submit" value="{--ADMIN_SURFBAR_REJECT_URL--}" />
                <INPUT type="submit" name="unlock" class="admin_submit" value="{--ADMIN_SURFBAR_CONFIRM_URL--}" />

diff --git a/templates/de/html/admin/admin_unlock_surfbar_urls_row.tpl b/templates/de/html/admin/admin_unlock_surfbar_urls_row.tpl
index 902a835842cbd37c0c303a5cc8d2a90358fbc751..516e5409e9e957df11228051d0d52e6c6b54b75e 100644 (file)
--- a/templates/de/html/admin/admin_unlock_surfbar_urls_row.tpl
+++ b/templates/de/html/admin/admin_unlock_surfbar_urls_row.tpl
@@ -6,7 +6,10 @@
                $content[userid]
        </TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]">
-               <a href="$content[url]" target="_blank" title="{--ADMIN_TEST_URL--}">{--ADMIN_TEST_URL--}</a>
+               $content[url]
+       </TD>
+       <TD align="center" class="bottom2 right2 switch_sw$content[sw]">
+               <a href="$content[framekiller]" target="_blank" title="{--ADMIN_TEST_URL--}">{--ADMIN_TEST_URL--}</a>
        </TD>
        <TD align="center" class="bottom2 switch_sw$content[sw]">
                $content[registered]

diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl
index 5b4d712014dd52ee70ae9be35d5518e967477b40..80dcde7ff8c0e981aa2920e53de0afe2e09cdd7d 100644 (file)
--- a/templates/de/html/guest/guest_sponsor_reg.tpl
+++ b/templates/de/html/guest/guest_sponsor_reg.tpl
@@ -286,12 +286,12 @@
   <TD>
     <SELECT name="warning_interval" class="guest_select" size="1">
       <OPTION value="0">{--SELECT_NONE--}</OPTION>
-      <OPTION value="{--(ONE_DAY*1)--}">1 {--DAYS--}</OPTION>
-      <OPTION value="{--(ONE_DAY*3)--}">3 {--DAYS--}</OPTION>
-      <OPTION value="{--(ONE_DAY*7)--}" selected>1 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--(ONE_DAY*14)--}">2 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--(ONE_DAY*28)--}">4 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--(ONE_DAY*56)--}">8 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*1)--}">1 {--DAYS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*3)--}">3 {--DAYS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*7)--}" selected>1 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*14)--}">2 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*28)--}">4 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*56)--}">8 {--LIFE_WEEKS--}</OPTION>
     </SELECT>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>

diff --git a/templates/de/html/sponsor/sponsor_settings_form.tpl b/templates/de/html/sponsor/sponsor_settings_form.tpl
index dc25f9a73b829a5194c6441f506ab49c1b19fe42..46fe4925f78a4e78bdf62289a59701ec7c2ee184 100644 (file)
--- a/templates/de/html/sponsor/sponsor_settings_form.tpl
+++ b/templates/de/html/sponsor/sponsor_settings_form.tpl
@@ -22,12 +22,12 @@
   <TD class="bottom2" width="275" align="center">
     <SELECT name="warning_interval" class="guest_select" size="1">
       <OPTION value="$content[warning_interval]">{!__CURRENT!}</OPTION>
-      <OPTION value="{--(ONE_DAY*1)--}">1 {--DAYS--}</OPTION>
-      <OPTION value="{--(ONE_DAY*3)--}">3 {--DAYS--}</OPTION>
-      <OPTION value="{--(ONE_DAY*7)--}">1 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--(ONE_DAY*14)--}">2 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--(ONE_DAY*28)--}">4 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--(ONE_DAY*56)--}">8 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*1)--}">1 {--DAYS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*3)--}">3 {--DAYS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*7)--}">1 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*14)--}">2 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*28)--}">4 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG[one_day]*56)--}">8 {--LIFE_WEEKS--}</OPTION>
     </SELECT>
   </TD>
 </TR>