X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=4295891afb21f3dfefd8a48a6f3eb24dc2909d97;hb=05ac410a5adaa49c99b6eeae4bef60f2994f1575;hp=4d0fda767b809368cbc9a0456ecc1970df605a19;hpb=cd951a117b88c07a2dcbf3e97587b4c370973b85;p=mailer.git diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 4d0fda767b..4295891afb 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -43,35 +43,14 @@ 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? @@ -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 @@ -117,7 +96,6 @@ LIMIT 1", // 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'] . '%}]'; @@ -139,20 +117,25 @@ LIMIT 1", $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'] = countSumTotalData($userid, 'user_points', 'points'); - $content['locked'] = countSumTotalData($userid, 'user_points', 'locked_points'); + $content['total_points'] = getTotalPoints($content['userid']); + $content['locked_points'] = countSumTotalData($content['userid'], 'user_points', 'locked_points') + countSumTotalData($content['userid'], 'user_points', 'locked_order_points'); + + // Prepare array for filter + $data = array( + 'userid' => $content['userid'], + 'points' => 0 + ); + + // Run the filter chain + $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--}'; // Link to email_details if some are sent if ($content['emails_sent'] > 0) { - $content['emails_sent'] = $base . '&what=email_details&userid=' . $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 @@ -177,7 +160,7 @@ LIMIT 1", loadTemplate('admin_user_details', false, $content); } else { // Account does not exist! - displayMessage(getMaskedMessage('ADMIN_MEMBER_404', $userid)); + displayMessage('{%message,ADMIN_MEMBER_404=' . $userid . '%}'); } // Free the result @@ -212,14 +195,24 @@ LIMIT 1", } 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') ); @@ -282,12 +275,6 @@ 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'; if ($content['emails_received'] > 0) { @@ -298,7 +285,8 @@ LIMIT 1", $content['email'] = '[' . $content['email'] . ']'; $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2); $content['refs'] = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', true); - $content['locked'] = countSumTotalData($content['userid'], 'user_points', 'locked_points'); + $content['own_points'] = countSumTotalData($content['userid'], 'user_points', 'points') + countSumTotalData($content['userid'], 'user_points', 'order_points'); + $content['locked_points'] = countSumTotalData($content['userid'], 'user_points', 'locked_points') + countSumTotalData($content['userid'], 'user_points', 'locked_order_points'); // If we have at least one referal, make it clickable to referal list if ($content['refs'] > 0) {