X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=5dd98324190aa360eda3294b8ce5c2407a625de0;hp=8618702c4d8e2d595d4f599bf55a9422a8a5c8bb;hb=c47144dd555bbab4acdf9085e4623900dedb0e7c;hpb=6c763653e88b9d10627e651ca59c7201d4b7d62b

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 8618702c4d..5dd9832419 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -37,7 +37,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	require($INC);
 } elseif ((!EXT_IS_ACTIVE("user")) || (GET_EXT_VERSION("user") == "")) {
 	// Missing extension!
-	ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "user"));
+	addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "user"));
 	return;
 }
 
@@ -79,7 +79,10 @@ if (GET_EXT_VERSION("user") >= "0.3.4") {
 if (EXT_IS_ACTIVE("country")) {
 	// Add country code
 	$MORE .= ", country_code";
-} // END - if
+} else {
+	// Add direct value
+	$MORE .= ", country";
+}
 
 // Init unset data (bad that we change $_GET here!)
 if (empty($_GET['letter'])) { $_GET['letter'] = _ALL2;    }
@@ -87,7 +90,7 @@ 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'])) {
 	// Secure the user ID
@@ -95,7 +98,7 @@ if (!empty($_GET['u_id'])) {
 
 	// Does the account exists?
 	$result_user = 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, emails_received, mails_confirmed".$MORE."
-FROM "._MYSQL_PREFIX."_user_data
+FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE userid=%s
 LIMIT 1",
 		array($uid), __FILE__, __LINE__);
@@ -109,14 +112,25 @@ LIMIT 1",
 		$LINKS = GET_TOTAL_DATA($uid, "user_links", "id", "userid", true);
 
 		// Add links to the numbers
-		if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$uid."\">".$LINKS."</A>]";
-		if ($DATA['refid'] > 0) $DATA['refid'] = $BASE."&amp;what=list_user&amp;u_id=".$DATA['refid']."\">".$DATA['refid']."</A>]";
+		if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$uid."\">".$LINKS."</a>]";
+		if ($DATA['refid'] > 0) $DATA['refid'] = $BASE."&amp;what=list_user&amp;u_id=".$DATA['refid']."\">".$DATA['refid']."</a>]";
 		if (empty($DATA['last_module'])) $DATA['last_module'] = "---";
-		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>]";
+		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>]";
+
+		// Calculate timestamp for birthday
+		$stamp = mktime(0, 0, 0, $DATA['birth_month'], $DATA['birth_day'], $DATA['birth_year']);
+
+		// Is this above zero?
+		if ($stamp > 0) {
+			// Then use it
+			define('_BIRTHDAY', MAKE_DATETIME($stamp, "3"));
+		} else {
+			// Zero or below so set zero!
+			define('_BIRTHDAY', MAKE_DATETIME(0, "3"));
+		}
 
 		// Prepare data for template
-		define('_BIRTHDAY', MAKE_DATETIME(mktime(0, 0, 0, $DATA['birth_month'], $DATA['birth_day'], $DATA['birth_year']), "3"));
 		define('_REFS' , $REFS);
 		define('_CATS' , $CATS);
 		define('_LINKS', $LINKS);
@@ -126,7 +140,7 @@ LIMIT 1",
 		$DATA['status']            = TRANSLATE_STATUS($DATA['status']);
 		$DATA['last_online']       = MAKE_DATETIME($DATA['last_online'], "0");
 		$DATA['used_points']       = TRANSLATE_COMMA($DATA['used_points']);
-		if ($DATA['emails_sent'] > 0) $DATA['emails_sent'] = $BASE."&amp;what=email_details&amp;u_id=".$uid."\">".TRANSLATE_COMMA($DATA['emails_sent'])."</A>]";
+		if ($DATA['emails_sent'] > 0) $DATA['emails_sent'] = $BASE."&amp;what=email_details&amp;u_id=".$uid."\">".TRANSLATE_COMMA($DATA['emails_sent'])."</a>]";
 		$DATA['joined']            = MAKE_DATETIME($DATA['joined'], "0");
 		$DATA['last_update']       = MAKE_DATETIME($DATA['last_update'], "0");
 		$DATA['last_profile_sent'] = MAKE_DATETIME($DATA['last_profile_sent'], "0");
@@ -182,7 +196,7 @@ LIMIT 1",
 	SQL_FREERESULT($result_user);
 } else {
 	$whereStatement = "";
-	if (($_GET['letter'] != _ALL2) && ($_GET['letter'] != _OTHERS) && (!empty($_GET['letter']))) {
+	if (($_GET['letter'] != getMessage('_ALL2')) && ($_GET['letter'] != getMessage('_OTHERS')) && (!empty($_GET['letter']))) {
 		// List only persons w
 		$whereStatement = " WHERE family LIKE '".$_GET['letter']."%'";
 	} // END - if
@@ -193,10 +207,10 @@ LIMIT 1",
 		// Is a WHERE statement already there?
 		if (!empty($whereStatement)) {
 			// Then append the status column
-			$whereStatement .= sprintf(" AND status='%s'", SQL_ESCAPE(strip_tags(strtoupper($_GET['status']))));
+			$whereStatement .= sprintf(" AND `status`='%s'", SQL_ESCAPE(strip_tags(strtoupper($_GET['status']))));
 		} else {
 			// Start a new one
-			$whereStatement = sprintf(" WHERE status='%s'", SQL_ESCAPE(strip_tags(strtoupper($_GET['status']))));
+			$whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(strip_tags(strtoupper($_GET['status']))));
 		}
 	} elseif (isset($_GET['mode'])) {
 		// Choose what we need to list
@@ -218,26 +232,26 @@ LIMIT 1",
 	} // END = if
 
 	// 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']);
+	$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)
-	if ($_CONFIG['user_limit'] == 0) {
+	if (getConfig('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);
+	$PAGES = round(SQL_NUMROWS($result_master) / getConfig('user_limit') + 0.5);
 
 	if (empty($_GET['page']))   $_GET['page']   = "1";
-	if (empty($_GET['offset'])) $_GET['offset'] = $_CONFIG['user_limit'];
+	if (empty($_GET['offset'])) $_GET['offset'] = getConfig('user_limit');
 
 	// Add limitation to SQL string and run him again
 	$SQL .= " LIMIT ".($_GET['offset'] * $_GET['page'] - $_GET['offset']).", ".$_GET['offset'];
 	$result = SQL_QUERY($SQL, __FILE__, __LINE__);
 
-	$result_user = SQL_QUERY("SELECT emails_sent FROM `"._MYSQL_PREFIX."_user_data` WHERE status='CONFIRMED'", __FILE__, __LINE__);
+	$result_user = SQL_QUERY("SELECT emails_sent FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED'", __FILE__, __LINE__);
 	$user_count = SQL_NUMROWS($result_user);
 	SQL_FREERESULT($result_user);
 
@@ -250,16 +264,12 @@ LIMIT 1",
 		define('__COLSPAN2'  , ($colspan + 2));
 		define('__USER_CNT'  , $user_count);
 
-		if ((function_exists('alpha')) && (function_exists('SortLinks'))) {
-			define('__ALPHA_SORT', alpha($_GET['sortby'], $colspan, true));
-			define('__SORT_LINKS', SortLinks($_GET['letter'], $_GET['sortby'], $colspan, true));
-		} else {
-			define('__ALPHA_SORT', "");
-			define('__SORT_LINKS', "");
-		}
+		// Sorting links
+		define('__ALPHA_SORT', alpha($_GET['sortby'], $colspan, true));
+		define('__SORT_LINKS', SortLinks($_GET['letter'], $_GET['sortby'], $colspan, true));
 
 		if ($PAGES > 1) {
-			define('__PAGE_NAV', ADD_PAGENAV($PAGES, $_CONFIG['user_limit'], true, $colspan, true));
+			define('__PAGE_NAV', ADD_PAGENAV($PAGES, getConfig('user_limit'), true, $colspan, true));
 		} else {
 			// No page navigation is required
 			define('__PAGE_NAV', "");
@@ -269,7 +279,7 @@ LIMIT 1",
 		if (EXT_IS_ACTIVE("nickname"))
 		{
 			// Nickname extension found
-			define('__NICKNAME_TH', "  <TD class=\"admin_title bottom2\" align=\"center\">".NICKNAME."</TD>");
+			define('__NICKNAME_TH', "  <td class=\"admin_title bottom2\" align=\"center\">".NICKNAME."</td>");
 		}
 		 else
 		{
@@ -285,10 +295,10 @@ LIMIT 1",
 
 			// 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>]";
+			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>]";
+			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($content['nickname']) || $content['nickname'] == $content['userid']) $content['nickname'] = "---";
@@ -306,7 +316,7 @@ LIMIT 1",
 			$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['email']  = "[<a href=\"".CREATE_EMAIL_LINK($content['email'], "user_data")."\">".$content['email']."</a>]";
 			$content['addr']   = $content['REMOTE_ADDR'];
 			$content['links']  = $LINKS;
 			$content['alinks'] = MEMBER_ACTION_LINKS($content['userid'], $content['status']);
@@ -323,7 +333,7 @@ LIMIT 1",
 			if (EXT_IS_ACTIVE("country")) {
 				// Then overwrite country information
 				$content['country'] = COUNTRY_GENERATE_INFO($content['country_code']);
-			} elseif ($content['country'] == 0) {
+			} elseif ($content['country'] == "") {
 				// Zero ID???
 				$content['country'] = "???";
 			}
@@ -345,7 +355,7 @@ LIMIT 1",
 		SQL_FREERESULT($result_master);
 	} else {
 		// No one as registered so far! :-(
-		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_NONE_REGISTERED);
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_NONE_REGISTERED'));
 	}
 }