X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fdoubler_functions.php;h=ecec2572b34b0b0d446b13d2cc677d5c950afa8e;hp=8a455f6ea04a2ff609cc791fa2dd8ed7e390e0e1;hb=0f3a135204757cc8750262871c8e62c42300acb4;hpb=f2aeaab0cd313b2eeb151642455ed558f6b186dc diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php index 8a455f6ea0..ecec2572b3 100644 --- a/inc/libs/doubler_functions.php +++ b/inc/libs/doubler_functions.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 * @@ -40,22 +38,21 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Generates a HTML table based on given data // @TODO Lame description -function generateDoublerTable ($userid = '0', $done = 'N', $ref = 'N', $sort = 'ASC') { - if (empty($cnt)) $cnt = '0'; +function generateDoublerTable ($userid = NULL, $done = 'N', $ref = 'N', $sort = 'ASC') { $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 = '{--DOUBLER_MEMBER_NO_ENTRIES_FOUND--}'; + $message = '{--MEMBER_DOUBLER_NO_ENTRIES_FOUND--}'; } else { // Guest mode! $mode = 'guest'; $COLS = 3; $DT_MODE = 3; - $message = '{--DOUBLER_GUEST_NO_ENTRIES_FOUND--}'; + $message = '{--GUEST_DOUBLER_NO_ENTRIES_FOUND--}'; } if (($done == 'Y') && ($sort == 'ASC')) { @@ -71,11 +68,13 @@ function generateDoublerTable ($userid = '0', $done = 'N', $ref = 'N', $sort = ' // List entries $result = SQL_QUERY_ESC("SELECT - `userid`, `refid`, `points`, `timemark` + `userid`,`refid`,`points`,`timemark` FROM `{?_MYSQL_PREFIX?}_doubler` WHERE - `completed`='%s' AND `is_ref`='%s'" . $add . " + `completed`='%s' AND + `is_ref`='%s' + " . $add . " ORDER BY `timemark` %s LIMIT %s", @@ -86,30 +85,27 @@ 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 (isValidUserId($content['userid'])) { $content['userid'] = generateUserProfileLink($content['userid']); } else { $content['userid'] = '---'; } - if (isValidUserId($content['refid'])) { $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' => $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 @@ -117,8 +113,8 @@ LIMIT %s", } else { // List no entries $OUT = '