From fc7f4d7fd71c718503c2af305276f5a374ae24da Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 9 Nov 2008 15:11:42 +0000 Subject: [PATCH] Lock reason now saved in DB, deleted accounts shall be locked for re-registering (prepared) --- inc/databases.php | 2 +- inc/extensions/ext-user.php | 47 +++- inc/language/de.php | 5 +- inc/modules/admin/what-add_points.php | 2 +- inc/modules/admin/what-list_links.php | 2 +- inc/modules/admin/what-list_user.php | 65 +++--- inc/modules/admin/what-lock_user.php | 125 +++++------ inc/modules/admin/what-sub_points.php | 2 +- inc/modules/guest/what-register.php | 18 +- inc/mysql-manager.php | 9 +- templates/de/html/admin/admin_add_points.tpl | 5 +- .../de/html/admin/admin_add_surfbar_url.tpl | 2 +- .../admin/admin_config_home_settings_pro.tpl | 8 +- .../de/html/admin/admin_config_nickname.tpl | 2 +- .../de/html/admin/admin_config_proxy.tpl | 2 +- .../de/html/admin/admin_config_removeip.tpl | 2 +- .../de/html/admin/admin_config_session.tpl | 2 +- .../de/html/admin/admin_config_surfbar.tpl | 2 +- .../de/html/admin/admin_config_yoomedia.tpl | 2 +- .../de/html/admin/admin_contct_user_form.tpl | 2 +- templates/de/html/admin/admin_edit_cats.tpl | 2 +- templates/de/html/admin/admin_list_links.tpl | 15 +- .../de/html/admin/admin_list_user_row.tpl | 26 ++- .../de/html/admin/admin_lock_sponsor.tpl | 2 +- .../de/html/admin/admin_lock_surfbar_urls.tpl | 2 +- templates/de/html/admin/admin_lock_user.tpl | 2 +- templates/de/html/admin/admin_reg_form.tpl | 2 +- .../de/html/admin/admin_reset_password.tpl | 2 +- .../html/admin/admin_reset_password_form.tpl | 2 +- .../de/html/admin/admin_send_reset_link.tpl | 2 +- .../de/html/admin/admin_send_yoomedia.tpl | 2 +- templates/de/html/admin/admin_sub_points.tpl | 4 +- .../admin/admin_undelete_surfbar_urls.tpl | 2 +- .../de/html/admin/admin_user_details.tpl | 206 +++++++++--------- .../admin/admin_validate_reset_hash_form.tpl | 2 +- .../html/member/member_holiday_deactivate.tpl | 2 +- .../de/html/member/member_support_form.tpl | 2 +- .../member/member_surfbar_book_dynamic.tpl | 2 +- .../member/member_surfbar_book_static.tpl | 2 +- .../de/html/member/member_transfer_new.tpl | 2 +- .../de/html/member/member_wernis_form.tpl | 2 +- .../html/member/member_wernis_mode_payout.tpl | 2 +- .../member/member_wernis_mode_withdraw.tpl | 2 +- 43 files changed, 331 insertions(+), 264 deletions(-) diff --git a/inc/databases.php b/inc/databases.php index 54370abbe6..bcb6658e5e 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -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); diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php index f12042f0db..203bd6e3c2 100644 --- a/inc/extensions/ext-user.php +++ b/inc/extensions/ext-user.php @@ -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ö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ätigt hat. Alle vor dieser Version best. Mails werden leider nicht mehr berü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. Diese Anzeige kann fehlerhaft sein, wenn Sie bereits Mitglieder in Ihrem {!MT_WORD!} haben sollen!"; @@ -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 "Firma" hinzugefü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 ü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 ü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ü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ählt, die eine Mindestanzahl an bestä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öschungen auflisten','Listet die Lö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öschen des Users mit ausgesendet."; + break; } break; diff --git a/inc/language/de.php b/inc/language/de.php index 1df932efdc..aa39b4f61e 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -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ählen"); define('ADMIN_RAND_REFID_DISABLED', "Referal-Id 0 verwenden"); define('ADMIN_RANDOM_MIN_CONFIRMED', "Wie viele bestätigte Mails muss ein Mitglied mindestens haben, um per Zufall ausgewählt zu werden?"); -define('EMAILS_RECEIVED', "Emails bereits empfangen"); +define('EMAILS_RECEIVED', "Emails empfangen"); define('MAILS_CONFIRMED', "Emails bestätigt"); +define('RAND_CONFIRMED', "Bestätigt f. Zufalls-Ref"); +define('LOCK_REASON', "Sperrgrund"); +define('LOCK_TIMESTAMP', "Sperrzeitpunkt"); define('MEMBER_MAIL_BONUS_CONFIRMED_ON', "Sie haben diese Bonusmail %s bestätigt."); define('MEMBER_MAIL_NORMAL_CONFIRMED_ON', "Sie haben diese Klickmail %s bestätigt."); diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php index a193055a5a..e77b3f24fe 100644 --- a/inc/modules/admin/what-add_points.php +++ b/inc/modules/admin/what-add_points.php @@ -110,7 +110,7 @@ if ($_GET['u_id'] == "all") { } else { // Opps, missing form here define('__USER_VALUE', "".$sname." ".$fname.""); - define('__UID_VALUE', $_GET['u_id']); + define('__UID' , bigintval($_GET['u_id'])); LOAD_TEMPLATE("admin_add_points"); } } else { diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php index 2fd651fd1f..7da4f58d3c 100644 --- a/inc/modules/admin/what-list_links.php +++ b/inc/modules/admin/what-list_links.php @@ -145,7 +145,7 @@ if (!empty($_GET['u_id'])) { define('__EMAIL_VALUE', "".$email.""); 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"); diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 9ecd2c4ee8..ea3997ab6e 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -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."&what=email_details&u_id=".$uid."\">".TRANSLATE_COMMA($emails_sent)."]"; - if ($LINKS > 0) $LINKS = $BASE."&what=list_links&u_id=".$uid."\">".TRANSLATE_COMMA($LINKS)."]"; + 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."&what=list_links&u_id=".$content['userid']."\">".TRANSLATE_COMMA($LINKS)."]"; + + // Set link to sent mails if present + if ($content['emails_sent'] > 0) $content['emails_sent'] = $BASE."&what=email_details&u_id=".$content['userid']."\">".TRANSLATE_COMMA($content['emails_sent'])."]"; // 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' => "[".$email."]", - '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'] = "[".$content['email']."]"; + $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); diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php index d382ea2f68..1e36fd3ede 100644 --- a/inc/modules/admin/what-lock_user.php +++ b/inc/modules/admin/what-lock_user.php @@ -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&what=list_user&u_id=".$_GET['u_id']; - } - else - { + $URL = URL."/modules.php?module=admin&what=list_user&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("".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2.""); } } - 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, "".$MSG.""); - } - else - { + } else { LOAD_TEMPLATE("admin_settings_saved", false, "".ADMIN_USER_UPDATED.""); } } - } - else - { + } else { // Account does not exists! OUTPUT_HTML("".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2.""); } diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php index d962bc943c..26731b6a5e 100644 --- a/inc/modules/admin/what-sub_points.php +++ b/inc/modules/admin/what-sub_points.php @@ -123,7 +123,7 @@ if ($_GET['u_id'] == "all") { // Opps, missing form here define('__USER_VALUE', "".$sname." ".$fname.""); - define('__UID_VALUE', $_GET['u_id']); + define('__UID', bigintval($_GET['u_id'])); LOAD_TEMPLATE("admin_sub_points"); } } diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php index e4fa749c48..c38e2e5bb5 100644 --- a/inc/modules/guest/what-register.php +++ b/inc/modules/guest/what-register.php @@ -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 = ""; diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 28dd1789e0..e92f1e4d50 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -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."
\n"; if (($onlyRows) || ($lookFor == "userid")) { // Count rows + //* DEBUG: */ echo "COUNT!
\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!
\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; diff --git a/templates/de/html/admin/admin_add_points.tpl b/templates/de/html/admin/admin_add_points.tpl index ef44eb9042..502ffb7ece 100644 --- a/templates/de/html/admin/admin_add_points.tpl +++ b/templates/de/html/admin/admin_add_points.tpl @@ -1,7 +1,4 @@ - -
+ diff --git a/templates/de/html/admin/admin_add_surfbar_url.tpl b/templates/de/html/admin/admin_add_surfbar_url.tpl index 17155247a4..5bac569fd4 100644 --- a/templates/de/html/admin/admin_add_surfbar_url.tpl +++ b/templates/de/html/admin/admin_add_surfbar_url.tpl @@ -14,7 +14,7 @@
-  * +
diff --git a/templates/de/html/admin/admin_config_home_settings_pro.tpl b/templates/de/html/admin/admin_config_home_settings_pro.tpl index 321a157ff2..cd06139410 100644 --- a/templates/de/html/admin/admin_config_home_settings_pro.tpl +++ b/templates/de/html/admin/admin_config_home_settings_pro.tpl @@ -39,10 +39,10 @@ - +
 
  + + +
\ No newline at end of file diff --git a/templates/de/html/admin/admin_config_nickname.tpl b/templates/de/html/admin/admin_config_nickname.tpl index d015fc76f5..cbf9424b0b 100644 --- a/templates/de/html/admin/admin_config_nickname.tpl +++ b/templates/de/html/admin/admin_config_nickname.tpl @@ -39,7 +39,7 @@ -  * + diff --git a/templates/de/html/admin/admin_config_proxy.tpl b/templates/de/html/admin/admin_config_proxy.tpl index ef877fc7b6..18328722ba 100644 --- a/templates/de/html/admin/admin_config_proxy.tpl +++ b/templates/de/html/admin/admin_config_proxy.tpl @@ -43,7 +43,7 @@   -  * + diff --git a/templates/de/html/admin/admin_config_removeip.tpl b/templates/de/html/admin/admin_config_removeip.tpl index e5a8c1f8ab..aa2fb3566f 100644 --- a/templates/de/html/admin/admin_config_removeip.tpl +++ b/templates/de/html/admin/admin_config_removeip.tpl @@ -109,7 +109,7 @@   -  * + diff --git a/templates/de/html/admin/admin_config_session.tpl b/templates/de/html/admin/admin_config_session.tpl index 98374e9d67..c1640b9eb3 100644 --- a/templates/de/html/admin/admin_config_session.tpl +++ b/templates/de/html/admin/admin_config_session.tpl @@ -26,7 +26,7 @@   -  * + diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl index 0b9e1476d6..8a037258f2 100644 --- a/templates/de/html/admin/admin_config_surfbar.tpl +++ b/templates/de/html/admin/admin_config_surfbar.tpl @@ -228,7 +228,7 @@   -  * + diff --git a/templates/de/html/admin/admin_config_yoomedia.tpl b/templates/de/html/admin/admin_config_yoomedia.tpl index b99b541b28..229911acd8 100644 --- a/templates/de/html/admin/admin_config_yoomedia.tpl +++ b/templates/de/html/admin/admin_config_yoomedia.tpl @@ -84,7 +84,7 @@   -  * + diff --git a/templates/de/html/admin/admin_contct_user_form.tpl b/templates/de/html/admin/admin_contct_user_form.tpl index 7767ab362a..b45291d7ef 100644 --- a/templates/de/html/admin/admin_contct_user_form.tpl +++ b/templates/de/html/admin/admin_contct_user_form.tpl @@ -13,7 +13,7 @@ -  * + diff --git a/templates/de/html/admin/admin_edit_cats.tpl b/templates/de/html/admin/admin_edit_cats.tpl index 7464064911..b3c0877bde 100644 --- a/templates/de/html/admin/admin_edit_cats.tpl +++ b/templates/de/html/admin/admin_edit_cats.tpl @@ -8,7 +8,7 @@ {!__CAT_ROWS!} -  * + diff --git a/templates/de/html/admin/admin_list_links.tpl b/templates/de/html/admin/admin_list_links.tpl index aaf7cd3ae7..4b7a6b4ae4 100644 --- a/templates/de/html/admin/admin_list_links.tpl +++ b/templates/de/html/admin/admin_list_links.tpl @@ -1,17 +1,14 @@ - + {!__EMAIL_LIST!} -
{!__SNAME_VALUE!} - {!__FNAME_VALUE!} ({!__EMAIL_VALUE!}): + {!__SNAME_VALUE!} {!__FNAME_VALUE!} ({!__EMAIL_VALUE!}): +
- {--MEMBER_TOTAL_LINKS_1--}{!__NUMS_VALUE!}{--MEMBER_TOTAL_LINKS_2--}
- {--ADMIN_DEL_UNCONFIRMED_LINKS--} + {--MEMBER_TOTAL_LINKS_1--}{!__NUMS_VALUE!}{--MEMBER_TOTAL_LINKS_2--}
+ {--ADMIN_DEL_UNCONFIRMED_LINKS--}
\ No newline at end of file + diff --git a/templates/de/html/admin/admin_list_user_row.tpl b/templates/de/html/admin/admin_list_user_row.tpl index 377c383c30..a9b8cbb854 100644 --- a/templates/de/html/admin/admin_list_user_row.tpl +++ b/templates/de/html/admin/admin_list_user_row.tpl @@ -10,9 +10,9 @@   $content[uid] $content[gender] - $content[sname] - $content[fname] - $content[nick] + $content[surname] + $content[family] + $content[nickname]   @@ -26,7 +26,7 @@   $content[email] $content[addr] - $content[ref] + $content[refid] $content[status] $content[links] @@ -41,11 +41,27 @@   $content[points] {!POINTS!} - $content[sent] + $content[emails_sent] $content[rate]% $content[locked] {!POINTS!} --- + +   + {--LOCK_REASON--}: + {--LOCK_TIMESTAMP--}: + {--__UNUSED--}: + {--__UNUSED--}: + {--__UNUSED--}: + + +   + $content[lock_reason] + $content[lock_timestamp] + --- + --- + --- + $content[alinks] diff --git a/templates/de/html/admin/admin_lock_sponsor.tpl b/templates/de/html/admin/admin_lock_sponsor.tpl index 0abdfab2b5..4c442dc458 100644 --- a/templates/de/html/admin/admin_lock_sponsor.tpl +++ b/templates/de/html/admin/admin_lock_sponsor.tpl @@ -26,7 +26,7 @@   -  * + diff --git a/templates/de/html/admin/admin_lock_surfbar_urls.tpl b/templates/de/html/admin/admin_lock_surfbar_urls.tpl index 50188016ec..bcb905b72d 100644 --- a/templates/de/html/admin/admin_lock_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_lock_surfbar_urls.tpl @@ -15,7 +15,7 @@ $content -  * + diff --git a/templates/de/html/admin/admin_lock_user.tpl b/templates/de/html/admin/admin_lock_user.tpl index 7486c47f58..6e58ed8b63 100644 --- a/templates/de/html/admin/admin_lock_user.tpl +++ b/templates/de/html/admin/admin_lock_user.tpl @@ -1,5 +1,5 @@
diff --git a/templates/de/html/admin/admin_reg_form.tpl b/templates/de/html/admin/admin_reg_form.tpl index 8135e4683b..c289f99295 100644 --- a/templates/de/html/admin/admin_reg_form.tpl +++ b/templates/de/html/admin/admin_reg_form.tpl @@ -32,7 +32,7 @@ diff --git a/templates/de/html/admin/admin_reset_password.tpl b/templates/de/html/admin/admin_reset_password.tpl index 0f2e2fb194..e9aa51e0bb 100644 --- a/templates/de/html/admin/admin_reset_password.tpl +++ b/templates/de/html/admin/admin_reset_password.tpl @@ -16,7 +16,7 @@ diff --git a/templates/de/html/admin/admin_reset_password_form.tpl b/templates/de/html/admin/admin_reset_password_form.tpl index 62602aefc9..454b5a5072 100644 --- a/templates/de/html/admin/admin_reset_password_form.tpl +++ b/templates/de/html/admin/admin_reset_password_form.tpl @@ -35,7 +35,7 @@ diff --git a/templates/de/html/admin/admin_send_reset_link.tpl b/templates/de/html/admin/admin_send_reset_link.tpl index 3bc53e81dd..fc7db05f5c 100644 --- a/templates/de/html/admin/admin_send_reset_link.tpl +++ b/templates/de/html/admin/admin_send_reset_link.tpl @@ -16,7 +16,7 @@ diff --git a/templates/de/html/admin/admin_send_yoomedia.tpl b/templates/de/html/admin/admin_send_yoomedia.tpl index d58798c630..3a9409c7bb 100644 --- a/templates/de/html/admin/admin_send_yoomedia.tpl +++ b/templates/de/html/admin/admin_send_yoomedia.tpl @@ -69,7 +69,7 @@ diff --git a/templates/de/html/admin/admin_sub_points.tpl b/templates/de/html/admin/admin_sub_points.tpl index bb8b97d200..4afdb5f3b8 100644 --- a/templates/de/html/admin/admin_sub_points.tpl +++ b/templates/de/html/admin/admin_sub_points.tpl @@ -1,6 +1,4 @@ - +
-  * +
-  * +
-  * +
-  * +
 
-  * +
diff --git a/templates/de/html/admin/admin_undelete_surfbar_urls.tpl b/templates/de/html/admin/admin_undelete_surfbar_urls.tpl index c772260968..eac4ed36c6 100644 --- a/templates/de/html/admin/admin_undelete_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_undelete_surfbar_urls.tpl @@ -14,7 +14,7 @@ $content diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl index 9afdf66474..b24c9a0d1c 100644 --- a/templates/de/html/admin/admin_user_details.tpl +++ b/templates/de/html/admin/admin_user_details.tpl @@ -1,97 +1,109 @@ -
-  * +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{--_UID--} - $content
{--GENDER--}:
- $DATA[gender]		{--SURNAME--}:
- $DATA[surname]		{--FAMILY_NAME--}:
- $DATA[family]		{--STREET_NR--}:
- $DATA[street_nr]		{--BIRTHDAY2--}:
- {!_BIRTHDAY!}
{--COUNTRY--}:
- $DATA[country]		{--ZIP--}:
- $DATA[zip]		{--CITY--}:
- $DATA[city]		{--ADDY--}:
- $DATA[email]		{--ACCOUNT_STATUS--}:
- $DATA[status]
{--RECEIVE_MAILS--}:
- $DATA[receive_mails]		{--MAX_PER_DAY--}:
- $DATA[max_mails]		{--REF_UID--}:
- $DATA[refid]		{--REF_CLICKS--}:
- $DATA[ref_clicks]		{--TOTAL_LOGINS--}:
- $DATA[total_logins]
{--REMOTE_IP--}:
- $DATA[REMOTE_ADDR]		{--ADMIN_LAST_ONLINE--}:
- $DATA[last_online]		{--ADMIN_LAST_MODULE--}:
- $DATA[last_module]		{--HAS_JOINED--}:
- $DATA[joined]		{--MAILS_SENT--}:
- $DATA[emails_sent]
{--USED_POINTS--}:
- $DATA[used_points]		{--TOTAL_POINTS--}:
- $DATA[total]		{--TOTAL_REFERRALS--}:
- {!_REFS!}		{--TOTAL_CATS--}:
- {!_CATS!}		{--UNCONFIRMED_LINKS--}:
- {!_LINKS!}
{--LOCKED_POINTS--}:
- $DATA[locked]		{--LAST_UPDATE--}:
- $DATA[last_update]		{--LAST_PROFILE_SENT--}:
- $DATA[last_profile_sent]		{--USER_REF_PAYOUT--}:
- $DATA[ref_payout]		{--USER_NICKNAME--}:
- $DATA[nickname]
{--CLICK_RATE--}:
- $DATA[click_rate]%		{--EMAILS_RECEIVED--}:
- $DATA[emails_received]		{--MAILS_CONFIRMED--}:
- $DATA[mails_confirmed]		{--RAND_CONFIRMED--}:
- $DATA[rand_confirmed]		{--__UNUSED--}:
- ---
- {--ADMIN_MEMBER_FUNCTIONS--}:
- {!_ADMIN_LINKS!}
\ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{--_UID--} + $content
{--GENDER--}:
+ $DATA[gender]		{--SURNAME--}:
+ $DATA[surname]		{--FAMILY_NAME--}:
+ $DATA[family]		{--STREET_NR--}:
+ $DATA[street_nr]		{--BIRTHDAY2--}:
+ {!_BIRTHDAY!}
{--COUNTRY--}:
+ $DATA[country]		{--ZIP--}:
+ $DATA[zip]		{--CITY--}:
+ $DATA[city]		{--ADDY--}:
+ $DATA[email]		{--ACCOUNT_STATUS--}:
+ $DATA[status]
{--RECEIVE_MAILS--}:
+ $DATA[receive_mails]		{--MAX_PER_DAY--}:
+ $DATA[max_mails]		{--REF_UID--}:
+ $DATA[refid]		{--REF_CLICKS--}:
+ $DATA[ref_clicks]		{--TOTAL_LOGINS--}:
+ $DATA[total_logins]
{--REMOTE_IP--}:
+ $DATA[REMOTE_ADDR]		{--ADMIN_LAST_ONLINE--}:
+ $DATA[last_online]		{--ADMIN_LAST_MODULE--}:
+ $DATA[last_module]		{--HAS_JOINED--}:
+ $DATA[joined]		{--MAILS_SENT--}:
+ $DATA[emails_sent]
{--USED_POINTS--}:
+ $DATA[used_points]		{--TOTAL_POINTS--}:
+ $DATA[total]		{--TOTAL_REFERRALS--}:
+ {!_REFS!}		{--TOTAL_CATS--}:
+ {!_CATS!}		{--UNCONFIRMED_LINKS--}:
+ {!_LINKS!}
{--LOCKED_POINTS--}:
+ $DATA[locked]		{--LAST_UPDATE--}:
+ $DATA[last_update]		{--LAST_PROFILE_SENT--}:
+ $DATA[last_profile_sent]		{--USER_REF_PAYOUT--}:
+ $DATA[ref_payout]		{--USER_NICKNAME--}:
+ $DATA[nickname]
{--CLICK_RATE--}:
+ $DATA[click_rate]%		{--EMAILS_RECEIVED--}:
+ $DATA[emails_received]		{--MAILS_CONFIRMED--}:
+ $DATA[mails_confirmed]		{--RAND_CONFIRMED--}:
+ $DATA[rand_confirmed]		{--__UNUSED--}:
+ ---
{--LOCK_REASON--}:
+ $DATA[lock_reason]		{--LOCK_TIMESTAMP--}:
+ $DATA[lock_timestamp]		{--__UNUSED--}:
+ ---		{--__UNUSED--}:
+ ---		{--__UNUSED--}:
+ ---
+ {--ADMIN_MEMBER_FUNCTIONS--}:
+ {!_ADMIN_LINKS!} +
diff --git a/templates/de/html/admin/admin_validate_reset_hash_form.tpl b/templates/de/html/admin/admin_validate_reset_hash_form.tpl index fdafa7432b..7d006d7b1f 100644 --- a/templates/de/html/admin/admin_validate_reset_hash_form.tpl +++ b/templates/de/html/admin/admin_validate_reset_hash_form.tpl @@ -17,7 +17,7 @@ -  * + diff --git a/templates/de/html/member/member_holiday_deactivate.tpl b/templates/de/html/member/member_holiday_deactivate.tpl index f1f47b0d9a..e06d1207d6 100644 --- a/templates/de/html/member/member_holiday_deactivate.tpl +++ b/templates/de/html/member/member_holiday_deactivate.tpl @@ -45,7 +45,7 @@ -  * + diff --git a/templates/de/html/member/member_support_form.tpl b/templates/de/html/member/member_support_form.tpl index 22479e5464..bd42b69337 100644 --- a/templates/de/html/member/member_support_form.tpl +++ b/templates/de/html/member/member_support_form.tpl @@ -38,7 +38,7 @@ Ihr $username
-  * + diff --git a/templates/de/html/member/member_surfbar_book_dynamic.tpl b/templates/de/html/member/member_surfbar_book_dynamic.tpl index 91960585da..fef10a0188 100644 --- a/templates/de/html/member/member_surfbar_book_dynamic.tpl +++ b/templates/de/html/member/member_surfbar_book_dynamic.tpl @@ -29,7 +29,7 @@
-  * +
diff --git a/templates/de/html/member/member_surfbar_book_static.tpl b/templates/de/html/member/member_surfbar_book_static.tpl index 314eb85049..48e29ffed6 100644 --- a/templates/de/html/member/member_surfbar_book_static.tpl +++ b/templates/de/html/member/member_surfbar_book_static.tpl @@ -29,7 +29,7 @@
-  * +
diff --git a/templates/de/html/member/member_transfer_new.tpl b/templates/de/html/member/member_transfer_new.tpl index 868969345a..7d09bfd320 100644 --- a/templates/de/html/member/member_transfer_new.tpl +++ b/templates/de/html/member/member_transfer_new.tpl @@ -53,7 +53,7 @@  * + type="reset" class="member_reset" value="{--CLEAR_FORM--}"{!__TRANSFER_TO_DISABLED!}> diff --git a/templates/de/html/member/member_wernis_form.tpl b/templates/de/html/member/member_wernis_form.tpl index 3909da6654..7bc788f6e2 100644 --- a/templates/de/html/member/member_wernis_form.tpl +++ b/templates/de/html/member/member_wernis_form.tpl @@ -35,7 +35,7 @@ -  * + diff --git a/templates/de/html/member/member_wernis_mode_payout.tpl b/templates/de/html/member/member_wernis_mode_payout.tpl index 9047c5b138..872a89a924 100644 --- a/templates/de/html/member/member_wernis_mode_payout.tpl +++ b/templates/de/html/member/member_wernis_mode_payout.tpl @@ -37,7 +37,7 @@ -  * + diff --git a/templates/de/html/member/member_wernis_mode_withdraw.tpl b/templates/de/html/member/member_wernis_mode_withdraw.tpl index 2557a47e33..3554354ba3 100644 --- a/templates/de/html/member/member_wernis_mode_withdraw.tpl +++ b/templates/de/html/member/member_wernis_mode_withdraw.tpl @@ -38,7 +38,7 @@ -  * + -- 2.39.2