From: quix0r Date: Wed, 18 Nov 2009 03:45:39 +0000 (+0000) Subject: Global rewrite of engine: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4cf9e7903e3d0528650b2c8871b9b9f68e473807;p=mailer.git Global rewrite of engine: - Cookie-less (even no session cookie) should now work (maybe with some flaws) - Some code cleanups --- diff --git a/.gitattributes b/.gitattributes index c82c2dd43d..771eb88ed1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1652,6 +1652,7 @@ theme/business/css/doubler.css -text theme/business/css/general.css -text theme/business/css/imprint.css -text theme/business/css/install.css -text +theme/business/css/mailid.css -text theme/business/css/register.css -text theme/business/css/sponsor.css -text theme/business/css/surfbar.css -text @@ -1669,6 +1670,7 @@ theme/default/css/doubler.css -text theme/default/css/general.css -text theme/default/css/imprint.css -text theme/default/css/install.css -text +theme/default/css/mailid.css -text theme/default/css/register.css -text theme/default/css/sponsor.css -text theme/default/css/surfbar.css -text @@ -1686,6 +1688,7 @@ theme/desert/css/doubler.css -text theme/desert/css/general.css -text theme/desert/css/imprint.css -text theme/desert/css/install.css -text +theme/desert/css/mailid.css -text theme/desert/css/register.css -text theme/desert/css/sponsor.css -text theme/desert/css/surfbar.css -text diff --git a/beg.php b/beg.php index b605c4527d..072f4b46d1 100644 --- a/beg.php +++ b/beg.php @@ -89,7 +89,7 @@ if (isGetRequestElementSet('userid')) { // numbers matching to the numbers behind the decimal dot. Simple! ;-) $points = mt_rand((getConfig('beg_points') * 100000), (getConfig('beg_points_max') * 100000)) / 100000; - // Set nickname / userid for the template(s + // Set nickname / userid for template $content['userid'] = getRequestElement('userid'); $content['clicks'] = (getUserData('beg_clicks') + 1); $content['banner'] = loadTemplate('beg_banner', true); diff --git a/click.php b/click.php index 78e19ddb19..5cdbd9f2d9 100644 --- a/click.php +++ b/click.php @@ -11,7 +11,7 @@ * Kurzbeschreibung : Klicks auf Banner zaehlen und weiterleiten * * -------------------------------------------------------------------- * * $Revision:: $ * - * $Date:: $ * + * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * * $Author:: $ * * Needs to be in all Files and every File needs "svn propset * diff --git a/debug.php b/debug.php index df171199c3..f9fec82e77 100644 --- a/debug.php +++ b/debug.php @@ -60,10 +60,10 @@ if ((isExtensionActive('debug')) && (getTotalFatalErrors() == '0')) { // Is the module there? Else we log it! if (isIncludeReadable($inc)) { - // Load the request module + // Load the requested module loadInclude($inc); } else { - // Missing request file, may happen while development + // Missing request files may happen while development DEBUG_ABUSE_LOG(__FILE__, __LINE__, 'request_404', postRequestElement('request')); } } else { diff --git a/inc/config-global.php b/inc/config-global.php index bbf6b45980..b7e8169743 100644 --- a/inc/config-global.php +++ b/inc/config-global.php @@ -59,7 +59,7 @@ error_reporting(E_ALL | E_STRICT); // Detect path $PATH = str_replace("\\", '/', substr(dirname(__FILE__), 0, -3)); -// Configuration include file +// Some very important function includes foreach (array('config','wrapper','inc','stats') as $inc) { require($PATH . 'inc/' . $inc . '-functions.php'); } // END - foreach diff --git a/inc/databases.php b/inc/databases.php index 75f97bee1e..b5dcf2efb4 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -47,7 +47,6 @@ addCode('WRONG_ID' , 0x002); addCode('ID_LOCKED' , 0x003); addCode('ID_UNCONFIRMED' , 0x004); addCode('UNKNOWN_STATUS' , 0x005); -addCode('NO_COOKIES' , 0x006); addCode('CNTR_FAILED' , 0x008); addCode('LOGOUT_DONE' , 0x008); addCode('LOGOUT_FAILED' , 0x009); diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php index d1b7ead347..dac2f79309 100644 --- a/inc/extensions/ext-bonus.php +++ b/inc/extensions/ext-bonus.php @@ -117,7 +117,7 @@ PRIMARY KEY (`id`) addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_bonus` SET `target_send`=`mails_sent` WHERE `target_send`=0 AND `mails_sent`>0 AND `receivers` != ''"); // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Behebt ein Versand-Problem mit den Bonus-Mails. Es wurde die Spalte target_send nicht beim Einfügen der Buchung gessetzt. Bitte laden Sie sich dazu - wenn nicht bereits geschehen - alle Patches bis mindestens Patch 240 unter Updates prüfen herunter."); + setExtensionUpdateNotes("Behebt ein Versand-Problem mit den Bonus-Mails. Es wurde die Spalte target_send nicht beim Einfügen der Buchung gessetzt. Bitte laden Sie sich dazu - wenn nicht bereits geschehen - alle Patches bis mindestens Patch 240 unter Updates prüfen herunter."); break; case '0.2.1': // SQL queries for v0.2.1 diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php index b7af7fa6ca..1d70a5997b 100644 --- a/inc/extensions/ext-mediadata.php +++ b/inc/extensions/ext-mediadata.php @@ -131,7 +131,7 @@ PRIMARY KEY (media_key) // Update notes (these will be set as task text!) setExtensionUpdateNotes("Start des {?mt_word2?} und Anzahl Anmeldungen aufgenommen. (Task #13)
-Bitte stellen Sie diesen derzeit manuell unter Einstellungen-Medidata selber einstellen."); +Bitte stellen Sie diesen derzeit manuell unter Einstellungen-Medidata selber einstellen."); break; case '0.0.8': // SQL queries for v0.0.8 diff --git a/inc/extensions/ext-mydata.php b/inc/extensions/ext-mydata.php index 92f4554219..af8765dd6d 100644 --- a/inc/extensions/ext-mydata.php +++ b/inc/extensions/ext-mydata.php @@ -122,7 +122,7 @@ switch (getExtensionMode()) { case '0.1.2': // SQL queries for v0.1.2 // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Einbindung der Erweiterung country, die Sie sich noch optional von meiner Seite herunterladen müssen.
+ setExtensionUpdateNotes("Einbindung der Erweiterung country, die Sie sich noch optional von meiner Seite herunterladen müssen.

Wichtig: Laden Sie noch die Template member_mydata_overview und member_mydata_edit (beide zu finden unter templates/".getLanguage()."/html/member/ !) mit hoch!"); diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php index 34c95aecc4..4c67e19779 100644 --- a/inc/extensions/ext-register.php +++ b/inc/extensions/ext-register.php @@ -209,7 +209,7 @@ PRIMARY KEY (id) case '0.3.2': // SQL queries for v0.3.2 // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Einbindung der Erweiterung country, die Sie sich noch optional von meiner Seite herunterladen müssen.
+ setExtensionUpdateNotes("Einbindung der Erweiterung country, die Sie sich noch optional von meiner Seite herunterladen müssen.

Wichtig: Laden Sie noch das Template guest_register.tpl mit hoch, welches unter templates/".getLanguage()."/html/guest/ zu finden ist!"); diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index 93a02253f1..fc7388ade9 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -214,7 +214,7 @@ switch (getExtensionMode()) { addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `index_cookie` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('ONE_DAY')*365).""); // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Sie können nun hier die Verzögerungszeit in der Eingangsseite einstellen."); + setExtensionUpdateNotes("Sie können nun hier die Verzögerungszeit in der Eingangsseite einstellen."); break; case '0.1.2': // SQL queries for v0.1.2 diff --git a/inc/filters.php b/inc/filters.php index 79462da8d7..362898e490 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -414,7 +414,7 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) { $GLOBALS['compile_config'][$matches[1][$key]] = "\".getConfig('" . 'DEFAULT_' . strtoupper($matches[1][$key]) . "').\""; } elseif (isMessageIdValid('DEFAULT_' . strtoupper($matches[1][$key]))) { // No config, try the language system - $GLOBALS['compile_config'][$matches[1][$key]] = "\".getMessage('". 'DEFAULT_' . strtoupper($matches[1][$key]) . "').\""; + $GLOBALS['compile_config'][$matches[1][$key]] = "\" . getMessage('". 'DEFAULT_' . strtoupper($matches[1][$key]) . "') . \""; } else { // Unhandled! $GLOBALS['compile_config'][$matches[1][$key]] = '!' . $matches[1][$key] . '!'; @@ -435,7 +435,7 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) { if ($compiled === true) { // Run the code $eval = "\$GLOBALS['compiled_config'][\$uncompiled] = \"" . $GLOBALS['compiled_config'][$uncompiled] . "\";"; - //* DEBUG: */ print '
' . str_replace('$', '$', htmlentities($eval)) . '
'; + //* DEBUG: */ print('
' . str_replace('$', '$', htmlentities($eval)) . '
'); eval($eval); } // END - if @@ -448,34 +448,54 @@ function FILTER_COMPILE_EXTENSION ($code) { // Compile {%cmd=some_value%} to get extension data // Support cmd is: // - version -> getExtensionVersion() call - preg_match_all('/\{%((([a-zA-Z0-9-_]+)=([a-zA-Z0-9-_]+))*)\%\}/', $code, $matches); + preg_match_all('/\{%(([a-zA-Z0-9-_,]+)=([^%\}]+))%\}/', $code, $matches); + //* DEBUG: */ print('
'.print_r($matches, true).'
'); + + // Default is from OUTPUT_HTML + $outputMode = getOutputMode(); // Some entries found? if ((count($matches) > 0) && (count($matches[3]) > 0)) { // Replace all matches - foreach ($matches[3] as $key => $cmd) { + foreach ($matches[2] as $key => $cmd) { // Init replacer variable $replacer = ''; // Is the extension installed or code provided? + // @TODO This whole if-block is very static if ($cmd == 'code') { // Code asked for - $replacer = "\".getCode(\"" . $matches[4][$key] . "\").\""; + $replacer = "\" . getCode('" . $matches[3][$key] . "') . \""; + } elseif (substr($cmd, 0, 3) == 'url') { + // Do we have JS-mode? + if (substr($cmd, -2, 2) == 'js') $outputMode = 1; + + // Handle an URL here + $replacer = "\" . encodeUrl('" . $matches[3][$key] . "', " . $outputMode . ") . \""; + + // Replace it + $code = str_replace($matches[0][$key], $replacer, $code); + + // And continue with next entry + continue; } else { // Construct call-back function name $functionName = 'getExtension' . ucfirst(strtolower($cmd)); // Construct call of the function - $replacer = "\".call_user_func_array('" . $functionName . "', array('" . $matches[4][$key] . "', true)).\""; + $replacer = "\" . call_user_func_array('" . $functionName . "', array('" . $matches[3][$key] . "', true)) . \""; } // Replace it and insert parameter for GET request - $code = str_replace($matches[0][$key], sprintf("&%s=%s&rev=\".getConfig('CURR_SVN_REVISION').\"", $cmd, $replacer), $code); + $code = str_replace($matches[0][$key], sprintf("&%s=%s&rev=\" . getConfig('CURR_SVN_REVISION') . \"", $cmd, $replacer), $code); } // END - foreach } // END - if + // Do we have non-HTML mode? + if ((getOutputMode() != '0') || ($outputMode != '0')) $code = html_entity_decode($code); + // Return compiled code - //* DEBUG: */ die('
'.secureString($code).'
'); + //* DEBUG: */ die('
'.htmlentities($code).'
'); return $code; } diff --git a/inc/functions.php b/inc/functions.php index 3ee5bdff81..73928d9698 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -302,7 +302,7 @@ function loadTemplate ($template, $return = false, $content = array()) { } else { // Add surrounding HTML comments to help finding bugs faster $ret = '\n" . $GLOBALS['tpl_content'] . '\n"; - $eval = '$ret = "' . escapeQuotes($ret) . '";'; + $eval = '$ret = "' . compileRawCode(escapeQuotes($ret)) . '";'; } // END - if // Cache the eval() command here @@ -862,7 +862,7 @@ function generateDerefererUrl ($URL) { // Don't de-refer our own links! if (substr($URL, 0, strlen(getConfig('URL'))) != getConfig('URL')) { // De-refer this link - $URL = '{?URL?}/modules.php?module=loader&url=' . encodeString(compileUriCode($URL)); + $URL = '{%url=modules.php?module=loader&url=' . encodeString(compileUriCode($URL)) . '%}'; } // END - if // Return link @@ -872,7 +872,7 @@ function generateDerefererUrl ($URL) { // Generates an URL for the frametester function generateFrametesterUrl ($URL) { // Prepare frametester URL - $frametesterUrl = sprintf("{?URL?}/modules.php?module=frametester&url=%s", + $frametesterUrl = sprintf("{%%url=modules.php?module=frametester&url=%s%%}", encodeString(compileUriCode($URL)) ); @@ -903,7 +903,7 @@ function countSelection ($array) { // Generate XHTML code for the CAPTCHA function generateCaptchaCode ($code, $type, $DATA, $userid) { - return 'Code ' . $code . ''; + return 'Code ' . $code . ''; } // Generates a timestamp (some wrapper for mktime()) @@ -927,18 +927,7 @@ function makeTime ($hours, $minutes, $seconds, $stamp) { // Redirects to an URL and if neccessarry extends it with own base URL function redirectToUrl ($URL) { // Compile out codes - eval('$URL = "' . compileRawCode($URL) . '";'); - - // Check if http(s):// is there - if ((substr($URL, 0, 7) != 'http://') && (substr($URL, 0, 8) != 'https://')) { - // Make all URLs full-qualified - $URL = getConfig('URL') . '/' . $URL; - } // END - if - - // Three different debug ways... - //* DEBUG: */ debug_report_bug(sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL)); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $URL); - //* DEBUG: */ die($URL); + eval('$URL = "' . compileRawCode(encodeUrl($URL)) . '";'); // Default 'rel' value is external, nofollow is evil from Google and hurts the Internet $rel = ' rel="external"'; @@ -957,6 +946,11 @@ function redirectToUrl ($URL) { clearOutputBuffer(); } // END - if + // Three different ways to debug... + //* DEBUG: */ debug_report_bug(sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL)); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $URL); + //* DEBUG: */ die($URL); + // Simple probe for bots/spiders from search engines if ((strpos(detectUserAgent(), 'spider') !== false) || (strpos(detectUserAgent(), 'bot') !== false)) { // Secure the URL against bad things such als HTML insertions and so on... @@ -1043,11 +1037,11 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true if ($constants === true) { // BEFORE 0.2.1 : Language and data constants // WITH 0.2.1+ : Only language constants - $code = str_replace('{--', "\".getMessage('", str_replace('--}', "').\"", $code)); + $code = str_replace('{--', "\" . getMessage('", str_replace('--}', "') . \"", $code)); // BEFORE 0.2.1 : Not used // WITH 0.2.1+ : Data constants - $code = str_replace('{!', "\".constant('", str_replace("!}", "').\"", $code)); + $code = str_replace('{!', "\" . constant('", str_replace('!}', "') . \"", $code)); } // END - if // Compile QUOT and other non-HTML codes @@ -1354,7 +1348,7 @@ function generateImageOrCode ($img_code, $headerSent = true) { debug_report_bug('img_code ' . $img_code .' has invalid length. img_code()=' . strlen($img_code) . ' code_length=' . getConfig('code_length')); } elseif ($headerSent === false) { // Return an HTML code here - return "\"Image\"\n"; + return "\"Image\"\n"; } // Load image @@ -1667,13 +1661,13 @@ function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=fals $NAV .= '-'; } else { // Open anchor tag and add base URL - $NAV .= ' 0)) $NAV .= '&userid=' . bigintval(getRequestElement('userid')); // Close open anchor tag - $NAV .= '">'; + $NAV .= '%}">'; } $NAV .= $page; if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) { @@ -1976,7 +1970,7 @@ function generateMemberAdminActionLinks ($userid, $status = '') { $OUT = "[ "; foreach ($targetArray as $tar) { - $OUT .= ""); if (($tar == 'lock_user') && ($status == 'LOCKED')) { // Locked accounts shall be unlocked @@ -2635,8 +2629,7 @@ function getMessageFromErrorCode ($code) { case getCode('ID_LOCKED') : $message = getMessage('LOGIN_ID_LOCKED'); break; case getCode('ID_UNCONFIRMED') : $message = getMessage('LOGIN_ID_UNCONFIRMED'); break; case getCode('ID_GUEST') : $message = getMessage('LOGIN_ID_GUEST'); break; - case getCode('NO_COOKIES') : $message = getMessage('LOGIN_NO_COOKIES'); break; - case getCode('COOKIES_DISABLED') : $message = getMessage('LOGIN_NO_COOKIES'); break; + case getCode('COOKIES_DISABLED') : $message = getMessage('LOGIN_COOKIES_DISABLED'); break; case getCode('BEG_SAME_AS_OWN') : $message = getMessage('BEG_SAME_UID_AS_OWN'); break; case getCode('LOGIN_FAILED') : $message = getMessage('LOGIN_FAILED_GENERAL'); break; case getCode('MODULE_MEM_ONLY') : $message = sprintf(getMessage('MODULE_MEM_ONLY'), getRequestElement('mod')); break; @@ -3367,7 +3360,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad // Remove double slashes $FQFN = str_replace('//', '/', $FQFN); - // Check if the base filename matches an exclusion pattern and if the pattern is not empty + // Check if the base filenname matches an exclusion pattern and if the pattern is not empty if ((!empty($excludePattern)) && (preg_match($excludePattern, $baseFile, $match))) { // These Lines are only for debugging!! //* DEBUG: */ outputHtml('baseDir:' . $baseDir . '
'); @@ -3835,6 +3828,41 @@ function getModuleFromFileName ($file, $accessLevel) { return $modCheck; } +// Encodes an URL for adding session id, etc. +function encodeUrl ($url, $outputMode = '0') { + // Do we have already have a PHPSESSID inside? Then it is already converted... + if (strpos($url, session_name()) !== false) return $url; + + // Do we have a valid session? + if ((($GLOBALS['valid_session'] === false) || (!isset($_COOKIE[session_name()]))) && (isSpider() === false)) { + // Invalid session + // Determine right seperator + $seperator = '&'; + if (strpos($url, '?') === false) { + // No question mark + $seperator = '?'; + } elseif ((getOutputMode() != '0') || ($outputMode != '0')) { + // Non-HTML mode + $seperator = '&'; + } + + // Add it to URL + $url .= $seperator . session_name() . '=' . session_id(); + } // END - if + + // Add {?URL?} + $url = '{?URL?}/' . $url; + + // Return the URL + return $url; +} + +// Simple check for spider +function isSpider () { + // Is it a spider? + return ((strpos('spider', strtolower(detectUserAgent(true))) !== false) || (strpos('bot', strtolower(detectUserAgent(true))) !== false)); +} + ////////////////////////////////////////////////// // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS // ////////////////////////////////////////////////// diff --git a/inc/language/de.php b/inc/language/de.php index 6cd559647f..448853eb53 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -219,7 +219,7 @@ addMessages(array( 'REFID_BY' => "Sie wurden geworben von", 'TERMS_OF_USAGE' => "AGBs zustimmen und absenden", 'YOU_FINALIZE' => "Sie haben es gleich geschafft.", - 'AGREE_TO_THIS' => "Stimmen Sie unseren [AGBs] zu?", + 'AGREE_TO_THIS' => "Stimmen Sie unseren [AGBs] zu?", 'SUBMIT_REGISTER' => "Anmeldedaten abschicken", 'HAVE_TO_AGREE' => "Sie müssen unseren AGBs zustimmen, damit Sie an diesem {?mt_word?} teilnehmen können.", 'ENTER_BOTH_PASSWORDS' => "Bitte geben Sie ein Passwort und das selbe Passwort noch einmal ein.", @@ -308,7 +308,7 @@ addMessages(array( 'LOGIN_ID_LOCKED' => "Ihr Account wurde gesperrt.", 'LOGIN_ID_UNCONFIRMED' => "Bitte bestätigen Sie erst Ihre Email-Adresse! Haben Sie den Bestätigungslink verloren? Links im Menü unter "Bestätigungslink" können Sie ihn erneut anfordern.", 'LOGIN_ID_GUEST' => "Es ist etwas beim Anmelden schief gelaufen. Dies sollte nicht vorkommen. status=guest", - 'LOGIN_NO_COOKIES' => "Sie haben in Ihrem Browser entweder die Cookies ausgeschaltet, oder die Sicherheitsstufe ist zu hoch eingestellt.", + 'LOGIN_COOKIES_DISABLED' => "Sie haben in Ihrem Browser entweder die Cookies ausgeschaltet, oder die Sicherheitsstufe ist zu hoch eingestellt.", 'GUEST_REG_POINTS_1' => "Für Ihre Anmeldung haben wir Ihnen als Willkommensgutschrift", 'GUEST_REG_POINTS_2' => "{?POINTS?} gutgeschrieben. Sie können bereits jetzt schon Mails an die anderen Mitglieder verschicken - solange Empfänger auch erreichbar sind.", 'GUEST_SELECT_LIFETIME' => "Wie lange soll Auto-Login aktiv sein?", @@ -532,7 +532,6 @@ addMessages(array( 'MEMBER_PLEASE_RESPECT' => "Sollten Sie damit nicht einverstanden sein, so melden Sie sich bitte bei uns. Wir kommen dann in Kontakt mit Ihnen.", 'ADMIN_LOCKED_SUBJ' => "Ihr Account wurde gesperrt.", 'ADMIN_UNLOCKED_SUBJ' => "Ihr Account wurde wieder freigegeben.", - 'ADMIN_UNLOCKED_YOUR_ACCOUNT' => "Einer unserer Administratoren hat soeben Ihren Account wieder freigeben! Sie können sich nun wieder unter folgender URL einloggen:\n\n{?URL?}/login.php", 'REASON_UNLOCKED' => "Nachricht vom Admin", 'ADMIN_WELCOME_BACK' => "Bitte beachten Sie beim naechsten Mal auf unsere AGBs, damit Ihnen diese Unangenehmlichkeiten erspart bleiben.", 'ADMIN_DEL_ACCOUNT' => "Loeschung Ihres Accounts.", @@ -543,7 +542,7 @@ addMessages(array( 'GUEST_CONFIRM_SUBJ' => "Bitte Ihre Email-Adresse bestätigen.", 'MEMBER_ORDER_ACCEPTED' => "Ihre Mailbuchung wurde freigeschaltet", 'MEMBER_ORDER_REJECTED' => "Ihre Mailbuchung wurde abgelehnt", - 'THANX_REFERAL_ONE' => "Vielen Dank für die Referal-Werbung.", + 'THANX_REFERAL_ONE_SUBJECT' => "Vielen Dank für die Referal-Werbung.", 'ADMIN_SEND_MAIL' => "Bonusmail versenden", 'ADMIN_BONUS_SEND' => "Bonusmail wurde in den Sende-Pool eingefügt.", 'ENTER_POINTS' => "Vergütung", @@ -1040,9 +1039,9 @@ addMessages(array( 'ADMIN_NO_POINTS_REPAYED' => "Die Mailbuchung hatte keine {?POINTS?} zum zurückbuchen.", 'ADMIN_POINTS_SHREDDED' => "Es wurden %s  {?POINTS?} geschrettert.", 'EXTENSION_PROBLEM_EXT_INACTIVE' => "Kann nicht fortfahren! Fehler: Erweiterung %s deaktiviert.", - 'ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE' => "Die Erweiterung %s ist derzeit deaktiviert. Hier können Sie diese aktivieren.", + 'ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE' => "Die Erweiterung %s ist derzeit deaktiviert. Hier können Sie diese aktivieren.", 'EXTENSION_PROBLEM_EXT_NOT_INSTALLED' => "Kann nicht fortfahren! Fehler: Erweiterung %s nicht installiert.", - 'ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED' => "Die Erweiterung %s ist derzeit nicht installiert. Hier können Sie diese aktivieren.", + 'ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED' => "Die Erweiterung %s ist derzeit nicht installiert. Hier können Sie diese aktivieren.", 'EXTENSION_PROBLEM_NOT_INSTALLED' => "Erweiterung %s nicht installiert.", 'EXTENSION_PROBLEM_UNSET_EXT' => "Skriptfehler: Parameter ext nicht gesetzt.", 'EXTENSION_WARNING_EXT_INACTIVE' => "Die Erweiterung %s ist nicht aktiv. Dies kann zu Störungen führen.
\nBitte aktivieren Sie diese unter Verschiedenes->Erweiterungen.", diff --git a/inc/language/doubler_de.php b/inc/language/doubler_de.php index abeb9e7969..c17608245b 100644 --- a/inc/language/doubler_de.php +++ b/inc/language/doubler_de.php @@ -115,8 +115,8 @@ addMessages(array( 'DOUBLER_FORM_404_POINTS' => "Keine {?POINTS?} zum Verdoppeln eingegeben.", 'DOUBLER_FORM_404_NICKNAME' => "Unbekannter Nickname eingegeben oder falsches Passwort.", 'DOUBLER_FORM_404_MEMBER' => "Mitgliedsaccount nicht gefunden oder falsches Passwort.", - 'DOUBLER_FORM_STATUS_UNCONFIRMED' => "Bitte bestätigen Sie erst Ihre EMail-Adresse. Den Bestätigungslink können Sie hier erneut per EMail anfordern .", - 'DOUBLER_FORM_STATUS_LOCKED' => "Ihr Account wurde von einem Administrator oder durch Urlaub gesperrt. Bitte melden Sie sich bei uns, damit wir Ihren Account freischalten können.", + 'DOUBLER_FORM_STATUS_UNCONFIRMED' => "Bitte bestätigen Sie erst Ihre EMail-Adresse. Den Bestätigungslink können Sie hier erneut per EMail anfordern .", + 'DOUBLER_FORM_STATUS_LOCKED' => "Ihr Account wurde von einem Administrator oder durch Urlaub gesperrt. Bitte melden Sie sich bei uns, damit wir Ihren Account freischalten können.", 'DOUBLER_FORM_WRONG_PASS' => "Passwort ist falsch.", 'DOUBLER_FORM_POINTS_MIN' => "Zu wenig {?POINTS?} zum Verdoppeln eingegeben.", 'DOUBLER_FORM_POINTS_MAX' => "Zu viele {?POINTS?} zum Verdoppeln eingegeben.", diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php index 69e5a76510..23dbcc70e9 100644 --- a/inc/language/sponsor_de.php +++ b/inc/language/sponsor_de.php @@ -135,7 +135,7 @@ addMessages(array( 'SPONSOR_PAYTYPE_VALUE' => "Bestellwert", 'SPONSOR_PAYTYPE_COUNT' => "Bestellmenge", 'GUEST_SPONSOR_RECEIVE_WARNINGS' => "Bei Datenänderung eine Bestätigung per Mail erhalten?", - 'SPONSOR_ACCEPT_TERMS' => "Ich/wir habe/n die [AGBs] gelesen und akzeptiert.", + 'SPONSOR_ACCEPT_TERMS' => "Ich/wir habe/n die [AGBs] gelesen und akzeptiert.", 'SPONSOR_TERMS_HEADER' => "Allgemeine Geschäftsbedingungen", // Add payment types @@ -238,7 +238,7 @@ addMessages(array( 'SPONSOR_TAX_IDENT_IS_EMPTY' => "Sie haben keine Ust-Ident-Nr. eingegeben.", 'SPONSOR_REGISTER_SOMETHING_MISSING' => "Die Sponsorenanmeldung konnte wegen der folgenden Punkte nicht durchgeführt werden", 'SPONSOR_PASSWORDS_MISMATCH' => "Die beiden von Ihnen eingegebenen Passwörter stimmen nicht überein.", - 'SPONSOR_TERMS_NOT_ACCEPTED' => "Bitte akzeptieren Sie unsere [AGBs] .", + 'SPONSOR_TERMS_NOT_ACCEPTED' => "Bitte akzeptieren Sie unsere [AGBs] .", 'SPONSOR_NO_PAYTYPE_SELECTED' => "Bitte wählen Sie noch ein Buchungspaket aus.", 'SPONSOR_NO_WARNING_INTERVAL_SELECTED' => "Bitte wählen Sie noch den Zeitabstand zwischen zwei Sponsorenberichten aus.", 'SPONSOR_NO_RECEIVE_WARNINGS_SELECTED' => "Bitte wählen Sie noch aus, ob Sie bei jeder Aktion Bestätigungsmails empfangen wollen oder nicht.", @@ -276,7 +276,7 @@ addMessages(array( 'SPONSOR_LOGIN_FAILED_LOCKED' => "Ihr Account wurde gesperrt, vermutlich wegen Nichteinhaltung von Regeln.", 'SPONSOR_LOGIN_FAILED_EMAIL' => "Sie haben Ihre Email-Adresse geändert und diese noch nicht bestätigt.", 'SPONSPOR_COOKIE_SETUP_FAILED' => "Es konnten keine Cookies gesetzt werden. Bitte Sicherheitseinstellungen in Ihrem Browser überprüfen.", - 'SPONSOR_ONLY_AREA_ENTERED' => "Sie haben einen Bereich aufgerufen, der nur den Sponsoren vorenthalten ist, die auch bezahlt haben. Bitte kehren Sie zur [ Eingangsseite ] zurück.", + 'SPONSOR_ONLY_AREA_ENTERED' => "Sie haben einen Bereich aufgerufen, der nur den Sponsoren vorenthalten ist, die auch bezahlt haben. Bitte kehren Sie zur [ Eingangsseite ] zurück.", 'SPONSOR_ACCOUNT_STATUS_FAILED' => "Unerwarteter Zustand des Scriptes erreicht! Bitte Support benachrichtigen.", 'SPONSOR_ACCOUNT_IS_CONFIRMED_AGAIN' => "Ihr Sponsorenaccount ist wieder freigegeben! Sie können sich nun erneut einloggen.", @@ -292,7 +292,7 @@ addMessages(array( 'SPONSOR_ENTER_OLD_PASSWORD' => "Geben Sie Ihr derzeitiges Passwort ein", 'SPONSOR_CHANGE_PASSWORD' => "Neues Passwort einstellen", 'SPONSOR_ACCOUNT_DATA_SAVED' => "Ihre Daten wurden gespeichert.", - 'SPONSOR_ACCOUNT_EMAIL_CHANGED' => "Sie haben Ihre EMail-Adresse geändert, Account wurde temporär gesperrt. Bitte [hier klicken], um in den Gastbereich zu gelangen.", + 'SPONSOR_ACCOUNT_EMAIL_CHANGED' => "Sie haben Ihre EMail-Adresse geändert, Account wurde temporär gesperrt. Bitte [hier klicken], um in den Gastbereich zu gelangen.", 'SPONSOR_SETTINGS_HEADER' => "Einstellungen Ihres Sponsorenaccounts", 'SPONSOR_UNKNOWN_WHAT' => "Scripte-Fehler: Unbekannte Sponsor-Aktion %s erkannt.", 'SPONSOR_SETTINGS_SAVED' => "Neue Einstellungen gespeichert.", diff --git a/inc/libs/active_functions.php b/inc/libs/active_functions.php index 2eab3801b1..bdc32fa76d 100644 --- a/inc/libs/active_functions.php +++ b/inc/libs/active_functions.php @@ -47,7 +47,7 @@ function FILTER_ADD_LINK_ACTIVE_LIST () { if (isExtensionActive('online')) { // Init content $content = array( - 'menu' => "".getConfig('menu_blur_spacer').getMessage('GUEST_ACTIVE_LINK')."", + 'menu' => "".getConfig('menu_blur_spacer').getMessage('GUEST_ACTIVE_LINK')."", 'what' => 'active' ); diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php index ce02418337..d9aa9f8575 100644 --- a/inc/libs/admins_functions.php +++ b/inc/libs/admins_functions.php @@ -139,14 +139,14 @@ LIMIT 1", list($adminId) = SQL_FETCHROW($result); // Rewrite email address to contact link - $email = "{?URL?}/modules.php?module=".$mod."&what=admins_contct&admin=".bigintval($adminId); + $email = '{%url=modules.php?module=' . $mod . '&what=admins_contct&admin=' . bigintval($adminId) . '%}'; } // END - if // Free memory SQL_FREERESULT($result); } elseif ((is_int($email)) && ($email > 0)) { // Direct id given - $email = "{?URL?}/modules.php?module=".$mod."&what=admins_contct&admin=".bigintval($email); + $email = '{%url=modules.php?module=' . $mod . '&what=admins_contct&admin=' . bigintval($email) . '%}'; } // Return rewritten (?) email address diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index 10298ce43d..0d9b52f822 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -86,7 +86,7 @@ function outputAdvancedOverview (&$result_main) { $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, " AND `status`='NEW' AND `task_type`='EXTENSION_UPDATE'"); if ($value > 0) { - $content['update_tasks'] = "".$value.""; + $content['update_tasks'] = "".$value.""; } // END - if // @@ -96,21 +96,21 @@ function outputAdvancedOverview (&$result_main) { $value = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true); if ($value > 0) { - $content['confirmed_members'] = "".$value.""; + $content['confirmed_members'] = "".$value.""; } // END - if // Unconfirmed accounts $value = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true); if ($value > 0) { - $content['unconfirmed_members'] = "".$value.""; + $content['unconfirmed_members'] = "".$value.""; } // END - if // And locked accounts $value = countSumTotalData('LOCKED', 'user_data', 'userid', 'status', true); if ($value > 0) { - $content['locked_members'] = "".$value.""; + $content['locked_members'] = "".$value.""; } // END - if // @@ -119,7 +119,7 @@ function outputAdvancedOverview (&$result_main) { $value = countSumTotalData(0, 'task_system', 'id', 'assigned_admin', true, " AND `status` != 'DELETED'"); if ($value > 0) { - $content['new_tasks'] = "".$value.""; + $content['new_tasks'] = "".$value.""; } // END - if // @@ -128,7 +128,7 @@ function outputAdvancedOverview (&$result_main) { $value = countSumTotalData('CLOSED', 'task_system', 'id', 'status', true); if ($value > 0) { - $content['closed_tasks'] = "".$value.""; + $content['closed_tasks'] = "".$value.""; } // END - if // @@ -137,7 +137,7 @@ function outputAdvancedOverview (&$result_main) { $value = countSumTotalData('DELETED', 'task_system', 'id', 'status', true); if ($value > 0) { - $content['deleted_tasks'] = "".$value.""; + $content['deleted_tasks'] = "".$value.""; } // END - if // @@ -146,7 +146,7 @@ function outputAdvancedOverview (&$result_main) { $value = countSumTotalData('SOLVED', 'task_system', 'id', 'status', true, sprintf(" AND `assigned_admin`=%s", getCurrentAdminId())); if ($value > 0) { - $content['solved_tasks'] = "".$value.""; + $content['solved_tasks'] = "".$value.""; } // END - if // @@ -155,7 +155,7 @@ function outputAdvancedOverview (&$result_main) { $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, " AND `status`='NEW' AND task_type != 'EXTENSION_UPDATE'"); if ($value > 0) { - $content['your_tasks'] = "".$value.""; + $content['your_tasks'] = "".$value.""; } // END - if // @@ -164,7 +164,7 @@ function outputAdvancedOverview (&$result_main) { $value = countSumTotalData('ADMIN', 'pool', 'id', 'data_type', true); if ($value > 0) { - $content['pending_mails'] = "".$value.""; + $content['pending_mails'] = "".$value.""; } // END - if // @@ -173,7 +173,7 @@ function outputAdvancedOverview (&$result_main) { $value = countSumTotalData('TEMP', 'pool', 'id', 'data_type', true); if ($value > 0) { - $content['canceled_mails'] = "".$value.""; + $content['canceled_mails'] = "".$value.""; } // END - if // @@ -182,7 +182,7 @@ function outputAdvancedOverview (&$result_main) { $value = countSumTotalData('SEND', 'pool', 'id', 'data_type', true); if ($value > 0) { - $content['send_emails'] = "".$value.""; + $content['send_emails'] = "".$value.""; } // END - if // @@ -193,7 +193,7 @@ function outputAdvancedOverview (&$result_main) { $value = countSumTotalData('DELETED', 'pool', 'id', 'data_type', true); if ($value > 0) { - $content['purged_mails'] = "".$value.""; + $content['purged_mails'] = "".$value.""; } // END - if // @@ -204,7 +204,7 @@ function outputAdvancedOverview (&$result_main) { $value = countSumTotalData('DELETED', 'bonus', 'id', 'data_type', true); if ($value > 0) { - $content['purged_bonus_mails'] = "".$value.""; + $content['purged_bonus_mails'] = "".$value.""; } // END - if } elseif (isExtensionActive('bonus')) { $content['purged_bonus_mails'] = sprintf(getMessage('ADMIN_EXT_BONUS_OUTDATED'), '0.1.8'); @@ -224,7 +224,7 @@ function outputAdvancedOverview (&$result_main) { $value = countSumTotalData('SEND', 'bonus', 'id', 'data_type', true, " AND `is_notify`='N'"); if ($value > 0) { - $content['send_bonus_mails'] = "".$value.""; + $content['send_bonus_mails'] = "".$value.""; } // END - if } elseif (isExtensionActive('bonus')) { $content['send_bonus_mails'] = sprintf(getMessage('ADMIN_EXT_BONUS_OUTDATED'), '0.1.8'); @@ -578,7 +578,7 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) { if (($value > 0) && (!empty($WHATs[$key]))) { if (empty($TITLEs[$key])) $TITLEs[$key] = getMessage('ADMIN_TASK_UNKNOWN_LIST_TITLE'); - $content['row_link'] = "".$value.""; + $content['row_link'] = "".$value.""; } else { $content['row_link'] = '0'; } diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php index ed45abc62e..e39f97f3f7 100644 --- a/inc/libs/theme_functions.php +++ b/inc/libs/theme_functions.php @@ -4,7 +4,7 @@ * =================== Last change: 12/13/2004 * * * * -------------------------------------------------------------------- * - * File : theme-manager.php * + * File : theme manager.php * * -------------------------------------------------------------------- * * Short description : Theme manager * * -------------------------------------------------------------------- * @@ -48,8 +48,9 @@ function generateThemeSelectionBox () { $mod = getModule(); // Construction URL - $formAction = "{?URL?}/modules.php?module=" . $mod; + $formAction = "{%url=modules.php?module=" . $mod; if (!empty($what)) $formAction .= "&what=" . $what; + $formAction = '%}'; // Initialize array $themesArray = array( diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 75d9fe3de1..ef117260fb 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -57,9 +57,9 @@ function alpha ($sortby, $colspan, $return=false) { $OUT .= '' . $ltr . ''; } else { // Output link to letter - $OUT .= '' . $ltr . ''; + $OUT .= '&letter=' . $ltr . '&sortby=' . $sortby . $add . '%}">' . $ltr . ''; } if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) { @@ -113,7 +113,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) { if ($sortby == $sort) { $OUT .= '' . $title . ' | '; } else { - $OUT .= '' . $title . ' | '; + $OUT .= '' . $title . ' | '; } } // END - foreach @@ -154,14 +154,14 @@ function addPageNavigation ($PAGES, $offset, $show_form, $colspan,$return=false) if (!isGetRequestElementSet('sortby')) setRequestGetElement('sortby', 'userid'); // Base link - $OUT .= ''; + $OUT .= '&letter=' . getRequestElement('letter') . '&sortby=' . getRequestElement('sortby') . '&page=' . $page . '&offset=' . $offset . '%}">'; } $OUT .= $page; @@ -210,7 +210,7 @@ LIMIT 1", list($userid) = SQL_FETCHROW($result); // Rewrite email address to contact link - $email = '{?URL?}/modules.php?module=' . $mod . '&what=user_contct&userid=' . bigintval($userid); + $email = '{%url=modules.php?module=' . $mod . '&what=user_contct&userid=' . bigintval($userid) . '%}'; } // END - if // Free memory @@ -221,6 +221,7 @@ LIMIT 1", } // Selects a random user id as the new referal id if they have at least X confirmed mails in this run +// @TODO Double-check configuration entry here function determineRandomReferalId () { // Default is zero refid $refid = '0'; @@ -367,7 +368,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p } } else { // Cookies not setable! - $errorCode = getCode('NO_COOKIES'); + $errorCode = getCode('COOKIES_DISABLED'); } } elseif (getExtensionVersion('sql_patches') >= '0.6.1') { // Update failture counter diff --git a/inc/modules/admin.php b/inc/modules/admin.php index d1b8d627b8..e1a87b4fcc 100644 --- a/inc/modules/admin.php +++ b/inc/modules/admin.php @@ -235,7 +235,7 @@ if (!isAdminRegistered()) { case 'pass': // Wrong password setRequestPostElement('ok', $ret); - $ret = '{--WRONG_PASS--} [{--ADMIN_RESET_PASS--}]'; + $ret = '{--WRONG_PASS--} [{--ADMIN_RESET_PASS--}]'; destroyAdminSession(); break; diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index ca8bf8c006..327e51147f 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -377,7 +377,7 @@ ORDER BY if (($menu == $action) && (empty($what))) { $OUT .= ''; } else { - $OUT .= '['; + $OUT .= '['; } } else { $OUT .= ''; @@ -447,7 +447,7 @@ ORDER BY if ($what == $what_sub) { $OUT .= ''; } else { - $OUT .= '['; + $OUT .= '['; } } else { $OUT .= ''; @@ -730,7 +730,7 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') { } // Return link - return '[' . $title . ']'; + return '[' . $title . ']'; } // Check "logical-area-mode" @@ -1323,11 +1323,11 @@ function adminCreateUserLink ($userid) { // Is the userid set correctly? if ($userid > 0) { // Create a link to that profile - return '{?URL?}/modules.php?module=admin&what=list_user&userid='.bigintval($userid); + return '{%url=modules.php?module=admin&what=list_user&userid='.bigintval($userid) . '%}'; } // END - if // Return a link to the user list - return '{?URL?}/modules.php?module=admin&what=list_user'; + return '{%url=modules.php?module=admin&what=list_user%}'; } // Generate a "link" for the given admin id (admin_id) diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php index d7e8bbdc96..56e36a0db7 100644 --- a/inc/modules/admin/what-adminedit.php +++ b/inc/modules/admin/what-adminedit.php @@ -247,13 +247,13 @@ WHERE ".$AND." AND id=%s LIMIT 1", $data['navi'] = ''; if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) { // Is highest position - $data['navi'] = "{--LOWER--}"; + $data['navi'] = "{--LOWER--}"; } elseif ($cnt == $max) { // Is lowest position - $data['navi'] = "{--HIGHER--}"; + $data['navi'] = "{--HIGHER--}"; } elseif ($data['sort'] > 0) { // Anything else between highest and lowest - $data['navi'] = "{--HIGHER--}/{--LOWER--}"; + $data['navi'] = "{--HIGHER--}/{--LOWER--}"; } // Fix empty elements for constant (fixes display bugs in Firefox) diff --git a/inc/modules/admin/what-admins_contct.php b/inc/modules/admin/what-admins_contct.php index 0c6d06d386..6a5b66f07d 100644 --- a/inc/modules/admin/what-admins_contct.php +++ b/inc/modules/admin/what-admins_contct.php @@ -39,7 +39,7 @@ // Some security stuff... if ((!defined('__SECURITY')) || (!isAdmin())) { die(); -} +} // END - if // Add description as navigation point addMenuDescription('admin', __FILE__); @@ -49,7 +49,7 @@ if ((isFormSent()) && (isGetRequestElementSet('admin'))) { if ((isExtensionActive('msg')) && (postRequestElement('type') == 'message')) { // Add message $message = loadEmailTemplate('admins_msg_contct_admin', postRequestElement('text'), 0); - SEND_ADMIN_MESSAGE(getRequestElement('admin'), ADMINS_MSG_FROM_ADMIN, $message); + sendAdminMessage(getRequestElement('admin'), getMessage('ADMINS_MSG_FROM_ADMIN'), $message); } else { // Load admin's email address $email = getAdminEmail(bigintval(getRequestElement('admin'))); diff --git a/inc/modules/admin/what-config_home.php b/inc/modules/admin/what-config_home.php index b9fe7597b4..05c5f93034 100644 --- a/inc/modules/admin/what-config_home.php +++ b/inc/modules/admin/what-config_home.php @@ -55,7 +55,7 @@ switch ($sub) { adminSaveSettingsFromPostData(); // Display continue link - loadTemplate('admin_settings_saved', false, "{--ADMIN_CONTINUE_TO_CONFIG--}"); + loadTemplate('admin_settings_saved', false, "{--ADMIN_CONTINUE_TO_CONFIG--}"); } else { // Prepare data for the template $content = array_fill(-1, 60, ''); @@ -88,13 +88,13 @@ ORDER BY `sort` ASC", __FILE__, __LINE__); // Process all entries while ($content = SQL_FETCHARRAY($result)) { // Link for setting 'what' as new "home" - $newHomeLink = "{--_IS_NEW_HOME--}"; + $newHomeLink = "{--_IS_NEW_HOME--}"; // Is this current home? if ($content['what'] == getConfig('index_home')) { // Is current home - $newHomeLink = "
{--_IS_CURRENT_HOME--}
"; - $content['title'] = "
".$content['title']."
"; + $newHomeLink = "
{--_IS_CURRENT_HOME--}
"; + $content['title'] = "
" . $content['title'] . "
"; } // END - if // Prepare content diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php index 6e3b2c5560..d2605ecc0c 100644 --- a/inc/modules/admin/what-config_mods.php +++ b/inc/modules/admin/what-config_mods.php @@ -128,8 +128,8 @@ ORDER BY module', __FILE__, __LINE__); if (empty($content['title'])) $content['title'] = '---'; if (($content['module'] == 'index') || ($content['module'] == 'login')) { // Add link to detail statistics - $content['module'] = "".$content['module'].""; - } + $content['module'] = "" . $content['module'] . ""; + } // END - if // Prepare array for the template // @TODO Rewritings: mod->module in template diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php index 41ddaf47fb..461184e9b9 100644 --- a/inc/modules/admin/what-config_payouts.php +++ b/inc/modules/admin/what-config_payouts.php @@ -236,7 +236,7 @@ if ((SQL_NUMROWS($result_type) > 0) && ($display)) { // Does your members request payouts? if ((SQL_NUMROWS($result_mem) > 0) && ($display)) { // Members has requested payouts - loadTemplate('admin_settings_saved', false, "{--ADMIN_PAYOUT_LIST_REQUESTS--}

"); + loadTemplate('admin_settings_saved', false, "{--ADMIN_PAYOUT_LIST_REQUESTS--}

"); } elseif ($display) { // No member requests so far loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_NO_MEMBER_REQUESTS')); diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php index d2933e6ec1..d2d36055e7 100644 --- a/inc/modules/admin/what-config_rallye_prices.php +++ b/inc/modules/admin/what-config_rallye_prices.php @@ -150,7 +150,7 @@ LIMIT 1", loadTemplate('admin_config_rallye_edit', false, $content); } else { // Nothing selected - $content = sprintf(getMessage('RALLYE_NO_PRICES_SELECTED'), "", ""); + $content = sprintf(getMessage('RALLYE_NO_PRICES_SELECTED'), "", ""); loadTemplate('admin_settings_saved', false, $content); } } elseif (isPostRequestElementSet('del')) { @@ -189,7 +189,7 @@ LIMIT 1", loadTemplate('admin_config_rallye_del', false, $content); } else { // Nothing selected - $content = "{--RALLYE_NO_PRICES_SELECTED_1--}{--RALLYE_NO_PRICES_SELECTED_2--}{--RALLYE_NO_PRICES_SELECTED_3--}"; + $content = "{--RALLYE_NO_PRICES_SELECTED_1--}{--RALLYE_NO_PRICES_SELECTED_2--}{--RALLYE_NO_PRICES_SELECTED_3--}"; loadTemplate('admin_settings_saved', false, $content); } } else { diff --git a/inc/modules/admin/what-config_transfer.php b/inc/modules/admin/what-config_transfer.php index 5892bc0d92..eada9997b3 100644 --- a/inc/modules/admin/what-config_transfer.php +++ b/inc/modules/admin/what-config_transfer.php @@ -8,7 +8,7 @@ * -------------------------------------------------------------------- * * Short description : Configuration of transfer system * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Konfiguration des Punktetransfersystems * + * Kurzbeschreibung : Konfiguration des Punktetransfer-Systems * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php index d6e08985c9..8a624faec5 100644 --- a/inc/modules/admin/what-del_email.php +++ b/inc/modules/admin/what-del_email.php @@ -141,7 +141,7 @@ LIMIT 1", $cnt += SQL_AFFECTEDROWS(); // Load template for link - loadTemplate('admin_settings_saved', false, "{--ADMIN_REMOVE_STATS_ENTRY--}"); + loadTemplate('admin_settings_saved', false, "{--ADMIN_REMOVE_STATS_ENTRY--}"); } // END - if // Free the result diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php index b1e95ed100..5e75ebb3c6 100644 --- a/inc/modules/admin/what-email_archiv.php +++ b/inc/modules/admin/what-email_archiv.php @@ -104,7 +104,7 @@ if (SQL_NUMROWS($result) > 0) { $pool['unconfirmed'] = $pool['max_rec'] - $pool['clicks']; if ($pool['unconfirmed'] > 0) { // Add link to list_unconfirmed what-file - $pool['unconfirmed'] = '' . $pool['unconfirmed'] . ''; + $pool['unconfirmed'] = '' . $pool['unconfirmed'] . ''; } // END - if // Prepare data for the row template diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php index 8a27a5bfb9..8a1a30c8c9 100644 --- a/inc/modules/admin/what-email_details.php +++ b/inc/modules/admin/what-email_details.php @@ -152,7 +152,7 @@ if (SQL_NUMROWS($result_list) > 0) { $pool['unconfirmed'] = $pool['sent_email'] - $pool['clicks']; if ($pool['unconfirmed'] > 0) { // Add link to list_unconfirmed what-file - $pool['unconfirmed'] = "".$pool['unconfirmed'].""; + $pool['unconfirmed'] = "" . $pool['unconfirmed'] . ""; } elseif ($pool['unconfirmed'] < 0) { // Sometimes rarely displayed minus values will be "fixed" to zero $pool['unconfirmed'] = '0'; @@ -208,7 +208,7 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) { // Add link? if ($bonus['unconfirmed'] > 0) { // Add link to list_unconfirmed what-file - $bonus['unconfirmed'] = "".$bonus['unconfirmed'].""; + $bonus['unconfirmed'] = "" . $bonus['unconfirmed'] . ""; } // END - if // Prepare content diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php index 38841cbc66..31ded21867 100644 --- a/inc/modules/admin/what-guestedit.php +++ b/inc/modules/admin/what-guestedit.php @@ -286,13 +286,13 @@ if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0) && (!isDemoM $cnt++; if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) { // Is highest position - $NAVI = "{--LOWER--}"; + $NAVI = "{--LOWER--}"; } elseif ($cnt == $max) { // Is lowest position - $NAVI = "{--HIGHER--}"; + $NAVI = "{--HIGHER--}"; } elseif ($data['sort'] > 0) { // Anything else between highest and lowest - $NAVI = "{--HIGHER--}/{--LOWER--}"; + $NAVI = "{--HIGHER--}/{--LOWER--}"; } if (empty($data['action'])) $data['action'] = ' '; diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php index de08177fc5..308ed2f32b 100644 --- a/inc/modules/admin/what-list_cats.php +++ b/inc/modules/admin/what-list_cats.php @@ -52,7 +52,7 @@ if (isGetRequestElementSet('userid')) { $content = getUserDataArray(); // Prepare constants - // @TODO No longer needed? define('__CATS_BASE' , "".$content['surname']." ".$content['family'].""; diff --git a/inc/modules/admin/what-list_doubler.php b/inc/modules/admin/what-list_doubler.php index add9a8dfd5..ecd2457b47 100644 --- a/inc/modules/admin/what-list_doubler.php +++ b/inc/modules/admin/what-list_doubler.php @@ -75,7 +75,7 @@ switch (getRequestElement('mode')) { if ($cnt > 0) { // Something was payed out $sumAlready += $cnt; - $content['already_direct_link'] = "".$cnt.""; + $content['already_direct_link'] = "".$cnt.""; } // END - if $cnt = countSumTotalData('Y','doubler','id','completed',true, " AND `is_ref`='Y'"); @@ -83,7 +83,7 @@ switch (getRequestElement('mode')) { if ($cnt > 0) { // Something was payed out $sumAlready += $cnt; - $content['already_ref_link'] = "".$cnt.""; + $content['already_ref_link'] = "".$cnt.""; } // END - if // And the same for waiting pouts (direct and referal) @@ -92,7 +92,7 @@ switch (getRequestElement('mode')) { if ($cnt > 0) { // Something was payed out $sumWaiting += $cnt; - $content['waiting_direct_link'] = "".$cnt.""; + $content['waiting_direct_link'] = "".$cnt.""; } // END - if $cnt = countSumTotalData('N','doubler','id','completed',true, " AND `is_ref`='Y'"); @@ -100,12 +100,12 @@ switch (getRequestElement('mode')) { if ($cnt > 0) { // Something was payed out $sumWaiting += $cnt; - $content['waiting_ref_link'] = "".$cnt.""; + $content['waiting_ref_link'] = "".$cnt.""; } // END - if // Links for all - $content['already_all_link'] = "".$sumAlready.""; - $content['waiting_all_link'] = "".$sumWaiting.""; + $content['already_all_link'] = "".$sumAlready.""; + $content['waiting_all_link'] = "".$sumWaiting.""; // All data is loaded here... break; diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php index 43eda25e79..69c19b7ae2 100644 --- a/inc/modules/admin/what-list_links.php +++ b/inc/modules/admin/what-list_links.php @@ -100,14 +100,14 @@ if (isGetRequestElementSet('userid')) { $result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp_ordered` AS `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); $type = 'mailid'; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM'); - $LINK = "".$id.""; + $LINK = "".$id.""; break; case 'BONUS': $result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1", array(bigintval($id2)), __FILE__, __LINE__); $type = 'bonusid'; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM'); - $LINK = "".$id2.""; + $LINK = "".$id2.""; break; default: // Problem in application detected! diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php index 5a83478091..1f6fd0dc0c 100644 --- a/inc/modules/admin/what-list_notifications.php +++ b/inc/modules/admin/what-list_notifications.php @@ -91,7 +91,7 @@ if ((isExtensionActive('bonus')) && (SQL_NUMROWS($result_max) > 0) && (!empty($S // Add link? if ($bonus['unconfirmed'] > 0) { // Add link to list_unconfirmed what-file - $bonus['unconfirmed'] = "".$bonus['unconfirmed'].""; + $bonus['unconfirmed'] = "" . $bonus['unconfirmed'] . ""; } // END - if // Prepare content diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php index df76022cf6..1e53c99604 100644 --- a/inc/modules/admin/what-list_payouts.php +++ b/inc/modules/admin/what-list_payouts.php @@ -234,7 +234,7 @@ ORDER BY while ($content = SQL_FETCHARRAY($result)) { if ($content['status'] == 'NEW') { // Generate links for direct accepting and rejecting - $content['status'] = "".PAYOUT_ACCEPT_PAYOUT." | ".PAYOUT_REJECT_PAYOUT.""; + $content['status'] = "{--PAYOUT_ACCEPT_PAYOUT--} | {--PAYOUT_REJECT_PAYOUT--}"; } else { // Translate status $content['status'] = getMessage('PAYOUT_STATUS_'.strtoupper($content['status']).''); diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php index e8cefebfca..f495c7a778 100644 --- a/inc/modules/admin/what-list_rallyes.php +++ b/inc/modules/admin/what-list_rallyes.php @@ -306,7 +306,7 @@ ORDER BY // Did some users joined this rallye? if ($joined > 0) { // List joined users - $joined = "".$joined.""; + $joined = "".$joined.""; } // END - if // Alter some variables diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php index c9ac613c12..a6e2d3cdec 100644 --- a/inc/modules/admin/what-list_sponsor.php +++ b/inc/modules/admin/what-list_sponsor.php @@ -124,7 +124,7 @@ ORDER BY SQL_FREERESULT($result); } else { // No refs made so far - loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SPONSOR_REFS_404'), "".bigintval(getRequestElement('rid'))."")); + loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SPONSOR_REFS_404'), "" . bigintval(getRequestElement('rid')) . "")); } } else { // Sponsor not found diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 6349a41bdb..680c7593c9 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -90,7 +90,7 @@ if (!isGetRequestElementSet('sortby')) { setRequestGetElement('sortby', 'userid' if (!isGetRequestElementSet('page')) { setRequestGetElement('page' , 1); } // Set base URL -$base = '[ 0) $content['links'] = $base . '&what=list_links&userid=' . $userid . '">' . $content['links'] . ']'; - if ($content['refid'] > 0) $content['refid'] = $base . '&what=list_user&userid=' . $content['refid'] . '">'.$content['refid'] . ']'; - if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $userid . '">' . $content['refs'] . ']'; - if ($content['cats'] > 0) $content['cats'] = $base . '&what=list_cats&userid=' . $userid . '">' . $content['cats'] . ']'; + if ($content['links'] > 0) $content['links'] = $base . '&what=list_links&userid=' . $userid . '%}">' . $content['links'] . ']'; + if ($content['refid'] > 0) $content['refid'] = $base . '&what=list_user&userid=' . $content['refid'] . '%}">'.$content['refid'] . ']'; + if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $userid . '%}">' . $content['refs'] . ']'; + if ($content['cats'] > 0) $content['cats'] = $base . '&what=list_cats&userid=' . $userid . '%}">' . $content['cats'] . ']'; // Fix empty module if (empty($content['last_module'])) $content['last_module'] = '---'; @@ -144,7 +144,7 @@ LIMIT 1", $content['status'] = translateUserStatus($content['status']); $content['last_online'] = generateDateTime($content['last_online'], 0); $content['used_points'] = translateComma($content['used_points']); - if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&what=email_details&userid=' . $userid . '">' . translateComma($content['emails_sent']) . ']'; + if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&what=email_details&userid=' . $userid . '%}">' . translateComma($content['emails_sent']) . ']'; $content['joined'] = generateDateTime($content['joined'], 0); $content['last_update'] = generateDateTime($content['last_update'], 0); $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], 0); @@ -300,10 +300,10 @@ LIMIT 1", // Get number of unconfirmed mails $content['links'] = countSumTotalData($content['userid'], 'user_links', 'id', 'userid', true); - if ($content['links'] > 0) $content['links'] = $base . '&what=list_links&userid=' . $content['userid'] . '">' . translateComma($content['links']) . ']'; + if ($content['links'] > 0) $content['links'] = $base . '&what=list_links&userid=' . $content['userid'] . '%}">' . translateComma($content['links']) . ']'; // Set link to sent mails if present - if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&what=email_details&userid=' . $content['userid'] . '">' . translateComma($content['emails_sent']) . ']'; + if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&what=email_details&userid=' . $content['userid'] . '%}">' . translateComma($content['emails_sent']) . ']'; // Add nickname if ((empty($content['nickname'])) || ($content['nickname'] == $content['userid'])) $content['nickname'] = '---'; @@ -321,7 +321,7 @@ LIMIT 1", $content['sw'] = $SW; $content['userid_link'] = generateUserProfileLink($content['userid']); $content['gender'] = translateGender($content['gender']); - $content['email'] = '[' . $content['email'] . ']'; + $content['email'] = '[' . $content['email'] . ']'; $content['alinks'] = generateMemberAdminActionLinks($content['userid'], $content['status']); $content['points'] = translateComma($content['points']); $content['rate'] = translateComma($content['rate']); @@ -331,7 +331,7 @@ LIMIT 1", $content['refs'] = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', true); // If we have at least one referal, make it clickable to referal list - if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $content['userid'] . '">' . $content['refs'] . ']'; + if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $content['userid'] . '%}">' . $content['refs'] . ']'; // Is the lock reason not set? if (!isset($content['lock_reason'])) $content['lock_reason'] = '---'; diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php index 385aa6fbda..f87ef5042b 100644 --- a/inc/modules/admin/what-logs.php +++ b/inc/modules/admin/what-logs.php @@ -101,7 +101,7 @@ if (isGetRequestElementSet('access')) { $file = basename($file); // Okay, add it - outputHtml('
  • ' . $file . '
    • '); + outputHtml('
  • ' . $file . '
    • '); } // END - foreach // Finish list diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php index 0d5f0e4e71..3ea041bc31 100644 --- a/inc/modules/admin/what-memedit.php +++ b/inc/modules/admin/what-memedit.php @@ -263,13 +263,13 @@ if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0) && (!isDemoM $cnt++; if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) { // Is highest position - $data['navi'] = "{--LOWER--}"; + $data['navi'] = "{--LOWER--}"; } elseif ($cnt == $max) { // Is lowest position - $data['navi'] = "{--HIGHER--}"; + $data['navi'] = "{--HIGHER--}"; } elseif ($data['sort'] > 0) { // Anything else between highest and lowest - $data['navi'] = "{--HIGHER--}/{--LOWER--}"; + $data['navi'] = "{--HIGHER--}/{--LOWER--}"; } // Fix empty values for Firefox diff --git a/inc/modules/admin/what-stats_mods.php b/inc/modules/admin/what-stats_mods.php index 59101e257e..80ba39b44d 100644 --- a/inc/modules/admin/what-stats_mods.php +++ b/inc/modules/admin/what-stats_mods.php @@ -78,7 +78,7 @@ if ((getRequestElement('mod') == 'index') || (getRequestElement('mod') == 'login if (($content['module'] == 'index') || ($content['module'] == 'login')) { // Add link to detail statistics - $content['module'] = "".$content['module'].""; + $content['module'] = "" . $content['module'] . ""; } // END - if // Add color switch diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php index 276a55324e..9e4ae15dc3 100644 --- a/inc/modules/admin/what-theme_edit.php +++ b/inc/modules/admin/what-theme_edit.php @@ -124,7 +124,7 @@ if (SQL_NUMROWS($result) > 0) { // Is the loaded theme name != current theme name? $LINK = $content['theme_path']; - if ($content['theme_path'] != getCurrentTheme()) $LINK = "".$content['theme_path'].""; + if ($content['theme_path'] != getCurrentTheme()) $LINK = "".$content['theme_path'].""; // Prepare data for the row template $content = array( diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php index d8a74e6fd9..b46ea6d638 100644 --- a/inc/modules/admin/what-usage.php +++ b/inc/modules/admin/what-usage.php @@ -89,14 +89,11 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) { // Until here... // Replace URLs - $content = str_replace('usage.png' , '{?URL?}/modules.php?module=admin&what='.getWhat().'&type=usage&image=usage', $content); - $content = str_replace('daily_usage_' , '{?URL?}/modules.php?module=admin&what='.getWhat().'&type=daily&image=' , $content); - $content = str_replace('hourly_usage_', '{?URL?}/modules.php?module=admin&what='.getWhat().'&type=hourly&image=' , $content); - $content = str_replace('ctry_usage_' , '{?URL?}/modules.php?module=admin&what='.getWhat().'&type=ctry&image=' , $content); - $content = str_replace('usage_' , '{?URL?}/modules.php?module=admin&what='.getWhat().'&usage=' , str_replace('.html', '', $content)); - - // @TODO Disabled due to too much trouble - //$content = str_replace("HREF=\"http://", "href=\"{?URL?}/modules.php?module=loader&url=http://", $content); + $content = str_replace('usage.png' , '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=usage&image=usage', $content); + $content = str_replace('daily_usage_' , '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=daily&image=' , $content); + $content = str_replace('hourly_usage_', '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=hourly&image=' , $content); + $content = str_replace('ctry_usage_' , '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=ctry&image=' , $content); + $content = str_replace('usage_' , '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&usage=' , str_replace('.html', '', $content)); $test = strtolower($content); // Do we need to strip out above and including plus trailing tag? diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php index 8bb5527f89..99c0ba0369 100644 --- a/inc/modules/guest/what-rallyes.php +++ b/inc/modules/guest/what-rallyes.php @@ -83,11 +83,11 @@ if (SQL_NUMROWS($result) == 1) { // Rallye will expire in less one day! $content['extras'] = getMessage('RALLYE_EXPIRE_ONE_DAY'); } else { - $content['extras'] = "{--RALLYE_REGISTER_NOW--}"; + $content['extras'] = "{--RALLYE_REGISTER_NOW--}"; } // Set admin line (currently set to impressum, later to contact form) - // @TODO Reactivate this: $content['admin'] = "".$login.""; + // @TODO Reactivate this: $content['admin'] = "" . $login . ""; // Set title $content['title'] = $title; diff --git a/inc/modules/member/what- b/inc/modules/member/what- index 15bab70e06..f984455948 100644 --- a/inc/modules/member/what- +++ b/inc/modules/member/what- @@ -49,5 +49,5 @@ addMenuDescription('member', __FILE__); // Loads the name-matching template loadTemplate(substr(basename(__FILE__), 5, -4)); -// +// [EOF] ?> diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php index 3ff0675f3e..d4010690df 100644 --- a/inc/modules/member/what-rallyes.php +++ b/inc/modules/member/what-rallyes.php @@ -82,11 +82,11 @@ if (SQL_NUMROWS($result) == 1) { $content['extras'] = getMessage('RALLYE_EXPIRE_ONE_DAY'); } else { // Link to referal links page - $content['extras'] = "{--RALLYE_GET_REFLINK--}"; + $content['extras'] = "{--RALLYE_GET_REFLINK--}"; } // Set admin line (currently set to impressum, later to contact form) - // @TODO Reactivate this: $content['admin'] = "".$content['login'].""; + // @TODO Reactivate this: $content['admin'] = "" . $content['login'] . ""; // Handle description... if ((empty($content['descr'])) && (!empty($content['template']))) { diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php index f5e17ede7d..48b0f136c4 100644 --- a/inc/modules/member/what-surfbar_list.php +++ b/inc/modules/member/what-surfbar_list.php @@ -76,7 +76,7 @@ if ((isFormSent()) && (isPostRequestElementSet(('action'))) && (isPostRequestEle $content['url'] = generateDerefererUrl($content['url']); if ($content['views_total'] > 0) { // Include link to stats - $content['views_total'] = "[".translateComma($content['views_total'])."]"; + $content['views_total'] = "[".translateComma($content['views_total'])."]"; } // END - if $content['registered'] = generateDateTime($content['registered'], 2); $content['last_locked'] = generateDateTime($content['last_locked'], 2); diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index e21e5b0b4e..cbafb61cf8 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -181,7 +181,7 @@ switch ($mode) { sendAdminNotification($ADMIN_SUBJ, 'admin_transfer_points', $content); // Transfer is completed - loadTemplate('admin_settings_saved', false, getMessage('TRANSFER_COMPLETED') . "
    {--TRANSFER_CONTINUE_OVERVIEW--}"); + loadTemplate('admin_settings_saved', false, getMessage('TRANSFER_COMPLETED') . "
    {--TRANSFER_CONTINUE_OVERVIEW--}"); } elseif ($valid_code === false) { // Invalid Touring code! loadTemplate('admin_settings_saved', false, "
    {--TRANSFER_INVALID_CODE--}
    "); @@ -461,7 +461,7 @@ KEY (`party_userid`) $total = countSumTotalData(getMemberId(), 'user_transfers_in', 'id', 'userid', true); $content['in_link'] = $total; if ($total > 0) { - $content['in_link'] = "".$total.""; + $content['in_link'] = "" . $total . ""; } // END - if // Check outgoing transfers @@ -472,13 +472,13 @@ KEY (`party_userid`) $content['out_link'] = $dmy; if ($dmy > 0) { - $content['out_link'] = "".$dmy.""; + $content['out_link'] = "" . $dmy . ""; } // END - if // Total transactions $content['all_link'] = $total; if ($total > 0) { - $content['all_link'] = "".$total.""; + $content['all_link'] = "" . $total . ""; } // END - if if (isFormSent()) { @@ -504,7 +504,7 @@ KEY (`party_userid`) // Set 'new transfer' link according to above option switch (getUserData('opt_in')) { case 'Y': - $content['new_link'] = "{--TRANSFER_NOW_LINK--}"; + $content['new_link'] = "{--TRANSFER_NOW_LINK--}"; break; case 'N': diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php index 44f10ad3b3..1409dccf16 100644 --- a/inc/modules/member/what-wernis.php +++ b/inc/modules/member/what-wernis.php @@ -111,13 +111,13 @@ if ((!isGetRequestElementSet('mode')) || (getRequestElement('mode') == 'choose') // Is the payout mode active? if (getConfig('wernis_payout_active') == 'Y') { // Add link - $content['payout_link'] = "
    {--MEMBER_WERNIS_MODE_PAYOUT--}
    "; + $content['payout_link'] = "
    {--MEMBER_WERNIS_MODE_PAYOUT--}
    "; } // END - if // Is the withdraw mode active? if (getConfig('wernis_withdraw_active') == 'Y') { // Add link - $content['withdraw_link'] = "
    {--MEMBER_WERNIS_MODE_WITHDRAW--}
    "; + $content['withdraw_link'] = "
    {--MEMBER_WERNIS_MODE_WITHDRAW--}
    "; } // END - if // Mode chooser! ;-) diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 47478a726b..6297f28228 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -340,7 +340,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) { // Begin the navigation line if ((!isset($GLOBALS['nav_depth'])) && ($return === false)) { $GLOBALS['nav_depth'] = '0'; - $prefix = "
    {--YOU_ARE_HERE--} Home"; + $prefix = "
    {--YOU_ARE_HERE--} Home"; } else { if ($return === false) $GLOBALS['nav_depth']++; $prefix = ''; @@ -356,7 +356,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) { if (((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (getConfig('youre_here') == 'Y')) || ((isAdmin()) && ($modCheck == 'admin'))) { // Output HTML code - $OUT = $prefix . ""); @@ -447,7 +447,7 @@ function addMenu ($mode, $action, $what) { } // END - if // Navigation link - $OUT .= ""; + $OUT .= ""; } else { // Not found! - open $OUT .= ""; @@ -1246,7 +1246,8 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify // Load email template $message = loadEmailTemplate('confirm-referal', $content, bigintval($userid)); - sendEmail(getUserData('email'), THANX_REFERAL_ONE, $message); + // Send email + sendEmail($userid, getMessage('THANX_REFERAL_ONE_SUBJECT'), $message); } elseif (($sendNotify) && (getUserData('refid') == '0') && ($locked === false) && ($add_mode == 'direct')) { // Prepare content $content = array( @@ -1258,7 +1259,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify $message = loadEmailTemplate('add-points', $content, $userid); // And sent it away - sendEmail(getUserData('email'), getMessage('SUBJECT_DIRECT_PAYMENT'), $message); + sendEmail($userid, getMessage('SUBJECT_DIRECT_PAYMENT'), $message); if (!isGetRequestElementSet('mid')) loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED')); } diff --git a/inc/session.php b/inc/session.php index f26fc26296..8d8d5b7cf9 100644 --- a/inc/session.php +++ b/inc/session.php @@ -53,7 +53,7 @@ if (isExtensionInstalledAndNewer('sql_patches', '0.5.3')) { // Is a session id there? if (session_id() == '') { // Start the session - session_start(); + $GLOBALS['valid_session'] = session_start(); } // END - if // Load language file(s) diff --git a/inc/stylesheet.php b/inc/stylesheet.php index d8e1514d01..47c6b65abd 100644 --- a/inc/stylesheet.php +++ b/inc/stylesheet.php @@ -69,7 +69,7 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) { if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) { switch (getConfig('css_php')) { case 'DIRECT': // Just link them (unsupported) - outputHtml(''); + outputHtml(''); break; case 'FILE': // Output contents @@ -106,7 +106,7 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) { loadTemplate('css_inline', false, $OUT); } else { // Now we load all CSS files from css.php! - outputHtml(''); + outputHtml('%}" />'); } // [EOF] diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index 1ecde45134..7e28564029 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -222,12 +222,12 @@ function detectRemoteHostname () { } // "Getter" for user agent -function detectUserAgent () { +function detectUserAgent ($alwaysReal = false) { // Get remote ip from environment $userAgent = getenv('HTTP_USER_AGENT'); // Is removeip installed? - if (isExtensionActive('removeip')) { + if ((isExtensionActive('removeip')) && ($alwaysReal === false)) { // Then anonymize it $userAgent = getAnonymousUserAgent($userAgent); } // END - if diff --git a/index.php b/index.php index f08e799a4f..4c859b6e3b 100644 --- a/index.php +++ b/index.php @@ -46,7 +46,7 @@ $GLOBALS['startTime'] = microtime(true); // Set module $GLOBALS['module'] = 'index'; -// Set 'CSS-Mode' +// Set CSS mode $GLOBALS['output_mode'] = '0'; // Load config.php diff --git a/templates/de/html/admin/admin_add_bank_package.tpl b/templates/de/html/admin/admin_add_bank_package.tpl index 04bbdb1add..39c4c7b2e9 100644 --- a/templates/de/html/admin/admin_add_bank_package.tpl +++ b/templates/de/html/admin/admin_add_bank_package.tpl @@ -1,4 +1,4 @@ -
    +
    diff --git a/templates/de/html/admin/admin_add_banner.tpl b/templates/de/html/admin/admin_add_banner.tpl index 2575924ade..f540b91d78 100644 --- a/templates/de/html/admin/admin_add_banner.tpl +++ b/templates/de/html/admin/admin_add_banner.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_add_cat.tpl b/templates/de/html/admin/admin_add_cat.tpl index 0f8be66b2c..2a74cf098c 100644 --- a/templates/de/html/admin/admin_add_cat.tpl +++ b/templates/de/html/admin/admin_add_cat.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_add_country.tpl b/templates/de/html/admin/admin_add_country.tpl index b22c77e84b..c6b0c1cd50 100644 --- a/templates/de/html/admin/admin_add_country.tpl +++ b/templates/de/html/admin/admin_add_country.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_add_max.tpl b/templates/de/html/admin/admin_add_max.tpl index 1f2ad88d28..a8c61046c0 100644 --- a/templates/de/html/admin/admin_add_max.tpl +++ b/templates/de/html/admin/admin_add_max.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_add_network.tpl b/templates/de/html/admin/admin_add_network.tpl index 863ee4c3e4..fc3eeb1839 100644 --- a/templates/de/html/admin/admin_add_network.tpl +++ b/templates/de/html/admin/admin_add_network.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_add_payment.tpl b/templates/de/html/admin/admin_add_payment.tpl index 1f0acef2d0..92d187c9d3 100644 --- a/templates/de/html/admin/admin_add_payment.tpl +++ b/templates/de/html/admin/admin_add_payment.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_add_points.tpl b/templates/de/html/admin/admin_add_points.tpl index 3b423dd7b9..1dca5b5e60 100644 --- a/templates/de/html/admin/admin_add_points.tpl +++ b/templates/de/html/admin/admin_add_points.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_add_points_all.tpl b/templates/de/html/admin/admin_add_points_all.tpl index a27b66f9d2..f8d9862dbc 100644 --- a/templates/de/html/admin/admin_add_points_all.tpl +++ b/templates/de/html/admin/admin_add_points_all.tpl @@ -1,4 +1,4 @@ - +
     
    diff --git a/templates/de/html/admin/admin_add_rallye.tpl b/templates/de/html/admin/admin_add_rallye.tpl index 47a2ae9598..597e669812 100644 --- a/templates/de/html/admin/admin_add_rallye.tpl +++ b/templates/de/html/admin/admin_add_rallye.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_add_rallye_prices.tpl b/templates/de/html/admin/admin_add_rallye_prices.tpl index 984e22e978..7b8f6a6d56 100644 --- a/templates/de/html/admin/admin_add_rallye_prices.tpl +++ b/templates/de/html/admin/admin_add_rallye_prices.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_add_reflevel.tpl b/templates/de/html/admin/admin_add_reflevel.tpl index c42555ac3a..2b8703e679 100644 --- a/templates/de/html/admin/admin_add_reflevel.tpl +++ b/templates/de/html/admin/admin_add_reflevel.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_add_sponsor.tpl b/templates/de/html/admin/admin_add_sponsor.tpl index 045844a5d8..84c32cc1ef 100644 --- a/templates/de/html/admin/admin_add_sponsor.tpl +++ b/templates/de/html/admin/admin_add_sponsor.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_add_sponsor_already.tpl b/templates/de/html/admin/admin_add_sponsor_already.tpl index 541faac20a..14b9ed81ba 100644 --- a/templates/de/html/admin/admin_add_sponsor_already.tpl +++ b/templates/de/html/admin/admin_add_sponsor_already.tpl @@ -1,4 +1,4 @@ - +
     
    diff --git a/templates/de/html/admin/admin_add_sponsor_paytype.tpl b/templates/de/html/admin/admin_add_sponsor_paytype.tpl index 894b9e1a2f..281694b813 100644 --- a/templates/de/html/admin/admin_add_sponsor_paytype.tpl +++ b/templates/de/html/admin/admin_add_sponsor_paytype.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_add_surfbar_url.tpl b/templates/de/html/admin/admin_add_surfbar_url.tpl index 89b391342e..af24387b2b 100644 --- a/templates/de/html/admin/admin_add_surfbar_url.tpl +++ b/templates/de/html/admin/admin_add_surfbar_url.tpl @@ -1,5 +1,5 @@
    - +
    URL in Surfbar hinzufügen: diff --git a/templates/de/html/admin/admin_admin_add.tpl b/templates/de/html/admin/admin_admin_add.tpl index 944a72d973..e5e282bcee 100644 --- a/templates/de/html/admin/admin_admin_add.tpl +++ b/templates/de/html/admin/admin_admin_add.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_admins_add.tpl b/templates/de/html/admin/admin_admins_add.tpl index 6047e730b2..9795cbcd3b 100644 --- a/templates/de/html/admin/admin_admins_add.tpl +++ b/templates/de/html/admin/admin_admins_add.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_admins_add_acl.tpl b/templates/de/html/admin/admin_admins_add_acl.tpl index a5e8a89d07..81c817a409 100644 --- a/templates/de/html/admin/admin_admins_add_acl.tpl +++ b/templates/de/html/admin/admin_admins_add_acl.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_admins_contct_form.tpl b/templates/de/html/admin/admin_admins_contct_form.tpl index 94348ee566..c510d51e99 100644 --- a/templates/de/html/admin/admin_admins_contct_form.tpl +++ b/templates/de/html/admin/admin_admins_contct_form.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_admins_mails_edit.tpl b/templates/de/html/admin/admin_admins_mails_edit.tpl index b761241a3f..40518200bf 100644 --- a/templates/de/html/admin/admin_admins_mails_edit.tpl +++ b/templates/de/html/admin/admin_admins_mails_edit.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_admins_mails_list.tpl b/templates/de/html/admin/admin_admins_mails_list.tpl index aa5702155c..51f80370ba 100644 --- a/templates/de/html/admin/admin_admins_mails_list.tpl +++ b/templates/de/html/admin/admin_admins_mails_list.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_amenu_delete.tpl b/templates/de/html/admin/admin_amenu_delete.tpl index f31eb4af4a..f3e4dd1d1f 100644 --- a/templates/de/html/admin/admin_amenu_delete.tpl +++ b/templates/de/html/admin/admin_amenu_delete.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_amenu_edit.tpl b/templates/de/html/admin/admin_amenu_edit.tpl index 7e57dec744..31d25938c4 100644 --- a/templates/de/html/admin/admin_amenu_edit.tpl +++ b/templates/de/html/admin/admin_amenu_edit.tpl @@ -1,5 +1,5 @@
    - + diff --git a/templates/de/html/admin/admin_amenu_edit_form.tpl b/templates/de/html/admin/admin_amenu_edit_form.tpl index c3cd0c4f7a..552bd82036 100644 --- a/templates/de/html/admin/admin_amenu_edit_form.tpl +++ b/templates/de/html/admin/admin_amenu_edit_form.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_active.tpl b/templates/de/html/admin/admin_config_active.tpl index 1980bb69ff..fedf236baf 100644 --- a/templates/de/html/admin/admin_config_active.tpl +++ b/templates/de/html/admin/admin_config_active.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_admin.tpl b/templates/de/html/admin/admin_config_admin.tpl index e80d8c44bd..587f58458e 100644 --- a/templates/de/html/admin/admin_config_admin.tpl +++ b/templates/de/html/admin/admin_config_admin.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_admins.tpl b/templates/de/html/admin/admin_config_admins.tpl index 10594f7ff5..293622cf09 100644 --- a/templates/de/html/admin/admin_config_admins.tpl +++ b/templates/de/html/admin/admin_config_admins.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_admins_del.tpl b/templates/de/html/admin/admin_config_admins_del.tpl index 46c876040b..d25a5edf32 100644 --- a/templates/de/html/admin/admin_config_admins_del.tpl +++ b/templates/de/html/admin/admin_config_admins_del.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_admins_edit.tpl b/templates/de/html/admin/admin_config_admins_edit.tpl index 30f461762b..d371a925e7 100644 --- a/templates/de/html/admin/admin_config_admins_edit.tpl +++ b/templates/de/html/admin/admin_config_admins_edit.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_autopurge.tpl b/templates/de/html/admin/admin_config_autopurge.tpl index f5e16b04ce..ca281d1fa0 100644 --- a/templates/de/html/admin/admin_config_autopurge.tpl +++ b/templates/de/html/admin/admin_config_autopurge.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl index e302daa116..af693d676e 100644 --- a/templates/de/html/admin/admin_config_beg.tpl +++ b/templates/de/html/admin/admin_config_beg.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_config_birthday.tpl b/templates/de/html/admin/admin_config_birthday.tpl index e7345e985c..363357eb93 100644 --- a/templates/de/html/admin/admin_config_birthday.tpl +++ b/templates/de/html/admin/admin_config_birthday.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl index ccb52ca921..e4959adefa 100644 --- a/templates/de/html/admin/admin_config_bonus.tpl +++ b/templates/de/html/admin/admin_config_bonus.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_config_cats.tpl b/templates/de/html/admin/admin_config_cats.tpl index be06331b64..4fa593569b 100644 --- a/templates/de/html/admin/admin_config_cats.tpl +++ b/templates/de/html/admin/admin_config_cats.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl index d4052a6dc3..408648e1e0 100644 --- a/templates/de/html/admin/admin_config_doubler.tpl +++ b/templates/de/html/admin/admin_config_doubler.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_config_email.tpl b/templates/de/html/admin/admin_config_email.tpl index 372b563a11..705c33d35b 100644 --- a/templates/de/html/admin/admin_config_email.tpl +++ b/templates/de/html/admin/admin_config_email.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_email_del.tpl b/templates/de/html/admin/admin_config_email_del.tpl index 98ca746705..ae79ebc51f 100644 --- a/templates/de/html/admin/admin_config_email_del.tpl +++ b/templates/de/html/admin/admin_config_email_del.tpl @@ -1,5 +1,5 @@
    - + diff --git a/templates/de/html/admin/admin_config_email_edit.tpl b/templates/de/html/admin/admin_config_email_edit.tpl index 0c3232b997..67e9852faa 100644 --- a/templates/de/html/admin/admin_config_email_edit.tpl +++ b/templates/de/html/admin/admin_config_email_edit.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_extensions.tpl b/templates/de/html/admin/admin_config_extensions.tpl index 8a2a4d4453..4d59936734 100644 --- a/templates/de/html/admin/admin_config_extensions.tpl +++ b/templates/de/html/admin/admin_config_extensions.tpl @@ -1,4 +1,4 @@ - +
    {--EDIT_MRECEIVE--}:
    diff --git a/templates/de/html/admin/admin_config_holiday.tpl b/templates/de/html/admin/admin_config_holiday.tpl index 5188de53ab..f982877f52 100644 --- a/templates/de/html/admin/admin_config_holiday.tpl +++ b/templates/de/html/admin/admin_config_holiday.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_home_main.tpl b/templates/de/html/admin/admin_config_home_main.tpl index e9358401a4..8e2fcc6f08 100644 --- a/templates/de/html/admin/admin_config_home_main.tpl +++ b/templates/de/html/admin/admin_config_home_main.tpl @@ -5,12 +5,12 @@
     · {--ADMIN_EDIT_HOME_TARGET--} + href="{%url=modules.php?module=admin&what=config_home&sub=target%}"> · {--ADMIN_EDIT_HOME_TARGET--}
     · {--ADMIN_EDIT_HOME_SETTINGS--} + href="{%url=modules.php?module=admin&what=config_home&sub=settings%}"> · {--ADMIN_EDIT_HOME_SETTINGS--}
    diff --git a/templates/de/html/admin/admin_config_home_settings.tpl b/templates/de/html/admin/admin_config_home_settings.tpl index 75e5597ff7..5271b4c706 100644 --- a/templates/de/html/admin/admin_config_home_settings.tpl +++ b/templates/de/html/admin/admin_config_home_settings.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_config_mediadata.tpl b/templates/de/html/admin/admin_config_mediadata.tpl index ea15e4a6f0..94978f572c 100644 --- a/templates/de/html/admin/admin_config_mediadata.tpl +++ b/templates/de/html/admin/admin_config_mediadata.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_menu.tpl b/templates/de/html/admin/admin_config_menu.tpl index ce939de369..656af4796c 100644 --- a/templates/de/html/admin/admin_config_menu.tpl +++ b/templates/de/html/admin/admin_config_menu.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_config_newsletter.tpl b/templates/de/html/admin/admin_config_newsletter.tpl index 4774364816..6d62c36b1d 100644 --- a/templates/de/html/admin/admin_config_newsletter.tpl +++ b/templates/de/html/admin/admin_config_newsletter.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_config_nickname.tpl b/templates/de/html/admin/admin_config_nickname.tpl index 16a33d5865..d937177ad5 100644 --- a/templates/de/html/admin/admin_config_nickname.tpl +++ b/templates/de/html/admin/admin_config_nickname.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl index 305ec46cc5..99a44d37ea 100644 --- a/templates/de/html/admin/admin_config_order.tpl +++ b/templates/de/html/admin/admin_config_order.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_config_order_form.tpl b/templates/de/html/admin/admin_config_order_form.tpl index 9d989f8d69..bc6586e830 100644 --- a/templates/de/html/admin/admin_config_order_form.tpl +++ b/templates/de/html/admin/admin_config_order_form.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_config_other.tpl b/templates/de/html/admin/admin_config_other.tpl index 53946b4317..fc37d0ad18 100644 --- a/templates/de/html/admin/admin_config_other.tpl +++ b/templates/de/html/admin/admin_config_other.tpl @@ -1,4 +1,4 @@ - +
     
    diff --git a/templates/de/html/admin/admin_config_payouts.tpl b/templates/de/html/admin/admin_config_payouts.tpl index b01d6bcb56..8a70610ecc 100644 --- a/templates/de/html/admin/admin_config_payouts.tpl +++ b/templates/de/html/admin/admin_config_payouts.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_payouts_del.tpl b/templates/de/html/admin/admin_config_payouts_del.tpl index 2d5e3cb4bf..1e999942f0 100644 --- a/templates/de/html/admin/admin_config_payouts_del.tpl +++ b/templates/de/html/admin/admin_config_payouts_del.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_payouts_edit.tpl b/templates/de/html/admin/admin_config_payouts_edit.tpl index 26c888796a..4a3bcbb4da 100644 --- a/templates/de/html/admin/admin_config_payouts_edit.tpl +++ b/templates/de/html/admin/admin_config_payouts_edit.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_point_settings.tpl b/templates/de/html/admin/admin_config_point_settings.tpl index e3760a805c..20072dfae2 100644 --- a/templates/de/html/admin/admin_config_point_settings.tpl +++ b/templates/de/html/admin/admin_config_point_settings.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_config_points.tpl b/templates/de/html/admin/admin_config_points.tpl index da3e3da2d1..2fbf6c53a2 100644 --- a/templates/de/html/admin/admin_config_points.tpl +++ b/templates/de/html/admin/admin_config_points.tpl @@ -1,27 +1,19 @@
    - - - - - - - -
     
      ·  {--ADMIN_EDIT_POINTS--} + href="{%url=modules.php?module=admin&what=config_points&sub=points%}">{--ADMIN_EDIT_POINTS--}  
    ·  {--ADMIN_EDIT_REFDEPTHS--} + href="{%url=modules.php?module=admin&what=config_points&sub=ref%}">{--ADMIN_EDIT_REFDEPTHS--}
    ·  {--ADMIN_EDIT_POINT_SETTINGS--} + href="{%url=modules.php?module=admin&what=config_points&sub=settings%}">{--ADMIN_EDIT_POINT_SETTINGS--}
     
    diff --git a/templates/de/html/admin/admin_config_primera.tpl b/templates/de/html/admin/admin_config_primera.tpl index e69fc79112..48e3c950d1 100644 --- a/templates/de/html/admin/admin_config_primera.tpl +++ b/templates/de/html/admin/admin_config_primera.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_proxy.tpl b/templates/de/html/admin/admin_config_proxy.tpl index de3e3d08b4..1df1347c5c 100644 --- a/templates/de/html/admin/admin_config_proxy.tpl +++ b/templates/de/html/admin/admin_config_proxy.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_config_rallye_del.tpl b/templates/de/html/admin/admin_config_rallye_del.tpl index 9098f534bd..1ef0afd49a 100644 --- a/templates/de/html/admin/admin_config_rallye_del.tpl +++ b/templates/de/html/admin/admin_config_rallye_del.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_rallye_edit.tpl b/templates/de/html/admin/admin_config_rallye_edit.tpl index d683a3cad7..62c6e40c3f 100644 --- a/templates/de/html/admin/admin_config_rallye_edit.tpl +++ b/templates/de/html/admin/admin_config_rallye_edit.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_rallye_prices.tpl b/templates/de/html/admin/admin_config_rallye_prices.tpl index 4ce3e4af29..07d93b107e 100644 --- a/templates/de/html/admin/admin_config_rallye_prices.tpl +++ b/templates/de/html/admin/admin_config_rallye_prices.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_refback.tpl b/templates/de/html/admin/admin_config_refback.tpl index acfaab43c9..ab2bb46840 100644 --- a/templates/de/html/admin/admin_config_refback.tpl +++ b/templates/de/html/admin/admin_config_refback.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_config_refid.tpl b/templates/de/html/admin/admin_config_refid.tpl index 0427e43a68..25f383b170 100644 --- a/templates/de/html/admin/admin_config_refid.tpl +++ b/templates/de/html/admin/admin_config_refid.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_config_register.tpl b/templates/de/html/admin/admin_config_register.tpl index 60986ef80f..134561e392 100644 --- a/templates/de/html/admin/admin_config_register.tpl +++ b/templates/de/html/admin/admin_config_register.tpl @@ -1,5 +1,5 @@
    - +
    {--REGISTER_MUST_HEADER--}: diff --git a/templates/de/html/admin/admin_config_register2.tpl b/templates/de/html/admin/admin_config_register2.tpl index 282302f961..0bb9a5b783 100644 --- a/templates/de/html/admin/admin_config_register2.tpl +++ b/templates/de/html/admin/admin_config_register2.tpl @@ -1,84 +1,41 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - -
      + {--EDIT_REGFORM_SETTINGS--}  
     
      {--LEAST_CATS--}:   
     
      {--ADMIN_CFG_REGISTER_DEFAULT--}:  $content[register_default] 
     
      {--ADMIN_CFG_REGISTER_DISPLAY_REFID--}:  $content[display_refid] 
     
      {--IP_TIMEOUT--}:  $content[ip_timeout] 
     
      {--REJECT_DOUBLE_EMAIL--}:  $content[check_double_email] 
     
     {--REJECT_DOUBLE_PASS--}: $content[check_double_pass] 
     {--REJECT_DOUBLE_PASS--}:$content[check_double_pass]
      +  
    diff --git a/templates/de/html/admin/admin_config_removeip.tpl b/templates/de/html/admin/admin_config_removeip.tpl index 88b21d6dd9..375d25e858 100644 --- a/templates/de/html/admin/admin_config_removeip.tpl +++ b/templates/de/html/admin/admin_config_removeip.tpl @@ -1,4 +1,4 @@ -
    +
    diff --git a/templates/de/html/admin/admin_config_rewrite.tpl b/templates/de/html/admin/admin_config_rewrite.tpl index dc5fb07198..5f5aeaa98a 100644 --- a/templates/de/html/admin/admin_config_rewrite.tpl +++ b/templates/de/html/admin/admin_config_rewrite.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_secure.tpl b/templates/de/html/admin/admin_config_secure.tpl index ee69e69b56..93a6f0d5f7 100644 --- a/templates/de/html/admin/admin_config_secure.tpl +++ b/templates/de/html/admin/admin_config_secure.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_session.tpl b/templates/de/html/admin/admin_config_session.tpl index 76f77d621f..2beb1d0dd8 100644 --- a/templates/de/html/admin/admin_config_session.tpl +++ b/templates/de/html/admin/admin_config_session.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_config_sponsor.tpl b/templates/de/html/admin/admin_config_sponsor.tpl index f2bc826289..12c01f9198 100644 --- a/templates/de/html/admin/admin_config_sponsor.tpl +++ b/templates/de/html/admin/admin_config_sponsor.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_config_stats.tpl b/templates/de/html/admin/admin_config_stats.tpl index ae00400cd5..923a1969b6 100644 --- a/templates/de/html/admin/admin_config_stats.tpl +++ b/templates/de/html/admin/admin_config_stats.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_config_sub_points.tpl b/templates/de/html/admin/admin_config_sub_points.tpl index 4b90e75815..7cb0532e6b 100644 --- a/templates/de/html/admin/admin_config_sub_points.tpl +++ b/templates/de/html/admin/admin_config_sub_points.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl index 71a47dc4be..d33ba0a208 100644 --- a/templates/de/html/admin/admin_config_surfbar.tpl +++ b/templates/de/html/admin/admin_config_surfbar.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_config_title.tpl b/templates/de/html/admin/admin_config_title.tpl index e5663bf12c..3a53437843 100644 --- a/templates/de/html/admin/admin_config_title.tpl +++ b/templates/de/html/admin/admin_config_title.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_top10.tpl b/templates/de/html/admin/admin_config_top10.tpl index dbdcd92893..bc861b3502 100644 --- a/templates/de/html/admin/admin_config_top10.tpl +++ b/templates/de/html/admin/admin_config_top10.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_transfer.tpl b/templates/de/html/admin/admin_config_transfer.tpl index 763fdeb076..7b3d38c484 100644 --- a/templates/de/html/admin/admin_config_transfer.tpl +++ b/templates/de/html/admin/admin_config_transfer.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_user.tpl b/templates/de/html/admin/admin_config_user.tpl index ff9087dbf5..9634cd6364 100644 --- a/templates/de/html/admin/admin_config_user.tpl +++ b/templates/de/html/admin/admin_config_user.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_wernis.tpl b/templates/de/html/admin/admin_config_wernis.tpl index 259da8a572..493352e4c2 100644 --- a/templates/de/html/admin/admin_config_wernis.tpl +++ b/templates/de/html/admin/admin_config_wernis.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_config_yoomedia.tpl b/templates/de/html/admin/admin_config_yoomedia.tpl index 67ae166e7e..61787d9a2c 100644 --- a/templates/de/html/admin/admin_config_yoomedia.tpl +++ b/templates/de/html/admin/admin_config_yoomedia.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_contct_user_form.tpl b/templates/de/html/admin/admin_contct_user_form.tpl index 00df3e2245..a3d4ee8d31 100644 --- a/templates/de/html/admin/admin_contct_user_form.tpl +++ b/templates/de/html/admin/admin_contct_user_form.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_del_admins.tpl b/templates/de/html/admin/admin_del_admins.tpl index 8ef95229be..59c768dab1 100644 --- a/templates/de/html/admin/admin_del_admins.tpl +++ b/templates/de/html/admin/admin_del_admins.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_del_bank_packages.tpl b/templates/de/html/admin/admin_del_bank_packages.tpl index cf30d54e8e..42fe8cb88a 100644 --- a/templates/de/html/admin/admin_del_bank_packages.tpl +++ b/templates/de/html/admin/admin_del_bank_packages.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_del_cats.tpl b/templates/de/html/admin/admin_del_cats.tpl index af402508a6..ef5efa2e90 100644 --- a/templates/de/html/admin/admin_del_cats.tpl +++ b/templates/de/html/admin/admin_del_cats.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_del_networks.tpl b/templates/de/html/admin/admin_del_networks.tpl index d9f2427b3a..777d10146a 100644 --- a/templates/de/html/admin/admin_del_networks.tpl +++ b/templates/de/html/admin/admin_del_networks.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_del_payments.tpl b/templates/de/html/admin/admin_del_payments.tpl index 09bdcdeee4..4fc6734fc9 100644 --- a/templates/de/html/admin/admin_del_payments.tpl +++ b/templates/de/html/admin/admin_del_payments.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_del_sponsor.tpl b/templates/de/html/admin/admin_del_sponsor.tpl index ef23e1f5e7..78c44840e9 100644 --- a/templates/de/html/admin/admin_del_sponsor.tpl +++ b/templates/de/html/admin/admin_del_sponsor.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_del_surfbar_urls.tpl b/templates/de/html/admin/admin_del_surfbar_urls.tpl index 7d5a847d66..54f25d6b30 100644 --- a/templates/de/html/admin/admin_del_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_del_surfbar_urls.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_del_user.tpl b/templates/de/html/admin/admin_del_user.tpl index ee2a63ffc1..baee1f189d 100644 --- a/templates/de/html/admin/admin_del_user.tpl +++ b/templates/de/html/admin/admin_del_user.tpl @@ -1,4 +1,4 @@ - +
    +
    diff --git a/templates/de/html/admin/admin_edit_bank_packages.tpl b/templates/de/html/admin/admin_edit_bank_packages.tpl index 5ca01ed707..2fa44d3972 100644 --- a/templates/de/html/admin/admin_edit_bank_packages.tpl +++ b/templates/de/html/admin/admin_edit_bank_packages.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_edit_cats.tpl b/templates/de/html/admin/admin_edit_cats.tpl index 307f4e6943..15d8a2979d 100644 --- a/templates/de/html/admin/admin_edit_cats.tpl +++ b/templates/de/html/admin/admin_edit_cats.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_edit_email.tpl b/templates/de/html/admin/admin_edit_email.tpl index 466de2de6b..d5ae214efd 100644 --- a/templates/de/html/admin/admin_edit_email.tpl +++ b/templates/de/html/admin/admin_edit_email.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_edit_email_select.tpl b/templates/de/html/admin/admin_edit_email_select.tpl index 0de48bd8fd..b4a3e196cc 100644 --- a/templates/de/html/admin/admin_edit_email_select.tpl +++ b/templates/de/html/admin/admin_edit_email_select.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_edit_networks.tpl b/templates/de/html/admin/admin_edit_networks.tpl index b11db61567..185c1c1089 100644 --- a/templates/de/html/admin/admin_edit_networks.tpl +++ b/templates/de/html/admin/admin_edit_networks.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_edit_payments.tpl b/templates/de/html/admin/admin_edit_payments.tpl index 94a5dd44a8..bd4cde776d 100644 --- a/templates/de/html/admin/admin_edit_payments.tpl +++ b/templates/de/html/admin/admin_edit_payments.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_edit_rallyes.tpl b/templates/de/html/admin/admin_edit_rallyes.tpl index 98224136b3..1ed8ab43ab 100644 --- a/templates/de/html/admin/admin_edit_rallyes.tpl +++ b/templates/de/html/admin/admin_edit_rallyes.tpl @@ -1,4 +1,4 @@ - +
    {--EDIT_PAYMENT--}:
    diff --git a/templates/de/html/admin/admin_edit_sponsor_add_points.tpl b/templates/de/html/admin/admin_edit_sponsor_add_points.tpl index 93328c9a82..a765298a18 100644 --- a/templates/de/html/admin/admin_edit_sponsor_add_points.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_add_points.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_edit_sponsor_edit.tpl b/templates/de/html/admin/admin_edit_sponsor_edit.tpl index b89f7859e4..b7180e93ce 100644 --- a/templates/de/html/admin/admin_edit_sponsor_edit.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_edit.tpl @@ -1,4 +1,4 @@ -
    +
     
    diff --git a/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl b/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl index 7ba9d305fd..1a8ca370be 100644 --- a/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_edit_surfbar_urls.tpl b/templates/de/html/admin/admin_edit_surfbar_urls.tpl index bfb04b1d3b..ddd63cb6cf 100644 --- a/templates/de/html/admin/admin_edit_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_edit_surfbar_urls.tpl @@ -1,5 +1,5 @@
    - +
     
    diff --git a/templates/de/html/admin/admin_edit_user.tpl b/templates/de/html/admin/admin_edit_user.tpl index 397e63a380..73de5cdc52 100644 --- a/templates/de/html/admin/admin_edit_user.tpl +++ b/templates/de/html/admin/admin_edit_user.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_ext_reg_form.tpl b/templates/de/html/admin/admin_ext_reg_form.tpl index e0e861554d..44d772e387 100644 --- a/templates/de/html/admin/admin_ext_reg_form.tpl +++ b/templates/de/html/admin/admin_ext_reg_form.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_extensions.tpl b/templates/de/html/admin/admin_extensions.tpl index 9b2fe76c70..aa804b0650 100644 --- a/templates/de/html/admin/admin_extensions.tpl +++ b/templates/de/html/admin/admin_extensions.tpl @@ -1,5 +1,5 @@
    -
    +
    diff --git a/templates/de/html/admin/admin_email_archiv_row.tpl b/templates/de/html/admin/admin_email_archiv_row.tpl index 3713c6df5a..1cb626ce7d 100644 --- a/templates/de/html/admin/admin_email_archiv_row.tpl +++ b/templates/de/html/admin/admin_email_archiv_row.tpl @@ -76,6 +76,6 @@
    - {--ADMIN_DELETE_NORMAL_MAIL--} + {--ADMIN_DELETE_NORMAL_MAIL--}
    diff --git a/templates/de/html/admin/admin_extensions_delete.tpl b/templates/de/html/admin/admin_extensions_delete.tpl index 520745e1b0..1fc7366f37 100644 --- a/templates/de/html/admin/admin_extensions_delete.tpl +++ b/templates/de/html/admin/admin_extensions_delete.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_extensions_edit.tpl b/templates/de/html/admin/admin_extensions_edit.tpl index 51f0ce1246..081a5d0000 100644 --- a/templates/de/html/admin/admin_extensions_edit.tpl +++ b/templates/de/html/admin/admin_extensions_edit.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_footer.tpl b/templates/de/html/admin/admin_footer.tpl index 63f9604ec3..443aea25be 100644 --- a/templates/de/html/admin/admin_footer.tpl +++ b/templates/de/html/admin/admin_footer.tpl @@ -1,7 +1,7 @@
    diff --git a/templates/de/html/admin/admin_gmenu_delete.tpl b/templates/de/html/admin/admin_gmenu_delete.tpl index f5abc019ca..b788ae9e0f 100644 --- a/templates/de/html/admin/admin_gmenu_delete.tpl +++ b/templates/de/html/admin/admin_gmenu_delete.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_gmenu_edit.tpl b/templates/de/html/admin/admin_gmenu_edit.tpl index 276b90db4a..62f87327cc 100644 --- a/templates/de/html/admin/admin_gmenu_edit.tpl +++ b/templates/de/html/admin/admin_gmenu_edit.tpl @@ -1,5 +1,5 @@
    - + diff --git a/templates/de/html/admin/admin_gmenu_edit_form.tpl b/templates/de/html/admin/admin_gmenu_edit_form.tpl index 32c7f90357..cbfe83f117 100644 --- a/templates/de/html/admin/admin_gmenu_edit_form.tpl +++ b/templates/de/html/admin/admin_gmenu_edit_form.tpl @@ -1,5 +1,5 @@
    - +
    {--ID_SELECT--}
    diff --git a/templates/de/html/admin/admin_gmenu_status.tpl b/templates/de/html/admin/admin_gmenu_status.tpl index 7ef68360c0..4bc812e949 100644 --- a/templates/de/html/admin/admin_gmenu_status.tpl +++ b/templates/de/html/admin/admin_gmenu_status.tpl @@ -1,5 +1,5 @@
    - + diff --git a/templates/de/html/admin/admin_guest_add.tpl b/templates/de/html/admin/admin_guest_add.tpl index 83e3cdf1d9..51c945be65 100644 --- a/templates/de/html/admin/admin_guest_add.tpl +++ b/templates/de/html/admin/admin_guest_add.tpl @@ -1,4 +1,4 @@ - +
     
    diff --git a/templates/de/html/admin/admin_list_admins.tpl b/templates/de/html/admin/admin_list_admins.tpl index 3189696bc0..ec36af7f69 100644 --- a/templates/de/html/admin/admin_list_admins.tpl +++ b/templates/de/html/admin/admin_list_admins.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_list_bank_package.tpl b/templates/de/html/admin/admin_list_bank_package.tpl index c606f1b3b9..eb77a602df 100644 --- a/templates/de/html/admin/admin_list_bank_package.tpl +++ b/templates/de/html/admin/admin_list_bank_package.tpl @@ -1,5 +1,5 @@
    - +
    + href="{%url=modules.php?module=admin&what=list_user&userid=$content[userid]%}">$content[userid]$content[win2] diff --git a/templates/de/html/admin/admin_list_bonus_emails_row.tpl b/templates/de/html/admin/admin_list_bonus_emails_row.tpl index 6e95fee95e..37f4f2becd 100644 --- a/templates/de/html/admin/admin_list_bonus_emails_row.tpl +++ b/templates/de/html/admin/admin_list_bonus_emails_row.tpl @@ -67,6 +67,6 @@ diff --git a/templates/de/html/admin/admin_list_bonus_form.tpl b/templates/de/html/admin/admin_list_bonus_form.tpl index c270110cd4..c66a2672f7 100644 --- a/templates/de/html/admin/admin_list_bonus_form.tpl +++ b/templates/de/html/admin/admin_list_bonus_form.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_list_cats.tpl b/templates/de/html/admin/admin_list_cats.tpl index 922eaf8907..a2fb85eaca 100644 --- a/templates/de/html/admin/admin_list_cats.tpl +++ b/templates/de/html/admin/admin_list_cats.tpl @@ -3,7 +3,7 @@ $content[rows] diff --git a/templates/de/html/admin/admin_list_cats_404.tpl b/templates/de/html/admin/admin_list_cats_404.tpl index 92f3403046..9f636053c5 100644 --- a/templates/de/html/admin/admin_list_cats_404.tpl +++ b/templates/de/html/admin/admin_list_cats_404.tpl @@ -1,7 +1,7 @@
    diff --git a/templates/de/html/admin/admin_list_beg_form.tpl b/templates/de/html/admin/admin_list_beg_form.tpl index 7bb6a6c03a..dcb2c9fef7 100644 --- a/templates/de/html/admin/admin_list_beg_form.tpl +++ b/templates/de/html/admin/admin_list_beg_form.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_list_beg_rows.tpl b/templates/de/html/admin/admin_list_beg_rows.tpl index 7b0faefe6a..0f5303bd2e 100644 --- a/templates/de/html/admin/admin_list_beg_rows.tpl +++ b/templates/de/html/admin/admin_list_beg_rows.tpl @@ -1,7 +1,7 @@
    $content[win1]$content[cnt]$content[win2] $content[win1]$content[userid]$content[win2]  $content[win1]$content[gender] $content[surname] $content[family]$content[win2]
    - {--ADMIN_DELETE_BONUS_MAIL--} + {--ADMIN_DELETE_BONUS_MAIL--}
    {--USER_ID--}: $content[userid]($content[email]) + href="{%url=modules.php?module=admin&what=list_user&userid=$content[userid]%}">$content[userid]($content[email])
    diff --git a/templates/de/html/admin/admin_list_chk_reg_row.tpl b/templates/de/html/admin/admin_list_chk_reg_row.tpl index f635d3f277..cb77fb43fc 100644 --- a/templates/de/html/admin/admin_list_chk_reg_row.tpl +++ b/templates/de/html/admin/admin_list_chk_reg_row.tpl @@ -7,6 +7,6 @@ diff --git a/templates/de/html/admin/admin_list_country.tpl b/templates/de/html/admin/admin_list_country.tpl index d504e9224c..0b18f06e5a 100644 --- a/templates/de/html/admin/admin_list_country.tpl +++ b/templates/de/html/admin/admin_list_country.tpl @@ -1,5 +1,5 @@
    -
    +
    - {--ADMIN_MEM_NO_CATS_1--}$content[userid]{--ADMIN_MEM_NO_CATS_2--} + {--ADMIN_MEM_NO_CATS_1--}$content[userid]{--ADMIN_MEM_NO_CATS_2--}
    $content[remote_addr] $content[refid] - {--CONFIRMATION_LINK--} + {--CONFIRMATION_LINK--}
    diff --git a/templates/de/html/admin/admin_list_country_form.tpl b/templates/de/html/admin/admin_list_country_form.tpl index 4d46a8f5ae..d78a4c27c5 100644 --- a/templates/de/html/admin/admin_list_country_form.tpl +++ b/templates/de/html/admin/admin_list_country_form.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_list_holiday.tpl b/templates/de/html/admin/admin_list_holiday.tpl index 0bf4d2908a..dc5244dc34 100644 --- a/templates/de/html/admin/admin_list_holiday.tpl +++ b/templates/de/html/admin/admin_list_holiday.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_list_emails_row.tpl b/templates/de/html/admin/admin_list_emails_row.tpl index 78e447ec15..7f1720fd1f 100644 --- a/templates/de/html/admin/admin_list_emails_row.tpl +++ b/templates/de/html/admin/admin_list_emails_row.tpl @@ -56,6 +56,6 @@
    - {--ADMIN_DELETE_NORMAL_MAIL--} + {--ADMIN_DELETE_NORMAL_MAIL--}
    diff --git a/templates/de/html/admin/admin_list_imprint.tpl b/templates/de/html/admin/admin_list_imprint.tpl index 66f65fbb3c..b197c3a723 100644 --- a/templates/de/html/admin/admin_list_imprint.tpl +++ b/templates/de/html/admin/admin_list_imprint.tpl @@ -1,5 +1,5 @@
    - +
    {--ID_SELECT--}
    diff --git a/templates/de/html/admin/admin_list_links.tpl b/templates/de/html/admin/admin_list_links.tpl index 2b48b7deeb..6701d55899 100644 --- a/templates/de/html/admin/admin_list_links.tpl +++ b/templates/de/html/admin/admin_list_links.tpl @@ -1,14 +1,14 @@ $content[rows]
    - $content[surname] $content[family] ($content[email]): + $content[surname] $content[family] ($content[email]):
    {--MEMBER_TOTAL_LINKS_1--}$content[nums]{--MEMBER_TOTAL_LINKS_2--}
    - {--ADMIN_DEL_UNCONFIRMED_LINKS--} + {--ADMIN_DEL_UNCONFIRMED_LINKS--}
    diff --git a/templates/de/html/admin/admin_list_mods.tpl b/templates/de/html/admin/admin_list_mods.tpl index b725704214..fbbf94504d 100644 --- a/templates/de/html/admin/admin_list_mods.tpl +++ b/templates/de/html/admin/admin_list_mods.tpl @@ -1,5 +1,5 @@
    - + diff --git a/templates/de/html/admin/admin_list_networks.tpl b/templates/de/html/admin/admin_list_networks.tpl index ff93267f1d..6ecb6c30b8 100644 --- a/templates/de/html/admin/admin_list_networks.tpl +++ b/templates/de/html/admin/admin_list_networks.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_list_networks_row.tpl b/templates/de/html/admin/admin_list_networks_row.tpl index 2961d0884c..7774502f3c 100644 --- a/templates/de/html/admin/admin_list_networks_row.tpl +++ b/templates/de/html/admin/admin_list_networks_row.tpl @@ -5,10 +5,10 @@ diff --git a/templates/de/html/admin/admin_list_payments.tpl b/templates/de/html/admin/admin_list_payments.tpl index f9438460ab..ca6dae2f5e 100644 --- a/templates/de/html/admin/admin_list_payments.tpl +++ b/templates/de/html/admin/admin_list_payments.tpl @@ -1,5 +1,5 @@
    - +
      $content[network_short_name]: [T|P|CT|C] + href="{%url=modules.php?module=admin&what=list_network_types&network=$content[network_id]%}" title="{--ADMIN_NETWORK_LIST_TYPES_LINK_TITLE--}">T|P|CT|C] [$content[network_title]] diff --git a/templates/de/html/admin/admin_list_notify_emails_row.tpl b/templates/de/html/admin/admin_list_notify_emails_row.tpl index 8bee3efa93..414c7c4673 100644 --- a/templates/de/html/admin/admin_list_notify_emails_row.tpl +++ b/templates/de/html/admin/admin_list_notify_emails_row.tpl @@ -67,6 +67,6 @@
    - {--ADMIN_DELETE_NOTIFY_MAIL--} + {--ADMIN_DELETE_NOTIFY_MAIL--}
    - + diff --git a/templates/de/html/admin/admin_list_rallye_usr_row.tpl b/templates/de/html/admin/admin_list_rallye_usr_row.tpl index aab9acba31..dd00d82559 100644 --- a/templates/de/html/admin/admin_list_rallye_usr_row.tpl +++ b/templates/de/html/admin/admin_list_rallye_usr_row.tpl @@ -1,7 +1,7 @@ diff --git a/templates/de/html/admin/admin_list_rallyes.tpl b/templates/de/html/admin/admin_list_rallyes.tpl index 4d0a899e9d..6dca9a1a51 100644 --- a/templates/de/html/admin/admin_list_rallyes.tpl +++ b/templates/de/html/admin/admin_list_rallyes.tpl @@ -1,4 +1,4 @@ - +
    {--EDIT_DEL_PAYMENT--} diff --git a/templates/de/html/admin/admin_list_payouts.tpl b/templates/de/html/admin/admin_list_payouts.tpl index 66d984d022..9f3857f903 100644 --- a/templates/de/html/admin/admin_list_payouts.tpl +++ b/templates/de/html/admin/admin_list_payouts.tpl @@ -1,4 +1,4 @@ - +
    {--PAYOUT_ADMIN_LIST_PAYOUTS--}: @@ -15,7 +15,7 @@ $content
    - {--PAYOUT_DELETE_ALL_REQUESTS--} + {--PAYOUT_DELETE_ALL_REQUESTS--}
    diff --git a/templates/de/html/admin/admin_list_rallye_noselect.tpl b/templates/de/html/admin/admin_list_rallye_noselect.tpl index 18ca8f2500..80ab615927 100644 --- a/templates/de/html/admin/admin_list_rallye_noselect.tpl +++ b/templates/de/html/admin/admin_list_rallye_noselect.tpl @@ -1,3 +1,3 @@ {--RALLYE_NO_RALLYES_SELECTED_1--} -{--RALLYE_NO_RALLYES_SELECTED_2--} +{--RALLYE_NO_RALLYES_SELECTED_2--} {--RALLYE_NO_RALLYES_SELECTED_3--} diff --git a/templates/de/html/admin/admin_list_rallye_prices_row.tpl b/templates/de/html/admin/admin_list_rallye_prices_row.tpl index d8a4b7328a..2c2b961521 100644 --- a/templates/de/html/admin/admin_list_rallye_prices_row.tpl +++ b/templates/de/html/admin/admin_list_rallye_prices_row.tpl @@ -1,5 +1,5 @@
    $content[title]$content[title] $content[admin_link] $content[start] $content[end]
    $content[bold_l]$content[userid]$content[bold_r] + href="{%url=modules.php?module=admin&what=list_user&userid=$content[userid]%}">$content[userid]$content[bold_r] $content[bold_l]$content[old]$content[bold_r]
    diff --git a/templates/de/html/admin/admin_list_sponsor.tpl b/templates/de/html/admin/admin_list_sponsor.tpl index 84880ff4be..c200ad73bc 100644 --- a/templates/de/html/admin/admin_list_sponsor.tpl +++ b/templates/de/html/admin/admin_list_sponsor.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_list_rallyes_row.tpl b/templates/de/html/admin/admin_list_rallyes_row.tpl index 23d8313cfd..abd0d8c084 100644 --- a/templates/de/html/admin/admin_list_rallyes_row.tpl +++ b/templates/de/html/admin/admin_list_rallyes_row.tpl @@ -28,15 +28,15 @@ {--RALLYE_AUTO_ADD--}:
    - $content[auto_lnk] + $content[auto_lnk]     		{--RALLYE_ACTIVE--}:
    - $content[active_lnk] + $content[active_lnk]     		{--RALLYE_NOTIFY--}:
    - $content[notify_lnk] + $content[notify_lnk]     		{--RALLYE_NOTIFIED--}:
    @@ -46,7 +46,7 @@
    {--RALLYE_ASSIGNED_PRICES--}:
    - $content[prices_cnt] + $content[prices_cnt]     		{--RALLYE_ASSIGNED_USERS--}:
    diff --git a/templates/de/html/admin/admin_list_rallyes_row2.tpl b/templates/de/html/admin/admin_list_rallyes_row2.tpl index 610ac863dd..586daa5a27 100644 --- a/templates/de/html/admin/admin_list_rallyes_row2.tpl +++ b/templates/de/html/admin/admin_list_rallyes_row2.tpl @@ -1,7 +1,7 @@
    $content[bold_l]$content[userid]$content[bold_r] + href="{%url=modules.php?module=admin&what=list_user&userid=$content[userid]%}">$content[userid]$content[bold_r] $content[bold_l]$content[old]$content[bold_r]
    - + - + - + - + diff --git a/templates/de/html/admin/admin_list_sponsor_pay.tpl b/templates/de/html/admin/admin_list_sponsor_pay.tpl index 46774023ed..8758dd9120 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_list_sponsor_details.tpl b/templates/de/html/admin/admin_list_sponsor_details.tpl index 89d82af978..36a36d653a 100644 --- a/templates/de/html/admin/admin_list_sponsor_details.tpl +++ b/templates/de/html/admin/admin_list_sponsor_details.tpl @@ -7,7 +7,7 @@
    {--SPONSOR_ID--}:  $content[id] [ $content[status] ] $content[id] [ $content[status] ]
    @@ -82,11 +82,11 @@
    {--SPONSOR_POINTS_AMOUNT--}:  [ $content[points_amount] ] [ $content[points_amount] ]
    {--SPONSOR_POINTS_USED--}:  [ $content[points_used] ] [ $content[points_used] ]
    @@ -115,16 +115,16 @@
    {--SPONSOR_REFERALS--}: [ $content[ref_count] ][ $content[ref_count] ]
    {--ADMIN_SPONSOR_ACTIONS--}:
    diff --git a/templates/de/html/admin/admin_list_sponsor_pay_del.tpl b/templates/de/html/admin/admin_list_sponsor_pay_del.tpl index 7a85a8da58..e1cb4d8db3 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay_del.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay_del.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl b/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl index a85d6864b3..a6e38ee348 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl @@ -1,5 +1,5 @@
    - + @@ -24,7 +24,7 @@
    diff --git a/templates/de/html/admin/admin_list_sponsor_row.tpl b/templates/de/html/admin/admin_list_sponsor_row.tpl index 50be924019..4cedde4470 100644 --- a/templates/de/html/admin/admin_list_sponsor_row.tpl +++ b/templates/de/html/admin/admin_list_sponsor_row.tpl @@ -5,13 +5,13 @@
    - [ $content[id] ] + [ $content[id] ] $content[gender] $content[surname] $content[family] - [ $content[points] ] + [ $content[points] ]
    - [ $content[status] ] + [ $content[status] ] $content[created] diff --git a/templates/de/html/admin/admin_list_surfbar_actions.tpl b/templates/de/html/admin/admin_list_surfbar_actions.tpl index 0c2c1f5123..3150042ade 100644 --- a/templates/de/html/admin/admin_list_surfbar_actions.tpl +++ b/templates/de/html/admin/admin_list_surfbar_actions.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_list_surfbar_urls.tpl b/templates/de/html/admin/admin_list_surfbar_urls.tpl index 50eb2b9223..ea4aa68570 100644 --- a/templates/de/html/admin/admin_list_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_list_surfbar_urls.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_list_surfbar_urls_row.tpl b/templates/de/html/admin/admin_list_surfbar_urls_row.tpl index ad1894326a..f1ebeca359 100644 --- a/templates/de/html/admin/admin_list_surfbar_urls_row.tpl +++ b/templates/de/html/admin/admin_list_surfbar_urls_row.tpl @@ -9,7 +9,7 @@ {--ADMIN_TEST_URL--} - $content[views_total] + $content[views_total] $content[status] diff --git a/templates/de/html/admin/admin_list_task_ext_rows.tpl b/templates/de/html/admin/admin_list_task_ext_rows.tpl index efd8569c92..d59653fabd 100644 --- a/templates/de/html/admin/admin_list_task_ext_rows.tpl +++ b/templates/de/html/admin/admin_list_task_ext_rows.tpl @@ -6,7 +6,7 @@ $content[admin] - {--ADMIN_REGISTER_EXTENSION--} + {--ADMIN_REGISTER_EXTENSION--} $content[infos] diff --git a/templates/de/html/admin/admin_list_transfer.tpl b/templates/de/html/admin/admin_list_transfer.tpl index 8083a736e9..e17347e632 100644 --- a/templates/de/html/admin/admin_list_transfer.tpl +++ b/templates/de/html/admin/admin_list_transfer.tpl @@ -1,5 +1,5 @@
    - + diff --git a/templates/de/html/admin/admin_list_user_sort_form.tpl b/templates/de/html/admin/admin_list_user_sort_form.tpl index fd997ac815..62c682b1cd 100644 --- a/templates/de/html/admin/admin_list_user_sort_form.tpl +++ b/templates/de/html/admin/admin_list_user_sort_form.tpl @@ -4,7 +4,7 @@ diff --git a/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl b/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl index 9f2e01617c..e9e82ce596 100644 --- a/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl +++ b/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl @@ -10,7 +10,7 @@
    diff --git a/templates/de/html/admin/admin_list_unconfirmed_row.tpl b/templates/de/html/admin/admin_list_unconfirmed_row.tpl index ba5c93b0b7..b9087f8dd0 100644 --- a/templates/de/html/admin/admin_list_unconfirmed_row.tpl +++ b/templates/de/html/admin/admin_list_unconfirmed_row.tpl @@ -1,7 +1,7 @@
    $content[u_link] {--CLICK_NOW--}  $content[email] $content[status]
    $content[already] - + diff --git a/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl b/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl index 8eb7ccaf73..872f61ae16 100644 --- a/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl +++ b/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl @@ -6,7 +6,7 @@ $content[remain] $content[pay] € - + diff --git a/templates/de/html/admin/admin_lock_sponsor.tpl b/templates/de/html/admin/admin_lock_sponsor.tpl index 30fedeb1c4..d7c289ad4f 100644 --- a/templates/de/html/admin/admin_lock_sponsor.tpl +++ b/templates/de/html/admin/admin_lock_sponsor.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_lock_surfbar_urls.tpl b/templates/de/html/admin/admin_lock_surfbar_urls.tpl index 8f04d35acb..7ba48253ed 100644 --- a/templates/de/html/admin/admin_lock_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_lock_surfbar_urls.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_lock_user.tpl b/templates/de/html/admin/admin_lock_user.tpl index c0073b7251..e09c2d22b8 100644 --- a/templates/de/html/admin/admin_lock_user.tpl +++ b/templates/de/html/admin/admin_lock_user.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_login_form.tpl b/templates/de/html/admin/admin_login_form.tpl index 448b19a3a8..fe1efe78a9 100644 --- a/templates/de/html/admin/admin_login_form.tpl +++ b/templates/de/html/admin/admin_login_form.tpl @@ -1,5 +1,5 @@
    - +
    @@ -22,7 +22,7 @@ {--ENTER_ADMIN_PASS--}:
    - [{--ADMIN_RESET_PASSWORD--}] + [{--ADMIN_RESET_PASSWORD--}]
    		@@ -54,7 +54,7 @@ - +
    diff --git a/templates/de/html/admin/admin_logout.tpl b/templates/de/html/admin/admin_logout.tpl index 5645c52faf..357fa67c00 100644 --- a/templates/de/html/admin/admin_logout.tpl +++ b/templates/de/html/admin/admin_logout.tpl @@ -1,19 +1,11 @@
    - +
    - - - - - - -
     
    {--ADMIN_LOGOUT_DONE--}
    -
    - {--ADMIN_RELOGIN_LINK--}
    -
    - {--ADMIN_BACK_TO_GUEST_MENU--}
    +     		+
    {--ADMIN_LOGOUT_DONE--}
    + +
     
    diff --git a/templates/de/html/admin/admin_logout_form.tpl b/templates/de/html/admin/admin_logout_form.tpl index 69c141ad2e..56099dc5e1 100644 --- a/templates/de/html/admin/admin_logout_form.tpl +++ b/templates/de/html/admin/admin_logout_form.tpl @@ -1,5 +1,5 @@
    - + diff --git a/templates/de/html/admin/admin_logout_sql_patches_remove.tpl b/templates/de/html/admin/admin_logout_sql_patches_remove.tpl index 80db8c7f72..8609012b84 100644 --- a/templates/de/html/admin/admin_logout_sql_patches_remove.tpl +++ b/templates/de/html/admin/admin_logout_sql_patches_remove.tpl @@ -7,7 +7,7 @@ diff --git a/templates/de/html/admin/admin_maintenance_form.tpl b/templates/de/html/admin/admin_maintenance_form.tpl index 28dc902f21..605543b109 100644 --- a/templates/de/html/admin/admin_maintenance_form.tpl +++ b/templates/de/html/admin/admin_maintenance_form.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_logout_sql_patches_install.tpl b/templates/de/html/admin/admin_logout_sql_patches_install.tpl index 7801680130..aec0e9dd51 100644 --- a/templates/de/html/admin/admin_logout_sql_patches_install.tpl +++ b/templates/de/html/admin/admin_logout_sql_patches_install.tpl @@ -6,9 +6,9 @@
    {--ADMIN_LOGOUT_SQL_PATCHES_DONE--}

    - {--ADMIN_RELOGIN_LINK--}
    + {--ADMIN_RELOGIN_LINK--}

    - {--ADMIN_BACK_TO_GUEST_MENU--}
    + {--ADMIN_BACK_TO_GUEST_MENU--}
    {--ADMIN_LOGOUT_SQL_PATCHES_REMOVE--}

    - {--ADMIN_RESET_PASS_LINK--} + {--ADMIN_RESET_PASS_LINK--}
    diff --git a/templates/de/html/admin/admin_member_add.tpl b/templates/de/html/admin/admin_member_add.tpl index 80006f4075..1c8774c8a9 100644 --- a/templates/de/html/admin/admin_member_add.tpl +++ b/templates/de/html/admin/admin_member_add.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_member_selection_box.tpl b/templates/de/html/admin/admin_member_selection_box.tpl index f22d0ad726..c78cb20767 100644 --- a/templates/de/html/admin/admin_member_selection_box.tpl +++ b/templates/de/html/admin/admin_member_selection_box.tpl @@ -1,4 +1,6 @@ + +
    @@ -10,8 +12,6 @@
    - - {--ADMIN_SELECT_USER--}: - $content[action] + $content[action] $content[what] diff --git a/templates/de/html/admin/admin_mmenu_delete.tpl b/templates/de/html/admin/admin_mmenu_delete.tpl index ca1e7eb909..104e25aea5 100644 --- a/templates/de/html/admin/admin_mmenu_delete.tpl +++ b/templates/de/html/admin/admin_mmenu_delete.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_mmenu_edit.tpl b/templates/de/html/admin/admin_mmenu_edit.tpl index ceeb42f9e8..288e297f7e 100644 --- a/templates/de/html/admin/admin_mmenu_edit.tpl +++ b/templates/de/html/admin/admin_mmenu_edit.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_mmenu_overview.tpl b/templates/de/html/admin/admin_mmenu_overview.tpl index 77e866b887..b8fb4dab97 100644 --- a/templates/de/html/admin/admin_mmenu_overview.tpl +++ b/templates/de/html/admin/admin_mmenu_overview.tpl @@ -1,5 +1,5 @@
    - + diff --git a/templates/de/html/admin/admin_mmenu_status.tpl b/templates/de/html/admin/admin_mmenu_status.tpl index e656527ca8..c04b310870 100644 --- a/templates/de/html/admin/admin_mmenu_status.tpl +++ b/templates/de/html/admin/admin_mmenu_status.tpl @@ -1,5 +1,5 @@
    - +
    {--ID_SELECT--}
    diff --git a/templates/de/html/admin/admin_mods_edit.tpl b/templates/de/html/admin/admin_mods_edit.tpl index 1dd5a703fc..c1ac01c217 100644 --- a/templates/de/html/admin/admin_mods_edit.tpl +++ b/templates/de/html/admin/admin_mods_edit.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_network_added.tpl b/templates/de/html/admin/admin_network_added.tpl index 02ae2a5db2..b8ae153a12 100644 --- a/templates/de/html/admin/admin_network_added.tpl +++ b/templates/de/html/admin/admin_network_added.tpl @@ -6,7 +6,7 @@
    Das Werbenetzwerk $content[network_title] wurde soeben hinzugefügt. - Sie sollten nun als nächstes die Werbearten hinzufügen. + Sie sollten nun als nächstes die Werbearten hinzufügen.
    diff --git a/templates/de/html/admin/admin_newsletter.tpl b/templates/de/html/admin/admin_newsletter.tpl index 069dd3180a..2628c50117 100644 --- a/templates/de/html/admin/admin_newsletter.tpl +++ b/templates/de/html/admin/admin_newsletter.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_newsletter_nohtml.tpl b/templates/de/html/admin/admin_newsletter_nohtml.tpl index 1c2f710d07..86521fa953 100644 --- a/templates/de/html/admin/admin_newsletter_nohtml.tpl +++ b/templates/de/html/admin/admin_newsletter_nohtml.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_next_link.tpl b/templates/de/html/admin/admin_next_link.tpl index bce97f8360..c0a2a67609 100644 --- a/templates/de/html/admin/admin_next_link.tpl +++ b/templates/de/html/admin/admin_next_link.tpl @@ -2,7 +2,7 @@ diff --git a/templates/de/html/admin/admin_overview_header_task.tpl b/templates/de/html/admin/admin_overview_header_task.tpl index 94b5a5f79c..f61cda805b 100644 --- a/templates/de/html/admin/admin_overview_header_task.tpl +++ b/templates/de/html/admin/admin_overview_header_task.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_overview_list_ext_rows.tpl b/templates/de/html/admin/admin_overview_list_ext_rows.tpl index 2988e5c56b..1ac84724f9 100644 --- a/templates/de/html/admin/admin_overview_list_ext_rows.tpl +++ b/templates/de/html/admin/admin_overview_list_ext_rows.tpl @@ -6,7 +6,7 @@ $content[assigned_admin] - {--ADMIN_REGISTER_EXTENSION--} + {--ADMIN_REGISTER_EXTENSION--} $content[infos] diff --git a/templates/de/html/admin/admin_overview_table.tpl b/templates/de/html/admin/admin_overview_table.tpl index 57c4a60691..8e84b2b932 100644 --- a/templates/de/html/admin/admin_overview_table.tpl +++ b/templates/de/html/admin/admin_overview_table.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_payout_accept_form.tpl b/templates/de/html/admin/admin_payout_accept_form.tpl index 8cba2845f6..10841a1c62 100644 --- a/templates/de/html/admin/admin_payout_accept_form.tpl +++ b/templates/de/html/admin/admin_payout_accept_form.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_payout_add_new.tpl b/templates/de/html/admin/admin_payout_add_new.tpl index 67aa8506ea..a5c70f83f6 100644 --- a/templates/de/html/admin/admin_payout_add_new.tpl +++ b/templates/de/html/admin/admin_payout_add_new.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_payout_overview_form.tpl b/templates/de/html/admin/admin_payout_overview_form.tpl index eaf474633a..8f572608a6 100644 --- a/templates/de/html/admin/admin_payout_overview_form.tpl +++ b/templates/de/html/admin/admin_payout_overview_form.tpl @@ -1,7 +1,7 @@ - +
    -
    +
    diff --git a/templates/de/html/admin/admin_payout_reject_form.tpl b/templates/de/html/admin/admin_payout_reject_form.tpl index 57303a944d..0dc02afd94 100644 --- a/templates/de/html/admin/admin_payout_reject_form.tpl +++ b/templates/de/html/admin/admin_payout_reject_form.tpl @@ -1,4 +1,4 @@ -
    +
    diff --git a/templates/de/html/admin/admin_points.tpl b/templates/de/html/admin/admin_points.tpl index 6a09df13e2..f70756c552 100644 --- a/templates/de/html/admin/admin_points.tpl +++ b/templates/de/html/admin/admin_points.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_points_del.tpl b/templates/de/html/admin/admin_points_del.tpl index 3d76e5e363..dc1a560b68 100644 --- a/templates/de/html/admin/admin_points_del.tpl +++ b/templates/de/html/admin/admin_points_del.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_points_edit.tpl b/templates/de/html/admin/admin_points_edit.tpl index 1995694c35..dac3c48155 100644 --- a/templates/de/html/admin/admin_points_edit.tpl +++ b/templates/de/html/admin/admin_points_edit.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_refbanner.tpl b/templates/de/html/admin/admin_refbanner.tpl index e3944db745..0e1f8aed25 100644 --- a/templates/de/html/admin/admin_refbanner.tpl +++ b/templates/de/html/admin/admin_refbanner.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_refbanner_edit.tpl b/templates/de/html/admin/admin_refbanner_edit.tpl index 6987ebecc8..5e9148049b 100644 --- a/templates/de/html/admin/admin_refbanner_edit.tpl +++ b/templates/de/html/admin/admin_refbanner_edit.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_reg_form.tpl b/templates/de/html/admin/admin_reg_form.tpl index 365c6fc41b..51b5b17517 100644 --- a/templates/de/html/admin/admin_reg_form.tpl +++ b/templates/de/html/admin/admin_reg_form.tpl @@ -1,5 +1,5 @@
    - +
    @@ -30,7 +30,7 @@
    - +
    diff --git a/templates/de/html/admin/admin_reset_pass_done.tpl b/templates/de/html/admin/admin_reset_pass_done.tpl index 3a7c96a2d5..5a28849ca3 100644 --- a/templates/de/html/admin/admin_reset_pass_done.tpl +++ b/templates/de/html/admin/admin_reset_pass_done.tpl @@ -11,7 +11,7 @@
    - »» {--ADMIN_CONTINUE_LOGIN--} + »» {--ADMIN_CONTINUE_LOGIN--}
    diff --git a/templates/de/html/admin/admin_reset_password.tpl b/templates/de/html/admin/admin_reset_password.tpl index 74a916d591..6f1644e563 100644 --- a/templates/de/html/admin/admin_reset_password.tpl +++ b/templates/de/html/admin/admin_reset_password.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_reset_password_form.tpl b/templates/de/html/admin/admin_reset_password_form.tpl index 75db5347be..da9b45bae1 100644 --- a/templates/de/html/admin/admin_reset_password_form.tpl +++ b/templates/de/html/admin/admin_reset_password_form.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_send_bonus_form.tpl b/templates/de/html/admin/admin_send_bonus_form.tpl index 3dc9876b27..6c4c557cf8 100644 --- a/templates/de/html/admin/admin_send_bonus_form.tpl +++ b/templates/de/html/admin/admin_send_bonus_form.tpl @@ -1,4 +1,4 @@ - +
    @@ -11,7 +11,7 @@ $content[login]
    - [{--ADMIN_CHANGE_LOGIN--}] + [{--ADMIN_CHANGE_LOGIN--}]
    diff --git a/templates/de/html/admin/admin_send_bonus_select.tpl b/templates/de/html/admin/admin_send_bonus_select.tpl index 0fddf6ef97..38810b08ea 100644 --- a/templates/de/html/admin/admin_send_bonus_select.tpl +++ b/templates/de/html/admin/admin_send_bonus_select.tpl @@ -4,13 +4,13 @@ diff --git a/templates/de/html/admin/admin_send_reset_link.tpl b/templates/de/html/admin/admin_send_reset_link.tpl index 5df9f2343e..d4989b90fb 100644 --- a/templates/de/html/admin/admin_send_reset_link.tpl +++ b/templates/de/html/admin/admin_send_reset_link.tpl @@ -1,4 +1,4 @@ - +
     
    - · {--ADMIN_SEND_BONUS_NORMAL--} + · {--ADMIN_SEND_BONUS_NORMAL--}
    {--ADMIN_SEND_BONUS_NORMAL_NOTES--}
    - · {--ADMIN_SEND_BONUS_HTML--}
    + · {--ADMIN_SEND_BONUS_HTML--}

    {--ADMIN_SEND_BONUS_HTML_NOTES--}
    diff --git a/templates/de/html/admin/admin_send_yoomedia.tpl b/templates/de/html/admin/admin_send_yoomedia.tpl index 084c250a5a..b142c151a3 100644 --- a/templates/de/html/admin/admin_send_yoomedia.tpl +++ b/templates/de/html/admin/admin_send_yoomedia.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_sub_points.tpl b/templates/de/html/admin/admin_sub_points.tpl index 7e3dfb0618..aadd77c7dc 100644 --- a/templates/de/html/admin/admin_sub_points.tpl +++ b/templates/de/html/admin/admin_sub_points.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_sub_points_all.tpl b/templates/de/html/admin/admin_sub_points_all.tpl index 5cfbe0672e..fc8279814e 100644 --- a/templates/de/html/admin/admin_sub_points_all.tpl +++ b/templates/de/html/admin/admin_sub_points_all.tpl @@ -1,44 +1,25 @@ - - + +
    - - - - - - - - - - + - - - - - - - - - - - - - + - + + - +
     
    {--ADMIN_SUB_POINTS_FROM_ALL--}:
     
     {--ADMIN_SUB_POINTS_FROM_ALL--}:
    {--ENTER_POINTS_SUB--}: 
     
    {--ENTER_SUB_REASON--}: 
      + +
     {--ENTER_SUB_REASON--}: + +
      + + +
    diff --git a/templates/de/html/admin/admin_task_holiday.tpl b/templates/de/html/admin/admin_task_holiday.tpl index 1d1f0e4bb9..57cc966160 100644 --- a/templates/de/html/admin/admin_task_holiday.tpl +++ b/templates/de/html/admin/admin_task_holiday.tpl @@ -1 +1 @@ -{--HOLIDAY_ADMIN_DEL_LINK--} +{--HOLIDAY_ADMIN_DEL_LINK--} diff --git a/templates/de/html/admin/admin_task_order.tpl b/templates/de/html/admin/admin_task_order.tpl index 8e4283884d..d9da0746dc 100644 --- a/templates/de/html/admin/admin_task_order.tpl +++ b/templates/de/html/admin/admin_task_order.tpl @@ -1 +1 @@ -{--ADMIN_UNLOCK_EMAIL_LINK--} +{--ADMIN_UNLOCK_EMAIL_LINK--} diff --git a/templates/de/html/admin/admin_theme_edit.tpl b/templates/de/html/admin/admin_theme_edit.tpl index 61506022e9..2b2b02396b 100644 --- a/templates/de/html/admin/admin_theme_edit.tpl +++ b/templates/de/html/admin/admin_theme_edit.tpl @@ -1,5 +1,5 @@
    -
    + diff --git a/templates/de/html/admin/admin_theme_import_form.tpl b/templates/de/html/admin/admin_theme_import_form.tpl index 58a6435170..26e7d7b834 100644 --- a/templates/de/html/admin/admin_theme_import_form.tpl +++ b/templates/de/html/admin/admin_theme_import_form.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/admin/admin_undelete_surfbar_urls.tpl b/templates/de/html/admin/admin_undelete_surfbar_urls.tpl index b17631ecfe..7ce68a1116 100644 --- a/templates/de/html/admin/admin_undelete_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_undelete_surfbar_urls.tpl @@ -1,5 +1,5 @@
    -
    +
    {--ID_SELECT--}
    diff --git a/templates/de/html/admin/admin_unlock_emails.tpl b/templates/de/html/admin/admin_unlock_emails.tpl index 48929199ff..b9454c2ac1 100644 --- a/templates/de/html/admin/admin_unlock_emails.tpl +++ b/templates/de/html/admin/admin_unlock_emails.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_unlock_emails_redir.tpl b/templates/de/html/admin/admin_unlock_emails_redir.tpl index d39ffb165e..948864f762 100644 --- a/templates/de/html/admin/admin_unlock_emails_redir.tpl +++ b/templates/de/html/admin/admin_unlock_emails_redir.tpl @@ -1,4 +1,4 @@ - +
    - +
    diff --git a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl index 998f6e33c7..fd46acc5c2 100644 --- a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_validate_reset_hash_form.tpl b/templates/de/html/admin/admin_validate_reset_hash_form.tpl index ec2b94c9fb..b6b7f3171b 100644 --- a/templates/de/html/admin/admin_validate_reset_hash_form.tpl +++ b/templates/de/html/admin/admin_validate_reset_hash_form.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/templates/de/html/admin/admin_welcome.tpl b/templates/de/html/admin/admin_welcome.tpl index a085fd45a6..5b0dde1a7d 100644 --- a/templates/de/html/admin/admin_welcome.tpl +++ b/templates/de/html/admin/admin_welcome.tpl @@ -10,7 +10,7 @@ [$content[login]] - Ausloggen + Ausloggen
    diff --git a/templates/de/html/admin/admin_welcome_admins.tpl b/templates/de/html/admin/admin_welcome_admins.tpl index 67e1666b21..0e7078c960 100644 --- a/templates/de/html/admin/admin_welcome_admins.tpl +++ b/templates/de/html/admin/admin_welcome_admins.tpl @@ -9,10 +9,10 @@     		Aktueller Admin: - [$content[login]] + [$content[login]] - Ausloggen + Ausloggen
    diff --git a/templates/de/html/beg/beg_banner.tpl b/templates/de/html/beg/beg_banner.tpl index cd95886b62..713c28838e 100644 --- a/templates/de/html/beg/beg_banner.tpl +++ b/templates/de/html/beg/beg_banner.tpl @@ -1,3 +1 @@ -Dieser Text steht im Template -beg_banner.tpl -und möchte geändert werden! +Dieser Text steht im Template beg_banner.tpl und möchte geändert werden! diff --git a/templates/de/html/beg/beg_link.tpl b/templates/de/html/beg/beg_link.tpl index 24fb523987..381a1e42eb 100644 --- a/templates/de/html/beg/beg_link.tpl +++ b/templates/de/html/beg/beg_link.tpl @@ -21,7 +21,7 @@
    - {--BEG_CONTINUE_REGISTER--} + {--BEG_CONTINUE_REGISTER--}
    diff --git a/templates/de/html/doubler/doubler_footer.tpl b/templates/de/html/doubler/doubler_footer.tpl index 5b61aac937..28347c24a0 100644 --- a/templates/de/html/doubler/doubler_footer.tpl +++ b/templates/de/html/doubler/doubler_footer.tpl @@ -1,3 +1 @@ -Dieser Text steht im Template -doubler_footer.tpl -! +Dieser Text steht im template doubler_footer.tpl! diff --git a/templates/de/html/doubler/doubler_header.tpl b/templates/de/html/doubler/doubler_header.tpl index 4059d88734..e83ee2478d 100644 --- a/templates/de/html/doubler/doubler_header.tpl +++ b/templates/de/html/doubler/doubler_header.tpl @@ -1,3 +1 @@ -Dieser Text steht im Template -doubler_header.tpl -! +Dieser Text steht im template doubler_header.tpl! diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl index 7069e6d218..69c73413c3 100644 --- a/templates/de/html/doubler/doubler_index.tpl +++ b/templates/de/html/doubler/doubler_index.tpl @@ -9,8 +9,7 @@ $content[enter_login]
    {--DOUBLER_NOTE_FOR_PASSWORD--}

    - +
    @@ -80,10 +79,10 @@ {--DOUBLER_REFERAL_8--} {--DOUBLER_REFERAL_LINK--}
    $content[message]
    {--DOUBLER_NOT_YET_REGISTERED--} {--DOUBLER_REGISTER_NOW--}
    + href="{?URL?}/ref.php?refid=$content[refid]%}">{--DOUBLER_REGISTER_NOW--}

    {--DOUBLER_YOUR_ADVERTISING_HERE--} {--DOUBLER_CONTACT_US--}
    + href="{%url=modules.ph?module=index&what?mpres?m&refid=$content[refid]%}">{--DOUBLER_CONTACT_US--}

    $content[banner]

    diff --git a/templates/de/html/doubler/doubler_reflink.tpl b/templates/de/html/doubler/doubler_reflink.tpl index c8e8c34aff..f4cbd0d0c6 100644 --- a/templates/de/html/doubler/doubler_reflink.tpl +++ b/templates/de/html/doubler/doubler_reflink.tpl @@ -1,4 +1,4 @@ diff --git a/templates/de/html/guest/guest_confirm_link.tpl b/templates/de/html/guest/guest_confirm_link.tpl index 5eebb65a2f..1d60eda714 100644 --- a/templates/de/html/guest/guest_confirm_link.tpl +++ b/templates/de/html/guest/guest_confirm_link.tpl @@ -1,5 +1,5 @@
    - + diff --git a/templates/de/html/guest/guest_frametester.tpl b/templates/de/html/guest/guest_frametester.tpl index 61af382ced..a2b6e6b16b 100644 --- a/templates/de/html/guest/guest_frametester.tpl +++ b/templates/de/html/guest/guest_frametester.tpl @@ -1,4 +1,4 @@ - + diff --git a/templates/de/html/guest/guest_login.tpl b/templates/de/html/guest/guest_login.tpl index db2ebd6044..fc5df4b8c2 100644 --- a/templates/de/html/guest/guest_login.tpl +++ b/templates/de/html/guest/guest_login.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/guest/guest_doubler.tpl b/templates/de/html/guest/guest_doubler.tpl index 5f2374d550..2296fbc4b4 100644 --- a/templates/de/html/guest/guest_doubler.tpl +++ b/templates/de/html/guest/guest_doubler.tpl @@ -33,7 +33,7 @@