// Init variables
$MORE = '';
-$colspan = 4;
// Add lock reason?
if (isExtensionInstalledAndNewer('user', '0.3.5')) {
// Add them...
- $MORE .= ", UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`";
+ $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
// Does the account exists?
$result_user = SQL_QUERY_ESC("SELECT
- `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."
+ `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
$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'] . '</a>]';
// 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['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'], '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');
$data = runFilterChain('get_own_points', $data);
// Add more data
- $content['own_points'] = $data['points'];
- $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2);
+ $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) {
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?}";
+ $whereStatement .= ' AND `rand_confirmed` >= {?user_min_confirmed?}';
} else {
// Add WHERE statement
- $whereStatement = " WHERE `rand_confirmed` >= {?user_min_confirmed?}";
+ $whereStatement = ' WHERE `rand_confirmed` >= {?user_min_confirmed?}';
}
break;
} // END - if
// Generate master query string
- $sql = sprintf("SELECT `userid`, `email`, `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')
);
// Are there some entries?
if (!SQL_HASZERONUMS($result_master)) {
// We have some (new?) registrations!
- $templateContent['colspan2'] = ($colspan + 2);
$templateContent['user_count'] = getTotalConfirmedUser();
- // Sorting links
- $templateContent['alpha_sort'] = alpha(getRequestParameter('sortby'), ($colspan + 1), true);
- $templateContent['sort_links'] = addSortLinks(getRequestParameter('letter'), getRequestParameter('sortby'), ($colspan + 1), true);
- $templateContent['page_nav'] = '';
-
- if ($numPages > 1) {
- $templateContent['page_nav'] = addPageNavigation($numPages, getConfig('user_limit'), true, $colspan, true);
- } // END - if
+ // Sorting links and number of pages
+ $templateContent['sort_links'] = addSortLinks(getRequestParameter('letter'), getRequestParameter('sortby'));
+ $templateContent['num_pages'] = $numPages;
// Column with nickname when nickname extension is present
// @TODO Rewrite this into a filter
$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'] . '%}</a>]';
} // END - if
$content['emails_sent'] = $base . '&what=email_details&userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['emails_sent'] . '%}</a>]';
} // 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
$content['email'] = '[<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>]';
- $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2);
+ $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], '2');
$content['refs'] = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', true);
$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');
projects / mailer.git / blobdiff