From ddba3ed27ba0836305f98763f3a8b0255218486e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 13 Oct 2008 17:16:38 +0000 Subject: [PATCH] More template fixes --- inc/databases.php | 2 +- inc/extensions/ext-surfbar.php | 1 + inc/language/surfbar_de.php | 2 ++ inc/mails/birthday_mails.php | 2 +- inc/modules/admin/what-list_surfbar_actions.php | 4 +++- inc/modules/admin/what-unlock_surfbar_urls.php | 8 ++++---- .../de/emails/member/member_birthday_confirm.tpl | 2 +- templates/de/html/admin/admin_add_sponsor.tpl | 12 ++++++------ .../de/html/admin/admin_list_surfbar_actions.tpl | 4 ++-- .../de/html/admin/admin_list_surfbar_actions_row.tpl | 4 ++-- .../de/html/admin/admin_unlock_surfbar_urls.tpl | 9 +++++---- .../de/html/admin/admin_unlock_surfbar_urls_row.tpl | 5 ++++- templates/de/html/guest/guest_sponsor_reg.tpl | 12 ++++++------ templates/de/html/sponsor/sponsor_settings_form.tpl | 12 ++++++------ 14 files changed, 44 insertions(+), 35 deletions(-) diff --git a/inc/databases.php b/inc/databases.php index c0b063e836..4ed7bc1b29 100644 --- 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 f289d5f079..f5e8466ac1 100644 --- 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 d056fc3c0f..2690cff77b 100644 --- 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', "Hinweise: Sie sollten zur Sicherheit Ihres {!MT_WORD2!} den neuen Status nie auf {--SURFBAR_URL_STATUS_ACTIVE--} z.B. bei der Mitgliedaktion {--MEMBER_SURFBAR_ACTION_UNPAUSE_SUBMIT--} 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 c4dab04700..ca8ac52414 100644 --- 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 c3fb242a1f..e431db9087 100644 --- 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 879e9ab93b..e6ea703afc 100644 --- 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 7e9c088940..498b20e0b9 100644 --- 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 ad4e80229a..c6b2aa7544 100644 --- a/templates/de/html/admin/admin_add_sponsor.tpl +++ b/templates/de/html/admin/admin_add_sponsor.tpl @@ -257,12 +257,12 @@   diff --git a/templates/de/html/admin/admin_list_surfbar_actions.tpl b/templates/de/html/admin/admin_list_surfbar_actions.tpl index 35df65b0f0..a242b226af 100644 --- a/templates/de/html/admin/admin_list_surfbar_actions.tpl +++ b/templates/de/html/admin/admin_list_surfbar_actions.tpl @@ -10,10 +10,10 @@ {--ID_SELECT--} - {--ADMIN_SURFBAR_MEMBER_ACTION--} + {--ADMIN_SURFBAR_CURRENT_STATUS--} - {--ADMIN_SURFBAR_CURRENT_STATUS--} + {--ADMIN_SURFBAR_MEMBER_ACTION--} {--ADMIN_SURFBAR_NEW_STATUS--} 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 08d8e58a80..5eca3a2ae6 100644 --- 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 @@ - $content[action] + $content[status] - $content[status] + $content[action] $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 f1f99f3831..5425675099 100644 --- a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl @@ -1,19 +1,20 @@
- +
- + $content - + diff --git a/templates/de/html/sponsor/sponsor_settings_form.tpl b/templates/de/html/sponsor/sponsor_settings_form.tpl index dc25f9a73b..46fe4925f7 100644 --- a/templates/de/html/sponsor/sponsor_settings_form.tpl +++ b/templates/de/html/sponsor/sponsor_settings_form.tpl @@ -22,12 +22,12 @@ -- 2.30.2
- {--EDIT_DEL_REFDEPTH--} + + {--ADMIN_UNLOCK_SURFBAR_URLS_TITLE--}
{--ID_SELECT--} {--_UID--}{--ADMIN_SURFBAR_URL--} {--ADMIN_TEST_URL--} {--ADMIN_SURFBAR_REGISTERED--}
+ 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 902a835842..516e5409e9 100644 --- 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] - {--ADMIN_TEST_URL--} + $content[url] + + {--ADMIN_TEST_URL--} $content[registered] diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl index 5b4d712014..80dcde7ff8 100644 --- a/templates/de/html/guest/guest_sponsor_reg.tpl +++ b/templates/de/html/guest/guest_sponsor_reg.tpl @@ -286,12 +286,12 @@