X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=beg.php;h=60afef8e96dafaaa2e761f64b7a22fc294e41dbc;hb=f34c00b4a31f6747e78c6cf88801888d1e84a123;hp=67e9855844707ace61455ef319cf8ee1004623ad;hpb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;p=mailer.git

diff --git a/beg.php b/beg.php
index 67e9855844..60afef8e96 100644
--- a/beg.php
+++ b/beg.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 01/09/2005 *
- * ===============                              Last change: 01/09/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 01/09/2005 *
+ * ===================                          Last change: 01/09/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : beg.php                                          *
@@ -14,10 +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                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -57,7 +56,7 @@ setContentType('text/html');
 redirectOnUninstalledExtension('beg');
 
 // Check for userid
-if (isGetRequestElementSet('userid')) {
+if (isGetRequestParameterSet('userid')) {
 	// Init variables
 	$points = '0';
 
@@ -65,18 +64,18 @@ if (isGetRequestElementSet('userid')) {
 	$pay = false;
 
 	// Validate if it is not a number
-	if (isNicknameUsed(getRequestElement('userid'))) {
+	if (isNicknameUsed(getRequestParameter('userid'))) {
 		// Is the nickname extension there?
 		if (isExtensionActive('nickname')) {
 			// Maybe we have found a nickname?
-			fetchUserData(getRequestElement('userid'), 'nickname');
+			fetchUserData(getRequestParameter('userid'), 'nickname');
 		} else {
 			// Nickname entered but nickname is not active
 			$errorCode = getCode('EXTENSION_PROBLEM');
 		}
 	} else {
 		// Direct userid
-		fetchUserData(getRequestElement('userid'));
+		fetchUserData(getRequestParameter('userid'));
 	}
 
 	// Check if locked in so don't pay points
@@ -89,15 +88,15 @@ if (isGetRequestElementSet('userid')) {
 		// numbers matching to the numbers behind the decimal dot. Simple! ;-)
 		$points = mt_rand((getConfig('beg_points') * 100000), (getConfig('beg_points_max') * 100000)) / 100000;
 
-		// Set nickname / userid for the template(s
-		$content['userid']      = getRequestElement('userid');
-		$content['clicks']      = (getUserData('beg_clicks') + 1);
-		$content['banner']      = loadTemplate('beg_banner', true);
-		$content['points']      = translateComma($points);
+		// Set nickname / userid for template
+		$content['userid'] = getRequestParameter('userid');
+		$content['clicks'] = (getUserData('beg_clicks') + 1);
+		$content['banner'] = loadTemplate('beg_banner', true);
+		$content['points'] = $points;
 	} // END - if
 
 	// User id valid and not webmaster's id?
-	if ((getUserData('userid') > 0) && (getConfig('beg_userid') != getUserData('userid'))) {
+	if ((isValidUserId(getUserData('userid'))) && (getConfig('beg_userid') != getUserData('userid'))) {
 		// Update counter
 		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `beg_clicks`=`beg_clicks`+1 WHERE `userid`=%s LIMIT 1",
 			array(getUserData('userid')), __FILE__, __LINE__);
@@ -107,8 +106,7 @@ if (isGetRequestElementSet('userid')) {
 			array(getUserData('userid'), detectRemoteAddr(), session_id()), __FILE__, __LINE__);
 
 		// Entry not found, points set and not logged in?
-		if (((SQL_NUMROWS($result) == '0') || (isAdmin())) && ($points > 0) && (!isMember()) && (getConfig('beg_pay_mode') == 'NONE')) {
-
+		if (((SQL_HASZERONUMS($result)) || (isAdmin())) && ($points > 0) && (!isMember()) && (getConfig('beg_pay_mode') == 'NONE')) {
 			// Admin is testing?
 			if (!isAdmin()) {
 				// Remember remote address, userid and timestamp for next click
@@ -129,26 +127,19 @@ if (isGetRequestElementSet('userid')) {
 				// Add points to user or begging rallye account
 				if (addPointsBeg(getUserData('userid'), $points)) {
 					// Set 'done' message
-					$content['message'] = loadTemplate('beg_done', true);
+					$content['message'] = loadTemplate('beg_done', true, $content);
 				} else {
 					// Error!
-					$content['message'] = loadTemplate('beg_failed', true);
+					$content['message'] = loadTemplate('beg_failed', true, $content);
 				}
 			} else {
 				// Error!
-				$content['message'] = loadTemplate('beg_failed', true);
+				$content['message'] = loadTemplate('beg_failed', true, $content);
 			}
 		} elseif (isMember()) {
 			// Logged in user found!
-			$content['message'] = loadTemplate('beg_login', true);
+			$content['message'] = loadTemplate('beg_login', true, $content);
 		} elseif (getConfig('beg_pay_mode') != 'NONE') { // Other pay-mode active!
-			// Prepare content for template
-			$content = array(
-				'clicks' => $content['clicks'],
-				'points' => $content['points'],
-				'userid' => $content['userid']
-			);
-
 			// Load message template depending on pay-mode
 			$content['message'] = loadTemplate('beg_pay_mode_'.strtolower(getConfig('beg_pay_mode')), true, $content);
 			$pay = true;
@@ -187,7 +178,7 @@ if (isGetRequestElementSet('userid')) {
 		$errorCode = generateErrorCodeFromUserStatus();
 	} elseif ((getUserData('userid') == '0') || (getUserData('status') == 'failed')) {
 		// Inalid or locked account, so let's find out
-		if (fetchUserData(getRequestElement('userid'), 'nickname')) {
+		if (fetchUserData(getRequestParameter('userid'), 'nickname')) {
 			// Locked account
 			$errorCode = getCode('ACCOUNT_LOCKED');
 		} else {