Empty commit

classes/script_start.php

@@ -112,6 +112,7 @@
 			LastUpdate
 			FROM users_sessions
 			WHERE UserID='$UserID'
+			AND Active = 1
 			ORDER BY LastUpdate DESC");
 		$UserSessions = $DB->to_array('SessionID',MYSQLI_ASSOC);
 		$Cache->cache_value('users_sessions_'.$UserID, $UserSessions, 0);
@@ -546,7 +547,10 @@ function logout() {
 	setcookie('keeplogged','',time()-60*60*24*365,'/','',false);
 	setcookie('session','',time()-60*60*24*365,'/','',false);
 	if($SessionID) {
+		
+		
 		$DB->query("DELETE FROM users_sessions WHERE UserID='$LoggedUser[ID]' AND SessionID='".db_string($SessionID)."'");
+		
 		$Cache->begin_transaction('users_sessions_'.$LoggedUser['ID']);
 		$Cache->delete_row($SessionID);
 		$Cache->commit_transaction(0);
@@ -1869,12 +1873,15 @@ function disable_users($UserIDs, $AdminComment, $BanReason = 1) {
 		$Cache->delete_value('user_info_heavy_'.$UserID);
 		$Cache->delete_value('user_stats_'.$UserID);
 	
-		$DB->query("SELECT SessionID FROM users_sessions WHERE UserID='$UserID'");
+		$DB->query("SELECT SessionID FROM users_sessions WHERE UserID='$UserID' AND Active = 1");
 		while(list($SessionID) = $DB->next_record()) {
 			$Cache->delete_value('session_'.$UserID.'_'.$SessionID);
 		}
 		$Cache->delete_value('users_sessions_'.$UserID);
+		
+		
 		$DB->query("DELETE FROM users_sessions WHERE UserID='$UserID'");
+		
 	}
 	$DB->query("SELECT torrent_pass FROM users_main WHERE ID in (".implode(", ",$UserIDs).")");
 	$PassKeys = $DB->collect('torrent_pass');

gazelle.sql

@@ -1260,9 +1260,11 @@ CREATE TABLE `users_sessions` (
   `OperatingSystem` varchar(8) DEFAULT NULL,
   `IP` varchar(15) NOT NULL,
   `LastUpdate` datetime NOT NULL,
+  `Active` tinyint(4) NOT NULL DEFAULT '1',
   PRIMARY KEY (`UserID`,`SessionID`),
   KEY `UserID` (`UserID`),
-  KEY `LastUpdate` (`LastUpdate`)
+  KEY `LastUpdate` (`LastUpdate`),
+  KEY `Active` (`Active`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE `users_subscriptions` (

sections/login/index.php

@@ -139,7 +139,7 @@
 					while(list($SessionID) = $DB->next_record()) {
 						$Cache->delete_value('session_'.$UserID.'_'.$SessionID);
 					}
-					$DB->query("DELETE FROM users_sessions WHERE UserID='$UserID'");
+					$DB->query("UPDATE users_sessions SET Active = 0 WHERE UserID='$UserID' AND Active = 1");
 
 					
 				} else {

sections/schedule/index.php

@@ -252,7 +252,10 @@ function next_hour() {
 		$Cache->delete_row($SessionID);
 		$Cache->commit_transaction(0);
 	}
-	$DB->query("DELETE FROM users_sessions WHERE LastUpdate<'$AgoDays' AND KeepLogged='1'");
+	
+	
+	$DB->query("DELETE FROM users_sesions WHERE LastUpdate<'$AgoDays' AND KeepLogged='1'");
+	
 	
 	$AgoMins = time_minus(60*30);
 	$DB->query("SELECT UserID, SessionID FROM users_sessions WHERE LastUpdate<'$AgoMins' AND KeepLogged='0'");
@@ -261,9 +264,12 @@ function next_hour() {
 		$Cache->delete_row($SessionID);
 		$Cache->commit_transaction(0);
 	}
+	
+	
 	$DB->query("DELETE FROM users_sessions WHERE LastUpdate<'$AgoMins' AND KeepLogged='0'");
 	
 
+	
 	//------------- Lower Login Attempts ------------------------------------//
 	$DB->query("UPDATE login_attempts SET Attempts=Attempts-1 WHERE Attempts>0");
 	$DB->query("DELETE FROM login_attempts WHERE LastAttempt<'".time_minus(3600*24*90)."'");

sections/user/sessions.php

@@ -1,4 +1,6 @@
 <?
+
+
 //TODO: restrict to viewing bellow class, username in h2
 if(isset($_GET['userid']) && check_perms('users_view_ips') && check_perms('users_logout')) {
         if(!is_number($_GET['userid'])) { error(404); }
@@ -42,7 +44,6 @@
 }
 
 list($UserID, $Username) = array_values(user_info($UserID));
-
 show_header($Username.' &gt; Sessions');
 ?>
 <div class="thin">
@@ -90,6 +91,6 @@
                 </table>
         </div>
 </div>
-<?
+
 show_footer();
 ?>

sections/user/takemoderate.php

@@ -206,7 +206,10 @@
 			$Cache->delete_value('session_'.$UserID.'_'.$SessionID);
 		}
 		$Cache->delete_value('users_sessions_'.$UserID);
-		$DB->query("DELETE FROM users_sessions WHERE UserID='$UserID'");
+		
+		
+		$DB->query("DELETE FROM users_sessions WHERE UserID="'$UserID'");
+		
 	}
 }
 
@@ -497,17 +500,19 @@
 		disable_users($UserID, '', 1);
 	} elseif($EnableUser == '1') {
 		$Cache->increment('stats_user_count');
+		update_tracker('add_user', array('id' => $UserID, 'passkey' => $Cur['torrent_pass']));
 		if (($Cur['Downloaded'] == 0) || ($Cur['Uploaded']/$Cur['Downloaded'] >= $Cur['RequiredRatio'])) {
 			$UpdateSet[]="i.RatioWatchEnds='0000-00-00 00:00:00'";
 			$CanLeech = 1;
 			$UpdateSet[]="m.can_leech='1'";
 			$UpdateSet[]="i.RatioWatchDownload='0'";	
-			update_tracker('add_user', array('id' => $UserID, 'passkey' => $Cur['torrent_pass']));
 		} else {
 			$EnableStr .= ' (Ratio: '.number_format($Cur['Uploaded']/$Cur['Downloaded'],2).', RR: '.number_format($Cur['RequiredRatio'],2).')';
 			if ($Cur['RatioWatchEnds'] != '0000-00-00 00:00:00') {
 				$UpdateSet[]="i.RatioWatchEnds=NOW()";
+				$CanLeech = 0;
 			}
+			update_tracker('update_user', array('passkey' => $Cur['torrent_pass'], 'can_leech' => '0'));
 		}
 		$UpdateSet[]="Enabled='1'";
 		$LightUpdates['Enabled'] = 1;
@@ -576,8 +581,11 @@
 		$Cache->delete_value('session_'.$UserID.'_'.$SessionID);
 	}
         $Cache->delete_value('users_sessions_'.$UserID);
+        
+	
 	$DB->query("DELETE FROM users_sessions WHERE UserID='$UserID'");
 	
+        
 }
 
 if (empty($UpdateSet) && empty($EditSummary)) {