make IP bans work better
This commit is contained in:
		
							parent
							
								
									54f44c7893
								
							
						
					
					
						commit
						9fbea9b440
					
				@ -207,8 +207,11 @@ class IPBan implements Extension {
 | 
				
			|||||||
		if($cached) return $cached;
 | 
							if($cached) return $cached;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		$bans = $database->get_all("
 | 
							$bans = $database->get_all("
 | 
				
			||||||
			SELECT * FROM bans
 | 
								SELECT bans.*, users.name as banner_name
 | 
				
			||||||
 | 
								FROM bans
 | 
				
			||||||
 | 
								JOIN users ON banner_id = users.id
 | 
				
			||||||
			WHERE (end_timestamp > ?) OR (end_timestamp IS NULL)
 | 
								WHERE (end_timestamp > ?) OR (end_timestamp IS NULL)
 | 
				
			||||||
 | 
								ORDER BY end_timestamp, bans.id
 | 
				
			||||||
		", array(time()));
 | 
							", array(time()));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		$database->cache->set("ip_bans", $bans, 600);
 | 
							$database->cache->set("ip_bans", $bans, 600);
 | 
				
			||||||
@ -221,7 +224,7 @@ class IPBan implements Extension {
 | 
				
			|||||||
		global $database;
 | 
							global $database;
 | 
				
			||||||
		$sql = "INSERT INTO bans (ip, reason, end_timestamp, banner_id) VALUES (?, ?, ?, ?)";
 | 
							$sql = "INSERT INTO bans (ip, reason, end_timestamp, banner_id) VALUES (?, ?, ?, ?)";
 | 
				
			||||||
		$database->Execute($sql, array($ip, $reason, strtotime($end), $user->id));
 | 
							$database->Execute($sql, array($ip, $reason, strtotime($end), $user->id));
 | 
				
			||||||
		$database->cache->delete("bans");
 | 
							$database->cache->delete("ip_bans");
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
// }}}
 | 
					// }}}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user