From 307a4e11763f0914e73dc756b219356e1c29ab25 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 30 Aug 2008 20:40:26 +0000 Subject: [PATCH] Password reset for admin login added (still buggy if cache is installed and sql_patches uninstalled) --- .gitattributes | 6 ++ beg.php | 4 +- birthday_confirm.php | 2 +- inc/autopurge.php | 16 ++-- inc/doubler_send.php | 6 +- inc/extensions.php | 10 +- inc/extensions/ext-active.php | 4 +- inc/extensions/ext-admins.php | 2 +- inc/extensions/ext-admintheme1.php | 2 +- inc/extensions/ext-admintheme_default.php | 2 +- inc/extensions/ext-autopurge.php | 2 +- inc/extensions/ext-bank.php | 2 +- inc/extensions/ext-beg.php | 12 +-- inc/extensions/ext-birthday.php | 2 +- inc/extensions/ext-bonus.php | 6 +- inc/extensions/ext-country.php | 2 +- inc/extensions/ext-demo.php | 2 +- inc/extensions/ext-doubler.php | 2 +- inc/extensions/ext-holiday.php | 2 +- inc/extensions/ext-html_mail.php | 2 +- inc/extensions/ext-mailid.php | 2 +- inc/extensions/ext-maintenance.php | 2 +- inc/extensions/ext-mediadata.php | 2 +- inc/extensions/ext-mods.php | 2 +- inc/extensions/ext-mydata.php | 2 +- inc/extensions/ext-newsletter.php | 2 +- inc/extensions/ext-nickname.php | 4 +- inc/extensions/ext-online.php | 2 +- inc/extensions/ext-optimize.php | 2 +- inc/extensions/ext-order.php | 2 +- inc/extensions/ext-other.php | 2 +- inc/extensions/ext-payout.php | 2 +- inc/extensions/ext-profile.php | 2 +- inc/extensions/ext-rallye.php | 2 +- inc/extensions/ext-register.php | 4 +- inc/extensions/ext-repair.php | 2 +- inc/extensions/ext-rewrite.php | 2 +- inc/extensions/ext-sql_patches.php | 8 +- inc/extensions/ext-support.php | 2 +- inc/extensions/ext-surfbar.php | 8 +- inc/extensions/ext-task.php | 4 +- inc/extensions/ext-theme.php | 2 +- inc/extensions/ext-top10.php | 4 +- inc/extensions/ext-transfer.php | 4 +- inc/extensions/ext-user.php | 4 +- inc/extensions/ext-wernis.php | 2 +- inc/extensions/ext-yoomedia.php | 4 +- inc/footer.php | 2 +- inc/functions.php | 20 ++-- inc/header.php | 8 +- inc/language/de.php | 29 ++++++ inc/libs/bonus_functions.php | 4 +- inc/libs/doubler_functions.php | 6 +- inc/libs/newsletter_functions.php | 2 +- inc/libs/rallye_functions.php | 10 +- inc/libs/register_functions.php | 8 +- inc/libs/task_functions.php | 14 +-- inc/load_cache.php | 18 ++-- inc/load_extensions.php | 28 +++--- inc/mails/beg_mails.php | 4 +- inc/mails/birthday_mails.php | 2 +- inc/mails/bonus_mails.php | 4 +- inc/modules/admin.php | 49 +++++++++- inc/modules/admin/admin-inc.php | 96 ++++++++++++++++++- inc/modules/admin/overview-inc.php | 6 +- inc/modules/admin/what-config_autopurge.php | 2 +- inc/modules/admin/what-config_beg.php | 2 +- inc/modules/admin/what-config_bonus.php | 2 +- inc/modules/admin/what-config_cache.php | 18 ++-- inc/modules/admin/what-config_order.php | 6 +- inc/modules/admin/what-config_other.php | 16 ++-- .../admin/what-config_rallye_prices.php | 2 +- inc/modules/admin/what-config_rewrite.php | 2 +- inc/modules/admin/what-extensions.php | 8 +- inc/modules/admin/what-list_beg.php | 2 +- inc/modules/admin/what-list_bonus.php | 12 +-- inc/modules/admin/what-list_payouts.php | 4 +- inc/modules/admin/what-maintenance.php | 4 +- inc/modules/admin/what-send_bonus.php | 4 +- inc/modules/admin/what-theme_edit.php | 2 +- inc/modules/admin/what-unlock_emails.php | 2 +- inc/modules/admin/what-user_online.php | 4 +- inc/modules/admin/what-usr_online.php | 4 +- inc/modules/chk_login.php | 2 +- inc/modules/guest/what-confirm.php | 2 +- inc/modules/guest/what-register.php | 14 +-- inc/modules/index.php | 4 +- inc/modules/login.php | 6 +- inc/modules/member/what-bonus.php | 10 +- inc/modules/member/what-categories.php | 2 +- inc/modules/member/what-holiday.php | 4 +- inc/modules/member/what-html_mail.php | 2 +- inc/modules/member/what-newsletter.php | 2 +- inc/modules/member/what-order.php | 24 ++--- inc/modules/member/what-payout.php | 6 +- inc/modules/member/what-points.php | 4 +- inc/modules/member/what-transfer.php | 2 +- inc/modules/order.php | 2 +- inc/monthly/monthly_beg.php | 2 +- inc/monthly/monthly_bonus.php | 10 +- inc/mysql-manager.php | 28 +++--- inc/pool-update.php | 2 +- inc/profile-updte.php | 2 +- mailid_top.php | 8 +- modules.php | 2 +- .../de/emails/admin/admin_reset_password.tpl | 24 +++++ templates/de/emails/header.tpl | 2 +- templates/de/html/admin/admin_add_points.tpl | 2 +- templates/de/html/admin/admin_add_rallye.tpl | 4 +- .../html/admin/admin_add_sponsor_paytype.tpl | 16 ++-- templates/de/html/admin/admin_admin_add.tpl | 10 +- .../html/admin/admin_admins_contact_form.tpl | 2 +- .../html/admin/admin_admins_contct_form.tpl | 2 +- .../admin/admin_admins_mails_edit_form.tpl | 4 +- templates/de/html/admin/admin_config_beg.tpl | 14 +-- .../de/html/admin/admin_config_birthday.tpl | 6 +- .../de/html/admin/admin_config_bonus.tpl | 24 ++--- .../de/html/admin/admin_config_doubler.tpl | 10 +- .../de/html/admin/admin_config_holiday.tpl | 2 +- .../admin/admin_config_home_settings_pro.tpl | 2 +- .../de/html/admin/admin_config_mediadata.tpl | 4 +- .../de/html/admin/admin_config_other.tpl | 12 +-- .../admin/admin_config_point_settings.tpl | 2 +- .../de/html/admin/admin_config_sponsor.tpl | 2 +- .../de/html/admin/admin_config_stats.tpl | 6 +- .../de/html/admin/admin_config_transfer.tpl | 2 +- .../de/html/admin/admin_contct_user_form.tpl | 2 +- templates/de/html/admin/admin_edit_admins.tpl | 4 +- .../de/html/admin/admin_edit_rallyes_row.tpl | 4 +- .../admin/admin_edit_sponsor_add_points.tpl | 4 +- .../admin/admin_edit_sponsor_sub_points.tpl | 4 +- .../de/html/admin/admin_email_archiv_row.tpl | 22 ++--- .../de/html/admin/admin_gmenu_status.tpl | 4 +- templates/de/html/admin/admin_guest_add.tpl | 10 +- templates/de/html/admin/admin_list_beg.tpl | 4 +- templates/de/html/admin/admin_list_bonus.tpl | 4 +- templates/de/html/admin/admin_list_cats.tpl | 2 +- .../de/html/admin/admin_list_cats_404.tpl | 2 +- templates/de/html/admin/admin_list_links.tpl | 2 +- .../html/admin/admin_list_payouts_banner.tpl | 8 +- .../de/html/admin/admin_list_payouts_txt.tpl | 8 +- .../de/html/admin/admin_list_rallyes_row.tpl | 28 +++--- .../html/admin/admin_list_sponsor_details.tpl | 10 +- .../admin/admin_list_sponsor_pay_edit_row.tpl | 2 +- .../de/html/admin/admin_list_sponsor_row.tpl | 6 +- .../de/html/admin/admin_list_unconfirmed.tpl | 12 +-- templates/de/html/admin/admin_logout.tpl | 10 +- .../html/admin/admin_logout_sql_patches.tpl | 10 +- templates/de/html/admin/admin_member_add.tpl | 10 +- templates/de/html/admin/admin_menu_failed.tpl | 4 +- templates/de/html/admin/admin_mini_online.tpl | 4 +- .../de/html/admin/admin_mmenu_status.tpl | 4 +- templates/de/html/admin/admin_optimize.tpl | 12 +-- .../html/admin/admin_payout_accept_form.tpl | 4 +- .../de/html/admin/admin_payout_add_new.tpl | 2 +- .../html/admin/admin_payout_overview_form.tpl | 2 +- .../html/admin/admin_payout_reject_form.tpl | 4 +- .../de/html/admin/admin_reset_pass_done.tpl | 18 ++++ .../de/html/admin/admin_reset_password.tpl | 28 ++++++ .../html/admin/admin_reset_password_form.tpl | 47 +++++++++ .../de/html/admin/admin_send_bonus_select.tpl | 8 +- .../de/html/admin/admin_send_reset_link.tpl | 28 ++++++ .../de/html/admin/admin_sponsor_paytypes.tpl | 4 +- templates/de/html/admin/admin_sub_points.tpl | 2 +- .../de/html/admin/admin_user_details.tpl | 62 ++++++------ .../admin/admin_validate_reset_hash_form.tpl | 29 ++++++ templates/de/html/admin/admin_welcome.tpl | 2 +- .../de/html/admin/admin_welcome_admins.tpl | 2 +- 168 files changed, 822 insertions(+), 482 deletions(-) create mode 100644 templates/de/emails/admin/admin_reset_password.tpl create mode 100644 templates/de/html/admin/admin_reset_pass_done.tpl create mode 100644 templates/de/html/admin/admin_reset_password.tpl create mode 100644 templates/de/html/admin/admin_reset_password_form.tpl create mode 100644 templates/de/html/admin/admin_send_reset_link.tpl create mode 100644 templates/de/html/admin/admin_validate_reset_hash_form.tpl diff --git a/.gitattributes b/.gitattributes index 78726980ab..30914c6957 100644 --- a/.gitattributes +++ b/.gitattributes @@ -576,6 +576,7 @@ templates/de/emails/admin/admin_rallye_expired_no.tpl -text templates/de/emails/admin/admin_rallye_no_notify.tpl -text templates/de/emails/admin/admin_rallye_notify.tpl -text templates/de/emails/admin/admin_rallye_purged.tpl -text +templates/de/emails/admin/admin_reset_password.tpl -text templates/de/emails/admin/admin_sponsor_change_data.tpl -text templates/de/emails/admin/admin_sponsor_change_email.tpl -text templates/de/emails/admin/admin_sponsor_edit.tpl -text @@ -995,8 +996,12 @@ templates/de/html/admin/admin_refbanner_row.tpl -text templates/de/html/admin/admin_reg.tpl -text templates/de/html/admin/admin_reg_form.tpl -text templates/de/html/admin/admin_reg_row.tpl -text +templates/de/html/admin/admin_reset_pass_done.tpl -text +templates/de/html/admin/admin_reset_password.tpl -text +templates/de/html/admin/admin_reset_password_form.tpl -text templates/de/html/admin/admin_send_bonus_form.tpl -text templates/de/html/admin/admin_send_bonus_select.tpl -text +templates/de/html/admin/admin_send_reset_link.tpl -text templates/de/html/admin/admin_settings_saved.tpl -text templates/de/html/admin/admin_setup_stats.tpl -text templates/de/html/admin/admin_sponsor_paytypes.tpl -text @@ -1017,6 +1022,7 @@ templates/de/html/admin/admin_unlock_sponsor.tpl -text templates/de/html/admin/admin_unlock_sponsor_row.tpl -text templates/de/html/admin/admin_update_download.tpl -text templates/de/html/admin/admin_user_details.tpl -text +templates/de/html/admin/admin_validate_reset_hash_form.tpl -text templates/de/html/admin/admin_welcome.tpl -text templates/de/html/admin/admin_welcome_admins.tpl -text templates/de/html/agb.tpl -text diff --git a/beg.php b/beg.php index c5442dfc4c..eb9bf94422 100644 --- a/beg.php +++ b/beg.php @@ -132,10 +132,10 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install // Set mode depending on how many mails the member has to confirm $locked = false; - if (($ref_payout > 0) && ($_CONFIG['allow_direct_pay'] == 'N')) $locked = true; + if (($ref_payout > 0) && ($_CONFIG['allow_direct_pay'] == "N")) $locked = true; // Is begging rallye active? - if ($_CONFIG['beg_rallye'] == 'Y') { + if ($_CONFIG['beg_rallye'] == "Y") { // Add points to rallye account $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET beg_points=beg_points+%s WHERE userid=%d LIMIT 1", array($points, $uid), __FILE__, __LINE__); diff --git a/birthday_confirm.php b/birthday_confirm.php index 1eb3f2c7a4..621b21fe92 100644 --- a/birthday_confirm.php +++ b/birthday_confirm.php @@ -70,7 +70,7 @@ WHERE b.userid=%d AND b.chk_value='%s' LIMIT 1", if ($data['status'] == "CONFIRMED") { // Set mode depending on how many mails the member has to confirm $locked = false; - if (($data['ref_payout'] > 0) && ($_CONFIG['allow_direct_pay'] == 'N')) $locked = true; + if (($data['ref_payout'] > 0) && ($_CONFIG['allow_direct_pay'] == "N")) $locked = true; // Add points to account $DEPTH = 0; diff --git a/inc/autopurge.php b/inc/autopurge.php index 2d280c4cbc..7c98694ed7 100644 --- a/inc/autopurge.php +++ b/inc/autopurge.php @@ -38,7 +38,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) require($INC); } -if (($_CONFIG['auto_purge_active'] == 'Y') && ($_CONFIG['auto_purge'] > 0)) +if (($_CONFIG['auto_purge_active'] == "Y") && ($_CONFIG['auto_purge'] > 0)) { // First calculate the timestamp if (function_exists('CREATE_TIME_SELECTIONS')) @@ -162,7 +162,7 @@ WHERE s.timestamp_ordered <= %s ORDER BY s.userid", } // Shall I look for inactive accounts and autopurge inactive accounts? -if ($_CONFIG['ap_inactive'] == 'Y') +if ($_CONFIG['ap_inactive'] == "Y") { // Ok, let's have a look... $since = bigintval(time() - $_CONFIG['ap_in_since']); @@ -260,7 +260,7 @@ ORDER BY userid", $UIDs = str_replace(", ", "\n", substr($UIDs, 0, -2)); // Send mail notification to admin - if ($_CONFIG['ap_un_mail'] == 'Y') + if ($_CONFIG['ap_un_mail'] == "Y") { if (GET_EXT_VERSION("admins") >= "0.4.1") { @@ -279,7 +279,7 @@ ORDER BY userid", } // Shall I auto-purge unconfirmed accounts? -if ($_CONFIG['ap_unconfirmed'] == 'Y') +if ($_CONFIG['ap_unconfirmed'] == "Y") { // Init variables and find unconfirmed accounts which I shall auto-purge $time = bigintval(time() - $_CONFIG['ap_un_time']); @@ -308,7 +308,7 @@ if ($_CONFIG['ap_unconfirmed'] == 'Y') $UIDs = str_replace(", ", "\n", substr($UIDs, 0, -2)); // Send mail notification to admin - if ($_CONFIG['ap_un_mail'] == 'Y') + if ($_CONFIG['ap_un_mail'] == "Y") { if (GET_EXT_VERSION("admins") >= "0.4.1") { @@ -327,7 +327,7 @@ if ($_CONFIG['ap_unconfirmed'] == 'Y') } // Check version (must be > 0.0) -if ((GET_EXT_VERSION("task") > "0.0") && ($_CONFIG['ap_tasks'] == 'Y')) +if ((GET_EXT_VERSION("task") > "0.0") && ($_CONFIG['ap_tasks'] == "Y")) { // Purge deleted tasks (no notification to admin) $since = bigintval(time() - $_CONFIG['ap_tasks_time']); @@ -335,7 +335,7 @@ if ((GET_EXT_VERSION("task") > "0.0") && ($_CONFIG['ap_tasks'] == 'Y')) array($since), __FILE__, __LINE__); $DELETED = SQL_AFFECTEDROWS(); - if (($DELETED > 0) && ($_CONFIG['ap_tasks_mail'] == 'Y')) + if (($DELETED > 0) && ($_CONFIG['ap_tasks_mail'] == "Y")) { // Send out email to admin if (GET_EXT_VERSION("admins") >= "0.4.1") @@ -418,7 +418,7 @@ if ($_CONFIG['ap_del_mails']) SQL_FREERESULT($result_mails); // Do we have deleted mails and the admin want's to receive a notification - if (($DELETED > 0) && ($_CONFIG['ap_dm_notify'] == 'Y')) + if (($DELETED > 0) && ($_CONFIG['ap_dm_notify'] == "Y")) { // Send out email to admin if (GET_EXT_VERSION("admins") >= "0.4.1") diff --git a/inc/doubler_send.php b/inc/doubler_send.php index 8aab915b5f..e4f16f4f9b 100644 --- a/inc/doubler_send.php +++ b/inc/doubler_send.php @@ -71,11 +71,11 @@ WHERE u.status='CONFIRMED' AND d.points <= %s AND d.points >= %s AND d.completed ORDER BY d.timemark LIMIT %d", array($DOUBLER_POINTS, $min, $_CONFIG['doubler_max_sent']), __FILE__, __LINE__); -if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == 'Y')) || ((SQL_NUMROWS($result_main) == $_CONFIG['doubler_group_sent']) && ($_CONFIG['doubler_sent_all'] == 'N'))) +if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y")) || ((SQL_NUMROWS($result_main) == $_CONFIG['doubler_group_sent']) && ($_CONFIG['doubler_sent_all'] == "N"))) { // Switch to matching SQL resource $result_load = $result_main; - if ((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == 'Y')) $result_load = $result_total; + if ((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y")) $result_load = $result_total; // At least one account was found while(list($id, $uid, $points, $ip, $time) = SQL_FETCHROW($result_load)) @@ -127,7 +127,7 @@ if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == 'Y')) $OK = false; // Check for jackpot inclusion in doubling process - if (($jackpot > 0) && ($jackpot >= $points) && ($_CONFIG['doubler_jackpot'] == 'Y')) + if (($jackpot > 0) && ($jackpot >= $points) && ($_CONFIG['doubler_jackpot'] == "Y")) { // Subtract points from jackpot SUB_JACKPOT($points); diff --git a/inc/extensions.php b/inc/extensions.php index 2111344061..cf3ba20d59 100644 --- a/inc/extensions.php +++ b/inc/extensions.php @@ -65,7 +65,7 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false) foreach ($EXT_VER_HISTORY as $EXT_VER) { require($file); - if (((GET_EXT_VERSION("sql_patches") != '') && ($_CONFIG['verbose_sql'] == 'Y')) || (!EXT_IS_ACTIVE("sql_patches"))) + if (((GET_EXT_VERSION("sql_patches") != '') && ($_CONFIG['verbose_sql'] == "Y")) || (!EXT_IS_ACTIVE("sql_patches"))) { if (!empty($UPDATE_NOTES)) { @@ -307,7 +307,7 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin=false, $ignore_cache=false) // Shorter way return ( ( - ($active == 'Y') || ( + ($active == "Y") || ( (IS_ADMIN()) && (!$ignore_admin) && (!empty($active)) @@ -382,7 +382,7 @@ function EXTENSION_UPDATE($file, $ext, $EXT_VER, $dry_run=false) include(PATH."inc/extensions/".$file); // Add notes - if ($_CONFIG['verbose_sql'] == 'Y') + if ($_CONFIG['verbose_sql'] == "Y") { $EXT_VER = $EXT_VER_HISTORY[$idx]; if (!empty($UPDATE_NOTES)) @@ -468,7 +468,7 @@ function EXTENSION_VERBOSE_TABLE($SQLs, $title=ADMIN_SQLS_EXECUTED_ON_REMOVAL, $ $S = false; $SW = 2; $i = 1; $OUT = ""; - if ((is_array($SQLs)) && (GET_EXT_VERSION("sql_patches")) && ($_CONFIG['verbose_sql'] == 'Y')) + if ((is_array($SQLs)) && (GET_EXT_VERSION("sql_patches")) && ($_CONFIG['verbose_sql'] == "Y")) { $OUT = "
@@ -495,7 +495,7 @@ function EXTENSION_VERBOSE_TABLE($SQLs, $title=ADMIN_SQLS_EXECUTED_ON_REMOVAL, $ } } - if ((!$S) && (GET_EXT_VERSION("sql_patches")) && ($_CONFIG['verbose_sql'] == 'Y')) + if ((!$S) && (GET_EXT_VERSION("sql_patches")) && ($_CONFIG['verbose_sql'] == "Y")) { // No addional SQL commands to run $OUT .= " diff --git a/inc/extensions/ext-active.php b/inc/extensions/ext-active.php index 65da897408..2056138cb6 100644 --- a/inc/extensions/ext-active.php +++ b/inc/extensions/ext-active.php @@ -54,7 +54,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (action, what, title, sort, visible, locked) VALUES ('main', 'active', 'Heute Online', 10, 'N', 'Y')"; // Load CSS file? - $EXT_CSS = 'Y'; + $EXT_CSS = "Y"; break; case "remove": // Do stuff when removing extension @@ -131,7 +131,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "active"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php index 98033a2ef7..90702a1095 100644 --- a/inc/extensions/ext-admins.php +++ b/inc/extensions/ext-admins.php @@ -287,7 +287,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "admins"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-admintheme1.php b/inc/extensions/ext-admintheme1.php index b36ba4e0c5..53c0a64387 100644 --- a/inc/extensions/ext-admintheme1.php +++ b/inc/extensions/ext-admintheme1.php @@ -89,7 +89,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "admintheme"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-admintheme_default.php b/inc/extensions/ext-admintheme_default.php index 540e1ddb11..97517cc383 100644 --- a/inc/extensions/ext-admintheme_default.php +++ b/inc/extensions/ext-admintheme_default.php @@ -89,7 +89,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "admintheme"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php index 136d94b2f9..02af08f171 100644 --- a/inc/extensions/ext-autopurge.php +++ b/inc/extensions/ext-autopurge.php @@ -273,7 +273,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "autopurge"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'Y'; +$EXT_ALWAYS_ACTIVE = "Y"; // ?> diff --git a/inc/extensions/ext-bank.php b/inc/extensions/ext-bank.php index 982a00ef17..80b7e03c9e 100644 --- a/inc/extensions/ext-bank.php +++ b/inc/extensions/ext-bank.php @@ -193,7 +193,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "bank"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php index eefd94b2c0..87a928f8ff 100644 --- a/inc/extensions/ext-beg.php +++ b/inc/extensions/ext-beg.php @@ -69,7 +69,7 @@ PRIMARY KEY(id) ) TYPE=MyISAM"; // Load CSS file? - $EXT_CSS = 'Y'; + $EXT_CSS = "Y"; break; case "remove": // Do stuff when removing extension @@ -166,8 +166,8 @@ case "update": // Update an extension $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_active enum('Y', 'N') not null default 'N'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD beg_rallye enum('Y', 'N') not null default 'N'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD beg_points double(21,5) not null default '0.00000'"; - $VIS = 'N'; $LOCKED = 'Y'; - if (EXT_IS_ACTIVE("beg")) { $VIS = 'Y'; $LOCKED = 'N'; } + $VIS = "N"; $LOCKED = "Y"; + if (EXT_IS_ACTIVE("beg")) { $VIS = "Y"; $LOCKED = "N"; } $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, visible, locked, sort) VALUES ('main', 'beg2', 'Bettel-Rallye', '".$VIS."', '".$LOCKED."', '7')"; $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('user', 'list_beg', 'Bettel-Rallye', 'Listet alle Teilnehmer der monatlichen Bettel-Rallye auf.', '12')"; @@ -271,7 +271,7 @@ default: // Do stuff when extension is loaded if (defined('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1)) { // Daily reset was run so let's check if begging rallye is active - if ($_CONFIG['beg_rallye'] == 'Y') + if ($_CONFIG['beg_rallye'] == "Y") { // Check for our winers $INC_POOL[] = PATH."inc/monthly/monthly_beg.php"; @@ -284,7 +284,7 @@ default: // Do stuff when extension is loaded } // Check for beg rallye is active and send mails out - if (($_CONFIG['beg_rallye'] == 'Y') && ($_CONFIG['beg_new_mem_notify'] == 'Y')) + if (($_CONFIG['beg_rallye'] == "Y") && ($_CONFIG['beg_new_mem_notify'] == "Y")) { // Include file for sending out mails $INC_POOL[] = PATH."inc/mails/beg_mails.php"; @@ -299,7 +299,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "beg"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php index 52654f0c97..9eedddefcd 100644 --- a/inc/extensions/ext-birthday.php +++ b/inc/extensions/ext-birthday.php @@ -204,7 +204,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "birthday"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php index a2a0271038..395f1a546f 100644 --- a/inc/extensions/ext-bonus.php +++ b/inc/extensions/ext-bonus.php @@ -547,7 +547,7 @@ default: // Do stuff when extension is loaded if (defined('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1)) { // Daily reset was run so let's check if active rallye is activated - if ($_CONFIG['bonus_active'] == 'Y') + if ($_CONFIG['bonus_active'] == "Y") { // Run active rallye if($_CONFIG['bonus_stats'] > 0) $INC_POOL[] = PATH."inc/stats_bonus.php"; @@ -561,7 +561,7 @@ default: // Do stuff when extension is loaded } // Check for bonus rallye is active and send mails out - if (($_CONFIG['bonus_active'] == 'Y') && ($_CONFIG['bonus_new_mem_notify'] == 'Y')) + if (($_CONFIG['bonus_active'] == "Y") && ($_CONFIG['bonus_new_mem_notify'] == "Y")) { // Include file for sending out mails $INC_POOL[] = PATH."inc/mails/bonus_mails.php"; @@ -573,7 +573,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "bonus"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php index 09afaa24d8..43f430dbc1 100644 --- a/inc/extensions/ext-country.php +++ b/inc/extensions/ext-country.php @@ -119,7 +119,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "country"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'Y'; +$EXT_ALWAYS_ACTIVE = "Y"; // ?> diff --git a/inc/extensions/ext-demo.php b/inc/extensions/ext-demo.php index 5e3e6242c5..264b3aba70 100644 --- a/inc/extensions/ext-demo.php +++ b/inc/extensions/ext-demo.php @@ -86,7 +86,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "demo"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php index a294dd5b4b..9d649ccff5 100644 --- a/inc/extensions/ext-doubler.php +++ b/inc/extensions/ext-doubler.php @@ -252,7 +252,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "doubler"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php index a0cc369ab7..85205f9102 100644 --- a/inc/extensions/ext-holiday.php +++ b/inc/extensions/ext-holiday.php @@ -241,7 +241,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "holiday"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php index 23365d9c68..c36ea06409 100644 --- a/inc/extensions/ext-html_mail.php +++ b/inc/extensions/ext-html_mail.php @@ -168,7 +168,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "html_mail"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-mailid.php b/inc/extensions/ext-mailid.php index 67eff54208..b1bf0842e3 100644 --- a/inc/extensions/ext-mailid.php +++ b/inc/extensions/ext-mailid.php @@ -244,7 +244,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "mailid"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-maintenance.php b/inc/extensions/ext-maintenance.php index 9fd371f7d3..7cb1ed8be7 100644 --- a/inc/extensions/ext-maintenance.php +++ b/inc/extensions/ext-maintenance.php @@ -119,7 +119,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "maintenance"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'Y'; +$EXT_ALWAYS_ACTIVE = "Y"; // ?> diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php index fa8249d507..072650affa 100644 --- a/inc/extensions/ext-mediadata.php +++ b/inc/extensions/ext-mediadata.php @@ -148,7 +148,7 @@ if ((isset($dry_run)) && (isset($EXT_LOAD_MODE))) $EXT_LANG_PREFIX = "mediadata"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'Y'; +$EXT_ALWAYS_ACTIVE = "Y"; // ?> diff --git a/inc/extensions/ext-mods.php b/inc/extensions/ext-mods.php index fa49533ab5..f73e3f07c9 100644 --- a/inc/extensions/ext-mods.php +++ b/inc/extensions/ext-mods.php @@ -120,7 +120,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "mods"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-mydata.php b/inc/extensions/ext-mydata.php index 7d3234322e..ff1c8df7c4 100644 --- a/inc/extensions/ext-mydata.php +++ b/inc/extensions/ext-mydata.php @@ -171,7 +171,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "mydata"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php index 2a4339e951..d480fc3b56 100644 --- a/inc/extensions/ext-newsletter.php +++ b/inc/extensions/ext-newsletter.php @@ -184,7 +184,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "newsletter"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-nickname.php b/inc/extensions/ext-nickname.php index d1fdbe0824..bc46034173 100644 --- a/inc/extensions/ext-nickname.php +++ b/inc/extensions/ext-nickname.php @@ -56,7 +56,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('main', 'nickname', 'Nicknamen', '5', 'Y', 'Y')"; // Load CSS file? - $EXT_CSS = 'Y'; + $EXT_CSS = "Y"; break; case "remove": // Do stuff when removing extension @@ -191,7 +191,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "nickname"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php index 166d092177..c91f111249 100644 --- a/inc/extensions/ext-online.php +++ b/inc/extensions/ext-online.php @@ -119,7 +119,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "online"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-optimize.php b/inc/extensions/ext-optimize.php index 22be9792fa..cd4baf7485 100644 --- a/inc/extensions/ext-optimize.php +++ b/inc/extensions/ext-optimize.php @@ -118,7 +118,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "optimize"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'Y'; +$EXT_ALWAYS_ACTIVE = "Y"; // ?> diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php index aaa0982e29..1bd44a851a 100644 --- a/inc/extensions/ext-order.php +++ b/inc/extensions/ext-order.php @@ -319,7 +319,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "order"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-other.php b/inc/extensions/ext-other.php index 13aa9d1a57..5d5d443452 100644 --- a/inc/extensions/ext-other.php +++ b/inc/extensions/ext-other.php @@ -204,7 +204,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "other"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'Y'; +$EXT_ALWAYS_ACTIVE = "Y"; // ?> diff --git a/inc/extensions/ext-payout.php b/inc/extensions/ext-payout.php index dd71a78f98..8d2396d62c 100644 --- a/inc/extensions/ext-payout.php +++ b/inc/extensions/ext-payout.php @@ -246,7 +246,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "payout"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-profile.php b/inc/extensions/ext-profile.php index e77a7aa215..87ce68aa67 100644 --- a/inc/extensions/ext-profile.php +++ b/inc/extensions/ext-profile.php @@ -132,7 +132,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "profile"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php index b86cb15339..46065fd5bc 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -352,7 +352,7 @@ LIMIT 1", __FILE__, __LINE__); $EXT_LANG_PREFIX = "rallye"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php index faa89c02cf..caa401e3d0 100644 --- a/inc/extensions/ext-register.php +++ b/inc/extensions/ext-register.php @@ -54,7 +54,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm $SQLs[] = ""; // Load own CSS file? - $EXT_CSS = 'Y'; + $EXT_CSS = "Y"; break; case "remove": // Do stuff when removing extension @@ -333,7 +333,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "register"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-repair.php b/inc/extensions/ext-repair.php index f330a2b698..56f3b68563 100644 --- a/inc/extensions/ext-repair.php +++ b/inc/extensions/ext-repair.php @@ -120,7 +120,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "repair"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php index c38ca09194..6fa497c433 100644 --- a/inc/extensions/ext-rewrite.php +++ b/inc/extensions/ext-rewrite.php @@ -145,7 +145,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "rewrite"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index e71bf2c68a..b3ae87cc76 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -603,10 +603,10 @@ default: // Do stuff when extension is loaded } else { // Set some lame ;-) default settings $_CONFIG['def_refid'] = 0; - $_CONFIG['enable_title_deco'] = 'N'; - $_CONFIG['title_mod_show'] = 'Y'; + $_CONFIG['enable_title_deco'] = "N"; + $_CONFIG['title_mod_show'] = "Y"; $_CONFIG['title_middle'] = "-"; - //$_CONFIG['verbose_sql'] = 'N'; + //$_CONFIG['verbose_sql'] = "N"; define('MT_WORD' , DEFAULT_MT_WORD ); define('MT_WORD2', DEFAULT_MT_WORD2); define('POINTS' , DEFAULT_POINTS); @@ -621,7 +621,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "sql_patches"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'Y'; +$EXT_ALWAYS_ACTIVE = "Y"; // ?> \ No newline at end of file diff --git a/inc/extensions/ext-support.php b/inc/extensions/ext-support.php index 43c3936e12..3990dceb02 100644 --- a/inc/extensions/ext-support.php +++ b/inc/extensions/ext-support.php @@ -133,7 +133,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "support"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php index b3df4d9002..ae9fad6c36 100644 --- a/inc/extensions/ext-surfbar.php +++ b/inc/extensions/ext-surfbar.php @@ -81,7 +81,7 @@ INDEX(`url_id`) $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES('surfbar','config_surfbar','Einstellungen','Einstellungen an der Surfbar ändern, wie Festvergütung, prozentuale Ref-Vergütung und vieles mehr.',3)"; // Load CSS file? - $EXT_CSS = "Y"; + $EXT_CSS = "N"; break; case "remove": // Do stuff when removing extension @@ -94,12 +94,12 @@ case "remove": // Do stuff when removing extension case "activate": // Do stuff when admin activates this extension // SQL commands to run - $SQLs[] = "UPDATE `"._MYSQL_PREFIX."_member_menu` SET `visible` = 'Y'`, `locked` = 'N' WHERE `what` = 'surfbar' LIMIT 1"; + $SQLs[] = "UPDATE `"._MYSQL_PREFIX."_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='surfbar' LIMIT 1"; break; case "deactivate": // Do stuff when admin deactivates this extension // SQL commands to run - $SQLs[] = "UPDATE `"._MYSQL_PREFIX."_member_menu` SET `locked` = 'Y' WHERE `what` = 'surfbar' LIMIT 1"; + $SQLs[] = "UPDATE `"._MYSQL_PREFIX."_member_menu` SET `locked`='Y' WHERE `what` = 'surfbar' LIMIT 1"; break; case "update": // Update an extension @@ -125,7 +125,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "surfbar"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-task.php b/inc/extensions/ext-task.php index 18409b1c24..5fc2acf257 100644 --- a/inc/extensions/ext-task.php +++ b/inc/extensions/ext-task.php @@ -56,7 +56,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm $SQLs[] = "UPDATE "._MYSQL_PREFIX."_task_system SET status='SOLVED' WHERE status='CLOSED'"; // Enable CSS file? - $EXT_CSS = 'Y'; + $EXT_CSS = "Y"; break; case "remove": // Do stuff when removing extension @@ -249,7 +249,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "task"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-theme.php b/inc/extensions/ext-theme.php index 970fcef799..8c4e31d2ff 100644 --- a/inc/extensions/ext-theme.php +++ b/inc/extensions/ext-theme.php @@ -112,7 +112,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "theme"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-top10.php b/inc/extensions/ext-top10.php index 35c1590cbd..6fc5afdf5e 100644 --- a/inc/extensions/ext-top10.php +++ b/inc/extensions/ext-top10.php @@ -56,7 +56,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD top10_max tinyint(4) not null default '10'"; // Load CSS file? - $EXT_CSS = 'Y'; + $EXT_CSS = "Y"; break; case "remove": // Do stuff when removing extension @@ -152,7 +152,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "top10"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php index 3a56f2db75..9f984f1c1d 100644 --- a/inc/extensions/ext-transfer.php +++ b/inc/extensions/ext-transfer.php @@ -287,7 +287,7 @@ default: // Do stuff when extension is loaded $_CONFIG = array_merge($_CONFIG, $dummy); unset($dummy); - if ((defined('__DAILY_RESET')) && ($_CONFIG['ap_transfer'] == 'Y')) + if ((defined('__DAILY_RESET')) && ($_CONFIG['ap_transfer'] == "Y")) { // Automatically remove outdated or not displayed transactions TRANSFER_AUTPPURGE($_CONFIG['transfer_max'], $_CONFIG['transfer_age']); @@ -298,7 +298,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "transfer"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php index 17142d78a0..3dc9ad16cf 100644 --- a/inc/extensions/ext-user.php +++ b/inc/extensions/ext-user.php @@ -51,7 +51,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm $SQLs[] = ""; // Load CSS-File? - $EXT_CSS = 'Y'; + $EXT_CSS = "Y"; break; case "remove": // Do stuff when removing extension @@ -223,7 +223,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "user"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'Y'; +$EXT_ALWAYS_ACTIVE = "Y"; // ?> diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php index deec8c8624..64122957af 100644 --- a/inc/extensions/ext-wernis.php +++ b/inc/extensions/ext-wernis.php @@ -119,7 +119,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "wernis"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // Init array global $WERNIS; diff --git a/inc/extensions/ext-yoomedia.php b/inc/extensions/ext-yoomedia.php index 0df7477429..e5fa090db0 100644 --- a/inc/extensions/ext-yoomedia.php +++ b/inc/extensions/ext-yoomedia.php @@ -55,7 +55,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm $SQLs[] = ""; // Load CSS file? - $EXT_CSS = 'Y'; + $EXT_CSS = "N"; break; case "remove": // Do stuff when removing extension @@ -92,7 +92,7 @@ default: // Do stuff when extension is loaded $EXT_LANG_PREFIX = "yoomedia"; // Extension is always active? -$EXT_ALWAYS_ACTIVE = 'N'; +$EXT_ALWAYS_ACTIVE = "N"; // ?> diff --git a/inc/footer.php b/inc/footer.php index 47dbf47cfc..4811010521 100644 --- a/inc/footer.php +++ b/inc/footer.php @@ -53,7 +53,7 @@ if (($footer != "1") && ($footer != "2") && ($CSS != "1")) { } // Shall we display the parsing time and number of queries? - if ((isset($_CONFIG['show_timings'])) && ($_CONFIG['show_timings'] == 'Y')) { + if ((isset($_CONFIG['show_timings'])) && ($_CONFIG['show_timings'] == "Y")) { // Then display it here DISPLAY_PARSING_TIME_FOOTER(); } diff --git a/inc/functions.php b/inc/functions.php index 38b4f58b63..d94a0336fe 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -368,7 +368,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML='N', $FROM="") { } // Fix HTML parameter (default is no!) - if (empty($HTML)) $HTML = 'N'; + if (empty($HTML)) $HTML = "N"; if (isBooleanConstantAndTrue('DEBUG_MODE')) { // In debug mode we want to display the mail instead of sending it away so we can debug this part echo "
@@ -377,7 +377,7 @@ To      : ".$TO."
 Subject : ".$SUBJECT."
 Message : ".$MSG."
\n"; - } elseif (($HTML == 'Y') && (EXT_IS_ACTIVE("html_mail", true))) { + } elseif (($HTML == "Y") && (EXT_IS_ACTIVE("html_mail", true))) { // Send mail as HTML away SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM); } elseif (!empty($TO)) { @@ -386,7 +386,7 @@ Message : ".$MSG." // Send Mail away SEND_RAW_EMAIL($TO, COMPILE_CODE($SUBJECT), COMPILE_CODE($MSG), $FROM); - } elseif ($HTML == 'N') { + } elseif ($HTML == "N") { // Problem found! SEND_RAW_EMAIL(WEBMASTER, COMPILE_CODE($SUBJECT), COMPILE_CODE($MSG), $FROM); } @@ -684,7 +684,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") { // Keept for backward-compatiblity (please replace these variables against our new {--CONST--} syntax!) $MAIN_TITLE = MAIN_TITLE; $URL = URL; $WEBMASTER = WEBMASTER; - $surname = ""; $family = ""; $nick = ""; $sex = 'N'; + $surname = ""; $family = ""; $nick = ""; $sex = "N"; // Prepare IP number and User Agent $REMOTE_ADDR = getenv('REMOTE_ADDR'); @@ -822,7 +822,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") { } } else { // Neutral sex and email address is default - $sex = 'N'; + $sex = "N"; $email = WEBMASTER; } @@ -1162,10 +1162,10 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0") case "yn": $OUT .= "
LOAD_TEMPLATE("guest_content_footer"); diff --git a/inc/modules/login.php b/inc/modules/login.php index b692e3e2cf..f220ec106d 100644 --- a/inc/modules/login.php +++ b/inc/modules/login.php @@ -92,7 +92,7 @@ if (empty($GLOBALS['action'])) } // Add the member's menu here... -if (($_CONFIG['member_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true))) +if (($_CONFIG['member_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) { ADD_MENU("member", GET_ACTION("member", $GLOBALS['what']), $GLOBALS['what']); } @@ -100,7 +100,7 @@ if (($_CONFIG['member_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true))) OUTPUT_HTML(" "); -$INC_ACTION = sprintf(PATH."inc/modules/member/action-%s.php", $act); +$INC_ACTION = sprintf(."%sinc/modules/member/action-%s.php", PATH, $act); if ((file_exists($INC_ACTION)) && (is_readable($INC_ACTION)) && (VALIDATE_MENU_ACTION("member", GET_ACTION("member", $GLOBALS['what']), $GLOBALS['what']))) { // Requested module is available so we load it @@ -112,7 +112,7 @@ if ((file_exists($INC_ACTION)) && (is_readable($INC_ACTION)) && (VALIDATE_MENU_A LOAD_URL("modules.php?module=login"); } -if (($_CONFIG['member_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true))) +if (($_CONFIG['member_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) { OUTPUT_HTML("
diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php index 48fbd70980..8ddf806a42 100644 --- a/inc/modules/member/what-bonus.php +++ b/inc/modules/member/what-bonus.php @@ -55,11 +55,11 @@ if (GET_EXT_VERSION("bonus") >= "0.6.9") { // Add more bonus points here $USE = "(0"; - if ($_CONFIG['bonus_click_yn'] == 'Y') $USE .= " + turbo_bonus"; - if ($_CONFIG['bonus_login_yn'] == 'Y') $USE .= " + login_bonus"; - if ($_CONFIG['bonus_order_yn'] == 'Y') $USE .= " + bonus_order"; - if ($_CONFIG['bonus_stats_yn'] == 'Y') $USE .= " + bonus_stats"; - if ($_CONFIG['bonus_ref_yn'] == 'Y') $USE .= " + bonus_ref"; + if ($_CONFIG['bonus_click_yn'] == "Y") $USE .= " + turbo_bonus"; + if ($_CONFIG['bonus_login_yn'] == "Y") $USE .= " + login_bonus"; + if ($_CONFIG['bonus_order_yn'] == "Y") $USE .= " + bonus_order"; + if ($_CONFIG['bonus_stats_yn'] == "Y") $USE .= " + bonus_stats"; + if ($_CONFIG['bonus_ref_yn'] == "Y") $USE .= " + bonus_ref"; $USE .= ")"; } else diff --git a/inc/modules/member/what-categories.php b/inc/modules/member/what-categories.php index ec2a5d45fd..9a4473c541 100644 --- a/inc/modules/member/what-categories.php +++ b/inc/modules/member/what-categories.php @@ -60,7 +60,7 @@ if ($cats > 0) $cnt = 0; foreach ($_POST['cat'] as $cat=>$joined) { - if ($joined == 'N') $cnt++; + if ($joined == "N") $cnt++; } if (($cats - $cnt) < $_CONFIG['least_cats']) { diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php index 46d0028d3f..f2db3cf65d 100644 --- a/inc/modules/member/what-holiday.php +++ b/inc/modules/member/what-holiday.php @@ -159,7 +159,7 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__); list($active, $locked) = SQL_FETCHROW($result); SQL_FREERESULT($result); - if (($active == 'Y') && (($locked + $_CONFIG['holiday_lock']) < time())) + if (($active == "Y") && (($locked + $_CONFIG['holiday_lock']) < time())) { // Load data $result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM "._MYSQL_PREFIX."_user_holidays @@ -203,7 +203,7 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__); LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_CANNOT_DEACTIVATE); } } - elseif ($active == 'Y') + elseif ($active == "Y") { // To fast! LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_LOCKED); diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php index 0fe44b6a96..451a68e65a 100644 --- a/inc/modules/member/what-html_mail.php +++ b/inc/modules/member/what-html_mail.php @@ -66,7 +66,7 @@ if (isset($_POST['ok'])) list($mode) = SQL_FETCHROW($result); SQL_FREERESULT($result); - if ($mode == 'Y') + if ($mode == "Y") { define('HTML_Y', ' checked'); define('HTML_N', ""); diff --git a/inc/modules/member/what-newsletter.php b/inc/modules/member/what-newsletter.php index 20f9efed24..6d21c0c0aa 100644 --- a/inc/modules/member/what-newsletter.php +++ b/inc/modules/member/what-newsletter.php @@ -59,7 +59,7 @@ SQL_FREERESULT($result); // Remember charge value define('__CHARGE_VALUE', TRANSLATE_COMMA($_CONFIG['nl_charge'])); -if ((isset($_POST['ok'])) && ($status == 'Y') && ($span == "0")) +if ((isset($_POST['ok'])) && ($status == "Y") && ($span == "0")) { // Save request $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET nl_timespan='".(ONE_DAY * 30)."' WHERE userid=%d LIMIT 1", diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index 752a316304..9635d3d515 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -123,7 +123,7 @@ if (SQL_NUMROWS($result_p) > 0) if (!ereg(".", $TOTAL)) $TOTAL .= ".00000"; } -if (($HOLIDAY == 'Y') && (GET_EXT_VERSION("holiday") >= "0.1.3")) +if (($HOLIDAY == "Y") && (GET_EXT_VERSION("holiday") >= "0.1.3")) { // Holiday is active! SQL_FREERESULT($result_p); @@ -148,7 +148,7 @@ if (($HOLIDAY == 'Y') && (GET_EXT_VERSION("holiday") >= "0.1.3")) // No entry found, so we need to check out the stats table as well... :) // We have to add that suff here, now we continue WITHOUT checking and check the text and subject against some filters $URL = ""; - if ($_CONFIG['test_text'] == 'Y') + if ($_CONFIG['test_text'] == "Y") { // Test submitted text against some filters (length, URLs in text etc.) if ((strpos(strtolower($_POST['text']), "https://") > -1) || (strpos(strtolower($_POST['text']), "http://") > -1) || (strpos(strtolower($_POST['text']), "www") > -1)) @@ -164,7 +164,7 @@ if (($HOLIDAY == 'Y') && (GET_EXT_VERSION("holiday") >= "0.1.3")) } } // Shall I test the subject line against URLs? - if ($_CONFIG['test_subj'] == 'Y') + if ($_CONFIG['test_subj'] == "Y") { // Check the subject line for issues $_POST['subject'] = str_replace("\\", "[nl]", substr($_POST['subject'], 0, 200)); @@ -175,7 +175,7 @@ if (($HOLIDAY == 'Y') && (GET_EXT_VERSION("holiday") >= "0.1.3")) } } // And shall I check that his URL is not in the black list? - if ($_CONFIG['url_blacklist'] == 'Y') + if ($_CONFIG['url_blacklist'] == "Y") { // Ok, I do that for you know... $result = SQL_QUERY_ESC("SELECT timestamp FROM "._MYSQL_PREFIX."_url_blist WHERE url='%s' LIMIT 1", @@ -205,7 +205,7 @@ if (($HOLIDAY == 'Y') && (GET_EXT_VERSION("holiday") >= "0.1.3")) // Probe for HTML extension if ($HTML_EXT) { - if ($_POST['html'] == 'Y') + if ($_POST['html'] == "Y") { // Chek for valid HTML tags $_POST['text'] = HTML_CHECK_TAGS($_POST['text']); @@ -229,7 +229,7 @@ if (($HOLIDAY == 'Y') && (GET_EXT_VERSION("holiday") >= "0.1.3")) { // Check if category and number of receivers is okay $ADD = ""; - if (($_CONFIG['order_multi_page'] == 'Y') && (!empty($_POST['zip']))) $ADD = "AND d.zip LIKE '".bigintval($_POST['zip'])."{PER}'"; + if (($_CONFIG['order_multi_page'] == "Y") && (!empty($_POST['zip']))) $ADD = "AND d.zip LIKE '".bigintval($_POST['zip'])."{PER}'"; // Check for userids $result = SQL_QUERY_ESC("SELECT DISTINCT c.userid FROM "._MYSQL_PREFIX."_user_cats AS c @@ -468,7 +468,7 @@ array( // Enable HTML checking $HTML = ""; $HOLIDAY = false; $HOL_STRING = ""; - if (($HTML_EXT) && ($_POST['html'] == 'Y')) $HTML = " AND html='Y'"; + if (($HTML_EXT) && ($_POST['html'] == "Y")) $HTML = " AND html='Y'"; if (GET_EXT_VERSION("holiday") >= "0.1.3") { // Extension's version is fine @@ -515,7 +515,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__); $result_ver = SQL_QUERY_ESC("SELECT zip FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d".$HTML." AND receive_mails > 0 AND status='CONFIRMED' LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__); - if ((SQL_NUMROWS($result_ver) == 1) && (!empty($_POST['zip'])) && ($_CONFIG['order_multi_page'] == 'Y')) + if ((SQL_NUMROWS($result_ver) == 1) && (!empty($_POST['zip'])) && ($_CONFIG['order_multi_page'] == "Y")) { list($zip) = SQL_FETCHROW($result_ver); SQL_FREERESULT($result_ver); @@ -688,7 +688,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__); } // 01 2 21 12 2 23 443 3 3210 - if ((!empty($_POST['data'])) || (($_CONFIG['order_multi_page'] == 'N') && ((!IS_ADMIN()) && (!$HTML_EXT)))) + if ((!empty($_POST['data'])) || (($_CONFIG['order_multi_page'] == "N") && ((!IS_ADMIN()) && (!$HTML_EXT)))) { // Pre-output categories $CAT = ""; @@ -730,7 +730,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__); define('ZIP_OUTPUT', " "); } // HTML extension - if (($HTML_EXT) && ($_POST['html'] == 'Y')) + if (($HTML_EXT) && ($_POST['html'] == "Y")) { // Extension is active so output valid HTML tags define('MEMBER_HTML_EXTENSION', LOAD_TEMPLATE("member_order-html_ext", true, HTML_ADD_VALID_TAGS())); @@ -751,7 +751,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__); if ($HTML_EXT) { // Add some content when html extension is active - if (($_CONFIG['order_multi_page'] == 'Y') || (IS_ADMIN())) $ADD = " \n"; + if (($_CONFIG['order_multi_page'] == "Y") || (IS_ADMIN())) $ADD = " \n"; define('MEMBER_HTML_EXTENSION', LOAD_TEMPLATE("member_order-html_intro", true)); } else @@ -760,7 +760,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__); define('MEMBER_HTML_EXTENSION', ""); } // Do we want ZIP code or not? - if (($_CONFIG['order_multi_page'] == 'Y') || (IS_ADMIN())) + if (($_CONFIG['order_multi_page'] == "Y") || (IS_ADMIN())) { // Yes $content = array( diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php index c7eb1fbaf6..3ed797f332 100644 --- a/inc/modules/member/what-payout.php +++ b/inc/modules/member/what-payout.php @@ -109,7 +109,7 @@ ORDER BY p.payout_timestamp DESC", $status = "".$status.""; // Nothing entered must be secured in member/what-payputs.php ! - if ($allow == 'Y') + if ($allow == "Y") { // Banner/Textlink views/clicks request if (!empty($banner)) @@ -206,7 +206,7 @@ ORDER BY p.payout_timestamp DESC", } // Add entry to his tranfer history - if ($allow == 'Y') + if ($allow == "Y") { // Banner/textlink ordered $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_payouts (userid, payout_total, payout_id, payout_timestamp, status, target_url, link_text, banner_url) @@ -281,7 +281,7 @@ VALUES (0, 'NEW', 'PAYOUT_REQUEST', '[payout:] ".PAYOUT_REQUEST_ADMIN."', '%s', // Load template and output it LOAD_TEMPLATE("admin_settings_saved", false, PAYOUT_REQUEST_SENT); } - elseif ($allow == 'Y') + elseif ($allow == "Y") { // Generate banner order form LOAD_TEMPLATE("member_payout_form_banner"); diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php index 777498bb77..fe9402524a 100644 --- a/inc/modules/member/what-points.php +++ b/inc/modules/member/what-points.php @@ -140,7 +140,7 @@ define('__TLOCK_VALUE', TRANSLATE_COMMA($TLOCK)); if (GET_EXT_VERSION("bonus") < "0.4.4") $_CONFIG['bonus_active'] = "X"; // Display login bonus and turbo-click bonus -if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (EXT_IS_ACTIVE("bonus")) && ($_CONFIG['bonus_active'] == 'Y')) { +if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (EXT_IS_ACTIVE("bonus")) && ($_CONFIG['bonus_active'] == "Y")) { $ADD = ", 0, 0, 0"; if (GET_EXT_VERSION("bonus") >= "0.4.4") $ADD = ", bonus_ref, bonus_order, bonus_stats"; @@ -168,7 +168,7 @@ if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (EXT_IS_ACTIVE("bonus")) && ($_CONF // Output rows define('__SPECIAL_ROWS', LOAD_TEMPLATE("member_points_bonus_rows", true)); -} elseif ($_CONFIG['bonus_active'] == 'N') { +} elseif ($_CONFIG['bonus_active'] == "N") { // Bonus active rallye deactivated define('__SPECIAL_ROWS', LOAD_TEMPLATE("member_points_bonus_disabled", true)); } elseif ((IS_ADMIN()) && (GET_EXT_VERSION("bonus") < "0.2.2") && (EXT_IS_ACTIVE("bonus"))) { diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index 7e65b6fadb..a3193b89b3 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -57,7 +57,7 @@ $MODE = ""; if (!empty($_GET['mode'])) $MODE = $_GET['mode']; // Check for "faker" -if (($opt_in == 'N') && ($MODE == "new")) $MODE = ""; +if (($opt_in == "N") && ($MODE == "new")) $MODE = ""; switch ($MODE) { diff --git a/inc/modules/order.php b/inc/modules/order.php index 4b7259f2e1..f64f69be1d 100644 --- a/inc/modules/order.php +++ b/inc/modules/order.php @@ -58,7 +58,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) if (empty($URL)) { // Is the auto-send mechanism active or inactive? - if ($_CONFIG['autosend_active'] == 'Y') + if ($_CONFIG['autosend_active'] == "Y") { // Auto-send is active define('ADMIN_AUTOSEND', COMPILE_CODE(ADMIN_AUTOSEND_ACTIVE)); diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php index ed17e83ac9..d66358db40 100644 --- a/inc/monthly/monthly_beg.php +++ b/inc/monthly/monthly_beg.php @@ -61,7 +61,7 @@ if (($curr != $_CONFIG['beg_month']) && ($_CONFIG['beg_month'] > 0) && ($_CONFIG if (EXT_IS_ACTIVE("autopurge")) { // Use last online stamp only when autopurge for inactive members is activated - if (($_CONFIG['ap_in_since'] > 0) && ($_CONFIG['beg_active'] == 'Y')) + if (($_CONFIG['ap_in_since'] > 0) && ($_CONFIG['beg_active'] == "Y")) { // Okay, include last online timestamp $whereStatement1 = "AND last_online >="; diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php index e425c8f1ac..12da67f6b4 100644 --- a/inc/monthly/monthly_bonus.php +++ b/inc/monthly/monthly_bonus.php @@ -71,11 +71,11 @@ if (($curr != $_CONFIG['bonus_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS // Add more bonus points here $ADD = " AND (0"; - if ($_CONFIG['bonus_click_yn'] == 'Y') $ADD .= " + turbo_bonus"; - if ($_CONFIG['bonus_login_yn'] == 'Y') $ADD .= " + login_bonus"; - if ($_CONFIG['bonus_order_yn'] == 'Y') $ADD .= " + bonus_order"; - if ($_CONFIG['bonus_stats_yn'] == 'Y') $ADD .= " + bonus_stats"; - if ($_CONFIG['bonus_ref_yn'] == 'Y') $ADD .= " + bonus_ref"; + if ($_CONFIG['bonus_click_yn'] == "Y") $ADD .= " + turbo_bonus"; + if ($_CONFIG['bonus_login_yn'] == "Y") $ADD .= " + login_bonus"; + if ($_CONFIG['bonus_order_yn'] == "Y") $ADD .= " + bonus_order"; + if ($_CONFIG['bonus_stats_yn'] == "Y") $ADD .= " + bonus_stats"; + if ($_CONFIG['bonus_ref_yn'] == "Y") $ADD .= " + bonus_ref"; $ADD .= ") > 0"; // SQL string to check for accounts diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index b13ac029d3..ef2e46d8c7 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -101,7 +101,7 @@ function CHECK_MODULE($mod) { if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (!isBooleanConstantAndTrue('admin_registered'))) return "done"; // Check if cache is latest version - $locked = 'Y'; $hidden = 'N'; $admin = 'N'; $mem = 'N'; $found = false; + $locked = "Y"; $hidden = "N"; $admin = "N"; $mem = "N"; $found = false; if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($cacheArray['modules']['module'])) && (is_array($cacheArray['modules']['module']))) { // Is the module cached? if (isset($cacheArray['modules']['locked'][$mod_chk])) { @@ -132,16 +132,16 @@ function CHECK_MODULE($mod) { // Check returned values against current access permissions // // Admin access ----- Guest access ----- --- Guest or member? --- - if ((IS_ADMIN()) || (($locked == 'N') && ($admin == 'N') && (($mem == 'N') || (IS_LOGGED_IN())))) { + if ((IS_ADMIN()) || (($locked == "N") && ($admin == "N") && (($mem == "N") || (IS_LOGGED_IN())))) { // If you are admin you are welcome for everything! $ret = "done"; - } elseif ($locked == 'Y') { + } elseif ($locked == "Y") { // Module is locked $ret = "locked"; - } elseif (($mem == 'Y') && (!IS_LOGGED_IN())) { + } elseif (($mem == "Y") && (!IS_LOGGED_IN())) { // You have to login first! $ret = "mem_only"; - } elseif (($admin == 'Y') && (!IS_ADMIN())) { + } elseif (($admin == "Y") && (!IS_ADMIN())) { // Only the Admin is allowed to enter this module! $ret = "admin_only"; } @@ -267,7 +267,7 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true) { if ($return) { // Return title return $ret; - } elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && ($_CONFIG['youre_here'] == 'Y')) || ((IS_ADMIN()) && ($MOD_CHECK == "admin"))) { + } elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && ($_CONFIG['youre_here'] == "Y")) || ((IS_ADMIN()) && ($MOD_CHECK == "admin"))) { // Output HTML code $OUT = $prefix."".$ret."\n"; //* DEBUG: */ echo __LINE__."*".$type."/".$GLOBALS['what']."*
\n"; @@ -783,7 +783,7 @@ function SEND_MODE_MAILS($mod, $modes) // Load template $msg = LOAD_EMAIL_TEMPLATE("member_mydata_notify", $content, $GLOBALS['userid']); - if ($_CONFIG['admin_notify'] == 'Y') { + if ($_CONFIG['admin_notify'] == "Y") { // The admin needs to be notified about a profile change $msg_admin = "admin_mydata_notify"; $sub_adm = ADMIN_CHANGED_DATA; @@ -832,7 +832,7 @@ function SEND_MODE_MAILS($mod, $modes) } else { SEND_ADMIN_EMAILS($sub_adm, LOAD_EMAIL_TEMPLATE($msg_admin, $content, $GLOBALS['userid'])); } - } elseif ($_CONFIG['admin_notify'] == 'Y') { + } elseif ($_CONFIG['admin_notify'] == "Y") { // Cannot send mails to admin! $content = CANNOT_SEND_ADMIN_MAILS; } else { @@ -1173,7 +1173,7 @@ function UPDATE_ONLINE_LIST($SID, $mod, $act, $wht) if (!EXT_IS_ACTIVE("online", true)) return; // Initialize variables - $uid = "0"; $rid = "0"; $MEM = 'N'; $ADMIN = 'N'; + $uid = "0"; $rid = "0"; $MEM = "N"; $ADMIN = "N"; if (!empty($GLOBALS['userid'])) { // Update member status only when userid is valid @@ -1181,13 +1181,13 @@ function UPDATE_ONLINE_LIST($SID, $mod, $act, $wht) { // Is valid user $uid = $GLOBALS['userid']; - $MEM = 'Y'; + $MEM = "Y"; } } if (IS_ADMIN()) { // Is administrator - $ADMIN = 'Y'; + $ADMIN = "Y"; } if (isSessionVariableSet('refid')) { // Check cookie @@ -1566,13 +1566,13 @@ function MODULE_HAS_MENU($mod) if (isset($cacheArray['modules']['has_menu'][$mod])) { // Check module cache and count hit - if ($cacheArray['modules']['has_menu'][$mod] == 'Y') $ret = true; + if ($cacheArray['modules']['has_menu'][$mod] == "Y") $ret = true; $_CONFIG['cache_hits']++; } elseif (isset($cacheArray['extensions']['ext_menu'][$mod])) { // Check cache and count hit - if ($cacheArray['extensions']['ext_menu'][$mod] == 'Y') $ret = true; + if ($cacheArray['extensions']['ext_menu'][$mod] == "Y") $ret = true; $_CONFIG['cache_hits']++; } } @@ -1584,7 +1584,7 @@ function MODULE_HAS_MENU($mod) if (SQL_NUMROWS($result) == 1) { list($has_menu) = SQL_FETCHROW($result); - if ($has_menu == 'Y') $ret = true; + if ($has_menu == "Y") $ret = true; } // Free memory diff --git a/inc/pool-update.php b/inc/pool-update.php index 1c06e7fa6b..c110f34306 100644 --- a/inc/pool-update.php +++ b/inc/pool-update.php @@ -60,7 +60,7 @@ if (SQL_NUMROWS($result_main) > 0) while ($DATA = SQL_FETCHROW($result_main)) { // Check fetched data for HTML - $HTML = $DATA[10]; if ($HTML == $DATA[0]) $HTML = 'N'; + $HTML = $DATA[10]; if ($HTML == $DATA[0]) $HTML = "N"; // Compile URL and subject line $DATA[7] = COMPILE_CODE($DATA[7]); diff --git a/inc/profile-updte.php b/inc/profile-updte.php index 79aa02feaa..24b0319862 100644 --- a/inc/profile-updte.php +++ b/inc/profile-updte.php @@ -39,7 +39,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) require($INC); } -if (($_CONFIG['send_prof_update'] == 'Y') && ($_CONFIG['profile_update'] > 0) && ($_CONFIG['resend_profile_update'])) +if (($_CONFIG['send_prof_update'] == "Y") && ($_CONFIG['profile_update'] > 0) && ($_CONFIG['resend_profile_update'])) { // Ok, we shall send update notifications... $TIMEOUT = bigintval(time() - $_CONFIG['profile_update']); diff --git a/mailid_top.php b/mailid_top.php index a8501ad731..0731b9b531 100644 --- a/mailid_top.php +++ b/mailid_top.php @@ -100,7 +100,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install list($pool, $sender, $notify) = SQL_FETCHROW($result_mailid); // Correct notification switch in non-bonus mails - if (($notify != 'Y') && ($notify != 'N')) $notify = 'N'; + if (($notify != "Y") && ($notify != "N")) $notify = "N"; // Free some memory SQL_FREERESULT($result_mailid); @@ -212,7 +212,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install if (bigintval($_POST['gfx_check']) == $img_code) { // Right code entered add points and remove entry - if (($ref_pay > 0) && ($_CONFIG['allow_direct_pay'] == 'N')) + if (($ref_pay > 0) && ($_CONFIG['allow_direct_pay'] == "N")) { // Don't add points over the referral system $locked = true; @@ -237,10 +237,10 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (function_exists('BONUS_ADD_TURBO_POINTS'))) { // Is an active-rallye running and this is not a notification mail? - if (($_CONFIG['bonus_active'] == 'Y') && ($notify == 'N')) + if (($_CONFIG['bonus_active'] == "Y") && ($notify == "N")) { // Shall I exclude the webmaster's own userid from the active-rallye? - if (((($_CONFIG['bonus_uid'] == $url_uid) && ($_CONFIG['bonus_include_own'] == 'Y')) || ($_CONFIG['bonus_uid'] != $url_uid)) && ($_CONFIG['def_refid'] != $url_uid)) + if (((($_CONFIG['bonus_uid'] == $url_uid) && ($_CONFIG['bonus_include_own'] == "Y")) || ($_CONFIG['bonus_uid'] != $url_uid)) && ($_CONFIG['def_refid'] != $url_uid)) { // Add points and remember ranking are done in this function.... BONUS_ADD_TURBO_POINTS($DATA, $url_uid, $type); diff --git a/modules.php b/modules.php index e85392bba4..f8fbe88fb7 100644 --- a/modules.php +++ b/modules.php @@ -94,7 +94,7 @@ include (PATH."inc/header.php"); // Modules are by default not valid! $MOD_VALID = false; $check = "failed"; -if ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['maintenance'] == 'Y') && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin")) +if ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['maintenance'] == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin")) { // Maintain mode is active and you are no admin ADD_FATAL(LANG_DOWN_MAINTAINCE); diff --git a/templates/de/emails/admin/admin_reset_password.tpl b/templates/de/emails/admin/admin_reset_password.tpl new file mode 100644 index 0000000000..4508762049 --- /dev/null +++ b/templates/de/emails/admin/admin_reset_password.tpl @@ -0,0 +1,24 @@ +Hallo lieber Administrator, + +hier ist Ihr angefordeter Reset-Link, den Sie zum Zurücksetzen Ihres Administratorkennworts benötigen. + +------------------------------ +{!URL!}/modules.php?module=admin&reset_pass=1&hash=$content[hash] +------------------------------ + +Wenn Sie auf diesen Link klicken, ist Ihr Passwort noch nicht zurückgesetzt. Bitte geben Sie zur Bestätigung Ihr Loginname ein. Dann erst können Sie Ihr Passwort ändern. + +Hier ist Ihr Loginname: +$content[login] + +Sollten Sie dies nicht gewesen sein, so ignorieren Sie einfach diese Mail. Hier sind die IP-Nummer und Browserbezeichnung: +------------------------------ +IP-Nummer: $REMOTE_ADDR +------------------------------ +Browser: $HTTP_USER_AGENT +------------------------------ + +Mit freundlichem Gruss, + Ihr {!MAIN_TITLE!} Script + +{!URL!}/admin.php \ No newline at end of file diff --git a/templates/de/emails/header.tpl b/templates/de/emails/header.tpl index 88202616de..b265221b61 100644 --- a/templates/de/emails/header.tpl +++ b/templates/de/emails/header.tpl @@ -1,4 +1,4 @@ -X-Mailer: {!TITLE!} {!VERSION!} +X-Mailer: {!TITLE!} {!FULL_VERSION!} Errors-To: {!WEBMASTER!} X-Loop: {!WEBMASTER!} From: {!MAIN_TITLE!} <{!WEBMASTER!}> diff --git a/templates/de/html/admin/admin_add_points.tpl b/templates/de/html/admin/admin_add_points.tpl index 5d90196513..7a41031a96 100644 --- a/templates/de/html/admin/admin_add_points.tpl +++ b/templates/de/html/admin/admin_add_points.tpl @@ -9,7 +9,7 @@ - {--ADMIN_ADD_POINTS_TO_USER--}:
+ {--ADMIN_ADD_POINTS_TO_USER--}:
{!__USER_VALUE!} diff --git a/templates/de/html/admin/admin_add_rallye.tpl b/templates/de/html/admin/admin_add_rallye.tpl index 9ef6edc35f..d3b205353c 100644 --- a/templates/de/html/admin/admin_add_rallye.tpl +++ b/templates/de/html/admin/admin_add_rallye.tpl @@ -45,7 +45,7 @@ {--RALLYE_START_DAY--}:   {--_START_DAY--}. - {--_START_MONTH--}. {--_START_YEAR--}
+ {--_START_MONTH--}. {--_START_YEAR--}
{--_START_HOUR--}: {--_START_MIN--}: {--_START_SEC--} @@ -58,7 +58,7 @@ {--RALLYE_END_DAY--}:   {--_END_DAY--}. {--_END_MONTH--}. - {--_END_YEAR--}
+ {--_END_YEAR--}
{--_END_HOUR--}: {--_END_MIN--}: {--_END_SEC--} diff --git a/templates/de/html/admin/admin_add_sponsor_paytype.tpl b/templates/de/html/admin/admin_add_sponsor_paytype.tpl index 32682e8b79..8c75740c9b 100644 --- a/templates/de/html/admin/admin_add_sponsor_paytype.tpl +++ b/templates/de/html/admin/admin_add_sponsor_paytype.tpl @@ -7,13 +7,13 @@   - {--SPONSOR_PAYTYPE_NAME--}:
{--SPONSOR_PAYTYPE_NAME_HINT--} + {--SPONSOR_PAYTYPE_NAME--}:
{--SPONSOR_PAYTYPE_NAME_HINT--}     - {--SPONSOR_PAYTYPE_RATE--}:
{--SPONSOR_PAYTYPE_RATE_HINT--} + {--SPONSOR_PAYTYPE_RATE--}:
{--SPONSOR_PAYTYPE_RATE_HINT--}   @@ -40,11 +40,11 @@
- {--SPONSOR_ADD_PAYTYPES_NOTES--}:
-
- {--SPONSOR_PAYTYPE_NAME--}: {--SPONSOR_PAYTYPE_NAME_NOTE--}
- {--SPONSOR_PAYTYPE_RATE--}: {--SPONSOR_PAYTYPE_RATE_NOTE--}
- {--SPONSOR_PAYTYPE_MIN_COUNT--}: {--SPONSOR_PAYTYPE_MIN_COUNT_NOTE--}
- {--SPONSOR_PAYTYPE_CURRENCY--}: {--SPONSOR_PAYTYPE_CURRENCY_NOTE--}
+ {--SPONSOR_ADD_PAYTYPES_NOTES--}:
+
+ {--SPONSOR_PAYTYPE_NAME--}: {--SPONSOR_PAYTYPE_NAME_NOTE--}
+ {--SPONSOR_PAYTYPE_RATE--}: {--SPONSOR_PAYTYPE_RATE_NOTE--}
+ {--SPONSOR_PAYTYPE_MIN_COUNT--}: {--SPONSOR_PAYTYPE_MIN_COUNT_NOTE--}
+ {--SPONSOR_PAYTYPE_CURRENCY--}: {--SPONSOR_PAYTYPE_CURRENCY_NOTE--}
diff --git a/templates/de/html/admin/admin_admin_add.tpl b/templates/de/html/admin/admin_admin_add.tpl index c04eb323d7..9eac064beb 100644 --- a/templates/de/html/admin/admin_admin_add.tpl +++ b/templates/de/html/admin/admin_admin_add.tpl @@ -1,7 +1,5 @@ -
- + +
@@ -21,7 +19,7 @@ - @@ -32,7 +30,7 @@ - diff --git a/templates/de/html/admin/admin_admins_contact_form.tpl b/templates/de/html/admin/admin_admins_contact_form.tpl index d433495461..8a785dafbd 100644 --- a/templates/de/html/admin/admin_admins_contact_form.tpl +++ b/templates/de/html/admin/admin_admins_contact_form.tpl @@ -12,7 +12,7 @@ - diff --git a/templates/de/html/admin/admin_admins_contct_form.tpl b/templates/de/html/admin/admin_admins_contct_form.tpl index 923557be99..908317a858 100644 --- a/templates/de/html/admin/admin_admins_contct_form.tpl +++ b/templates/de/html/admin/admin_admins_contct_form.tpl @@ -12,7 +12,7 @@ - diff --git a/templates/de/html/admin/admin_admins_mails_edit_form.tpl b/templates/de/html/admin/admin_admins_mails_edit_form.tpl index e9c1d8fd0d..96dd9b877d 100644 --- a/templates/de/html/admin/admin_admins_mails_edit_form.tpl +++ b/templates/de/html/admin/admin_admins_mails_edit_form.tpl @@ -1,8 +1,8 @@ {--ADMINS_ADD_MORE_ADMINS--}: -
+
-
+
diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl index 6ea8cb6d20..efdf5313b4 100644 --- a/templates/de/html/admin/admin_config_beg.tpl +++ b/templates/de/html/admin/admin_config_beg.tpl @@ -77,7 +77,7 @@ @@ -109,7 +109,7 @@ @@ -131,7 +131,7 @@ @@ -149,7 +149,7 @@ @@ -160,7 +160,7 @@ @@ -171,7 +171,7 @@ diff --git a/templates/de/html/admin/admin_config_birthday.tpl b/templates/de/html/admin/admin_config_birthday.tpl index ad5cb57c5f..8c6daa2edd 100644 --- a/templates/de/html/admin/admin_config_birthday.tpl +++ b/templates/de/html/admin/admin_config_birthday.tpl @@ -10,7 +10,7 @@ - @@ -43,7 +43,7 @@ @@ -26,7 +26,7 @@  {--ADMIN_BONUS_INCLUDE_OWN--} @@ -41,7 +41,7 @@  {--ADMIN_BONUS_RALLYE_CLICK_INCLUDE--} @@ -56,7 +56,7 @@  {--ADMIN_BONUS_RALLYE_LOGIN_INCLUDE--} @@ -71,7 +71,7 @@  {--ADMIN_BONUS_RALLYE_ORDER_INCLUDE--} @@ -86,7 +86,7 @@  {--ADMIN_BONUS_RALLYE_STATS_INCLUDE--} @@ -101,7 +101,7 @@  {--ADMIN_BONUS_RALLYE_REF_INCLUDE--} @@ -183,8 +183,8 @@ @@ -287,7 +287,7 @@  {--ADMIN_BONUS_RALLYE_DI_NOTIFY--} @@ -299,7 +299,7 @@  {--ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY--} diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl index 3343638f00..dd6b39112b 100644 --- a/templates/de/html/admin/admin_config_doubler.tpl +++ b/templates/de/html/admin/admin_config_doubler.tpl @@ -90,7 +90,7 @@ @@ -101,7 +101,7 @@ @@ -112,7 +112,7 @@ @@ -154,11 +154,11 @@ diff --git a/templates/de/html/admin/admin_config_holiday.tpl b/templates/de/html/admin/admin_config_holiday.tpl index 57630c8201..6817d5972d 100644 --- a/templates/de/html/admin/admin_config_holiday.tpl +++ b/templates/de/html/admin/admin_config_holiday.tpl @@ -32,7 +32,7 @@ diff --git a/templates/de/html/admin/admin_config_home_settings_pro.tpl b/templates/de/html/admin/admin_config_home_settings_pro.tpl index 2072b66b58..80d4d908f4 100644 --- a/templates/de/html/admin/admin_config_home_settings_pro.tpl +++ b/templates/de/html/admin/admin_config_home_settings_pro.tpl @@ -5,7 +5,7 @@ class="admin_table dashed" width="510"> + {--ADMIN_EDIT_HOME_SETTINGS--} diff --git a/templates/de/html/admin/admin_config_mediadata.tpl b/templates/de/html/admin/admin_config_mediadata.tpl index 75bb4bd7df..f44dc230ba 100644 --- a/templates/de/html/admin/admin_config_mediadata.tpl +++ b/templates/de/html/admin/admin_config_mediadata.tpl @@ -45,6 +45,6 @@
  {--SELECT_WHAT_NAME--}:  {--__WHAT_SELECTION--}
+ 		{--__WHAT_SELECTION--}
({--CREATE_WHAT_FIRST--})		  
  {--SELECT_PARENT_MENU--}:  {--__ACTION_SELECTION--}
+ 		{--__ACTION_SELECTION--}
({--CREATE_ACTION_FIRST--})		  
 
{--ADMINS_ENTER_CONTACT_TEXT--}:
+ 		{--ADMINS_ENTER_CONTACT_TEXT--}:
 
{--ADMINS_ENTER_CONTACT_TEXT--}:
+ 		{--ADMINS_ENTER_CONTACT_TEXT--}:
 {--BEG_MODE_DIRECT--}
+ class="admin_normal" value="DIRECT"{--__BEG_MODE_DIRECT--}> {--BEG_MODE_DIRECT--}
   {--ADMIN_BEG_RALLYE_ACTIVE--}    {--YES--}
+ class="admin_normal" value="Y"{--__BEG_RALLYE_Y--}> {--YES--}
 {--NO--}
{--ADMIN_BEG_INCLUDE_OWN--}    {--YES--}
+ class="admin_normal" value="Y"{--__BEG_INCLUDE_OWN_Y--}> {--YES--}
 {--NO--}
   {--YES--}
+ class="admin_normal" value="Y"{--__BEG_ACTIVE_Y--}> {--YES--}
 {--NO--}
{--ADMIN_BEG_RAL_EN_NOTIFY--}    {--YES--}
+ class="admin_normal" value="Y"{--__BEG_RAL_EN_NOTIFY_Y--}> {--YES--}
 {--NO--}
{--ADMIN_BEG_RAL_DI_NOTIFY--}    {--YES--}
+ class="admin_normal" value="Y"{--__BEG_RAL_DI_NOTIFY_Y--}> {--YES--}
 {--NO--}
{--ADMIN_BEG_NEW_MEMBER_NOTIFY--}    {--YES--}
+ class="admin_normal" value="Y"{--__BEG_NEW_MEMBER_NOTIFY_Y--}> {--YES--}
 {--NO--}
 
{--ADMIN_BIRTHDAY_POINTS--}:
+ 		{--ADMIN_BIRTHDAY_POINTS--}:
({--ADMIN_BIRTHDAY_POINTS_NOTE--})		   {--ADMIN_BIRTHDAY_ONLY_ACTIVE--}    {--YES--}
+ class="admin_normal" value="Y"{--__BIRTHDAY_ACTIVE_Y--}> {--YES--}
 {--NO--}
 {--BIRTHDAY_MODE_DIRECT--}
+ name="birthday_mode" class="admin_normal" value="DIRECT"{--__BIRTHDAY_MODE_DIRECT--}> {--BIRTHDAY_MODE_DIRECT--}
      {--YES--}
+ name="bonus_active" class="admin_normal" value="Y"{--__BONUS_ACTIVE_Y--}> {--YES--}
 {--NO--}
   {--YES--}
+ name="bonus_include_own" class="admin_normal" value="Y"{--__BONUS_INCLUDE_OWN_Y--}> {--YES--}
 {--NO--}
   {--YES--}
+ name="bonus_click_yn" class="admin_normal" value="Y"{--__BONUS_CLICK_Y--}> {--YES--}
 {--NO--}
   {--YES--}
+ name="bonus_login_yn" class="admin_normal" value="Y"{--__BONUS_LOGIN_Y--}> {--YES--}
 {--NO--}
   {--YES--}
+ name="bonus_order_yn" class="admin_normal" value="Y"{--__BONUS_ORDER_Y--}> {--YES--}
 {--NO--}
   {--YES--}
+ name="bonus_stats_yn" class="admin_normal" value="Y"{--__BONUS_STATS_Y--}> {--YES--}
 {--NO--}
   {--YES--}
+ name="bonus_ref_yn" class="admin_normal" value="Y"{--__BONUS_REF_Y--}> {--YES--}
 {--NO--}
- {--ADMIN_BONUS_TURBO_RATES--}:
-
+ {--ADMIN_BONUS_TURBO_RATES--}:
+
    @@ -275,7 +275,7 @@  {--ADMIN_BONUS_RALLYE_EN_NOTIFY--}
    {--YES--}
+ name="bonus_en_notify" class="admin_normal" value="Y"{--__BONUS_EN_NOTIFY_Y--}> {--YES--}
 {--NO--}
   {--YES--}
+ name="bonus_di_notify" class="admin_normal" value="Y"{--__BONUS_DI_NOTIFY_Y--}> {--YES--}
 {--NO--}
   {--YES--}
+ name="bonus_new_mem_notify" class="admin_normal" value="Y"{--__BONUS_NEW_MEMBER_NOTIFY_Y--}> {--YES--}
 {--NO--}
{--ADMIN_DOUBLER_SENT_ALL--}:    {--YES--}
+ name="doubler_sent_all" class="admin_normal" value="Y"{!__DOUBLER_SENT_ALL_Y!}> {--YES--}
 {--NO--}
{--ADMIN_DOUBLER_JACKPOT--}:    {--YES--}
+ name="doubler_jackpot" class="admin_normal" value="Y"{!__DOUBLER_JACKPOT_Y!}> {--YES--}
 {--NO--}
{--ADMIN_DOUBLER_OWN--}:    {--YES--}
+ name="doubler_own" class="admin_normal" value="Y"{!__DOUBLER_OWN_Y!}> {--YES--}
 {--NO--}

+ name="doubler_send_mode" class="admin_normal" value="DIRECT"{!__DOUBLER_SEND_DIRECT!}>
  
+ name="doubler_send_mode" class="admin_normal" value="RESET"{!__DOUBLER_SEND_RESET!}>
  - {--HOLIDAY_ADMIN_MODE_RESET--}
+ {--HOLIDAY_ADMIN_MODE_RESET--}
{--HOLIDAY_ADMIN_MODE_DIRECT--}
- {--ADMIN_EDIT_HOME_SETTINGS--}
 
-
· {--ADMIN_MEDIADATA_MT_START_NOTE--}
-· {--ADMIN_MEDIADATA_MT_STAGE_NOTE--}
+
· {--ADMIN_MEDIADATA_MT_START_NOTE--}
+· {--ADMIN_MEDIADATA_MT_STAGE_NOTE--}
diff --git a/templates/de/html/admin/admin_config_other.tpl b/templates/de/html/admin/admin_config_other.tpl index 3b07d7d9d9..989f794117 100644 --- a/templates/de/html/admin/admin_config_other.tpl +++ b/templates/de/html/admin/admin_config_other.tpl @@ -138,7 +138,7 @@ {--ADMIN_OPTION_CSS_PHP--}:    {--ADMIN_CSS_PHP_DIRECT--}
+ value="DIRECT"{--_CFG_CSS_PHP_DIRECT--}> {--ADMIN_CSS_PHP_DIRECT--}
 {--ADMIN_CSS_PHP_FILE--}   @@ -153,7 +153,7 @@ {--ADMIN_OPTION_GUEST_MENU--}:    {--ADMIN_GUEST_MENU_ACTIVE--}
+ name="guest_menu" value="Y"{--_CFG_GUEST_MENU_ACTIVE--}> {--ADMIN_GUEST_MENU_ACTIVE--}
 {--ADMIN_GUEST_MENU_INACTIVE--}   @@ -168,7 +168,7 @@ {--ADMIN_OPTION_MEMBER_MENU--}:    {--ADMIN_MEMBER_MENU_ACTIVE--}
+ name="member_menu" value="Y"{--_CFG_MEMBER_MENU_ACTIVE--}> {--ADMIN_MEMBER_MENU_ACTIVE--}
 {--ADMIN_MEMBER_MENU_INACTIVE--}   @@ -183,7 +183,7 @@ {--ADMIN_OPTION_YOURE_HERE--}:    {--ADMIN_YOURE_HERE_ACTIVE--}
+ name="youre_here" value="Y"{--_CFG_YOURE_HERE_ACTIVE--}> {--ADMIN_YOURE_HERE_ACTIVE--}
 {--ADMIN_YOURE_HERE_INACTIVE--}   @@ -198,7 +198,7 @@ {--ADMIN_OPTION_SHOW_TIMINGS--}:   -  {--YES--}
+  {--YES--}
 {--NO--}   @@ -213,7 +213,7 @@ {--ADMIN_OPTION_MAILID_REDIRECT--}:    {--ADMIN_CONFIG_MAILID_REDIRECT_INDEX--}
+ name="mailid_error_redirect" value="INDEX"{--_CFG_MAILID_REDIRECT_INDEX--}> {--ADMIN_CONFIG_MAILID_REDIRECT_INDEX--}
 {--ADMIN_CONFIG_MAILID_REDIRECT_REJECT--}   diff --git a/templates/de/html/admin/admin_config_point_settings.tpl b/templates/de/html/admin/admin_config_point_settings.tpl index 4b4b45a669..5ad1f1468f 100644 --- a/templates/de/html/admin/admin_config_point_settings.tpl +++ b/templates/de/html/admin/admin_config_point_settings.tpl @@ -13,7 +13,7 @@ {--ADMIN_CONFIG_DIRECT_PAY--} {--ADMIN_CONFIG_POINTS_DIRECT--} 
+ name="allow_direct_pay" value="Y" class="admin_normal"{!__DIRECT_Y!}>
{--ADMIN_CONFIG_POINTS_MAILS--}  diff --git a/templates/de/html/admin/admin_config_sponsor.tpl b/templates/de/html/admin/admin_config_sponsor.tpl index d272dbe99a..45d25889b5 100644 --- a/templates/de/html/admin/admin_config_sponsor.tpl +++ b/templates/de/html/admin/admin_config_sponsor.tpl @@ -2,7 +2,7 @@ diff --git a/templates/de/html/admin/admin_config_stats.tpl b/templates/de/html/admin/admin_config_stats.tpl index e38bf275e3..d87f7adf4b 100644 --- a/templates/de/html/admin/admin_config_stats.tpl +++ b/templates/de/html/admin/admin_config_stats.tpl @@ -10,7 +10,7 @@ - - - - - diff --git a/templates/de/html/admin/admin_edit_admins.tpl b/templates/de/html/admin/admin_edit_admins.tpl index 95b9799940..a6db74d6ab 100644 --- a/templates/de/html/admin/admin_edit_admins.tpl +++ b/templates/de/html/admin/admin_edit_admins.tpl @@ -24,6 +24,6 @@
- {--ADMIN_CONFIG_SPONSOR_TITLE--} + {--ADMIN_CONFIG_SPONSOR_TITLE--}
 
 
{--ADMIN_GSTATS_MEMBERS--}:
+ 		{--ADMIN_GSTATS_MEMBERS--}:
({--ADMIN_GSTATS_MEMBERS_NOTE--})		    
{--ADMIN_GSTATS_MODULES--}:
+ 		{--ADMIN_GSTATS_MODULES--}:
({--ADMIN_GSTATS_MODULES_NOTE--})		    
{--ADMIN_GSTATS_INACTIVE--}:
+ 		{--ADMIN_GSTATS_INACTIVE--}:
({--ADMIN_GSTATS_INACTIVE_NOTE--})		    
{--ADMIN_TRANSFER_CODE--}:
+ 		{--ADMIN_TRANSFER_CODE--}:
({--ADMIN_TRANSFER_CODE_NOTE--})		  
{--ADMIN_CONTACT_USER--}:
+ 		{--ADMIN_CONTACT_USER--}:
$content[surname] $content[family] <$content[email]>
-
{--ADMIN_ADMINS_ACL_NOTE--}
-
+
{--ADMIN_ADMINS_ACL_NOTE--}
+
{--ADMIN_ADMINS_EDIT_NOTE--}
diff --git a/templates/de/html/admin/admin_edit_rallyes_row.tpl b/templates/de/html/admin/admin_edit_rallyes_row.tpl index 652a52da14..aa78fe7fd9 100644 --- a/templates/de/html/admin/admin_edit_rallyes_row.tpl +++ b/templates/de/html/admin/admin_edit_rallyes_row.tpl @@ -34,7 +34,7 @@ valign="top">{--RALLYE_START_DAY--}:   - $content[s_day]. $content[s_month]. $content[s_year]
+ $content[s_day]. $content[s_month]. $content[s_year]
$content[s_hour]: $content[s_min]: $content[s_sec] @@ -45,7 +45,7 @@ valign="top">{--RALLYE_END_DAY--}:   - $content[e_day]. $content[e_month]. $content[e_year]
+ $content[e_day]. $content[e_month]. $content[e_year]
$content[e_hour]: $content[e_min]: $content[e_sec] 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 9eeedbdd95..295e3f08e7 100644 --- a/templates/de/html/admin/admin_edit_sponsor_add_points.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_add_points.tpl @@ -3,8 +3,8 @@   - {--ADMIN_ADD_POINTS_TO_SPONSOR--}:
- {--__SPONSOR_VALUE--} + {--ADMIN_ADD_POINTS_TO_SPONSOR--}:
+ {--__SPONSOR_VALUE--}   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 721de01538..52371b8a1c 100644 --- a/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl @@ -3,8 +3,8 @@   - {--ADMIN_SUB_POINTS_FROM_SPONSOR--}:
- {--__SPONSOR_VALUE--} + {--ADMIN_SUB_POINTS_FROM_SPONSOR--}:
+ {--__SPONSOR_VALUE--}   diff --git a/templates/de/html/admin/admin_email_archiv_row.tpl b/templates/de/html/admin/admin_email_archiv_row.tpl index 5819f9a8dc..dec3b57402 100644 --- a/templates/de/html/admin/admin_email_archiv_row.tpl +++ b/templates/de/html/admin/admin_email_archiv_row.tpl @@ -1,12 +1,12 @@ {--EMAIL_SENDER--}:
+ align="center">{--EMAIL_SENDER--}:
$content[u_link] {--EMAIL_SUBJECT--}:
+ align="center">{--EMAIL_SUBJECT--}:
$content[subj] {--EMAIL_TEXT--}:
+ align="center">{--EMAIL_TEXT--}:
$content[text] @@ -15,10 +15,10 @@ - {--EMAIL_PAYMENT--}:
+ {--EMAIL_PAYMENT--}:
$content[pay] - {--EMAIL_CATEGORY--}:
+ {--EMAIL_CATEGORY--}:
$content[cat] @@ -26,14 +26,14 @@ - {--EMAIL_RECEIVERS--}:
+ {--EMAIL_RECEIVERS--}:
$content[sent] ({--EMAIL_RUIDS--}: $content[ruids]) - {--USERS_LINKS--}:
+ {--USERS_LINKS--}:
$content[unconfirmed] - {--EMAIL_POOL_TYPE--}:
+ {--EMAIL_POOL_TYPE--}:
$content[type] @@ -41,14 +41,14 @@ - {--EMAIL_TSEND--}:
+ {--EMAIL_TSEND--}:
$content[tsend] - {--EMAIL_URL--}:
+ {--EMAIL_URL--}:
{--EMAIL_URL_TEST--} - {--EMAIL_TIMESTAMP--}:
+ {--EMAIL_TIMESTAMP--}:
$content[stamp] diff --git a/templates/de/html/admin/admin_gmenu_status.tpl b/templates/de/html/admin/admin_gmenu_status.tpl index 1d24670136..76373b9ce1 100644 --- a/templates/de/html/admin/admin_gmenu_status.tpl +++ b/templates/de/html/admin/admin_gmenu_status.tpl @@ -7,8 +7,8 @@   - {--CHANGE_GUEST_MENU--}
-
+ {--CHANGE_GUEST_MENU--}
+
{--CHANGE_MENU_1--}{!__CHK_VALUE!}{--CHANGE_MENU_2--} diff --git a/templates/de/html/admin/admin_guest_add.tpl b/templates/de/html/admin/admin_guest_add.tpl index bf7ad93811..f7f9934e4e 100644 --- a/templates/de/html/admin/admin_guest_add.tpl +++ b/templates/de/html/admin/admin_guest_add.tpl @@ -1,7 +1,5 @@ -
- + +
@@ -21,7 +19,7 @@ - @@ -32,7 +30,7 @@ - diff --git a/templates/de/html/admin/admin_list_beg.tpl b/templates/de/html/admin/admin_list_beg.tpl index 9e1fabb89d..dc374f2639 100644 --- a/templates/de/html/admin/admin_list_beg.tpl +++ b/templates/de/html/admin/admin_list_beg.tpl @@ -26,7 +26,7 @@
  {--SELECT_WHAT_NAME--}:  {--__WHAT_SELECTION--}
+ 		{--__WHAT_SELECTION--}
({--CREATE_WHAT_FIRST--})		  
  {--SELECT_PARENT_MENU--}:  {--__ACTION_SELECTION--}
+ 		{--__ACTION_SELECTION--}
({--CREATE_ACTION_FIRST--})		  
-
{--ADMIN_BEG_WINNER_HIGLIGHTED--}
-
+
{--ADMIN_BEG_WINNER_HIGLIGHTED--}
+
{--ADMIN_BEG_TIMEOUT_1--} {!__AUTOPURGE_TIMEOUT!} {--ADMIN_BEG_TIMEOUT_2--}
diff --git a/templates/de/html/admin/admin_list_bonus.tpl b/templates/de/html/admin/admin_list_bonus.tpl index 82e35d7d6e..dc2b18fb34 100644 --- a/templates/de/html/admin/admin_list_bonus.tpl +++ b/templates/de/html/admin/admin_list_bonus.tpl @@ -26,7 +26,7 @@ -
{--ADMIN_BONUS_WINNER_HIGLIGHTED--}
-
+
{--ADMIN_BONUS_WINNER_HIGLIGHTED--}
+
{--ADMIN_BONUS_TIMEOUT_1--} {!__AUTOPURGE_TIMEOUT!} {--ADMIN_BONUS_TIMEOUT_2--}
diff --git a/templates/de/html/admin/admin_list_cats.tpl b/templates/de/html/admin/admin_list_cats.tpl index a91b4ed081..a515011ed2 100644 --- a/templates/de/html/admin/admin_list_cats.tpl +++ b/templates/de/html/admin/admin_list_cats.tpl @@ -9,7 +9,7 @@ {!__CATS_ROWS!} {--ADMIN_MEMBER_FUNCTIONS--}:
+ style="padding-top: 10px; padding-bottom: 10px">{--ADMIN_MEMBER_FUNCTIONS--}:
{!__MEMBER_LINKS!} diff --git a/templates/de/html/admin/admin_list_cats_404.tpl b/templates/de/html/admin/admin_list_cats_404.tpl index 7f9fa91612..b936c0f516 100644 --- a/templates/de/html/admin/admin_list_cats_404.tpl +++ b/templates/de/html/admin/admin_list_cats_404.tpl @@ -15,7 +15,7 @@   - {--ADMIN_MEMBER_FUNCTIONS--}:
+ {--ADMIN_MEMBER_FUNCTIONS--}:
{!__MEMBER_LINKS!} diff --git a/templates/de/html/admin/admin_list_links.tpl b/templates/de/html/admin/admin_list_links.tpl index caa59675f5..1ef17a5adf 100644 --- a/templates/de/html/admin/admin_list_links.tpl +++ b/templates/de/html/admin/admin_list_links.tpl @@ -9,7 +9,7 @@ {--__EMAIL_LIST--} - {--MEMBER_TOTAL_LINKS_1--}{--__NUMS_VALUE!}{--MEMBER_TOTAL_LINKS_2--}
+ {--MEMBER_TOTAL_LINKS_1--}{--__NUMS_VALUE!}{--MEMBER_TOTAL_LINKS_2--}
{--ADMIN_DEL_UNCONFIRMED_LINKS--} diff --git a/templates/de/html/admin/admin_list_payouts_banner.tpl b/templates/de/html/admin/admin_list_payouts_banner.tpl index 91646e8782..1f29edd2f2 100644 --- a/templates/de/html/admin/admin_list_payouts_banner.tpl +++ b/templates/de/html/admin/admin_list_payouts_banner.tpl @@ -1,11 +1,11 @@ {--PAYOUT_OPTIONAL_BANNER--}:  $content[banner] -
+
{--PAYOUT_ALTERNATE_TEXT--}:  $content[alt] -
-
+
+
{--PAYOUT_TARGET_URL--}:  $content[url] -
+
diff --git a/templates/de/html/admin/admin_list_payouts_txt.tpl b/templates/de/html/admin/admin_list_payouts_txt.tpl index 1d24fc1cd5..5b2b1a4402 100644 --- a/templates/de/html/admin/admin_list_payouts_txt.tpl +++ b/templates/de/html/admin/admin_list_payouts_txt.tpl @@ -1,8 +1,8 @@ {--PAYOUT_LINK_TEXT--}: -
+
$content[txt_link] -
-
+
+
{--PAYOUT_LINK_URL--}: -
+
$content[txt_url] diff --git a/templates/de/html/admin/admin_list_rallyes_row.tpl b/templates/de/html/admin/admin_list_rallyes_row.tpl index d8e4e1ee2d..c8ecd8694c 100644 --- a/templates/de/html/admin/admin_list_rallyes_row.tpl +++ b/templates/de/html/admin/admin_list_rallyes_row.tpl @@ -1,43 +1,43 @@ $content[select] - {--RALLYE_TITLE--}:
+ {--RALLYE_TITLE--}:
$content[title] - {--RALLYE_DESCR2--}:
+ {--RALLYE_DESCR2--}:
$content[descr] - {--RALLYE_ADMIN_ID--}:
+ {--RALLYE_ADMIN_ID--}:
$content[alogin] - {--RALLYE_TSTART--}:
+ {--RALLYE_TSTART--}:
$content[start_date] - {--RALLYE_TEND--}:
+ {--RALLYE_TEND--}:
$content[end_date] - {--RALLYE_TEMPLATE2--}:
+ {--RALLYE_TEMPLATE2--}:
$content[template] - {--RALLYE_AUTO_ADD--}:
+ {--RALLYE_AUTO_ADD--}:
$content[auto_lnk] - {--RALLYE_ACTIVE--}:
+ {--RALLYE_ACTIVE--}:
$content[active_lnk] - {--RALLYE_NOTIFY--}:
+ {--RALLYE_NOTIFY--}:
$content[notify_lnk] - {--RALLYE_NOTIFIED--}:
+ {--RALLYE_NOTIFIED--}:
$content[notified] {--RALLYE_ASSIGNED_PRICES--}:
+ colspan="3">{--RALLYE_ASSIGNED_PRICES--}:
$content[prices_cnt] - {--RALLYE_ASSIGNED_USERS--}:
+ {--RALLYE_ASSIGNED_USERS--}:
$content[joined] @@ -46,9 +46,9 @@ {--RALLYE_MIN_USERS_MINI--}:
+ colspan="3">{--RALLYE_MIN_USERS_MINI--}:
$content[min_users] - {--RALLYE_MIN_PRICES_MINI--}:
+ {--RALLYE_MIN_PRICES_MINI--}:
$content[min_prices] diff --git a/templates/de/html/admin/admin_list_sponsor_details.tpl b/templates/de/html/admin/admin_list_sponsor_details.tpl index be7b96c6de..577ba20b9b 100644 --- a/templates/de/html/admin/admin_list_sponsor_details.tpl +++ b/templates/de/html/admin/admin_list_sponsor_details.tpl @@ -64,7 +64,7 @@ {--SPONSOR_ENTER_URL--}:  -  [ {--EMAIL_URL_TEST--} ]  +  [ {--EMAIL_URL_TEST--} ]  @@ -81,11 +81,11 @@ {--SPONSOR_POINTS_AMOUNT--}:  -  [ {--__SPONSOR_AMOUNT--} ] +  [ {--__SPONSOR_AMOUNT--} ] {--SPONSOR_POINTS_USED--}:  -  [ {--__SPONSOR_USED--} ] +  [ {--__SPONSOR_USED--} ] @@ -114,7 +114,7 @@ {--SPONSOR_REFERRALS--}:  - [ {--__SPONSOR_REFS--} ] + [ {--__SPONSOR_REFS--} ] @@ -123,7 +123,7 @@
  •  [ {--ADMIN_SPONSOR_EDIT--} ]
  •  [ {--ADMIN_SPONSOR_DEL--} ]
  •  [ {--ADMIN_SPONSOR_LOCK--} ]
    • -
  •  [ {--ADMIN_LIST_SPONSOR_ORDERS--} ] ({--__SPONSOR_ORDERS--})
    • +
  •  [ {--ADMIN_LIST_SPONSOR_ORDERS--} ] ({--__SPONSOR_ORDERS--})
    • diff --git a/templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl b/templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl index 0832bb27a5..438c7e507f 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl @@ -1,6 +1,6 @@ - $content[id] + $content[id] diff --git a/templates/de/html/admin/admin_list_sponsor_row.tpl b/templates/de/html/admin/admin_list_sponsor_row.tpl index b9821c4f46..a0e44227c5 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[salut] $content[sname] $content[fname] - [ $content[points] ] + [ $content[points] ] @@ -24,7 +24,7 @@ - [ $content[status] ] + [ $content[status] ] $content[created] diff --git a/templates/de/html/admin/admin_list_unconfirmed.tpl b/templates/de/html/admin/admin_list_unconfirmed.tpl index c86edfba81..f0c02dcf95 100644 --- a/templates/de/html/admin/admin_list_unconfirmed.tpl +++ b/templates/de/html/admin/admin_list_unconfirmed.tpl @@ -2,26 +2,26 @@ class="admin_table dashed"> - {--EMAIL_SENDER--}:
    + {--EMAIL_SENDER--}:
    {--__LIST_UNCON_SENDER--} - {--EMAIL_SUBJECT--}:
    + {--EMAIL_SUBJECT--}:
    {--__LIST_UNCON_SUBJECT--} - {--EMAIL_URL--}:
    + {--EMAIL_URL--}:
    {--EMAIL_URL_TEST--} - {--EMAIL_TIMESTAMP--}:
    + {--EMAIL_TIMESTAMP--}:
    {--__LIST_UNCON_STAMP--} - {--EMAIL_TEXT--}:
    + {--EMAIL_TEXT--}:
    {--__LIST_UNCON_TEXT--} - {--USERS_LINKS--}:
    + {--USERS_LINKS--}:
    {--__LIST_UNCO_UNCONFIRMED--} diff --git a/templates/de/html/admin/admin_logout.tpl b/templates/de/html/admin/admin_logout.tpl index 5fc4e93010..2bc9ba4a3f 100644 --- a/templates/de/html/admin/admin_logout.tpl +++ b/templates/de/html/admin/admin_logout.tpl @@ -4,12 +4,12 @@   - {--ADMIN_LOGOUT_DONE--}
    -
    + {--ADMIN_LOGOUT_DONE--}
    +
    {--ADMIN_RELOGIN_LINK--}
    -
    - {--ADMIN_BACK_TO_GUEST_MENU--}
    + href="{!URL!}/modules.php?module=admin&action=login">{--ADMIN_RELOGIN_LINK--}
    +
    + {--ADMIN_BACK_TO_GUEST_MENU--}
    diff --git a/templates/de/html/admin/admin_logout_sql_patches.tpl b/templates/de/html/admin/admin_logout_sql_patches.tpl index 83c5ccfaa2..1c4c067e28 100644 --- a/templates/de/html/admin/admin_logout_sql_patches.tpl +++ b/templates/de/html/admin/admin_logout_sql_patches.tpl @@ -4,11 +4,11 @@   - {--ADMIN_LOGOUT_SQL_PATCHES_DONE--}
    -
    - {--ADMIN_RELOGIN_LINK--}
    -
    - {--ADMIN_BACK_TO_GUEST_MENU--}
    + {--ADMIN_LOGOUT_SQL_PATCHES_DONE--}
    +
    + {--ADMIN_RELOGIN_LINK--}
    +
    + {--ADMIN_BACK_TO_GUEST_MENU--}
    diff --git a/templates/de/html/admin/admin_member_add.tpl b/templates/de/html/admin/admin_member_add.tpl index 656f2b7e5d..0a4fef5d88 100644 --- a/templates/de/html/admin/admin_member_add.tpl +++ b/templates/de/html/admin/admin_member_add.tpl @@ -1,7 +1,5 @@ - - + +
    @@ -21,7 +19,7 @@ - @@ -32,7 +30,7 @@ - diff --git a/templates/de/html/admin/admin_menu_failed.tpl b/templates/de/html/admin/admin_menu_failed.tpl index 3ec973f117..015ea69ea1 100644 --- a/templates/de/html/admin/admin_menu_failed.tpl +++ b/templates/de/html/admin/admin_menu_failed.tpl @@ -1,5 +1,5 @@ -
    -
    +
    +
      {--SELECT_WHAT_NAME--}:  {--__WHAT_SELECTION--}
    +     		{--__WHAT_SELECTION--}
    ({--CREATE_WHAT_FIRST--})    		  
      {--SELECT_PARENT_MENU--}:  {--__ACTION_SELECTION--}
    +     		{--__ACTION_SELECTION--}
    ({--CREATE_ACTION_FIRST--})    		  
    diff --git a/templates/de/html/admin/admin_mini_online.tpl b/templates/de/html/admin/admin_mini_online.tpl index 0b5279d43f..be775baf0e 100644 --- a/templates/de/html/admin/admin_mini_online.tpl +++ b/templates/de/html/admin/admin_mini_online.tpl @@ -1,5 +1,4 @@ -
    +
    @@ -21,4 +20,3 @@
    {--USER_NOW_ONLINE--}{!_ADMINS_ONLINE!}
    -
    \ No newline at end of file diff --git a/templates/de/html/admin/admin_mmenu_status.tpl b/templates/de/html/admin/admin_mmenu_status.tpl index 9dfced1c5b..866aa3a1ee 100644 --- a/templates/de/html/admin/admin_mmenu_status.tpl +++ b/templates/de/html/admin/admin_mmenu_status.tpl @@ -7,8 +7,8 @@   - {--CHANGE_MEMBER_MENU--}
    -
    + {--CHANGE_MEMBER_MENU--}
    +
    {--CHANGE_MENU_1--}{!__CHK_VALUE!}{--CHANGE_MENU_2--} diff --git a/templates/de/html/admin/admin_optimize.tpl b/templates/de/html/admin/admin_optimize.tpl index af70a1fecd..4dd5a9a98f 100644 --- a/templates/de/html/admin/admin_optimize.tpl +++ b/templates/de/html/admin/admin_optimize.tpl @@ -12,15 +12,15 @@ - {--OPTIMIZE_DB_TOTAL_TABLES--}: {!__TOTAL_TABS!}
    + {--OPTIMIZE_DB_TOTAL_TABLES--}: {!__TOTAL_TABS!}
    {--OPTIMIZE_DB_TOTAL_SIZE--}: {!__TOTAL_SIZE!} - {--KBYTES--}
    - {--OPTIMIZE_DB_TOTAL_OPTIMIZE--}: {!__TOTAL_CALLS!}
    + {--KBYTES--}
    + {--OPTIMIZE_DB_TOTAL_OPTIMIZE--}: {!__TOTAL_CALLS!}
    {--OPTIMIZE_DB_TOTAL_OPTI--}: {!__TOTAL_OPTIMIZED!} - {--KBYTES--}
    - {--OPTIMIZE_DB_TOTAL_GAIN_TABLES--}: {!__NOW_OPTIMIZED!}
    + {--KBYTES--}
    + {--OPTIMIZE_DB_TOTAL_GAIN_TABLES--}: {!__NOW_OPTIMIZED!}
    {--OPTIMIZE_DB_TOTAL_GAIN_SIZE--}: {!__NOW_SAVED!} - {--KBYTES--}
    + {--KBYTES--}
    diff --git a/templates/de/html/admin/admin_payout_accept_form.tpl b/templates/de/html/admin/admin_payout_accept_form.tpl index 958e9b3a49..603bf31e5d 100644 --- a/templates/de/html/admin/admin_payout_accept_form.tpl +++ b/templates/de/html/admin/admin_payout_accept_form.tpl @@ -11,7 +11,7 @@   - {--PAYOUT_RECEIVER_ACCEPT--}:
    + {--PAYOUT_RECEIVER_ACCEPT--}:
    {--PAYOUT_USERDATA_VALUE!} @@ -21,7 +21,7 @@   - {--PAYOUT_OPTIONAL_TEXT--}:
    + {--PAYOUT_OPTIONAL_TEXT--}:
    diff --git a/templates/de/html/admin/admin_payout_add_new.tpl b/templates/de/html/admin/admin_payout_add_new.tpl index 537bacedd8..7c794e92e7 100644 --- a/templates/de/html/admin/admin_payout_add_new.tpl +++ b/templates/de/html/admin/admin_payout_add_new.tpl @@ -4,7 +4,7 @@ class="admin_table dashed" align="center"> - {--ADMIN_PAYOUT_ADD_NEW_TITLE--}:
    + {--ADMIN_PAYOUT_ADD_NEW_TITLE--}:
    ({--ADMIN_PAYOUT_ADD_NEW_NOTE--}) diff --git a/templates/de/html/admin/admin_payout_overview_form.tpl b/templates/de/html/admin/admin_payout_overview_form.tpl index 790704834a..2a67f66294 100644 --- a/templates/de/html/admin/admin_payout_overview_form.tpl +++ b/templates/de/html/admin/admin_payout_overview_form.tpl @@ -2,7 +2,7 @@ action="{!URL!}/modules.php?module=admin&what=list_payouts&do=accept&pid=$content[pid]&task=$content[tid]" method="POST"> -
    +
      - {--PAYOUT_RECEIVER_REJECT--}:
    + {--PAYOUT_RECEIVER_REJECT--}:
    {--PAYOUT_USERDATA_VALUE!} @@ -21,7 +21,7 @@   - {--PAYOUT_OPTIONAL_TEXT--}:
    + {--PAYOUT_OPTIONAL_TEXT--}:
    diff --git a/templates/de/html/admin/admin_reset_pass_done.tpl b/templates/de/html/admin/admin_reset_pass_done.tpl new file mode 100644 index 0000000000..289a8f1c60 --- /dev/null +++ b/templates/de/html/admin/admin_reset_pass_done.tpl @@ -0,0 +1,18 @@ +
    + + + + + + + + + + +
    + {--ADMIN_RESET_PASS_DONE_TITLE--} +
    + $content +
    + {--ADMIN_CONTINUE_LOGIN--} +
    diff --git a/templates/de/html/admin/admin_reset_password.tpl b/templates/de/html/admin/admin_reset_password.tpl new file mode 100644 index 0000000000..baa7e5edc2 --- /dev/null +++ b/templates/de/html/admin/admin_reset_password.tpl @@ -0,0 +1,28 @@ +
    + + + + + + + + + + + + +
    + {--ADMIN_RESET_PASSWORD_TITLE--} +
    + {--ADMIN_ENTER_EMAIL--} + + +
    +  * + +
    +
    + +
    + {--ADMIN_RESET_PASSWORD_NOTE--} +
    diff --git a/templates/de/html/admin/admin_reset_password_form.tpl b/templates/de/html/admin/admin_reset_password_form.tpl new file mode 100644 index 0000000000..14bdc161ed --- /dev/null +++ b/templates/de/html/admin/admin_reset_password_form.tpl @@ -0,0 +1,47 @@ +
    +
    + + + + + + + + + + + + + + + + + + + +
    + {--ADMIN_RESET_PASSWORD_TITLE--} +
    + {--ADMIN_SHOW_LOGIN--} + + $content[login]
    + [{--ADMIN_CHANGE_LOGIN--}] +
    + {--ADMIN_ENTER_PASSWORD1--} + + +
    + {--ADMIN_ENTER_PASSWORD2--} + + +
    + + +  * + +
    +
    + +
    + {--ADMIN_RESET_PASSWORD_NOTE--} +
    diff --git a/templates/de/html/admin/admin_send_bonus_select.tpl b/templates/de/html/admin/admin_send_bonus_select.tpl index 4dd17b8f5f..4d491c765f 100644 --- a/templates/de/html/admin/admin_send_bonus_select.tpl +++ b/templates/de/html/admin/admin_send_bonus_select.tpl @@ -6,15 +6,15 @@ · {--ADMIN_SEND_BONUS_NORMAL--}
    -
    + href="{!URL!}/modules.php?module=admin&what=send_bonus&mode=normal">{--ADMIN_SEND_BONUS_NORMAL--}
    +
    {--ADMIN_SEND_BONUS_NORMAL_NOTES--} · {--ADMIN_SEND_BONUS_HTML--}
    -
    + href="{!URL!}/modules.php?module=admin&what=send_bonus&mode=html">{--ADMIN_SEND_BONUS_HTML--}
    +
    {--ADMIN_SEND_BONUS_HTML_NOTES--} diff --git a/templates/de/html/admin/admin_send_reset_link.tpl b/templates/de/html/admin/admin_send_reset_link.tpl new file mode 100644 index 0000000000..03cd5aeb2a --- /dev/null +++ b/templates/de/html/admin/admin_send_reset_link.tpl @@ -0,0 +1,28 @@ +
    +
    + + + + + + + + + + + +
    + {--ADMIN_SEND_RESET_LINK_TITLE--} +
    + {--ADMIN_ENTER_EMAIL--} + + +
    +  * + +
    +
    + +
    + {--ADMIN_SEND_RESET_LINK_NOTE--} +
    diff --git a/templates/de/html/admin/admin_sponsor_paytypes.tpl b/templates/de/html/admin/admin_sponsor_paytypes.tpl index b893dd1318..8920cfbf26 100644 --- a/templates/de/html/admin/admin_sponsor_paytypes.tpl +++ b/templates/de/html/admin/admin_sponsor_paytypes.tpl @@ -1,5 +1,5 @@
    - {--__LIST_CONTENT--}
    -
    + {--__LIST_CONTENT--}
    +
    {--__ADD_CONTENT--}
    \ No newline at end of file diff --git a/templates/de/html/admin/admin_sub_points.tpl b/templates/de/html/admin/admin_sub_points.tpl index 8f8c45dc48..fc631bc9cc 100644 --- a/templates/de/html/admin/admin_sub_points.tpl +++ b/templates/de/html/admin/admin_sub_points.tpl @@ -8,7 +8,7 @@ - {--ADMIN_SUB_POINTS_FROM_USER--}:
    + {--ADMIN_SUB_POINTS_FROM_USER--}:
    {!__USER_VALUE!} diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl index 339b342cbc..a33f77d44f 100644 --- a/templates/de/html/admin/admin_user_details.tpl +++ b/templates/de/html/admin/admin_user_details.tpl @@ -6,80 +6,80 @@ $content - {--SEX--}:
    + {--SEX--}:
    $DATA[0] - {--SURNAME--}:
    + {--SURNAME--}:
    $DATA[1] - {--FAMILY_NAME--}:
    + {--FAMILY_NAME--}:
    $DATA[2] - {--STREET_NR--}:
    + {--STREET_NR--}:
    $DATA[3] - {--BIRTHDAY2--}:
    + {--BIRTHDAY2--}:
    {!_BIRTHDAY!} - {--COUNTRY--}:
    + {--COUNTRY--}:
    $DATA[6] - {--ZIP--}:
    + {--ZIP--}:
    $DATA[4] - {--CITY--}:
    + {--CITY--}:
    $DATA[5] - {--ADDY--}:
    + {--ADDY--}:
    $DATA[7] - {--ACCOUNT_STATUS--}:
    + {--ACCOUNT_STATUS--}:
    $DATA[14] - {--RECEIVE_MAILS--}:
    + {--RECEIVE_MAILS--}:
    $DATA[12] - {--MAX_PER_DAY--}:
    + {--MAX_PER_DAY--}:
    $DATA[11] - {--REF_UID--}:
    + {--REF_UID--}:
    $DATA[13] - {--REF_CLICKS--}:
    + {--REF_CLICKS--}:
    $DATA[18] - {--TOTAL_LOGINS--}:
    + {--TOTAL_LOGINS--}:
    $DATA[19] - {--REMOTE_IP--}:
    + {--REMOTE_IP--}:
    $DATA[15] - {--ADMIN_LAST_ONLINE--}:
    + {--ADMIN_LAST_ONLINE--}:
    $DATA[16] - {--ADMIN_LAST_MODULE--}:
    + {--ADMIN_LAST_MODULE--}:
    $DATA[17] - {--HAS_JOINED--}:
    + {--HAS_JOINED--}:
    $DATA[22] - {--MAILS_SENT--}:
    + {--MAILS_SENT--}:
    $DATA[21] - {--USED_POINTS--}:
    + {--USED_POINTS--}:
    $DATA[20] - {--TOTAL_POINTS--}:
    + {--TOTAL_POINTS--}:
    $DATA[total] - {--TOTAL_REFERRALS--}:
    + {--TOTAL_REFERRALS--}:
    {!_REFS!} - {--TOTAL_CATS--}:
    + {--TOTAL_CATS--}:
    {!_CATS!} - {--UNCONFIRMED_LINKS--}:
    + {--UNCONFIRMED_LINKS--}:
    {!_LINKS!} - {--LOCKED_POINTS--}:
    + {--LOCKED_POINTS--}:
    $DATA[locked] - {--LAST_UPDATE--}:
    + {--LAST_UPDATE--}:
    $DATA[23] - {--LAST_PROFILE_SENT--}:
    + {--LAST_PROFILE_SENT--}:
    $DATA[24] - {--USER_REF_PAYOUT--}:
    + {--USER_REF_PAYOUT--}:
    $DATA[26] - {--USER_NICKNAME--}:
    + {--USER_NICKNAME--}:
    $DATA[27] - {--ADMIN_MEMBER_FUNCTIONS--}:
    + {--ADMIN_MEMBER_FUNCTIONS--}:
    {!_ADMIN_LINKS!} \ No newline at end of file diff --git a/templates/de/html/admin/admin_validate_reset_hash_form.tpl b/templates/de/html/admin/admin_validate_reset_hash_form.tpl new file mode 100644 index 0000000000..ce61ff14ad --- /dev/null +++ b/templates/de/html/admin/admin_validate_reset_hash_form.tpl @@ -0,0 +1,29 @@ +
    +
    + + + + + + + + + + + +
    + {--ADMIN_VALIDATE_HASH_TITLE--} +
    + {--ADMIN_ENTER_LOGIN--} + + +
    + +  * + +
    +
    + +
    + {--ADMIN_VALIDATE_HASH_NOTE--} +
    diff --git a/templates/de/html/admin/admin_welcome.tpl b/templates/de/html/admin/admin_welcome.tpl index 852fdb79da..d7da82ff7d 100644 --- a/templates/de/html/admin/admin_welcome.tpl +++ b/templates/de/html/admin/admin_welcome.tpl @@ -1,5 +1,5 @@ : : : Willkommen zum Administrationsbereich : : : -
    +
    diff --git a/templates/de/html/admin/admin_welcome_admins.tpl b/templates/de/html/admin/admin_welcome_admins.tpl index e4b93ad854..86ee23a840 100644 --- a/templates/de/html/admin/admin_welcome_admins.tpl +++ b/templates/de/html/admin/admin_welcome_admins.tpl @@ -1,5 +1,5 @@ : : : Willkommen zum Administrationsbereich : : : -
    +
    -- 2.39.2