./inc/classes/cachesystem.class.php:471: // @TODO Add support for more types which break in last else-block
./inc/config-functions.php:144: // @TODO Make this all better... :-/
./inc/expression-functions.php:136:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
+./inc/expression-functions.php:199: // @TODO is escapeQuotes enougth for strings with single/double quotes?
./inc/extensions/ext-html_mail.php:138: // @TODO Move these arrays into config
./inc/extensions/ext-menu.php:54: // @TODO Convert menu-Id to one coding-standard. admin(edit|_add) => admin_menu_(edit|add), mem(edit|_add) => mem_menu_(edit|add)
./inc/extensions/ext-network.php:20: * @TODO AbisZED: Which charset? *
./inc/modules/admin/what-config_admins.php:146: // @TODO Rewrite this to filter 'run_sqls'
./inc/modules/admin/what-config_mods.php:141: // @TODO Rewritings: mod->module in template
./inc/modules/admin/what-config_mods.php:57: // @TODO This can be moved into mysql-function.php, see checkModulePermissions() function
+./inc/modules/admin/what-config_points.php:113: // @TODO Rewrite this to a filter
./inc/modules/admin/what-config_rallye_prices.php:209: // @TODO Rewritings: level->price_level, infos->info in template
./inc/modules/admin/what-config_rallye_prices.php:226: // @TODO Rewrite these two constants
./inc/modules/admin/what-config_register.php:78: // @TODO Move this HTML code into a template
./inc/modules/admin/what-edit_user.php:20: * @TODO Add support for ext-country *
./inc/modules/admin/what-email_stats.php:48:// @TODO Unused at the moment
-./inc/modules/admin/what-extensions.php:348: // @TODO Rewrite this to a filter
+./inc/modules/admin/what-extensions.php:350: // @TODO Rewrite this to a filter
./inc/modules/admin/what-guest_add.php:137: // @TODO This can be somehow rewritten to a function
./inc/modules/admin/what-guest_add.php:69: // @TODO Cant this be rewritten?
./inc/modules/admin/what-guest_add.php:85: // @TODO This can be somehow rewritten to a function
./inc/modules/admin/what-list_task.php:192: // @TODO Rewrite this to $OUT .= ..., true, ...
./inc/modules/admin/what-list_task.php:196: // @TODO Rewrite this to $OUT .= ..., true, ...
./inc/modules/admin/what-list_unconfirmed.php:100: // @TODO Rewrite this to $content = SQL_FETCHARRAY(), look some lines above for two differrent queries
-./inc/modules/admin/what-list_unconfirmed.php:130: // @TODO Rewritings: userid->userid
./inc/modules/admin/what-list_unconfirmed.php:77: // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS'));
./inc/modules/admin/what-list_unconfirmed.php:88: // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
./inc/modules/admin/what-list_user.php:160: // @TODO Rewrite these to filters
./inc/modules/member/what-bonus.php:57: // @TODO Rewrite this to a filter
./inc/modules/member/what-categories.php:129: // @TODO Rewrite this to use $OUT .= ...
./inc/modules/member/what-doubler.php:56:// @TODO The '*100' is in the way to get moved into the template
-./inc/modules/member/what-order.php:453: // @TODO Rewrite this to a filter
+./inc/modules/member/what-order.php:456: // @TODO Rewrite this to a filter
./inc/modules/member/what-order.php:65:// @TODO Rewrite this to a filter
./inc/modules/member/what-payout.php:221: // @TODO Rewrite this to a filter
./inc/modules/member/what-points.php:55:// @TODO Should we rewrite this to a filter?
./inc/revision-functions.php:153:// @TODO Please describe this function
./inc/wrapper-functions.php:127:// @TODO Implement $compress
./inc/wrapper-functions.php:134:// @TODO Implement $decompress
-./inc/wrapper-functions.php:449:// @TODO Do some more sanity check here
-./inc/wrapper-functions.php:764: * @TODO Do we really need this check? If yes, try to fix this:
+./inc/wrapper-functions.php:455:// @TODO Do some more sanity check here
+./inc/wrapper-functions.php:793: * @TODO Do we really need this check? If yes, try to fix this:
./mailid.php:135: // @TODO Rewrite this to a filter
./mailid.php:215: // @TODO Rewrite this to a dynamic include or so
./mailid.php:95: // @TODO Rewrite this to a filter
// Add points to user or begging rallye account
if (addPointsBeg(getUserData('userid'), $points)) {
// Set 'done' message
- $content['message'] = loadTemplate('beg_done', true);
+ $content['message'] = loadTemplate('beg_done', true, $content);
} else {
// Error!
- $content['message'] = loadTemplate('beg_failed', true);
+ $content['message'] = loadTemplate('beg_failed', true, $content);
}
} else {
// Error!
- $content['message'] = loadTemplate('beg_failed', true);
+ $content['message'] = loadTemplate('beg_failed', true, $content);
}
} elseif (isMember()) {
// Logged in user found!
- $content['message'] = loadTemplate('beg_login', true);
+ $content['message'] = loadTemplate('beg_login', true, $content);
} elseif (getConfig('beg_pay_mode') != 'NONE') { // Other pay-mode active!
// Prepare content for template
$content = array(
// Read configuration
$configValue = getConfig($data['matches'][4][$data['key']]);
- // Do we have a call-back?
+ // Construct a new expression
+ $replacer = '{%pipe,' . $data['callback'] . ',' . $configValue . '%}';
+
+ // Replace the config entry
+ $code = str_replace($data['matches'][0][$data['key']], $replacer, $data['code']);
+
+ // Return replaced code
+ return $code;
+}
+
+// Expression call-back function for piping data through functions
+function doExpressionPipe ($data) {
+ // We need callback and extra_func: callback is really the call-back function, extra_func is our value
+ $replacer = $data['extra_func'];
+
+ // Do we have a call-back? Should always be there!
if (!empty($data['callback'])) {
// Parse it through this function
- $configValue = call_user_func_array($data['callback'], array($configValue));
+ $replacer = "\" . " . $data['callback'] . "('" . $replacer . "') . \"";
} // END - if
// Replace the config entry
- $code = str_replace($data['matches'][0][$data['key']], $configValue, $data['code']);
+ $code = str_replace($data['matches'][0][$data['key']], $replacer, $data['code']);
// Return replaced code
return $code;
// Expression call-back for dynamic messages
function doExpressionMessage ($data) {
- die('<pre>'.htmlentities(print_r($data, true)).'</pre>');
+ // Message string replacement depends on if message is masked
+ if (isMessageMasked($data['callback'])) {
+ // Message should be masked
+ $replacer = "\" . getMaskedMessage('" . $data['callback'] . "', '" . $data['extra_func'] . "') . \"";
+ } else {
+ // Regular message
+ $replacer = "\" . getMessage('" . $data['callback'] . "') . \"";
+ }
+
+ // Replace the code
+ // @TODO is escapeQuotes enougth for strings with single/double quotes?
+ $code = str_replace($data['matches'][0][$data['key']], $replacer, escapeQuotes($data['code']));
+
+ // Return the (maybe) replaced code
+ return $code;
}
// [EOF]
$add = '';
if (isExtensionINstalledAndNewer('sql_patches', '0.6.0')) $add = ", `filter_counter`";
- // Load all active filers
+ // Load all filters
$result = SQL_QUERY("SELECT
`filter_name`,`filter_function`,`filter_active`".$add."
FROM
// Is that filter already there?
if ((isset($GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction])) && ($force === false)) {
- // Then abort here
- if ($silentAbort === false) {
+ // In installation phase we always want to abort
+ if (($silentAbort === false) || (isInstallationPhase())) {
// Add fatal message
- addFatalMessage(__FUNCTION__, __LINE__, sprintf("Filter chain %s has already filter function %s registered!", $filterName, $filterFunction));
+ debug_report_bug(sprintf("[%s:%s] Filter chain %s has already filter function %s registered!", __FUNCTION__, __LINE__, $filterName, $filterFunction));
} // END - if
// Abort here
// Then run all filters
foreach ($GLOBALS['cache_array']['filter']['chains'][$filterName] as $filterFunction => $active) {
// Debug message
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Running: name={$filterName},func={$filterFunction},active={$active}");
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Running: name=' . $filterName . ',func=' . $filterFunction . ',active=' . $active);
- // Is the filter active?
+ // Is the filter active or newly added??
if (($active == 'Y') || ($active == 'A') || ((in_array($filterName, array('shutdown','extension_remove','post_extension_run_sql'))) && ($active == 'R'))) {
// Is this filter there?
if (!function_exists($filterFunction)) {
} // END - if
// Call the filter chain
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $filterName.'/'.$filterFunction.',[]='.gettype($returnValue));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $filterName . '/' . $filterFunction . ',[]=' . gettype($returnValue));
$returnValue = call_user_func_array($filterFunction, array($returnValue));
// Update usage counter
countFilterUsage($filterName, $filterFunction);
} elseif (isDebugModeEnabled()) {
// Debug message
- logDebugMessage(__FUNCTION__, __LINE__, "Skipped: name={$filterName},func={$filterFunction},active={$active}");
+ logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: name=' . $filterName . ',func=' . $filterFunction . ',active=' . $active);
}
} // END - foreach
// Use this for replacing
$code = str_replace($match, $GLOBALS['compile_config'][$matches[1][$key]], $code);
- //* DEBUG: */ if (($match == '{?URL?}') && (strlen($code) > 10000)) die(
'<pre>'.secureString($code).'</pre>');
+ //* DEBUG: */ if (($match == '{?URL?}') && (strlen($code) > 10000)) die(
__FUNCTION__.'['.__LINE__.']:<pre>'.secureString($code).'</pre>');
} // END - foreach
} // END - if
if ($compiled === true) {
// Run the code
$eval = "\$GLOBALS['compiled_config'][\$uncompiled] = \"" . $GLOBALS['compiled_config'][$uncompiled] . "\";";
- //* DEBUG: */ print(
'<pre>' . str_replace('$', '$', htmlentities($eval)) . '</pre>');
+ //* DEBUG: */ print(
__FUNCTION__.'['.__LINE__.']:<pre>' . str_replace('$', '$', htmlentities($eval)) . '</pre>');
eval($eval);
} // END - if
// Compile {%cmd,callback,extraFunction=some_value%} to get expression code snippets
// See switch() command below for supported commands
preg_match_all('/\{%(([a-zA-Z0-9-_,]+)(=([^\}]+)){0,1})*%\}/', $code, $matches);
- //* DEBUG: */ print(
'<pre>'.print_r($matches, true).'</pre>');
+ //* DEBUG: */ print(
__FUNCTION__.'['.__LINE__.']:<pre>'.print_r($matches, true).'</pre>');
// Default is from outputHtml()
$outputMode = getOutputMode();
);
// Call it
+ //* DEBUG: */ print __FUNCTION__ . '[' . __LINE__ . ']: function=' . $commandFunction . "<br />\n";
$code = call_user_func($commandFunction, $data);
} else {
// Unsupported command detected
if ((getOutputMode() != '0') || ($outputMode != '0')) $code = decodeEntities($code);
// Return compiled code
- //* DEBUG: */ die('<pre>'.htmlentities($code).'</pre>');
+ //* DEBUG: */ print(__FUNCTION__.'['.__LINE__.']:<pre>'.($code).'</pre>');
return $code;
}
// Compiles the final output
function compileFinalOutput () {
// Init counter
- $cnt = '0';
+ $cnt = 0;
// Add page header and footer
addPageHeaderFooter();
// Compile all out
- while (((strpos($GLOBALS['output'], '{--') > 0) || (strpos($GLOBALS['output'], '{!') > 0) || (strpos($GLOBALS['output'], '{?') > 0)) && ($cnt < 3)) {
+ while (((strpos($GLOBALS['output'], '{--') !== false) || (strpos($GLOBALS['output'], '{!') !== false) || (strpos($GLOBALS['output'], '{?') !== false) || (strpos($GLOBALS['output'], '{%') !== false)) && ($cnt < 3)) {
// Init common variables
$content = array();
$newContent = '';
// Compile it
- $eval = "\$newContent = \"".compileCode(escapeQuotes($GLOBALS['output']))."\";";
+ //* DEBUG: */ print '<pre>'.htmlentities($GLOBALS['output']).'</pre>';
+ $eval = '$newContent = "' . compileCode(escapeQuotes($GLOBALS['output'])) . '";';
+ //* DEBUG: */ die('<pre>'.htmlentities($eval).'</pre>');
eval($eval);
// Was that eval okay?
// Something went wrong!
debug_report_bug('Evaluation error:<pre>' . linenumberCode($eval) . '</pre>', false);
} // END - if
+
+ // Use it again
$GLOBALS['output'] = $newContent;
// Count round
} // END - if
// Init variables
-$mysql = array();
+$GLOBALS['install_mysql'] = array();
if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) {
// Transfer 'mysql' array
- $mysql = postRequestParameter('mysql');
+ $GLOBALS['install_mysql'] = postRequestParameter('mysql');
} // END - if
// Check if both passwords from SMTP are matching
break;
case '2': // MySQL data (alone!)
- if (empty($mysql['dbase'])) $mysql['dbase'] = 'your_database';
- if (empty($mysql['login'])) $mysql['login'] = 'your_login';
- if (empty($mysql['host'])) $mysql['host'] = 'localhost';
- if (empty($mysql['prefix'])) $mysql['prefix'] = 'mxchange';
- if (empty($mysql['type'])) $mysql['type'] = 'MyISAM';
+ if (empty($GLOBALS['install_mysql']['dbase'])) $GLOBALS['install_mysql']['dbase'] = 'your_database';
+ if (empty($GLOBALS['install_mysql']['login'])) $GLOBALS['install_mysql']['login'] = 'your_login';
+ if (empty($GLOBALS['install_mysql']['host'])) $GLOBALS['install_mysql']['host'] = 'localhost';
+ if (empty($GLOBALS['install_mysql']['prefix'])) $GLOBALS['install_mysql']['prefix'] = 'mxchange';
+ if (empty($GLOBALS['install_mysql']['type'])) $GLOBALS['install_mysql']['type'] = 'MyISAM';
if (ifFatalErrorsDetected()) {
addToInstallContent('<div class="install_fatal">');
foreach (getFatalArray() as $key => $err) {
addToInstallContent('<div class="para"><strong>·</strong> {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '</div>');
- }
+ } // END - foreach
addToInstallContent('</div>');
- }
- $content['mysql_host'] = $mysql['host'];
- $content['mysql_dbase'] = $mysql['dbase'];
- $content['mysql_prefix'] = $mysql['prefix'];
- $content['mysql_login'] = $mysql['login'];
- $content['table_type'] = $mysql['type'];
+ } // END - if
+ $content['mysql_host'] = $GLOBALS['install_mysql']['host'];
+ $content['mysql_dbase'] = $GLOBALS['install_mysql']['dbase'];
+ $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
+ $content['mysql_login'] = $GLOBALS['install_mysql']['login'];
+ $content['table_type'] = $GLOBALS['install_mysql']['type'];
$content['spath'] = postRequestParameter('spath');
$content['burl'] = postRequestParameter('burl');
$content['title'] = postRequestParameter('title');
} // END - if
// MySQL settings
- $content['mysql_host'] = $mysql['host'];
- $content['mysql_dbase'] = $mysql['dbase'];
- $content['mysql_prefix'] = $mysql['prefix'];
- $content['table_type'] = $mysql['type'];
- $content['mysql_login'] = $mysql['login'];
- $content['mysql_pass1'] = $mysql['pass1'];
- $content['mysql_pass2'] = $mysql['pass2'];
+ $content['mysql_host'] = $GLOBALS['install_mysql']['host'];
+ $content['mysql_dbase'] = $GLOBALS['install_mysql']['dbase'];
+ $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
+ $content['table_type'] = $GLOBALS['install_mysql']['type'];
+ $content['mysql_login'] = $GLOBALS['install_mysql']['login'];
+ $content['mysql_pass1'] = $GLOBALS['install_mysql']['pass1'];
+ $content['mysql_pass2'] = $GLOBALS['install_mysql']['pass2'];
// Set constants for SMTP data
$content['smtp_host'] = $smtpHost;
// MySQL data
$OUT = '';
- foreach ($mysql as $key => $value) {
+ foreach ($GLOBALS['install_mysql'] as $key => $value) {
$OUT .= " <input type=\"hidden\" name=\"mysql[" . $key . "]\" value=\"" . $value . "\" />\n";
} // END - foreach
$content['mysql_hidden'] = $OUT;
initSqls();
// Connect to MySQL server
- SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__);
+ SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__);
+
+ // Is the link up?
if (SQL_IS_LINK_UP()) {
// Seems to work, also right database?
- if (SQL_SELECT_DB($mysql['dbase'], __FILE__, __LINE__) === true) {
- // Automatically run install.sql
+ if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === true) {
+ // Check for dumps
if ((!isFileReadable(postRequestParameter('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestParameter('spath') . 'install/menu-'.getLanguage().'.sql'))) {
// Installation area not found!
addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_MISSING_DUMPS'));
+ return;
} // END - if
+ // Any errors detected?
if (!ifFatalErrorsDetected()) {
// Set type and prefix from POST data
setConfigEntry('_TABLE_TYPE' , postRequestParameter('mysql', 'type'));
debug_report_bug(sprintf("SQL dump %s is not readable!", $dump));
}
} // END - foreach
- //* DEBUG: */ die('<pre>'.print_r(getSqls(), true).'</pre>');
+ //* DEBUG: */ die(
__FUNCTION__.'['.__LINE__.']:'<pre>'.print_r(getSqls(), true).'</pre>');
// Are some SQLs found?
if (countSqls() == 0) {
} // END foreach
$content['fatal_errors'] = $OUT;
$OUT = '';
- foreach ($mysql as $key => $value) {
+ foreach ($GLOBALS['install_mysql'] as $key => $value) {
$OUT .= ' <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
} // END foreach
$content['mysql_hidden'] = $OUT;
return $GLOBALS['lang_diff_count'][$target];
}
+// Checks wether the given message is masked
+function isMessageMasked ($messageId) {
+ // Is the message id valid?
+ if (!isMessageIdValid($messageId)) {
+ // No, then abort here
+ debug_report_bug(__FUNCTION__ . ': Invalid message id ' . $messageId . ' detected.');
+ } // END - if
+
+ // Now simply check it
+ $masked = (strpos($GLOBALS['messages'][getCurrentLanguage()][$messageId], '%') !== false);
+
+ // Return result
+ return $masked;
+}
+
// [EOF]
?>
'ADMIN_CONFIG_BEG_TIMEOUT' => "Zeitsperre global",
'ADMIN_CONFIG_BEG_UID_TIMEOUT' => "Zeitsperre gegen eine Mitglieder-Id",
'ADMIN_CONFIG_BEG_REMOTE_IP_TIMEOUT' => "Zeitsperre gegen eine IP-Nummer",
- 'BEG_LINK_BY_1' => "Bettel-Link bei ",
- 'BEG_LINK_BY_2' => "",
- 'BEG_LINK_USERID_1' => "Unser Mitglied ",
- 'BEG_LINK_USERID_2' => " hat {?POINTS?} gebettelt.",
+ 'BEG_LINK_BY' => "Bettel-Link bei <strong>{?MAIN_TITLE?}</strong>",
+ 'BEG_LINK_USERID' => "Unser Mitglied <strong>%s</strong> hat {?POINTS?} gebettelt.",
'BEG_UID_STEAL_1' => "Das Mitglied ",
'BEG_UID_STEAL_2' => " hat soeben ",
'BEG_UID_STEAL_3' => " {?POINTS?} bei Ihnen erbettelt.",
- 'BEG_CLICKS_1' => "Dies war insgesamt der ",
- 'BEG_CLICKS_2' => ". Klick auf sein Bettel-Link.",
+ 'BEG_CLICKS' => "Dies war insgesamt der <strong>%s.</strong> Klick auf sein Bettel-Link.",
'BEG_THANKS_FOR_CLICK' => "Danke für Ihre Spende.",
'BEG_CONTINUE_REGISTER' => "Und weiter geht es zur Anmeldung bei {?MAIN_TITLE?} ...",
'BEG_SORRY_ANOTHER_WAS_HERE_1' => "Oh schade! Es war vor kurzem schon einer hier! Das Mitglied ",
'BEG_MEMBER_EARN_1' => "Sie erhalten von",
'BEG_MEMBER_EARN_2' => "bis",
'BEG_MEMBER_EARN_3' => "für jeden Klick auf Ihren Bettellink.",
- 'BEG_MEMBER_TIMEOUT_1' => "Die Zeitsperre ist derzeit eingestellt auf ",
- 'BEG_MEMBER_TIMEOUT_2' => ". Innerhalb dieser Zeit erhalten Sie keine erneute Vergütung.",
+ 'BEG_MEMBER_TIMEOUT' => "Die Zeitsperre ist derzeit eingestellt auf <strong>%s</strong>. Innerhalb dieser Zeit erhalten Sie keine erneute Vergütung.",
'BEG_MEMBER_HAVE_FUN' => "Viel Spass beim {?POINTS?}-Betteln.",
'BEG_GUEST_TRAILER' => "{?POINTS?} erbetteln bei...",
'BEG_GUEST_EARN_1' => "Betteln macht sich bezahlt! Für jeden Klick erhalten Sie von",
'BEG_GUEST_EARN_2' => "bis",
'BEG_GUEST_EARN_3' => "auf Ihr Mitgliedskonto direkt gutgeschrieben. Zuddem verdienen Sie an den erbettelteten {?POINTS?} Ihrer Refferal mit.",
- 'BEG_GUEST_TIMEOUT_1' => "Sie können derzeit alle ",
- 'BEG_GUEST_TIMEOUT_2' => " {?POINTS?} betteln.",
+ 'BEG_GUEST_TIMEOUT' => "Sie können derzeit alle <strong>%s</strong> {?POINTS?} betteln.",
'BEG_GUEST_HAVE_FUN' => "Heute noch anmelden und Spass haben.",
'ADMIN_BEG_POINTS_MAX' => "Maximale erbettelbare {?POINTS?} bei Klick auf Bettellink",
'ADMIN_BEG_USERID' => "Mitglied-Account zum Abbuchen der erbettelten {?POINTS?}",
'BEG_TOTAL' => "Gesamt erbettelt",
'BEG_POINTS' => "Erbettelt",
'BEG_MEMBER_TOTAL' => "Erbettelte {?POINTS?} aller Mitglieder",
- 'ADMIN_BEG_TIMEOUT_1' => "Es werden nur Mitglieder ausgewertet und hier aufgelistet, die spätestens am ",
- 'ADMIN_BEG_TIMEOUT_2' => "noch aktiv waren. Alle anderen Mitglieder erhalten die Vergütung nicht.",
+ 'ADMIN_BEG_TIMEOUT' => "Es werden nur Mitglieder ausgewertet und hier aufgelistet, die spätestens am <strong>%s</strong> noch aktiv waren. Alle anderen Mitglieder erhalten die Vergütung nicht.",
'ADMIN_EDIT_BEG_RALLYE_SETTINGS' => "Einstellungen an der Bettel-Rallye",
'ADMIN_BEG_RALLYE_ACTIVE' => "Ist die Bettel-Rallye aktiv? (Mails können optional versendet werden!)",
'ADMIN_BEG_RALLYE_ONLY_ACTIVE' => "Nur aktive Mitglieder nehmen dran?<br /><div class=\"admin_note\">(Nur in Verbindung mit der Erweiterung <strong>autopurge</strong>!)</div>",
'BONUS_POINTS_TITLE' => "Sonderbonus-{?POINTS?}",
'BONUS_RANK_YOU_ARE_404' => "Sie haben bis jetzt noch keine Aktiv-Vergütung erhalten.",
'BONUS_RANK' => "Platz",
- 'BONUS_SHOW_HEADER_LINE_1' => "Hier sehen Sie eine Übersicht, wer alles",
- 'BONUS_SHOW_HEADER_LINE_2' => "für die Mail",
- 'BONUS_SHOW_HEADER_LINE_3' => "erhalten hat",
+ 'BONUS_SHOW_HEADER_LINE' => "Hier sehen Sie eine Übersicht, wer alles <strong>{?POINTS?}</strong> für die Mail %s erhalten hat",
'BONUS_SHOW_YOU_HAVE_CONFIRMED' => "Sie haben diese Mail am",
'BONUS_SHOW_CONFIRMED_BONUS_IS' => "Stelle bestätigt. Ihre Zusatz-Gutschrift für diese Mail",
'BONUS_TOTAL' => "Gesamtbonus",
'ADMIN_BONUS_WITHDRAW_PREPARED' => "Vergütung des Aktiv-Bonuses vorbereitet.",
'ADMIN_BONUS_WINNER_HIGLIGHTED' => "Mögliche Gewinner der Aktiv-Rallye sind dick marktiert.",
'ADMIN_BONUS_ALREADY_WITHDRAW' => "Manuelle Vergütungvorbereitung bereits betätigt.",
- 'ADMIN_BONUS_TIMEOUT_1' => "Es werden nur Mitglieder ausgewertet und hier aufgelistet, die spätestens am ",
- 'ADMIN_BONUS_TIMEOUT_2' => " noch aktiv waren. Alle anderen Mitglieder erhalten die Vergütung nicht.",
+ 'ADMIN_BONUS_TIMEOUT' => "Es werden nur Mitglieder ausgewertet und hier aufgelistet, die spätestens am <strong>%s</strong> noch aktiv waren. Alle anderen Mitglieder erhalten die Vergütung nicht.",
'ADMIN_BONUS_USERID' => "Mitgliedskonto zum Abbuchen der {?POINTS?}",
'ADMIN_CONFIG_BONUS_TIMEOUT' => "Verweildauer von Aktiv-Bonus-Einträgen",
'ADMIN_BONUS_TURBO_LINES' => "Anzahl angezeigter Aktiv-Bonus-Empfänger in <strong>show_bonus.php</strong>",
'BONUS_STATS_TOTAL' => "100%-Klickratebonus",
'BONUS_POINTS_DISABLED' => "Aktiv-Rallye derzeit nicht aktiv.",
'BONUS_MEMBER_STATS_SUBJECT' => "Ihr Aktiv-Bonus wegen 100% Klickrate",
- 'BONUS_LOGIN_BONUS_ADDED' => "Login-Bonus mit <u>{%config,translateComma=login_bonus%} {?POINTS?}</u> vergütet.",
+ 'BONUS_LOGIN_BONUS_ADDED' => "Login-Bonus mit <strong>{%config,translateComma=login_bonus%} {?POINTS?}</strong> vergütet.",
'BONUS_LOGIN_BONUS_NOT_ADDED' => "Login-Bonus nicht vergütet.",
'LIST_UNCONFIRMED_BONUS_LINKS' => "Unbest. Bonus-Mail",
'ADMIN_BONUS_MAIL_ALREADY_DELETED' => "Bonus-Mail bereits gelöscht.",
'ADMIN_BONUS_RALLYE_REF_INCLUDE' => "Referal-Bonus in monatlicher Auswertung mit einschliessen?",
// Header
- 'MEMBER_MAIL_BONUS_DETAILS_TITLE_1' => "Details zur Bonusmail <u>",
- 'MEMBER_MAIL_BONUS_DETAILS_TITLE_2' => "</u>:",
+ 'MEMBER_MAIL_BONUS_DETAILS_TITLE' => "Details zur Bonusmail <strong>%s</strong>:",
// Subject lines
'BONUS_RALLYE_DI_NOTIFY' => "HINWEIS: Aktiv-Rallye gestoppt.",
'EDIT_MENUS' => "Menüs bearbeiten",
'DEL_MENUS' => "Menüs löschen",
'EDIT_ADMIN_MENU' => "Admin-Menüeinträge ändern",
- 'EDIT_MENU_1' => "Es soll/sollen <strong>",
- 'EDIT_MENU_2' => "</strong> Menüeintrag/-einträge geändert werden:",
+ 'EDIT_MENU' => "Es soll/sollen <strong>%s</strong> Menüeintrag/-einträge geändert werden:",
'ENTRY_MODIFY' => "Eintrag",
'SUBMIT_CHANGES' => "Änderungen durchführen",
'ENTRY_404_1' => "Eintrag <em>",
'MEMBER_REFLIST_LIST_TITLE_1' => "Ihre Referals in Ebene <u>",
'MEMBER_REFLIST_LIST_TITLE_2' => "</u> (<u>",
'MEMBER_REFLIST_LIST_TITLE_3' => "%</u>)",
- 'MEMBER_REFLIST_COUNTER_1' => "In dieser Ebene haben Sie <u>",
- 'MEMBER_REFLIST_COUNTER_2' => "</u> Mitglieder geworben.",
+ 'MEMBER_REFLIST_COUNTER' => "In dieser Ebene haben Sie <strong>%s</strong> Mitglieder geworben.",
'MEMBER_REFLIST_TITLE' => "Referal-Übersicht",
'MEMBER_REFLIST_POINTS' => "Verdienst des Mitgliedes",
'MEMBER_REFLIST_ACTIVITY' => "Mitglied aktiv?",
'DOUBLER_NOTE_FOR_PASSWORD' => "Das Passwort wird nicht gespeichert.",
'DOUBLER_ENTER_POINTS' => "{?POINTS?} zum Verdoppeln",
'DOUBLER_NOW' => "Verdoppeln.",
- 'DOUBLER_ALREADY_PAYED_1' => "Es wurden bereits",
- 'DOUBLER_ALREADY_PAYED_2' => "ausgezahlt.",
+ 'DOUBLER_ALREADY_PAYED' => "Es wurden bereits <strong>%s {?POINTS?}</strong> ausgezahlt.",
'DOUBLER_MINIMUM_IS' => "Mindestens",
'DOUBLER_MAXIMUM_IS' => "verdoppeln, maximal",
'DOUBLER_HAVE_FUN' => "Viel Spaß.",
'HOLIDAY_MEMBER_TITLE' => "Von wann bis wann sind Sie im Urlaub?",
'HOLIDAY_MEMBER_TSTART' => "Anfang Ihres Urlaubes",
'HOLIDAY_MEMBER_TEND' => "Ende Ihres Urlaubes",
-// @TODO Rewrite these two constants to one
- 'HOLIDAY_MAX_DAYS_1' => "Sie können nicht mehr als ",
- 'HOLIDAY_MAX_DAYS_2' => " Tag(e) an Urlaub einstellen.",
+ 'HOLIDAY_MAX_DAYS' => "Sie können nicht mehr als <strong>%s</strong> Tag(e) an Urlaub einstellen.",
'HOLIDAY_ADD' => "Urlaubsschaltung aktivieren",
'HOLIDAY_COMMENTS' => "Sonstige Hinweise an uns",
'HOLIDAY_NOTES' => "Sobald Sie das Formular abgeschickt haben, wird die Urlaubsschaltung für Ihren Account aktiviert. Sie können sich weiterhin im Mitgliedsbereich aufhalten, können aber keine Mails mehr empfangen und auch selber keine mehr buchen.",
addMessages(array(
'MAIL_DATA_INVALID' => "Daten der Mailbuchung sind fehlerhaft.",
'ERROR_CONFIRMING_MAIL' => "Bitte klicken Sie nur Links aus Ihrem Mitgliedsbereich oder aus den Mails an.",
- 'THANX_POINTS_ADDED_1' => "Vielen Dank für die Bestätigung der Mail. Die ",
- 'THANX_POINTS_ADDED_2' => " {?POINTS?} wurden Ihnen gerade gutgeschrieben.",
- 'THANX_POINTS_LOCKED_1' => "Vielen Dank für die Bestätigung der Mail. Die ",
- 'THANX_POINTS_LOCKED_2' => " {?POINTS?} werden Ihnen bald gutgeschrieben.",
- 'POINTS_NOT_ADDED_1' => "Falscher Bestätigungscode eingegeben! Die ",
- 'POINTS_NOT_ADDED_2' => " {?POINTS?} wurden dem Versender wieder gutgeschrieben.",
+ 'THANX_POINTS_ADDED' => "Vielen Dank für die Bestätigung der Mail. Die <span class=\"member_done\">%s</span> {?POINTS?} wurden Ihnen gerade gutgeschrieben.",
+ 'THANX_POINTS_LOCKED' => "Vielen Dank für die Bestätigung der Mail. Die <span class=\"member_done\">%s</span> {?POINTS?} werden Ihnen bald gutgeschrieben.",
+ 'POINTS_NOT_ADDED' => "Falscher Bestätigungscode eingegeben! Die <span class=\"member_failed\">%s</span> {?POINTS?} wurden dem Versender wieder gutgeschrieben.",
'ENTER_CODE' => "Code eingeben",
- 'MEMBER_TIME_COUNTER_1' => "Gutschrift der {?POINTS?} erfolgt in",
- 'MEMBER_TIME_COUNTER_2' => ".",
+ 'MEMBER_TIME_COUNTER' => "Gutschrift der {?POINTS?} erfolgt in <strong>%s</strong> ...",
'SUBMIT_CODE' => "Abschicken",
- 'MAILID_TOTAL_POINTS1' => "Ihr Kontostand beträgt jetzt",
- 'MAILID_TOTAL_POINTS2' => ".",
+ 'MAILID_TOTAL_POINTS' => "Ihr Kontostand beträgt jetzt <span class=\"member_done\">%s {?POINTS?}</span>.",
'MEMBER_GENERAL_MAIL_PROBLEM' => "Allgemeines Mail-Problem erkannt. Bitte beim Support melden"
));
'RALLYE_TEMPLATE' => "Template (anstelle freien HTML-Codes)",
'RALLYE_PROBLEM_CREATE' => "Problem beim Erzeugen der Referal-Rallye.",
'RALLYE_NO_RALLYES_SETUP' => "Bitte fügen Sie zuerst eine neue Referal-Rallye hinzu.",
- 'RALLYE_CONFIG_PRICES_1' => "Preise einrichten für Referal-Rallye <u>",
- 'RALLYE_CONFIG_PRICES_2' => "</u>",
+ 'RALLYE_CONFIG_PRICES' => "Preise einrichten für Referal-Rallye <strong>%s</strong>",
'RALLYE_PRICE_LEVEL' => "Platz eingeben (1, 2, 3, usw.)",
'RALLYE_PRICE_POINTS' => "Preis in {?POINTS?}",
'RALLYE_PRICE_INFOS' => "Preisbeschreibung (<span class=\"tiny\">Sie können auch nur die Beschreibung eingeben!</span>)",
'RALLYE_ADMIN_NOTIFY' => "Neue Ref-Rallye: %s",
'RALLYE_ADMIN_USERS_404' => "Zur ausgewählten Referal-Rallye sind noch keine Mitglieder hinzugefügt worden.",
// @TODO Rewrite following two lines to one
- 'RALLYE_LIST_USERS_1' => "Teilnehmende Mitglieder an der Referal-Rallye <u>",
- 'RALLYE_LIST_USERS_2' => "</u>",
+ 'RALLYE_LIST_USERS' => "Teilnehmende Mitglieder an der Referal-Rallye <u>%s</u>",
'RALLYE_OLD_REFS' => "Refs vor Referal-Rallye",
'RALLYE_NEW_REFS' => "Neue Refs",
'RALLYE_STOP_AUTO_ADD_NOW' => "Auto-Beitreten neuer Mitglieder deaktivieren",
// Admin language strings
// @TODO Rewrite these constants to one
addMessages(array(
- 'ADMIN_LIST_USER_NOREFS_1' => "Das Mitglied <u>",
- 'ADMIN_LIST_USER_NOREFS_2' => "</u> hat in dieser Referal-Ebene keine Refs.",
- 'ADMIN_LIST_USER_NODATA_1' => "Das Mitglied <u>",
- 'ADMIN_LIST_USER_NODATA_2' => "</u> wurde bereits gelöscht.",
+ 'ADMIN_LIST_USER_NOREFS' => "Das Mitglied <strong>%s</strong> hat in dieser Referal-Ebene keine Refs.",
+ 'ADMIN_LIST_USER_NODATA' => "Das Mitglied <strong>%s</strong> wurde bereits gelöscht.",
'ADMIN_CONFIG_REFBACK_TITLE' => "Refback-Einstellungen",
'ADMIN_CONFIG_REFBACK_ENABLED' => "Refback eingeschaltet? (Wenn nein, ist nur die Referal-Übersicht funktionell.)",
'ADMIN_CONFIG_REFBACK_MIN_PERCENTS' => "Minimum erlaubte Refback-Prozente:<br /><span class=\"admin_note\">(0% ist immer erlaubt!)</span>",
'ADMIN_SPONSOR_POINTS_SUBTRACTED' => "{?POINTS?} wurden abgezogen.",
'ADMIN_SPONSPOR_CANNOT_LOCK_PENDING_UNCINFIRMED_ACCOUNTS' => "Sie können keine auf Freischaltung wartende oder unbestätigte Accounts sperren/freigeben.",
// @TODO Rewrite these four constants to one and use sprintf()
- 'ADMIN_HEADER_DEL_SPONSOR_1' => "Sponsorenaccount <u>",
- 'ADMIN_HEADER_DEL_SPONSOR_2' => "</u> löschen",
- 'ADMIN_TEXT_DEL_SPONSOR_1' => "Möchten Sie den Sponsoren <strong>",
- 'ADMIN_TEXT_DEL_SPONSOR_2' => "</strong> mit samt aller seiner Bestellungen unwiederruflich löschen?",
+ 'ADMIN_HEADER_DEL_SPONSOR' => "Sponsorenaccount <strong>%s</strong> löschen",
+ 'ADMIN_TEXT_DEL_SPONSOR' => "Möchten Sie den Sponsoren <strong>%s</strong> mit samt aller seiner Bestellungen unwiederruflich löschen?",
'ADMIN_SPONSOR_DELETED' => "Sponsorenaccount <span class=\"data\">%s</span> entfernt.",
'GUEST_SPONSOR_TITLE' => "Anmeldung als Sponsor",
'SPONSOR_ENTER_COMPANY_DATA' => "Daten zum Unternehmen",
setPostRequestParameter('ok', '***');
} // END - if
+ // Clear error message
+ $errorMessage = '';
+
if ((isFormSent()) && (postRequestParameter('ok') != '***')) {
// Hash the password with the old function because we are here in install mode
$hashedPass = md5(postRequestParameter('pass1'));
// Registering is done
redirectToUrl('modules.php?module=admin&register=done');
} else {
- $ret = getMessage('ADMIN_CANNOT_COMPLETE');
+ // Registration incomplete
+ $errorMessage = getMessage('ADMIN_CANNOT_COMPLETE');
+
+ // Set this to have our error message displayed
+ setPostRequestParameter('ok', '***');
}
break;
case 'failed': // Registration has failed
- $ret = getMessage('ADMIN_REGISTER_FAILED');
+ $errorMessage = getMessage('ADMIN_REGISTER_FAILED');
+
+ // Set this to have our error message displayed
+ setPostRequestParameter('ok', '***');
break;
case 'already': // Admin does already exists!
- $ret = getMessage('ADMIN_LOGIN_ALREADY_REG');
+ $errorMessage = getMessage('ADMIN_LOGIN_ALREADY_REG');
+
+ // Set this to have our error message displayed
+ setPostRequestParameter('ok', '***');
break;
default:
// Any other kind will be logged
- logDebugMessage(__FILE__, __LINE__, sprintf("Unknown return code %s from ifAdminLoginDataIsValid().", $ret));
+ $errorMessage = sprintf("Unknown return code %s from ifAdminLoginDataIsValid().", $ret);
+ logDebugMessage(__FILE__, __LINE__, $errorMessage);
+
+ // Set this to have our error message displayed
+ setPostRequestParameter('ok', '***');
break;
} // END - switch
} // END - if
if (empty($content['login'])) $loginMessage = getMessage('ADMIN_NO_LOGIN');
// An error comes back from registration?
- if ((!empty($ret)) && ($ret != 'init')) $loginMessage = $ret;
+ if ((!empty($ret)) && ($ret != 'init')) $loginMessage = $errorMessage;
// No password 1 entered or to short?
if (!isPostRequestParameterSet('pass1')) $pass1Message = getMessage('ADMIN_NO_PASS1');
// Load register template
loadTemplate('admin_reg_form', false, $content);
- }
+ } // END - if
} elseif (isGetRequestParameterSet('reset_pass')) {
// Is the form submitted?
if ((isPostRequestParameterSet('send_link')) && (isPostRequestParameterSet('email'))) {
} // END - if
// Prepare content
- $content['userid'] = generateUserProfileLink($content['userid']);
- $content['email'] = generateEmailLink($content['email'], 'user_data');
- $content['gender'] = translateGender($content['gender']);
- $content['points'] = translateComma($content['points']);
- $content['last_online'] = generateDateTime($content['last_online'], 2);
+ $content['userid'] = generateUserProfileLink($content['userid']);
+ $content['email'] = generateEmailLink($content['email'], 'user_data');
+ $content['gender'] = translateGender($content['gender']);
+ $content['points'] = translateComma($content['points']);
+ $content['last_online'] = generateDateTime($content['last_online'], 2);
$content['sw'] = $SW;
$content['win1'] = $WIN1;
$content['win2'] = $WIN2;
}
// Prepare constant for timemark
+ // @TODO Can't this be moved into our expression language?
if (isExtensionActive('autopurge')) {
$content['autopurge_timeout'] = generateDateTime(time() - getConfig('ap_inactive_since'), 2);
} else {
- $content['autopurge_timeout'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('EXTENSION_PROBLEM_NOT_INSTALLED', 'autopurge'));
+ $content['autopurge_timeout'] = getMaskedMessage('EXTENSION_PROBLEM_NOT_INSTALLED', 'autopurge');
}
// Load final template
}
// Transfer variables...
- $eval = "\$URL = \"".$eurl."\";";
+ $eval = '$URL = "' . $eurl . '";';
$reason = encodeString(getMessage('PAYOUT_REASON_PAYOUT'), false);
// Run code...
loadIncludeOnce($inc);
} // END - foreach
- // Init filter system here
- initFilterSystem();
+ // Load cache
+ loadIncludeOnce('inc/load_cache.php');
+
+ // Run the init filter chain
+ runFilterChain('init');
// Are we installation routine?
if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
// You have to install first!
redirectToUrl('install.php');
} // END - if
-
- // Load cache
- loadIncludeOnce('inc/load_cache.php');
-
- // Run the init filter chain
- runFilterChain('init');
}
// Handle fatal errors
// This patched function will reduce many SELECT queries for the specified or current admin login
function isAdmin ($adminLogin = '') {
+ // No admin in installation phase!
+ if (isInstallationPhase()) {
+ return false;
+ } // END - if
+
// Init variables
$ret = false;
$passCookie = '';
* MA 02110-1301 USA *
************************************************************************/
+// XDEBUG call
+//* DEBUG: */ xdebug_start_trace();
+
// Load security stuff here
require('inc/libs/security_functions.php');
<table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
<tr>
<td colspan="2" align="center" class="admin_title bottom">
- <strong>{--RALLYE_CONFIG_PRICES_1--}$content{--RALLYE_CONFIG_PRICES_2--}:</strong>
+ <strong>{%message,RALLYE_CONFIG_PRICES,$content%}:</strong>
</td>
</tr>
<tr>
</tr>
<tr>
<td align="center" colspan="2" class="admin_title bottom">
- {--EDIT_MENU_1--}$content[chk]{--EDIT_MENU_2--}
+ {%message,EDIT_MENU,$content[chk]%}
</td>
</tr>
$content[rows]
<div align="center" class="admin_table dashed">
<div class="admin_title bottom">
- <div class="admin_done">{--ADMIN_HEADER_DEL_SPONSOR_1--}$content[userid]{--ADMIN_HEADER_DEL_SPONSOR_2--}</div>
+ <div class="admin_done">{%message,ADMIN_HEADER_DEL_SPONSOR,$content[userid]%}</div>
</div>
<div>
- {--ADMIN_TEXT_DEL_SPONSOR_1--}$content[userid]{--ADMIN_TEXT_DEL_SPONSOR_2--}
+ {%message,ADMIN_TEXT_DEL_SPONSOR,$content[userid]%}
</div>
<div>
</tr>
<tr>
<td align="center" colspan="2" class="admin_title bottom">
- {--EDIT_MENU_1--}$content[chk]{--EDIT_MENU_2--}
+ {%message,EDIT_MENU,$content[chk]%}
</td>
</tr>
$content[rows]
<strong>{--ADMIN_BEG_WINNER_HIGLIGHTED--}</strong>
<div>
- {--ADMIN_BEG_TIMEOUT_1--} <strong>$content[autopurge_timeout]</strong> {--ADMIN_BEG_TIMEOUT_2--}
+ {%message,ADMIN_BEG_TIMEOUT,$content[autopurge_timeout]%}
</div>
</div>
</div>
<strong>{--ADMIN_BONUS_WINNER_HIGLIGHTED--}</strong>
</div>
<div>
- {--ADMIN_BONUS_TIMEOUT_1--}<strong>$content[autopurge_timeout]</strong>{--ADMIN_BONUS_TIMEOUT_2--}
+ {%message,ADMIN_BONUS_TIMEOUT,$content[autopurge_timeout]%}
</div>
</div>
</div>
<table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
<tr>
<td colspan="4" align="center" class="admin_title">
- <strong>{--RALLYE_LIST_USERS_1--}$content[rallye]{--RALLYE_LIST_USERS_2--}:</strong>
+ <strong>{%message,RALLYE_LIST_USERS,$content[rallye]%}:</strong>
</td>
</tr>
<tr>
<tr>
<td colspan="6" class="admin_title bottom" height="20">
- <strong>{--ADMIN_LIST_USER_NODATA_1--}<u>$content[refid]</u>{--ADMIN_LIST_USER_NODATA_2--}</strong>
+ <strong>{%message,ADMIN_LIST_USER_NODATA,$content[refid]%}</strong>
</td>
</tr>
<tr>
<td colspan="6" class="admin_title bottom" height="20">
- <strong>{--ADMIN_LIST_USER_NOREFS_1--}<u>$content[userid]</u>{--ADMIN_LIST_USER_NOREFS_2--}</strong>
+ <strong>{%message,ADMIN_LIST_USER_NOREFS,$content[userid]%}</strong>
</td>
</tr>
</tr>
<tr>
<td align="center" colspan="2" class="admin_title bottom">
- {--EDIT_MENU_1--}$content[chk]{--EDIT_MENU_2--}
+ {%message,EDIT_MENU,$content[chk]%}
</td>
</tr>
$content[rows]
<tr>
<td align="center">
<div>{--BEG_UID_STEAL_1--}<strong>$content[userid]</strong>{--BEG_UID_STEAL_2--}<strong>$content[points]</strong>{--BEG_UID_STEAL_3--}</div>
- <div>{--BEG_CLICKS_1--}<strong>$content[clicks]</strong>{--BEG_CLICKS_2--}</div>
+ <div>{%message,BEG_CLICKS,$content[clicks]%}</div>
<div align="right">{--BEG_THANKS_FOR_CLICK--}</div>
</td>
</tr>
<tr>
<td align="center">
<div>{--BEG_SORRY_ANOTHER_WAS_HERE_1--}<strong>$content[userid]</strong>{--BEG_SORRY_ANOTHER_WAS_HERE_2--}<strong>$content[points]</strong>{--BEG_SORRY_ANOTHER_WAS_HERE_3--}</div>
- <div>{--BEG_CLICKS_1--}<strong>$content[clicks]</strong>{--BEG_CLICKS_2--}</div>
+ <div>{%message,BEG_CLICKS,$content[clicks]%}</div>
<div align="right">{--BEG_THANKS_FOR_CLICK_AGAIN--}</div>
</td>
</tr>
<tr>
<td align="center" height="50" class="bottom">
<div class="para big">
- {--BEG_LINK_BY_1--}<strong>{?MAIN_TITLE?}</strong>{--BEG_LINK_BY_2--}
+ {--BEG_LINK_BY--}
</div>
<div class="para">
- {--BEG_LINK_USERID_1--}<u>$content[userid]</u>{--BEG_LINK_USERID_2--}
+ {%message,BEG_LINK_USERID,$content[userid]%}
</div>
</td>
</tr>
<tr>
<td align="center">
<div>{--BEG_SORRY_YOURE_LOGGED_IN_1--}<strong>$content[userid]</strong>{--BEG_SORRY_YOURE_LOGGED_IN_2--}<strong>$content[points]</strong>{--BEG_SORRY_YOURE_LOGGED_IN_3--}</div>
- <div>{--BEG_CLICKS_1--}<strong>$content[clicks]</strong>{--BEG_CLICKS_2--}</div>
+ <div>{%message,BEG_CLICKS,$content[clicks]%}</div>
<div align="right">{--BEG_THANKS_FOR_CLICK_AGAIN--}</div>
</td>
</tr>
</table>
</form>
<br />
- {--DOUBLER_ALREADY_PAYED_1--} <strong>$content[total]
- {?POINTS?}</strong> {--DOUBLER_ALREADY_PAYED_2--}<br />
- {--DOUBLER_POINTS_LEFT_1--} <strong>$content[left]
- {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}<br />
- {--DOUBLER_USAGE_COUNTER_1--} <strong>{?doubler_counter?}</strong>
- {--DOUBLER_USAGE_COUNTER_2--}<br />
+ {%message,DOUBLER_ALREADY_PAYED,$content[total]%}<br />
+ {--DOUBLER_POINTS_LEFT_1--} <strong>$content[left] {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}<br />
+ {--DOUBLER_USAGE_COUNTER_1--} <strong>{?doubler_counter?}</strong> {--DOUBLER_USAGE_COUNTER_2--}<br />
<br />
{--DOUBLER_MINIMUM_IS--} <strong>$content[min] {?POINTS?}</strong>
{--DOUBLER_MAXIMUM_IS--} <strong>$content[max] {?POINTS?}</strong><br />
{--DOUBLER_REFERAL_8--} {--DOUBLER_REFERAL_LINK--}<br />
$content[message]<br />
{--DOUBLER_NOT_YET_REGISTERED--} <a
- href="{?URL?}/ref.php?refid=$content[refid]%}">{--DOUBLER_REGISTER_NOW--}</a><br />
+ href="{%url=ref.php?refid=$content[refid]%}">{--DOUBLER_REGISTER_NOW--}</a><br />
<br />
{--DOUBLER_YOUR_ADVERTISING_HERE--} <a
href="{%url=modules.php?module=index&what=impressum&refid=$content[refid]%}">{--DOUBLER_CONTACT_US--}</a><br />
{--BEG_GUEST_EARN_3--}
</div>
<div class="para">
- {--BEG_GUEST_TIMEOUT_1--} <strong>$content[timeout]</strong>
- {--BEG_GUEST_TIMEOUT_2--}
+ {%message,BEG_GUEST_TIMEOUT,$content[timeout]%}
</div>
<div class="para" align="right">
{--BEG_GUEST_HAVE_FUN--}
</div>
</div>
<div align="center" class="beg_msg">
- <a href="{?URL?}/ref.php?refid=$content[userid]">{--BEG_CONTINUE_REGISTER--}</a>
+ <a href="{%url=ref.php?refid=$content[userid]%}">{--BEG_CONTINUE_REGISTER--}</a>
</div>
</div>
<td class="doubler_main bottom" style="padding-left: 0px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
<ul>
<li>{--DOUBLER_MINIMUM_IS--} <strong>$content[min] {?POINTS?}</strong> {--DOUBLER_MAXIMUM_IS--} <strong>$content[max] {?POINTS?}</strong></li>
- <li>{--DOUBLER_ALREADY_PAYED_1--} <strong>$content[total] {?POINTS?}</strong> {--DOUBLER_ALREADY_PAYED_2--}</li>
+ <li>{%message,DOUBLER_ALREADY_PAYED,$content[total]%}</li>
<li>{--DOUBLER_POINTS_LEFT_1--} <strong>$content[left] {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}</li>
<li>{--DOUBLER_USAGE_COUNTER_1--} <strong>{?doubler_counter?}</strong> {--DOUBLER_USAGE_COUNTER_2--}</li>
<li>$content[payout_time]</li>
<table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
<tr>
<td width="220" align="center">
- {--THANX_POINTS_ADDED_1--}<strong class="member_done">$content[points]</strong> {--THANX_POINTS_ADDED_2--}<br />
- {--MAILID_TOTAL_POINTS1--} <span class="member_done">$content[total]
- {?POINTS?}</span> {--MAILID_TOTAL_POINTS2--}
+ {%message,THANX_POINTS_ADDED,$content[points]%}<br />
+ {%message,MAILID_TOTAL_POINTS,$content[total]%}
</td>
<td align="center">
<table border="0" cellspacing="0" cellpadding="0" class="member_banner dashed">
<tr>
<td width="220" align="center">
<div class="tiny">
- {--THANX_POINTS_ADDED_1--}<span class="member_done">$content[points]</span> {--THANX_POINTS_ADDED_2--}<br />
- {--MAILID_TOTAL_POINTS1--} <span class="member_done">$content[total]
- {?POINTS?}</span> {--MAILID_TOTAL_POINTS2--}<br />
+ {%message,THANX_POINTS_ADDED,$content[points]%}<br />
+ {%message,MAILID_TOTAL_POINTS,$content[total]%}<br />
<br />
<a href="{%url=show_bonus.php?userid=$content[userid]&t=$content[type]&d=$content[data]%}" target="_blank">{--BONUS_SHOW_TURBO_BONUS--}
</div>
<table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
<tr>
- <td width="220" align="center">{--POINTS_NOT_ADDED_1--}<strong
- class="member_failed">$content[points]</strong> {--POINTS_NOT_ADDED_2--}
+ <td width="220" align="center">
+ {%message,POINTS_NOT_ADDED,$content[points]%}
</td>
<td align="center">
- <table border="0" cellspacing="0" cellpadding="0" class="member_banner dashed">
- <tr>
- <td align="center">$content[banner]</td>
- </tr>
- </table>
+ <div class="member_banner dashed">
+ $content[banner]
+ </div>
</td>
</tr>
</table>
<table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
<tr>
- <td width="220" align="center">{--THANX_POINTS_LOCKED_1--}
- <strong class="member_done">$content[points]</strong> {--THANX_POINTS_LOCKED_2--}
+ <td width="220" align="center">
+ {%message,THANX_POINTS_LOCKED,$content[points]%}
</td>
<td align="center">
- <table border="0" cellspacing="0" cellpadding="0" class="member_banner dashed">
- <tr>
- <td align="center">$content[banner]</td>
- </tr>
- </table>
+ <div class="member_banner dashed">
+ $content[banner]
+ </div>
</td>
</tr>
</table>
<tr>
<td width="220" align="center">
<div class="tiny">
- {--THANX_POINTS_LOCKED_1--}<span class="member_done">$content[points]</span> {--THANX_POINTS_LOCKED_2--}<br />
+ {%message,THANX_POINTS_LOCKED,$content[points]%}<br />
<br />
<a href="{%url=show_bonus.php?userid=$content[userid]&t=$content[type]&d=$content[data]%}" target="_blank">{--BONUS_SHOW_TURBO_BONUS--}
</div>
</td>
<td align="center">
- <table border="0" cellspacing="0" cellpadding="0" class="member_banner dashed">
- <tr>
- <td align="center">$content[banner]</td>
- </tr>
- </table>
+ <div class="member_banner dashed">
+ $content[banner]
+ </div>
</td>
</tr>
</table>
<tr>
<td align="center">
<form accept-charset="utf-8" name="confirm" style="margin-top: 0px;margin-bottom:0px">
- {--MEMBER_TIME_COUNTER_1--}
- <input type="text" name="counter" size="$content[tim2]" readonly class="member_normal" value="$content[time]" />
- {--_SECONDS--} {--MEMBER_TIME_COUNTER_2--}
+ {%message,MEMBER_TIME_COUNTER,<input type="text" name="counter" size="$content[tim2]" readonly class="member_normal" value="$content[time]" />%}
</form>
</td>
</tr>
{--BEG_MEMBER_EARN_3--}
</div>
<div class="para">
- {--BEG_MEMBER_TIMEOUT_1--} <strong>{%config,createFancyTime=beg_timeout%}</strong>
- {--BEG_MEMBER_TIMEOUT_2--}
+ {%message,BEG_MEMBER_TIMEOUT,{%config,createFancyTime=beg_timeout%}%}
</div>
<div class="para" align="right">
{--BEG_MEMBER_HAVE_FUN--}
<div class="doubler_main bottom" style="padding-left: 0px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
<ul>
<li>{--DOUBLER_MINIMUM_IS--} <strong>{%config,translateComma=doubler_min%} {?POINTS?}</strong> {--DOUBLER_MAXIMUM_IS--} <strong>{%config,translateComma=doubler_max%} {?POINTS?}</strong></li>
- <li>{--DOUBLER_ALREADY_PAYED_1--} <strong>{%config,translateComma=doubler_points%} {?POINTS?}</strong> {--DOUBLER_ALREADY_PAYED_2--}</li>
+ <li>{%message,DOUBLER_ALREADY_PAYED,{%config,translateComma=doubler_points%}%}</li>
<li>{--DOUBLER_POINTS_LEFT_1--} <strong>$content[left] {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}</li>
<li>{--DOUBLER_USAGE_COUNTER_1--} <strong>{?doubler_counter?}</strong> {--DOUBLER_USAGE_COUNTER_2--}</li>
<li>$content[payout_time]</li>
</tr>
<tr>
<td colspan="2" align="center">
- <span class="member_note">{--HOLIDAY_MAX_DAYS_1--}<strong>{?holiday_max?}</strong>{--HOLIDAY_MAX_DAYS_2--}</span>
+ <span class="member_note">{%message,HOLIDAY_MAX_DAYS,{?holiday_max?}%}</span>
</td>
</tr>
<tr>
<table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" width="650">
<tr>
<td colspan="2" align="center" class="header_column bottom">
- <strong>{--MEMBER_MAIL_BONUS_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_BONUS_DETAILS_TITLE_2--}</strong>
+ <strong>{%message,MEMBER_MAIL_BONUS_DETAILS_TITLE,$content[id]%}</strong>
</td>
</tr>
<tr>
<table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" width="650">
<tr>
<td colspan="2" align="center" class="header_column bottom">
- <strong>{--MEMBER_MAIL_BONUS_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_BONUS_DETAILS_TITLE_2--}</strong>
+ <strong>{%message,MEMBER_MAIL_BONUS_DETAILS_TITLE,$content[id]%}</strong>
</td>
</tr>
<tr>
<table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" width="650">
<tr>
<td colspan="2" align="center" class="header_column bottom">
- <strong>{--MEMBER_MAIL_BONUS_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_BONUS_DETAILS_TITLE_2--}</strong>
+ <strong>{%message,MEMBER_MAIL_BONUS_DETAILS_TITLE,$content[id]%}</strong>
</td>
</tr>
<tr>
<table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" width="650">
<tr>
<td colspan="2" align="center" class="header_column bottom">
- <strong>{--MEMBER_MAIL_BONUS_DETAILS_TITLE_1--}$content[id]{--MEMBER_MAIL_BONUS_DETAILS_TITLE_2--}</strong>
+ <strong>{%message,MEMBER_MAIL_BONUS_DETAILS_TITLE,$content[id]%}</strong>
</td>
</tr>
<tr>
$content[rows]
<tr>
<td align="center" class="member_footer" colspan="6">
- <span class="member_note">{--MEMBER_REFLIST_COUNTER_1--}$content[counter]{--MEMBER_REFLIST_COUNTER_2--}</span>
+ <span class="member_note">{%message,MEMBER_REFLIST_COUNTER,$content[counter]%}</span>
</td>
</tr>
</table>
$content[rows]
<tr>
<td align="center" class="member_footer" colspan="6">
- <span class="member_note">{--MEMBER_REFLIST_COUNTER_1--}$content[counter]{--MEMBER_REFLIST_COUNTER_2--}</span>
+ <span class="member_note">{%message,MEMBER_REFLIST_COUNTER,$content[counter]%}</span>
</td>
</tr>
</table>
{--HELLO--} $content[gender] $content[surname] $content[family]!
</div>
<div>
- {--BONUS_SHOW_HEADER_LINE_1--} <strong>{?POINTS?}</strong> {--BONUS_SHOW_HEADER_LINE_2--} <strong>$content[mailid]</strong> {--BONUS_SHOW_HEADER_LINE_3--}:
+ {%message,BONUS_SHOW_HEADER_LINE,$content[mailid]%}:
</div>
<table border="0" cellspacing="0" cellpadding="0" width="300" class="member_table dashed">
<tr>
projects / mailer.git / commitdiff