Lock reason now saved in DB, deleted accounts shall be locked for re-registering...
authorRoland Häder <roland@mxchange.org>
Sun, 9 Nov 2008 15:11:42 +0000 (15:11 +0000)
committerRoland Häder <roland@mxchange.org>
Sun, 9 Nov 2008 15:11:42 +0000 (15:11 +0000)
43 files changed:
inc/databases.php
inc/extensions/ext-user.php
inc/language/de.php
inc/modules/admin/what-add_points.php
inc/modules/admin/what-list_links.php
inc/modules/admin/what-list_user.php
inc/modules/admin/what-lock_user.php
inc/modules/admin/what-sub_points.php
inc/modules/guest/what-register.php
inc/mysql-manager.php
templates/de/html/admin/admin_add_points.tpl
templates/de/html/admin/admin_add_surfbar_url.tpl
templates/de/html/admin/admin_config_home_settings_pro.tpl
templates/de/html/admin/admin_config_nickname.tpl
templates/de/html/admin/admin_config_proxy.tpl
templates/de/html/admin/admin_config_removeip.tpl
templates/de/html/admin/admin_config_session.tpl
templates/de/html/admin/admin_config_surfbar.tpl
templates/de/html/admin/admin_config_yoomedia.tpl
templates/de/html/admin/admin_contct_user_form.tpl
templates/de/html/admin/admin_edit_cats.tpl
templates/de/html/admin/admin_list_links.tpl
templates/de/html/admin/admin_list_user_row.tpl
templates/de/html/admin/admin_lock_sponsor.tpl
templates/de/html/admin/admin_lock_surfbar_urls.tpl
templates/de/html/admin/admin_lock_user.tpl
templates/de/html/admin/admin_reg_form.tpl
templates/de/html/admin/admin_reset_password.tpl
templates/de/html/admin/admin_reset_password_form.tpl
templates/de/html/admin/admin_send_reset_link.tpl
templates/de/html/admin/admin_send_yoomedia.tpl
templates/de/html/admin/admin_sub_points.tpl
templates/de/html/admin/admin_undelete_surfbar_urls.tpl
templates/de/html/admin/admin_user_details.tpl
templates/de/html/admin/admin_validate_reset_hash_form.tpl
templates/de/html/member/member_holiday_deactivate.tpl
templates/de/html/member/member_support_form.tpl
templates/de/html/member/member_surfbar_book_dynamic.tpl
templates/de/html/member/member_surfbar_book_static.tpl
templates/de/html/member/member_transfer_new.tpl
templates/de/html/member/member_wernis_form.tpl
templates/de/html/member/member_wernis_mode_payout.tpl
templates/de/html/member/member_wernis_mode_withdraw.tpl

index 54370ab..bcb6658 100644 (file)
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_SVN_REVISION', "526");
+define('CURR_SVN_REVISION', "527");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
index f12042f..203bd6e 100644 (file)
@@ -38,10 +38,10 @@ if (!defined('__SECURITY')) {
 }
 
 // Version number
-$EXT_VERSION = "0.3.4";
+$EXT_VERSION = "0.3.5";
 
 // Version history array (add more with , "0.1" and so on)
-$EXT_VER_HISTORY = array("0.0", "0.1", "0.1.1", "0.1.2", "0.1.2", "0.1.3", "0.1.4", "0.1.5", "0.1.6", "0.1.7", "0.1.8", "0.1.9", "0.2.0", "0.2.1", "0.2.2", "0.2.3", "0.2.4", "0.2.5", "0.2.6", "0.2.7", "0.2.8", "0.2.9", "0.3.0", "0.3.1", "0.3.2", "0.3.3", "0.3.4");
+$EXT_VER_HISTORY = array("0.0", "0.1", "0.1.1", "0.1.2", "0.1.2", "0.1.3", "0.1.4", "0.1.5", "0.1.6", "0.1.7", "0.1.8", "0.1.9", "0.2.0", "0.2.1", "0.2.2", "0.2.3", "0.2.4", "0.2.5", "0.2.6", "0.2.7", "0.2.8", "0.2.9", "0.3.0", "0.3.1", "0.3.2", "0.3.3", "0.3.4", "0.3.5");
 
 switch ($EXT_LOAD_MODE)
 {
@@ -55,7 +55,8 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE what='config_user' OR what='user_contct' LIMIT 2";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_admin_menu` WHERE `what` IN('config_user','user_contct','list_user_del') LIMIT 3";
+       $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_user_del`";
        break;
 
 case "activate": // Do stuff when admin activates this extension
@@ -72,7 +73,7 @@ case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.1": // SQL queries for v0.1
-               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD user_limit INT(7) NOT NULL DEFAULT '20'";
+               $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `user_limit` INT(7) NOT NULL DEFAULT 20";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Seitenweises Anzeigen der User-Liste ist nun m&ouml;glich.";
@@ -88,7 +89,7 @@ case "update": // Update an extension
                $UPDATE_NOTES = "CSS-Datei kann per Admin-Bereich ein- und ausgeschaltet werden.";
 
        case "0.1.2": // SQL queries for v0.1.2
-               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD mails_confirmed BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'";
+               $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_user_data` ADD `mails_confirmed` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Dem Mitglied wird nun angezeigt, wie viele Mails er best&auml;tigt hat. Alle vor dieser Version best. Mails werden leider nicht mehr ber&uuml;cksichtigt! Bitte teilen Sie dies Ihren Mitgliedern mit.";
@@ -100,7 +101,7 @@ case "update": // Update an extension
                break;
 
        case "0.1.4": // SQL queries for v0.1.4
-               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD emails_received BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'";
+               $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_user_data` ADD `emails_received` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Anzahl empfangener Mails wird angezeigt. <BIG>Diese Anzeige kann fehlerhaft sein, wenn Sie bereits Mitglieder in Ihrem {!MT_WORD!} haben sollen!</BIG>";
@@ -137,15 +138,15 @@ case "update": // Update an extension
                break;
 
        case "0.2.1": // SQL queries for v0.2.1
-               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD user_alpha TINYINT(3) UNSIGNED NOT NULL DEFAULT '10'";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_user','Mitgliederliste','Anzahl Mitglieder pro Seite, Anzahl Buchstaben pro Zeile usw.', 8)";
+               $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `user_alpha` TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";
+               $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_user','Mitgliederliste','Anzahl Mitglieder pro Seite, Anzahl Buchstaben pro Zeile usw.', 8)";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "User-Liste ist konfigurierbar: Anzahl Mitglieder pro Seite und Anzahl Buchstaben pro Zeile; Template-Fehler beseitigt.";
                break;
 
        case "0.2.2": // SQL queries for v0.2.2
-               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data CHANGE gender gender ENUM('M','F','C') NOT NULL DEFAULT 'M'";
+               $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_user_data` CHANGE `gender` `gender` ENUM('M','F','C') NOT NULL DEFAULT 'M'";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Anrede &quot;Firma&quot; hinzugef&uuml;gt.";
@@ -182,7 +183,7 @@ case "update": // Update an extension
                break;
 
        case "0.2.9": // SQL queries for v0.2.9
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','user_contct','Mitglied kontaktieren','Kontaktieren Sie hier Ihre Mitglieder ganz direkt &uuml;ber ein Webformular. Sie brauchen somit kein EMail-Programm mehr starten!', 8)";
+               $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','user_contct','Mitglied kontaktieren','Kontaktieren Sie hier Ihre Mitglieder ganz direkt &uuml;ber ein Webformular. Sie brauchen somit kein EMail-Programm mehr starten!', 8)";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Admin-Kontaktformular hinzugef&uuml;gt.";
@@ -194,7 +195,7 @@ case "update": // Update an extension
                break;
 
        case "0.3.1": // SQL queries for v0.3.1
-               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET title = 'Mitglieder-Management' WHERE action = 'user' AND (what='' OR what IS NULL) LIMIT 1";
+               $SQLs[] = "UPDATE `"._MYSQL_PREFIX."_admin_menu` SET `title` = 'Mitglieder-Management' WHERE `action`='user' AND (`what`='' OR `what` IS NULL) LIMIT 1";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Verwaltung auf Management umgestellt";
@@ -218,6 +219,30 @@ case "update": // Update an extension
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitglieder werden per Zufall als Referal-ID ausgew&auml;hlt, die eine Mindestanzahl an best&auml;tigten Mails haben, wenn die Ref-Id 0 ist.";
                break;
+
+       case "0.3.5": // SQL queries for v0.3.5
+               $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_user_data` ADD `lock_reason` TINYTEXT";
+               $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_user_data` ADD `lock_timestamp` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00'";
+               $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `user_delete_purge` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".($_CONFIG['one_day'] * 30)."";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_user_del','L&ouml;schungen auflisten','Listet die L&ouml;schungen von Usern auf.', 9)";
+               $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_user_del`";
+               $SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_user_del` (
+`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+`userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`email` VARCHAR(255) NOT NULL DEFAULT '',
+`surname` VARCHAR(255) NOT NULL DEFAULT '',
+`family` VARCHAR(255) NOT NULL DEFAULT '',
+`joined` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`last_online` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`del_timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+`del_reason` TINYTEXT,
+INDEX (`userid`),
+PRIMARY KEY(`id`)
+) TYPE=MyISAM COMMENT='List of deleted users'";
+
+               // Update notes (these will be set as task text!)
+               $UPDATE_NOTES = "Der Sperrgrund wird nun mit abgespeichert und beim L&ouml;schen des Users mit ausgesendet.";
+               break;
        }
        break;
 
index 1df932e..aa39b4f 100644 (file)
@@ -1187,8 +1187,11 @@ define('ADMIN_RANDOM_ZERO_REFID', "Soll per Zufall ein User nach folgenden Krite
 define('ADMIN_RAND_REFID_ENABLED', "Mitglieder per Zufall w&auml;hlen");
 define('ADMIN_RAND_REFID_DISABLED', "Referal-Id 0 verwenden");
 define('ADMIN_RANDOM_MIN_CONFIRMED', "Wie viele best&auml;tigte Mails muss ein Mitglied mindestens haben, um per Zufall ausgew&auml;hlt zu werden?");
-define('EMAILS_RECEIVED', "Emails bereits empfangen");
+define('EMAILS_RECEIVED', "Emails empfangen");
 define('MAILS_CONFIRMED', "Emails best&auml;tigt");
+define('RAND_CONFIRMED', "Best&auml;tigt f. Zufalls-Ref");
+define('LOCK_REASON', "Sperrgrund");
+define('LOCK_TIMESTAMP', "Sperrzeitpunkt");
 
 define('MEMBER_MAIL_BONUS_CONFIRMED_ON', "Sie haben diese Bonusmail <span class=\"data\">%s</span> best&auml;tigt.");
 define('MEMBER_MAIL_NORMAL_CONFIRMED_ON', "Sie haben diese Klickmail <span class=\"data\">%s</span> best&auml;tigt.");
index a193055..e77b3f2 100644 (file)
@@ -110,7 +110,7 @@ if ($_GET['u_id'] == "all") {
                } else {
                        // Opps, missing form here
                        define('__USER_VALUE', "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</A>");
-                       define('__UID_VALUE', $_GET['u_id']);
+                       define('__UID'       , bigintval($_GET['u_id']));
                        LOAD_TEMPLATE("admin_add_points");
                }
        } else {
index 2fd651f..7da4f58 100644 (file)
@@ -145,7 +145,7 @@ if (!empty($_GET['u_id'])) {
                                define('__EMAIL_VALUE', "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>");
                                define('__EMAIL_LIST' , $OUT);
                                define('__NUMS_VALUE' , $nums);
-                               define('__UID_VALUE'  , $_GET['u_id']);
+                               define('__UID'        , bigintval($_GET['u_id']));
 
                                // Load final template
                                LOAD_TEMPLATE("admin_list_links");
index 9ecd2c4..ea3997a 100644 (file)
@@ -64,6 +64,12 @@ if (EXT_IS_ACTIVE("nickname")) { $MORE = ", nickname"; }
 if (GET_EXT_VERSION("user") >= "0.3.4") {
        // Add it...
        $MORE .= ", rand_confirmed";
+
+       // Add lock reason?
+       if (GET_EXT_VERSION("user") >= "0.3.5") {
+               // Add them...
+               $MORE .= ", lock_reason, UNIX_TIMESTAMP(`lock_timestamp`) AS lock_timestamp";
+       } // END - if
 } // END - if
 
 // Init unset data (bad that we change $_GET here!)
@@ -117,6 +123,7 @@ LIMIT 1",
                $DATA['last_profile_sent'] = MAKE_DATETIME($DATA['last_profile_sent'], "0");
                $DATA['total']             = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_points", "points"));
                $DATA['locked']            = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_points", "locked_points"));
+               $DATA['lock_timestamp']    = MAKE_DATETIME($DATA['lock_timestamp'], "2");
 
                // Nickname inclusion?
                if (EXT_IS_ACTIVE("nickname")) {
@@ -172,7 +179,8 @@ LIMIT 1",
                }
        } // END - if
 
-       $SQL = "SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, status, emails_sent, mails_confirmed, emails_received".$MORE." FROM "._MYSQL_PREFIX."_user_data".$whereStatement." ORDER BY ".$_GET['sortby'];
+       // Prepare SQL and run it
+       $SQL = "SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, status, emails_sent, mails_confirmed, emails_received".$MORE." FROM "._MYSQL_PREFIX."_user_data".$whereStatement." ORDER BY ".SQL_ESCAPE($_GET['sortby']);
        $result_master = SQL_QUERY($SQL, __FILE__, __LINE__);
 
        // Calculate page count (0.5 fixes a bug with page count)
@@ -231,45 +239,44 @@ LIMIT 1",
                        define('__NICKNAME_TH', "");
                }
 
+               // Load all users
                $SW = 2; $OUT = "";
-               while (list($uid, $gender, $sname, $fname, $email, $IP, $ref, $status, $emails_sent, $mails_confirmed, $emails_received, $nick) = SQL_FETCHROW($result)) {
-                       if ($ref > 0) $ref = ADMIN_USER_PROFILE_LINK($ref);
-                       $LINKS = GET_TOTAL_DATA($uid, "user_links", "id", "userid", true);
-                       $SENT = $emails_sent;
-                       if ($emails_sent > 0) $SENT = $BASE."&amp;what=email_details&amp;u_id=".$uid."\">".TRANSLATE_COMMA($emails_sent)."</A>]";
-                       if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$uid."\">".TRANSLATE_COMMA($LINKS)."</A>]";
+               while ($content = SQL_FETCHARRAY($result)) {
+                       // Set refid link
+                       if ($content['refid'] > 0) $content['refid'] = ADMIN_USER_PROFILE_LINK($content['refid']);
+
+                       // Get number of unconfirmed mails
+                       $LINKS = GET_TOTAL_DATA($content['userid'], "user_links", "id", "userid", true);
+                       if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$content['userid']."\">".TRANSLATE_COMMA($LINKS)."</A>]";
+
+                       // Set link to sent mails if present
+                       if ($content['emails_sent'] > 0) $content['emails_sent'] = $BASE."&amp;what=email_details&amp;u_id=".$content['userid']."\">".TRANSLATE_COMMA($content['emails_sent'])."</A>]";
 
                        // Add nickname
-                       if (empty($nick) || $nick == $uid) $nick = "---";
+                       if (empty($content['nickname']) || $content['nickname'] == $content['userid']) $content['nickname'] = "---";
 
                        // Calculate total points
-                       $pointsTotal = GET_TOTAL_DATA($uid, "user_points", "points")  - GET_TOTAL_DATA($uid, "user_data", "used_points");
+                       $pointsTotal = GET_TOTAL_DATA($content['userid'], "user_points", "points")  - GET_TOTAL_DATA($content['userid'], "user_data", "used_points");
 
                        // Clickrate
                        $clickRate = 0;
-                       if ($emails_received > 0) {
-                               $clickRate = $mails_confirmed / $emails_received * 100;
+                       if ($content['emails_received'] > 0) {
+                               $clickRate = $content['mails_confirmed'] / $content['emails_received'] * 100;
                        } // END - if
 
                        // Transfer data to array
-                       $content = array(
-                               'sw'     => $SW,
-                               'uid'    => ADMIN_USER_PROFILE_LINK($uid),
-                               'gender' => TRANSLATE_GENDER($gender),
-                               'sname'  => $sname,
-                               'fname'  => $fname,
-                               'email'  => "[<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>]",
-                               'addr'   => $IP,
-                               'ref'    => $ref,
-                               'status' => TRANSLATE_STATUS($status),
-                               'links'  => $LINKS,
-                               'nick'   => $nick,
-                               'alinks' => MEMBER_ACTION_LINKS($uid, $status),
-                               'points' => TRANSLATE_COMMA($pointsTotal),
-                               'sent'   => $SENT,
-                               'rate'   => TRANSLATE_COMMA($clickRate),
-                               'locked' => TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_points", "locked_points"))
-                       );
+                       $content['sw']     = $SW;
+                       $content['uid']    = ADMIN_USER_PROFILE_LINK($content['userid']);
+                       $content['gender'] = TRANSLATE_GENDER($content['gender']);
+                       $content['email']  = "[<A href=\"".CREATE_EMAIL_LINK($content['email'], "user_data")."\">".$content['email']."</A>]";
+                       $content['addr']   = $content['REMOTE_ADDR'];
+                       $content['status'] = TRANSLATE_STATUS($content['status']);
+                       $content['links']  = $LINKS;
+                       $content['alinks'] = MEMBER_ACTION_LINKS($content['userid'], $content['status']);
+                       $content['points'] = TRANSLATE_COMMA($pointsTotal);
+                       $content['rate']   = TRANSLATE_COMMA($clickRate);
+                       $content['locked'] = TRANSLATE_COMMA(GET_TOTAL_DATA($content['userid'], "user_points", "locked_points"));
+                       $content['lock_timestamp'] = MAKE_DATETIME($content['lock_timestamp'], "2");
 
                        // Load row template and switch colors
                        $OUT .= LOAD_TEMPLATE("admin_list_user_row", true, $content);
index d382ea2..1e36fd3 100644 (file)
@@ -40,138 +40,139 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR("admin", __FILE__);
 
-if (!empty($_GET['u_id']))
-{
+// Is a userid set?
+if (!empty($_GET['u_id'])) {
+       // Load user's data
        $result_user = SQL_QUERY_ESC("SELECT status, gender, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        $ACT = false;
-       if (SQL_NUMROWS($result_user) == 1)
-       {
+       if (SQL_NUMROWS($result_user) == 1) {
                // User found
                list($status, $gender, $sname, $fname, $email) = SQL_FETCHROW($result_user);
+
+               // Free result
                SQL_FREERESULT($result_user);
-               if (empty($_GET['u_id']))
-               {
-                       // Output selection form with all confirmed user accounts listed
-                       ADD_MEMBER_SELECTION_BOX();
-               } elseif (!empty($_POST['lock'])) {
+
+               // Is a lock reason set?
+               if ((!empty($_POST['lock'])) && ($status != "LOCKED")) {
                        // Ok, lock the account!
-                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET status='LOCKED' WHERE userid=%s LIMIT 1",
-                        array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
-                       if (SQL_AFFECTEDROWS() == 1)
-                       {
+                       if (GET_EXT_VERSION("user") >= "0.3.5") {
+                               // Lock with reason
+                               $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET status='LOCKED',lock_reason='%s',lock_timestamp=NOW() WHERE userid=%s LIMIT 1",
+                                       array($_POST['reason'], bigintval($_GET['u_id'])), __FILE__, __LINE__);
+                       } else {
+                               // Lock with no lock reason saved
+                               $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET status='LOCKED' WHERE userid=%s LIMIT 1",
+                                       array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
+                       }
+
+                       // Entry updated?
+                       if (SQL_AFFECTEDROWS() == 1) {
                                // Send an email to the user! In later version you can optionally switch this feature off
                                $msg = LOAD_EMAIL_TEMPLATE("lock-user", array('text' => $_POST['reason']), bigintval($_GET['u_id']));
 
                                // Send away...
                                SEND_EMAIL(bigintval($_GET['u_id']), ADMIN_LOCKED_SUBJ, $msg);
-                       }
+                       } // END - if
 
                        // Prepare message
                        $MSG = USER_ACCOUNT_LOCKED_1.$_GET['u_id'].USER_ACCOUNT_LOCKED_2;
                        $ACT = true;
-               } elseif (!empty($_POST['unlock'])) {
+               } elseif ((!empty($_POST['unlock'])) && ($status == "LOCKED")) {
                        // Ok, unlock the account!
-                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET status='CONFIRMED' WHERE userid=%s LIMIT 1",
-                        array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
-                       if (SQL_AFFECTEDROWS() == 1)
-                       {
+                       if (GET_EXT_VERSION("user") >= "0.3.5") {
+                               // Reset lock reason as well
+                               $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET status='CONFIRMED',lock_reason='',lock_timestamp='0000-00-00 00:00' WHERE userid=%s LIMIT 1",
+                                       array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
+                       } else {
+                               // No lock reason to reset
+                               $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET status='CONFIRMED' WHERE userid=%s LIMIT 1",
+                                       array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
+                       }
+
+                       // Entry updated?
+                       if (SQL_AFFECTEDROWS() == 1) {
                                // Send an email to the user! In later version you can optionally switch this feature off
                                $msg = LOAD_EMAIL_TEMPLATE("unlock-user", array('text' => $_POST['reason']), bigintval($_GET['u_id']));
 
                                // Send away...
                                SEND_EMAIL(bigintval($_GET['u_id']), ADMIN_UNLOCKED_SUBJ, $msg);
-                               if (EXT_IS_ACTIVE("rallye"))
-                               {
+                               if (EXT_IS_ACTIVE("rallye")) {
                                        RALLYE_AUTOADD_USER($_GET['u_id']);
-                               }
-                       }
+                               } // END - if
+                       } // END - if
 
                        // Prepare message
                        $MSG = USER_ACCOUNT_UNLOCKED_1.$_GET['u_id'].USER_ACCOUNT_UNLOCKED_2;
                        $ACT = true;
-               }
-                elseif (isset($_POST['del']))
-               {
+               } elseif (isset($_POST['del'])) {
                        // Delete the account
                        $ACT = true;
                        require_once(PATH."inc/modules/admin/what-del_user.php");
-               }
-                elseif (!empty($_POST['no']))
-               {
+               } elseif (!empty($_POST['no'])) {
                        // Do not lock him...
-                       $URL = URL."/modules.php?module=admin&amp;what=list_user&amp;u_id=".$_GET['u_id'];
-               }
-                else
-               {
+                       $URL = URL."/modules.php?module=admin&amp;what=list_user&amp;u_id=".bigintval($_GET['u_id']);
+               } else {
                        $result = SQL_QUERY_ESC("SELECT email, surname, family FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
-                        array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
-                       if (SQL_NUMROWS($result) == 1)
-                       {
+                               array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
+
+                       // Entry found?
+                       if (SQL_NUMROWS($result) == 1) {
                                // Load data
                                list ($email, $sname, $fname) = SQL_FETCHROW($result);
+
+                               // Free result
                                SQL_FREERESULT($result);
 
                                // Transfer data to constants for the template
                                define('__EMAIL', CREATE_EMAIL_LINK($email, "user_data"));
                                define('__SNAME', $sname);
                                define('__FNAME', $fname);
-                               define('__UID'  , $_GET['u_id']);
-
-                               // Transfer data to constants for the template
-                               define('__UID_VALUE', $_GET['u_id']);
+                               define('__UID'  , bigintval($_GET['u_id']));
 
                                // Realy want to lock?
                                switch ($status)
                                {
                                case "CONFIRMED": // Yes, lock him down... ;-)
                                        define('__OK_VALUE'    , "lock");
-                                       define('__HEADER_VALUE', ADMIN_HEADER_LOCK_ACCOUNT_1.__UID_VALUE.ADMIN_HEADER_LOCK_ACCOUNT_2);
-                                       define('__TEXT_VALUE'  , ADMIN_TEXT_LOCK_ACCOUNT_1.__UID_VALUE.ADMIN_TEXT_LOCK_ACCOUNT_2);
+                                       define('__HEADER_VALUE', ADMIN_HEADER_LOCK_ACCOUNT_1.__UID.ADMIN_HEADER_LOCK_ACCOUNT_2);
+                                       define('__TEXT_VALUE'  , ADMIN_TEXT_LOCK_ACCOUNT_1.__UID.ADMIN_TEXT_LOCK_ACCOUNT_2);
                                        break;
 
                                case "LOCKED": // Unlock the user
                                        define('__OK_VALUE'    , "unlock");
-                                       define('__HEADER_VALUE', ADMIN_HEADER_UNLOCK_ACCOUNT_1.__UID_VALUE.ADMIN_HEADER_UNLOCK_ACCOUNT_2);
-                                       define('__TEXT_VALUE'  , ADMIN_TEXT_UNLOCK_ACCOUNT_1.__UID_VALUE.ADMIN_TEXT_UNLOCK_ACCOUNT_2);
+                                       define('__HEADER_VALUE', ADMIN_HEADER_UNLOCK_ACCOUNT_1.__UID.ADMIN_HEADER_UNLOCK_ACCOUNT_2);
+                                       define('__TEXT_VALUE'  , ADMIN_TEXT_UNLOCK_ACCOUNT_1.__UID.ADMIN_TEXT_UNLOCK_ACCOUNT_2);
                                        break;
 
                                case "UNCONFIRMED": // Unconfirmed accounts cannot be unlocked!
                                        define('__OK_VALUE'    , "del");
-                                       define('__HEADER_VALUE', ADMIN_HEADER_DEL_ACCOUNT_1.__UID_VALUE.ADMIN_HEADER_DEL_ACCOUNT_2);
-                                       define('__TEXT_VALUE'  , ADMIN_TEXT_DEL_ACCOUNT_1.__UID_VALUE.ADMIN_TEXT_DEL_ACCOUNT_2);
+                                       define('__HEADER_VALUE', ADMIN_HEADER_DEL_ACCOUNT_1.__UID.ADMIN_HEADER_DEL_ACCOUNT_2);
+                                       define('__TEXT_VALUE'  , ADMIN_TEXT_DEL_ACCOUNT_1.__UID.ADMIN_TEXT_DEL_ACCOUNT_2);
                                        break;
                                }
 
                                // Output form
                                LOAD_TEMPLATE("admin_lock_user");
-                       }
-                        else
-                       {
+                       } else {
                                // Account does not exists!
                                OUTPUT_HTML("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
                        }
                }
-               if (!empty($URL))
-               {
+
+               // Is an URL set?
+               if (!empty($URL)) {
                        // Reload and die...
                        LOAD_URL($URL);
-               }
-                elseif ($ACT)
-               {
+               } elseif ($ACT) {
                        // An action was performed...
-                       if (!empty($MSG))
-                       {
+                       if (!empty($MSG)) {
                                LOAD_TEMPLATE("admin_settings_saved", false, "<STRONG class=\"admin_green\">".$MSG."</STRONG>");
-                       }
-                        else
-                       {
+                       } else {
                                LOAD_TEMPLATE("admin_settings_saved", false, "<STRONG class=\"admin_green\">".ADMIN_USER_UPDATED."</STRONG>");
                        }
                }
-       }
-        else
-       {
+       } else {
                // Account does not exists!
                OUTPUT_HTML("<STRONG class=\"admin_failed\">".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2."</STRONG>");
        }
index d962bc9..26731b6 100644 (file)
@@ -123,7 +123,7 @@ if ($_GET['u_id'] == "all")
                {
                        // Opps, missing form here
                        define('__USER_VALUE', "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</A>");
-                       define('__UID_VALUE', $_GET['u_id']);
+                       define('__UID', bigintval($_GET['u_id']));
                        LOAD_TEMPLATE("admin_sub_points");
                }
        }
index e4fa749..c38e2e5 100644 (file)
@@ -173,17 +173,21 @@ if (isset($_POST['ok'])) {
        SQL_FREERESULT($result);
 }
 
-if ((isset($_POST['ok'])) && (!$FAILED))
-{
-       // Save the registration
+if ((isset($_POST['ok'])) && (!$FAILED)) {
+       // Prepapre month and day of birth
        if (strlen($_POST['day'])   == 1) $_POST['day']   = "0".$_POST['day'];
        if (strlen($_POST['month']) == 1) $_POST['month'] = "0".$_POST['month'];
 
-       // Get total users
-       $totalUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true);
+       // Get total ...
+       // ... confirmed, ...
+       $confirmedUsers   = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true);
+       // ... unconfirmed ...
+       $unconfirmedUsers = GET_TOTAL_DATA("UNCONFIRMED", "user_data", "userid", "status", true);
+       // ... and locked users!
+       $lockedUsers      = GET_TOTAL_DATA("LOCKED", "user_data", "userid", "status", true);
 
-       // Hash = MM-DD-YYYY:IP:USER_AGENT:TIMEMARK
-       $hash = generateHash(sha1($totalUsers.":".$_POST['month']."-".$_POST['day']."-".$_POST['year'].":".getenv('SERVER_NAME').":".GET_REMOTE_ADDR().":".GET_USER_AGENT()."-".time())."/".RAND_NUMBER);
+       // Generate hash which will be inserted into confirmation mail
+       $hash = generateHash(sha1($confirmedUsers.":".$unconfirmedUsers.":".$lockedUsers.":".$_POST['month']."-".$_POST['day']."-".$_POST['year'].":".getenv('SERVER_NAME').":".GET_REMOTE_ADDR().":".GET_USER_AGENT()."/".SITE_KEY."/".DATE_KEY."/".RAND_NUMBER));
 
        // Add design when extension sql_patches is v0.2.7 or greater
        $ADD1 = ""; $ADD2 = "";
index 28dd178..e92f1e4 100644 (file)
@@ -1078,12 +1078,15 @@ function REMOVE_RECEIVER(&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=fal
 // Calculate sum (default) or count records of given criteria
 function GET_TOTAL_DATA ($search, $tableName, $lookFor, $whereStatement="userid", $onlyRows=false, $add="") {
        $ret = 0;
+       //* DEBUG: */ echo $search."/".$tableName."/".$lookFor."/".$whereStatement."/".$add."<br />\n";
        if (($onlyRows) || ($lookFor == "userid")) {
                // Count rows
+               //* DEBUG: */ echo "COUNT!<br />\n";
                $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) FROM `"._MYSQL_PREFIX."_%s` WHERE `%s`='%s'".$add,
                        array($lookFor, $tableName, $whereStatement, $search), __FILE__, __LINE__);
        } else {
                // Add all rows
+               //* DEBUG: */ echo "SUM!<br />\n";
                $result = SQL_QUERY_ESC("SELECT SUM(`%s`) FROM `"._MYSQL_PREFIX."_%s` WHERE `%s`='%s'".$add,
                        array($lookFor, $tableName, $whereStatement, $search), __FILE__, __LINE__);
        }
@@ -1096,8 +1099,12 @@ function GET_TOTAL_DATA ($search, $tableName, $lookFor, $whereStatement="userid"
 
        // Fix empty values
        if ((empty($ret)) && ($lookFor != "counter") && ($lookFor != "id") && ($lookFor != "userid")) {
+               // Float number
                $ret = "0.00000";
-       } // END - if
+       } elseif ("".$ret."" == "") {
+               // Fix empty result
+               $ret = "0";
+       }
 
        // Return value
        return $ret;
index ef44eb9..502ffb7 100644 (file)
@@ -1,7 +1,4 @@
-
-<FORM
-       action="{!URL!}/modules.php?module=admin&amp;what=add_points&amp;u_id={!__UID_VALUE!}"
-       method="POST" style="margin-bottom: 0px">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=add_points&amp;u_id={!__UID!}" method="POST" style="margin-bottom: 0px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
        align="center" class="admin_table dashed">
        <TR>
index 1715524..5bac569 100644 (file)
@@ -14,7 +14,7 @@
        </div>
 
        <div class="admin_title top2" style="padding-top:3px;padding-bottom:3px">
-               <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+               <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                <input type="submit" class="admin_submit" name="add" value="{--ADMIN_SURFBAR_ADD_URL--}" />
        </div>
 </div>
index 321a157..cd06139 100644 (file)
                <TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
-               <TD colspan="3" class="admin_footer"><INPUT
-                       type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;<INPUT
-                       type="submit" name="ok" class="admin_submit"
-                       value="{--SAVE_SETTINGS--}" /></TD>
+               <TD colspan="3" class="admin_footer">
+                       <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
+                       <INPUT type="submit" class="admin_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+               </TD>
        </TR>
 </TABLE>
 </FORM>
\ No newline at end of file
index d015fc7..cbf9424 100644 (file)
@@ -39,7 +39,7 @@
        </TR>
        <TR>
                <TD colspan="3" class="admin_footer">
-                       <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+                       <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                        <INPUT type="submit" name="ok" class="admin_submit" value="{--SAVE_SETTINGS--}" />
                </TD>
        </TR>
index ef877fc..1832872 100644 (file)
@@ -43,7 +43,7 @@
        <TR><TD colspan="2" class="bottom2 seperator" height="5">&nbsp;</TD></TR>
        <TR>
                <TD colspan="2" class="admin_footer">
-                       <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+                       <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                        <INPUT type="submit" name="ok" class="admin_submit" value="{--SAVE_SETTINGS--}" />
                </TD>
        </TR>
index e5a8c1f..aa2fb35 100644 (file)
 <tr><td colspan="2" class="bottom2 seperator" height="5">&nbsp;</td></tr>
 <tr>
        <td colspan="2" class="admin_footer">
-               <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+               <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                <input type="submit" name="ok" class="admin_submit" value="{--SAVE_SETTINGS--}" />
        </td>
 </tr>
index 98374e9..c1640b9 100644 (file)
@@ -26,7 +26,7 @@
        <tr><td colspan="2" class="bottom2 seperator" height="5">&nbsp;</td></tr>
        <tr>
                <td colspan="2" class="admin_footer">
-                       <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+                       <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="ok" class="admin_submit" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
index 0b9e147..8a03725 100644 (file)
        <tr><td height="3" colspan="2" class="seperator bottom2">&nbsp;</td></tr>
        <tr>
                <td colspan="2" class="admin_footer">
-                       <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+                       <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="ok" class="admin_submit" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
index b99b541..229911a 100644 (file)
@@ -84,7 +84,7 @@
 <tr><td colspan="2" class="bottom2 seperator" height="5">&nbsp;</td></tr>
 <tr>
        <td colspan="2" class="admin_footer">
-               <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+               <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                <input type="submit" name="ok" class="admin_submit" value="{--SAVE_SETTINGS--}" />
        </td>
 </tr>
index 7767ab3..b45291d 100644 (file)
@@ -13,7 +13,7 @@
        </TR>
        <TR>
                <TD class="admin_footer">
-                       <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+                       <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                        <INPUT type="submit" name="ok" class="admin_submit" value="{--CONTACT_USER--}" />
                </TD>
        </TR>
index 7464064..b3c0877 100644 (file)
@@ -8,7 +8,7 @@
 {!__CAT_ROWS!}
 <TR>
        <TD align="center" colspan="3" class="admin_footer">
-               <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+               <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                <INPUT type="submit" name="ok" class="admin_submit" value="{--CHANGE_CATS--}" />
        </TD>
 </TR>
index aaf7cd3..4b7a6b4 100644 (file)
@@ -1,17 +1,14 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
        <TR>
-               <TD colspan="4" align="center" class="admin_header bottom2"
-                       height="40"><STRONG><A
-                       href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id={!__UID_VALUE!}">{!__SNAME_VALUE!}
-               {!__FNAME_VALUE!}</A></STRONG> ({!__EMAIL_VALUE!}):</TD>
+               <TD colspan="4" align="center" class="admin_header bottom2" height="40">
+                       <STRONG><A href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id={!__UID!}">{!__SNAME_VALUE!} {!__FNAME_VALUE!}</A></STRONG> ({!__EMAIL_VALUE!}):
+               </TD>
        </TR>
        {!__EMAIL_LIST!}
        <TR>
                <TD colspan="4" height="40" class="admin_header" align="center">
-               {--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>
+                       {--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!}&del=all" onclick="return confirm('{--ADMIN_REALLY_DELETE_ALL_MAILS--}')">{--ADMIN_DEL_UNCONFIRMED_LINKS--}</A>
                </TD>
        </TR>
-</TABLE>
\ No newline at end of file
+</TABLE>
index 377c383..a9b8cbb 100644 (file)
@@ -10,9 +10,9 @@
        <TD width="5" class="switch_sw$content[sw] seperator bottom2">&nbsp;</TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]">$content[uid]</TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]">$content[gender]</TD>
-       <TD align="center" class="bottom2 right2 switch_sw$content[sw]">$content[sname]</TD>
-       <TD align="center" class="bottom2 right2 switch_sw$content[sw]">$content[fname]</TD>
-       <TD align="center" class="bottom2 switch_sw$content[sw]">$content[nick]</TD>
+       <TD align="center" class="bottom2 right2 switch_sw$content[sw]">$content[surname]</TD>
+       <TD align="center" class="bottom2 right2 switch_sw$content[sw]">$content[family]</TD>
+       <TD align="center" class="bottom2 switch_sw$content[sw]">$content[nickname]</TD>
 </TR>
 <TR>
        <TD width="5" class="switch_sw$content[sw] seperator">&nbsp;</TD>
@@ -26,7 +26,7 @@
        <TD class="switch_sw$content[sw] seperator bottom2" width="5">&nbsp;</TD>
        <TD align="center" class="right2 switch_sw$content[sw] bottom2">$content[email]</TD>
        <TD align="center" class="right2 switch_sw$content[sw] bottom2">$content[addr]</TD>
-       <TD align="center" class="right2 switch_sw$content[sw] bottom2">$content[ref]</TD>
+       <TD align="center" class="right2 switch_sw$content[sw] bottom2">$content[refid]</TD>
        <TD align="center" class="right2 switch_sw$content[sw] bottom2">$content[status]</TD>
        <TD align="center" class="switch_sw$content[sw] bottom2">$content[links]</TD>
 </TR>
 <TR>
        <TD class="switch_sw$content[sw] seperator bottom2" width="5">&nbsp;</TD>
        <TD align="center" class="right2 switch_sw$content[sw] bottom2">$content[points] {!POINTS!}</TD>
-       <TD align="center" class="right2 switch_sw$content[sw] bottom2">$content[sent]</TD>
+       <TD align="center" class="right2 switch_sw$content[sw] bottom2">$content[emails_sent]</TD>
        <TD align="center" class="right2 switch_sw$content[sw] bottom2">$content[rate]%</TD>
        <TD align="center" class="right2 switch_sw$content[sw] bottom2">$content[locked] {!POINTS!}</TD>
        <TD align="center" class="switch_sw$content[sw] bottom2">---</TD>
 </TR>
 <TR>
+       <TD width="5" class="switch_sw$content[sw] seperator">&nbsp;</TD>
+       <TD align="center" class="right2 switch_sw$content[sw]"><STRONG>{--LOCK_REASON--}:</STRONG></TD>
+       <TD align="center" class="right2 switch_sw$content[sw]"><STRONG>{--LOCK_TIMESTAMP--}:</STRONG></TD>
+       <TD align="center" class="right2 switch_sw$content[sw]"><STRONG>{--__UNUSED--}:</STRONG></TD>
+       <TD align="center" class="right2 switch_sw$content[sw]"><STRONG>{--__UNUSED--}:</STRONG></TD>
+       <TD align="center" class="switch_sw$content[sw]"><STRONG>{--__UNUSED--}:</STRONG></TD>
+</TR>
+<TR>
+       <TD class="switch_sw$content[sw] seperator bottom2" width="5">&nbsp;</TD>
+       <TD align="center" class="right2 switch_sw$content[sw] bottom2">$content[lock_reason]</TD>
+       <TD align="center" class="right2 switch_sw$content[sw] bottom2">$content[lock_timestamp]</TD>
+       <TD align="center" class="right2 switch_sw$content[sw] bottom2">---</TD>
+       <TD align="center" class="right2 switch_sw$content[sw] bottom2">---</TD>
+       <TD align="center" class="switch_sw$content[sw] bottom2">---</TD>
+</TR>
+<TR>
        <TD height="22" colspan="6" class="admin_title">$content[alinks]</TD>
 </TR>
index 0abdfab..4c442dc 100644 (file)
@@ -26,7 +26,7 @@
 <TR><TD height="5" class="seperator bottom2">&nbsp;</TD></TR>
 <TR>
   <TD class="admin_footer">
-    <INPUT type="submit" name="no" class="admin_no" value="{--NO--}" />&nbsp;*
+    <INPUT type="submit" name="no" class="admin_no" value="{--NO--}" />
     <INPUT type="submit" name="ok" class="admin_yes" value="{--YES--}" />
   </TD>
 </TR>
index 5018801..bcb905b 100644 (file)
@@ -15,7 +15,7 @@
 $content
 <tr>
        <td class="admin_footer" colspan="5">
-               <input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />&nbsp;*
+               <input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />
                <input type="submit" name="do_lock" class="admin_lock" value="{--ADMIN_SURFBAR_LOCK_URL_NOW--}" />
        </td>
 </tr>
index 7486c47..6e58ed8 100644 (file)
@@ -1,5 +1,5 @@
 <FORM
-       action="{!URL!}/modules.php?module=admin&amp;what=lock_user&amp;u_id={!__UID_VALUE!}"
+       action="{!URL!}/modules.php?module=admin&amp;what=lock_user&amp;u_id={!__UID!}"
        method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
        align="center" class="admin_table dashed">
index 8135e46..c289f99 100644 (file)
@@ -32,7 +32,7 @@
        </TR>
        <TR>
                <TD align="center" colspan="2">
-                       <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+                       <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                        <INPUT type="submit" class="admin_submit submit" name="ok" value="{--ADMIN_REG_SUBMIT--}" />
                </TD>
        </TR>
index 0f2e2fb..e9aa51e 100644 (file)
@@ -16,7 +16,7 @@
 </TR>
 <TR>
        <TD class="admin_footer" colspan="2">
-               <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+               <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                <INPUT type="submit" name="send_link" class="admin_submit" value="{--ADMIN_RESET_PASS_SUBMIT--}" />
        </TD>
 </TR>
index 62602ae..454b5a5 100644 (file)
@@ -35,7 +35,7 @@
        <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="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                <INPUT type="submit" name="reset_pass" class="admin_submit" value="{--ADMIN_RESET_PASSWORD_SUBMIT--}" />
        </TD>
 </TR>
index 3bc53e8..fc7db05 100644 (file)
@@ -16,7 +16,7 @@
 </TR>
 <TR>
        <TD class="admin_footer" colspan="2">
-               <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+               <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                <INPUT type="submit" name="send_link" class="admin_submit" value="{--ADMIN_SEND_RESET_LINK_SUBMIT--}" />
        </TD>
 </TR>
index d58798c..3a9409c 100644 (file)
@@ -69,7 +69,7 @@
 <tr><td colspan="2" class="seperator bottom2" height="10">&nbsp;</td></tr>
 <tr>
        <td colspan="2" align="center" class="admin_footer">
-               <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+               <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                <input type="submit" name="sent" class="admin_submit" value="{--ADMIN_SEND_MAIL--}" />
        </td>
 </tr>
index bb8b97d..4afdb5f 100644 (file)
@@ -1,6 +1,4 @@
-<FORM
-       action="{!URL!}/modules.php?module=admin&amp;what=sub_points&amp;u_id={!__UID_VALUE!}"
-       method="POST">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=sub_points&amp;u_id={!__UID!}" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500"
        align="center" class="admin_table dashed">
        <TR>
index c772260..eac4ed3 100644 (file)
@@ -14,7 +14,7 @@
 $content
 <tr>
        <td class="admin_footer" colspan="4">
-               <input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />&nbsp;*
+               <input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />
                <input type="submit" name="do_undelete" class="admin_lock" value="{--ADMIN_SURFBAR_UNDELETE_URL_NOW--}" />
        </td>
 </tr>
index 9afdf66..b24c9a0 100644 (file)
-<TABLE border="0" cellspacing="0" cellpadding="0" width="99%"
-       align="center" class="admin_table dashed">
-       <TR>
-               <TD colspan="5" class="admin_title" align="center"
-                       style="height: 30px"><STRONG class="admin_green big">{--_UID--}
-               $content</STRONG></TD>
-       </TR>
-       <TR>
-               <TD align="center" width="20%" class="top right">{--GENDER--}:<BR />
-               <STRONG>$DATA[gender]</STRONG></TD>
-               <TD align="center" width="20%" class="top right">{--SURNAME--}:<BR />
-               <STRONG>$DATA[surname]</STRONG></TD>
-               <TD align="center" width="20%" class="top right">{--FAMILY_NAME--}:<BR />
-               <STRONG>$DATA[family]</STRONG></TD>
-               <TD align="center" width="20%" class="top right">{--STREET_NR--}:<BR />
-               <STRONG>$DATA[street_nr]</STRONG></TD>
-               <TD align="center" width="20%" class="top">{--BIRTHDAY2--}:<BR />
-               <STRONG>{!_BIRTHDAY!}</STRONG></TD>
-       </TR>
-       <TR>
-               <TD align="center" class="top right">{--COUNTRY--}:<BR />
-               <STRONG>$DATA[country]</STRONG></TD>
-               <TD align="center" class="top right">{--ZIP--}:<BR />
-               <STRONG>$DATA[zip]</STRONG></TD>
-               <TD align="center" class="top right">{--CITY--}:<BR />
-               <STRONG>$DATA[city]</STRONG></TD>
-               <TD align="center" class="top right">{--ADDY--}:<BR />
-               <STRONG><A href="$DATA[email_link]">$DATA[email]</A></TD>
-               <TD align="center" class="top">{--ACCOUNT_STATUS--}:<BR />
-               <STRONG>$DATA[status]</STRONG></TD>
-       </TR>
-       <TR>
-               <TD align="center" class="top right">{--RECEIVE_MAILS--}:<BR />
-               <STRONG>$DATA[receive_mails]</STRONG></TD>
-               <TD align="center" class="top right">{--MAX_PER_DAY--}:<BR />
-               <STRONG>$DATA[max_mails]</TD>
-               <TD align="center" class="top right">{--REF_UID--}:<BR />
-               <STRONG>$DATA[refid]</STRONG></TD>
-               <TD align="center" class="top right">{--REF_CLICKS--}:<BR />
-               <STRONG>$DATA[ref_clicks]</STRONG></TD>
-               <TD align="center" class="top">{--TOTAL_LOGINS--}:<BR />
-               <STRONG>$DATA[total_logins]</STRONG></TD>
-       </TR>
-       <TR>
-               <TD align="center" class="top right">{--REMOTE_IP--}:<BR />
-               <STRONG>$DATA[REMOTE_ADDR]</STRONG></TD>
-               <TD align="center" class="top right">{--ADMIN_LAST_ONLINE--}:<BR />
-               <STRONG>$DATA[last_online]</STRONG></TD>
-               <TD align="center" class="top right">{--ADMIN_LAST_MODULE--}:<BR />
-               <STRONG>$DATA[last_module]</STRONG></TD>
-               <TD align="center" class="top right">{--HAS_JOINED--}:<BR />
-               <STRONG>$DATA[joined]</STRONG></TD>
-               <TD align="center" class="top">{--MAILS_SENT--}:<BR />
-               <STRONG>$DATA[emails_sent]</STRONG></TD>
-       </TR>
-       <TR>
-               <TD align="center" class="top right">{--USED_POINTS--}:<BR />
-               <STRONG>$DATA[used_points]</STRONG></TD>
-               <TD align="center" class="top right">{--TOTAL_POINTS--}:<BR />
-               <STRONG>$DATA[total]</STRONG></TD>
-               <TD align="center" class="top right">{--TOTAL_REFERRALS--}:<BR />
-               <STRONG>{!_REFS!}</STRONG></TD>
-               <TD align="center" class="top right">{--TOTAL_CATS--}:<BR />
-               <STRONG>{!_CATS!}</STRONG></TD>
-               <TD align="center" class="top">{--UNCONFIRMED_LINKS--}:<BR />
-               <STRONG>{!_LINKS!}</STRONG></TD>
-       </TR>
-       <TR>
-               <TD align="center" class="top right">{--LOCKED_POINTS--}:<BR />
-               <STRONG>$DATA[locked]</STRONG></TD>
-               <TD align="center" class="top right">{--LAST_UPDATE--}:<BR />
-               <STRONG>$DATA[last_update]</STRONG></TD>
-               <TD align="center" class="top right">{--LAST_PROFILE_SENT--}:<BR />
-               <STRONG>$DATA[last_profile_sent]</STRONG></TD>
-               <TD align="center" class="top right">{--USER_REF_PAYOUT--}:<BR />
-               <STRONG>$DATA[ref_payout]</STRONG></TD>
-               <TD align="center" class="top">{--USER_NICKNAME--}:<BR />
-               <STRONG>$DATA[nickname]</STRONG></TD>
-       </TR>
-       <TR>
-               <TD align="center" class="top right">{--CLICK_RATE--}:<BR />
-               <STRONG>$DATA[click_rate]%</STRONG></TD>
-               <TD align="center" class="top right">{--EMAILS_RECEIVED--}:<BR />
-               <STRONG>$DATA[emails_received]</STRONG></TD>
-               <TD align="center" class="top right">{--MAILS_CONFIRMED--}:<BR />
-               <STRONG>$DATA[mails_confirmed]</STRONG></TD>
-               <TD align="center" class="top right">{--RAND_CONFIRMED--}:<BR />
-               <STRONG>$DATA[rand_confirmed]</STRONG></TD>
-               <TD align="center" class="top">{--__UNUSED--}:<BR />
-               <STRONG>---</STRONG></TD>
-       </TR>
-       <TR>
-               <TD align="center" class="admin_footer top" colspan="5">
-               <STRONG>{--ADMIN_MEMBER_FUNCTIONS--}:</STRONG><BR />
-               {!_ADMIN_LINKS!}</TD>
-       </TR>
-</TABLE>
\ No newline at end of file
+<table border="0" cellspacing="0" cellpadding="0" width="99%" align="center" class="admin_table dashed">
+       <tr>
+               <td colspan="5" class="admin_title" align="center"
+                       style="height: 30px"><strong class="admin_green big">{--_UID--}
+               $content</strong></td>
+       </tr>
+       <tr>
+               <td align="center" width="20%" class="top right">{--GENDER--}:<br />
+               <strong>$DATA[gender]</strong></td>
+               <td align="center" width="20%" class="top right">{--SURNAME--}:<br />
+               <strong>$DATA[surname]</strong></td>
+               <td align="center" width="20%" class="top right">{--FAMILY_NAME--}:<br />
+               <strong>$DATA[family]</strong></td>
+               <td align="center" width="20%" class="top right">{--STREET_NR--}:<br />
+               <strong>$DATA[street_nr]</strong></td>
+               <td align="center" width="20%" class="top">{--BIRTHDAY2--}:<br />
+               <strong>{!_BIRTHDAY!}</strong></td>
+       </tr>
+       <tr>
+               <td align="center" class="top right">{--COUNTRY--}:<br />
+               <strong>$DATA[country]</strong></td>
+               <td align="center" class="top right">{--ZIP--}:<br />
+               <strong>$DATA[zip]</strong></td>
+               <td align="center" class="top right">{--CITY--}:<br />
+               <strong>$DATA[city]</strong></td>
+               <td align="center" class="top right">{--ADDY--}:<br />
+               <strong><a href="$DATA[email_link]">$DATA[email]</a></td>
+               <td align="center" class="top">{--ACCOUNT_STATUS--}:<br />
+               <strong>$DATA[status]</strong></td>
+       </tr>
+       <tr>
+               <td align="center" class="top right">{--RECEIVE_MAILS--}:<br />
+               <strong>$DATA[receive_mails]</strong></td>
+               <td align="center" class="top right">{--MAX_PER_DAY--}:<br />
+               <strong>$DATA[max_mails]</td>
+               <td align="center" class="top right">{--REF_UID--}:<br />
+               <strong>$DATA[refid]</strong></td>
+               <td align="center" class="top right">{--REF_CLICKS--}:<br />
+               <strong>$DATA[ref_clicks]</strong></td>
+               <td align="center" class="top">{--TOTAL_LOGINS--}:<br />
+               <strong>$DATA[total_logins]</strong></td>
+       </tr>
+       <tr>
+               <td align="center" class="top right">{--REMOTE_IP--}:<br />
+               <strong>$DATA[REMOTE_ADDR]</strong></td>
+               <td align="center" class="top right">{--ADMIN_LAST_ONLINE--}:<br />
+               <strong>$DATA[last_online]</strong></td>
+               <td align="center" class="top right">{--ADMIN_LAST_MODULE--}:<br />
+               <strong>$DATA[last_module]</strong></td>
+               <td align="center" class="top right">{--HAS_JOINED--}:<br />
+               <strong>$DATA[joined]</strong></td>
+               <td align="center" class="top">{--MAILS_SENT--}:<br />
+               <strong>$DATA[emails_sent]</strong></td>
+       </tr>
+       <tr>
+               <td align="center" class="top right">{--USED_POINTS--}:<br />
+               <strong>$DATA[used_points]</strong></td>
+               <td align="center" class="top right">{--TOTAL_POINTS--}:<br />
+               <strong>$DATA[total]</strong></td>
+               <td align="center" class="top right">{--TOTAL_REFERRALS--}:<br />
+               <strong>{!_REFS!}</strong></td>
+               <td align="center" class="top right">{--TOTAL_CATS--}:<br />
+               <strong>{!_CATS!}</strong></td>
+               <td align="center" class="top">{--UNCONFIRMED_LINKS--}:<br />
+               <strong>{!_LINKS!}</strong></td>
+       </tr>
+       <tr>
+               <td align="center" class="top right">{--LOCKED_POINTS--}:<br />
+               <strong>$DATA[locked]</strong></td>
+               <td align="center" class="top right">{--LAST_UPDATE--}:<br />
+               <strong>$DATA[last_update]</strong></td>
+               <td align="center" class="top right">{--LAST_PROFILE_SENT--}:<br />
+               <strong>$DATA[last_profile_sent]</strong></td>
+               <td align="center" class="top right">{--USER_REF_PAYOUT--}:<br />
+               <strong>$DATA[ref_payout]</strong></td>
+               <td align="center" class="top">{--USER_NICKNAME--}:<br />
+               <strong>$DATA[nickname]</strong></td>
+       </tr>
+       <tr>
+               <td align="center" class="top right">{--CLICK_RATE--}:<br />
+               <strong>$DATA[click_rate]%</strong></td>
+               <td align="center" class="top right">{--EMAILS_RECEIVED--}:<br />
+               <strong>$DATA[emails_received]</strong></td>
+               <td align="center" class="top right">{--MAILS_CONFIRMED--}:<br />
+               <strong>$DATA[mails_confirmed]</strong></td>
+               <td align="center" class="top right">{--RAND_CONFIRMED--}:<br />
+               <strong>$DATA[rand_confirmed]</strong></td>
+               <td align="center" class="top">{--__UNUSED--}:<br />
+               <strong>---</strong></td>
+       </tr>
+       <tr>
+               <td align="center" class="top right">{--LOCK_REASON--}:<br />
+               <strong>$DATA[lock_reason]</strong></td>
+               <td align="center" class="top right">{--LOCK_TIMESTAMP--}:<br />
+               <strong>$DATA[lock_timestamp]</strong></td>
+               <td align="center" class="top right">{--__UNUSED--}:<br />
+               <strong>---</strong></td>
+               <td align="center" class="top right">{--__UNUSED--}:<br />
+               <strong>---</strong></td>
+               <td align="center" class="top">{--__UNUSED--}:<br />
+               <strong>---</strong></td>
+       </tr>
+       <tr>
+               <td align="center" class="admin_footer top" colspan="5">
+                       <strong>{--ADMIN_MEMBER_FUNCTIONS--}:</strong><br />
+                       {!_ADMIN_LINKS!}
+               </td>
+       </tr>
+</table>
index fdafa74..7d006d7 100644 (file)
@@ -17,7 +17,7 @@
 <TR>
        <TD class="admin_footer" colspan="2">
                <INPUT type="hidden" name="hash" value="$content" />
-               <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+               <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                <INPUT type="submit" name="validate_hash" class="admin_submit" value="{--ADMIN_VALIDATE_HASH_SUBMIT--}" />
        </TD>
 </TR>
index f1f47b0..e06d120 100644 (file)
@@ -45,7 +45,7 @@
        </TR>
        <TR>
                <TD colspan="3" align="center" class="member_footer">
-                       <INPUT type="reset" class="member_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+                       <INPUT type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
                        <INPUT type="submit" name="stop" class="member_submit" value="{--HOLIDAY_STOP--}" />
                </TD>
        </TR>
index 22479e5..bd42b69 100644 (file)
@@ -38,7 +38,7 @@
     Ihr $username
 </PRE></DIV>
                <HR noshade width="400">
-               <INPUT type="reset" class="member_reset" value="Nochmal eingeben"><BIG>&nbsp;*</BIG>
+               <INPUT type="reset" class="member_reset" value="Nochmal eingeben"><BIG></BIG>
                <INPUT type="submit" class="member_submit" name="ok"
                        value="Abschicken"></TD>
        </TR>
index 9196058..fef10a0 100644 (file)
@@ -29,7 +29,7 @@
        </div>
 
        <div class="member_title2 top2" style="padding-top:5px;padding-bottom:5px">
-               <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+               <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
                <input type="submit" class="member_submit" name="ok" value="{--MEMBER_SURFBAR_ADD_URL--}" />
        </div>
 </div>
index 314eb85..48e29ff 100644 (file)
@@ -29,7 +29,7 @@
        </div>
 
        <div class="member_title2 top2" style="padding-top:5px;padding-bottom:5px">
-               <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+               <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
                <input type="submit" class="member_submit" name="ok" value="{--MEMBER_SURFBAR_ADD_URL--}" />
        </div>
 </div>
index 8689693..7d09bfd 100644 (file)
@@ -53,7 +53,7 @@
        </TR>
        <TR>
                <TD colspan="4" align="center" class="member_footer"><INPUT
-                       type="reset" class="member_reset" value="{--CLEAR_FORM--}"{!__TRANSFER_TO_DISABLED!}>&nbsp;*
+                       type="reset" class="member_reset" value="{--CLEAR_FORM--}"{!__TRANSFER_TO_DISABLED!}>
                <INPUT type="submit" name="ok" class="member_submit"
                        value="{--TRANSFER_ADD_NEW--}"{!__TRANSFER_TO_DISABLED!}></TD>
        </TR>
index 3909da6..7bc788f 100644 (file)
@@ -35,7 +35,7 @@
        </tr>
        <tr>
                <td colspan="3" align="center" class="member_footer">
-                       <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+                       <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="ok" class="member_submit" value="{--WERNIS_SEND_NOW--}" />
                </td>
        </tr>
index 9047c5b..872a89a 100644 (file)
@@ -37,7 +37,7 @@
        </tr>
        <tr>
                <td colspan="3" align="center" class="member_footer">
-                       <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+                       <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="ok" class="member_submit" value="{--WERNIS_MEMBER_PAYOUT_SUBMIT--}" />
                </td>
        </tr>
index 2557a47..3554354 100644 (file)
@@ -38,7 +38,7 @@
        </tr>
        <tr>
                <td colspan="3" align="center" class="member_footer">
-                       <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+                       <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="ok" class="member_submit" value="{--WERNIS_MEMBER_WITHDRAW_SUBMIT--}" />
                </td>
        </tr>