X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=58c2147f0a350ff7b0be4ece9e78cb104ae42d9c;hp=0199638d136c39047917a5c705bbfdc684290b5e;hb=357b2ca133fc1f89db74097955c366cb4bee6996;hpb=2865a2ba42f7be1851708e33a4f3325ecbff0dd1

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 0199638d13..58c2147f0a 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 } elseif ((!EXT_IS_ACTIVE("user")) || (GET_EXT_VERSION("user") == "")) {
@@ -43,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Init title with "all accounts"
 $listHeader = ADMIN_ALL_ACCOUNTS;
@@ -51,7 +50,7 @@ if (!empty($_GET['mode'])) {
 	// Set title according to the "mode"
 	$eval = sprintf("\$listHeader = ADMIN_LIST_%s_ACCOUNTS;", strtoupper(SQL_ESCAPE($_GET['mode'])));
 	eval($eval);
-}
+} // END - if
 
 // Remember it
 define('__TITLE', $listHeader);
@@ -64,20 +63,18 @@ if (empty($_GET['sortby'])) { $_GET['sortby'] = "userid"; }
 if (empty($_GET['page']))   { $_GET['page']   = "1";      }
 
 // Set base URL
-$BASE = "<A href=\"".URL."/modules.php?module=admin";
+$BASE = "[<A href=\"".URL."/modules.php?module=admin";
 
-if (!empty($_GET['u_id']))
-{
+if (!empty($_GET['u_id'])) {
 	// Secure the user ID
 	$uid = bigintval($_GET['u_id']);
 
-	// Does the account exists?       0      1        2         3      4     5      6       7         8          9          10           11           12         13     14         15           16          17            18           19           20           21        22        23             24              25         26
-	$result = SQL_QUERY_ESC("SELECT sex, surname, family, street_nr, zip, city, country, email, birth_day, birth_month, birth_year, max_mails, receive_mails, refid, status, REMOTE_ADDR, last_online, last_module, ref_clicks, total_logins, used_points, emails_sent, joined, last_update, last_profile_sent, notified, ref_payout".$MORE."
+	// Does the account exists?        0      1        2         3       4     5      6       7         8          9          10           11           12         13     14         15           16          17            18           19           20           21        22        23             24              25         26
+	$result = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, zip, city, country, email, birth_day, birth_month, birth_year, max_mails, receive_mails, refid, status, REMOTE_ADDR, last_online, last_module, ref_clicks, total_logins, used_points, emails_sent, joined, last_update, last_profile_sent, notified, ref_payout".$MORE."
 FROM "._MYSQL_PREFIX."_user_data
-WHERE userid=%d LIMIT 1",
+WHERE userid=%s LIMIT 1",
 	 array($uid), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 1)
-	{
+	if (SQL_NUMROWS($result) == 1) {
 		// Account found!
 		$DATA  = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
@@ -86,11 +83,11 @@ WHERE userid=%d LIMIT 1",
 		$CATS  = GET_TOTAL_DATA($uid, "user_cats", "id", "userid", true);
 		$LINKS = GET_TOTAL_DATA($uid, "user_links", "id", "userid", true);
 
-		if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$uid."\">".$LINKS."</A>";
-		if ($DATA[13] > 0) $DATA[13] = str_replace(("u_id=".$uid), ("u_id=".$DATA[13]), $BASE."&amp;what=list_user\">".$DATA[13]."</A>");
+		if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$uid."\">".$LINKS."</A>]";
+		if ($DATA[13] > 0) $DATA[13] = str_replace(("u_id=".$uid), ("u_id=".$DATA[13]), $BASE."&amp;what=list_user\">".$DATA[13]."</A>]");
 		if (empty($DATA[17])) $DATA[17] = "---";
-		if ($REFS > 0)	$REFS = $BASE."&amp;what=list_refs&amp;u_id=".$uid."\">".$REFS."</A></STRONG>";
-		if ($CATS > 0) $CATS = $BASE."&amp;what=list_cats&amp;u_id=".$uid."\">".$CATS."</A>";
+		if ($REFS > 0) $REFS = $BASE."&amp;what=list_refs&amp;u_id=".$uid."\">".$REFS."</A>]";
+		if ($CATS > 0) $CATS = $BASE."&amp;what=list_cats&amp;u_id=".$uid."\">".$CATS."</A>]";
 
 		// Prepare data for template
 		define('_BIRTHDAY', MAKE_DATETIME(mktime(0, 0, 0, $DATA[9], $DATA[8], $DATA[10]), "3"));
@@ -98,12 +95,12 @@ WHERE userid=%d LIMIT 1",
 		define('_CATS' , $CATS);
 		define('_LINKS', $LINKS);
 		define('_ADMIN_LINKS', MEMBER_ACTION_LINKS($uid, $DATA[14]));
-		$DATA[0]      = TRANSLATE_SEX($DATA[0]);
+		$DATA[0]      = TRANSLATE_GENDER($DATA[0]);
 		$DATA[28]     = CREATE_EMAIL_LINK($DATA[7], "user_data");
 		$DATA[14]     = TRANSLATE_STATUS($DATA[14]);
 		$DATA[16]     = MAKE_DATETIME($DATA[16], "0");
 		$DATA[20]     = TRANSLATE_COMMA($DATA[20]);
-		if ($DATA[21] > 0) $DATA[21] = $BASE."&amp;what=email_details&amp;u_id=".$uid."\">".$DATA[21]."</A>";
+		if ($DATA[21] > 0) $DATA[21] = $BASE."&amp;what=email_details&amp;u_id=".$uid."\">".TRANSLATE_COMMA($DATA[21])."</A>]";
 		$DATA[22]     = MAKE_DATETIME($DATA[22], "0");
 		$DATA[23]     = MAKE_DATETIME($DATA[23], "0");
 		$DATA[24]     = MAKE_DATETIME($DATA[24], "0");
@@ -119,21 +116,16 @@ WHERE userid=%d LIMIT 1",
 
 		// Template laden
 		LOAD_TEMPLATE("admin_user_details", false, $uid);
-	}
-	 else
-	{
+	} else {
 		// Account does not exists!
 		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MEMBER_404_1.$uid.ADMIN_MEMBER_404_2);
 	}
-}
- else
-{
+} else {
 	$whereStatement = "";
-	if (($_GET['letter'] != _ALL2) && ($_GET['letter'] != _OTHERS) && (!empty($_GET['letter'])))
-	{
+	if (($_GET['letter'] != _ALL2) && ($_GET['letter'] != _OTHERS) && (!empty($_GET['letter']))) {
 		// List only persons w
 		$whereStatement = " WHERE family LIKE '".$_GET['letter']."%'";
-	}
+	} // END - if
 	if ($_GET['sortby'] == "family_name") $_GET['sortby'] = "family";
 
 	// Parse the mode parameter
@@ -146,16 +138,16 @@ WHERE userid=%d LIMIT 1",
 			// Start a new one
 			$whereStatement = sprintf(" WHERE status='%s'", SQL_ESCAPE(strip_tags(strtoupper($_GET['mode']))));
 		}
-	}
+	} // END - if
 
-	$SQL = "SELECT userid, sex, surname, family, email, REMOTE_ADDR, refid, status".$MORE." FROM "._MYSQL_PREFIX."_user_data".$whereStatement." ORDER BY ".$_GET['sortby'];
+	$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'];
 	$result_master = SQL_QUERY($SQL, __FILE__, __LINE__);
 
 	// Calculate page count (0.5 fixes a bug with page count)
 	if ($_CONFIG['user_limit'] == 0) {
 		$_CONFIG['user_limit'] = 100;
 		LOAD_TEMPLATE("admin_settings_saved", false, EXTENSION_WARNING_USER_LIMIT);
-	}
+	} // END - if
 
 	// Activate the extension please!
 	$PAGES = round(SQL_NUMROWS($result_master) / $_CONFIG['user_limit'] + 0.5);
@@ -171,8 +163,7 @@ WHERE userid=%d LIMIT 1",
 	$user_count = SQL_NUMROWS($result_user);
 	SQL_FREERESULT($result_user);
 
-	if (SQL_NUMROWS($result_master) > 0)
-	{
+	if (SQL_NUMROWS($result_master) > 0) {
 		// Free memory
 		SQL_FREERESULT($result_master);
 
@@ -209,35 +200,49 @@ WHERE userid=%d LIMIT 1",
 		}
 
 		$SW = 2; $OUT = "";
-		while (list($uid, $sex, $sname, $fname, $email, $IP, $ref, $status, $nick) = SQL_FETCHROW($result))
-		{
+		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 = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_links", "id", "userid", true));
-			if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$uid."\">".$LINKS."</A>";
+			$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>]";
 
 			// Add nickname
 			if (empty($nick) || $nick == $uid) $nick = "---";
 
+			// Calculate total points
+			$pointsTotal = GET_TOTAL_DATA($uid, "user_points", "points")  - GET_TOTAL_DATA($uid, "user_data", "used_points");
+
+			// Clickrate
+			$clickRate = 0;
+			if ($emails_received > 0) {
+				$clickRate = $mails_confirmed / $emails_received * 100;
+			} // END - if
+
 			// Transfer data to array
 			$content = array(
 				'sw'     => $SW,
 				'uid'    => ADMIN_USER_PROFILE_LINK($uid),
-				'sex'    => TRANSLATE_SEX($sex),
+				'gender' => TRANSLATE_GENDER($gender),
 				'sname'  => $sname,
 				'fname'  => $fname,
-				'email'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
+				'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)
+				'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"))
 			);
 
 			// Load row template and switch colors
 			$OUT .= LOAD_TEMPLATE("admin_list_user_row", true, $content);
 			$SW = 3 - $SW;
-		}
+		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
@@ -249,9 +254,7 @@ WHERE userid=%d LIMIT 1",
 
 		// Free some memory
 		SQL_FREERESULT($result_master);
-	}
-	 else
-	{
+	} else {
 		// No one as registered so far! :-(
 		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_NONE_REGISTERED);
 	}