Some language strings rewritten to use getMessage()
authorRoland Häder <roland@mxchange.org>
Sat, 10 Oct 2009 23:40:53 +0000 (23:40 +0000)
committerRoland Häder <roland@mxchange.org>
Sat, 10 Oct 2009 23:40:53 +0000 (23:40 +0000)
13 files changed:
inc/language/bonus_de.php
inc/language/cache_de.php
inc/libs/admins_functions.php
inc/libs/cache_functions.php
inc/libs/sponsor_functions.php
inc/modules/admin/overview-inc.php
inc/modules/admin/what-config_proxy.php
inc/modules/admin/what-del_email.php
inc/modules/guest/what-sponsor_reg.php
inc/pool/pool-user.php
templates/de/html/admin/admin_list_bonus.tpl
templates/de/html/member/member_bonus.tpl
templates/de/html/show_bonus_msg.tpl

index 6da5242..a784f53 100644 (file)
@@ -74,11 +74,6 @@ define('BONUS_TOTAL', "Gesamtbonus");
 define('BONUS_RALLYE_NO_ONE_JOINED', "Niemand nimmt an unserer Aktiv-Rallye dran teil. :-(");
 define('BONUS_RALLYE_NOTE', "Bitte beachten Sie, dass Ihr Login-Bonus hier nicht mit angezeigt wird. Bei der monatlichen Auswertung wird er Ihnen jedoch gutgeschrieben.");
 define('BONUS_RALLYE_CONDITIONS', "Wer alles an der Aktiv-Rallye teilnehmen kann");
-define('BONUS_RALLYE_CONDITION_1', "Es werden nur aktive und freigeschaltete Mitglieder ber&uuml;cksichtig.");
-define('BONUS_RALLYE_CONDITION_2', "Der Login-Bonus wird bei der Auswertung nicht beachtet, aber dem Mitglied gutgeschrieben.");
-define('BONUS_RALLYE_CONDITION_3', "Es kann jeder dran teilnehmen, der Mitglied bei diesem {!MT_WORD!} (<strong>{--MAIN_TITLE--}</strong>) und freigegeben ist.");
-define('BONUS_RALLYE_CONDITION_4', "Zur Erstellung des Rallye-Ergebnisses wird nur die Aktiv-Verg&uuml;tung ber&uuml;cksichtig, welche Sie beim Best&auml;tigen von Mails erhalten k&ouml;nnen.");
-define('BONUS_RALLYE_CONDITION_5', "Der Rechtsweg ist ausgeschlossen.");
 define('BONUS_START_CONFIRMING_MAILS', "Hier sind Ihre unbest&auml;tigten Mails...");
 define('BONUS_MEMBER_HERE_IS_THE_LIST', "Hier finden Sie die aktuelle Liste mit den m&ouml;glichen Gewinnern!");
 define('BONUS_MONTHLY_ONLINE_BONUS', "Gewonnen: Monatliche Aktiv-Rallye");
@@ -89,7 +84,7 @@ define('ADMIN_BONUS_WITHDRAW_PREPARED', "Verg&uuml;tung des Aktiv-Bonuses vorber
 define('ADMIN_BONUS_WINNER_HIGLIGHTED', "M&ouml;gliche Gewinner der Aktiv-Rallye sind dick marktiert.");
 define('ADMIN_BONUS_ALREADY_WITHDRAW', "Manuelle Verg&uuml;tungvorbereitung bereits bet&auml;tigt!");
 define('ADMIN_BONUS_TIMEOUT_1', "Es werden nur Mitglieder ausgewertet und hier aufgelistet, die sp&auml;testens am ");
-define('ADMIN_BONUS_TIMEOUT_2', "noch aktiv waren. Alle anderen Mitglieder erhalten die Verg&uuml;tung nicht!");
+define('ADMIN_BONUS_TIMEOUT_2', " noch aktiv waren. Alle anderen Mitglieder erhalten die Verg&uuml;tung nicht!");
 define('ADMIN_BONUS_USERID', "Mitgliedskonto zum Abbuchen der {!POINTS!}");
 define('ADMIN_CONFIG_BONUS_TIMEOUT', "Verweildauer von Aktiv-Bonus-Eintr&auml;gen");
 define('ADMIN_BONUS_TURBO_LINES', "Anzahl angezeigter Aktiv-Bonus-Empf&auml;nger in <strong>show_bonus.php</strong>");
index 2f255bb..66b9d18 100644 (file)
@@ -44,8 +44,7 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 define('CACHE_PROBLEMS_DETECTED', "Probleme mit dem Cache-Subsystem erkannt!");
-define('CACHE_CANNOT_LOAD_1', "Kann nicht Cache-Datei <strong><u>");
-define('CACHE_CANNOT_LOAD_2', "</u></strong> laden!");
+define('CACHE_CANNOT_LOAD', "Kann nicht Cache-Datei <strong><u>%s</u></strong> laden!");
 define('CACHE_CANNOT_INITIALIZE', "Konnte das Caching-System nicht initialisieren. Bitte die Dokumentation <strong>DOCS/de/cache/README.txt</strong> lesen!");
 define('ADMIN_CACHE_STATS_TITLE', "Statistiken des Caching-Systems");
 define('ADMIN_CACHE_DB_HITS', "Zugriffe auf die Datenbank");
@@ -53,8 +52,7 @@ define('ADMIN_CACHE_HITS', "Zugriffe auf den Cache");
 define('ADMIN_CACHE_PERCENTS', "Prozentual (*)");
 define('ADMIN_CACHE_NOTES', "(*): Sollten bei Ihnen die Prozente unter 50&#37; liegen und Sie nicht vor September 2008 das Script *neu* installiert haben, so ist dies kein Grund zur Besorgnis. Im Normalfall sollten die Prozente seit eigenen Revisionen im September 2008 (R300+) &uuml;ber 50&#37; liegen.");
 define('ADMIN_TOTAL_HITS', "Gesamtzugriffe");
-define('CACHE_CANNOT_UNLINK_1', "Kann nicht die Cache-Datei <strong><u>");
-define('CACHE_CANNOT_UNLINK_2', "</u></strong> vom Server entfernen!");
+define('CACHE_CANNOT_UNLINK', "Kann nicht die Cache-Datei <strong><u>%s</u></strong> vom Server entfernen!");
 
 // Administrative settings
 define('ADMIN_CONFIG_CACHE_SETTINGS', "Caching-Einstellung");
@@ -70,5 +68,5 @@ define('ADMIN_CACHE_THEMES', "Soll der Zugriff auf die Tabelle <strong>{!_MYSQL_
 define('ADMIN_CACHE_ADMIN_MENU', "Soll der Aufbau des Administratormen&uuml;s beschleunigt werden (EXPERIMENTELL!)?");
 define('ADMIN_CACHE_PATH', "Relativer Pfad f&uuml;r alle Cache-Dateien zum Pfad <strong>inc</strong>");
 
-//
+// [EOF]
 ?>
index 548affd..40b6da9 100644 (file)
@@ -277,7 +277,7 @@ function adminsEditAdminAccount ($POST) {
                                // Don't allow it
                                $content['mode'] = '&nbsp;';
                        }
-                       $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array(ADMINS_GLOBAL_LA_SETTING, ADMINS_OLD_LA_SETTING, ADMINS_NEW_LA_SETTING), $content['la_mode']);
+                       $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array(getMessage('ADMINS_GLOBAL_LA_SETTING'), getMessage('ADMINS_OLD_LA_SETTING'), getMessage('ADMINS_NEW_LA_SETTING')), $content['la_mode']);
 
                        // Load row template and switch color
                        $OUT .= LOAD_TEMPLATE('admin_edit_admins_row', true, $content);
index 53e4847..e3d4e20 100644 (file)
@@ -221,7 +221,7 @@ class CacheSystem {
                        }
                } else {
                        // Cache file not found or not readable
-                       addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_LOAD_1.$this->fqfn.CACHE_CANNOT_LOAD_2);
+                       addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".sprintf(getMessage('CACHE_CANNOT_LOAD', $this->fqfn)));
                }
        }
 
@@ -273,7 +273,7 @@ class CacheSystem {
                                $this->rebuilt[$this->name] = true;
                        } else {
                                // Not removed!
-                               addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_UNLINK_1.$this->fqfn.CACHE_CANNOT_UNLINK_2);
+                               addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".sprintf(getMessage('CACHE_CANNOT_UNLINK', $this->fqfn)));
                        }
                } // END - if
        }
index fb8ac7b..78f0959 100644 (file)
@@ -140,13 +140,13 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $messageArray=array()
                                $DATA['values'][] = bigintval(REQUEST_GET('id'));
 
                                // Generate message
-                               $message = SPONSOR_GET_MESSAGE(ADMIN_SPONSOR_UPDATED, "updated", $messageArray);
+                               $message = SPONSOR_GET_MESSAGE(getMessage('ADMIN_SPONSOR_UPDATED'), 'updated', $messageArray);
                                $ret = "updated";
                        } elseif ((!$ALREADY) || (($POST['force'] == '1') && (IS_ADMIN()))) {
                                // Add new sponsor, first add more data
-                               $DATA['keys'][] = "sponsor_created"; $DATA['values'][] = time();
+                               $DATA['keys'][] = 'sponsor_created'; $DATA['values'][] = time();
                                $DATA['keys'][] = 'status';
-                               if ((!$NO_UPDATE) && (IS_ADMIN()) && (getWhat() == "add_sponsor")) {
+                               if ((!$NO_UPDATE) && (IS_ADMIN()) && (getWhat() == 'add_sponsor')) {
                                        // Only allowed for admin
                                        $DATA['values'][] = 'PENDING';
                                } else {
@@ -154,22 +154,22 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $messageArray=array()
                                        $DATA['values'][] = 'UNCONFIRMED';
 
                                        // Generate hash code
-                                       $DATA['keys'][] = "hash";
+                                       $DATA['keys'][] = 'hash';
                                        $DATA['values'][] = md5(session_id().':'.$POST['email'].':'.detectRemoteAddr().':'.detectUserAgent().':'.time());
-                                       $DATA['keys'][] = "remote_addr";
+                                       $DATA['keys'][] = 'remote_addr';
                                        $DATA['values'][] = detectRemoteAddr();
                                }
 
                                // Implode all data into strings
-                               $KEYS   = implode(""  , $DATA['keys']);
+                               $KEYS   = implode("`, `"  , $DATA['keys']);
                                $valueS = str_repeat("%s', '", count($DATA['values']) - 1);
 
                                // Generate string
-                               $sql = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_data` (".$KEYS.") VALUES ('".$valueS."%s')";
+                               $sql = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_data` (`".$KEYS."`) VALUES ('".$valueS."%s')";
 
                                // Generate message
                                $message = SPONSOR_GET_MESSAGE(getMessage('ADMIN_SPONSOR_ADDED'), "added", $messageArray);
-                               $ret = "added";
+                               $ret = 'added';
                        } elseif ((!$NO_UPDATE) && (IS_ADMIN())) {
                                // Add all data as hidden data
                                $OUT = '';
@@ -183,7 +183,7 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $messageArray=array()
                                define('__EMAIL'      , $POST['email']);
 
                                // Ask for adding a sponsor with same email address
-                               LOAD_TEMPLATE("admin_add_sponsor_already");
+                               LOAD_TEMPLATE('admin_add_sponsor_already');
                                return;
                        } else {
                                // Already added!
index 152c73e..672fbe6 100644 (file)
@@ -369,7 +369,7 @@ LIMIT 1",
                                                                        $OUT .= LOAD_TEMPLATE('admin_newsletter_tsk', true, $content);
                                                                } else {
                                                                        // Already unsubscribed
-                                                                       $OUT .= "<div class=\"admin_failed medium\">".ADMIN_NL_UNSUBSCRIBE_ALREADY."</div>\n";
+                                                                       $OUT .= "<div class=\"admin_failed medium\">{--ADMIN_NL_UNSUBSCRIBE_ALREADY--}</div>\n";
                                                                }
                                                                break;
 
index 369d543..619b30f 100644 (file)
@@ -64,8 +64,8 @@ if (isFormSent()) {
        );
 
        // Load template
-       LOAD_TEMPLATE("admin_config_proxy", false, $content);
+       LOAD_TEMPLATE('admin_config_proxy', false, $content);
 }
 
-//
+// [EOF]
 ?>
index d41efd8..df46ffd 100644 (file)
@@ -144,7 +144,7 @@ LIMIT 1",
                        $cnt += SQL_AFFECTEDROWS();
 
                        // Load template for link
-                       LOAD_TEMPLATE('admin_settings_saved', false, "<a href=\"{!URL!}/modules.php?module=admin&amp;what=del_email&amp;pid=".bigintval(REQUEST_GET('mid'))."\">".ADMIN_REMOVE_STATS_ENTRY."</a>");
+                       LOAD_TEMPLATE('admin_settings_saved', false, "<a href=\"{!URL!}/modules.php?module=admin&amp;what=del_email&amp;pid=".bigintval(REQUEST_GET('mid'))."\">{--ADMIN_REMOVE_STATS_ENTRY--}</a>");
                } // END - if
 
                // Free the result
@@ -156,7 +156,7 @@ LIMIT 1",
                $cnt += SQL_AFFECTEDROWS();
 
                // Output link for manually removing stats entry
-               OUTPUT_HTML(sprintf(ADMIN_DELETED_MAILS_COUNT, $cnt));
+               OUTPUT_HTML(sprintf(getMessage('ADMIN_DELETED_MAILS_COUNT'), $cnt));
        } else {
                // Mail already deleted!
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NORMAL_MAIL_ALREADY_DELETED'));
index 9e329bb..642264f 100644 (file)
@@ -411,5 +411,5 @@ ORDER BY `pay_name`", __FILE__, __LINE__);
        SQL_FREERESULT($result);
 }
 
-//
+// [EOF]
 ?>
index c10638a..80fc955 100644 (file)
@@ -203,10 +203,10 @@ if (SQL_NUMROWS($result_main) > 0) {
                                                );
 
                                                // Yes we do, so we notify admin and sender about fully sent mail!
-                                               sendAdminNotification(ADMIN_SUBJ_SEND_DONE, "done-admin", $content, $uid);
+                                               sendAdminNotification(getMessage('ADMIN_SUBJ_SEND_DONE'), 'done-admin', $content, $uid);
 
                                                // Get sender's data
-                                               $result_sender = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                                               $result_sender = SQL_QUERY_ESC("SELECT `surname`, `family`, `email` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
                                                        array(bigintval($DATA[1])), __FILE__, __LINE__);
 
                                                // Is the sender found?
@@ -215,7 +215,7 @@ if (SQL_NUMROWS($result_main) > 0) {
                                                        list($sname, $fname, $email) = SQL_FETCHROW($result_sender);
 
                                                        // Load email template
-                                                       $mailText = LOAD_EMAIL_TEMPLATE("done-member", $content, $DATA[1]);
+                                                       $mailText = LOAD_EMAIL_TEMPLATE('done-member', $content, $DATA[1]);
 
                                                        // Send it also waway
                                                        sendEmail($email, MEMBER_SUBJ_SEND_DONE, $mailText);
index 2d2b9dc..9ee6fd2 100644 (file)
@@ -26,7 +26,8 @@
        </tr>
 </table>
 
-<div class="admin_note"><strong>{--ADMIN_BONUS_WINNER_HIGLIGHTED--}</strong><br />
-<br />
-<div class="admin_note">{--ADMIN_BONUS_TIMEOUT_1--} <strong>{!__AUTOPURGE_TIMEOUT!}</strong>
-{--ADMIN_BONUS_TIMEOUT_2--}</div></div>
+<div class="admin_note">
+       <strong>{--ADMIN_BONUS_WINNER_HIGLIGHTED--}</strong><br />
+       <br />
+       {--ADMIN_BONUS_TIMEOUT_1--}<strong>{!__AUTOPURGE_TIMEOUT!}</strong>{--ADMIN_BONUS_TIMEOUT_2--}
+</div>
index 799ec4e..6ad516a 100644 (file)
                        align="center"><strong>{--BONUS_RALLYE_CONDITIONS--}:</strong></td>
        </tr>
        <tr>
-               <td class="member_note bottom2"
-                       style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px">
-               <ol align="left">
-                       <li class="tiny">{--BONUS_RALLYE_CONDITION_1--}</li>
-                       <li class="tiny">{--BONUS_RALLYE_CONDITION_2--}</li>
-                       <li class="tiny">{--BONUS_RALLYE_CONDITION_3--}</li>
-                       <li class="tiny">{--BONUS_RALLYE_CONDITION_4--}</li>
-                       <li class="tiny">{--BONUS_RALLYE_CONDITION_5--}</li>
-               </ol>
+               <td class="member_note bottom2" style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px">
+                       <ol align="left">
+                               <li class="tiny">Es werden nur aktive und freigeschaltete Mitglieder ber&uuml;cksichtig.</li>
+                               <li class="tiny">Der Login-Bonus wird bei der Auswertung nicht beachtet, aber dem Mitglied gutgeschrieben.</li>
+                               <li class="tiny">Es kann jeder dran teilnehmen, der Mitglied bei diesem {!MT_WORD!} (<strong>{--MAIN_TITLE--}</strong>) und freigegeben ist.</li>
+                               <li class="tiny">Zur Erstellung des Rallye-Ergebnisses wird nur die Aktiv-Verg&uuml;tung ber&uuml;cksichtig, welche Sie beim Best&auml;tigen von Mails erhalten k&ouml;nnen."</li>
+                               <li class="tiny">Der Rechtsweg ist ausgeschlossen.</li>
+                       </ol>
                </td>
        </tr>
        <tr>
index b0d869c..a052294 100644 (file)
@@ -1,11 +1,7 @@
 {--HELLO--} $content[gender] $content[surname] $content[family]!
 <br />
 <br />
-{--BONUS_SHOW_HEADER_LINE_1--}
-<strong>{!POINTS!}</strong>
-{--BONUS_SHOW_HEADER_LINE_2--}
-<strong>$content[mailid]</strong>
-{--BONUS_SHOW_HEADER_LINE_3--}:
+{--BONUS_SHOW_HEADER_LINE_1--}<strong>{!POINTS!}</strong>{--BONUS_SHOW_HEADER_LINE_2--}<strong>$content[mailid]</strong>{--BONUS_SHOW_HEADER_LINE_3--}:
 <br />
 <br />
 <table border="0" cellspacing="0" cellpadding="0" width="300" class="member_table dashed">