X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=38702a865214ad3a5e3c51a4e48a31a61d6c82ac;hp=ca6a77dbd33eeb682b3f506013c01e5b74612b93;hb=d8148e3f1f3a6762b2e786dbe99ada269dcf2ea0;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index ca6a77dbd3..38702a8652 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! - addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "user")); + addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "user"); return; } @@ -45,13 +45,13 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { ADD_DESCR("admin", __FILE__); // Init title with "all accounts" -$listHeader = ADMIN_ALL_ACCOUNTS; -if (!empty($_GET['status'])) { +$listHeader = getMessage('ADMIN_ALL_ACCOUNTS'); +if (REQUEST_ISSET_GET(('status'))) { // Set title according to the "status" - $listHeader = constant(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(SQL_ESCAPE($_GET['status'])))); -} elseif (!empty($_GET['mode'])) { + $listHeader = getMessage(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(SQL_ESCAPE(REQUEST_GET('status'))))); +} elseif (REQUEST_ISSET_GET(('mode'))) { // Set title according to the "mode" - $listHeader = constant(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(SQL_ESCAPE($_GET['mode'])))); + $listHeader = getMessage(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(SQL_ESCAPE(REQUEST_GET('mode'))))); } // Remember it @@ -85,16 +85,16 @@ if (EXT_IS_ACTIVE("country")) { } // Init unset data (bad that we change $_GET here!) -if (empty($_GET['letter'])) { $_GET['letter'] = _ALL2; } -if (empty($_GET['sortby'])) { $_GET['sortby'] = "userid"; } -if (empty($_GET['page'])) { $_GET['page'] = "1"; } +if (!REQUEST_ISSET_GET(('letter'))) { REQUEST_SET_GET('letter', getMessage('_ALL2')); } +if (!REQUEST_ISSET_GET(('sortby'))) { REQUEST_SET_GET('sortby', "userid"); } +if (!REQUEST_ISSET_GET(('page'))) { REQUEST_SET_GET('page' , "1"); } // Set base URL $BASE = "[ 0) $LINKS = $BASE."&what=list_links&u_id=".$uid."\">".$LINKS."]"; - if ($DATA['refid'] > 0) $DATA['refid'] = $BASE."&what=list_user&u_id=".$DATA['refid']."\">".$DATA['refid']."]"; + if ($LINKS > 0) $LINKS = $BASE."&what=list_links&uid=".$uid."\">".$LINKS."]"; + if ($DATA['refid'] > 0) $DATA['refid'] = $BASE."&what=list_user&uid=".$DATA['refid']."\">".$DATA['refid']."]"; if (empty($DATA['last_module'])) $DATA['last_module'] = "---"; - if ($REFS > 0) $REFS = $BASE."&what=list_refs&u_id=".$uid."\">".$REFS."]"; - if ($CATS > 0) $CATS = $BASE."&what=list_cats&u_id=".$uid."\">".$CATS."]"; + if ($REFS > 0) $REFS = $BASE."&what=list_refs&uid=".$uid."\">".$REFS."]"; + if ($CATS > 0) $CATS = $BASE."&what=list_cats&uid=".$uid."\">".$CATS."]"; // Calculate timestamp for birthday $stamp = mktime(0, 0, 0, $DATA['birth_month'], $DATA['birth_day'], $DATA['birth_year']); @@ -140,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."&what=email_details&u_id=".$uid."\">".TRANSLATE_COMMA($DATA['emails_sent'])."]"; + if ($DATA['emails_sent'] > 0) $DATA['emails_sent'] = $BASE."&what=email_details&uid=".$uid."\">".TRANSLATE_COMMA($DATA['emails_sent'])."]"; $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"); @@ -152,12 +152,13 @@ LIMIT 1", if (!isset($DATA['lock_reason'])) $DATA['lock_reason'] = "---"; // Nickname inclusion? + // @TODO Rewrite these to filters if (EXT_IS_ACTIVE("nickname")) { // Nickname not set or invalid? Then if ((empty($DATA['nickname'])) || ($DATA['nickname'] == $uid)) $DATA['nickname'] = "---"; } else { // Extension not found - $DATA['nickname'] = EXT_NICKNAME_404; + $DATA['nickname'] = getMessage('EXT_NICKNAME_404'); } // Is the user extension newer? @@ -189,32 +190,32 @@ LIMIT 1", LOAD_TEMPLATE("admin_user_details", false, $uid); } else { // Account does not exist! - LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MEMBER_404_1.$uid.ADMIN_MEMBER_404_2); + LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_MEMBER_404'), $uid)); } // Free the result SQL_FREERESULT($result_user); } else { $whereStatement = ""; - if (($_GET['letter'] != getMessage('_ALL2')) && ($_GET['letter'] != getMessage('_OTHERS')) && (!empty($_GET['letter']))) { + if ((REQUEST_GET('letter') != getMessage('_ALL2')) && (REQUEST_GET('letter') != getMessage('_OTHERS')) && (REQUEST_ISSET_GET(('letter')))) { // List only persons w - $whereStatement = " WHERE family LIKE '".$_GET['letter']."%'"; + $whereStatement = " WHERE family LIKE '".REQUEST_GET('letter')."%'"; } // END - if - if ($_GET['sortby'] == "family_name") $_GET['sortby'] = "family"; + if (REQUEST_GET('sortby') == "family_name") REQUEST_SET_GET('sortby', "family"); // Parse the status or mode parameter - if (isset($_GET['status'])) { + if (REQUEST_ISSET_GET(('status'))) { // 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(REQUEST_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(REQUEST_GET('status'))))); } - } elseif (isset($_GET['mode'])) { + } elseif (REQUEST_ISSET_GET(('mode'))) { // Choose what we need to list - switch ($_GET['mode']) { + switch (REQUEST_GET('mode')) { case "norefs": // Users w/o refs if (!empty($whereStatement)) { // Add AND statement @@ -226,32 +227,32 @@ LIMIT 1", break; default: // Invalid list mode - DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", SQL_ESCAPE($_GET['mode']))); + DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", SQL_ESCAPE(REQUEST_GET('mode')))); break; } } // 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(REQUEST_GET('sortby')); $result_master = SQL_QUERY($SQL, __FILE__, __LINE__); // Calculate page count (0.5 fixes a bug with page count) if (getConfig('user_limit') == 0) { - $_CONFIG['user_limit'] = 100; - LOAD_TEMPLATE("admin_settings_saved", false, EXTENSION_WARNING_USER_LIMIT); + setConfigEntry('user_limit', 100); + LOAD_TEMPLATE("admin_settings_saved", false, getMessage('EXTENSION_WARNING_USER_LIMIT')); } // END - if // Activate the extension please! $PAGES = round(SQL_NUMROWS($result_master) / getConfig('user_limit') + 0.5); - if (empty($_GET['page'])) $_GET['page'] = "1"; - if (empty($_GET['offset'])) $_GET['offset'] = getConfig('user_limit'); + if (!REQUEST_ISSET_GET(('page'))) REQUEST_SET_GET('page' , "1"); + if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', getConfig('user_limit')); // Add limitation to SQL string and run him again - $SQL .= " LIMIT ".($_GET['offset'] * $_GET['page'] - $_GET['offset']).", ".$_GET['offset']; + $SQL .= " LIMIT ".(REQUEST_GET('offset') * REQUEST_GET('page') - REQUEST_GET('offset')).", ".REQUEST_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); @@ -265,8 +266,8 @@ LIMIT 1", define('__USER_CNT' , $user_count); // Sorting links - define('__ALPHA_SORT', alpha($_GET['sortby'], $colspan, true)); - define('__SORT_LINKS', SortLinks($_GET['letter'], $_GET['sortby'], $colspan, true)); + define('__ALPHA_SORT', alpha(REQUEST_GET('sortby'), $colspan, true)); + define('__SORT_LINKS', SortLinks(REQUEST_GET('letter'), REQUEST_GET('sortby'), $colspan, true)); if ($PAGES > 1) { define('__PAGE_NAV', ADD_PAGENAV($PAGES, getConfig('user_limit'), true, $colspan, true)); @@ -276,13 +277,11 @@ LIMIT 1", } // Column with nickname when nickname extension is present - if (EXT_IS_ACTIVE("nickname")) - { + // @TODO Rewrite this into a filter + if (EXT_IS_ACTIVE("nickname")) { // Nickname extension found - define('__NICKNAME_TH', " ".NICKNAME.""); - } - else - { + define('__NICKNAME_TH', " {--NICKNAME--}"); + } else { // Not found define('__NICKNAME_TH', ""); } @@ -295,10 +294,10 @@ LIMIT 1", // 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)."]"; + if ($LINKS > 0) $LINKS = $BASE."&what=list_links&uid=".$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'])."]"; + if ($content['emails_sent'] > 0) $content['emails_sent'] = $BASE."&what=email_details&uid=".$content['userid']."\">".TRANSLATE_COMMA($content['emails_sent'])."]"; // Add nickname if (empty($content['nickname']) || $content['nickname'] == $content['userid']) $content['nickname'] = "---"; @@ -330,6 +329,7 @@ LIMIT 1", if (!isset($content['lock_reason'])) $content['lock_reason'] = "---"; // Is the extension "country" installed? + // @TODO Rewrite this into a filter if (EXT_IS_ACTIVE("country")) { // Then overwrite country information $content['country'] = COUNTRY_GENERATE_INFO($content['country_code']);