X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fdoubler_functions.php;h=b74fc4587406d46efcad91e0fff3301e39e53604;hb=fb7120ffa230b62b54895bcf95952e1cf30f8594;hp=3c44736a4c689bdb9a5b0a8f34b32ae87ce580ef;hpb=963e55ca1ea79e255f235e359cde9f7862191dc5;p=mailer.git

diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index 3c44736a4c..b74fc45874 100644
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Funktionen fuer den Newsletter an die Gaeste     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -37,68 +42,57 @@ if (!defined('__SECURITY')) {
 	require($INC);
 }
 
-//
-function DOUBLER_GENERATE_TABLE($uid="0", $done='N', $ref='N', $sort="ASC")
-{
-	global $_CONFIG;
+// Generates a HTML table based on given data
+// @TODO Lame description
+function DOUBLER_GENERATE_TABLE ($uid="0", $done='N', $ref='N', $sort="ASC") {
 	if (empty($cnt)) $cnt = 0;
 	$ADD = ""; $DT_MODE = 0;
-	if ($uid > 0)
-	{
+	if ($uid > 0) {
 		// Load entries only from a single user
 		$ADD = " AND userid='".bigintval($uid)."'";
 		$MODE = "member"; $COLS = "4"; $DT_MODE = "2";
-		$NOT_FOUND = DOUBLER_MEMBER_NO_ENTRIES_FOUND;
-	}
-	 else
-	{
+		$NOT_FOUND = getMessage('DOUBLER_MEMBER_NO_ENTRIES_FOUND');
+	} else {
 		// Guest mode!
 		$MODE = "guest"; $COLS = "3"; $DT_MODE = "3";
-		$NOT_FOUND = DOUBLER_GUEST_NO_ENTRIES_FOUND;
+		$NOT_FOUND = getMessage('DOUBLER_GUEST_NO_ENTRIES_FOUND');
 	}
 
-	if (($done == "Y") && ($sort == "ASC"))
-	{
+	if (($done == "Y") && ($sort == "ASC")) {
 		// Already payed out points (latest payouts first)
-		$limit = $_CONFIG['doubler_display_old'];
-	}
-	 elseif ($sort == "ASC")
-	{
+		$limit = getConfig('doubler_display_old');
+	} elseif ($sort == "ASC") {
 		// List entries which will receive their payout soon
-		$limit = $_CONFIG['doubler_display_pay'];
-	}
-	 elseif ($sort == "DESC")
-	{
+		$limit = getConfig('doubler_display_pay');
+	} elseif ($sort == "DESC") {
 		// Newest entries
-		$limit = $_CONFIG['doubler_display_new'];
+		$limit = getConfig('doubler_display_new');
 	}
 
 	// List entries
 	$result = SQL_QUERY("SELECT userid, refid, points, timemark
-FROM "._MYSQL_PREFIX."_doubler
+FROM `{!_MYSQL_PREFIX!}_doubler`
 WHERE completed='".$done."' AND is_ref='".$ref."'".$ADD."
 ORDER BY timemark ".$sort."
-LIMIT ".$limit, __FILE__, __LINE__);
+LIMIT ".$limit, __FUNCTION__, __LINE__);
 
-	if (SQL_NUMROWS($result) > 0)
-	{
+	if (SQL_NUMROWS($result) > 0) {
 		// List entries
 		$OUT = ""; $SW = 2;
-		while(list($uid, $rid, $points, $time) = SQL_FETCHROW($result))
-		{
-			if (IS_ADMIN())
-			{
+		while ($content = SQL_FETCHARRAY($result)) {
+			// Rewrite userid/refid only if admin is in
+			if (IS_ADMIN()) {
 				// Set links to admin area
-				if ($uid > 0) { $uid = ADMIN_USER_PROFILE_LINK($uid); } else { $uid = "---"; }
-				if ($rid > 0) { $rid = ADMIN_USER_PROFILE_LINK($rid); } else { $rid = "---"; }
-			}
+				if ($content['userid'] > 0) { $content['userid'] = ADMIN_USER_PROFILE_LINK($content['userid']); } else { $content['userid'] = "---"; }
+				if ($content['refid'] > 0)  { $content['refid']  = ADMIN_USER_PROFILE_LINK($content['refid']);  } else { $content['refid']  = "---"; }
+			} // END - if
 
 			// Prepare data for the row template
 			$content = array(
-				'uid'    => $uid,
-				'rid'    => $rid,
-				'points' => TRANSLATE_COMMA($points),
-				'stamp'  => MAKE_DATETIME($time, $DT_MODE),
+				'uid'    => $content['userid'],
+				'rid'    => $content['refid'],
+				'points' => TRANSLATE_COMMA($content['points']),
+				'stamp'  => MAKE_DATETIME($content['timemark'], $DT_MODE),
 				'sw'     => $SW,
 			);
 
@@ -109,47 +103,41 @@ LIMIT ".$limit, __FILE__, __LINE__);
 
 		// Free memory
 		SQL_FREERESULT($result);
-	}
-	 else
-	{
+	} else {
 		// List no entries
-		$OUT = "<TR>
-  <TD colspan=\"".$COLS."\" align=\"center\" class=\"doubler_big_row bottom2\">
+		$OUT = "<tr>
+  <td colspan=\"".$COLS."\" align=\"center\" class=\"doubler_big_row bottom2\">
     ".LOAD_TEMPLATE("admin_settings_saved", true, $NOT_FOUND)."
-  </TD>
-</TR>\n";
+  </td>
+</tr>\n";
 	}
 
 	// Return template
 	return LOAD_TEMPLATE($MODE."_doubler_list", true, $OUT);
 }
+
 //
-function DOUBLER_GET_TOTAL_POINTS_LEFT()
-{
-	global $_CONFIG;
+function DOUBLER_GET_TOTAL_POINTS_LEFT() {
 	// Initialize variables
 	$points = 0;
 
-	if ($_CONFIG['doubler_own'] == "Y")
-	{
+	if (getConfig('doubler_own') == "Y") {
 		// Take points from doubler's own account
-		$points += $_CONFIG['doubler_points'] - $_CONFIG['doubler_used'];
+		$points += getConfig('doubler_points') - getConfig('doubler_used');
 	}
 
-	if ($_CONFIG['doubler_jackpot'] == "Y")
-	{
+	if (getConfig('doubler_jackpot') == "Y") {
 		// Load jackpot
-		$result = SQL_QUERY("SELECT points FROM "._MYSQL_PREFIX."_jackpot WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);
+		$result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FUNCTION__, __LINE__);
 		list($jackpot) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 
 		if (!empty($jackpot)) $points += $jackpot;
 	}
 
-	if ($_CONFIG['doubler_uid'] > 0)
-	{
+	if (getConfig('doubler_uid') > 0) {
 		// Get user's points
-		$user = GET_TOTAL_DATA($_CONFIG['doubler_uid'], "user_points", "points");
+		$user = GET_TOTAL_DATA(getConfig('doubler_uid'), "user_points", "points");
 		$points += $user;
 	}