X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fdoubler_functions.php;h=16179e2569aa7504027b4afbc10ec08f90e02bb6;hp=f80d13630d12a2324943b70e3ece7a4307debcf2;hb=7b0f17cd637e388049d2167811e4332cec1e979b;hpb=cca98f57dff720b174d21d071cee8303462485d7

diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index f80d13630d..16179e2569 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                  *
@@ -33,28 +38,27 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
 // Generates a HTML table based on given data
 // @TODO Lame description
-function DOUBLER_GENERATE_TABLE ($uid="0", $done='N', $ref='N', $sort="ASC") {
-	global $_CONFIG;
+function DOUBLER_GENERATE_TABLE ($uid = '0', $done='N', $ref='N', $sort="ASC") {
 	if (empty($cnt)) $cnt = 0;
-	$ADD = ""; $DT_MODE = 0;
+	$add = ''; $DT_MODE = 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;
+		$add = " AND `userid`='".bigintval($uid)."'";
+		$mode = 'member'; $COLS = "4"; $DT_MODE = "2";
+		$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;
+		$mode = 'guest'; $COLS = "3"; $DT_MODE = "3";
+		$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 = getConfig('doubler_display_old');
 	} elseif ($sort == "ASC") {
@@ -67,32 +71,33 @@ function DOUBLER_GENERATE_TABLE ($uid="0", $done='N', $ref='N', $sort="ASC") {
 
 	// List entries
 	$result = SQL_QUERY("SELECT userid, refid, points, timemark
-FROM `{!MYSQL_PREFIX!}_doubler`
-WHERE completed='".$done."' AND is_ref='".$ref."'".$ADD."
+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) {
 		// List entries
-		$OUT = ""; $SW = 2;
-		while(list($uid, $rid, $points, $time) = SQL_FETCHROW($result)) {
+		$OUT = ''; $SW = 2;
+		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'] = generateUserProfileLink($content['userid']); } else { $content['userid'] = '---'; }
+				if ($content['refid'] > 0)  { $content['refid']  = generateUserProfileLink($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' => translateComma($content['points']),
+				'stamp'  => generateDateTime($content['timemark'], $DT_MODE),
 				'sw'     => $SW,
 			);
 
 			// Load template and switch color
-			$OUT .= LOAD_TEMPLATE($MODE."_doubler_list_rows", true, $content);
+			$OUT .= LOAD_TEMPLATE($mode."_doubler_list_rows", true, $content);
 			$SW = 3 - $SW;
 		}
 
@@ -102,13 +107,13 @@ LIMIT ".$limit, __FILE__, __LINE__);
 		// List no entries
 		$OUT = "<tr>
   <td colspan=\"".$COLS."\" align=\"center\" class=\"doubler_big_row bottom2\">
-    ".LOAD_TEMPLATE("admin_settings_saved", true, $NOT_FOUND)."
+    ".LOAD_TEMPLATE('admin_settings_saved', true, $NOT_FOUND)."
   </td>
 </tr>\n";
 	}
 
 	// Return template
-	return LOAD_TEMPLATE($MODE."_doubler_list", true, $OUT);
+	return LOAD_TEMPLATE($mode."_doubler_list", true, $OUT);
 }
 
 //
@@ -116,14 +121,14 @@ function DOUBLER_GET_TOTAL_POINTS_LEFT() {
 	// Initialize variables
 	$points = 0;
 
-	if (getConfig('doubler_own') == "Y") {
+	if (getConfig('doubler_own') == 'Y') {
 		// Take points from doubler's own account
 		$points += getConfig('doubler_points') - getConfig('doubler_used');
 	}
 
-	if (getConfig('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);