From 697f44491525f2b1e5cd37e4d47d1f421545538b Mon Sep 17 00:00:00 2001
From: Anthony Parsons <ant@specialops.ath.cx>
Date: Sun, 2 Apr 2006 14:06:16 +0000
Subject: [PATCH] Fixed the invite system completely (including the next level
 counter)

---
 README.xml                       | 3 ++-
 invites.php                      | 4 ++--
 lib/class.User_Authenticated.php | 3 ++-
 lib/class.User_Registered.php    | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.xml b/README.xml
index c599c89..3af755e 100644
--- a/README.xml
+++ b/README.xml
@@ -45,7 +45,7 @@
 	<li>Admin tools</li>
 	<li>Need a new HTML parser thing (or three)</li>
 	<li>Reduce 2 cookie requirement to 1</li>
-	<li>Fix the "points to next invite" counter</li>
+	<li><del>Fix the "points to next invite" counter</del></li>
 	<li>Do something useful with the JS thing</li>
 </ul>
 
@@ -61,6 +61,7 @@
 	<li>Various ideas from the IRC/board regulars</li>
 	<li>No help whatsoever from Jay because he's a fag</li>
 </ul>
+<p>SO2.11 is going to be released soon.</p>
 
 <div id="footer">
 	<address>© 2004-2006 Ant P. | <a href="xmpp:ant@specialops.ath.cx">Jabber</a> | <a href="irc://specialops.ath.cx">IRC</a></address>
diff --git a/invites.php b/invites.php
index 25d53f6..2769f6a 100644
--- a/invites.php
+++ b/invites.php
@@ -35,9 +35,9 @@ if ( !defined('INVITE_ONLY') ) {
 			 '<p>These links are only valid for one registration, and you can only have a maximum of 5 at any time.</p>',"\n";
 	}
 	
-	for ( $i = 0; $i <= floor(sqrt($user->points)) || $i <= $user->invites; $i++ ); // This is intentionally empty
+	for ( $i = max($user->points, pow($user->invites, 2)); floor(sqrt($i)) != sqrt($i); $i++ );
 	
-	echo '<p class="info">Points to next invite: ',(pow($i, 2) - $user->points),"</p>\n";
+	echo '<p class="info">Points to next invite: ',($i - $user->points),"</p>\n";
 	
 	$userlist = $DB->query('SELECT `userid`, `alias` FROM `users` WHERE `referrer` = @userid');
 	if ( $userlist->num_rows ) {
diff --git a/lib/class.User_Authenticated.php b/lib/class.User_Authenticated.php
index 314edcf..1a567af 100644
--- a/lib/class.User_Authenticated.php
+++ b/lib/class.User_Authenticated.php
@@ -104,7 +104,8 @@ class User_Authenticated extends User_Registered
 				$value = 'AES_ENCRYPT('.$DB->string($value).', `reg_ip`)';
 				break;
 			case 'points':
-				if ( is_int(sqrt($value)) && sqrt($value) > $this->attrcache['invites'] &&
+				$tmp = sqrt($value);
+				if ( floor($tmp) == $tmp && $tmp > $this->attrcache['invites'] &&
 						$DB->query('SELECT COUNT(*) AS `c` FROM `things`
 									WHERE `what` = "invite"
 									AND `userid` = @userid')->fetch_object()->c < 5 ) {
diff --git a/lib/class.User_Registered.php b/lib/class.User_Registered.php
index cb7ba08..2a69e11 100644
--- a/lib/class.User_Registered.php
+++ b/lib/class.User_Registered.php
@@ -84,7 +84,8 @@ class User_Registered extends User_Anonymous
 				$value = 'AES_ENCRYPT("'.$DB->string($value).'", `reg_ip`)';
 				break;
 			case 'points':
-				if ( is_int(sqrt($value)) && sqrt($value) > $this->attrcache['invites'] &&
+				$tmp = sqrt($value);
+				if ( floor($tmp) == $tmp && $tmp > $this->attrcache['invites'] &&
 						$DB->query('SELECT COUNT(*) AS `c` FROM `things`
 									WHERE `what` = "invite"
 									AND `userid` = '.$this->userid)->fetch_object()->c < 5 ) {
-- 
2.11.4.GIT