X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=4295891afb21f3dfefd8a48a6f3eb24dc2909d97;hb=05ac410a5adaa49c99b6eeae4bef60f2994f1575;hp=3bd4aabdd964e5e4cb0e9bb8c814c7caf1e8ff7e;hpb=cf3765c38cf0a76f396aca291f71858936e92956;p=mailer.git diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 3bd4aabdd9..4295891afb 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -14,11 +14,9 @@ * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * * $Author:: $ * - * Needs to be in all Files and every File needs "svn propset * - * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009, 2010 by Mailer Developer Team * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -43,37 +41,16 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { } // END - if // Add description as navigation point -addMenuDescription('admin', __FILE__); - -if ((!isExtensionInstalled('user')) || (!isExtensionActive('user'))) { - // Missing extension! - loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('user')); - return; -} // END - if +addYouAreHereLink('admin', __FILE__); // 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? @@ -99,7 +76,7 @@ if (isGetRequestParameterSet('userid')) { // 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." + `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 @@ -109,7 +86,7 @@ LIMIT 1", // User found? if (SQL_NUMROWS($result_user) == 1) { - // Account found! + // Account found $content = SQL_FETCHARRAY($result_user); // Get count/sum of refs, selected categories, unconfirmed mails @@ -119,9 +96,8 @@ 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 . '%}">' . translateComma($content['refs']) . ']'; - if ($content['cats'] > 0) $content['cats'] = $base . '&what=list_cats&userid=' . $userid . '%}">' . translateComma($content['cats']) . ']'; + 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'] . '%}]'; // Calculate timestamp for birthday $stamp = mktime(0, 0, 0, $content['birth_month'], $content['birth_day'], $content['birth_year']); @@ -138,18 +114,29 @@ LIMIT 1", // Prepare data for template $content['email_link'] = generateEmailLink($content['email'], 'user_data'); $content['last_online'] = generateDateTime($content['last_online'], 0); - if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&what=email_details&userid=' . $userid . '%}">' . translateComma($content['emails_sent']) . ']'; $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'] = 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--}'; - // Nickname inclusion? - // @TODO Rewrite these to filters - if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']); + // 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 // Clickrate $content['click_rate'] = '0'; @@ -173,7 +160,7 @@ LIMIT 1", loadTemplate('admin_user_details', false, $content); } else { // Account does not exist! - loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', $userid)); + displayMessage('{%message,ADMIN_MEMBER_404=' . $userid . '%}'); } // Free the result @@ -186,7 +173,7 @@ LIMIT 1", } // END - if // Parse the status or mode parameter - if (isGetRequestParameterSet(('status'))) { + if (isGetRequestParameterSet('status')) { // Is a WHERE statement already there? if (!empty($whereStatement)) { // Then append the status column @@ -208,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') ); @@ -225,7 +222,7 @@ LIMIT 1", // Calculate page count (0.5 fixes a bug with page count) if (getConfig('user_limit') == '0') { setConfigEntry('user_limit', 100); - loadTemplate('admin_settings_saved', false, '{--EXTENSION_WARNING_USER_LIMIT--}'); + displayMessage('{--EXTENSION_WARNING_USER_LIMIT--}'); } // END - if // Activate the extension please! @@ -239,7 +236,7 @@ LIMIT 1", $result = SQL_QUERY($sql, __FILE__, __LINE__); // Are there some entries? - if (SQL_NUMROWS($result_master) > 0) { + if (!SQL_HASZERONUMS($result_master)) { // We have some (new?) registrations! $templateContent['colspan2'] = ($colspan + 2); $templateContent['user_count'] = getTotalConfirmedUser(); @@ -269,17 +266,14 @@ LIMIT 1", // Get number of unconfirmed mails $content['links'] = countSumTotalData($content['userid'], 'user_links', 'id', 'userid', true); - if ($content['links'] > 0) $content['links'] = $base . '&what=list_links&userid=' . $content['userid'] . '%}">' . translateComma($content['links']) . ']'; + if ($content['links'] > 0) { + $content['links'] = $base . '&what=list_links&userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['links'] . '%}]'; + } // END - if // Set link to sent mails if present - if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&what=email_details&userid=' . $content['userid'] . '%}">' . translateComma($content['emails_sent']) . ']'; - - // Add nickname - $content['nickname'] = '{--EXT_NICKNAME_404--}'; - if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']); - - // Calculate total points - $content['points'] = countSumTotalData($content['userid'], 'user_points', 'points') - countSumTotalData($content['userid'], 'user_data', 'used_points'); + if ($content['emails_sent'] > 0) { + $content['emails_sent'] = $base . '&what=email_details&userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['emails_sent'] . '%}]'; + } // END - if // Clickrate $content['rate'] = '0'; @@ -291,10 +285,13 @@ 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) $content['refs'] = $base . '&what=list_refs&userid=' . $content['userid'] . '%}">' . translateComma($content['refs']) . ']'; + if ($content['refs'] > 0) { + $content['refs'] = $base . '&what=list_refs&userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['refs'] . '%}]'; + } // END - if // Is the extension 'country' installed? // @TODO Rewrite this into a filter @@ -319,16 +316,6 @@ LIMIT 1", // Remember all rows $content['rows'] = $OUT; - // Init title with "all accounts" - $content['title'] = '{--ADMIN_ALL_ACCOUNTS--}'; - if (isGetRequestParameterSet(('status'))) { - // Set title according to the 'status' - $content['title'] = getMessage(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(getRequestParameter(('status'))))); - } elseif (isGetRequestParameterSet('mode')) { - // Set title according to the "mode" - $content['title'] = getMessage(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(getRequestParameter('mode')))); - } - // Merge more data again $content = merge_array($content, $templateContent); @@ -336,7 +323,7 @@ LIMIT 1", loadTemplate('admin_list_user', false, $content); } else { // No one as registered so far! :-( - loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_NONE_REGISTERED--}'); + displayMessage('{--ADMIN_NO_NONE_REGISTERED--}'); } // Free memory