X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fdoubler_functions.php;h=4b550e706d5e7c924225dca0d0399c69edc4c978;hb=41792f2d1a2478a284c663c02b2f64ca74b2e3df;hp=b6eddaf4432c2349b6baacf6ab2f3428feb7ccb3;hpb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;p=mailer.git diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php index b6eddaf443..4b550e706d 100644 --- a/inc/libs/doubler_functions.php +++ b/inc/libs/doubler_functions.php @@ -47,15 +47,15 @@ if (!defined('__SECURITY')) { function generateDoublerTable ($userid = '0', $done = 'N', $ref = 'N', $sort = 'ASC') { if (empty($cnt)) $cnt = '0'; $add = ''; $DT_MODE = '0'; - if ($userid > 0) { + if (isValidUserId($userid)) { // Load entries only from a single user $add = sprintf(" AND `userid`=%s", bigintval($userid)); $mode = 'member'; $COLS = 4; $DT_MODE = 2; - $message = getMessage('DOUBLER_MEMBER_NO_ENTRIES_FOUND'); + $message = '{--MEMBER_DOUBLER_NO_ENTRIES_FOUND--}'; } else { // Guest mode! $mode = 'guest'; $COLS = 3; $DT_MODE = 3; - $message = getMessage('DOUBLER_GUEST_NO_ENTRIES_FOUND'); + $message = '{--GUEST_DOUBLER_NO_ENTRIES_FOUND--}'; } if (($done == 'Y') && ($sort == 'ASC')) { @@ -86,48 +86,46 @@ LIMIT %s", $limit ), __FUNCTION__, __LINE__); - if (SQL_NUMROWS($result) > 0) { + if (!SQL_HASZERONUMS($result)) { // List entries - $OUT = ''; $SW = 2; + $OUT = ''; while ($content = SQL_FETCHARRAY($result)) { // Rewrite userid/refid only if admin is in + // @TODO Can't this be moved into EL? if (isAdmin()) { + // Set empty userid/refid + $content['userid'] = '---'; + $content['refid'] = '---'; + // Set links to admin area - if ($content['userid'] > 0) { $content['userid'] = generateUserProfileLink($content['userid']); } else { $content['userid'] = '---'; } - if ($content['refid'] > 0) { $content['refid'] = generateUserProfileLink($content['refid']); } else { $content['refid'] = '---'; } + if (isValidUserId($content['userid'])) $content['userid'] = generateUserProfileLink($content['userid']); + if (isValidUserId($content['refid'])) $content['refid'] = generateUserProfileLink($content['refid']); } // END - if // Prepare data for the row template - $content = array( - 'userid' => $content['userid'], - 'rid' => $content['refid'], - 'points' => translateComma($content['points']), - 'timemark' => generateDateTime($content['timemark'], $DT_MODE), - 'sw' => $SW, - ); + $content['timemark'] = generateDateTime($content['timemark'], $DT_MODE); // Load template and switch color $OUT .= loadTemplate($mode . '_doubler_list_rows', true, $content); - $SW = 3 - $SW; - } + } // END - while // Free memory SQL_FREERESULT($result); } else { // List no entries - $OUT = "