";
@@ -78,14 +82,16 @@ ORDER BY beg_points DESC, last_online DESC, userid",
} // END - if
// Prepare content
+ // @TODO Rewrite templates so s/fname will be replaced by surname/family
+ // @TODO to shorten this block. Please also do so with uid->userid
$content = array(
- 'uid' => $uid,
- 'email' => CREATE_EMAIL_LINK($email, "user_data"),
- 'gender' => TRANSLATE_GENDER($gender),
- 'sname' => $sname,
- 'fname' => $fname,
- 'turbo' => TRANSLATE_COMMA($turbo),
- 'last' => MAKE_DATETIME($last, "2"),
+ 'uid' => $content['userid'],
+ 'email' => generateMemberEmailLink($content['email'], "user_data"),
+ 'gender' => translateGender($content['gender']),
+ 'sname' => $content['surname'],
+ 'fname' => $content['family'],
+ 'turbo' => translateComma($content['beg_points']),
+ 'last' => generateDateTime($content['last_online'], '2'),
'sw' => $SW,
'win1' => $WIN1,
'win2' => $WIN2,
@@ -94,36 +100,36 @@ ORDER BY beg_points DESC, last_online DESC, userid",
// Load template and add it
$OUT .= LOAD_TEMPLATE("admin_list_beg_rows", true, $content);
- $SW = 3 - $SW; $cnt++; $total += $turbo;
+ $SW = 3 - $SW; $cnt++; $total += $content['beg_points'];
}
define('__BEG_ROWS', $OUT);
- define('__TOTAL', TRANSLATE_COMMA($total));
+ define('__TOTAL', translateComma($total));
// Check if we need to display form or not with manuel withdraw
- if (getConfig('last_month') == date("m", time())) {
+ if (getConfig('last_month') == date('m', time())) {
// Load form
define('__BEG_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_beg_form", true));
} else {
// Display message "no manual withdraw possible"
- define('__BEG_WITHDRAW_FORM', "".ADMIN_BEG_ALREADY_WITHDRAW."
");
+ define('__BEG_WITHDRAW_FORM', "{--ADMIN_BEG_ALREADY_WITHDRAW--}
");
}
// Prepare constant for timemark
- if (EXT_IS_ACTIVE("autopurge")) {
- define('__AUTOPURGE_TIMEOUT', MAKE_DATETIME(time() - getConfig('ap_inactive_since'), "2"));
+ if (EXT_IS_ACTIVE('autopurge')) {
+ define('__AUTOPURGE_TIMEOUT', generateDateTime(time() - getConfig('ap_inactive_since'), '2'));
} else {
- define('__AUTOPURGE_TIMEOUT', sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "autopurge"));
+ define('__AUTOPURGE_TIMEOUT', sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'autopurge'));
}
// Load final template
LOAD_TEMPLATE("admin_list_beg");
} else {
// No one has joined the begging rallye...
- LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BEG_NO_RALLYE);
+ LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BEG_NO_RALLYE'));
}
} else {
// Rallye deactivated
- LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BEG_RALLYE_DEACTIVATED);
+ LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BEG_RALLYE_DEACTIVATED'));
}
//