X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=0c861764522ffd981c4a34001ed85d600346c553;hb=0fada672e2066043b76ed5d57f852f451a49a3a3;hp=70120a8d3f678dfc2a520aec5a4c2382cd766fc0;hpb=330dbb3e2b34450cd1665497506455e195a0a166;p=mailer.git diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 70120a8d3f..0c86176452 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -43,44 +43,23 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if ((!isExtensionInstalled('user')) || (!isExtensionActive('user'))) { - // Missing extension! - displayMessage(generateExtensionInactiveNotInstalledMessage('user')); - return; -} // END - if - // Init variables $MORE = ''; $colspan = 4; -// Add nickname if extension is found&active -// @TODO Rewrite these if-blocks in a filter -if (isExtensionActive('nickname')) { - // Add nickname - $MORE .= ", `nickname`"; -} else { - $MORE .= ", `userid`"; -} - -// Add random confirmed if extension version matches -if (isExtensionInstalledAndNewer('user', '0.3.4')) { - // Add it... - $MORE .= ", `rand_confirmed`"; - - // Add lock reason? - if (isExtensionInstalledAndNewer('user', '0.3.5')) { - // Add them... - $MORE .= ", `lock_reason`, UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`"; - } // END - if +// Add lock reason? +if (isExtensionInstalledAndNewer('user', '0.3.5')) { + // Add them... + $MORE .= ', UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`'; } // END - if // Is the extension 'country' installed? if (isExtensionActive('country')) { // Add country code - $MORE .= ", `country_code`"; + $MORE .= ', `country_code`'; } else { // Add direct value - $MORE .= ", `country`"; + $MORE .= ', `country`'; } // Init unset data @@ -97,7 +76,7 @@ if (isGetRequestParameterSet('userid')) { // Does the account exists? $result_user = SQL_QUERY_ESC("SELECT - `userid`, `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." + `userid`, `country`, `email`, `birth_day`, `birth_month`, `birth_year`, `last_online`, `used_points`, `emails_sent`, `joined`, `last_update`, `last_profile_sent`, `notified`, `emails_received`, `mails_confirmed`".$MORE." FROM `{?_MYSQL_PREFIX?}_user_data` WHERE @@ -111,13 +90,12 @@ LIMIT 1", $content = SQL_FETCHARRAY($result_user); // Get count/sum of refs, selected categories, unconfirmed mails - $content['refs'] = countSumTotalData($userid, 'refsystem' , 'counter'); - $content['cats'] = countSumTotalData($userid, 'user_cats' , 'id', 'userid', true); - $content['links'] = countSumTotalData($userid, 'user_links', 'id', 'userid', true); + $content['refs'] = countSumTotalData($userid, 'refsystem', 'counter'); + $content['cats'] = countSumTotalData($userid, 'user_cats', 'id', 'userid', true); + $content['links'] = getTotalUnconfirmedMails($userid); // Add links to the numbers if ($content['links'] > 0) $content['links'] = $base . '&what=list_links&userid=' . $userid . '%}">' . $content['links'] . ']'; - if (isValidUserId($content['refid'])) $content['refid'] = $base . '&what=list_user&userid=' . $content['refid'] . '%}">'.$content['refid'] . ']'; if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $userid . '%}">{%pipe,translateComma=' . $content['refs'] . '%}]'; if ($content['cats'] > 0) $content['cats'] = $base . '&what=list_cats&userid=' . $userid . '%}">{%pipe,translateComma=' . $content['cats'] . '%}]'; @@ -127,18 +105,18 @@ LIMIT 1", // Is this above zero? if ($stamp > 0) { // Then use it - $content['birthday'] = generateDateTime($stamp, 3); + $content['birthday'] = generateDateTime($stamp, '3'); } else { // Zero or below so set zero! - $content['birthday'] = generateDateTime(0, 3); + $content['birthday'] = generateDateTime(0, '3'); } // Prepare data for template $content['email_link'] = generateEmailLink($content['email'], 'user_data'); - $content['last_online'] = generateDateTime($content['last_online'], 0); - $content['joined'] = generateDateTime($content['joined'], 0); - $content['last_update'] = generateDateTime($content['last_update'], 0); - $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], 0); + $content['last_online'] = generateDateTime($content['last_online'], '0'); + $content['joined'] = generateDateTime($content['joined'], '0'); + $content['last_update'] = generateDateTime($content['last_update'], '0'); + $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], '0'); $content['total_points'] = getTotalPoints($content['userid']); $content['locked_points'] = countSumTotalData($content['userid'], 'user_points', 'locked_points') + countSumTotalData($content['userid'], 'user_points', 'locked_order_points'); @@ -152,19 +130,12 @@ LIMIT 1", $data = runFilterChain('get_own_points', $data); // Add more data - $content['own_points'] = $data['points']; - $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2); - $content['nickname'] = '{--EXT_NICKNAME_404--}'; + $content['own_points'] = $data['points']; + $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2); // Link to email_details if some are sent if ($content['emails_sent'] > 0) { - $content['emails_sent'] = $base . '&what=email_details&userid=' . $content['userid'] . '%}">}{%pipe,translateComma=' . $content['emails_sent'] . '%}]'; - } // END - if - - // Nickname inclusion? - // @TODO Rewrite these to filters - if (isExtensionInstalled('nickname')) { - $content['nickname'] = getNickname($content['userid']); + $content['emails_sent'] = $base . '&what=email_details&userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['emails_sent'] . '%}]'; } // END - if // Clickrate @@ -217,21 +188,31 @@ LIMIT 1", case 'norefs': // Users w/o refs if (!empty($whereStatement)) { // Add AND statement - $whereStatement .= " AND `refid`=0"; + $whereStatement .= ' AND (`refid`=0 OR `refid` IS NULL)'; } else { // Add WHERE statement - $whereStatement = " WHERE `refid`=0"; + $whereStatement = ' WHERE (`refid`=0 OR `refid` IS NULL)'; + } + break; + + case 'random_refid': // Users available for random referal id + if (!empty($whereStatement)) { + // Add AND statement + $whereStatement .= ' AND `rand_confirmed` >= {?user_min_confirmed?}'; + } else { + // Add WHERE statement + $whereStatement = ' WHERE `rand_confirmed` >= {?user_min_confirmed?}'; } break; default: // Invalid list mode - logDebugMessage(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", getRequestParameter('mode'))); + debug_report_bug(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", getRequestParameter('mode'))); break; } // END - switch } // END - if // Generate master query string - $sql = sprintf("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 `%s` ASC", + $sql = sprintf("SELECT `userid`, `email`, `emails_sent`, `mails_confirmed`, `emails_received`" . $MORE . " FROM `{?_MYSQL_PREFIX?}_user_data`" . $whereStatement . " ORDER BY `%s` ASC", getRequestParameter('sortby') ); @@ -284,7 +265,7 @@ LIMIT 1", $content = merge_array($content, $templateContent); // Get number of unconfirmed mails - $content['links'] = countSumTotalData($content['userid'], 'user_links', 'id', 'userid', true); + $content['links'] = getTotalUnconfirmedMails($content['userid']); if ($content['links'] > 0) { $content['links'] = $base . '&what=list_links&userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['links'] . '%}]'; } // END - if @@ -294,16 +275,10 @@ LIMIT 1", $content['emails_sent'] = $base . '&what=email_details&userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['emails_sent'] . '%}]'; } // END - if - // Add nickname - $content['nickname'] = '{--EXT_NICKNAME_404--}'; - if (isExtensionInstalled('nickname')) { - $content['nickname'] = getNickname($content['userid']); - } // END - if - - // Clickrate - $content['rate'] = '0'; + // Click rate + $content['click_rate'] = '0'; if ($content['emails_received'] > 0) { - $content['rate'] = $content['mails_confirmed'] / $content['emails_received'] * 100; + $content['click_rate'] = $content['mails_confirmed'] / $content['emails_received'] * 100; } // END - if // Transfer data to array