X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=feabe013ac560fd0fe361374202e5f2fd315cd4d;hb=7a27c44db48d021c1e54a76916914ef41ff49372;hp=3d497c18d38997f88cee2b8e059ab9c41bcdf637;hpb=ca378407a00fb80cafe270a4a4424f1e5636e08b;p=mailer.git diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 3d497c18d3..feabe013ac 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -14,11 +14,10 @@ * $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 * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * + * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -42,52 +41,30 @@ 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 (getExtensionVersion('user') >= '0.3.4') { - // Add it... - $MORE .= ", `rand_confirmed`"; - - // Add lock reason? - if (getExtensionVersion('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 -if (!isGetRequestElementSet('letter')) { setGetRequestElement('letter', getMessage('_ALL2')); } -if (!isGetRequestElementSet('sortby')) { setGetRequestElement('sortby', 'userid'); } -if (!isGetRequestElementSet('page')) { setGetRequestElement('page' , 1); } +if (!isGetRequestElementSet('letter')) { setGetRequestElement('letter', ''); } +if (!isGetRequestElementSet('sortby')) { setGetRequestElement('sortby', 'userid'); } +if (!isGetRequestElementSet('page')) { setGetRequestElement('page' , 1); } // Set base URL $base = '[ 0) $content['links'] = $base . '&what=list_links&userid=' . $userid . '%}">' . $content['links'] . ']'; - if ($content['refid'] > 0) $content['refid'] = $base . '&what=list_user&userid=' . $content['refid'] . '%}">'.$content['refid'] . ']'; - if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $userid . '%}">' . $content['refs'] . ']'; - if ($content['cats'] > 0) $content['cats'] = $base . '&what=list_cats&userid=' . $userid . '%}">' . $content['cats'] . ']'; - - // Fix empty module - if (empty($content['last_module'])) $content['last_module'] = '---'; + 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']); @@ -131,56 +104,45 @@ LIMIT 1", // Is this above zero? if ($stamp > 0) { // Then use it - $content['birthday'] = generateDateTime($stamp, 3); + $content['birthday'] = generateDateTime($stamp, '2'); } else { // Zero or below so set zero! - $content['birthday'] = generateDateTime(0, 3); + $content['birthday'] = generateDateTime(0, '2'); } // Prepare data for template - $content['admin_links'] = generateMemberAdminActionLinks($userid, $content['status']); - $content['gender'] = translateGender($content['gender']); $content['email_link'] = generateEmailLink($content['email'], 'user_data'); - $content['status'] = translateUserStatus($content['status']); - $content['last_online'] = generateDateTime($content['last_online'], 0); - $content['used_points'] = translateComma($content['used_points']); - 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'] = translateComma(countSumTotalData($userid, 'user_points', 'points')); - $content['locked'] = translateComma(countSumTotalData($userid, 'user_points', 'locked_points')); - $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2); - - // Is the lock reason not set? - if (!isset($content['lock_reason'])) $content['lock_reason'] = '---'; - - // Nickname inclusion? - // @TODO Rewrite these to filters - if (isExtensionActive('nickname')) { - // Nickname not set or invalid? Then - if ((empty($content['nickname'])) || ($content['nickname'] == $userid)) $content['nickname'] = '---'; - } else { - // Extension not found - $content['nickname'] = getMessage('EXT_NICKNAME_404'); - } - - // Is the user extension newer? - if (getExtensionVersion('user') >= '0.3.4') { - // Then "translate" the number - $content['rand_confirmed'] = translateComma($content['rand_confirmed']); + $content['last_online'] = generateDateTime($content['last_online'], '2'); + $content['joined'] = generateDateTime($content['joined'], '2'); + $content['last_update'] = generateDateTime($content['last_update'], '2'); + $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], '2'); + $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'); + + // 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'; if ($content['emails_received'] > 0) { - $content['click_rate'] = translateComma($content['mails_confirmed'] / $content['emails_received'] * 100); + $content['click_rate'] = ($content['mails_confirmed'] / $content['emails_received'] * 100); } // END - if - // "Translate" more data - $content['mails_confirmed'] = translateComma($content['mails_confirmed']); - $content['emails_received'] = translateComma($content['emails_received']); - // Is the extension 'country' installed? if (isExtensionActive('country')) { // Then overwrite country information @@ -197,20 +159,20 @@ 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 SQL_FREERESULT($result_user); } else { $whereStatement = ''; - if ((getRequestElement('letter') != getMessage('_ALL2')) && (getRequestElement('letter') != getMessage('_OTHERS')) && (isGetRequestElementSet('letter'))) { + if (isGetRequestElementSet('letter')) { // List only persons w - $whereStatement = " WHERE `family` LIKE '".getRequestElement('letter') . "%'"; + $whereStatement = " WHERE `family` LIKE '".getRequestElement('letter') . "%%'"; } // END - if // Parse the status or mode parameter - if (isGetRequestElementSet(('status'))) { + if (isGetRequestElementSet('status')) { // Is a WHERE statement already there? if (!empty($whereStatement)) { // Then append the status column @@ -225,21 +187,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 OR `refid` IS NULL)'; + } + break; + + case 'random_refid': // Users available for random referral id + if (!empty($whereStatement)) { + // Add AND statement + $whereStatement .= ' AND `rand_confirmed` >= {?user_min_confirmed?}'; } else { // Add WHERE statement - $whereStatement = " WHERE `refid`=0"; + $whereStatement = ' WHERE `rand_confirmed` >= {?user_min_confirmed?}'; } break; default: // Invalid list mode - logDebugMessage(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", getRequestElement('mode'))); + debug_report_bug(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", getRequestElement('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", getRequestElement('sortby') ); @@ -249,92 +221,70 @@ 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, getMessage('EXTENSION_WARNING_USER_LIMIT')); + displayMessage('{--EXTENSION_WARNING_USER_LIMIT--}'); } // END - if // Activate the extension please! - $PAGES = round(SQL_NUMROWS($result_master) / getConfig('user_limit') + 0.5); + $numPages = round(SQL_NUMROWS($result_master) / getConfig('user_limit') + 0.5); if (!isGetRequestElementSet('page')) setGetRequestElement('page' , 1); if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', getConfig('user_limit')); // Add limitation to SQL string and run him again - $sql .= " LIMIT ".(getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')).", ".getRequestElement('offset'); + $sql .= ' LIMIT ' . (getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')) . ', ' . getRequestElement('offset'); $result = SQL_QUERY($sql, __FILE__, __LINE__); - // Count all confirmed users - $user_count = countSumTotalData('CONFIRMED','user_data','userid','status',true); - // Are there some entries? - if (SQL_NUMROWS($result_master) > 0) { + if (!SQL_HASZERONUMS($result_master)) { // We have some (new?) registrations! - define('__COLSPAN2' , ($colspan + 2)); - define('__USER_CNT' , $user_count); + $templateContent['user_count'] = getTotalConfirmedUser(); - // Sorting links - define('__ALPHA_SORT', alpha(getRequestElement('sortby'), $colspan, true)); - define('__SORT_LINKS', addSortLinks(getRequestElement('letter'), getRequestElement('sortby'), $colspan, true)); - - if ($PAGES > 1) { - define('__PAGE_NAV', addPageNavigation($PAGES, getConfig('user_limit'), true, $colspan, true)); - } else { - // No page navigation is required - define('__PAGE_NAV', ''); - } + // Sorting links and number of pages + $templateContent['sort_links'] = addSortLinks(getRequestElement('letter'), getRequestElement('sortby')); + $templateContent['num_pages'] = $numPages; // Column with nickname when nickname extension is present - // @TODO Rewrite this into a filter + // @TODO Rewrite this into a filter + $templateContent['nickname_th'] = ''; if (isExtensionActive('nickname')) { // Nickname extension found - define('__NICKNAME_TH', "