From c9179c18d07c42f3d0e11b295b13f7a964225867 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 3 Nov 2009 15:41:51 +0000
Subject: [PATCH] More fixes for registration if ext-cache and many more are
 absend

---
 inc/classes/cachesystem.class.php   |  2 +-
 inc/libs/refback_functions.php      |  2 +-
 inc/modules/guest/what-register.php |  8 ++++----
 ref.php                             | 10 ++++++++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index 78b72f8101..a24402a167 100644
--- a/inc/classes/cachesystem.class.php
+++ b/inc/classes/cachesystem.class.php
@@ -282,7 +282,7 @@ class CacheSystem {
 				// Debug message if allowed
 				if (isDebugModeEnabled()) {
 					// Debug message
-					debug_report_bug('Not removing cache ' . $this->name . ' in output_mode=' . getOutputMode());
+					logDebugMessage(__METHOD__, __LINE__, 'Not removing cache ' . $this->name . ' in output_mode=' . getOutputMode());
 				} // END - if
 
 				// Abort here
diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php
index 820be36d6b..15f750e3d4 100644
--- a/inc/libs/refback_functions.php
+++ b/inc/libs/refback_functions.php
@@ -253,7 +253,7 @@ function updateRefbackTable ($userid) {
 	} // END - if
 
 	// When he has a referal...
-	if ((($GLOBALS['refback_refid'][$GLOBALS['refback_level']] == $userid) || ($GLOBALS['refback_refid'][$GLOBALS['refback_level']] == 0)) && (getExtensionVersion('cache') >= '0.1.2') && (!isset($GLOBALS['refback_cached']))) {
+	if ((($GLOBALS['refback_refid'][$GLOBALS['refback_level']] == $userid) || ($GLOBALS['refback_refid'][$GLOBALS['refback_level']] == 0)) && (isExtensionInstalledAndNewer('cache', '0.1.2')) && (!isset($GLOBALS['refback_cached']))) {
 		// Remove cache here
 		//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):userid={$userid},ref={$GLOBALS['refback_refid'][$GLOBALS['refback_level']]} - CACHE!<br />");
 		if ($GLOBALS['cache_instance']->loadCacheFile('refback')) $GLOBALS['cache_instance']->removeCacheFile();
diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index b53d0bdaed..25b2711545 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -198,7 +198,7 @@ if ((isFormSent()) && (($isOkay === true) || (isAdmin()))) {
 	// @TODO Rewrite these all to a single filter
 	$ADD1 = '';
 	$ADD2 = '';
-	if (getExtensionVersion('theme') >= '0.0.8') {
+	if (isExtensionInstalledAndNewer('theme', '0.0.8')) {
 		// Okay, add design here
 		$ADD1 = ', `curr_theme`';
 		$ADD2 = ", '".getCurrentTheme()."'";
@@ -207,7 +207,7 @@ if ((isFormSent()) && (($isOkay === true) || (isAdmin()))) {
 	// Check if I shall disable sending mail to newly registered members out about active/begging rallye
 	//
 	// First comes first: begging rallye
-	if (getExtensionVersion('beg') >= '0.1.7') {
+	if (isExtensionInstalledAndNewer('beg', '0.1.7')) {
 		// Okay, shall I disable now?
 		if (getConfig('beg_new_mem_notify') != 'Y') {
 			$ADD1 .= ', `beg_ral_notify`, `beg_ral_en_notify`';
@@ -216,7 +216,7 @@ if ((isFormSent()) && (($isOkay === true) || (isAdmin()))) {
 	} // END - if
 
 	// Second: active rallye
-	if (getExtensionVersion('bonus') >= '0.7.7') {
+	if (isExtensionInstalledAndNewer('bonus', '0.7.7')) {
 		// Okay, shall I disable now?
 		if (getConfig('bonus_new_mem_notify') != 'Y') {
 			$ADD1 .= ', `bonus_ral_notify`, `bonus_ral_en_notify`';
@@ -294,7 +294,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 			array(bigintval($userid)), __FILE__, __LINE__);
 
 		// Update mediadata as well
-		if ((getExtensionVersion('mediadata') >= '0.0.4') && ($locked == 'points')) {
+		if ((isExtensionInstalledAndNewer('mediadata', '0.0.4')) && ($locked == 'points')) {
 			// Update database
 			updateMediadataEntry(array('total_points'), 'add', getConfig('points_register'));
 		} // END - if
diff --git a/ref.php b/ref.php
index 95e6400a43..33b656e747 100644
--- a/ref.php
+++ b/ref.php
@@ -74,8 +74,14 @@ if (!empty($ref)) {
 		$result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `nickname`='%s' LIMIT 1",
 			array($ref), __FILE__, __LINE__);
 
-		// Load userid
-		list($ref) = SQL_FETCHROW($result);
+		// Do we have an entry?
+		if (SQL_NUMROWS($result) == 1) {
+			// Load userid
+			list($ref) = SQL_FETCHROW($result);
+		} else {
+			// No entry found
+			$ref = 0;
+		}
 
 		// Free result
 		SQL_FREERESULT($result);
-- 
2.39.5