X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=beg.php;h=e9877f9699347750c932b7b8820cf53260d88989;hp=6bc039e62e773db6c9c7510fc76f133e01cda956;hb=ba59d6cfbe27195f59bbe2b7cab3d01bf9ceb566;hpb=8da353fa4bb729bb3299d247803c23833a52a327

diff --git a/beg.php b/beg.php
index 6bc039e62e..e9877f9699 100644
--- a/beg.php
+++ b/beg.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -65,7 +65,7 @@ if (isGetRequestElementSet('userid')) {
 
 	// Validate if it is not a number
 	if ((isExtensionActive('nickname')) && (isNicknameUsed(getRequestElement('userid')))) {
-		// Maybe we have found a nickname?
+		// Maybe a nickname is provided?
 		fetchUserData(getRequestElement('userid'), 'nickname');
 	} elseif (isNicknameUsed(getRequestElement('userid'))) {
 		// Nickname entered but nickname is not active
@@ -79,7 +79,7 @@ if (isGetRequestElementSet('userid')) {
 	$status = 'failed';
 
 	// Check if account was found
-	if ((isUserDataValid()) && (getUserData('status') == 'CONFIRMED')) {
+	if ((isValidUserData()) && (getUserData('status') == 'CONFIRMED')) {
 		/*
 		 * Multiply configured values with 100000 and divide with 100000 so we can also handle small values
 		 * If we need more number behind the decimal dot then we just need to increase all these three
@@ -96,20 +96,20 @@ if (isGetRequestElementSet('userid')) {
 	// User id valid and not webmaster's id?
 	if ((isValidId(getUserData('userid'))) && (getBegUserid() != getUserData('userid'))) {
 		// Update counter
-		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `beg_clicks`=`beg_clicks`+1 WHERE `userid`=%s LIMIT 1",
+		sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `beg_clicks`=`beg_clicks`+1 WHERE `userid`=%s LIMIT 1",
 			array(getUserData('userid')), __FILE__, __LINE__);
 
 		// Check for last entry for userid w/o IP number                            12              33                               2    23              44            3                                          21     1                              1
-		$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_beg_ips` WHERE ((UNIX_TIMESTAMP() - `timeout`) >= {?beg_timeout?} OR ((UNIX_TIMESTAMP() - `timeout`) >= {?beg_userid_timeout?} AND `userid`=%s)) AND (`remote_ip`='%s' OR `sid`='%s') LIMIT 1",
+		$result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_beg_ips` WHERE ((UNIX_TIMESTAMP() - `timeout`) >= {?beg_timeout?} OR ((UNIX_TIMESTAMP() - `timeout`) >= {?beg_userid_timeout?} AND `userid`=%s)) AND (`remote_ip`='%s' OR `sid`='%s') LIMIT 1",
 			array(
 				getUserData('userid'),
-				detectRemoteAddr(),
+				determineRealRemoteAddress(),
 				session_id()
 			), __FILE__, __LINE__);
 
 		// Entry not found, points set and not logged in?
 		//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'SQL_HASZERONUMS()=' . intval(SQL_HASZERONUMS($result)) . ',isAdmin()=' . intval(isAdmin()) . ',points=' . $points . ',isMember()=' . intval(isMember()) . ',getBegPayMode()=' . getBegPayMode());
-		if ((SQL_HASZERONUMS($result)) && ($points > 0) && (getBegPayMode() == 'NONE') && ((!isMember()) || (isAdmin()))) {
+		if ((ifSqlHasZeroNums($result)) && ($points > 0) && (getBegPayMode() == 'NONE') && ((!isMember()) || (isAdmin()))) {
 			// Default is result from isAdmin(), mostly false
 			$isPayed = isAdmin();
 
@@ -120,15 +120,15 @@ if (isGetRequestElementSet('userid')) {
 				 * but only when there is no admin begging.
 				 * Admins shall be able to test it!
 				 */
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_beg_ips` (`userid`, `remote_ip`, `sid`, `timeout`) VALUES ('%s','%s','%s', UNIX_TIMESTAMP())",
+				sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_beg_ips` (`userid`, `remote_ip`, `sid`, `timeout`) VALUES ('%s','%s','%s', UNIX_TIMESTAMP())",
 					array(
 						getUserData('userid'),
-						detectRemoteAddr(),
+						determineRealRemoteAddress(),
 						session_id()
 					), __FILE__, __LINE__);
 
 				// Was is successfull?
-				$isPayed = (!SQL_HASZEROAFFECTED());
+				$isPayed = (!ifSqlHasZeroAffectedRows());
 			} // END - if
 
 			// Pay points?
@@ -159,7 +159,7 @@ if (isGetRequestElementSet('userid')) {
 		}
 
 		// Free memory
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 
 		// Include header
 		loadIncludeOnce('inc/header.php');