More language constants rewritten

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 03fbfae67bde258e1171b40b07427051ac61ee51..e5ecb1b7a8a507063b73b15c9d88e3e8ac6d68d0 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -448,7 +448,7 @@ function USER_DO_NEW_PASSWORD ($email, $uid) {
                }
        } else {
                // ID or email is wrong
-               LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"guest_failed\">".GUEST_WRONG_ID_EMAIL."</span>");
+               LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"guest_failed\">{!GUEST_WRONG_ID_EMAIL!}</span>");
        }
 
        // Return the error code

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index f729b1da8f2be747a38177661b185ff2fb4f0ef7..fa49f1f28ed716ba453ec47a0ea3dd0e11f7c1fe 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -778,7 +778,7 @@ function ADMIN_USER_PROFILE_LINK ($uid, $title="", $wht="list_user") {
 
        //* DEBUG: */ echo "a:".$title."<br />";
        // Return link
-       return "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$wht."&amp;u_id=".$uid."\" title=\"".ADMIN_USER_PROFILE_TITLE."\">".$title."</a>";
+       return "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$wht."&amp;u_id=".$uid."\" title=\"{!ADMIN_USER_PROFILE_TITLE!}\">".$title."</a>";
 }
 
 // Check "logical-area-mode"

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index e87f4d5606d02dd6da5c89afff5235072584c26f..301f3bc35fc7c62d16df9458558bf31baad5d2ad 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -141,7 +141,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                                if ($type == "SUPPORT_MEMBER") {
                                        $mode = substr($text, 0, strpos($text, ":"));
                                        $text = substr($text, strpos($text, ":") + 1);
-                                       $ADD = "<li>".ADMIN_TASK_SUPPORT_MODE.": <strong>".$mode."</strong></li>";
+                                       $ADD = "<li>{!ADMIN_TASK_SUPPORT_MODE!}: <strong>".$mode."</strong></li>";
                                } // END - if
 
                                if ($uid > 0) {
@@ -150,7 +150,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                                        if (SQL_NUMROWS($result_user) == 1) {
                                                list($gender, $sname, $fname, $email) = SQL_FETCHROW($result_user);
                                                SQL_FREERESULT($result_user);
-                                               $ADD = "<li>".ADMIN_MEMBER_UID.": <strong>".ADMIN_USER_PROFILE_LINK($uid)." (<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</a>)</strong></li>";
+                                               $ADD = "<li>{!ADMIN_MEMBER_UID!}: <strong>".ADMIN_USER_PROFILE_LINK($uid)." (<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</a>)</strong></li>";
                                        } // END - if
                                } // END - if
 
@@ -241,7 +241,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                                                ));
                                        } else {
                                                // Task is closed so nothing is todo
-                                               $OUT .= "<div class=\"admin_failed\">".ADMIN_EXT_ALREADY_REGISTERED."</div>\n";
+                                               $OUT .= "<div class=\"admin_failed\">{!ADMIN_EXT_ALREADY_REGISTERED!}</div>\n";
 
                                                // Close task but not already closes or deleted or update tasks
                                                if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE")) {
@@ -253,7 +253,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 
                                case "EXTENSION_UPDATE": // Extension update
                                        // Extension updates are installed automatically
-                                       $OUT .= "<div class=\"admin_failed medium\">".ADMIN_EXTENSION_UPDATED."</div>\n";
+                                       $OUT .= "<div class=\"admin_failed medium\">{!ADMIN_EXTENSION_UPDATED!}</div>\n";
 
                                        // Close task
                                        if (($status != "CLOSED") && ($status != "DELETED")) {
@@ -293,7 +293,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                                                }
                                        } else {
                                                // Extension is not installed
-                                               $OUT .= "<div class=\"admin_failed medium\">".ADMIN_PAYOUT_NOT_INSTALLED."</div>\n";
+                                               $OUT .= "<div class=\"admin_failed medium\">{!ADMIN_PAYOUT_NOT_INSTALLED!}</div>\n";
                                        }
                                        break;
 
@@ -314,11 +314,11 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                                                        $OUT .= LOAD_TEMPLATE("admin_wernis_overview_form", true, $content);
                                                } else {
                                                        // Problem obtaining wernis ID
-                                                       $OUT .= "<div class=\"admin_failed medium\">".WERNIS_OBTAIN_ID_FAILED."</div>\n";
+                                                       $OUT .= "<div class=\"admin_failed medium\">{!WERNIS_OBTAIN_ID_FAILED!}</div>\n";
                                                }
                                        } else {
                                                // Extension is not installed
-                                               $OUT .= "<div class=\"admin_failed medium\">".ADMIN_WERNIS_NOT_INSTALLED."</div>\n";
+                                               $OUT .= "<div class=\"admin_failed medium\">{!ADMIN_WERNIS_NOT_INSTALLED!}</div>\n";
                                        }
                                        break;
 
@@ -389,7 +389,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                        $infos = "---";
                        if ($admin == "0") {
                                // No admin currently is assigned
-                               $admin = "<div class=\"admin_note\">".ADMIN_NO_ADMIN_ASSIGNED."</div>";
+                               $admin = "<div class=\"admin_note\">{!ADMIN_NO_ADMIN_ASSIGNED!}</div>";
                        } else {
                                // Load admin's data
                                $login = GET_ADMIN_LOGIN($admin);
@@ -419,7 +419,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                                // Member found otherwise it's a system task
                                $uid = ADMIN_USER_PROFILE_LINK($uid);
                        } else {
-                               $uid = "<em>".ADMIN_IS_SYSTEM_TASK."</em>";
+                               $uid = "<em>{!ADMIN_IS_SYSTEM_TASK!}</em>";
                        }
 
                        // Prepare content

diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php
index 598eb8cf5ea2c29d856f92deb2736d4734b09f61..8008970116e374df9146b9e0e701c4ee458bd9eb 100644 (file)
--- a/inc/modules/admin/what-config_payouts.php
+++ b/inc/modules/admin/what-config_payouts.php
@@ -69,7 +69,7 @@ VALUES ('%s', %d, %d,'%s','%s','%s','%s','%s','%s','%s')",
                SQL_FREERESULT($result);
 
                // Does already exist
-               $msg = "<div class=\"admin_failed\">".ADMIN_PAYOUT_TYPE_ALREADY."</div>";
+               $msg = "<div class=\"admin_failed\">{!ADMIN_PAYOUT_TYPE_ALREADY!}</div>";
        }
 }
 
@@ -212,7 +212,7 @@ if ((SQL_NUMROWS($result_type) > 0) && ($display)) {
 // Does your members request payouts?
 if ((SQL_NUMROWS($result_mem) > 0) && ($display)) {
        // Members has requested payouts
-       LOAD_TEMPLATE("admin_settings_saved", false, "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_payouts\">".ADMIN_PAYOUT_LIST_REQUESTS."</a></P>");
+       LOAD_TEMPLATE("admin_settings_saved", false, "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_payouts\">{!ADMIN_PAYOUT_LIST_REQUESTS!}</a></P>");
 } elseif ($display) {
        // No member requests so far
        LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_PAYOUT_NO_MEMBER_REQUESTS'));

diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index 806610456c1fddd36016dc13deeb8c1f08becb4c..47d341b66f8237e8bb610b3a73f3462dbf4daa69 100644 (file)
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -111,7 +111,7 @@ if (SQL_NUMROWS($result) > 0) {
 
                // Is the loaded theme name != current theme name?
                $LINK = $unix;
-               if ($unix != GET_CURR_THEME()) $LINK = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=theme_edit&amp;default_theme=".$unix."\" title=\"".ADMIN_SET_AS_NEW_THEME."\">".$unix."</a>";
+               if ($unix != GET_CURR_THEME()) $LINK = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=theme_edit&amp;default_theme=".$unix."\" title=\"{!ADMIN_SET_AS_NEW_THEME!}\">".$unix."</a>";
 
                // Prepare data for the row template
                $content = array(

diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php
index 94306fe016f9bf61a4b2ac214dd55ba52eed94c1..743de75788f3d146db31e0bc07df201c3c1fbbae 100644 (file)
--- a/inc/modules/admin/what-updates.php
+++ b/inc/modules/admin/what-updates.php
@@ -123,7 +123,7 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($
 // Is a newer version available?
 if (empty($ONLINE['version'])) {
        // Disconnected?
-       LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".ADMIN_CANNOT_CHECK_VERSION." (".$ONLINE['code'].")</div>");
+       LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">{!ADMIN_CANNOT_CHECK_VERSION!} (".$ONLINE['code'].")</div>");
 } elseif (($ONLINE['version'] != FULL_VERSION) || ($ONLINE['revision'] != CURR_SVN_REVISION)) {
        // New full-version available (all previous released patches are included in this version!)
        define('__ONLINE_VERSION', $ONLINE['version']);

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 9a0dd6c95fb55bf9136b84fad8b9971228d78609..55bd891a67596fdedc33073101db888a7bcf6827 100644 (file)
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -102,7 +102,7 @@ if ((!empty($_POST['url'])) || (!empty($_GET['url'])) || (!empty($_GET['frame'])
                break;
 
        case "test_top":
-               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"guest_done\">".GUEST_FRAMETESTER_TOP."</span>");
+               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"guest_done\">{!GUEST_FRAMETESTER_TOP!}</span>");
                break;
 
        case "back": // Back buttom

diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php
index 096a60bc6a5307f8ee76fe6807b23482fcf3b4b3..ae572fe30a13a2512defb5c801ca192e24ccc4e3 100644 (file)
--- a/inc/modules/guest/action-themes.php
+++ b/inc/modules/guest/action-themes.php
@@ -60,7 +60,7 @@ if ($num_themes > 1) {
        $OUT = LOAD_TEMPLATE("theme_one", true);
 } elseif (IS_ADMIN()) {
        // If there is no theme installed and there's an admin notify him!
-       $OUT = LOAD_TEMPLATE("admin_settings_saved", true, "<div class=\"admin_note\">".ADMIN_NO_THEME_INSTALLED_WARNING."</div>");
+       $OUT = LOAD_TEMPLATE("admin_settings_saved", true, "<div class=\"admin_note\">{!ADMIN_NO_THEME_INSTALLED_WARNING!}</div>");
 }
 
 // Remember

diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index 08bcfcf699fa291d750927c3a4e3b9856c524387..495e4e0ff71eb45ff24912aecda845ea193810e0 100644 (file)
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -177,7 +177,7 @@ case "MODULES": // TOP10 module clicks
        if (SQL_NUMROWS($guest_t10) > 0) {
                // Guest clicks
                OUTPUT_HTML("<tr>
-  <td align=\"center\" class=\"guest_title2 bottom2\" colspan=\"2\">".GUEST_TOP_GUEST_STATS."</td>
+  <td align=\"center\" class=\"guest_title2 bottom2\" colspan=\"2\">{!GUEST_TOP_GUEST_STATS!}</td>
 </tr>");
                $SW = 2;
                while (list($clicks, $title) = SQL_FETCHROW($guest_t10)) {
@@ -192,7 +192,7 @@ case "MODULES": // TOP10 module clicks
        if (SQL_NUMROWS($guest_t10) > 0) {
                // Guest clicks
                OUTPUT_HTML("<tr>
-  <td align=\"center\" class=\"guest_title2 bottom2\" colspan=\"2\">".GUEST_TOP_MEMBER_STATS."</td>
+  <td align=\"center\" class=\"guest_title2 bottom2\" colspan=\"2\">{!GUEST_TOP_MEMBER_STATS!}</td>
 </tr>");
                $SW = 2;
                while (list($clicks, $title) = SQL_FETCHROW($mem_t10)) {
@@ -214,7 +214,7 @@ case "MODULES": // TOP10 module clicks
        break;
 
 case "INACTIVE": // Deactivated stats
-       LOAD_TEMPLATE("admin_settings_saved", false, "<strong>".GUEST_STATS_DEACTIVATED."</strong>");
+       LOAD_TEMPLATE("admin_settings_saved", false, "<strong>{!GUEST_STATS_DEACTIVATED!}</strong>");
        break;
 }
 

diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index 4c2dcb6b926ca2f165929e76113e9743941bcc93..db2fbf58300007c88982ead6e7630db6a8b73cbd 100644 (file)
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -63,7 +63,7 @@ if ($num_themes > 1) {
        $OUT = LOAD_TEMPLATE("theme_one", true);
 } elseif (IS_ADMIN()) {
        // If there is no theme installed and there's an admin notify him!
-       $OUT = LOAD_TEMPLATE("admin_settings_saved", true, "<div class=\"admin_note\">".ADMIN_NO_THEME_INSTALLED_WARNING."</div>");
+       $OUT = LOAD_TEMPLATE("admin_settings_saved", true, "<div class=\"admin_note\">{!ADMIN_NO_THEME_INSTALLED_WARNING!}</div>");
 }
 
 // Remember

diff --git a/inc/modules/member/what-newsletter.php b/inc/modules/member/what-newsletter.php
index 1b31672422d2a1a8b0abe87be0f71f7fbf4e4fbe..2e5f885cad2c60de359be6cd8d0a8fdc5582b37f 100644 (file)
--- a/inc/modules/member/what-newsletter.php
+++ b/inc/modules/member/what-newsletter.php
@@ -65,7 +65,7 @@ if ((isset($_POST['ok'])) && ($status == "Y") && ($span == "0"))
 
        // Add task
        SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (assigned_admin, status, task_type, subject, text, task_created, userid)
-VALUES ('0','NEW','NL_UNSUBSCRIBE','".ADMIN_NL_SUBJECT."','".$admin_msg."', UNIX_TIMESTAMP(),'%s')", array($GLOBALS['userid']), __FILE__, __LINE__);
+VALUES ('0','NEW','NL_UNSUBSCRIBE','{!ADMIN_NL_SUBJECT!}','".$admin_msg."', UNIX_TIMESTAMP(),'%s')", array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Send mail to member
        $msg = LOAD_EMAIL_TEMPLATE("member_newsletter_request", array(), $GLOBALS['userid']);

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 0c85a3f7658a37c1264009b3f1bee24345f8983b..1539e82f8abab09da5cae208add7bf1c985929d4 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -812,15 +812,15 @@ function SEND_MODE_MAILS($mod, $modes) {
                                } // END - switch
                        } else {
                                // Could not load profile data
-                               $content = "<span class=\"member_failed\">".MEMBER_CANNOT_LOAD_PROFILE."</span>";
+                               $content = "<span class=\"member_failed\">{!MEMBER_CANNOT_LOAD_PROFILE!}</span>";
                        }
                } else {
                        // Passwords mismatch
-                       $content = "<span class=\"member_failed\">".MEMBER_PASSWORD_ERROR."</span>";
+                       $content = "<span class=\"member_failed\">{!MEMBER_PASSWORD_ERROR!}</span>";
                }
        } else {
                // Could not load profile
-               $content = "<span class=\"member_failed\">".MEMBER_CANNOT_LOAD_PROFILE."</span>";
+               $content = "<span class=\"member_failed\">{!MEMBER_CANNOT_LOAD_PROFILE!}</span>";
        }
 
        // Send email to user if required
@@ -1835,7 +1835,7 @@ WHERE userid=%s AND `status`='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML
                }
        } else {
                // No cateogries are defined yet
-               $OUT = "<option class=\"member_failed\">".MEMBER_NO_CATS."</option>\n";
+               $OUT = "<option class=\"member_failed\">{!MEMBER_NO_CATS!}</option>\n";
        }
 
        // Return HTML code

diff --git a/modules.php b/modules.php
index f1b619b29e731126af0f8c9e5b2162841501933f..c862671e537600364e013c03b91ca14b8095284d 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -70,11 +70,11 @@ if (IS_MEMBER()) {
                // Additionally admin?
                if (IS_ADMIN()) {
                        // Add it
-                       $username .= " ("._ADMIN_SHORT.")";
+                       $username .= " ({!_ADMIN_SHORT!})";
                } // END - if
        } else {
                // Hmmm, logged in and no valid userid?
-               $username = "<em>"._UNKNOWN."</em>";
+               $username = "<em>{!_UNKNOWN!}</em>";
 
                // Destroy session
                destroy_user_session();