Password reset for admin login added (still buggy if cache is installed and sql_patch...
authorRoland Häder <roland@mxchange.org>
Sat, 30 Aug 2008 20:40:26 +0000 (20:40 +0000)
committerRoland Häder <roland@mxchange.org>
Sat, 30 Aug 2008 20:40:26 +0000 (20:40 +0000)
168 files changed:
.gitattributes
beg.php
birthday_confirm.php
inc/autopurge.php
inc/doubler_send.php
inc/extensions.php
inc/extensions/ext-active.php
inc/extensions/ext-admins.php
inc/extensions/ext-admintheme1.php
inc/extensions/ext-admintheme_default.php
inc/extensions/ext-autopurge.php
inc/extensions/ext-bank.php
inc/extensions/ext-beg.php
inc/extensions/ext-birthday.php
inc/extensions/ext-bonus.php
inc/extensions/ext-country.php
inc/extensions/ext-demo.php
inc/extensions/ext-doubler.php
inc/extensions/ext-holiday.php
inc/extensions/ext-html_mail.php
inc/extensions/ext-mailid.php
inc/extensions/ext-maintenance.php
inc/extensions/ext-mediadata.php
inc/extensions/ext-mods.php
inc/extensions/ext-mydata.php
inc/extensions/ext-newsletter.php
inc/extensions/ext-nickname.php
inc/extensions/ext-online.php
inc/extensions/ext-optimize.php
inc/extensions/ext-order.php
inc/extensions/ext-other.php
inc/extensions/ext-payout.php
inc/extensions/ext-profile.php
inc/extensions/ext-rallye.php
inc/extensions/ext-register.php
inc/extensions/ext-repair.php
inc/extensions/ext-rewrite.php
inc/extensions/ext-sql_patches.php
inc/extensions/ext-support.php
inc/extensions/ext-surfbar.php
inc/extensions/ext-task.php
inc/extensions/ext-theme.php
inc/extensions/ext-top10.php
inc/extensions/ext-transfer.php
inc/extensions/ext-user.php
inc/extensions/ext-wernis.php
inc/extensions/ext-yoomedia.php
inc/footer.php
inc/functions.php
inc/header.php
inc/language/de.php
inc/libs/bonus_functions.php
inc/libs/doubler_functions.php
inc/libs/newsletter_functions.php
inc/libs/rallye_functions.php
inc/libs/register_functions.php
inc/libs/task_functions.php
inc/load_cache.php
inc/load_extensions.php
inc/mails/beg_mails.php
inc/mails/birthday_mails.php
inc/mails/bonus_mails.php
inc/modules/admin.php
inc/modules/admin/admin-inc.php
inc/modules/admin/overview-inc.php
inc/modules/admin/what-config_autopurge.php
inc/modules/admin/what-config_beg.php
inc/modules/admin/what-config_bonus.php
inc/modules/admin/what-config_cache.php
inc/modules/admin/what-config_order.php
inc/modules/admin/what-config_other.php
inc/modules/admin/what-config_rallye_prices.php
inc/modules/admin/what-config_rewrite.php
inc/modules/admin/what-extensions.php
inc/modules/admin/what-list_beg.php
inc/modules/admin/what-list_bonus.php
inc/modules/admin/what-list_payouts.php
inc/modules/admin/what-maintenance.php
inc/modules/admin/what-send_bonus.php
inc/modules/admin/what-theme_edit.php
inc/modules/admin/what-unlock_emails.php
inc/modules/admin/what-user_online.php
inc/modules/admin/what-usr_online.php
inc/modules/chk_login.php
inc/modules/guest/what-confirm.php
inc/modules/guest/what-register.php
inc/modules/index.php
inc/modules/login.php
inc/modules/member/what-bonus.php
inc/modules/member/what-categories.php
inc/modules/member/what-holiday.php
inc/modules/member/what-html_mail.php
inc/modules/member/what-newsletter.php
inc/modules/member/what-order.php
inc/modules/member/what-payout.php
inc/modules/member/what-points.php
inc/modules/member/what-transfer.php
inc/modules/order.php
inc/monthly/monthly_beg.php
inc/monthly/monthly_bonus.php
inc/mysql-manager.php
inc/pool-update.php
inc/profile-updte.php
mailid_top.php
modules.php
templates/de/emails/admin/admin_reset_password.tpl [new file with mode: 0644]
templates/de/emails/header.tpl
templates/de/html/admin/admin_add_points.tpl
templates/de/html/admin/admin_add_rallye.tpl
templates/de/html/admin/admin_add_sponsor_paytype.tpl
templates/de/html/admin/admin_admin_add.tpl
templates/de/html/admin/admin_admins_contact_form.tpl
templates/de/html/admin/admin_admins_contct_form.tpl
templates/de/html/admin/admin_admins_mails_edit_form.tpl
templates/de/html/admin/admin_config_beg.tpl
templates/de/html/admin/admin_config_birthday.tpl
templates/de/html/admin/admin_config_bonus.tpl
templates/de/html/admin/admin_config_doubler.tpl
templates/de/html/admin/admin_config_holiday.tpl
templates/de/html/admin/admin_config_home_settings_pro.tpl
templates/de/html/admin/admin_config_mediadata.tpl
templates/de/html/admin/admin_config_other.tpl
templates/de/html/admin/admin_config_point_settings.tpl
templates/de/html/admin/admin_config_sponsor.tpl
templates/de/html/admin/admin_config_stats.tpl
templates/de/html/admin/admin_config_transfer.tpl
templates/de/html/admin/admin_contct_user_form.tpl
templates/de/html/admin/admin_edit_admins.tpl
templates/de/html/admin/admin_edit_rallyes_row.tpl
templates/de/html/admin/admin_edit_sponsor_add_points.tpl
templates/de/html/admin/admin_edit_sponsor_sub_points.tpl
templates/de/html/admin/admin_email_archiv_row.tpl
templates/de/html/admin/admin_gmenu_status.tpl
templates/de/html/admin/admin_guest_add.tpl
templates/de/html/admin/admin_list_beg.tpl
templates/de/html/admin/admin_list_bonus.tpl
templates/de/html/admin/admin_list_cats.tpl
templates/de/html/admin/admin_list_cats_404.tpl
templates/de/html/admin/admin_list_links.tpl
templates/de/html/admin/admin_list_payouts_banner.tpl
templates/de/html/admin/admin_list_payouts_txt.tpl
templates/de/html/admin/admin_list_rallyes_row.tpl
templates/de/html/admin/admin_list_sponsor_details.tpl
templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl
templates/de/html/admin/admin_list_sponsor_row.tpl
templates/de/html/admin/admin_list_unconfirmed.tpl
templates/de/html/admin/admin_logout.tpl
templates/de/html/admin/admin_logout_sql_patches.tpl
templates/de/html/admin/admin_member_add.tpl
templates/de/html/admin/admin_menu_failed.tpl
templates/de/html/admin/admin_mini_online.tpl
templates/de/html/admin/admin_mmenu_status.tpl
templates/de/html/admin/admin_optimize.tpl
templates/de/html/admin/admin_payout_accept_form.tpl
templates/de/html/admin/admin_payout_add_new.tpl
templates/de/html/admin/admin_payout_overview_form.tpl
templates/de/html/admin/admin_payout_reject_form.tpl
templates/de/html/admin/admin_reset_pass_done.tpl [new file with mode: 0644]
templates/de/html/admin/admin_reset_password.tpl [new file with mode: 0644]
templates/de/html/admin/admin_reset_password_form.tpl [new file with mode: 0644]
templates/de/html/admin/admin_send_bonus_select.tpl
templates/de/html/admin/admin_send_reset_link.tpl [new file with mode: 0644]
templates/de/html/admin/admin_sponsor_paytypes.tpl
templates/de/html/admin/admin_sub_points.tpl
templates/de/html/admin/admin_user_details.tpl
templates/de/html/admin/admin_validate_reset_hash_form.tpl [new file with mode: 0644]
templates/de/html/admin/admin_welcome.tpl
templates/de/html/admin/admin_welcome_admins.tpl

index 7872698..30914c6 100644 (file)
@@ -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 c5442df..eb9bf94 100644 (file)
--- 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__);
index 1eb3f2c..621b21f 100644 (file)
@@ -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;
index 2d280c4..7c98694 100644 (file)
@@ -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")
index 8aab915..e4f16f4 100644 (file)
@@ -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);
index 2111344..cf3ba20 100644 (file)
@@ -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  = "<DIV align=\"center\">
 <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"".$WIDTH."\" align=\"center\"".$dashed.">
@@ -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 .= "<TR>
index 65da897..2056138 100644 (file)
@@ -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";
 
 //
 ?>
index 98033a2..90702a1 100644 (file)
@@ -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";
 
 //
 ?>
index b36ba4e..53c0a64 100644 (file)
@@ -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";
 
 //
 ?>
index 540e1dd..97517cc 100644 (file)
@@ -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";
 
 //
 ?>
index 136d94b..02af08f 100644 (file)
@@ -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";
 
 //
 ?>
index 982a00e..80b7e03 100644 (file)
@@ -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";
 
 //
 ?>
index eefd94b..87a928f 100644 (file)
@@ -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";
 
 //
 ?>
index 52654f0..9eeddde 100644 (file)
@@ -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";
 
 //
 ?>
index a2a0271..395f1a5 100644 (file)
@@ -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";
 
 //
 ?>
index 09afaa2..43f430d 100644 (file)
@@ -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";
 
 //
 ?>
index 5e3e624..264b3ab 100644 (file)
@@ -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";
 
 //
 ?>
index a294dd5..9d649cc 100644 (file)
@@ -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";
 
 //
 ?>
index a0cc369..85205f9 100644 (file)
@@ -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";
 
 //
 ?>
index 23365d9..c36ea06 100644 (file)
@@ -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";
 
 //
 ?>
index 67eff54..b1bf084 100644 (file)
@@ -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";
 
 //
 ?>
index 9fd371f..7cb1ed8 100644 (file)
@@ -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";
 
 //
 ?>
index fa8249d..072650a 100644 (file)
@@ -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";
 
 //
 ?>
index fa49533..f73e3f0 100644 (file)
@@ -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";
 
 //
 ?>
index 7d32343..ff1c8df 100644 (file)
@@ -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";
 
 //
 ?>
index 2a4339e..d480fc3 100644 (file)
@@ -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";
 
 //
 ?>
index d1fdbe0..bc46034 100644 (file)
@@ -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";
 
 //
 ?>
index 166d092..c91f111 100644 (file)
@@ -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";
 
 //
 ?>
index 22be979..cd4baf7 100644 (file)
@@ -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";
 
 //
 ?>
index aaa0982..1bd44a8 100644 (file)
@@ -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";
 
 //
 ?>
index 13aa9d1..5d5d443 100644 (file)
@@ -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";
 
 //
 ?>
index dd71a78..8d2396d 100644 (file)
@@ -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";
 
 //
 ?>
index e77a7aa..87ce68a 100644 (file)
@@ -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";
 
 //
 ?>
index b86cb15..46065fd 100644 (file)
@@ -352,7 +352,7 @@ LIMIT 1", __FILE__, __LINE__);
 $EXT_LANG_PREFIX = "rallye";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = 'N';
+$EXT_ALWAYS_ACTIVE = "N";
 
 //
 ?>
index faa89c0..caa401e 100644 (file)
@@ -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";
 
 //
 ?>
index f330a2b..56f3b68 100644 (file)
@@ -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";
 
 //
 ?>
index c38ca09..6fa497c 100644 (file)
@@ -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";
 
 //
 ?>
index e71bf2c..b3ae87c 100644 (file)
@@ -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
index 43c3936..3990dce 100644 (file)
@@ -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";
 
 //
 ?>
index b3df4d9..ae9fad6 100644 (file)
@@ -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 &auml;ndern, wie Festverg&uuml;tung, prozentuale Ref-Verg&uuml;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";
 
 //
 ?>
index 18409b1..5fc2acf 100644 (file)
@@ -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";
 
 //
 ?>
index 970fcef..8c4e31d 100644 (file)
@@ -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";
 
 //
 ?>
index 35c1590..6fc5afd 100644 (file)
@@ -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";
 
 //
 ?>
index 3a56f2d..9f984f1 100644 (file)
@@ -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";
 
 //
 ?>
index 17142d7..3dc9ad1 100644 (file)
@@ -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";
 
 //
 ?>
index deec8c8..6412295 100644 (file)
@@ -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;
index 0df7477..e5fa090 100644 (file)
@@ -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";
 
 //
 ?>
index 47dbf47..4811010 100644 (file)
@@ -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();
        }
index 38b4f58..d94a033 100644 (file)
@@ -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 "<PRE>
@@ -377,7 +377,7 @@ To      : ".$TO."
 Subject : ".$SUBJECT."
 Message : ".$MSG."
 </PRE>\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 .= "      <OPTION value=\"Y\"";
-               if ($DEFAULT == 'Y') $OUT .= " selected=\"selected\"";
+               if ($DEFAULT == "Y") $OUT .= " selected=\"selected\"";
                $OUT .= ">".YES."</OPTION>
                        <OPTION value=\"N\"";
-               if ($DEFAULT == 'N') $OUT .= " selected=\"selected\"";
+               if ($DEFAULT == "N") $OUT .= " selected=\"selected\"";
                $OUT .= ">".NO."</OPTION>\n";
                break;
        }
@@ -1910,11 +1910,11 @@ function CREATE_EMAIL_LINK($email, $table="admins") {
 function generateHash ($plainText, $salt = "") {
        global $_CONFIG, $_SERVER;
 
-       // Is the required extension "sql_patches" there?
-       if ((GET_EXT_VERSION("sql_patches") < "0.3.6") || (GET_EXT_VERSION("sql_patches") == "")) {
+       // Is the required extension "sql_patches" there and a salt is not given?
+       if (((GET_EXT_VERSION("sql_patches") < "0.3.6") || (GET_EXT_VERSION("sql_patches") == "")) && (empty($salt))) {
                // Extension sql_patches is missing/outdated so we return the plain text
                return $plainText;
-       }
+       } // END - if
 
        // When the salt is empty build a new one, else use the first x configured characters as the salt
        if ($salt == "") {
index aa9f78a..a5462b7 100644 (file)
@@ -51,22 +51,22 @@ if (($header != "1") && ($header != "2")) {
                // Add title decorations? (left)
                if (!defined('__PAGE_TITLE')) {
                        if ((count($_CONFIG) > 1) && (is_resource($link)) && (isset($db))) {
-                               if (($_CONFIG['enable_title_deco'] == 'Y') && (trim(!empty($_CONFIG['title_left'])))) $TITLE .= trim($_CONFIG['title_left'])." ";
+                               if (($_CONFIG['enable_title_deco'] == "Y") && (trim(!empty($_CONFIG['title_left'])))) $TITLE .= trim($_CONFIG['title_left'])." ";
                                $TITLE .= MAIN_TITLE;
 
                                // Add title of module? (middle decoration will also be added!)
                                if (isset($_CONFIG['enable_mod_title'])) {
-                                       if (($_CONFIG['enable_mod_title'] == 'Y') || ((empty($GLOBALS['what'])) && (empty($GLOBALS['action']))) || ($GLOBALS['module'] == "admin")) $TITLE .= " ".trim($_CONFIG['title_middle'])." ".ADD_MODULE_TITLE($GLOBALS['module']);
+                                       if (($_CONFIG['enable_mod_title'] == "Y") || ((empty($GLOBALS['what'])) && (empty($GLOBALS['action']))) || ($GLOBALS['module'] == "admin")) $TITLE .= " ".trim($_CONFIG['title_middle'])." ".ADD_MODULE_TITLE($GLOBALS['module']);
                                } // END - if
 
                                // Add title from what file
                                $MODE = "";
                                if ($GLOBALS['module'] == "login") $MODE = "member";
                                 elseif ($GLOBALS['module'] == "index") $MODE = "guest";
-                               if ((!empty($MODE)) && (isset($_CONFIG['enable_what_title'])) && ($_CONFIG['enable_what_title'] == 'Y')) $TITLE .= " ".trim($_CONFIG['title_middle'])." ".GET_MOD_DESCR($MODE, $GLOBALS['what']);
+                               if ((!empty($MODE)) && (isset($_CONFIG['enable_what_title'])) && ($_CONFIG['enable_what_title'] == "Y")) $TITLE .= " ".trim($_CONFIG['title_middle'])." ".GET_MOD_DESCR($MODE, $GLOBALS['what']);
 
                                // Add title decorations? (right)
-                               if (($_CONFIG['enable_title_deco'] == 'Y') && (!empty($_CONFIG['title_right']))) $TITLE .= " ".trim($_CONFIG['title_right']);
+                               if (($_CONFIG['enable_title_deco'] == "Y") && (!empty($_CONFIG['title_right']))) $TITLE .= " ".trim($_CONFIG['title_right']);
 
                                // Remember title in constant for the template
                                define('__PAGE_TITLE', html_entity_decode($TITLE));
index e8e314d..2d6e543 100644 (file)
@@ -1119,5 +1119,34 @@ define('ADMIN_CONFIG_PROXY_USERNAME', "Benuztername (falls vorhanden):");
 define('ADMIN_CONFIG_PROXY_PASSWORD', "Passwort (falls vorhanden):");
 define('EDIT_ENTRIES', "Eintr&auml;ge &auml;ndern");
 
+define('ADMIN_SEND_RESET_LINK_TITLE', "1/4: Administratorkennwort zur&uuml;cksetzen");
+define('ADMIN_VALIDATE_HASH_TITLE', "2/4: Validierung Iher Logindaten");
+define('ADMIN_RESET_PASSWORD_TITLE', "3/4: Neues Passwort eingeben");
+define('ADMIN_RESET_PASS_DONE_TITLE', "4/4: Neues Passwort gesetzt");
+
+define('ADMIN_SEND_RESET_LINK_SUBMIT', "Passwort zur&uuml;cksetzen");
+define('ADMIN_VALIDATE_HASH_SUBMIT', "Adminlogindaten validieren");
+define('ADMIN_RESET_PASSWORD_SUBMIT', "Neues Kennwort setzen");
+
+define('ADMIN_SEND_RESET_LINK_NOTE', "Sobald Sie Ihre Email-Adresse eingegeben haben, wird Ihnen Ihr Loginname zugeschickt. Diesen geben Sie in dem n&auml;chsten Formular zusammen mit Ihrem neuen Passwort ein. Danach k&ouml;nnen Sie wieder in den Adminbereich einloggen.");
+define('ADMIN_VALIDATE_HASH_NOTE', "Sie haben diesen Link aus einer Mail angeklickt, die Ihnen zuvor zugesandt wurde. Daraus ben&ouml;tigen Sie Ihren Loginnamen, damit Ihre Daten validiert werden k&ouml;nnen. Nach Abesenden des Formulars k&ouml;nnen Sie dann Ihr Administratorkennwort &auml;ndern.");
+define('ADMIN_RESET_PASSWORD_NOTE', "Geben Sie nun zweimal ein neues Kennwort f&uuml;r das angezeigte Administratorlogin ein. Dabei sollten Sie Buchstaben, Zahlen und Sonderzeichen wie Slash, Strich, Unterstrich usw. verwenden, um die St&auml;rke des Passwortes zu maximieren.");
+
+define('ADMIN_ENTER_EMAIL', "Geben Sie Ihre Email-Adresse ein, die Ihrem Adminlogin hinterlegt ist:");
+define('ADMIN_ENTER_LOGIN', "Bitte geben Sie Ihr Administratorlogin ein, dass Sie in der Mail erhalten haben:");
+define('ADMIN_ENTER_PASSWORD1', "Geben Sie Ihr neues Administratorkennwort ein:");
+define('ADMIN_ENTER_PASSWORD2', "Wiederholen Sie das Passwort zur Best&auml;tigung:");
+
+define('ADMIN_RESET_PASS', "Ihr Administratorkennwort zur&uuml;cksetzen?");
+define('ADMIN_NO_LOGIN_WITH_EMAIL', "Kein Administrator-Account mit der angegebenen Email-Adresse gefunden!");
+define('ADMIN_RESET_PASS_LINK_SUBJ', "Zuruecksetzung Ihres Admin-Passwortes");
+define('ADMIN_RESET_LINK_SENT', "Der Reset-Link wurde soeben an Ihre eingegebene Email-Adresse ausgesendet.");
+define('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED', "Validierung Ihrer Logindaten fehlgeschlagen. Haben Sie auch den Link aus der Mail angeklickt und Ihren Loginnamen eingegeben?");
+define('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2', "Validierung Ihrer Logindaten fehlgeschlagen. Es liegt ein Fehler im Script vor. Bitte im <A href=\"http://forum.mxchange.org\">Support-Forum</A> den Fehler melden.");
+define('ADMIN_SHOW_LOGIN', "Ihr Administratorlogin:");
+define('ADMIN_CHANGE_LOGIN', "Anderes Adminlogin");
+define('ADMIN_PASSWORD_RESET_DONE', "Ihr Administratorkennwort wurde neu gesetzt. Sie k&ouml;nnen sich jetzt mit Ihren neuen Zugangsdaten im Adminbereich einloggen.");
+define('ADMIN_CONTINUE_LOGIN', "Weiter zum Administratorlogin");
+
 //
 ?>
index 1310396..e619dff 100644 (file)
@@ -43,7 +43,7 @@ function BONUS_ADD_TURBO_POINTS($mid, $uid, $type)
        global $_CONFIG;
 
        // Shall we add bonus points?
-       if ($_CONFIG['bonus_active'] == 'N') return;
+       if ($_CONFIG['bonus_active'] == "N") return;
 
        // Select SQL command
        $SQL = "";
@@ -186,7 +186,7 @@ function BONUS_POINTS_HANDLER($MODE)
        global $_CONFIG;
 
        // Shall we add bonus points?
-       if ($_CONFIG['bonus_active'] == 'N') return;
+       if ($_CONFIG['bonus_active'] == "N") return;
 
        // Switch to jackpot-mode when no UID is supplied but userid-mode is selected
        if (($_CONFIG['bonus_mode'] == "UID") && ($_CONFIG['bonus_uid'] == "0")) $_CONFIG['bonus_mode'] = "JACKPOT";
index e437c51..85ad9e6 100644 (file)
@@ -57,7 +57,7 @@ function DOUBLER_GENERATE_TABLE($uid="0", $done='N', $ref='N', $sort="ASC")
                $NOT_FOUND = DOUBLER_GUEST_NO_ENTRIES_FOUND;
        }
 
-       if (($done == 'Y') && ($sort == "ASC"))
+       if (($done == "Y") && ($sort == "ASC"))
        {
                // Already payed out points (latest payouts first)
                $limit = $_CONFIG['doubler_display_old'];
@@ -130,13 +130,13 @@ function DOUBLER_GET_TOTAL_POINTS_LEFT()
        // Initialize variables
        $points = "0";
 
-       if ($_CONFIG['doubler_own'] == 'Y')
+       if ($_CONFIG['doubler_own'] == "Y")
        {
                // Take points from doubler's own account
                $points += $_CONFIG['doubler_points'] - $_CONFIG['doubler_used'];
        }
 
-       if ($_CONFIG['doubler_jackpot'] == 'Y')
+       if ($_CONFIG['doubler_jackpot'] == "Y")
        {
                // Load jackpot
                $result = SQL_QUERY("SELECT points FROM "._MYSQL_PREFIX."_jackpot WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);
index 184efff..5dcf9d8 100644 (file)
@@ -163,7 +163,7 @@ function SEND_NEWSLETTER($TO, $SUBJECT, $MSG, $MODE)
 {
        global $_POST;
        // Send mail away as HTML
-       if ($_POST['auto_urls'] == 'Y') {
+       if ($_POST['auto_urls'] == "Y") {
                // Automatically insert URLs into newsletter
                if ((EXT_IS_ACTIVE("html")) && ($MODE == "html")) {
                        // Send HTML mail
index 4496e31..e67677e 100644 (file)
@@ -127,7 +127,7 @@ VALUES ('%s', '%s', '%s', '%s')",
                $DATA['refs']  = $cnt;
 
                // Shall I notify this member?
-               if (($notify == 'Y') && ($un))
+               if (($notify == "Y") && ($un))
                {
                        // Load email template and send it to the user
                        $msg = LOAD_EMAIL_TEMPLATE("member_rallye_notify", $prices, $uid);
@@ -137,7 +137,7 @@ VALUES ('%s', '%s', '%s', '%s')",
 
        // Send email to admin
        $templ = "admin_rallye_no_notify";
-       if ($notify == 'Y') $templ = "admin_rallye_notify";
+       if ($notify == "Y") $templ = "admin_rallye_notify";
        if (GET_EXT_VERSION("admins") < "0.4.1")
        {
                // Use old method to send out
@@ -316,7 +316,7 @@ VALUES ('%s', '%s', '0')",
                        SQL_FREERESULT($result);
                }
 
-               if ($notify == 'Y')
+               if ($notify == "Y")
                {
                        // Transfer all neccessary data to the global $DATA array
                        $DATA['start'] = MAKE_DATETIME($start, "2");
@@ -417,7 +417,7 @@ LIMIT 1", array(bigintval($uid), $since), __FILE__, __LINE__);
                                }
                        }
 
-                       if ($notify == 'Y')
+                       if ($notify == "Y")
                        {
                                // Prepare infos for the mail template
                                if (!empty($DATA['info']))
@@ -462,7 +462,7 @@ LIMIT 1", array(bigintval($uid), $since), __FILE__, __LINE__);
        }
 
        // Select template depending on notfication is switch on / off
-       if ($notify == 'Y')
+       if ($notify == "Y")
        {
                $templ = "admin_rallye_expired";
        }
index d64d827..5837b84 100644 (file)
@@ -45,7 +45,7 @@ function REGISTER_FILL_MUST_CONSTANTS()
        while(list($name, $required) = SQL_FETCHROW($result))
        {
                $value = "";
-               if ($required == 'Y') $value = "<FONT class=\\\"guest_failed\\\">&nbsp;(*)</FONT>";
+               if ($required == "Y") $value = "<FONT class=\\\"guest_failed\\\">&nbsp;(*)</FONT>";
                $eval = "define('MUST_".strtoupper($name)."', \"".$value."\");";
                eval($eval);
        }
@@ -76,7 +76,7 @@ function REGISTER_CHECK_REQUIRED_FIELDS(&$array)
                        // if extensions is present check if country code was selected
                        //         01              2         21    12             3         32    234     5      54    4               43    34                      4    4      5      5432    2      3                      3210
                        $country = ((!EXT_IS_ACTIVE("country")) || ((EXT_IS_ACTIVE("country")) && (((empty($value)) && ($key == "cntry")) || (($key == "country_code") && (!empty($value)))) && (!empty($array['country_code']))));
-                       if ((empty($value)) && ($chk == 'Y') && (!$country))
+                       if ((empty($value)) && ($chk == "Y") && (!$country))
                        {
                                // Required field not set
                                $array[$key] = "!";
@@ -92,7 +92,7 @@ function REGISTER_OUTPUT_REQUIRE_CHECK(&$array)
        $result = SQL_QUERY("SELECT field_name, field_required FROM "._MYSQL_PREFIX."_must_register ORDER BY id", __FILE__, __LINE__);
        while(list($name, $required) = SQL_FETCHROW($result))
        {
-               if (($array[$name] == "!") && ($required == 'Y'))
+               if (($array[$name] == "!") && ($required == "Y"))
                {
                        // Empty entry found
                        $array[$name] = "";
@@ -134,7 +134,7 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false)
                                'id'    => $id,
                        );
 
-                       if (($_POST['cat'][$id] == 'Y') || (($_CONFIG['register_default'] == 'Y') && (empty($_POST['cat'][$id]))))
+                       if (($_POST['cat'][$id] == "Y") || (($_CONFIG['register_default'] == "Y") && (empty($_POST['cat'][$id]))))
                        {
                                $content['def_y'] = ' checked';
                        }
index 7f103ca..2a51e25 100644 (file)
@@ -336,11 +336,11 @@ ORDER BY d.userid";
                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 {
                        // Old version ???
@@ -349,7 +349,7 @@ ORDER BY d.userid";
 
                // Autopurge installed?
                $LAST = ""; $ONLINE = "";
-               if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == 'Y') && ($_CONFIG['ap_in_since'] > 0)) {
+               if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == "Y") && ($_CONFIG['ap_in_since'] > 0)) {
                        // Use last online timestamp to keep inactive members away from here
                        $LAST   = " AND last_online >= ";
                        $ONLINE = bigintval(time() - $_CONFIG['ap_in_since']);
@@ -368,7 +368,7 @@ ORDER BY active_bonus DESC, userid";
 
                // Autopurge installed?
                $LAST = ""; $ONLINE = "";
-               if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == 'Y') && ($_CONFIG['ap_in_since'] > 0)) {
+               if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == "Y") && ($_CONFIG['ap_in_since'] > 0)) {
                        // Use last online timestamp to keep inactive members away from here
                        $LAST   = " AND last_online >= ";
                        $ONLINE = bigintval(time() - $_CONFIG['ap_in_since']);
index 165bf9c..dea40b9 100644 (file)
@@ -98,7 +98,7 @@ if (($cacheInstance->cache_file("admins", true) == true)) {
                $cacheInstance->cache_destroy();
                unset($cacheArray['admins']);
        }
-} elseif (($_CONFIG['cache_admins'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
+} elseif (($_CONFIG['cache_admins'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file
        $cacheInstance->cache_init("ADMINS");
 
@@ -159,11 +159,13 @@ if ($cacheInstance->cache_file("mod_reg", true) == true) {
                        unset($cacheArray['modules']['admin_only'][$key]);
                        $cacheArray['modules']['mem_only'][$mod] = $cacheArray['modules']['mem_only'][$key];
                        unset($cacheArray['modules']['mem_only'][$key]);
-                       $cacheArray['modules']['has_menu'][$mod] = $cacheArray['modules']['has_menu'][$key];
-                       unset($cacheArray['modules']['has_menu'][$key]);
+                       if (isset($cacheArray['modules']['has_menu'][$key])) {
+                               $cacheArray['modules']['has_menu'][$mod] = $cacheArray['modules']['has_menu'][$key];
+                               unset($cacheArray['modules']['has_menu'][$key]);
+                       } // END - if
                }
        }
-} elseif (($_CONFIG['cache_modreg'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
+} elseif (($_CONFIG['cache_modreg'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file here
        $cacheInstance->cache_init("MODULES");
 
@@ -216,7 +218,7 @@ if ($cacheInstance->cache_file("config", true) == true) {
                $cacheInstance->cache_destroy();
                unset($cacheArray);
        }
-} elseif (($_CONFIG['cache_config'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
+} elseif (($_CONFIG['cache_config'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file here
        $cacheInstance->cache_init("CONFIG");
 
@@ -255,7 +257,7 @@ if ($cacheInstance->cache_file("refsystem", true) == true) {
                $cacheInstance->cache_destroy();
                unset($REF_SYSTEM);
        }
-} elseif (($_CONFIG['cache_refsys'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
+} elseif (($_CONFIG['cache_refsys'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file here
        $cacheInstance->cache_init("REFSYSTEM");
 
@@ -294,7 +296,7 @@ if ($cacheInstance->cache_file("refdepths", true) == true) {
                $cacheInstance->cache_destroy();
                unset($REF_DEPTHS);
        }
-} elseif (($_CONFIG['cache_refdepth'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
+} elseif (($_CONFIG['cache_refdepth'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file here
        $cacheInstance->cache_init("REFDEPTHS");
 
@@ -337,7 +339,7 @@ if (GET_EXT_VERSION("admins") >= "0.3") {
                                unset($cacheArray['admin_acls']);
                        }
                }
-       } elseif (($_CONFIG['cache_acls'] == 'Y') && ($CSS != "1") && ($CSS != "-1")) {
+       } elseif (($_CONFIG['cache_acls'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
                // Create cache file here
                $cacheInstance->cache_init("ADMINS_ACLS");
 
index 75b0c42..f1304aa 100644 (file)
@@ -70,7 +70,7 @@ if (EXT_IS_ACTIVE("cache")) {
        }
 
        // Do not recreate cache file when it's switched off!
-       if (($cacheMode == "init") && ($_CONFIG['cache_exts'] == 'N')) $cacheMode = "skip";
+       if (($cacheMode == "init") && ($_CONFIG['cache_exts'] == "N")) $cacheMode = "skip";
 
        // Load language
        if ($cacheMode == "load") include(PATH."inc/language/cache_".GET_LANGUAGE().".php");
@@ -89,19 +89,19 @@ if ($cacheMode == "load") {
        $EXT_DUMMY = $cacheInstance->cache_load();
        foreach ($EXT_DUMMY['ext_name'] as $k=>$name) {
                // Load functions file
-               if ($EXT_DUMMY['ext_funcs'][$k] == 'Y') require_once(PATH."inc/libs/".$name."_functions.php");
+               if ($EXT_DUMMY['ext_funcs'][$k] == "Y") require_once(PATH."inc/libs/".$name."_functions.php");
 
                // Load Language file
-               if ($EXT_DUMMY['ext_lang'][$k] == 'Y') {
+               if ($EXT_DUMMY['ext_lang'][$k] == "Y") {
                        $INC = sprintf(PATH."inc/language/%s_%s.php", $name, GET_LANGUAGE());
                        if (file_exists($INC)) require_once($INC);
                }
 
                // Load CSS file
-               if ($EXT_DUMMY['ext_css'][$k] == 'Y') $EXT_CSS_FILES[] = "".$name.".css";
+               if ($EXT_DUMMY['ext_css'][$k] == "Y") $EXT_CSS_FILES[] = "".$name.".css";
 
                // Load extension file itself
-               if (($EXT_DUMMY['ext_active'][$k] == 'Y') || ($EXT_DUMMY['ext_keep'][$k] == 'Y') || (IS_ADMIN())) {
+               if (($EXT_DUMMY['ext_active'][$k] == "Y") || ($EXT_DUMMY['ext_keep'][$k] == "Y") || (IS_ADMIN())) {
                        require_once(PATH."inc/extensions/ext-".$name.".php");
                }
 
@@ -177,11 +177,11 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($cacheMode == "init") || ($cacheMode ==
                //* DEBUG: */ echo "*".$name."/".$menu."*<br>";
 
                // An empty menu entry will be interpreted as N (no menu) to avoid problems
-               if (empty($menu)) $menu = 'N';
+               if (empty($menu)) $menu = "N";
 
                // Load extensions
                $file1 = sprintf(PATH."inc/extensions/ext-%s.php", $name);
-               $file2 = $file1; $EXT_CSS = 'N'; $EXT_ALWAYS_ACTIVE = 'N';
+               $file2 = $file1; $EXT_CSS = "N"; $EXT_ALWAYS_ACTIVE = "N";
 
                // Special functions file
                $file3 = sprintf(PATH."inc/libs/%s_functions.php", $name);
@@ -198,26 +198,26 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($cacheMode == "init") || ($cacheMode ==
                        if (file_exists($file3) && is_readable($file3))
                        {
                                // Special functions file
-                               $funcs = 'Y';
+                               $funcs = "Y";
                                require_once($file3);
                        }
                         else
                        {
                                // Don't load functions file
-                               $funcs = 'N';
+                               $funcs = "N";
                        }
 
                        // Do we need a language file?
                        if (($file1 != $file2) && (file_exists($file2)) && (is_readable($file2)))
                        {
                                // Load language file
-                               $lang = 'Y';
+                               $lang = "Y";
                                include($file2);
                        }
                         else
                        {
                                // Don't load language file
-                               $lang = 'N';
+                               $lang = "N";
                        }
 
                        // Load extension
@@ -229,10 +229,10 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($cacheMode == "init") || ($cacheMode ==
                         else
                        {
                                // KEEP sql_patches ALWAYS ACTIVE!
-                               $EXT_ALWAYS_ACTIVE = 'Y';
+                               $EXT_ALWAYS_ACTIVE = "Y";
                        }
 
-                       if ($css == 'Y')
+                       if ($css == "Y")
                        {
                                $CSS_FILE = PATH."theme/".GET_CURR_THEME()."/css/".$name.".css";
                                if (file_exists($CSS_FILE))
@@ -243,7 +243,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($cacheMode == "init") || ($cacheMode ==
                                 else
                                {
                                        // Don't load CSS file
-                                       $css = 'N';
+                                       $css = "N";
                                }
                        }
 
index 7bbd91f..ce45732 100644 (file)
@@ -55,7 +55,7 @@ $SQL = "SELECT userid, email FROM "._MYSQL_PREFIX."_user_data WHERE (beg_ral_not
 switch ($_CONFIG['beg_rallye'])
 {
 case 'Y': // Begging rallye is activated
-       if ($_CONFIG['beg_ral_en_notify'] == 'Y')
+       if ($_CONFIG['beg_ral_en_notify'] == "Y")
        {
                // Okay, let's check for member accounts
                $SQL .= "= 0 OR (beg_ral_notify > 0 AND beg_ral_en_notify < beg_ral_di_notify)";
@@ -69,7 +69,7 @@ case 'Y': // Begging rallye is activated
        break;
 
 case 'N': // Begging rallye is deactivated
-       if ($_CONFIG['beg_ral_di_notify'] == 'Y')
+       if ($_CONFIG['beg_ral_di_notify'] == "Y")
        {
                // Okay, let's check for member accounts
                $SQL .= " > 0 AND beg_ral_di_notify < beg_ral_en_notify";
index 597d728..d0faabf 100644 (file)
@@ -53,7 +53,7 @@ $YEAR  = date('Y', time());
 
 // Shall I include only active members?
 $ADD = "%s"; $VALUE = "";
-if (($_CONFIG['birthday_active']) && (EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_in_since'] > 0) && ($_CONFIG['ap_inactive'] == 'Y'))
+if (($_CONFIG['birthday_active']) && (EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_in_since'] > 0) && ($_CONFIG['ap_inactive'] == "Y"))
 {
        $ADD = " AND last_online >= %d";
        $VALUE = bigintval(time() - $_CONFIG['ap_in_since']);
index 6736810..198419d 100644 (file)
@@ -55,7 +55,7 @@ $SQL = "SELECT userid, email FROM "._MYSQL_PREFIX."_user_data WHERE (bonus_ral_n
 switch ($_CONFIG['bonus_active'])
 {
 case 'Y': // Active rallye is activated
-       if ($_CONFIG['bonus_en_notify'] == 'Y')
+       if ($_CONFIG['bonus_en_notify'] == "Y")
        {
                // Okay, let's check for member accounts
                $SQL .= "= 0 OR (bonus_ral_notify > 0 AND bonus_ral_en_notify < bonus_ral_di_notify)";
@@ -69,7 +69,7 @@ case 'Y': // Active rallye is activated
        break;
 
 case 'N': // Active rallye is deactivated
-       if ($_CONFIG['bonus_di_notify'] == 'Y')
+       if ($_CONFIG['bonus_di_notify'] == "Y")
        {
                // Okay, let's check for member accounts
                $SQL .= " > 0 AND bonus_ral_di_notify < bonus_ral_en_notify";
index cb73fec..ed6f004 100644 (file)
@@ -140,6 +140,51 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                // Load register template
                LOAD_TEMPLATE("admin_reg_form");
        }
+} elseif (isset($_GET['reset_pass'])) {
+       // Is the form submitted?
+       if ((isset($_POST['send_link'])) && (!empty($_POST['email']))) {
+               // Try to send the link out
+               $OUT = ADMIN_SEND_PASSWORD_RESET_LINK($_POST['email']);
+
+               // Output result
+               LOAD_TEMPLATE("admin_settings_saved", false, $OUT);
+       } elseif (!empty($_GET['hash'])) {
+               // Output form for hash validation
+               LOAD_TEMPLATE("admin_validate_reset_hash_form", false, SQL_ESCAPE($_GET['hash']));
+       } elseif ((isset($_POST['validate_hash'])) && (!empty($_POST['login'])) && (!empty($_POST['hash']))) {
+               // Validate the login data and hash
+               $valid = ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN($_POST['hash'], $_POST['login']);
+
+               // Valid?
+               if ($valid) {
+                       // Prepare content first
+                       $content = array(
+                               'hash'  => SQL_ESCAPE($_POST['hash']),
+                               'login' => SQL_ESCAPE($_POST['login'])
+                       );
+
+                       // Validation okay so display form for final password change
+                       LOAD_TEMPLATE("admin_reset_password_form", false, $content);
+               } else {
+                       // Cannot validate the login data and hash
+                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED);
+               }
+       } elseif ((isset($_POST['reset_pass'])) && (!empty($_POST['hash'])) && (!empty($_POST['login'])) && (!empty($_POST['pass1'])) && ($_POST['pass1'] == $_POST['pass2'])) {
+               // Okay, we shall the admin password here. So first revalidate the hash
+               if (ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN($_POST['hash'], $_POST['login'])) {
+                       // Set the password now
+                       $OUT = ADMIN_RESET_PASSWORD($_POST['login'], $_POST['pass1']);
+
+                       // Output result
+                       LOAD_TEMPLATE("admin_reset_pass_done", false, $OUT);
+               } else {
+                       // Validation failed
+                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2);
+               }
+       } else {
+               // Output reset password form
+               LOAD_TEMPLATE("admin_send_reset_link");
+       }
 } elseif ((!isSessionVariableSet('admin_login')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last')) || (!isSessionVariableSet('admin_to')) || ((get_session('admin_last') + bigintval(get_session('admin_to')) * 3600 * 24) < time())) {
        // At leat one administrator account was created
        if ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last')) && (isSessionVariableSet('admin_to'))) {
@@ -150,7 +195,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
        if (!empty($_GET['register'])) {
                // Registration of first admin is done
                if ($_GET['register'] == "done") OUTPUT_HTML("<STRONG class=\"admin\">".ADMIN_REGISTER_DONE."</STRONG>");
-       }
+       } // END - if
 
        // Check if the admin has submitted data or not
        $ret = "";
@@ -185,7 +230,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
                case "pass": // Wrong password
                        $_POST['ok'] = $ret;
-                       $ret = WRONG_PASS;
+                       $ret = WRONG_PASS." [<A href=\"".URL."/modules.php?module=admin&amp;reset_pass=1\">".ADMIN_RESET_PASS."</A>]\n";
                        break;
                }
        }
index f147c1a..d0aef8c 100644 (file)
@@ -746,7 +746,7 @@ function ADMIN_CHECK_MENU_MODE()
 // Change activation status
 function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
        global $_CONFIG;
-       $cnt = 0; $newStatus = 'Y';
+       $cnt = 0; $newStatus = "Y";
        if ((is_array($IDs)) && (count($IDs) > 0)) {
                // "Walk" all through and count them
                foreach ($IDs as $id=>$selected) {
@@ -763,7 +763,7 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
                                if (SQL_NUMROWS($result) == 1) {
                                        // Load the status
                                        list($currStatus) = SQL_FETCHROW($result);
-                                       if ($currStatus == 'Y') $newStatus='N'; else $newStatus = 'Y';
+                                       if ($currStatus == "Y") $newStatus='N'; else $newStatus = "Y";
 
                                        // Change this status
                                        SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_%s SET %s='%s' WHERE %s=%d LIMIT 1",
@@ -909,5 +909,97 @@ function ADMIN_TEST_PROXY_SETTINGS ($settingsArray) {
        // Return result
        return $valid;
 }
+// Sends out a link to the given email adress so the admin can reset his/her password
+function ADMIN_SEND_PASSWORD_RESET_LINK ($email) {
+       global $_CONFIG;
+       // Init output
+       $OUT = "";
+
+       // Compile out security characters (must be for looking up!)
+       $email = COMPILE_CODE($email);
+
+       // Look up administator login
+       $result = SQL_QUERY_ESC("SELECT id, login, password FROM "._MYSQL_PREFIX."_admins WHERE email='%s' LIMIT 1",
+               array($email), __FILE__, __LINE__);
+
+       // Is there an account?
+       if (SQL_NUMROWS($result) == 0) {
+               // No account found!
+               return ADMIN_NO_LOGIN_WITH_EMAIL;
+       } // END - if
+
+       // Load all data
+       $content = SQL_FETCHARRAY($result);
+
+       // Free result
+       SQL_FREERESULT($result);
+
+       // Generate hash for reset link
+       $content['hash'] = generateHash(URL.":".$content['id'].":".$content['login'].":".$content['password'], substr($content['password'], 10));
+
+       // Remove some data
+       unset($content['id']);
+       unset($content['password']);
+
+       // Prepare email
+       $mailText = LOAD_EMAIL_TEMPLATE("admin_reset_password", $content);
+
+       // Send it out
+       SEND_EMAIL($email, ADMIN_RESET_PASS_LINK_SUBJ, $mailText);
+
+       // Prepare output
+       return ADMIN_RESET_LINK_SENT;
+}
+// Validate hash and login for password reset
+function ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN ($hash, $login) {
+       // By default nothing validates... ;)
+       $valid = false;
+
+       // Compile the login for lookup
+       $login = COMPILE_CODE($login);
+
+       // Then try to find that user
+       $result = SQL_QUERY_ESC("SELECT id, password, email FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
+               array($login), __FILE__, __LINE__);
+
+       // Is an account here?
+       if (SQL_NUMROWS($result) == 1) {
+               // Load all data
+               $content = SQL_FETCHARRAY($result);
+
+               // Generate hash again
+               $hashFromData = generateHash(URL.":".$content['id'].":".$login.":".$content['password'], substr($content['password'], 10));
+
+               // Does both match?
+               $valid = ($hash == $hashFromData);
+       } // END - if
+
+       // Free result
+       SQL_FREERESULT($result);
+
+       // Return result
+       return $valid;
+}
+// Reset the password for the login. Do NOT call this function without calling above function first!
+function ADMIN_RESET_PASSWORD ($login, $password) {
+       // Init hash
+       $passHash = "";
+
+       // Now check if we have sql_patches installed
+       if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
+               // Use new way of hashing
+               $passHash = generateHash($password);
+       } else {
+               // Old MD5 method
+               $passHash = md5($password);
+       }
+
+       // Update database
+       SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s' WHERE login='%s' LIMIT 1",
+               array($passHash, $login), __FILE__, __LINE__);
+
+       // Return output
+       return ADMIN_PASSWORD_RESET_DONE;
+}
 //
 ?>
index bdd3334..7f0f341 100644 (file)
@@ -133,7 +133,7 @@ VALUES ('%s', '0', 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())",
 
                                if (!empty($cacheArray['active_extensions'][$ext])) {
                                        // Maybe we want to keept the current extension active?
-                                       if (($cacheArray['active_extensions'][$ext] == 'Y') && (!EXT_IS_ACTIVE($ext, true, true))) {
+                                       if (($cacheArray['active_extensions'][$ext] == "Y") && (!EXT_IS_ACTIVE($ext, true, true))) {
                                                // Reactivate this extension!
                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='Y' WHERE ext_name='%s' LIMIT 1",
                                                 array($ext), __FILE__, __LINE__);
@@ -212,7 +212,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                $title = TASK_NO_TITLE;
 
                                // Shall I list SQL commands assigned to an extension installation or update task?
-                               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"))) {
                                        $ext_name = substr($subj, 1, strpos($subj, ":") - 1);
                                        if ($type == "EXTENSION") {
                                                // Load SQL commands for registering
@@ -247,7 +247,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                        // Add SQLs to a table
                                        if (empty($SQLs)) $SQLs = array();
                                        if (empty($title)) $title = "";
-                                       if ((!empty($ext_name)) && (GET_EXT_VERSION("sql_patches")) && ($_CONFIG['verbose_sql'] == 'Y')) {
+                                       if ((!empty($ext_name)) && (GET_EXT_VERSION("sql_patches")) && ($_CONFIG['verbose_sql'] == "Y")) {
                                                // Add verbose SQL table
                                                $text .= EXTENSION_VERBOSE_TABLE($SQLs, $title, " class=\"admin_table top2 left2 right2\"", true, "100%")."<br />\n";
                                        }
index 9163d41..287352e 100644 (file)
@@ -68,7 +68,7 @@ if (isset($_POST['ok']))
 
        // Mail confirmation links
        define('_CFG_AUTO_PURGE', CREATE_TIME_SELECTIONS($_CONFIG['auto_purge'], "auto_purge", "MWD"));
-       if ($_CONFIG['auto_purge_active'] == 'N')
+       if ($_CONFIG['auto_purge_active'] == "N")
        {
                define('_CFG_AP_ACTIVE_N', ' checked');
                define('_CFG_AP_ACTIVE_Y', "");
index dcc8d49..76ff349 100644 (file)
@@ -57,7 +57,7 @@ if (isset($_POST['ok']))
        $_CONFIG['beg_ral_di_notify'] = $_POST['beg_ral_di_notify'];
 
        // Include sending out mails
-       if ((($_CONFIG['beg_rallye'] == 'Y') && ($_CONFIG['beg_ral_en_notify'] == 'Y')) || (($_CONFIG['beg_rallye'] == 'N') && ($_CONFIG['beg_ral_di_notify'] == 'Y')))
+       if ((($_CONFIG['beg_rallye'] == "Y") && ($_CONFIG['beg_ral_en_notify'] == "Y")) || (($_CONFIG['beg_rallye'] == "N") && ($_CONFIG['beg_ral_di_notify'] == "Y")))
        {
                include(PATH."inc/mails/beg_mails.php");
        }
index 70bf8e3..cb432f2 100644 (file)
@@ -71,7 +71,7 @@ if (isset($_POST['ok']))
        $_CONFIG['bonus_di_notify'] = $_POST['bonus_di_notify'];
 
        // Include sending out mails
-       if ((($_CONFIG['bonus_active'] == 'Y') && ($_CONFIG['bonus_en_notify'] == 'Y')) || (($_CONFIG['bonus_active'] == 'N') && ($_CONFIG['bonus_di_notify'] == 'Y')))
+       if ((($_CONFIG['bonus_active'] == "Y") && ($_CONFIG['bonus_en_notify'] == "Y")) || (($_CONFIG['bonus_active'] == "N") && ($_CONFIG['bonus_di_notify'] == "Y")))
        {
                include(PATH."inc/mails/bonus_mails.php");
        }
index 0f5f86b..17d68e1 100644 (file)
@@ -43,41 +43,41 @@ ADD_DESCR("admin", basename(__FILE__));
 if (isset($_POST['ok']))
 {
        // Cache path has been not changed by default so don't test it again
-       $_POST['cache_tested'] = 'N';
+       $_POST['cache_tested'] = "N";
 
        // Check if path has been changed
        if ($_POST['cache_path'] != $_CONFIG['cache_path'])
        {
                // Okay, cache path has been altered so we have to test it again!
-               $_POST['cache_tested'] = 'Y';
+               $_POST['cache_tested'] = "Y";
        }
 
        // Delete deactivated cache files
-       if (($_POST['cache_admins'] == 'N') && ($cacheInstance->cache_file("admins", true)))
+       if (($_POST['cache_admins'] == "N") && ($cacheInstance->cache_file("admins", true)))
        {
                $cacheInstance->cache_destroy();
        }
-       if (($_POST['cache_acls'] == 'N') && ($cacheInstance->cache_file("acls", true)))
+       if (($_POST['cache_acls'] == "N") && ($cacheInstance->cache_file("acls", true)))
        {
                $cacheInstance->cache_destroy();
        }
-       if (($_POST['cache_exts'] == 'N') && ($cacheInstance->cache_file("extensions", true)))
+       if (($_POST['cache_exts'] == "N") && ($cacheInstance->cache_file("extensions", true)))
        {
                $cacheInstance->cache_destroy();
        }
-       if (($_POST['cache_config'] == 'N') && ($cacheInstance->cache_file("config", true)))
+       if (($_POST['cache_config'] == "N") && ($cacheInstance->cache_file("config", true)))
        {
                $cacheInstance->cache_destroy();
        }
-       if (($_POST['cache_modreg'] == 'N') && ($cacheInstance->cache_file("modreg", true)))
+       if (($_POST['cache_modreg'] == "N") && ($cacheInstance->cache_file("modreg", true)))
        {
                $cacheInstance->cache_destroy();
        }
-       if (($_POST['cache_refdepth'] == 'N') && ($cacheInstance->cache_file("refdepth", true)))
+       if (($_POST['cache_refdepth'] == "N") && ($cacheInstance->cache_file("refdepth", true)))
        {
                $cacheInstance->cache_destroy();
        }
-       if (($_POST['cache_refsys'] == 'N') && ($cacheInstance->cache_file("refsys", true)))
+       if (($_POST['cache_refsys'] == "N") && ($cacheInstance->cache_file("refsys", true)))
        {
                $cacheInstance->cache_destroy();
        }
index c9da993..1453b98 100644 (file)
@@ -79,7 +79,7 @@ if (isset($_POST['ok'])) {
        define('_CFG_UNCONFIRMED'   , $_CONFIG['unconfirmed']);
        define('_CFG_MAX_TLENGTH'   , $_CONFIG['max_tlength']);
 
-       if ($_CONFIG['test_text'] == 'N') {
+       if ($_CONFIG['test_text'] == "N") {
                define('_CFG_TEST_TEXT_N', ' checked');
                define('_CFG_TEST_TEXT_Y', "");
        } else {
@@ -107,7 +107,7 @@ if (isset($_POST['ok'])) {
                        break;
        }
 
-       if ($_CONFIG['test_subj'] == 'N') {
+       if ($_CONFIG['test_subj'] == "N") {
                define('_CFG_TEST_SUBJ_N', ' checked');
                define('_CFG_TEST_SUBJ_Y', "");
        } else {
@@ -115,7 +115,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_TEST_SUBJ_Y', ' checked');
        }
 
-       if ($_CONFIG['url_blacklist'] == 'N') {
+       if ($_CONFIG['url_blacklist'] == "N") {
                define('_CFG_URL_BLIST_N', ' checked');
                define('_CFG_URL_BLIST_Y', "");
        } else {
index 2421b01..b6dd012 100644 (file)
@@ -97,7 +97,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_PROF_REUPDATE' , "<INPUT type=\"text\" name=\"resend_profile_update\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['resend_profile_update'] ."\"> <FONT class=\"tiny\">(".SECS.")</FONT>");
        }
 
-       if ($_CONFIG['order_multi_page'] == 'N') {
+       if ($_CONFIG['order_multi_page'] == "N") {
                define('_CFG_ORDER_MULTI_N', ' checked');
                define('_CFG_ORDER_MULTI_Y', "");
        } else {
@@ -105,7 +105,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_ORDER_MULTI_Y', ' checked');
        }
 
-       if ($_CONFIG['autosend_active'] == 'N') {
+       if ($_CONFIG['autosend_active'] == "N") {
                define('_CFG_AUTOSEND_ACTIVE_N', ' checked');
                define('_CFG_AUTOSEND_ACTIVE_Y', "");
        } else {
@@ -113,7 +113,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_AUTOSEND_ACTIVE_Y', ' checked');
        }
 
-       if ($_CONFIG['send_prof_update'] == 'N') {
+       if ($_CONFIG['send_prof_update'] == "N") {
                define('_CFG_SEND_UPDATE_N', ' checked');
                define('_CFG_SEND_UPDATE_Y', "");
        } else {
@@ -121,7 +121,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_SEND_UPDATE_Y', ' checked');
        }
 
-       if ($_CONFIG['admin_notify'] == 'N') {
+       if ($_CONFIG['admin_notify'] == "N") {
                define('_CFG_ADMIN_NOTIFY_N', ' checked');
                define('_CFG_ADMIN_NOTIFY_Y', "");
        } else {
@@ -137,7 +137,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_CSS_PHP_FILE', ' checked');
        }
 
-       if ($_CONFIG['guest_menu'] == 'Y') {
+       if ($_CONFIG['guest_menu'] == "Y") {
                define('_CFG_GUEST_MENU_ACTIVE', ' checked');
                define('_CFG_GUEST_MENU_INACTIVE', "");
        } else {
@@ -145,7 +145,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_GUEST_MENU_INACTIVE', ' checked');
        }
 
-       if ($_CONFIG['member_menu'] == 'Y') {
+       if ($_CONFIG['member_menu'] == "Y") {
                define('_CFG_MEMBER_MENU_ACTIVE', ' checked');
                define('_CFG_MEMBER_MENU_INACTIVE', "");
        } else {
@@ -153,7 +153,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_MEMBER_MENU_INACTIVE', ' checked');
        }
 
-       if ($_CONFIG['youre_here'] == 'Y') {
+       if ($_CONFIG['youre_here'] == "Y") {
                define('_CFG_YOURE_HERE_ACTIVE', ' checked');
                define('_CFG_YOURE_HERE_INACTIVE', "");
        } else {
@@ -161,7 +161,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_YOURE_HERE_INACTIVE', ' checked');
        }
 
-       if ($_CONFIG['show_timings'] == 'Y') {
+       if ($_CONFIG['show_timings'] == "Y") {
                define('_CFG_SHOW_TIMINGS_Y', ' checked');
                define('_CFG_SHOW_TIMINGS_N', "");
        } else {
index 02ed535..0d3faf7 100644 (file)
@@ -262,7 +262,7 @@ WHERE d.admin_id=a.id ORDER BY start_time DESC", __FILE__, __LINE__);
                while (list($id, $aid, $start, $end, $title, $alogin, $active) = SQL_FETCHROW($result))
                {
                        $select = "<INPUT type=\"checkbox\" name=\"sel[".$id."]\" class=\"admin_normal\" value=\"1\">";
-                       if ($active == 'Y') $select = "<STRONG class=\"big\">".$id."</STRONG>";
+                       if ($active == "Y") $select = "<STRONG class=\"big\">".$id."</STRONG>";
 
                        // Prepare data for the row template
                        $content = array(
index f02d461..9d16d7b 100644 (file)
@@ -47,7 +47,7 @@ if (isset($_POST['ok']))
        foreach ($_POST['mod'] as $mod=>$sel)
        {
                // Now you can never deselect the admin module, bah!!! ;-)
-               if (($sel == 'Y') || ($mod == "admin"))
+               if (($sel == "Y") || ($mod == "admin"))
                {
                        // Add module to queue
                        $MODs[] = $mod;
index b761a95..bf5e182 100644 (file)
@@ -55,12 +55,12 @@ if (!empty($_GET['reg_ext'])) {
        // De-/activate extensions
        foreach ($_POST['sel'] as $id=>$active) {
                // Shall we keep the extension always active?
-               if ((isset($cacheArray['active_extensions'][GET_EXT_NAME($id)])) && ($cacheArray['active_extensions'][GET_EXT_NAME($id)] == 'Y') && ($active == 'N')) {
+               if ((isset($cacheArray['active_extensions'][GET_EXT_NAME($id)])) && ($cacheArray['active_extensions'][GET_EXT_NAME($id)] == "Y") && ($active == "N")) {
                        // Keep this extension active!
                } else {
                        // De/activate extension
-                       $ACT = 'N'; $EXT_LOAD_MODE = "deactivate";
-                       if ($active == 'N') { $ACT = 'Y'; $EXT_LOAD_MODE = "activate"; }
+                       $ACT = "N"; $EXT_LOAD_MODE = "deactivate";
+                       if ($active == "N") { $ACT = "Y"; $EXT_LOAD_MODE = "activate"; }
                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='".$ACT."' WHERE id=%d AND ext_active='%s' LIMIT 1",
                         array(bigintval($id), $active), __FILE__, __LINE__);
 
@@ -111,7 +111,7 @@ if (!empty($_GET['reg_ext'])) {
                $SW = "2"; $OUT = "";
                foreach ($_POST['sel'] as $id=>$sel) {
                        // Edit this extension?
-                       if (($sel == 'Y') || ($sel == 'N')) {
+                       if (($sel == "Y") || ($sel == "N")) {
                                // Load required data
                                if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
                                        $result = SQL_QUERY_ESC("SELECT ext_name, ext_has_css, ext_active FROM "._MYSQL_PREFIX."_extensions WHERE id=%d LIMIT 1",
index 8bf3d0e..67926c0 100644 (file)
@@ -40,7 +40,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
-if ($_CONFIG['beg_rallye'] == 'Y')
+if ($_CONFIG['beg_rallye'] == "Y")
 {
        // Shall I withdraw now?
        if (isset($_POST['withdraw']))
index 4a0e5d2..721ee92 100644 (file)
@@ -40,7 +40,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
-if ($_CONFIG['bonus_active'] == 'Y')
+if ($_CONFIG['bonus_active'] == "Y")
 {
        // Shall I withdraw now?
        if (isset($_POST['withdraw']))
@@ -58,11 +58,11 @@ if ($_CONFIG['bonus_active'] == 'Y')
        {
                // 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
index 157025c..43f8314 100644 (file)
@@ -148,7 +148,7 @@ if (!empty($_GET['pid']))
                                                $msg = LOAD_EMAIL_TEMPLATE("member_payout_accepted", $_POST['text'], $uid);
 
                                                // Output message
-                                               if ($allow == 'Y')
+                                               if ($allow == "Y")
                                                {
                                                        // Banner / Textlink request
                                                        LOAD_TEMPLATE("admin_settings_saved", false, PAYOUT_BANNER_ACCEPTED_NOTIFIED);
@@ -259,7 +259,7 @@ ORDER BY p.payout_timestamp DESC", __FILE__, __LINE__);
                        }
 
                        // Nothing entered must be secured in member/what-payputs.php !
-                       if ($allow == 'Y')
+                       if ($allow == "Y")
                        {
                                // Banner/Textlink views/clicks request
                                if (!empty($banner))
index 923926c..3b0bd43 100644 (file)
@@ -47,12 +47,12 @@ if (isset($_POST['ok']))
        switch ($_CONFIG['maintenance'])
        {
        case 'Y':
-               $target_mode = 'N';
+               $target_mode = "N";
                $out = ADMIN_MAINTENANCE_DEACTIVATED;
                break;
 
        case 'N':
-               $target_mode = 'Y';
+               $target_mode = "Y";
                $out = ADMIN_MAINTENANCE_ACTIVATED;
                break;
        }
index ab8dbfa..ace9560 100644 (file)
@@ -93,8 +93,8 @@ if (isset($_POST['ok']))
                // Gettings points is oka, so we can add $USED later from
                if ($EXT_HTML)
                {
-                       $HTML = 'N';
-                       if ($_GET['mode'] == "html") $HTML = 'Y';
+                       $HTML = "N";
+                       if ($_GET['mode'] == "html") $HTML = "Y";
                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
 (subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, html_msg)
 VALUES ('%s', '%s', '%s', '%s', '%s', 'NEW', UNIX_TIMESTAMP(), '%s', '%s', '%s', '%s', '%s')",
index 538a432..4c8efda 100644 (file)
@@ -52,7 +52,7 @@ if ($SEL > 0) {
                // Shall I de-/activate or delete themes?
                if (isset($_POST['status'])) {
                        // Change status
-                       if ($_POST['active'][$id] == 'Y') {
+                       if ($_POST['active'][$id] == "Y") {
                                $SQL = "UPDATE "._MYSQL_PREFIX."_themes SET theme_active='N' WHERE id='".$id."' LIMIT 1";
                        } else {
                                $SQL = "UPDATE "._MYSQL_PREFIX."_themes SET theme_active='Y' WHERE id='".$id."' LIMIT 1";
index 296edeb..ddc051d 100644 (file)
@@ -82,7 +82,7 @@ if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock'])))
                                        SQL_FREERESULT($result);
 
                                        // Check for bonus extension version >= 0.4.4 for the order bonus
-                                       if ((GET_EXT_VERSION("bonus") >= "0.4.4") && ($_CONFIG['bonus_active'] == 'Y'))
+                                       if ((GET_EXT_VERSION("bonus") >= "0.4.4") && ($_CONFIG['bonus_active'] == "Y"))
                                        {
                                                // Add points directly
                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET bonus_order=bonus_order+".$_CONFIG['bonus_order']." WHERE userid=%d LIMIT 1",
index 2812aa8..59096e7 100644 (file)
@@ -85,12 +85,12 @@ if (SQL_NUMROWS($result) > 0)
                if ($action == "") $action = "---";
                if ($what   == "")   $what = "---";
 
-               if ($admin == 'Y')
+               if ($admin == "Y")
                {
                        // Is an administrator
                        $userid = _IS_ADMIN;
                }
-               elseif (($mem == 'N') && ($admin == 'N'))
+               elseif (($mem == "N") && ($admin == "N"))
                {
                        // Is a guest
                        $userid = _IS_GUEST;
index 6e2533d..3a2a30b 100644 (file)
@@ -75,12 +75,12 @@ if (EXT_IS_ACTIVE("online", true))
                        if (empty($act)) $act = "---";
                        if (empty($wht))   $wht = "---";
 
-                       if ($admin == 'Y')
+                       if ($admin == "Y")
                        {
                                // Is an administrator
                                $uid = _IS_ADMIN;
                        }
-                        elseif (($mem == 'N') && ($admin == 'N'))
+                        elseif (($mem == "N") && ($admin == "N"))
                        {
                                // Is a guest
                                $uid = _IS_GUEST;
index 6ab20c0..14a9ee7 100644 (file)
@@ -53,7 +53,7 @@ if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash')) && (isSession
        set_session("mxchange_theme", $NewTheme);
 
        $bonus = false;
-       if ((GET_EXT_VERSION("sql_patches") >= "0.2.8") && (GET_EXT_VERSION("bonus") >= "0.2.1") && ($_CONFIG['bonus_login_yn'] == 'N') && ($_CONFIG['bonus_login_yn'] == 'Y')) {
+       if ((GET_EXT_VERSION("sql_patches") >= "0.2.8") && (GET_EXT_VERSION("bonus") >= "0.2.1") && ($_CONFIG['bonus_login_yn'] == "N") && ($_CONFIG['bonus_login_yn'] == "Y")) {
                // Update last login
                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
 SET last_login=UNIX_TIMESTAMP()
index 4749ab6..6ecc2d4 100644 (file)
@@ -91,7 +91,7 @@ if (!empty($_GET['hash']))
                                        }
 
                                        // If version matches add ref bonus to refid's account
-                                       if ((GET_EXT_VERSION("bonus") >= "0.4.4") && ($_CONFIG['bonus_active'] == 'Y'))
+                                       if ((GET_EXT_VERSION("bonus") >= "0.4.4") && ($_CONFIG['bonus_active'] == "Y"))
                                        {
                                                // Add points (directly only!)
                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET bonus_ref=bonus_ref+%s WHERE userid=%d LIMIT 1",
index 59ffc72..758da7a 100644 (file)
@@ -77,7 +77,7 @@ if (isset($_POST['ok']))
        // First we only check the submitted data then we continue... :)
        //
        // Did he agree to our Terms Of Usage?
-       if ($_POST['agree'] != 'Y')
+       if ($_POST['agree'] != "Y")
        {
                $_POST['agree'] = "!";
                $FAILED = true;
@@ -133,7 +133,7 @@ if (isset($_POST['ok']))
                // Do this check only when no admin is logged in
                foreach ($_POST['cat'] as $id=>$answer)
                {
-                       if ($answer == 'Y') $cats++;
+                       if ($answer == "Y") $cats++;
                }
                if ($cats < $_CONFIG['least_cats'])
                {
@@ -141,7 +141,7 @@ if (isset($_POST['ok']))
                        $FAILED = true;
                }
        }
-       if (($_POST['addy'] != "!") && ($_CONFIG['check_double_email'] == 'Y') && (!IS_ADMIN()))
+       if (($_POST['addy'] != "!") && ($_CONFIG['check_double_email'] == "Y") && (!IS_ADMIN()))
        {
                // Does the email address already exists in our database?
                $CHK = SEARCH_EMAIL_USERTAB($_POST['addy']);
@@ -198,7 +198,7 @@ if ((isset($_POST['ok'])) && (!$FAILED))
        if (GET_EXT_VERSION("beg") >= "0.1.7")
        {
                // Okay, shall I disable now?
-               if ($_CONFIG['beg_new_mem_notify'] == 'N')
+               if ($_CONFIG['beg_new_mem_notify'] == "N")
                {
                        $ADD1 .= ", beg_ral_notify, beg_ral_en_notify";
                        $ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()";
@@ -209,7 +209,7 @@ if ((isset($_POST['ok'])) && (!$FAILED))
        if (GET_EXT_VERSION("bonus") >= "0.7.7")
        {
                // Okay, shall I disable now?
-               if ($_CONFIG['bonus_new_mem_notify'] == 'N')
+               if ($_CONFIG['bonus_new_mem_notify'] == "N")
                {
                        $ADD1 .= ", bonus_ral_notify, bonus_ral_en_notify";
                        $ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()";
@@ -286,7 +286,7 @@ array(
        // Write catgories
        if ((is_array($_POST['cat'])) && (count($_POST['cat']))) {
                foreach ($_POST['cat'] as $cat=>$joined) {
-                       if ($joined == 'Y') {
+                       if ($joined == "Y") {
                                // Insert category entry
                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_cats (userid, cat_id) VALUES (%d, %d)",
                                 array(bigintval($userid), bigintval($cat)), __FILE__, __LINE__);
@@ -438,7 +438,7 @@ array(
        }
 
        // Shall I display the refid or shall I make it editable?
-       if ($_CONFIG['display_refid'] == 'Y') {
+       if ($_CONFIG['display_refid'] == "Y") {
                // Load template to enter it
                define('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid", true, $GLOBALS['refid']));
        } else {
index 30a8b1c..006eca1 100644 (file)
@@ -87,7 +87,7 @@ if (empty($GLOBALS['action']))
 }
 
 // Add the guest's menu here...
-if (($_CONFIG['guest_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true)))
+if (($_CONFIG['guest_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true)))
 {
        // Show only when guest menu is active
        ADD_MENU("guest", $act, $GLOBALS['what']);
@@ -108,7 +108,7 @@ if ((file_exists($INC_ACTION)) && (is_readable($INC_ACTION)) && (VALIDATE_MENU_A
        LOAD_URL("modules.php?module=index");
 }
 
-if (($_CONFIG['guest_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true)))
+if (($_CONFIG['guest_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true)))
 {
        // TDs between content and </table>
        LOAD_TEMPLATE("guest_content_footer");
index b692e3e..f220ec1 100644 (file)
@@ -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("   </TD>
   <TD valign=\"top\" align=\"center\" rowspan=\"3\" class=\"member_content\">");
 
-$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("  <br /></TD>
 </TR>
index 48fbd70..8ddf806 100644 (file)
@@ -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
index ec2a5d4..9a4473c 100644 (file)
@@ -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'])
                {
index 46d0028..f2db3cf 100644 (file)
@@ -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);
index 0fe44b6..451a68e 100644 (file)
@@ -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', "");
index 20f9efe..6d21c0c 100644 (file)
@@ -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",
index 752a316..9635d3d 100644 (file)
@@ -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', "<TR><TD colspan=\"5\" height=\"5\" class=\"seperator\">&nbsp;</TD></TR>");
                                        }
                                        // 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 = "<TR><TD colspan=\"2\" class=\"seperator bottom2\" height=\"5\">&nbsp;</TD></TR>\n";
+                                               if (($_CONFIG['order_multi_page'] == "Y") || (IS_ADMIN())) $ADD = "<TR><TD colspan=\"2\" class=\"seperator bottom2\" height=\"5\">&nbsp;</TD></TR>\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', "<TR><TD colspan=\"2\"><INPUT type=\"hidden\" name=\"html\" value=\"N\"></TD></TR>");
                                        }
                                        // 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(
index c7eb1fb..3ed797f 100644 (file)
@@ -109,7 +109,7 @@ ORDER BY p.payout_timestamp DESC",
                                $status = "<FONT class=\"member_failed\">".$status."</FONT>";
 
                                // 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");
index 777498b..fe94025 100644 (file)
@@ -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"))) {
index 7e65b6f..a3193b8 100644 (file)
@@ -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)
 {
index 4b7259f..f64f69b 100644 (file)
@@ -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));
index ed17e83..d66358d 100644 (file)
@@ -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 >=";
index e425c8f..12da67f 100644 (file)
@@ -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
index b13ac02..ef2e46d 100644 (file)
@@ -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."<STRONG><A class=\"you_are_here\" href=\"".URL."/modules.php?module=".$MOD_CHECK."&amp;".$type."=".$search.$LINK_ADD."\">".$ret."</A></STRONG>\n";
                        //* DEBUG: */ echo __LINE__."*".$type."/".$GLOBALS['what']."*<br />\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
index 1c06e7f..c110f34 100644 (file)
@@ -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]);
index 79aa02f..24b0319 100644 (file)
@@ -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']);
index a8501ad..0731b9b 100644 (file)
@@ -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);
index e85392b..f8fbe88 100644 (file)
@@ -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 (file)
index 0000000..4508762
--- /dev/null
@@ -0,0 +1,24 @@
+Hallo lieber Administrator,
+
+hier ist Ihr angefordeter Reset-Link, den Sie zum Zur&uuml;cksetzen Ihres Administratorkennworts ben&ouml;tigen.
+
+------------------------------
+{!URL!}/modules.php?module=admin&reset_pass=1&hash=$content[hash]
+------------------------------
+
+Wenn Sie auf diesen Link klicken, ist Ihr Passwort noch nicht zur&uuml;ckgesetzt. Bitte geben Sie zur Best&auml;tigung Ihr Loginname ein. Dann erst k&ouml;nnen Sie Ihr Passwort &auml;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
index 8820261..b265221 100644 (file)
@@ -1,4 +1,4 @@
-X-Mailer: {!TITLE!} {!VERSION!}
+X-Mailer: {!TITLE!} {!FULL_VERSION!}
 Errors-To: {!WEBMASTER!}
 X-Loop: {!WEBMASTER!}
 From: {!MAIN_TITLE!} <{!WEBMASTER!}>
index 5d90196..7a41031 100644 (file)
@@ -9,7 +9,7 @@
        </TR>
        <TR>
                <TD class="admin_title" colspan="3" align="center">
-               {--ADMIN_ADD_POINTS_TO_USER--}:<BR>
+               {--ADMIN_ADD_POINTS_TO_USER--}:<BR />
                <STRONG>{!__USER_VALUE!}</STRONG></TD>
        </TR>
        <TR>
index 9ef6edc..d3b2053 100644 (file)
@@ -45,7 +45,7 @@
                <TD width="200" align="right" valign="top">{--RALLYE_START_DAY--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="290" align="center">{--_START_DAY--}.
-               {--_START_MONTH--}. {--_START_YEAR--}<BR>
+               {--_START_MONTH--}. {--_START_YEAR--}<BR />
                {--_START_HOUR--}: {--_START_MIN--}: {--_START_SEC--}</TD>
        </TR>
        <TR>
@@ -58,7 +58,7 @@
                <TD align="right" valign="top">{--RALLYE_END_DAY--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center">{--_END_DAY--}. {--_END_MONTH--}.
-               {--_END_YEAR--}<BR>
+               {--_END_YEAR--}<BR />
                {--_END_HOUR--}: {--_END_MIN--}: {--_END_SEC--}</TD>
        </TR>
        <TR>
index 32682e8..8c75740 100644 (file)
@@ -7,13 +7,13 @@
 </TR>
 <TR><TD height="8" colspan="3" class="seperator">&nbsp;</TD></TR>
 <TR>
-  <TD width="350" align="right">{--SPONSOR_PAYTYPE_NAME--}:<BR><FONT class="tiny">{--SPONSOR_PAYTYPE_NAME_HINT--}</FONT></TD>
+  <TD width="350" align="right">{--SPONSOR_PAYTYPE_NAME--}:<BR /><FONT class="tiny">{--SPONSOR_PAYTYPE_NAME_HINT--}</FONT></TD>
   <TD width="10" class="seperator">&nbsp;</TD>
   <TD width="200"><INPUT type="text" name="pay_name" size="10" maxlength="255" class="admin_normal"></TD>
 </TR>
 <TR><TD height="8" colspan="3" class="seperator">&nbsp;</TD></TR>
 <TR>
-  <TD width="350" align="right">{--SPONSOR_PAYTYPE_RATE--}:<BR><FONT class="tiny">{--SPONSOR_PAYTYPE_RATE_HINT--}</FONT></TD>
+  <TD width="350" align="right">{--SPONSOR_PAYTYPE_RATE--}:<BR /><FONT class="tiny">{--SPONSOR_PAYTYPE_RATE_HINT--}</FONT></TD>
   <TD width="10" class="seperator">&nbsp;</TD>
   <TD width="200"><INPUT type="text" name="pay_rate" size="7" maxlength="25" class="admin_normal" value="0.00000"></TD>
 </TR>
 </FORM>
 <DIV align="center">
   <FONT class="admin_note tiny">
-    <U><B>{--SPONSOR_ADD_PAYTYPES_NOTES--}:</B></U><BR>
-    <BR>
-    <STRONG>{--SPONSOR_PAYTYPE_NAME--}:</STRONG>&nbsp;{--SPONSOR_PAYTYPE_NAME_NOTE--}<BR>
-    <STRONG>{--SPONSOR_PAYTYPE_RATE--}:</STRONG>&nbsp;{--SPONSOR_PAYTYPE_RATE_NOTE--}<BR>
-    <STRONG>{--SPONSOR_PAYTYPE_MIN_COUNT--}:</STRONG>&nbsp;{--SPONSOR_PAYTYPE_MIN_COUNT_NOTE--}<BR>
-    <STRONG>{--SPONSOR_PAYTYPE_CURRENCY--}:</STRONG>&nbsp;{--SPONSOR_PAYTYPE_CURRENCY_NOTE--}<BR>
+    <U><STRONG>{--SPONSOR_ADD_PAYTYPES_NOTES--}:</STRONG></U><BR />
+    <BR />
+    <STRONG>{--SPONSOR_PAYTYPE_NAME--}:</STRONG>&nbsp;{--SPONSOR_PAYTYPE_NAME_NOTE--}<BR />
+    <STRONG>{--SPONSOR_PAYTYPE_RATE--}:</STRONG>&nbsp;{--SPONSOR_PAYTYPE_RATE_NOTE--}<BR />
+    <STRONG>{--SPONSOR_PAYTYPE_MIN_COUNT--}:</STRONG>&nbsp;{--SPONSOR_PAYTYPE_MIN_COUNT_NOTE--}<BR />
+    <STRONG>{--SPONSOR_PAYTYPE_CURRENCY--}:</STRONG>&nbsp;{--SPONSOR_PAYTYPE_CURRENCY_NOTE--}<BR />
   </FONT>
 </DIV>
index c04eb32..9eac064 100644 (file)
@@ -1,7 +1,5 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=admin_add"
-       method="POST" target="_self">
-<TABLE border="0" cellspacing="0" cellpadding="0" width="500"
-       align="center" class="admin_title dashed">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=admin_add" method="POST" target="_self">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
        <TR>
                <TD height="8" colspan="5"></TD>
        </TR>
@@ -21,7 +19,7 @@
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_WHAT_NAME--}:</TD>
                <TD width="10">&nbsp;</TD>
-               <TD class="admin_table" align="center">{--__WHAT_SELECTION--} <BR>
+               <TD class="admin_table" align="center">{--__WHAT_SELECTION--} <BR />
                <SPAN class="admin_note">({--CREATE_WHAT_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
@@ -32,7 +30,7 @@
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_PARENT_MENU--}:</TD>
                <TD width="10">&nbsp;</TD>
-               <TD class="admin_table" align="center">{--__ACTION_SELECTION--} <BR>
+               <TD class="admin_table" align="center">{--__ACTION_SELECTION--} <BR />
                <SPAN class="admin_note">({--CREATE_ACTION_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
index d433495..8a785da 100644 (file)
@@ -12,7 +12,7 @@
                <TD colspan="3" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
-               <TD colspan="3" align="center">{--ADMINS_ENTER_CONTACT_TEXT--}:<BR>
+               <TD colspan="3" align="center">{--ADMINS_ENTER_CONTACT_TEXT--}:<BR />
                <TEXTAREA class="admin_normal" name="text" rows="5" cols="40"></TEXTAREA>
                </TD>
        </TR>
index 923557b..908317a 100644 (file)
@@ -12,7 +12,7 @@
                <TD colspan="3" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
-               <TD colspan="3" align="center">{--ADMINS_ENTER_CONTACT_TEXT--}:<BR>
+               <TD colspan="3" align="center">{--ADMINS_ENTER_CONTACT_TEXT--}:<BR />
                <TEXTAREA class="admin_normal" name="text" rows="5" cols="40"></TEXTAREA>
                </TD>
        </TR>
index e9c1d8f..96dd9b8 100644 (file)
@@ -1,8 +1,8 @@
 <FONT class="tiny">{--ADMINS_ADD_MORE_ADMINS--}:</FONT>
-<BR>
+<BR />
 <SELECT name="admin_new[$content[template]]" size="1"
        class="admin_select">
        <OPTION value="x">{--SELECT_NONE--}</OPTION>
        $content[admins]
 </SELECT>
-<BR>
+<BR />
index 6ea8cb6..efdf531 100644 (file)
@@ -77,7 +77,7 @@
        </TR>
        <TR>
                <TD align="right" height="20"><INPUT type="radio" name="beg_mode"
-                       class="admin_normal" value="DIRECT"{--__BEG_MODE_DIRECT--}>&nbsp;{--BEG_MODE_DIRECT--}<BR>
+                       class="admin_normal" value="DIRECT"{--__BEG_MODE_DIRECT--}>&nbsp;{--BEG_MODE_DIRECT--}<BR />
                </TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_mode"
@@ -98,7 +98,7 @@
                <TD align="right" height="20">{--ADMIN_BEG_RALLYE_ACTIVE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_rallye"
-                       class="admin_normal" value="Y"{--__BEG_RALLYE_Y--}>&nbsp;{--YES--}<BR>
+                       class="admin_normal" value="Y"{--__BEG_RALLYE_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="beg_rallye" class="admin_normal" value="N"{--__BEG_RALLYE_N--}>&nbsp;{--NO--}
                </TD>
        </TR>
                <TD align="right" height="20">{--ADMIN_BEG_INCLUDE_OWN--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_include_own"
-                       class="admin_normal" value="Y"{--__BEG_INCLUDE_OWN_Y--}>&nbsp;{--YES--}<BR>
+                       class="admin_normal" value="Y"{--__BEG_INCLUDE_OWN_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="beg_include_own" class="admin_normal"
                        value="N"{--__BEG_INCLUDE_OWN_N--}>&nbsp;{--NO--}</TD>
        </TR>
                </TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_active"
-                       class="admin_normal" value="Y"{--__BEG_ACTIVE_Y--}>&nbsp;{--YES--}<BR>
+                       class="admin_normal" value="Y"{--__BEG_ACTIVE_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="beg_active" class="admin_normal" value="N"{--__BEG_ACTIVE_N--}>&nbsp;{--NO--}
                </TD>
        </TR>
                <TD align="right" height="20">{--ADMIN_BEG_RAL_EN_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_ral_en_notify"
-                       class="admin_normal" value="Y"{--__BEG_RAL_EN_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
+                       class="admin_normal" value="Y"{--__BEG_RAL_EN_NOTIFY_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="beg_ral_en_notify" class="admin_normal"
                        value="N"{--__BEG_RAL_EN_NOTIFY_N--}>&nbsp;{--NO--}</TD>
        </TR>
                <TD align="right" height="20">{--ADMIN_BEG_RAL_DI_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_ral_di_notify"
-                       class="admin_normal" value="Y"{--__BEG_RAL_DI_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
+                       class="admin_normal" value="Y"{--__BEG_RAL_DI_NOTIFY_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="beg_ral_di_notify" class="admin_normal"
                        value="N"{--__BEG_RAL_DI_NOTIFY_N--}>&nbsp;{--NO--}</TD>
        </TR>
                <TD align="right" height="20">{--ADMIN_BEG_NEW_MEMBER_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_new_mem_notify"
-                       class="admin_normal" value="Y"{--__BEG_NEW_MEMBER_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
+                       class="admin_normal" value="Y"{--__BEG_NEW_MEMBER_NOTIFY_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="beg_new_mem_notify" class="admin_normal"
                        value="N"{--__BEG_NEW_MEMBER_NOTIFY_N--}>&nbsp;{--NO--}</TD>
        </TR>
index ad5cb57..8c6daa2 100644 (file)
@@ -10,7 +10,7 @@
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
-               <TD width="400" align="right">{--ADMIN_BIRTHDAY_POINTS--}:<BR>
+               <TD width="400" align="right">{--ADMIN_BIRTHDAY_POINTS--}:<BR />
                <FONT class="admin_note">({--ADMIN_BIRTHDAY_POINTS_NOTE--})</FONT></TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="170"><INPUT type="text" name="birthday_points"
@@ -27,7 +27,7 @@
                <TD align="right" height="20">{--ADMIN_BIRTHDAY_ONLY_ACTIVE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="birthday_active"
-                       class="admin_normal" value="Y"{--__BIRTHDAY_ACTIVE_Y--}>&nbsp;{--YES--}<BR>
+                       class="admin_normal" value="Y"{--__BIRTHDAY_ACTIVE_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="birthday_active" class="admin_normal"
                        value="N"{--__BIRTHDAY_ACTIVE_N--}>&nbsp;{--NO--}</TD>
        </TR>
@@ -43,7 +43,7 @@
        </TR>
        <TR>
                <TD align="right" height="20"><INPUT type="radio"
-                       name="birthday_mode" class="admin_normal" value="DIRECT"{--__BIRTHDAY_MODE_DIRECT--}>&nbsp;{--BIRTHDAY_MODE_DIRECT--}<BR>
+                       name="birthday_mode" class="admin_normal" value="DIRECT"{--__BIRTHDAY_MODE_DIRECT--}>&nbsp;{--BIRTHDAY_MODE_DIRECT--}<BR />
                </TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="birthday_mode"
index f15c8b6..586aedf 100644 (file)
@@ -14,7 +14,7 @@
                &nbsp;{--ADMIN_BONUS_RALLYE_IS_ACTIVE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_active" class="admin_normal" value="Y"{--__BONUS_ACTIVE_Y--}>&nbsp;{--YES--}<BR>
+                       name="bonus_active" class="admin_normal" value="Y"{--__BONUS_ACTIVE_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_active" class="admin_normal" value="N"{--__BONUS_ACTIVE_N--}>&nbsp;{--NO--}
                </TD>
        </TR>
@@ -26,7 +26,7 @@
                &nbsp;{--ADMIN_BONUS_INCLUDE_OWN--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_include_own" class="admin_normal" value="Y"{--__BONUS_INCLUDE_OWN_Y--}>&nbsp;{--YES--}<BR>
+                       name="bonus_include_own" class="admin_normal" value="Y"{--__BONUS_INCLUDE_OWN_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_include_own" class="admin_normal"
                        value="N"{--__BONUS_INCLUDE_OWN_N--}>&nbsp;{--NO--}</TD>
        </TR>
@@ -41,7 +41,7 @@
                &nbsp;{--ADMIN_BONUS_RALLYE_CLICK_INCLUDE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_click_yn" class="admin_normal" value="Y"{--__BONUS_CLICK_Y--}>&nbsp;{--YES--}<BR>
+                       name="bonus_click_yn" class="admin_normal" value="Y"{--__BONUS_CLICK_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_click_yn" class="admin_normal"
                        value="N"{--__BONUS_CLICK_N--}>&nbsp;{--NO--}</TD>
        </TR>
@@ -56,7 +56,7 @@
                &nbsp;{--ADMIN_BONUS_RALLYE_LOGIN_INCLUDE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_login_yn" class="admin_normal" value="Y"{--__BONUS_LOGIN_Y--}>&nbsp;{--YES--}<BR>
+                       name="bonus_login_yn" class="admin_normal" value="Y"{--__BONUS_LOGIN_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_login_yn" class="admin_normal"
                        value="N"{--__BONUS_LOGIN_N--}>&nbsp;{--NO--}</TD>
        </TR>
@@ -71,7 +71,7 @@
                &nbsp;{--ADMIN_BONUS_RALLYE_ORDER_INCLUDE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_order_yn" class="admin_normal" value="Y"{--__BONUS_ORDER_Y--}>&nbsp;{--YES--}<BR>
+                       name="bonus_order_yn" class="admin_normal" value="Y"{--__BONUS_ORDER_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_order_yn" class="admin_normal"
                        value="N"{--__BONUS_ORDER_N--}>&nbsp;{--NO--}</TD>
        </TR>
@@ -86,7 +86,7 @@
                &nbsp;{--ADMIN_BONUS_RALLYE_STATS_INCLUDE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_stats_yn" class="admin_normal" value="Y"{--__BONUS_STATS_Y--}>&nbsp;{--YES--}<BR>
+                       name="bonus_stats_yn" class="admin_normal" value="Y"{--__BONUS_STATS_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_stats_yn" class="admin_normal"
                        value="N"{--__BONUS_STATS_N--}>&nbsp;{--NO--}</TD>
        </TR>
                &nbsp;{--ADMIN_BONUS_RALLYE_REF_INCLUDE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_ref_yn" class="admin_normal" value="Y"{--__BONUS_REF_Y--}>&nbsp;{--YES--}<BR>
+                       name="bonus_ref_yn" class="admin_normal" value="Y"{--__BONUS_REF_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_ref_yn" class="admin_normal" value="N"{--__BONUS_REF_N--}>&nbsp;{--NO--}
                </TD>
        </TR>
        </TR>
        <TR>
                <TD align="right" height="20" valign="top">
-               {--ADMIN_BONUS_TURBO_RATES--}:<BR>
-               <BR>
+               {--ADMIN_BONUS_TURBO_RATES--}:<BR />
+               <BR />
                <DIV align="left">
                <OL>
                        <LH>
                &nbsp;{--ADMIN_BONUS_RALLYE_EN_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_en_notify" class="admin_normal" value="Y"{--__BONUS_EN_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
+                       name="bonus_en_notify" class="admin_normal" value="Y"{--__BONUS_EN_NOTIFY_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_en_notify" class="admin_normal"
                        value="N"{--__BONUS_EN_NOTIFY_N--}>&nbsp;{--NO--}</TD>
        </TR>
                &nbsp;{--ADMIN_BONUS_RALLYE_DI_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_di_notify" class="admin_normal" value="Y"{--__BONUS_DI_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
+                       name="bonus_di_notify" class="admin_normal" value="Y"{--__BONUS_DI_NOTIFY_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_di_notify" class="admin_normal"
                        value="N"{--__BONUS_DI_NOTIFY_N--}>&nbsp;{--NO--}</TD>
        </TR>
                &nbsp;{--ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_new_mem_notify" class="admin_normal" value="Y"{--__BONUS_NEW_MEMBER_NOTIFY_Y--}>&nbsp;{--YES--}<BR>
+                       name="bonus_new_mem_notify" class="admin_normal" value="Y"{--__BONUS_NEW_MEMBER_NOTIFY_Y--}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_new_mem_notify" class="admin_normal"
                        value="N"{--__BONUS_NEW_MEMBER_NOTIFY_N--}>&nbsp;{--NO--}</TD>
        </TR>
index 3343638..dd6b391 100644 (file)
@@ -90,7 +90,7 @@
                <TD align="right" height="20">{--ADMIN_DOUBLER_SENT_ALL--}:</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD style="padding-left: 5px"><INPUT type="radio"
-                       name="doubler_sent_all" class="admin_normal" value="Y"{!__DOUBLER_SENT_ALL_Y!}>&nbsp;{--YES--}<BR>
+                       name="doubler_sent_all" class="admin_normal" value="Y"{!__DOUBLER_SENT_ALL_Y!}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="doubler_sent_all" class="admin_normal"
                        value="N"{!__DOUBLER_SENT_ALL_N!}>&nbsp;{--NO--}</TD>
        </TR>
                <TD align="right" height="20">{--ADMIN_DOUBLER_JACKPOT--}:</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD style="padding-left: 5px"><INPUT type="radio"
-                       name="doubler_jackpot" class="admin_normal" value="Y"{!__DOUBLER_JACKPOT_Y!}>&nbsp;{--YES--}<BR>
+                       name="doubler_jackpot" class="admin_normal" value="Y"{!__DOUBLER_JACKPOT_Y!}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="doubler_jackpot" class="admin_normal"
                        value="N"{!__DOUBLER_JACKPOT_N!}>&nbsp;{--NO--}</TD>
        </TR>
                <TD align="right" height="20">{--ADMIN_DOUBLER_OWN--}:</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD style="padding-left: 5px"><INPUT type="radio"
-                       name="doubler_own" class="admin_normal" value="Y"{!__DOUBLER_OWN_Y!}>&nbsp;{--YES--}<BR>
+                       name="doubler_own" class="admin_normal" value="Y"{!__DOUBLER_OWN_Y!}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="doubler_own" class="admin_normal" value="N"{!__DOUBLER_OWN_N!}>&nbsp;{--NO--}
                </TD>
        </TR>
        </TR>
        <TR>
                <TD align="center" height="20"><INPUT type="radio"
-                       name="doubler_send_mode" class="admin_normal" value="DIRECT"{!__DOUBLER_SEND_DIRECT!}><BR>
+                       name="doubler_send_mode" class="admin_normal" value="DIRECT"{!__DOUBLER_SEND_DIRECT!}><BR />
                </TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD style="padding-left: 5px"><INPUT type="radio"
-                       name="doubler_send_mode" class="admin_normal" value="RESET"{!__DOUBLER_SEND_RESET!}><BR>
+                       name="doubler_send_mode" class="admin_normal" value="RESET"{!__DOUBLER_SEND_RESET!}><BR />
                </TD>
        </TR>
        <TR>
index 57630c8..6817d59 100644 (file)
@@ -32,7 +32,7 @@
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD width="270"><INPUT type="radio" name="holiday_mode"
                        class="admin_normal" value="RESET"{!__RESET_DEFAULT!}">
-               {--HOLIDAY_ADMIN_MODE_RESET--}<BR>
+               {--HOLIDAY_ADMIN_MODE_RESET--}<BR />
                <INPUT type="radio" name="holiday_mode" class="admin_normal"
                        value="DIRECT"{!__DIRECT_DEFAULT!}">
                {--HOLIDAY_ADMIN_MODE_DIRECT--}</TD>
index 2072b66..80d4d90 100644 (file)
@@ -5,7 +5,7 @@
        class="admin_table dashed" width="510">
        <TR>
                <TD colspan="3" align="center" class="admin_title bottom2" height="30">
-               <B>{--ADMIN_EDIT_HOME_SETTINGS--}</B></TD>
+               <STRONG>{--ADMIN_EDIT_HOME_SETTINGS--}</STRONG></TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
index 75bb4bd..f44dc23 100644 (file)
@@ -45,6 +45,6 @@
 </TABLE>
 </FORM>
 
-<DIV class="admin_note"><STRONG><BIG>&middot;</BIG></STRONG>&nbsp;{--ADMIN_MEDIADATA_MT_START_NOTE--}<BR>
-<STRONG><BIG>&middot;</BIG></STRONG>&nbsp;{--ADMIN_MEDIADATA_MT_STAGE_NOTE--}<BR>
+<DIV class="admin_note"><STRONG><BIG>&middot;</BIG></STRONG>&nbsp;{--ADMIN_MEDIADATA_MT_START_NOTE--}<BR />
+<STRONG><BIG>&middot;</BIG></STRONG>&nbsp;{--ADMIN_MEDIADATA_MT_STAGE_NOTE--}<BR />
 </DIV>
index 3b07d7d..989f794 100644 (file)
                <TD align="right">{--ADMIN_OPTION_CSS_PHP--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><SPAN class="nobr"> <INPUT type="radio" name="css_php"
-                       value="DIRECT"{--_CFG_CSS_PHP_DIRECT--}>&nbsp;{--ADMIN_CSS_PHP_DIRECT--}<BR>
+                       value="DIRECT"{--_CFG_CSS_PHP_DIRECT--}>&nbsp;{--ADMIN_CSS_PHP_DIRECT--}<BR />
                <INPUT type="radio" name="css_php" value="FILE"{--_CFG_CSS_PHP_FILE--}>&nbsp;{--ADMIN_CSS_PHP_FILE--}
                </SPAN></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right">{--ADMIN_OPTION_GUEST_MENU--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><SPAN class="nobr"> <INPUT type="radio"
-                       name="guest_menu" value="Y"{--_CFG_GUEST_MENU_ACTIVE--}>&nbsp;{--ADMIN_GUEST_MENU_ACTIVE--}<BR>
+                       name="guest_menu" value="Y"{--_CFG_GUEST_MENU_ACTIVE--}>&nbsp;{--ADMIN_GUEST_MENU_ACTIVE--}<BR />
                <INPUT type="radio" name="guest_menu" value="N"{--_CFG_GUEST_MENU_INACTIVE--}>&nbsp;{--ADMIN_GUEST_MENU_INACTIVE--}
                </SPAN></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right">{--ADMIN_OPTION_MEMBER_MENU--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><SPAN class="nobr"> <INPUT type="radio"
-                       name="member_menu" value="Y"{--_CFG_MEMBER_MENU_ACTIVE--}>&nbsp;{--ADMIN_MEMBER_MENU_ACTIVE--}<BR>
+                       name="member_menu" value="Y"{--_CFG_MEMBER_MENU_ACTIVE--}>&nbsp;{--ADMIN_MEMBER_MENU_ACTIVE--}<BR />
                <INPUT type="radio" name="member_menu" value="N"{--_CFG_MEMBER_MENU_INACTIVE--}>&nbsp;{--ADMIN_MEMBER_MENU_INACTIVE--}
                </SPAN></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right">{--ADMIN_OPTION_YOURE_HERE--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><SPAN class="nobr"> <INPUT type="radio"
-                       name="youre_here" value="Y"{--_CFG_YOURE_HERE_ACTIVE--}>&nbsp;{--ADMIN_YOURE_HERE_ACTIVE--}<BR>
+                       name="youre_here" value="Y"{--_CFG_YOURE_HERE_ACTIVE--}>&nbsp;{--ADMIN_YOURE_HERE_ACTIVE--}<BR />
                <INPUT type="radio" name="youre_here" value="N"{--_CFG_YOURE_HERE_INACTIVE--}>&nbsp;{--ADMIN_YOURE_HERE_INACTIVE--}
                </SPAN></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right">{--ADMIN_OPTION_SHOW_TIMINGS--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><SPAN class="nobr">
-                       <INPUT type="radio" name="show_timings" value="Y"{--_CFG_SHOW_TIMINGS_Y--} />&nbsp;{--YES--}<BR>
+                       <INPUT type="radio" name="show_timings" value="Y"{--_CFG_SHOW_TIMINGS_Y--} />&nbsp;{--YES--}<BR />
                        <INPUT type="radio" name="show_timings" value="N"{--_CFG_SHOW_TIMINGS_N--} />&nbsp;{--NO--}
                </SPAN></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right">{--ADMIN_OPTION_MAILID_REDIRECT--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><SPAN class="nobr"> <INPUT type="radio"
-                       name="mailid_error_redirect" value="INDEX"{--_CFG_MAILID_REDIRECT_INDEX--}>&nbsp;{--ADMIN_CONFIG_MAILID_REDIRECT_INDEX--}<BR>
+                       name="mailid_error_redirect" value="INDEX"{--_CFG_MAILID_REDIRECT_INDEX--}>&nbsp;{--ADMIN_CONFIG_MAILID_REDIRECT_INDEX--}<BR />
                <INPUT type="radio" name="mailid_error_redirect" value="REJECT"{--_CFG_MAILID_REDIRECT_REJECT--}>&nbsp;{--ADMIN_CONFIG_MAILID_REDIRECT_REJECT--}
                </SPAN></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
index 4b4b45a..5ad1f14 100644 (file)
@@ -13,7 +13,7 @@
                {--ADMIN_CONFIG_DIRECT_PAY--}</TD>
                <TD width="240" align="right">
                {--ADMIN_CONFIG_POINTS_DIRECT--}&nbsp;<INPUT type="radio"
-                       name="allow_direct_pay" value="Y" class="admin_normal"{!__DIRECT_Y!}><BR>
+                       name="allow_direct_pay" value="Y" class="admin_normal"{!__DIRECT_Y!}><BR />
                <HR noshade width="220">
                {--ADMIN_CONFIG_POINTS_MAILS--}&nbsp;<INPUT type="radio"
                        name="allow_direct_pay" value="N" class="admin_normal"{!__DIRECT_N!}>
index d272dbe..45d2588 100644 (file)
@@ -2,7 +2,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="admin_table dashed" width="500">
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30">
-    <B>{--ADMIN_CONFIG_SPONSOR_TITLE--}</B>
+    <STRONG>{--ADMIN_CONFIG_SPONSOR_TITLE--}</STRONG>
   </TD>
 </TR>
 <TR><TD colspan="2" class="seperator" height="5">&nbsp;</TD></TR>
index e38bf27..d87f7ad 100644 (file)
@@ -10,7 +10,7 @@
                <TD colspan="3" height="5" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
-               <TD width="340" height="40" align="right"><STRONG>{--ADMIN_GSTATS_MEMBERS--}:</STRONG><BR>
+               <TD width="340" height="40" align="right"><STRONG>{--ADMIN_GSTATS_MEMBERS--}:</STRONG><BR />
                <FONT class="tiny">({--ADMIN_GSTATS_MEMBERS_NOTE--})</FONT></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="50"><INPUT type="radio" name="guest_stats"
@@ -23,7 +23,7 @@
                <TD colspan="3" height="5" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
-               <TD height="40" align="right"><STRONG>{--ADMIN_GSTATS_MODULES--}:</STRONG><BR>
+               <TD height="40" align="right"><STRONG>{--ADMIN_GSTATS_MODULES--}:</STRONG><BR />
                <FONT class="tiny">({--ADMIN_GSTATS_MODULES_NOTE--})</FONT></TD>
                <TD class="seperator">&nbsp;</TD>
                <TD><INPUT type="radio" name="guest_stats" class="admin_normal"
@@ -36,7 +36,7 @@
                <TD colspan="3" height="5" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
-               <TD height="40" align="right"><STRONG>{--ADMIN_GSTATS_INACTIVE--}:</STRONG><BR>
+               <TD height="40" align="right"><STRONG>{--ADMIN_GSTATS_INACTIVE--}:</STRONG><BR />
                <FONT class="tiny">({--ADMIN_GSTATS_INACTIVE_NOTE--})</FONT></TD>
                <TD class="seperator">&nbsp;</TD>
                <TD><INPUT type="radio" name="guest_stats" class="admin_normal"
index 8f6feec..54d299b 100644 (file)
@@ -46,7 +46,7 @@
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
-               <TD align="right">{--ADMIN_TRANSFER_CODE--}:<BR>
+               <TD align="right">{--ADMIN_TRANSFER_CODE--}:<BR />
                <FONT class="admin_note">({--ADMIN_TRANSFER_CODE_NOTE--})</FONT></TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD><INPUT type="text" name="transfer_code" class="admin_normal"
index 687865f..8973494 100644 (file)
@@ -4,7 +4,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="400"
        class="admin_table dashed" align="center">
        <TR>
-               <TD align="center" class="admin_title bottom2" height="30"><STRONG>{--ADMIN_CONTACT_USER--}:<BR>
+               <TD align="center" class="admin_title bottom2" height="30"><STRONG>{--ADMIN_CONTACT_USER--}:<BR />
                $content[surname] $content[family] &lt;<A
                        href="mailto:$content[email]">$content[email]</A>&gt;</STRONG></TD>
        </TR>
index 95b9799..a6db74d 100644 (file)
@@ -24,6 +24,6 @@
 </TABLE>
 </FORM>
 
-<DIV class="admin_note">{--ADMIN_ADMINS_ACL_NOTE--}<BR>
-<BR>
+<DIV class="admin_note">{--ADMIN_ADMINS_ACL_NOTE--}<BR />
+<BR />
 {--ADMIN_ADMINS_EDIT_NOTE--}</DIV>
index 652a52d..aa78fe7 100644 (file)
@@ -34,7 +34,7 @@
                valign="top">{--RALLYE_START_DAY--}:</TD>
        <TD class="switch_sw$content[sw] seperator" width="10">&nbsp;</TD>
        <TD class="switch_sw$content[sw]" width="290" align="center">
-       $content[s_day]. $content[s_month]. $content[s_year]<BR>
+       $content[s_day]. $content[s_month]. $content[s_year]<BR />
        $content[s_hour]: $content[s_min]: $content[s_sec]</TD>
 </TR>
 <TR>
@@ -45,7 +45,7 @@
                valign="top">{--RALLYE_END_DAY--}:</TD>
        <TD class="switch_sw$content[sw] seperator" width="10">&nbsp;</TD>
        <TD class="switch_sw$content[sw]" width="290" align="center">
-       $content[e_day]. $content[e_month]. $content[e_year]<BR>
+       $content[e_day]. $content[e_month]. $content[e_year]<BR />
        $content[e_hour]: $content[e_min]: $content[e_sec]</TD>
 </TR>
 <TR>
index 9eeedbd..295e3f0 100644 (file)
@@ -3,8 +3,8 @@
 <TR><TD class="admin_title seperator" height="10" colspan="3">&nbsp;</TD></TR>
 <TR>
   <TD class="admin_title" colspan="3" align="center">
-    {--ADMIN_ADD_POINTS_TO_SPONSOR--}:<BR>
-    <B>{--__SPONSOR_VALUE--}</B>
+    {--ADMIN_ADD_POINTS_TO_SPONSOR--}:<BR />
+    <STRONG>{--__SPONSOR_VALUE--}</STRONG>
   </TD>
 </TR>
 <TR><TD class="admin_title seperator bottom2" height="10" colspan="3">&nbsp;</TD></TR>
index 721de01..52371b8 100644 (file)
@@ -3,8 +3,8 @@
 <TR><TD class="admin_title seperator" height="10" colspan="3">&nbsp;</TD></TR>
 <TR>
   <TD class="admin_title" colspan="3" align="center">
-    {--ADMIN_SUB_POINTS_FROM_SPONSOR--}:<BR>
-    <B>{--__SPONSOR_VALUE--}</B>
+    {--ADMIN_SUB_POINTS_FROM_SPONSOR--}:<BR />
+    <STRONG>{--__SPONSOR_VALUE--}</STRONG>
   </TD>
 </TR>
 <TR><TD class="admin_title seperator bottom2" height="10" colspan="3">&nbsp;</TD></TR>
index 5819f9a..dec3b57 100644 (file)
@@ -1,12 +1,12 @@
 <TR>
        <TD class="switch_sw$content[sw] top2 bottom right" width="23%"
-               align="center">{--EMAIL_SENDER--}:<BR>
+               align="center">{--EMAIL_SENDER--}:<BR />
        <STRONG class="admin_misc">$content[u_link]</STRONG></TD>
        <TD class="switch_sw$content[sw] top2 bottom right" width="23%"
-               align="center">{--EMAIL_SUBJECT--}:<BR>
+               align="center">{--EMAIL_SUBJECT--}:<BR />
        <STRONG class="admin_misc">$content[subj]</STRONG></TD>
        <TD class="switch_sw$content[sw] top2 bottom" width="54%"
-               align="center">{--EMAIL_TEXT--}:<BR>
+               align="center">{--EMAIL_TEXT--}:<BR />
        <STRONG class="admin_misc">$content[text]</STRONG></TD>
 </TR>
 <TR>
 <TR>
        <TD colspan="2" align="center"
                class="switch_sw$content[sw] top bottom right">
-       {--EMAIL_PAYMENT--}:<BR>
+       {--EMAIL_PAYMENT--}:<BR />
        <STRONG class="admin_misc">$content[pay] </TD>
        <TD align="center" class="switch_sw$content[sw] top bottom">
-       {--EMAIL_CATEGORY--}:<BR>
+       {--EMAIL_CATEGORY--}:<BR />
        <STRONG class="admin_misc">$content[cat] </TD>
 </TR>
 <TR>
 </TR>
 <TR>
        <TD align="center" class="switch_sw$content[sw] top bottom right">
-       {--EMAIL_RECEIVERS--}:<BR>
+       {--EMAIL_RECEIVERS--}:<BR />
        <STRONG class="admin_misc">$content[sent]</STRONG> ({--EMAIL_RUIDS--}:
        <STRONG class="admin_misc">$content[ruids]</STRONG>)</TD>
        <TD align="center" class="switch_sw$content[sw] top bottom right">
-       {--USERS_LINKS--}:<BR>
+       {--USERS_LINKS--}:<BR />
        <STRONG class="admin_misc">$content[unconfirmed]</STRONG></TD>
        <TD align="center" class="switch_sw$content[sw] top bottom">
-       {--EMAIL_POOL_TYPE--}:<BR>
+       {--EMAIL_POOL_TYPE--}:<BR />
        <STRONG class="admin_misc">$content[type]</STRONG></TD>
 </TR>
 <TR>
 </TR>
 <TR>
        <TD align="center" class="switch_sw$content[sw] top right">
-       {--EMAIL_TSEND--}:<BR>
+       {--EMAIL_TSEND--}:<BR />
        <STRONG class="admin_misc">$content[tsend]</STRONG></TD>
        <TD align="center" class="switch_sw$content[sw] top right">
-       {--EMAIL_URL--}:<BR>
+       {--EMAIL_URL--}:<BR />
        <STRONG class="admin_misc"><A href="$content[url]"
                target="_blank">{--EMAIL_URL_TEST--}</A></STRONG></TD>
        <TD align="center" class="switch_sw$content[sw] top">
-       {--EMAIL_TIMESTAMP--}:<BR>
+       {--EMAIL_TIMESTAMP--}:<BR />
        <STRONG class="admin_misc">$content[stamp]</STRONG></TD>
 </TR>
 <TR>
index 1d24670..76373b9 100644 (file)
@@ -7,8 +7,8 @@
                <TD colspan="4" height="5" class="admin_title seperator">&nbsp;</TD>
        </TR>
        <TR>
-               <TD align="center" colspan="4" class="admin_title"><STRONG>{--CHANGE_GUEST_MENU--}</STRONG><BR>
-               <BR>
+               <TD align="center" colspan="4" class="admin_title"><STRONG>{--CHANGE_GUEST_MENU--}</STRONG><BR />
+               <BR />
                {--CHANGE_MENU_1--}{!__CHK_VALUE!}{--CHANGE_MENU_2--}</TD>
        </TR>
        <TR>
index bf7ad93..f7f9934 100644 (file)
@@ -1,7 +1,5 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=guest_add"
-       method="POST" target="_self">
-<TABLE border="0" cellspacing="0" cellpadding="0" width="500"
-       align="center" class="admin_title dashed">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=guest_add" method="POST" target="_self">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
        <TR>
                <TD height="8" colspan="5"></TD>
        </TR>
@@ -21,7 +19,7 @@
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_WHAT_NAME--}:</TD>
                <TD width="10">&nbsp;</TD>
-               <TD align="center" class="admin_table">{--__WHAT_SELECTION--} <BR>
+               <TD align="center" class="admin_table">{--__WHAT_SELECTION--} <BR />
                <SPAN class="admin_note">({--CREATE_WHAT_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
@@ -32,7 +30,7 @@
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_PARENT_MENU--}:</TD>
                <TD width="10">&nbsp;</TD>
-               <TD align="center" class="admin_table">{--__ACTION_SELECTION--} <BR>
+               <TD align="center" class="admin_table">{--__ACTION_SELECTION--} <BR />
                <SPAN class="admin_note">({--CREATE_ACTION_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
index 9e1fabb..dc374f2 100644 (file)
@@ -26,7 +26,7 @@
        </TR>
 </TABLE>
 
-<DIV class="admin_note"><STRONG>{--ADMIN_BEG_WINNER_HIGLIGHTED--}</STRONG><BR>
-<BR>
+<DIV class="admin_note"><STRONG>{--ADMIN_BEG_WINNER_HIGLIGHTED--}</STRONG><BR />
+<BR />
 <FONT class="admin_note">{--ADMIN_BEG_TIMEOUT_1--} <STRONG>{!__AUTOPURGE_TIMEOUT!}</STRONG>
 {--ADMIN_BEG_TIMEOUT_2--}</FONT></DIV>
index 82e35d7..dc2b18f 100644 (file)
@@ -26,7 +26,7 @@
        </TR>
 </TABLE>
 
-<DIV class="admin_note"><STRONG>{--ADMIN_BONUS_WINNER_HIGLIGHTED--}</STRONG><BR>
-<BR>
+<DIV class="admin_note"><STRONG>{--ADMIN_BONUS_WINNER_HIGLIGHTED--}</STRONG><BR />
+<BR />
 <FONT class="admin_note">{--ADMIN_BONUS_TIMEOUT_1--} <STRONG>{!__AUTOPURGE_TIMEOUT!}</STRONG>
 {--ADMIN_BONUS_TIMEOUT_2--}</FONT></DIV>
index a91b4ed..a515011 100644 (file)
@@ -9,7 +9,7 @@
        {!__CATS_ROWS!}
        <TR>
                <TD colspan="3" align="center" class="admin_footer"
-                       style="padding-top: 10px; padding-bottom: 10px"><U>{--ADMIN_MEMBER_FUNCTIONS--}:</U><BR>
+                       style="padding-top: 10px; padding-bottom: 10px"><U>{--ADMIN_MEMBER_FUNCTIONS--}:</U><BR />
                {!__MEMBER_LINKS!}</TD>
        </TR>
 </TABLE>
index 7f9fa91..b936c0f 100644 (file)
@@ -15,7 +15,7 @@
                <TD height="10" class="admin_header seperator">&nbsp;</TD>
        </TR>
        <TR>
-               <TD align="center" class="admin_header"><U>{--ADMIN_MEMBER_FUNCTIONS--}:</U><BR>
+               <TD align="center" class="admin_header"><U>{--ADMIN_MEMBER_FUNCTIONS--}:</U><BR />
                {!__MEMBER_LINKS!}</TD>
        </TR>
        <TR>
index caa5967..1ef17a5 100644 (file)
@@ -9,7 +9,7 @@
        {--__EMAIL_LIST--}
        <TR>
                <TD colspan="4" height="40" class="admin_header" align="center">
-               {--MEMBER_TOTAL_LINKS_1--}{--__NUMS_VALUE!}{--MEMBER_TOTAL_LINKS_2--}<BR>
+               {--MEMBER_TOTAL_LINKS_1--}{--__NUMS_VALUE!}{--MEMBER_TOTAL_LINKS_2--}<BR />
                <A
                        href="{!URL!}/modules.php?module=admin&amp;what=list_links&amp;u_id={!__UID_VALUE!}&del=all"
                        onclick="return confirm('{--ADMIN_REALLY_DELETE_ALL_MAILS--}')">{--ADMIN_DEL_UNCONFIRMED_LINKS--}</A>
index 91646e8..1f29edd 100644 (file)
@@ -1,11 +1,11 @@
 {--PAYOUT_OPTIONAL_BANNER--}:&nbsp;
 <STRONG><A href="$content[banner]" title="$content[alt]"
        target="_blank">$content[banner]</A></STRONG>
-<BR>
+<BR />
 {--PAYOUT_ALTERNATE_TEXT--}:&nbsp;
 <STRONG>$content[alt]</STRONG>
-<BR>
-<BR>
+<BR />
+<BR />
 {--PAYOUT_TARGET_URL--}:&nbsp;
 <STRONG>$content[url]</STRONG>
-<BR>
+<BR />
index 1d24fc1..5b2b1a4 100644 (file)
@@ -1,8 +1,8 @@
 {--PAYOUT_LINK_TEXT--}:
-<BR>
+<BR />
 <STRONG>$content[txt_link]</STRONG>
-<BR>
-<BR>
+<BR />
+<BR />
 {--PAYOUT_LINK_URL--}:
-<BR>
+<BR />
 <STRONG>$content[txt_url]</STRONG>
index d8e4e1e..c8ecd86 100644 (file)
@@ -1,43 +1,43 @@
 <TR>
        <TD align="center" class="switch_sw$content[sw] bottom2 right2"
                rowspan="5">$content[select]</TD>
-       <TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_TITLE--}:</STRONG><BR>
+       <TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_TITLE--}:</STRONG><BR />
        $content[title]</TD>
-       <TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_DESCR2--}:</STRONG><BR>
+       <TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_DESCR2--}:</STRONG><BR />
        $content[descr]</TD>
-       <TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_ADMIN_ID--}:</STRONG><BR>
+       <TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_ADMIN_ID--}:</STRONG><BR />
        <A href="$content[email_link]">$content[alogin]</A></TD>
-       <TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_TSTART--}:</STRONG><BR>
+       <TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_TSTART--}:</STRONG><BR />
        $content[start_date]</TD>
-       <TD align="center" class="switch_sw$content[sw] bottom2"><STRONG>{--RALLYE_TEND--}:</STRONG><BR>
+       <TD align="center" class="switch_sw$content[sw] bottom2"><STRONG>{--RALLYE_TEND--}:</STRONG><BR />
        $content[end_date]</TD>
 </TR>
 <TR>
-       <TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_TEMPLATE2--}:</STRONG><BR>
+       <TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_TEMPLATE2--}:</STRONG><BR />
        $content[template]</TD>
-       <TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_AUTO_ADD--}:</STRONG><BR>
+       <TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_AUTO_ADD--}:</STRONG><BR />
        <A
                href="{!URL!}/modules.php?module=admin&amp;what=list_rallyes&amp;rallye=$content[id]&amp;auto=$content[auto]"
                title="$content[auto_title]">$content[auto_lnk]</A></TD>
-       <TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_ACTIVE--}:</STRONG><BR>
+       <TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_ACTIVE--}:</STRONG><BR />
        <A
                href="{!URL!}/modules.php?module=admin&amp;what=list_rallyes&amp;rallye=$content[id]&amp;activate=$content[active]"
                title="$content[active_title]">$content[active_lnk]</A></TD>
-       <TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_NOTIFY--}:</STRONG><BR>
+       <TD align="center" class="switch_sw$content[sw] bottom2 right2"><STRONG>{--RALLYE_NOTIFY--}:</STRONG><BR />
        <A
                href="{!URL!}/modules.php?module=admin&amp;what=list_rallyes&amp;rallye=$content[id]&amp;notify=$content[notify]"
                title="$content[notify_title]">$content[notify_lnk]</A></TD>
-       <TD align="center" class="switch_sw$content[sw] bottom2"><STRONG>{--RALLYE_NOTIFIED--}:</STRONG><BR>
+       <TD align="center" class="switch_sw$content[sw] bottom2"><STRONG>{--RALLYE_NOTIFIED--}:</STRONG><BR />
        $content[notified]</TD>
 </TR>
 <TR>
        <TD align="center" class="switch_sw$content[sw] bottom2 right2"
-               colspan="3"><STRONG>{--RALLYE_ASSIGNED_PRICES--}:</STRONG><BR>
+               colspan="3"><STRONG>{--RALLYE_ASSIGNED_PRICES--}:</STRONG><BR />
        <A
                href="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=$content[id]">$content[prices_cnt]</A>
        </TD>
        <TD align="center" class="switch_sw$content[sw] bottom2" colspan="2">
-       <STRONG>{--RALLYE_ASSIGNED_USERS--}:</STRONG><BR>
+       <STRONG>{--RALLYE_ASSIGNED_USERS--}:</STRONG><BR />
        $content[joined]</TD>
 </TR>
 <TR>
@@ -46,9 +46,9 @@
 </TR>
 <TR>
        <TD align="center" class="switch_sw$content[sw] bottom2 right2"
-               colspan="3"><STRONG>{--RALLYE_MIN_USERS_MINI--}:</STRONG><BR>
+               colspan="3"><STRONG>{--RALLYE_MIN_USERS_MINI--}:</STRONG><BR />
        $content[min_users]</TD>
        <TD align="center" class="switch_sw$content[sw] bottom2" colspan="2">
-       <STRONG>{--RALLYE_MIN_PRICES_MINI--}:</STRONG><BR>
+       <STRONG>{--RALLYE_MIN_PRICES_MINI--}:</STRONG><BR />
        $content[min_prices]</TD>
 </TR>
index be7b96c..577ba20 100644 (file)
@@ -64,7 +64,7 @@
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_URL--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;[&nbsp;<A href="{--__SPONSOR_URL--}" target="_blank"><B>{--EMAIL_URL_TEST--}</B></A>&nbsp;]&nbsp;</TD>
+  <TD class="bottom2">&nbsp;[&nbsp;<A href="{--__SPONSOR_URL--}" target="_blank"><STRONG>{--EMAIL_URL_TEST--}</STRONG></A>&nbsp;]&nbsp;</TD>
 </TR>
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30">
 <TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_POINTS_AMOUNT--}:</STRONG>&nbsp;</TD>
-  <TD align="center" class="bottom2">&nbsp;[&nbsp;<A href="{--URL--}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={--__SPONSOR_ID--}&amp;mode=add_points" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}"><B>{--__SPONSOR_AMOUNT--}</B></A>&nbsp;]</TD>
+  <TD align="center" class="bottom2">&nbsp;[&nbsp;<A href="{--URL--}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={--__SPONSOR_ID--}&amp;mode=add_points" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}"><STRONG>{--__SPONSOR_AMOUNT--}</STRONG></A>&nbsp;]</TD>
 <TR>
 </TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_POINTS_USED--}:</STRONG>&nbsp;</TD>
-  <TD align="center" class="bottom2">&nbsp;[&nbsp;<A href="{--URL--}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={--__SPONSOR_ID--}&amp;mode=sub_points" title="{--ADMIN_SPONSOR_SUB_POINTS_LINK_TITLE--}"><B>{--__SPONSOR_USED--}</B></A>&nbsp;]</TD>
+  <TD align="center" class="bottom2">&nbsp;[&nbsp;<A href="{--URL--}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={--__SPONSOR_ID--}&amp;mode=sub_points" title="{--ADMIN_SPONSOR_SUB_POINTS_LINK_TITLE--}"><STRONG>{--__SPONSOR_USED--}</STRONG></A>&nbsp;]</TD>
 </TR>
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30">
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_REFERRALS--}:</STRONG>&nbsp;</TD>
-  <TD align="center" class="bottom2">[&nbsp;<A href="{--URL--}/modules.php?module=admin&amp;what=list_sponsor&amp;rid={--__SPONSOR_ID--}"><B>{--__SPONSOR_REFS--}</B></A>&nbsp;]</TD>
+  <TD align="center" class="bottom2">[&nbsp;<A href="{--URL--}/modules.php?module=admin&amp;what=list_sponsor&amp;rid={--__SPONSOR_ID--}"><STRONG>{--__SPONSOR_REFS--}</STRONG></A>&nbsp;]</TD>
 </TR>
 <TR>
   <TD colspan="2" class="admin_footer" style="padding: 5px">
       <LI>&nbsp;[&nbsp;<A href="{--URL--}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={--__SPONSOR_ID--}&amp;mode=edit">{--ADMIN_SPONSOR_EDIT--}</A>&nbsp;]</LI>
       <LI>&nbsp;[&nbsp;<A href="{--URL--}/modules.php?module=admin&amp;what=del_sponsor&amp;id={--__SPONSOR_ID--}">{--ADMIN_SPONSOR_DEL--}</A>&nbsp;]</LI>
       <LI>&nbsp;[&nbsp;<A href="{--URL--}/modules.php?module=admin&amp;what=lock_sponsor&amp;id={--__SPONSOR_ID--}">{--ADMIN_SPONSOR_LOCK--}</A>&nbsp;]</LI>
-      <LI>&nbsp;[&nbsp;<A href="{--URL--}/modules.php?module=admin&amp;what=list_sponsor_pays&amp;id={--__SPONSOR_ID--}">{--ADMIN_LIST_SPONSOR_ORDERS--}</A>&nbsp;] (<B>{--__SPONSOR_ORDERS--}</B>)</LI>
+      <LI>&nbsp;[&nbsp;<A href="{--URL--}/modules.php?module=admin&amp;what=list_sponsor_pays&amp;id={--__SPONSOR_ID--}">{--ADMIN_LIST_SPONSOR_ORDERS--}</A>&nbsp;] (<STRONG>{--__SPONSOR_ORDERS--}</STRONG>)</LI>
     </UL>
   </TD>
 </TR>
index 0832bb2..438c7e5 100644 (file)
@@ -1,6 +1,6 @@
 <TR>
   <TD class="switch_sw$content[sw] bottom2 right2" align="center" height="29">
-    <B>$content[id]</B>
+    <STRONG>$content[id]</STRONG>
     <INPUT type="hidden" name="id[$content[id]]" class="admin_normal" value="1">
   </TD>
   <TD class="switch_sw$content[sw] bottom2 right2">
index b9821c4..a0e4422 100644 (file)
@@ -5,13 +5,13 @@
 </TR>
 <TR>
   <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="100">
-    [&nbsp;<B><A href="{--URL--}/modules.php?module=admin&amp;what=list_sponsor&amp;id=$content[id]" title="{--ADMIN_SPONSOR_DETAILS_LINK_TITLE--}">$content[id]</A></B>&nbsp;]
+    [&nbsp;<STRONG><A href="{--URL--}/modules.php?module=admin&amp;what=list_sponsor&amp;id=$content[id]" title="{--ADMIN_SPONSOR_DETAILS_LINK_TITLE--}">$content[id]</A></STRONG>&nbsp;]
   </TD>
   <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="240" colspan="2">
     <A href="$content[email]">$content[salut] $content[sname] $content[fname]</A>
   </TD>
   <TD align="center" class="switch_sw$content[sw] bottom2" width="160">
-    [&nbsp;<B><A href="{--URL--}/modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=add_points" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}">$content[points]</A></B>&nbsp;]
+    [&nbsp;<STRONG><A href="{--URL--}/modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=add_points" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}">$content[points]</A></STRONG>&nbsp;]
   </TD>
 </TR>
 <TR>
@@ -24,7 +24,7 @@
 </TR>
 <TR>
   <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="100">
-    [&nbsp;<B><A href="{--URL--}/modules.php?module=admin&amp;what=lock_sponsor&amp;id=$content[id]">$content[status]</A></B>&nbsp;]
+    [&nbsp;<STRONG><A href="{--URL--}/modules.php?module=admin&amp;what=lock_sponsor&amp;id=$content[id]">$content[status]</A></STRONG>&nbsp;]
   </TD>
   <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="120">
     $content[created]
index c86edfb..f0c02dc 100644 (file)
@@ -2,26 +2,26 @@
        class="admin_table dashed">
        <TR>
                <TD width="260" align="center" class="bottom2 right2">
-               {--EMAIL_SENDER--}:<BR>
+               {--EMAIL_SENDER--}:<BR />
                <STRONG><A
                        href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id={--__LIST_UNCON_SENDER--}">{--__LIST_UNCON_SENDER--}</A></STRONG>
                </TD>
                <TD width="260" align="center" class="bottom2">
-               {--EMAIL_SUBJECT--}:<BR>
+               {--EMAIL_SUBJECT--}:<BR />
                <STRONG>{--__LIST_UNCON_SUBJECT--}</STRONG></TD>
        </TR>
        <TR>
-               <TD align="center" class="bottom2 right2">{--EMAIL_URL--}:<BR>
+               <TD align="center" class="bottom2 right2">{--EMAIL_URL--}:<BR />
                <STRONG><A
                        href="{!URL!}/modules.php?module=frametester&amp;url={--__LIST_UNCON_URL--}"
                        target="_blank">{--EMAIL_URL_TEST--}</A></STRONG></TD>
-               <TD align="center" class="bottom2">{--EMAIL_TIMESTAMP--}:<BR>
+               <TD align="center" class="bottom2">{--EMAIL_TIMESTAMP--}:<BR />
                <STRONG>{--__LIST_UNCON_STAMP--}</STRONG></TD>
        </TR>
        <TR>
-               <TD align="center" class="bottom2 right2">{--EMAIL_TEXT--}:<BR>
+               <TD align="center" class="bottom2 right2">{--EMAIL_TEXT--}:<BR />
                <STRONG>{--__LIST_UNCON_TEXT--}</STRONG></TD>
-               <TD align="center" class="bottom2">{--USERS_LINKS--}:<BR>
+               <TD align="center" class="bottom2">{--USERS_LINKS--}:<BR />
                <STRONG>{--__LIST_UNCO_UNCONFIRMED--}</STRONG></TD>
        </TR>
        <TR>
index 5fc4e93..2bc9ba4 100644 (file)
@@ -4,12 +4,12 @@
                <TD height="5" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
-               <TD align="center" class="admin_content"><STRONG>{--ADMIN_LOGOUT_DONE--}</STRONG><BR>
-               <BR>
+               <TD align="center" class="admin_content"><STRONG>{--ADMIN_LOGOUT_DONE--}</STRONG><BR />
+               <BR />
                <A class="admin_content"
-                       href="{!URL!}/modules.php?module=admin&amp;action=login">{--ADMIN_RELOGIN_LINK--}</A><BR>
-               <BR>
-               <A class="admin_content" href="{!URL!}/modules.php?module=index">{--ADMIN_BACK_TO_GUEST_MENU--}</A><BR>
+                       href="{!URL!}/modules.php?module=admin&amp;action=login">{--ADMIN_RELOGIN_LINK--}</A><BR />
+               <BR />
+               <A class="admin_content" href="{!URL!}/modules.php?module=index">{--ADMIN_BACK_TO_GUEST_MENU--}</A><BR />
                </TD>
        </TR>
        <TR>
index 83c5ccf..1c4c067 100644 (file)
@@ -4,11 +4,11 @@
                <TD height="5" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
-               <TD align="center" class="admin_content"><STRONG>{--ADMIN_LOGOUT_SQL_PATCHES_DONE--}</STRONG><BR>
-               <BR>
-               <A class="admin_content" href="{!URL!}/modules.php?module=admin&amp;action=login">{--ADMIN_RELOGIN_LINK--}</A><BR>
-               <BR>
-               <A class="admin_content" href="{!URL!}/modules.php?module=index">{--ADMIN_BACK_TO_GUEST_MENU--}</A><BR>
+               <TD align="center" class="admin_content"><STRONG>{--ADMIN_LOGOUT_SQL_PATCHES_DONE--}</STRONG><BR />
+               <BR />
+               <A class="admin_content" href="{!URL!}/modules.php?module=admin&amp;action=login">{--ADMIN_RELOGIN_LINK--}</A><BR />
+               <BR />
+               <A class="admin_content" href="{!URL!}/modules.php?module=index">{--ADMIN_BACK_TO_GUEST_MENU--}</A><BR />
                </TD>
        </TR>
        <TR>
index 656f2b7..0a4fef5 100644 (file)
@@ -1,7 +1,5 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=mem_add"
-       method="POST" target="_self">
-<TABLE border="0" cellspacing="0" cellpadding="0" width="500"
-       align="center" class="admin_title dashed">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=mem_add" method="POST" target="_self">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
        <TR>
                <TD height="8" colspan="5"></TD>
        </TR>
@@ -21,7 +19,7 @@
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_WHAT_NAME--}:</TD>
                <TD width="10">&nbsp;</TD>
-               <TD align="center" class="admin_table">{--__WHAT_SELECTION--} <BR>
+               <TD align="center" class="admin_table">{--__WHAT_SELECTION--} <BR />
                <SPAN class="admin_note">({--CREATE_WHAT_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
@@ -32,7 +30,7 @@
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_PARENT_MENU--}:</TD>
                <TD width="10">&nbsp;</TD>
-               <TD align="center" class="admin_table">{--__ACTION_SELECTION--} <BR>
+               <TD align="center" class="admin_table">{--__ACTION_SELECTION--} <BR />
                <SPAN class="admin_note">({--CREATE_ACTION_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
index 3ec973f..015ea69 100644 (file)
@@ -1,5 +1,5 @@
-<BR>
-<BR>
+<BR />
+<BR />
 <TABLE border="0" cellspacing="0" cellpadding="0" align="center"
        width="420" class="admin_table dashed">
        <TR>
index 0b5279d..be775ba 100644 (file)
@@ -1,5 +1,4 @@
-<TABLE border="0" cellspacing="0" cellpadding="0" align="center"
-       width="170" class="admin_table dashed">
+<TABLE border="0" cellspacing="0" cellpadding="0" align="center" width="170" class="admin_table dashed">
        <TR>
                <TD colspan="3" class="admin_title bottom2" align="center" height="30">
                <STRONG>{--USER_NOW_ONLINE--}</STRONG></TD>
@@ -21,4 +20,3 @@
                <TD><STRONG>{!_ADMINS_ONLINE!}</STRONG></TD>
        </TR>
 </TABLE>
-<BR>
\ No newline at end of file
index 9dfced1..866aa3a 100644 (file)
@@ -7,8 +7,8 @@
                <TD colspan="4" height="5" class="admin_title seperator">&nbsp;</TD>
        </TR>
        <TR>
-               <TD align="center" colspan="4" class="admin_title"><STRONG>{--CHANGE_MEMBER_MENU--}</STRONG><BR>
-               <BR>
+               <TD align="center" colspan="4" class="admin_title"><STRONG>{--CHANGE_MEMBER_MENU--}</STRONG><BR />
+               <BR />
                {--CHANGE_MENU_1--}{!__CHK_VALUE!}{--CHANGE_MENU_2--}</TD>
        </TR>
        <TR>
index af70a1f..4dd5a9a 100644 (file)
        <TR>
                <TD colspan="5" align="center" class="admin_footer"
                        style="padding-top: 15px; padding-bottom: 15px";>
-               {--OPTIMIZE_DB_TOTAL_TABLES--}: <STRONG>{!__TOTAL_TABS!}</STRONG><BR>
+               {--OPTIMIZE_DB_TOTAL_TABLES--}: <STRONG>{!__TOTAL_TABS!}</STRONG><BR />
                {--OPTIMIZE_DB_TOTAL_SIZE--}: <STRONG>{!__TOTAL_SIZE!}
-               {--KBYTES--}</STRONG><BR>
-               {--OPTIMIZE_DB_TOTAL_OPTIMIZE--}: <STRONG>{!__TOTAL_CALLS!}</STRONG><BR>
+               {--KBYTES--}</STRONG><BR />
+               {--OPTIMIZE_DB_TOTAL_OPTIMIZE--}: <STRONG>{!__TOTAL_CALLS!}</STRONG><BR />
                {--OPTIMIZE_DB_TOTAL_OPTI--}: <STRONG>{!__TOTAL_OPTIMIZED!}
-               {--KBYTES--}</STRONG><BR>
-               {--OPTIMIZE_DB_TOTAL_GAIN_TABLES--}: <STRONG>{!__NOW_OPTIMIZED!}</STRONG><BR>
+               {--KBYTES--}</STRONG><BR />
+               {--OPTIMIZE_DB_TOTAL_GAIN_TABLES--}: <STRONG>{!__NOW_OPTIMIZED!}</STRONG><BR />
                {--OPTIMIZE_DB_TOTAL_GAIN_SIZE--}: <STRONG>{!__NOW_SAVED!}
-               {--KBYTES--}</STRONG><BR>
+               {--KBYTES--}</STRONG><BR />
                </TD>
        </TR>
 </TABLE>
index 958e9b3..603bf31 100644 (file)
@@ -11,7 +11,7 @@
                <TD class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
-               <TD align="center">{--PAYOUT_RECEIVER_ACCEPT--}:<BR>
+               <TD align="center">{--PAYOUT_RECEIVER_ACCEPT--}:<BR />
                {--PAYOUT_USERDATA_VALUE!}</TD>
        </TR>
        <TR>
@@ -21,7 +21,7 @@
                <TD class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
-               <TD align="center">{--PAYOUT_OPTIONAL_TEXT--}:<BR>
+               <TD align="center">{--PAYOUT_OPTIONAL_TEXT--}:<BR />
                <TEXTAREA name="text" class="admin_normal" rows="5" cols="30"></TEXTAREA>
                </TD>
        </TR>
index 537bace..7c794e9 100644 (file)
@@ -4,7 +4,7 @@
        class="admin_table dashed" align="center">
        <TR>
                <TD colspan="3" align="center" class="admin_title bottom2" height="40">
-               <STRONG>{--ADMIN_PAYOUT_ADD_NEW_TITLE--}:</STRONG><BR>
+               <STRONG>{--ADMIN_PAYOUT_ADD_NEW_TITLE--}:</STRONG><BR />
                <FONT class="admin_note">({--ADMIN_PAYOUT_ADD_NEW_NOTE--})</FONT></TD>
        </TR>
        <TR>
index 7907048..2a67f66 100644 (file)
@@ -2,7 +2,7 @@
        action="{!URL!}/modules.php?module=admin&amp;what=list_payouts&do=accept&amp;pid=$content[pid]&amp;task=$content[tid]"
        method="POST"><INPUT type="submit" class="admin_submit"
        value="{--PAYOUT_ACCEPT_PAYOUT--}"></FORM>
-<BR>
+<BR />
 <FORM
        action="{!URL!}/modules.php?module=admin&amp;what=list_payouts&do=reject&amp;pid=$content[pid]&amp;task=$content[tid]"
        method="POST"><INPUT type="submit" class="admin_delete"
index 5034b27..d0346fa 100644 (file)
@@ -11,7 +11,7 @@
                <TD class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
-               <TD align="center">{--PAYOUT_RECEIVER_REJECT--}:<BR>
+               <TD align="center">{--PAYOUT_RECEIVER_REJECT--}:<BR />
                {--PAYOUT_USERDATA_VALUE!}</TD>
        </TR>
        <TR>
@@ -21,7 +21,7 @@
                <TD class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
-               <TD align="center">{--PAYOUT_OPTIONAL_TEXT--}:<BR>
+               <TD align="center">{--PAYOUT_OPTIONAL_TEXT--}:<BR />
                <TEXTAREA name="text" class="admin_normal" rows="5" cols="30"></TEXTAREA>
                </TD>
        </TR>
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 (file)
index 0000000..289a8f1
--- /dev/null
@@ -0,0 +1,18 @@
+<BR />
+<TABLE border="0" cellspacing="0" cellpadding="0" width="620" align="center" class="admin_table dashed">
+<TR>
+       <TD class="admin_title bottom2" height="30">
+               <STRONG>{--ADMIN_RESET_PASS_DONE_TITLE--}</STRONG>
+       </TD>
+</TR>
+<TR>
+       <TD class="bottom2">
+               $content
+       </TD>
+</TR>
+<TR>
+       <TD class="admin_footer">
+               <A href="{!URL!}/modules.php?module=admin">{--ADMIN_CONTINUE_LOGIN--}</A>
+       </TD>
+</TR>
+</TABLE>
diff --git a/templates/de/html/admin/admin_reset_password.tpl b/templates/de/html/admin/admin_reset_password.tpl
new file mode 100644 (file)
index 0000000..baa7e5e
--- /dev/null
@@ -0,0 +1,28 @@
+<BR />
+<FORM action="{!URL!}/modules.php?module=admin&amp;reset_pass=1" method="post">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="620" align="center" class="admin_table dashed">
+<TR>
+       <TD class="admin_title bottom2" height="30" colspan="2">
+               <STRONG>{--ADMIN_RESET_PASSWORD_TITLE--}</STRONG>
+       </TD>
+</TR>
+<TR>
+       <TD height="40" width="50%" class="bottom2">
+               {--ADMIN_ENTER_EMAIL--}
+       </TD>
+       <TD width="50%" class="bottom2">
+               <INPUT type="email" name="email" size="20" maxlength="255" />
+       </TD>
+</TR>
+<TR>
+       <TD class="admin_footer" colspan="2">
+               <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+               <INPUT type="submit" name="send_link" class="admin_submit" value="{--ADMIN_RESET_PASS_SUBMIT--}" />
+       </TD>
+</TR>
+</TABLE>
+</FORM>
+
+<DIV class="admin_note">
+       {--ADMIN_RESET_PASSWORD_NOTE--}
+</DIV>
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 (file)
index 0000000..14bdc16
--- /dev/null
@@ -0,0 +1,47 @@
+<BR />
+<FORM action="{!URL!}/modules.php?module=admin&amp;reset_pass=1" method="post">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="620" align="center" class="admin_table dashed">
+<TR>
+       <TD class="admin_title bottom2" height="30" colspan="2">
+               <STRONG>{--ADMIN_RESET_PASSWORD_TITLE--}</STRONG>
+       </TD>
+</TR>
+<TR>
+       <TD height="40" width="50%" class="bottom2">
+               {--ADMIN_SHOW_LOGIN--}
+       </TD>
+       <TD width="50%" class="bottom2">
+               <STRONG>$content[login]</STRONG><BR />
+               [<A href="{!URL!}/modules.php?module=admin&amp;reset_pass=1">{--ADMIN_CHANGE_LOGIN--}</A>]
+       </TD>
+</TR>
+<TR>
+       <TD height="40" width="50%" class="bottom2">
+               {--ADMIN_ENTER_PASSWORD1--}
+       </TD>
+       <TD width="50%" class="bottom2">
+               <INPUT type="password" name="pass1" size="20" maxlength="255" />
+       </TD>
+</TR>
+<TR>
+       <TD height="40" width="50%" class="bottom2">
+               {--ADMIN_ENTER_PASSWORD2--}
+       </TD>
+       <TD width="50%" class="bottom2">
+               <INPUT type="password" name="pass2" size="20" maxlength="255" />
+       </TD>
+</TR>
+<TR>
+       <TD class="admin_footer" colspan="2">
+               <INPUT type="hidden" name="hash" value="$content[hash]" />
+               <INPUT type="hidden" name="login" value="$content[login]" />
+               <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+               <INPUT type="submit" name="reset_pass" class="admin_submit" value="{--ADMIN_RESET_PASSWORD_SUBMIT--}" />
+       </TD>
+</TR>
+</TABLE>
+</FORM>
+
+<DIV class="admin_note">
+       {--ADMIN_RESET_PASSWORD_NOTE--}
+</DIV>
index 4dd17b8..4d491c7 100644 (file)
@@ -6,15 +6,15 @@
        <TR>
                <TD style="padding-left: 7px; padding-top: 5px; padding-bottom: 5px"
                        class="bottom2"><STRONG><BIG>&middot;</BIG></STRONG>&nbsp;<A
-                       href="{!URL!}/modules.php?module=admin&amp;what=send_bonus&amp;mode=normal">{--ADMIN_SEND_BONUS_NORMAL--}</A><BR>
-               <BR>
+                       href="{!URL!}/modules.php?module=admin&amp;what=send_bonus&amp;mode=normal">{--ADMIN_SEND_BONUS_NORMAL--}</A><BR />
+               <BR />
                <FONT class="admin_note">{--ADMIN_SEND_BONUS_NORMAL_NOTES--}</FONT></TD>
        </TR>
        <TR>
                <TD style="padding-left: 7px; padding-top: 5px; padding-bottom: 5px">
                <STRONG><BIG>&middot;</BIG></STRONG>&nbsp;<A
-                       href="{!URL!}/modules.php?module=admin&amp;what=send_bonus&amp;mode=html">{--ADMIN_SEND_BONUS_HTML--}</A><BR>
-               <BR>
+                       href="{!URL!}/modules.php?module=admin&amp;what=send_bonus&amp;mode=html">{--ADMIN_SEND_BONUS_HTML--}</A><BR />
+               <BR />
                <FONT class="admin_note">{--ADMIN_SEND_BONUS_HTML_NOTES--}</FONT></TD>
        </TR>
 </TABLE>
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 (file)
index 0000000..03cd5ae
--- /dev/null
@@ -0,0 +1,28 @@
+<BR />
+<FORM action="{!URL!}/modules.php?module=admin&amp;reset_pass=1" method="post">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="620" align="center" class="admin_table dashed">
+<TR>
+       <TD class="admin_title bottom2" height="30" colspan="2">
+               <STRONG>{--ADMIN_SEND_RESET_LINK_TITLE--}</STRONG>
+       </TD>
+</TR>
+<TR>
+       <TD height="40" width="50%" class="bottom2">
+               {--ADMIN_ENTER_EMAIL--}
+       </TD>
+       <TD width="50%" class="bottom2">
+               <INPUT type="text" name="email" size="20" maxlength="255" />
+       </TD>
+</TR>
+<TR>
+       <TD class="admin_footer" colspan="2">
+               <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+               <INPUT type="submit" name="send_link" class="admin_submit" value="{--ADMIN_SEND_RESET_LINK_SUBMIT--}" />
+       </TD>
+</TR>
+</TABLE>
+</FORM>
+
+<DIV class="admin_note">
+       {--ADMIN_SEND_RESET_LINK_NOTE--}
+</DIV>
index b893dd1..8920cfb 100644 (file)
@@ -1,5 +1,5 @@
 <DIV align="center">
-  {--__LIST_CONTENT--}<BR>
-  <BR>
+  {--__LIST_CONTENT--}<BR />
+  <BR />
   {--__ADD_CONTENT--}
 </DIV>
\ No newline at end of file
index 8f8c45d..fc631bc 100644 (file)
@@ -8,7 +8,7 @@
        </TR>
        <TR>
                <TD class="admin_title" colspan="3" align="center">
-               {--ADMIN_SUB_POINTS_FROM_USER--}:<BR>
+               {--ADMIN_SUB_POINTS_FROM_USER--}:<BR />
                <STRONG>{!__USER_VALUE!}</STRONG></TD>
  &nbs