A lot more wrapper functions added, templates renamed
authorRoland Häder <roland@mxchange.org>
Sat, 29 Jan 2011 21:48:19 +0000 (21:48 +0000)
committerRoland Häder <roland@mxchange.org>
Sat, 29 Jan 2011 21:48:19 +0000 (21:48 +0000)
25 files changed:
.gitattributes
inc/extensions/ext-sql_patches.php
inc/functions.php
inc/language/autopurge_de.php
inc/language/de.php
inc/language/order_de.php
inc/language/other_de.php
inc/libs/register_functions.php
inc/libs/wernis_functions.php
inc/modules/admin.php
inc/modules/admin/admin-inc.php
inc/modules/admin/what-email_details.php
inc/modules/guest/what-wernis_portal.php
inc/modules/member/what-wernis.php
inc/template-functions.php
inc/wrapper-functions.php
templates/de/html/admin/admin_config_autopurge.tpl
templates/de/html/admin/admin_config_order.tpl
templates/de/html/admin/admin_config_other.tpl
templates/de/html/admin/admin_logout_sql_patches_remove.tpl
templates/de/html/admin/admin_reset_pass_done.tpl
templates/de/html/admin/admin_reset_password.tpl
templates/de/html/admin/admin_reset_password_done.tpl [new file with mode: 0644]
templates/de/html/admin/admin_reset_password_send_link.tpl [new file with mode: 0644]
templates/de/html/admin/admin_send_reset_link.tpl

index fb1bd74..73a840f 100644 (file)
@@ -1321,7 +1321,9 @@ templates/de/html/admin/admin_repair_lang_row_compares.tpl -text svneol=unset#te
 templates/de/html/admin/admin_repair_lang_row_diff.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_reset_pass_done.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_reset_password.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_reset_password_done.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_reset_password_form.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_reset_password_send_link.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_send_bonus_form.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_send_bonus_select.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_send_reset_link.tpl -text svneol=unset#text/plain
index 167b565..aa6c5d2 100644 (file)
@@ -798,7 +798,7 @@ INDEX (`ip`)
 
                // Transfer words/numbers to constants if config entry is found
                if (isExtensionInstalledAndNewer('sql_patches', '0.0.3')) {
-                       setConfigEntry('POINTS', getConfig('points_word'));
+                       setConfigEntry('POINTS', getPointsWord());
                } // END - if
                break;
 
index aeb0ac4..e07307a 100644 (file)
@@ -659,7 +659,7 @@ function generateRandomCode ($length, $code, $userid, $DATA = '') {
        $server = $_SERVER['PHP_SELF'] . getEncryptSeperator() . detectUserAgent() . getEncryptSeperator() . getenv('SERVER_SOFTWARE') . getEncryptSeperator() . detectRealIpAddress() . getEncryptSeperator() . detectRemoteAddr();
 
        // Build key string
-       $keys = getConfig('SITE_KEY') . getEncryptSeperator() . getConfig('DATE_KEY');
+       $keys = getSiteKey() . getEncryptSeperator() . getDateKey();
        if (isConfigEntrySet('secret_key')) {
                $keys .= getEncryptSeperator().getSecretKey();
        } // END - if
@@ -690,22 +690,26 @@ function generateRandomCode ($length, $code, $userid, $DATA = '') {
 
        if (isConfigEntrySet('master_salt')) {
                // Generate hash with master salt from modula of number with the prime number and other data
-               $saltedHash = generateHash(($a % getPrime()) . getEncryptSeperator() . $server . getEncryptSeperator() . $keys . getEncryptSeperator() . $data . getEncryptSeperator() . getConfig('DATE_KEY') . getEncryptSeperator() . $a, getMasterSalt());
+               $saltedHash = generateHash(($a % getPrime()) . getEncryptSeperator() . $server . getEncryptSeperator() . $keys . getEncryptSeperator() . $data . getEncryptSeperator() . getDateKey() . getEncryptSeperator() . $a, getMasterSalt());
 
                // Create number from hash
-               $rcode = hexdec(substr($saltedHash, strlen(getMasterSalt()), 9)) / abs(getConfig('rand_no') - $a + sqrt(getConfig('_ADD'))) / pi();
+               $rcode = hexdec(substr($saltedHash, strlen(getMasterSalt()), 9)) / abs(getRandNo() - $a + sqrt(getConfig('_ADD'))) / pi();
        } else {
                // Generate hash with "hash of site key" from modula of number with the prime number and other data
-               $saltedHash = generateHash(($a % getPrime()) . getEncryptSeperator() . $server . getEncryptSeperator() . $keys . getEncryptSeperator() . $data . getEncryptSeperator() . getConfig('DATE_KEY') . getEncryptSeperator() . $a, substr(sha1(getConfig('SITE_KEY')), 0, getSaltLength()));
+               $saltedHash = generateHash(($a % getPrime()) . getEncryptSeperator() . $server . getEncryptSeperator() . $keys . getEncryptSeperator() . $data . getEncryptSeperator() . getDateKey() . getEncryptSeperator() . $a, substr(sha1(getSiteKey()), 0, getSaltLength()));
 
                // Create number from hash
-               $rcode = hexdec(substr($saltedHash, 8, 9)) / abs(getConfig('rand_no') - $a + sqrt(getConfig('_ADD'))) / pi();
+               $rcode = hexdec(substr($saltedHash, 8, 9)) / abs(getRandNo() - $a + sqrt(getConfig('_ADD'))) / pi();
        }
 
        // At least 10 numbers shall be secure enought!
        $len = getCodeLength();
-       if ($len == '0') $len = $length;
-       if ($len == '0') $len = 10;
+       if ($len == '0') {
+               $len = $length;
+       } // END - if
+       if ($len == '0') {
+               $len = 10;
+       } // END - if
 
        // Cut off requested counts of number
        $return = substr(str_replace('.', '', $rcode), 0, $len);
@@ -947,10 +951,10 @@ function sendRawRequest ($host, $request) {
        //* DEBUG: */ die('SCRIPT=' . $script);
        if ($useProxy === true) {
                // Resolve hostname into IP address
-               $ip = $resolver->resolveHostname(compileRawCode(getConfig('proxy_host')));
+               $ip = $resolver->resolveHostname(compileRawCode(getProxyHost()));
 
                // Connect to host through proxy connection
-               $fp = fsockopen($ip, bigintval(getConfig('proxy_port')), $errno, $errdesc, 30);
+               $fp = fsockopen($ip, bigintval(getProxyPort()), $errno, $errdesc, 30);
        } else {
                // Resolve hostname into IP address
                $ip = $resolver->resolveHostname($host);
@@ -1079,9 +1083,9 @@ function setupProxyTunnel ($host, $resource) {
        $proxyTunnel .= 'Host: ' . $host . getConfig('HTTP_EOL');
 
        // Use login data to proxy? (username at least!)
-       if (getConfig('proxy_username') != '') {
+       if (getProxyUsername() != '') {
                // Add it as well
-               $encodedAuth = base64_encode(compileRawCode(getConfig('proxy_username')) . ':' . compileRawCode(getConfig('proxy_password')));
+               $encodedAuth = base64_encode(compileRawCode(getProxyUsername()) . ':' . compileRawCode(getProxyPassword()));
                $proxyTunnel .= 'Proxy-Authorization: Basic ' . $encodedAuth . getConfig('HTTP_EOL');
        } // END - if
 
@@ -1176,7 +1180,7 @@ function generateHash ($plainText, $salt = '', $hash = true) {
                $server = $_SERVER['PHP_SELF'] . getEncryptSeperator() . detectUserAgent() . getEncryptSeperator() . getenv('SERVER_SOFTWARE') . getEncryptSeperator() . detectRealIpAddress() . getEncryptSeperator() . detectRemoteAddr();
 
                // Build key string
-               $keys   = getConfig('SITE_KEY') . getEncryptSeperator() . getConfig('DATE_KEY') . getEncryptSeperator() . getSecretKey() . getEncryptSeperator() . getFileHash() . getEncryptSeperator() . getDateFromPatchTime() . getEncryptSeperator() . getMasterSalt();
+               $keys   = getSiteKey() . getEncryptSeperator() . getDateKey() . getEncryptSeperator() . getSecretKey() . getEncryptSeperator() . getFileHash() . getEncryptSeperator() . getDateFromPatchTime() . getEncryptSeperator() . getMasterSalt();
 
                // Additional data
                $data = $plainText . getEncryptSeperator() . uniqid(mt_rand(), true) . getEncryptSeperator() . time();
@@ -1185,7 +1189,7 @@ function generateHash ($plainText, $salt = '', $hash = true) {
                $a = time() + getConfig('_ADD') - 1;
 
                // Generate SHA1 sum from modula of number and the prime number
-               $sha1 = sha1(($a % getPrime()) . $server . getEncryptSeperator() . $keys . getEncryptSeperator() . $data . getEncryptSeperator() . getConfig('DATE_KEY') . getEncryptSeperator() . $a);
+               $sha1 = sha1(($a % getPrime()) . $server . getEncryptSeperator() . $keys . getEncryptSeperator() . $data . getEncryptSeperator() . getDateKey() . getEncryptSeperator() . $a);
                //* DEBUG: */ debugOutput('SHA1=' . $sha1.' ('.strlen($sha1).')<br />');
                $sha1 = scrambleString($sha1);
                //* DEBUG: */ debugOutput('Scrambled=' . $sha1.' ('.strlen($sha1).')<br />');
index 6b9a2b8..e695437 100644 (file)
@@ -52,7 +52,7 @@ addMessages(array(
        'ADMIN_AUTOPURGE_TASKS_SUBJECT' => "[Auto-Purge:] Zu l&ouml;schen marktierte Aufgaben",
        'ADMIN_AUTOPURGE_TURBO_SUBJECT' => "[Auto-Purge:] Veraltete Bonus-Eintr&auml;ge",
        'ADMIN_AUTOPURGE_DELETE_MAILS_SUBJECT' => "[Auto-Purge:] Mailbuchungen bereits gel. Mitglieder",
-       'ADMIN_AUTOPURGE_CONFIGURATION' => "Konfiguration der automatischen L&ouml;schungen",
+       'ADMIN_CONFIG_AUTOPURGE_TITLE' => "Konfiguration der automatischen L&ouml;schungen",
        'ADMIN_AUTOPURGE_INACTIVE' => "Sollten inaktive Accounts erkannt und gel&ouml;scht werden?",
        'ADMIN_AUTOPURGE_INACTIVE_SINCE' => "Dauer bis best&auml;tigtes Account als inaktiv markiert wird",
        'ADMIN_AUTOPURGE_INACTIVE_TIME' => "Dauer bis inaktives Account gel&ouml;scht wird",
@@ -61,8 +61,8 @@ addMessages(array(
        'ADMIN_AUTOPURGE_ALL_ACTIVE' => "Alle Ihre Mitlieder sind aktiv.",
        'ADMIN_AUTOPURGE_TASKS' => "L&ouml;schen von veralteten zu L&ouml;schen markierten Aufgaben?",
        'ADMIN_AUTOPURGE_TASKS_TIME' => "Dauer bis zu l&ouml;schen marktierte Aufgaben gel&ouml;scht werden",
-       'ADMIN_AUTOPURGE_INACTIVE_TITLE' => "Inaktive Accounts l&ouml;schen",
-       'ADMIN_AUTOPURGE_UNCONFIRMED_TITLE' => "Unbest&auml;tigte Accounts l&ouml;schen",
+       'ADMIN_CONFIG_AUTOPURGE_INACTIVE_TITLE' => "Inaktive Accounts l&ouml;schen",
+       'ADMIN_CONFIG_AUTOPURGE_UNCONFIRMED_TITLE' => "Unbest&auml;tigte Accounts l&ouml;schen",
        'ADMIN_AUTOPURGE_TASKS_TITLE' => "Veraltete Aufgaben l&ouml;schen",
        'ADMIN_AUTOPURGE_NOTIFICATION_TITLE' => "Benachtigung an Admin bei Auto-L&ouml;schung",
        'ADMIN_AUTOPURGE_NOTIFY_INACTIVE' => "Benachrichtigung bei inaktive Accounts l&ouml;schen",
@@ -77,9 +77,9 @@ addMessages(array(
        'ADMIN_AUTOPURGE_NOTIFY_DELETE_MAILS' => "Benachrichtigen bei L&ouml;schung von Mails",
 
 // Moved from other extensions
-       'ADMIN_OPTION_AUTOPURGE_ACTIVE' => "Auto-L&ouml;schung von Best&auml;tigungslink ist aktiviert?",
-       'ADMIN_OPTION_MAIL_LIFETIME' => "G&uuml;tigkeitsdauer der Best&auml;tigungslinks (0 = Best&auml;tigungslinks laufen nie ab)",
-       'ADMIN_AUTOPURGE_MAILID_TITLE' => "Mailbest&auml;tigungslinks l&ouml;schen",
+       'ADMIN_CONFIG_AUTOPURGE_ACTIVE' => "Auto-L&ouml;schung von Best&auml;tigungslink ist aktiviert?",
+       'ADMIN_CONFIG_MAIL_LIFETIME' => "G&uuml;tigkeitsdauer der Best&auml;tigungslinks (0 = Best&auml;tigungslinks laufen nie ab)",
+       'ADMIN_CONFIG_AUTOPURGE_MAILID_TITLE' => "Mailbest&auml;tigungslinks l&ouml;schen",
 ));
 
 // [EOF]
index 94f595f..8fb201b 100644 (file)
@@ -930,7 +930,7 @@ addMessages(array(
        'DEFAULT_POINTS' => "Punkte",
        'PROBLEM_POINTS_OVERVIEW_UNAVAILABLE' => "{?POINTS?}-&Uuml;bersicht derzeit nicht verf&uuml;gbar.",
        'ADMIN_NOTHING_SELECTED_CHANGE' => "Sie haben nichts zum &Auml;ndern des Status ausgew&auml;hlt.",
-       'TEMPLATE_CONTENT' => "Templatedaten:",
+       'TEMPLATE_CONTENT' => "Templatedaten",
        'MESSAGE_HEADER' => "Hinweis:",
        'WARNING_MESSAGE_HEADER' => "Warnung:",
        'ADMIN_ALPHA_SELCTION' => "Alphabetische Suche:",
@@ -946,7 +946,7 @@ addMessages(array(
        'SHOW_TIMINGS_SQL_TIME' => "SQL-Zeit:",
        'SHOW_TIMINGS_NUM_TEMPLATES' => "Templates:",
        'SHOW_TIMINGS_SECS' => "Sek.",
-       'ADMIN_OPTION_MAILID_REDIRECT' => "Soll bei fehlerhafter/gel&ouml;schter Mailbuchung beim Best&auml;tigen die Mail auf die Hauptseite oder Ablehnungsseite weitergleitet werden?",
+       'ADMIN_CONFIG_MAILID_REDIRECT' => "Soll bei fehlerhafter/gel&ouml;schter Mailbuchung beim Best&auml;tigen die Mail auf die Hauptseite oder Ablehnungsseite weitergleitet werden?",
        'ADMIN_CONFIG_MAILID_REDIRECT_INDEX' => "Auf Hauptseite weiterleiten.",
        'ADMIN_CONFIG_MAILID_REDIRECT_REJECT' => "Auf Ablehnungsseite umleiten.",
        'REASON_DIRECT_PAYMENT' => "Direkte Gutschrift (siehe evtl. vorangegangene Mail)",
@@ -983,17 +983,18 @@ addMessages(array(
        'APP_DIE_TITLE' => "Bug im Script erkannt!",
        'ADMIN_CONTACT_LINK_TITLE' => "Kontakt zum Administrator",
        'ADMIN_MAIL_NOTHING_DELETED' => "Die Mail mit der Id <span class=\"data\">%s</span> weisst keine Mitglieder auf.",
+       'TEMPLATE_DATA' => "Daten aus &#36;DATA",
 
-       'ADMIN_SEND_RESET_LINK_TITLE' => "1/4: Administratorkennwort zur&uuml;cksetzen",
+       'ADMIN_RESET_PASSWORD_SEND_LINK_TITLE' => "1/4: Administratorkennwort zur&uuml;cksetzen",
        'ADMIN_VALIDATE_HASH_TITLE' => "2/4: Validierung Iher Logindaten",
        'ADMIN_RESET_PASSWORD_TITLE' => "3/4: Neues Passwort eingeben",
-       'ADMIN_RESET_PASS_DONE_TITLE' => "4/4: Neues Passwort gesetzt",
+       'ADMIN_RESET_PASSWORD_DONE_TITLE' => "4/4: Neues Passwort gesetzt",
 
-       'ADMIN_SEND_RESET_LINK_SUBMIT' => "Passwort zur&uuml;cksetzen",
+       'ADMIN_RESET_PASSWORD_SEND_LINK_SUBMIT' => "Passwort zur&uuml;cksetzen",
        'ADMIN_VALIDATE_HASH_SUBMIT' => "Adminlogindaten validieren",
        'ADMIN_RESET_PASSWORD_SUBMIT' => "Neues Kennwort setzen",
 
-       'ADMIN_SEND_RESET_LINK_NOTE' => "Sobald Sie Ihre Email-Adresse eingegeben haben, wird Ihnen Ihr Loginname zugeschickt. Diesen geben Sie in dem n&auml;chsten Formular zusammen mit Ihrem neuen Passwort ein. Danach k&ouml;nnen Sie wieder in den Adminbereich einloggen.",
+       'ADMIN_RESET_PASSWORD_SEND_LINK_NOTE' => "Sobald Sie Ihre Email-Adresse eingegeben haben, wird Ihnen Ihr Loginname zugeschickt. Diesen geben Sie in dem n&auml;chsten Formular zusammen mit Ihrem neuen Passwort ein. Danach k&ouml;nnen Sie wieder in den Adminbereich einloggen.",
        'ADMIN_VALIDATE_HASH_NOTE' => "Sie haben diesen Link aus einer Mail angeklickt, die Ihnen zuvor zugesandt wurde. Daraus ben&ouml;tigen Sie Ihren Loginnamen, damit Ihre Daten validiert werden k&ouml;nnen. Nach Abesenden des Formulars k&ouml;nnen Sie dann Ihr Administratorkennwort &auml;ndern.",
        'ADMIN_RESET_PASSWORD_NOTE' => "Geben Sie nun zweimal ein neues Kennwort f&uuml;r das angezeigte Administratorlogin ein. Dabei sollten Sie Buchstaben, Zahlen und Sonderzeichen wie Slash, Strich, Unterstrich usw. verwenden, um die St&auml;rke des Passwortes zu maximieren.",
 
@@ -1004,15 +1005,15 @@ addMessages(array(
 
        'ADMIN_RESET_PASS' => "Ihr Administratorkennwort zur&uuml;cksetzen?",
        'ADMIN_NO_LOGIN_WITH_EMAIL' => "Kein Administrator-Account mit der angegebenen Email-Adresse gefunden.",
-       'ADMIN_RESET_PASS_LINK_SUBJECT' => "Zur&uuml;cksetzung Ihres Admin-Passwortes",
-       'ADMIN_RESET_LINK_SENT' => "Der Reset-Link wurde soeben an Ihre eingegebene Email-Adresse ausgesendet.",
+       'ADMIN_RESET_PASSWORD_LINK_SUBJECT' => "Zur&uuml;cksetzung Ihres Admin-Passwortes",
+       'ADMIN_RESET_PASSWORD_LINK_SENT' => "Der Reset-Link wurde soeben an Ihre eingegebene Email-Adresse ausgesendet.",
        'ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED' => "Validierung Ihrer Logindaten fehlgeschlagen. Haben Sie auch den Link aus der Mail angeklickt und Ihren Loginnamen eingegeben?",
        'ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2' => "Validierung Ihrer Logindaten fehlgeschlagen. Es liegt ein Bug im Script vor. Bitte im <a href=\"http://bugs.mxchange.org\" target=\"_blank\" title=\"Direktlink zum Bug-Tracker\">Bug-Tracker</a> den Fehler melden.",
        'ADMIN_SHOW_LOGIN' => "Ihr Administratorlogin:",
        'ADMIN_CHANGE_LOGIN' => "Anderes Adminlogin",
        'ADMIN_PASSWORD_RESET_DONE' => "Ihr Administratorkennwort wurde neu gesetzt. Sie k&ouml;nnen sich jetzt mit Ihren neuen Zugangsdaten im Adminbereich einloggen.",
        'ADMIN_CONTINUE_LOGIN' => "Weiter zum Administratorlogin",
-       'ADMIN_RESET_PASS_LINK' => "Jetzt Ihr Administratorkennwort zur&uuml;cksetzen (n&ouml;tiger Schritt!)",
+       'ADMIN_RESET_PASSWORD_LINK' => "Jetzt Ihr Administratorkennwort zur&uuml;cksetzen (n&ouml;tiger Schritt!)",
        'ADMIN_SUPPORT_FORUM_LINK' => "Direktlink zum Support-Forum (neues Fenster)",
        'ADMIN_SUPPORT_BUGTRACKER_LINK' => "Direktlink zum Bug-Tracker (neues Fenster)",
        'ADMIN_SUPPORT_WIKI_LINK' => "Direktlink zum Doku-Wiki (neues Fenster)",
index a672182..af6981b 100644 (file)
@@ -51,11 +51,11 @@ addMessages(array(
        'ADMIN_ORDER_SELECTION_COLUMN' => "Tabellenspalte, nach der umsortiert werden soll",
        'ADMIN_ORDER_SELECTION_MODE' => "Sortierreihenfolge",
        'ADMIN_ORDER_SELECTION_SETTINGS' => "Auswahlverfahren der Empf&auml;nger",
-       'ADMIN_OPTION_MAX_TEXT_LENGTH' => "Maximale L&auml;nge des Werbetextes",
-       'ADMIN_OPTION_MAX_UNCONFIRMED_MAILS' => "Maximale Anzahl unbest. Mails (Mailbuchung)",
-       'ADMIN_OPTION_CHECK_EMAIL_TEXT' => "Sind URLs im Werbetext erlaubt?",
-       'ADMIN_OPTION_CHECK_EMAIL_SUBJECT' => "Sind URLs in der Betreffzeile erlaubt?",
-       'ADMIN_OPTION_URL_BLACKLIST' => "Black-Liste f&uuml;r gebuchte URLs aktivieren?",
+       'ADMIN_CONFIG_MAX_TEXT_LENGTH' => "Maximale L&auml;nge des Werbetextes",
+       'ADMIN_CONFIG_MAX_UNCONFIRMED_MAILS' => "Maximale Anzahl unbest. Mails (Mailbuchung)",
+       'ADMIN_CONFIG_CHECK_EMAIL_TEXT' => "Sind URLs im Werbetext erlaubt?",
+       'ADMIN_CONFIG_CHECK_EMAIL_SUBJECT' => "Sind URLs in der Betreffzeile erlaubt?",
+       'ADMIN_CONFIG_URL_BLACKLIST' => "Black-Liste f&uuml;r gebuchte URLs aktivieren?",
 
        'MEMBER_ORDER_ALLOWED_RECEIVE' => "Sie k&ouml;nnen heute noch <span class=\"data\">%s</span> von <span class=\"data\">%s</span> Mailbuchungen aufgeben.",
        'MEMBER_ORDER_ALLOWED_MAX' => "Sie k&ouml;nnen solange Mailbuchungen aufgeben, bis alle Mitglieder nicht mehr empfangsbereit sind.",
index e7e8121..3ec6e40 100644 (file)
@@ -42,45 +42,45 @@ if (!defined('__SECURITY')) {
 
 // Language constans
 addMessages(array(
-       'ADMIN_OTHER_SETTINGS' => "Sonstige Einstellungen",
-       'ADMIN_OPTION_URL_TIME_LOCK' => "Selbe beworbene URL nicht mehr bewerbar (0 = URL sofort erneut buchbar)",
-       'ADMIN_OPTION_POOL_MAX_SEND' => "Anzahl zu sendender Mails aus dem Pool",
-       'ADMIN_OPTION_LOCK_PROFILE_TIME' => "Sperrzeit des Mitgliedprofiles nach &Auml;nderung (0 = Keine Sperrzeit)",
-       'ADMIN_OPTION_AUTOSEND_ACTIVE' => "Ist der Auto-Versand aktiv?",
-       'ADMIN_OPTION_NOTIFY_ADMIN' => "Benachrichtigung bei Profil&auml;nderung?",
-       'ADMIN_OPTION_MAX_ONLINETIME' => "Timeout f&uuml;r Who-is-Online",
-       'ADMIN_OPTION_SEND_UPDATE' => "Mail zur Erneurung des Profiles senden?",
-       'ADMIN_SENDING_SETTINGS' => "Versand-Optionen",
-       'ADMIN_NOTIFY_SETTINGS' => "Benachrichtigungsoptionen",
-       'ADMIN_TIMEOUT_SETTINGS' => "Time-out Optionen",
-       'ADMIN_PROFILE_TIME_SETTINGS' => "Zeitenangaben f&uuml;r Mitgliederprofile",
-       'ADMIN_OPTION_PROFILE_UPDATE' => "Profilaktualisierungsinterval (0 = Keine Erinnerung aussenden)",
-       'ADMIN_OPTION_PROFILE_REUPDATE' => "Erneute Aussendung der Mail (0 = Keine Erinnerung aussenden)",
-       'ADMIN_OPTION_CODE_LENGTH' => "L&auml;nge des grafischen Codes im Best.-Frame (0 = Nur Button anklicken)",
+       'ADMIN_CONFIG_OTHER_TITLE' => "Sonstige Einstellungen",
+       'ADMIN_CONFIG_URL_TIME_LOCK' => "Selbe beworbene URL nicht mehr bewerbar (0 = URL sofort erneut buchbar)",
+       'ADMIN_CONFIG_POOL_MAX_SEND' => "Anzahl zu sendender Mails aus dem Pool",
+       'ADMIN_CONFIG_LOCK_PROFILE_TIME' => "Sperrzeit des Mitgliedprofiles nach &Auml;nderung (0 = Keine Sperrzeit)",
+       'ADMIN_CONFIG_AUTOSEND_ACTIVE' => "Ist der Auto-Versand aktiv?",
+       'ADMIN_CONFIG_NOTIFY_ADMIN' => "Benachrichtigung bei Profil&auml;nderung?",
+       'ADMIN_CONFIG_MAX_ONLINETIME' => "Timeout f&uuml;r Who-is-Online",
+       'ADMIN_CONFIG_SEND_UPDATE' => "Mail zur Erneurung des Profiles senden?",
+       'ADMIN_CONFIG_SENDING_TITLE' => "Versand-Optionen",
+       'ADMIN_CONFIG_NOTIFY_TITLE' => "Benachrichtigungsoptionen",
+       'ADMIN_CONFIG_TIMEOUT_TITLE' => "Time-out Optionen",
+       'ADMIN_CONFIG_PROFILE_TIME_TITLE' => "Zeitenangaben f&uuml;r Mitgliederprofile",
+       'ADMIN_CONFIG_PROFILE_UPDATE' => "Profilaktualisierungsinterval (0 = Keine Erinnerung aussenden)",
+       'ADMIN_CONFIG_PROFILE_REUPDATE' => "Erneute Aussendung der Mail (0 = Keine Erinnerung aussenden)",
+       'ADMIN_CONFIG_CODE_LENGTH' => "L&auml;nge des grafischen Codes im Best.-Frame (0 = Nur Button anklicken)",
        'ADMIN_CODE_LENGTH_NOTE' => "(Zeichenanzahl)",
-       'ADMIN_OPTION_ACTIVATE_EXCHANGE' => "Automatisches Freischalten des {?mt_word2?}, wenn x Mitglieder empfangsbereit sind. 0 = Funktion abschalten",
-       'ADMIN_OPTION_ZIPCODE_ACTIVE' => "Versand nach PLZ erlauben",
-       'ADMIN_OPTION_POINTS_WORD' => "W&auml;hrung Ihres Tausches (Klammlose, Wernis, Primera, FuCo, etc.)",
-       'ADMIN_OPTION_MAX_COMMA' => "Angezeigte Stellen hinter dem Komma",
-       'ADMIN_OPTION_CSS_PHP' => "Sollen die CSS-Dateien direkt ausgegeben werden oder von css.php angezeigt werden?",
-       'ADMIN_SELECT_CSS_OUTPUT_MODE_DIRECT' => "Per &lt;link&gt;-Tag ausgeben (Debug!)",
-       'ADMIN_SELECT_CSS_OUTPUT_MODE_FILE' => "Per css.php ausgeben",
-       'ADMIN_SELECT_CSS_OUTPUT_MODE_INLINE' => "In &lt;style&gt;-Tag ausgeben",
-       'ADMIN_OPTION_GUEST_MENU' => "Gastmen&uuml; ein-/ausblenden",
-       'ADMIN_OPTION_MEMBER_MENU' => "Mitgliedsmen&uuml; ein-/ausblenden",
-       'ADMIN_OPTION_YOURE_HERE' => "Navigation &quot;Sie sind hier&quot; ein-/ausblenden",
+       'ADMIN_CONFIG_ACTIVATE_EXCHANGE' => "Automatisches Freischalten des {?mt_word2?}, wenn x Mitglieder empfangsbereit sind. 0 = Funktion abschalten",
+       'ADMIN_CONFIG_ZIPCODE_ACTIVE' => "Versand nach PLZ erlauben",
+       'ADMIN_CONFIG_POINTS_WORD' => "W&auml;hrung Ihres Tausches (Klammlose, Wernis, Primera, FuCo, etc.)",
+       'ADMIN_CONFIG_MAX_COMMA' => "Angezeigte Stellen hinter dem Komma",
+       'ADMIN_CONFIG_CSS_PHP' => "Sollen die CSS-Dateien direkt ausgegeben werden oder von css.php angezeigt werden?",
+       'ADMIN_CONFIG_SELECT_CSS_OUTPUT_MODE_DIRECT' => "Per &lt;link&gt;-Tag ausgeben (Debug!)",
+       'ADMIN_CONFIG_SELECT_CSS_OUTPUT_MODE_FILE' => "Per css.php ausgeben",
+       'ADMIN_CONFIG_SELECT_CSS_OUTPUT_MODE_INLINE' => "In &lt;style&gt;-Tag ausgeben",
+       'ADMIN_CONFIG_GUEST_MENU' => "Gastmen&uuml; ein-/ausblenden",
+       'ADMIN_CONFIG_MEMBER_MENU' => "Mitgliedsmen&uuml; ein-/ausblenden",
+       'ADMIN_CONFIG_YOURE_HERE' => "Navigation &quot;Sie sind hier&quot; ein-/ausblenden",
        'ADMIN_IS_SHOWN' => "Einblenden",
        'ADMIN_IS_NOT_SHOWN' => "Ausblenden",
-       'ADMIN_OPTION_MT_WORD' => "Art Ihres Tausches (1. Fall)",
-       'ADMIN_OPTION_MT_WORD2' => "Art Ihres Tausches (2. Fall)",
-       'ADMIN_OPTION_MT_WORD3' => "Art Ihres Tausches (1. Fall, Plural)",
-       'ADMIN_OPTION_REJECT_URL' => "Standart-URL bei Ablehnung der Mailbuchung",
-       'ADMIN_OPTION_SHOW_TIMINGS' => "Skript-Statistiken im Seitenfuss einblenden (n&uuml;tzlich zum Debuggen)",
-       'ADMIN_OPTION_SHOW_POINTS_UNCONFIRMED' => "{?POINTS?} in unbest&auml;tige Mails im Mitgliedsbereich anzeigen?",
-       'ADMIN_OPTION_MINIMUM_AGE' => "Ab welchem Mindestalter d&uuml;rfen sich Ihre Mitglieder anmelden?",
-       'ADMIN_SQL_SETTINGS' => "SQL-Einstellungen",
-       'ADMIN_DISPLAY_DEBUG_SQLS' => "Sollen die SQL-Abfragen f&uuml;r Administratoren zu Debug-Zwecken angezeigt werden?.  Das Einschalten dieser Einstellung kann enorme Performanceverluste bedeuten.",
-       'ADMIN_STATS_SETTINGS' => "Interne Statistik Einstellungen",
+       'ADMIN_CONFIG_MT_WORD' => "Art Ihres Tausches (1. Fall)",
+       'ADMIN_CONFIG_MT_WORD2' => "Art Ihres Tausches (2. Fall)",
+       'ADMIN_CONFIG_MT_WORD3' => "Art Ihres Tausches (1. Fall, Plural)",
+       'ADMIN_CONFIG_REJECT_URL' => "Standart-URL bei Ablehnung der Mailbuchung",
+       'ADMIN_CONFIG_SHOW_TIMINGS' => "Skript-Statistiken im Seitenfuss einblenden (n&uuml;tzlich zum Debuggen)",
+       'ADMIN_CONFIG_SHOW_POINTS_UNCONFIRMED' => "{?POINTS?} in unbest&auml;tige Mails im Mitgliedsbereich anzeigen?",
+       'ADMIN_CONFIG_MINIMUM_AGE' => "Ab welchem Mindestalter d&uuml;rfen sich Ihre Mitglieder anmelden?",
+       'ADMIN_CONFIG_SQL_TITLE' => "SQL-Einstellungen",
+       'ADMIN_CONFIG_DISPLAY_DEBUG_SQLS' => "Sollen die SQL-Abfragen f&uuml;r Administratoren zu Debug-Zwecken angezeigt werden?.  Das Einschalten dieser Einstellung kann enorme Performanceverluste bedeuten.",
+       'ADMIN_CONFIG_STATS_TITLE' => "Interne Statistik Einstellungen",
        'ADMIN_CONFIG_STATS_ENABLED' => "Sollen die internen Statistiken eingeschaltet sein? Das Abschalten dieser Statistiken kann etwas Performance bringen, ist aber f&uuml;r Performancemessungen vorraussetzend.",
 ));
 
index 4bfdd04..4a0ddb5 100644 (file)
@@ -302,8 +302,8 @@ function doRegistration () {
                detectServerName() . getEncryptSeperator() .
                detectRemoteAddr() . getEncryptSeperator() .
                detectUserAgent() . '/' .
-               getConfig('SITE_KEY') . '/' .
-               getConfig('DATE_KEY') . '/' .
+               getSiteKey() . '/' .
+               getDateKey() . '/' .
                getConfig('CACHE_BUSTER')
        ));
 
index c44c562..46c1250 100644 (file)
@@ -83,7 +83,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
        } // END - if
 
        // Is the API id and MD5 hash there?
-       if ((getConfig('wernis_api_id') == '') || (getConfig('wernis_api_md5') == '')) {
+       if ((getWernisApiId() == '') || (getWernisApiMd5() == '')) {
                // Abort here...
                return array(
                        'status'  => 'failed_general',
@@ -92,8 +92,8 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
        } // END - if
 
        // Add more request data
-       $requestData['api_id']  = getConfig('wernis_api_id');
-       $requestData['api_key'] = getConfig('wernis_api_md5');
+       $requestData['api_id']  = getWernisApiId();
+       $requestData['api_key'] = getWernisApiMd5();
 
        // Is a purpose there?
        if (isset($requestData['purpose'])) {
@@ -105,7 +105,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
        } // END - if
 
        // Construct the request string
-       $requestString = getConfig('wernis_api_url') . $scriptName;
+       $requestString = getWernisApiUrl() . $scriptName;
 
        // Get the raw response from the lower function
        $response = sendPostRequest($requestString, $requestData);
@@ -233,7 +233,7 @@ function WERNIS_TEST_API () {
 // Widthdraw this amount
 function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
        // Is the sponsor extension installed?
-       if (getConfig('wernis_withdraw_active') != 'Y') {
+       if (!isWernisWithdrawActive()) {
                if (!isExtensionActive('sponsor')) {
                        // No, abort here
                        return false;
@@ -251,7 +251,7 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
                'sub_request' => 'receive',
                't_uid'       => bigintval($wdsId),
                't_md5'       => $userMd5,
-               'r_uid'       => getConfig('wernis_refid'),
+               'r_uid'       => getWernisRefid(),
                'amount'      => bigintval($amount),
                'purpose'     => getMaskedMessage('WERNIS_API_PURPOSE_WITHDRAW', getMemberId())
        );
@@ -286,8 +286,8 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
        // Prepare the request data
        $requestData = array(
                'sub_request' => 'send',
-               't_uid'       => getConfig('wernis_refid'),
-               't_md5'       => getConfig('wernis_pass_md5'),
+               't_uid'       => getWernisRefid(),
+               't_md5'       => getWernisPassMd5(),
                'r_uid'       => bigintval($wdsId),
                'amount'      => bigintval($amount),
                'purpose'     => getMaskedMessage('WERNIS_API_PURPOSE_PAYOUT', getMemberId())
@@ -341,8 +341,15 @@ function translateWernisTransferStatus ($status) {
 // Log the transfer
 function WERNIS_LOG_TRANSFER ($wdsId, $amount, $type = 'FAILED', $message = '', $status = '') {
        // Register this wernis movement
-       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_wernis` (`userid`,`wernis_account`,`wernis_amount`,`wernis_timestamp`,`wernis_type`,`wernis_api_message`,`wernis_api_status`) VALUES (%d, %d, %d, UNIX_TIMESTAMP(), '%s', '%s', '%s')",
-               array(getMemberId(), bigintval($wdsId), bigintval($amount), $type, $message, $status), __FUNCTION__, __LINE__);
+       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_wernis` (`userid`,`wernis_account`,`wernis_amount`,`wernis_timestamp`,`wernis_type`,`wernis_api_message`,`wernis_api_status`) VALUES (%s, %s, %s, UNIX_TIMESTAMP(), '%s', '%s', '%s')",
+               array(
+                       getMemberId(),
+                       bigintval($wdsId),
+                       bigintval($amount),
+                       $type,
+                       $message,
+                       $status
+               ), __FUNCTION__, __LINE__);
 }
 
 // Take fees and factor
@@ -351,47 +358,207 @@ function WERNIS_TAKE_FEE ($points, $mode) {
        //* DEBUG: */ debugOutput('mode='.$mode.',points='.$points);
        if (!in_array($mode, array('payout', 'withdraw'))) {
                // Log error and abort
-               logDebugMessage(__FUNCTION__, __LINE__, "userid={getMemberId()},mode={$mode},points={$points}");
+               logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . getMemberId() . ',mode=' . $mode . ',points=' . $points);
                return false;
        } // END - if
 
        // Is there a percentage or fixed fee?
-       if (getConfig('wernis_'.$mode.'_fee_percent') > 0) {
+       if (getConfig('wernis_' . $mode . '_fee_percent') > 0) {
                // Percentage fee
                $points -= $points * getConfig('wernis_'.$mode.'_fee_percent') / 100;
-       } elseif (getConfig('wernis_'.$mode.'_fee_fix') > 0) {
+       } elseif (getConfig('wernis_' . $mode . '_fee_fix') > 0) {
                // Fixed fee
-               $points -= getConfig('wernis_'.$mode.'_fee_fix');
+               $points -= getConfig('wernis_' . $mode . '_fee_fix');
        }
 
        // Divide/multiply the factor
        if ($mode == 'payout') {
                // Divide for payout
-               $points = $points / getConfig('wernis_payout_factor');
+               $points = $points / getWernisPayoutFactor();
        } else {
                // Multiply for withdraw
-               $points = $points * getConfig('wernis_withdraw_factor');
+               $points = $points * getWernisWithdrawFactor();
        }
 
        // Return value
-       //* DEBUG: */ debugOutput('mode='.$mode.',points='.$points);
+       //* DEBUG: */ debugOutput('mode=' . $mode . ',points=' . $points);
        return $points;
 }
 
 // Add withdraw fees and factor
 function WERNIS_ADD_WITHDRAW_FEE ($points) {
        // Is there a percentage or fixed fee?
-       if (getConfig('wernis_withdraw_fee_percent') > 0) {
+       if (getWernisWithdrawFeePercent() > 0) {
                // Percentage fee
-               $points += $points * getConfig('wernis_withdraw_fee_percent') / 100;
-       } elseif (getConfig('wernis_withdraw_fee_fix') > 0) {
+               $points += $points * getWernisWithdrawFeePercent() / 100;
+       } elseif (getWernisWithdrawFeeFix() > 0) {
                // Fixed fee
-               $points += getConfig('wernis_withdraw_fee_fix');
+               $points += getWernisWithdrawFeeFix();
        }
 
        // Return value
        return $points;
 }
 
+// ---------------------------------------------------------------------------
+//                             Wrapper functions
+// ---------------------------------------------------------------------------
+
+// Wrapper function for 'wernis_refid'
+function getWernisRefid () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Get config entry
+               $GLOBALS[__FUNCTION__] = getConfig('wernis_refid');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Wrapper function for 'wernis_pass_md5'
+function getWernisPassMd5 () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Get config entry
+               $GLOBALS[__FUNCTION__] = getConfig('wernis_pass_md5');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Wrapper function for 'wernis_api_id'
+function getWernisApiId () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Get config entry
+               $GLOBALS[__FUNCTION__] = getConfig('wernis_api_id');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Wrapper function for 'wernis_api_md5'
+function getWernisApiMd5 () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Get config entry
+               $GLOBALS[__FUNCTION__] = getConfig('wernis_api_md5');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Wrapper function for 'wernis_api_url'
+function getWernisApiUrl () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Get config entry
+               $GLOBALS[__FUNCTION__] = getConfig('wernis_api_url');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Wrapper function for 'wernis_withdraw_active'
+function getWernisWithdrawActive () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Get config entry
+               $GLOBALS[__FUNCTION__] = getConfig('wernis_withdraw_active');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Wrapper function for 'wernis_payout_active'
+function getWernisPayoutActive () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Get config entry
+               $GLOBALS[__FUNCTION__] = getConfig('wernis_payout_active');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Wrapper function for 'wernis_withdraw_active'
+function isWernisWithdrawActive () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Get config entry
+               $GLOBALS[__FUNCTION__] = (getConfig('wernis_withdraw_active') == 'Y');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Wrapper function for 'wernis_payout_active'
+function isWernisPayoutActive () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Get config entry
+               $GLOBALS[__FUNCTION__] = (getConfig('wernis_payout_active') == 'Y');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Wrapper function for 'wernis_withdraw_factor'
+function getWernisWithdrawFactor () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Get config entry
+               $GLOBALS[__FUNCTION__] = getConfig('wernis_withdraw_factor');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Wrapper function for 'wernis_payout_factor'
+function getWernisPayoutFactor () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Get config entry
+               $GLOBALS[__FUNCTION__] = getConfig('wernis_payout_factor');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Wrapper function for 'wernis_withdraw_fee_percent'
+function getWernisWithdrawFeePercent () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Get config entry
+               $GLOBALS[__FUNCTION__] = getConfig('wernis_withdraw_fee_percent');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// Wrapper function for 'wernis_withdraw_fee_fix'
+function getWernisWithdrawFeeFix () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Get config entry
+               $GLOBALS[__FUNCTION__] = getConfig('wernis_withdraw_fee_fix');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
 // [EOF]
 ?>
index eef42ad..ad48308 100644 (file)
@@ -199,7 +199,7 @@ if (!isAdminRegistered()) {
                        );
 
                        // Validation okay so display form for final password change
-                       loadTemplate('form_reset_password_form', false, $content);
+                       loadTemplate('admin_reset_password_form', false, $content);
                } else {
                        // Cannot validate the login data and hash
                        loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}');
@@ -208,14 +208,14 @@ if (!isAdminRegistered()) {
                // Okay, we shall the admin password here. So first revalidate the hash
                if (adminResetValidateHashLogin(postRequestParameter('hash'), postRequestParameter('login'))) {
                        // Output result
-                       loadTemplate('form_reset_pass_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1')));
+                       loadTemplate('admin_reset_password_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1')));
                } else {
                        // Validation failed
                        loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
                }
        } else {
                // Output reset password form
-               loadTemplate('admin_send_reset_link');
+               loadTemplate('admin_reset_password_send_link');
        }
 } elseif ((!isSessionVariableSet('admin_id')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last'))) {
        // At leat one administrator account was created
@@ -300,19 +300,29 @@ if (!isAdminRegistered()) {
                        $passwdMessage = '';
 
                        // No login entered?
-                       if (!isPostRequestParameterSet('login')) $loginMessage = '{--ADMIN_NO_LOGIN--}';
+                       if (!isPostRequestParameterSet('login')) {
+                               $loginMessage = '{--ADMIN_NO_LOGIN--}';
+                       } // END - if
 
                        // An error comes back from login?
-                       if ((!empty($ret)) && (postRequestParameter('ok') == '404')) $loginMessage = $ret;
+                       if ((!empty($ret)) && (postRequestParameter('ok') == '404')) {
+                               $loginMessage = $ret;
+                       } // END - if
 
                        // No password entered?
-                       if (!isPostRequestParameterSet('password')) $passwdMessage = '{--ADMIN_NO_PASS--}';
+                       if (!isPostRequestParameterSet('password')) {
+                               $passwdMessage = '{--ADMIN_NO_PASS--}';
+                       } // END - if
 
                        // Or password too short?
-                       if (strlen(postRequestParameter('password')) < 4) $passwdMessage = '{--ADMIN_SHORT_PASS--}';
+                       if (strlen(postRequestParameter('password')) < 4) {
+                               $passwdMessage = '{--ADMIN_SHORT_PASS--}';
+                       } // END - if
 
                        // An error comes back from login?
-                       if ((!empty($ret)) && (postRequestParameter('ok') == 'password')) $passwdMessage = $ret;
+                       if ((!empty($ret)) && (postRequestParameter('ok') == 'password')) {
+                               $passwdMessage = $ret;
+                       } // END - if
 
                        // Load message template
                        $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
index 126e4dd..904a5d1 100644 (file)
@@ -1136,13 +1136,13 @@ function sendAdminPasswordResetLink ($email) {
        unset($content['password']);
 
        // Prepare email
-       $mailText = loadEmailTemplate('form_reset_password', $content);
+       $mailText = loadEmailTemplate('admin_reset_password', $content);
 
        // Send it out
-       sendEmail($email, '{--ADMIN_RESET_PASS_LINK_SUBJECT--}', $mailText);
+       sendEmail($email, '{--ADMIN_RESET_PASSWORD_LINK_SUBJECT--}', $mailText);
 
        // Prepare output
-       return '{--ADMIN_RESET_LINK_SENT--}';
+       return '{--ADMIN_RESET_PASSWORD_LINK_SENT--}';
 }
 
 // Validate hash and login for password reset
index eca649d..97e547a 100644 (file)
@@ -136,7 +136,9 @@ if (!isGetRequestParameterSet('mid')) {
 
 // Run SQL query for normal mails
 $result_list = SQL_QUERY($sql, __FILE__, __LINE__);
-if ((!empty($SQL2)) && (empty($WHO))) $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
+if ((!empty($SQL2)) && (empty($WHO))) {
+       $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
+} // END - if
 
 // Calculate pages
 $numPages = '0';
index e6c3d62..27166d8 100644 (file)
@@ -56,13 +56,13 @@ $rdf = new fase4_rdf();
 $rdf->_use_nl2br = false;
 $rdf->use_dynamic_display(false);
 $rdf->set_CacheDir(getCachePath() . '');
-$rdf->set_salt(md5(getConfig('SITE_KEY')));
+$rdf->set_salt(md5(getSiteKey()));
 $rdf->set_max_item(10);
 $rdf->set_Options(
        array(
                'textinput' => 'hidden',
                'sitelink'  => 'http://www.wds66.com',
-               'refid'     => getConfig('wernis_refid'),
+               'refid'     => getWernisRefid(),
                'reflink'   => '/ref.php?refid=',
        )
 );
@@ -70,12 +70,12 @@ $rdf->set_Options(
 // Use proxy?
 if (isProxyUsed()) {
        // Set proxy data
-       $rdf->set_proxy(getConfig('proxy_host'), getConfig('proxy_port'));
+       $rdf->set_proxy(getProxyHost(), getProxyPort());
 
        // Use auth?
-       if (getConfig('proxy_username') != '') {
+       if (getProxyUsername() != '') {
                // Set auth data
-               $rdf->set_proxy_auth(getConfig('proxy_username'), getConfig('proxy_password'));
+               $rdf->set_proxy_auth(getProxyUsername(), getProxyPassword());
        } // END  - if
 } // END - if
 
index e1a6504..f8c4399 100644 (file)
@@ -52,7 +52,7 @@ if ((!isExtensionActive('wernis')) && (!isAdmin())) {
 } // END - if
 
 // Check if the admin has entered the data
-if ((getConfig('wernis_api_id') == '') || (getConfig('wernis_api_md5') == '')) {
+if ((getWernisApiId() == '') || (getWernisApiMd5() == '')) {
        // Something important is missing...
        loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_API_DATA_MISSING--}');
        return;
@@ -104,7 +104,7 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo
                } // END - if
 
                // Is the withdraw mode active?
-               if (getConfig('wernis_withdraw_active') == 'Y') {
+               if (isWernisWithdrawActive()) {
                        // Add link
                        $content['withdraw_link'] = '<a class="menu_blur" style="height: 40px" href="{%url=modules.php?module=login&amp;what=wernis&amp;mode=withdraw%}"><div style="padding-top: 10px">{--MEMBER_WERNIS_MODE_WITHDRAW--}</div></a>';
                } // END - if
@@ -132,7 +132,7 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo
 
        // Add points to content array
        $content['points']     = $points;
-} elseif ((getRequestParameter('mode') == 'withdraw') && (getConfig('wernis_withdraw_active') == 'Y')) {
+} elseif ((getRequestParameter('mode') == 'withdraw') && (isWernisWithdrawActive())) {
        // Prepare data for the template
        $content['points']        = getTotalPoints(getMemberId());
        $content['wernis_userid'] = '';
index 4a3b1cb..d15de9e 100644 (file)
@@ -331,7 +331,7 @@ function loadTemplate ($template, $return = false, $content = array(), $compileC
        (' . $template . ')
 </div>
 <div class="para">
-       {--TEMPLATE_CONTENT--}
+       {--TEMPLATE_CONTENT--}:
        <pre>' . print_r($content, true) . '</pre>
 </div>';
                } else {
@@ -490,9 +490,9 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0', $loadU
        {--TEMPLATE_404--}: ' . $template . '
 </div>
 <div class="para">
-       {--TEMPLATE_CONTENT--}
+       {--TEMPLATE_CONTENT--}:
        <pre>' . print_r($content, true) . '</pre>
-       {--TEMPLATE_DATA--}
+       {--TEMPLATE_DATA--}:
        <pre>' . print_r($DATA, true) . '</pre>
 </div>';
 
index b5d5bf4..19da2ee 100644 (file)
@@ -1512,6 +1512,30 @@ function getSecretKey () {
        return $GLOBALS[__FUNCTION__];
 }
 
+// "Getter" for SITE_KEY
+function getSiteKey () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('SITE_KEY');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for DATE_KEY
+function getDayKey () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('DATE_KEY');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
 // "Getter" for master_salt
 function getMasterSalt () {
        // Do we have cache?
@@ -2076,6 +2100,18 @@ function getMailsPage () {
        return $GLOBALS[__FUNCTION__];
 }
 
+// "Getter" for rand_no
+function getRandNo () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('rand_no');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
 // "Getter" for __DB_NAME
 function getDbName () {
        // Do we have cache?
@@ -2100,6 +2136,54 @@ function getDomain () {
        return $GLOBALS[__FUNCTION__];
 }
 
+// "Getter" for proxy_username
+function getProxyUsername () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('proxy_username');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for proxy_password
+function getProxyPassword () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('proxy_password');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for proxy_host
+function getProxyHost () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('proxy_host');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for proxy_port
+function getProxyPort () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('proxy_port');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
 // "Getter" for SMTP_HOSTNAME
 function getSmtpHostname () {
        // Do we have cache?
index 14e5f09..21cfdf9 100644 (file)
@@ -3,12 +3,12 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_AUTOPURGE_CONFIGURATION--}</strong>
+                       <strong>{--ADMIN_CONFIG_AUTOPURGE_TITLE--}</strong>
                </td>
        </tr>
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       {--ADMIN_AUTOPURGE_INACTIVE_TITLE--}
+                       {--ADMIN_CONFIG_AUTOPURGE_INACTIVE_TITLE--}
                </td>
        </tr>
        <tr>
        </tr>
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       {--ADMIN_AUTOPURGE_MAILID_TITLE--}
+                       {--ADMIN_CONFIG_AUTOPURGE_MAILID_TITLE--}
                </td>
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_OPTION_AUTOPURGE_ACTIVE--}:
+                       {--ADMIN_CONFIG_AUTOPURGE_ACTIVE--}:
                </td>
                <td>
                        <input type="radio" class="form_field" name="auto_purge_active" value="Y"$content[auto_purge_active_y] /> {--YES--}<br />
@@ -65,7 +65,7 @@
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_OPTION_MAIL_LIFETIME--}:
+                       {--ADMIN_CONFIG_MAIL_LIFETIME--}:
                </td>
                <td>
                        $content[auto_purge]
index 09816d9..359867c 100644 (file)
@@ -26,7 +26,7 @@
 
        <tr>
                <td align="right">
-                       {--ADMIN_OPTION_MAX_UNCONFIRMED_MAILS--}:
+                       {--ADMIN_CONFIG_MAX_UNCONFIRMED_MAILS--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="unconfirmed" size="10" maxlength="10" value="{?unconfirmed?}" />
@@ -35,7 +35,7 @@
 
        <tr>
                <td align="right">
-                       {--ADMIN_OPTION_MAX_TEXT_LENGTH--}:
+                       {--ADMIN_CONFIG_MAX_TEXT_LENGTH--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="max_tlength" size="10" maxlength="100" value="{?max_tlength?}" />
@@ -44,7 +44,7 @@
 
        <tr>
                <td align="right">
-                       {--ADMIN_OPTION_CHECK_EMAIL_TEXT--}
+                       {--ADMIN_CONFIG_CHECK_EMAIL_TEXT--}
                </td>
                <td>
                        <input type="radio" class="form_field" name="allow_url_in_text" value="Y"$content[allow_url_in_text_y] />{--YES--}<br />
@@ -54,7 +54,7 @@
 
        <tr>
                <td align="right">
-                       {--ADMIN_OPTION_CHECK_EMAIL_SUBJECT--}
+                       {--ADMIN_CONFIG_CHECK_EMAIL_SUBJECT--}
                </td>
                <td>
                        <input type="radio" class="form_field" name="allow_url_in_subject" value="Y"$content[allow_url_in_subject_y] /> {--YES--}<br />
@@ -64,7 +64,7 @@
 
        <tr>
                <td align="right">
-                       {--ADMIN_OPTION_URL_BLACKLIST--}
+                       {--ADMIN_CONFIG_URL_BLACKLIST--}
                </td>
                <td>
                        <input type="radio" class="form_field" name="url_blacklist" value="Y"$content[url_blacklist_y] /> {--YES--}<br />
index bf170f3..401971c 100644 (file)
@@ -3,12 +3,14 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_OTHER_SETTINGS--}</strong>
+                       <strong>{--ADMIN_CONFIG_OTHER_TITLE--}</strong>
                </td>
        </tr>
 
        <tr>
-               <td align="right" width="300">{--ADMIN_OPTION_CODE_LENGTH--}:</td>
+               <td align="right" width="300">
+                       {--ADMIN_CONFIG_CODE_LENGTH--}:
+               </td>
                <td>
                        <input type="text" class="form_field" name="code_length" size="3" maxlength="5" value="{?code_length?}" />
                        <div class="tiny">{--ADMIN_CODE_LENGTH_NOTE--}</div>
@@ -17,7 +19,7 @@
 
        <tr>
                <td align="right">
-                       {--ADMIN_OPTION_ACTIVATE_EXCHANGE--}:
+                       {--ADMIN_CONFIG_ACTIVATE_EXCHANGE--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="activate_xchange" size="10" maxlength="10" value="{?activate_xchange?}" />
@@ -26,7 +28,7 @@
 
        <tr>
                <td align="right">
-                       {--ADMIN_OPTION_MINIMUM_AGE--}:
+                       {--ADMIN_CONFIG_MINIMUM_AGE--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="min_age" size="3" maxlength="3" value="{?min_age?}" />
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_POINTS_WORD--}:</td>
+               <td align="right">
+                       {--ADMIN_CONFIG_POINTS_WORD--}:
+               </td>
                <td>
                        <input type="text" class="form_field" name="points_word" size="7" maxlength="255" value="{?POINTS?}" />
                </td>
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_MT_WORD--}:</td>
+               <td align="right">
+                       {--ADMIN_CONFIG_MT_WORD--}:
+               </td>
                <td>
                        <input type="text" class="form_field" name="mt_word" size="15" maxlength="255" value="{?mt_word?}" />
                </td>
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_MT_WORD2--}:</td>
+               <td align="right">
+                       {--ADMIN_CONFIG_MT_WORD2--}:
+               </td>
                <td>
                        <input type="text" class="form_field" name="mt_word2" size="15" maxlength="255" value="{?mt_word2?}" />
                </td>
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_MT_WORD3--}:</td>
+               <td align="right">
+                       {--ADMIN_CONFIG_MT_WORD3--}:
+               </td>
                <td>
                        <input type="text" class="form_field" name="mt_word3" size="15" maxlength="255" value="{?mt_word3?}" />
                </td>
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_MAX_COMMA--}:</td>
+               <td align="right">
+                       {--ADMIN_CONFIG_MAX_COMMA--}:
+               </td>
                <td>
                        <!-- @TODO Rewrite this selection to one of our functions //-->
                        <select name="max_comma" size="1" class="form_select">
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_REJECT_URL--}:</td>
+               <td align="right">
+                       {--ADMIN_CONFIG_REJECT_URL--}:
+               </td>
                <td>
                        <input type="text" class="form_field" name="reject_url" size="15" maxlength="255" value="{?reject_url?}" />
                </td>
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_CSS_PHP--}:</td>
+               <td align="right">
+                       {--ADMIN_CONFIG_CSS_PHP--}:
+               </td>
                <td>
-                       <input type="radio" class="form_field" name="css_php" value="DIRECT"$content[css_php_direct] /> {--ADMIN_SELECT_CSS_OUTPUT_MODE_DIRECT--}<br />
-                       <input type="radio" class="form_field" name="css_php" value="FILE"$content[css_php_file] /> {--ADMIN_SELECT_CSS_OUTPUT_MODE_FILE--}<br />
-                       <input type="radio" class="form_field" name="css_php" value="INLINE"$content[css_php_inline] /> {--ADMIN_SELECT_CSS_OUTPUT_MODE_INLINE--}
+                       <input type="radio" class="form_field" name="css_php" value="DIRECT"$content[css_php_direct] /> {--ADMIN_CONFIG_SELECT_CSS_OUTPUT_MODE_DIRECT--}<br />
+                       <input type="radio" class="form_field" name="css_php" value="FILE"$content[css_php_file] /> {--ADMIN_CONFIG_SELECT_CSS_OUTPUT_MODE_FILE--}<br />
+                       <input type="radio" class="form_field" name="css_php" value="INLINE"$content[css_php_inline] /> {--ADMIN_CONFIG_SELECT_CSS_OUTPUT_MODE_INLINE--}
                </td>
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_GUEST_MENU--}:</td>
+               <td align="right">
+                       {--ADMIN_CONFIG_GUEST_MENU--}:
+               </td>
                <td>
                        <input type="radio" class="form_field" name="guest_menu" value="Y"$content[guest_menu_y] /> {--ADMIN_IS_SHOWN--}<br />
                        <input type="radio" class="form_field" name="guest_menu" value="N"$content[guest_menu_n] /> {--ADMIN_IS_NOT_SHOWN--}
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_MEMBER_MENU--}:</td>
+               <td align="right">
+                       {--ADMIN_CONFIG_MEMBER_MENU--}:
+               </td>
                <td>
                        <input type="radio" class="form_field" name="member_menu" value="Y"$content[member_menu_y] /> {--ADMIN_IS_SHOWN--}<br />
                        <input type="radio" class="form_field" name="member_menu" value="N"$content[member_menu_n] /> {--ADMIN_IS_NOT_SHOWN--}
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_YOURE_HERE--}:</td>
+               <td align="right">
+                       {--ADMIN_CONFIG_YOURE_HERE--}:
+               </td>
                <td>
                        <input type="radio" class="form_field" name="youre_here" value="Y"$content[youre_here_y] /> {--ADMIN_IS_SHOWN--}<br />
                        <input type="radio" class="form_field" name="youre_here" value="N"$content[youre_here_n] /> {--ADMIN_IS_NOT_SHOWN--}
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_SHOW_TIMINGS--}:</td>
+               <td align="right">
+                       {--ADMIN_CONFIG_SHOW_TIMINGS--}:
+               </td>
                <td>
                        <input type="radio" class="form_field" name="show_timings" value="Y"$content[show_timings_y] /> {--YES--}<br />
                        <input type="radio" class="form_field" name="show_timings" value="N"$content[show_timings_n] /> {--NO--}
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_SHOW_POINTS_UNCONFIRMED--}:</td>
+               <td align="right">
+                       {--ADMIN_CONFIG_SHOW_POINTS_UNCONFIRMED--}:
+               </td>
                <td>
                        <input type="radio" class="form_field" name="show_points_unconfirmed" value="Y"$content[show_points_unconfirmed_y] /> {--YES--}<br />
                        <input type="radio" class="form_field" name="show_points_unconfirmed" value="N"$content[show_points_unconfirmed_n] /> {--NO--}
        </tr>
 
        <tr>
-               <td class="bottom" align="right">{--ADMIN_OPTION_MAILID_REDIRECT--}:</td>
+               <td class="bottom" align="right">
+                       {--ADMIN_CONFIG_MAILID_REDIRECT--}:
+               </td>
                <td class="bottom">
                        <input type="radio" class="form_field" name="mailid_error_redirect" value="INDEX"$content[mailid_error_redirect_index] /> {--ADMIN_CONFIG_MAILID_REDIRECT_INDEX--}<br />
                        <input type="radio" class="form_field" name="mailid_error_redirect" value="REJECT"$content[mailid_error_redirect_reject] /> {--ADMIN_CONFIG_MAILID_REDIRECT_REJECT--}
 
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_SENDING_SETTINGS--}</strong>
+                       <strong>{--ADMIN_CONFIG_SENDING_TITLE--}</strong>
                </td>
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_POOL_MAX_SEND--}:</td>
+               <td align="right">
+                       {--ADMIN_CONFIG_POOL_MAX_SEND--}:
+               </td>
                <td align="center">
                        <input type="text" class="form_field" name="max_send" size="10" maxlength="100" value="{?max_send?}" />
                </td>
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_ZIPCODE_ACTIVE--}:</td>
+               <td align="right">
+                       {--ADMIN_CONFIG_ZIPCODE_ACTIVE--}:
+               </td>
                <td align="center">
                        <input type="radio" class="form_field" name="order_multi_page" value="Y"$content[order_multi_page_y] /> {--YES--}<br />
                        <input type="radio" class="form_field" name="order_multi_page" value="N"$content[order_multi_page_n] /> {--NO--}
        </tr>
 
        <tr>
-               <td class="bottom" align="right">{--ADMIN_OPTION_AUTOSEND_ACTIVE--}:</td>
+               <td class="bottom" align="right">
+                       {--ADMIN_CONFIG_AUTOSEND_ACTIVE--}:
+               </td>
                <td class="bottom" align="center">
                        <input type="radio" class="form_field" name="autosend_active" value="Y"$content[autosend_active_y] /> {--YES--}<br />
                        <input type="radio" class="form_field" name="autosend_active" value="N"$content[autosend_active_n] /> {--NO--}
 
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_NOTIFY_SETTINGS--}</strong>
+                       <strong>{--ADMIN_CONFIG_NOTIFY_TITLE--}</strong>
                </td>
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_SEND_UPDATE--}:</td>
+               <td align="right">
+                       {--ADMIN_CONFIG_SEND_UPDATE--}:
+               </td>
                <td align="center">
                        <input type="radio" class="form_field" name="send_prof_update" value="Y"$content[send_prof_update_y] /> {--YES--}<br />
                        <input type="radio" class="form_field" name="send_prof_update" value="N"$content[send_prof_update_n] /> {--NO--}
        </tr>
 
        <tr>
-               <td class="bottom" align="right">{--ADMIN_OPTION_NOTIFY_ADMIN--}:</td>
+               <td class="bottom" align="right">
+                       {--ADMIN_CONFIG_NOTIFY_ADMIN--}:
+               </td>
                <td class="bottom" align="center">
                        <input type="radio" class="form_field" name="admin_notify" value="Y"$content[admin_notify_y] /> {--YES--}<br />
                        <input type="radio" class="form_field" name="admin_notify" value="N"$content[admin_notify_n] /> {--NO--}
 
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_TIMEOUT_SETTINGS--}</strong>
+                       <strong>{--ADMIN_CONFIG_TIMEOUT_TITLE--}</strong>
                </td>
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_MAX_ONLINETIME--}:</td>
+               <td align="right">{--ADMIN_CONFIG_MAX_ONLINETIME--}:</td>
                <td>$content[online_timeout]</td>
        </tr>
 
        <tr>
-               <td class="bottom" align="right">{--ADMIN_OPTION_URL_TIME_LOCK--}:</td>
+               <td class="bottom" align="right">{--ADMIN_CONFIG_URL_TIME_LOCK--}:</td>
                <td class="bottom">$content[url_tlock]</td>
        </tr>
 
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_PROFILE_TIME_SETTINGS--}</strong>
+                       <strong>{--ADMIN_CONFIG_PROFILE_TIME_TITLE--}</strong>
                </td>
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_LOCK_PROFILE_TIME--}:</td>
+               <td align="right">{--ADMIN_CONFIG_LOCK_PROFILE_TIME--}:</td>
                <td>$content[profile_lock]</td>
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_PROFILE_UPDATE--}:</td>
+               <td align="right">{--ADMIN_CONFIG_PROFILE_UPDATE--}:</td>
                <td>$content[profile_update]</td>
        </tr>
 
        <tr>
-               <td class="bottom" align="right">{--ADMIN_OPTION_PROFILE_REUPDATE--}:</td>
+               <td class="bottom" align="right">{--ADMIN_CONFIG_PROFILE_REUPDATE--}:</td>
                <td class="bottom">$content[profile_reupdate]</td>
        </tr>
 
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_SQL_SETTINGS--}</strong>
+                       <strong>{--ADMIN_CONFIG_SQL_TITLE--}</strong>
                </td>
        </tr>
 
        <tr>
-               <td class="bottom" align="right">{--ADMIN_DISPLAY_DEBUG_SQLS--}</td>
+               <td class="bottom" align="right">
+                       {--ADMIN_CONFIG_DISPLAY_DEBUG_SQLS--}
+               </td>
                <td class="bottom" align="center">
                        <input type="radio" class="form_field" name="display_debug_sqls" value="Y"$content[display_debug_sqls_y] /> {--YES--}<br />
                        <input type="radio" class="form_field" name="display_debug_sqls" value="N"$content[display_debug_sqls_n] /> {--NO--}
 
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_STATS_SETTINGS--}</strong>
+                       <strong>{--ADMIN_CONFIG_STATS_TITLE--}</strong>
                </td>
        </tr>
 
        <tr>
-               <td class="bottom" align="right">{--ADMIN_CONFIG_STATS_ENABLED--}</td>
+               <td class="bottom" align="right">
+                       {--ADMIN_CONFIG_STATS_ENABLED--}
+               </td>
                <td class="bottom" align="center">
                        <input type="radio" class="form_field" name="stats_enabled" value="Y"$content[stats_enabled_y] /> {--YES--}<br />
                        <input type="radio" class="form_field" name="stats_enabled" value="N"$content[stats_enabled_n] /> {--NO--}
index 82732fa..eee3792 100644 (file)
@@ -1,11 +1,12 @@
-<div align="center" class="admin dashed">
+<div align="center">
+<div class="admin dashed">
        <div class="admin_content">
                <div class="para">
                        <strong>{--ADMIN_LOGOUT_SQL_PATCHES_REMOVE--}</strong>
                </div>
                <div class="para">
-                       <a class="admin_content" href="{%url=modules.php?module=admin&amp;reset_pass=1%}">{--ADMIN_RESET_PASS_LINK--}</a>
+                       <a class="admin_content" href="{%url=modules.php?module=admin&amp;reset_pass=1%}">{--ADMIN_RESET_PASSWORD_LINK--}</a>
                </div>
        </div>
-</table>
+</div>
 </div>
index 25cb1bb..11f5d85 100644 (file)
@@ -1,17 +1 @@
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-<tr>
-       <td class="table_header bottom">
-               <strong>{--ADMIN_RESET_PASS_DONE_TITLE--}</strong>
-       </td>
-</tr>
-<tr>
-       <td class="bottom">
-               $content
-       </td>
-</tr>
-<tr>
-       <td class="table_footer">
-               &raquo;&raquo;&nbsp;<strong><a href="{%url=modules.php?module=admin%}">{--ADMIN_CONTINUE_LOGIN--}</a></strong>
-       </td>
-</tr>
-</table>
+<!-- @DEPRECATED //-->
index 9e6a9a8..7497821 100644 (file)
@@ -17,7 +17,7 @@
 <tr>
        <td class="table_footer" colspan="2">
                <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" name="send_link" class="form_submit" value="{--ADMIN_RESET_PASS_SUBMIT--}" />
+               <input type="submit" name="send_link" class="form_submit" value="{--ADMIN_RESET_PASSWORD_SUBMIT--}" />
        </td>
 </tr>
 </table>
diff --git a/templates/de/html/admin/admin_reset_password_done.tpl b/templates/de/html/admin/admin_reset_password_done.tpl
new file mode 100644 (file)
index 0000000..ed43bf3
--- /dev/null
@@ -0,0 +1,19 @@
+<div align="center">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+<tr>
+       <td class="table_header bottom">
+               <strong>{--ADMIN_RESET_PASSWORD_DONE_TITLE--}</strong>
+       </td>
+</tr>
+<tr>
+       <td class="bottom">
+               $content
+       </td>
+</tr>
+<tr>
+       <td class="table_footer">
+               &raquo;&raquo;&nbsp;<strong><a href="{%url=modules.php?module=admin%}">{--ADMIN_CONTINUE_LOGIN--}</a></strong>
+       </td>
+</tr>
+</table>
+</div>
diff --git a/templates/de/html/admin/admin_reset_password_send_link.tpl b/templates/de/html/admin/admin_reset_password_send_link.tpl
new file mode 100644 (file)
index 0000000..577f798
--- /dev/null
@@ -0,0 +1,29 @@
+<div align="center">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;reset_pass=1%}" method="post">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+<tr>
+       <td class="table_header bottom" colspan="2">
+               <strong>{--ADMIN_RESET_PASSWORD_SEND_LINK_TITLE--}</strong>
+       </td>
+</tr>
+<tr>
+       <td class="bottom">
+               {--ADMIN_ENTER_EMAIL--}
+       </td>
+       <td class="bottom">
+               <input type="text" class="form_field" name="email" size="20" maxlength="255" />
+       </td>
+</tr>
+<tr>
+       <td class="table_footer" colspan="2">
+               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+               <input type="submit" name="send_link" class="form_submit" value="{--ADMIN_RESET_PASSWORD_SEND_LINK_SUBMIT--}" />
+       </td>
+</tr>
+</table>
+</form>
+
+<div class="notice">
+       {--ADMIN_RESET_PASSWORD_SEND_LINK_NOTE--}
+</div>
+</div>
index b402d08..11f5d85 100644 (file)
@@ -1,29 +1 @@
-<div align="center">
-<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;reset_pass=1%}" method="post">
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-<tr>
-       <td class="table_header bottom" colspan="2">
-               <strong>{--ADMIN_SEND_RESET_LINK_TITLE--}</strong>
-       </td>
-</tr>
-<tr>
-       <td class="bottom">
-               {--ADMIN_ENTER_EMAIL--}
-       </td>
-       <td class="bottom">
-               <input type="text" class="form_field" name="email" size="20" maxlength="255" />
-       </td>
-</tr>
-<tr>
-       <td class="table_footer" colspan="2">
-               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" name="send_link" class="form_submit" value="{--ADMIN_SEND_RESET_LINK_SUBMIT--}" />
-       </td>
-</tr>
-</table>
-</form>
-
-<div class="notice">
-       {--ADMIN_SEND_RESET_LINK_NOTE--}
-</div>
-</div>
+<!-- @DEPRECATED //-->