Search Field and other minor fixes

Fixes the issues noted by Omano in #180.

Also now checks if php-zip is installed on the update module.
Previously, if you attempted to update without this extension you'd
receive a warning.

Additionally fixed not being able to set an expiry date on user accounts
as mktime() was returning false on PHP >=7 due to the $is_dst arg being
removed - and had been deprecated since 5.1.0.

includes/database_mysql.php

@@ -257,33 +257,42 @@ class OGPDatabaseMySQL extends OGPDatabase
 	}
 	
 	public function getUserList_limit($page_user,$limit_user,$search_field) {
-		
-       $user_get_id = ($page_user - 1) * $limit_user;		
-	
-		if ( !$this->link ) return;
-		$query = sprintf("SELECT user_id,users_login,users_lang,
-			users_role,users_fname,users_lname,users_email,user_expires,users_parent
-			FROM %susers 
-			".($search_field ? "WHERE `user_id` = '$search_field' OR `users_login` = '$search_field' OR `users_lang` = '$search_field'
-			OR `users_role` = '$search_field' OR `users_fname` = '$search_field' OR `users_lname` = '$search_field' OR `users_email` = '$search_field'
-			OR `user_expires` = '$search_field' OR `users_parent` = '$search_field' " : "" )." 
-			ORDER BY users_login ASC LIMIT $user_get_id,$limit_user",
-			$this->table_prefix);
+		$user_get_id = ($page_user - 1) * $limit_user;
+
+		$sql = "SELECT
+					user_id, users_login, users_lang,
+					users_role, users_fname, users_lname,
+					users_email, user_expires, users_parent
+			FROM ".$this->table_prefix."users ";
+
+		if (!empty($search_field)) {
+			$sql .= "WHERE user_id = '$search_field' OR users_login LIKE '%$search_field%' OR users_lang = '$search_field'
+						OR users_role = '$search_field' OR users_fname LIKE '%$search_field%' OR users_lname LIKE '%$search_field%' OR users_email LIKE '%$search_field%' ";
+		}
+
+		$sql .= "ORDER BY users_login ASC LIMIT $user_get_id, $limit_user";
 		++$this->queries_;
-		$result = mysql_query($query,$this->link);
+
+		$result = mysql_query($sql, $this->link);
 		$results = array();
-		while ( $row = mysql_fetch_assoc( $result ) )
+
+		while ( $row = mysql_fetch_assoc($result)) {
 			array_push($results,$row);
+		}
+
 		return $results;
 	}
 	
 	public function get_user_count($search_field){
-		return $this->resultQuery("SELECT COUNT(user_id) AS total FROM `".$this->table_prefix."users`
-		".($search_field ? "WHERE `user_id` = '$search_field' OR `users_login` = '$search_field' OR `users_lang` = '$search_field'
-			OR `users_role` = '$search_field' OR `users_fname` = '$search_field' OR `users_lname` = '$search_field' OR `users_email` = '$search_field'
-			OR `user_expires` = '$search_field' OR `users_parent` = '$search_field' " : "" )."
-		
-		;");
+		$sql = "SELECT COUNT(1) AS total FROM ".$this->table_prefix."users ";
+
+		if (!empty($search_field)) {
+			$sql .= "WHERE user_id = '$search_field' OR users_login LIKE '%$search_field%' OR users_lang = '$search_field'
+						OR users_role = '$search_field' OR users_fname LIKE '%$search_field%' OR users_lname LIKE '%$search_field%' OR users_email LIKE '%$search_field%'";
+		}
+
+		++$this->queries_;
+		return $this->resultQuery($sql);
 	}
 
 	public function getGroupList() {
@@ -1414,18 +1423,18 @@ class OGPDatabaseMySQL extends OGPDatabase
 			' : '').'
 			'
  			.($home_cfg_id ?" WHERE home_cfg_id = '$home_cfg_id'
- 			".($search_field ?" AND home_id = '$search_field' OR user_id_main = '$search_field' OR home_path = '$search_field' 
- 								OR home_name = '$search_field' 
- 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+ 			".($search_field ?" AND home_id = '$search_field' OR user_id_main = '$search_field' OR home_path LIKE '%".$search_field."%'
+ 								OR home_name LIKE '%".$search_field."%'
+ 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
  								OR user_id = '$search_field'
- 								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+ 								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
  								OR agent_ip = '$search_field' OR port = '$search_field'
  								" : '')." ": '
- 			'.($search_field ?" WHERE home_cfg_id = '$home_cfg_id' OR home_id = '$search_field' OR user_id_main = '$search_field' OR home_path = '$search_field' 
- 								OR home_name = '$search_field' 
- 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+ 			'.($search_field ?" WHERE home_cfg_id = '$home_cfg_id' OR home_id = '$search_field' OR user_id_main = '$search_field' OR home_path LIKE '%".$search_field."%'
+ 								OR home_name LIKE '%".$search_field."%'
+ 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
  								OR user_id = '$search_field'
-								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
 								OR agent_ip = '$search_field' OR port = '$search_field'
 								" : '').'
 								'));
@@ -1440,20 +1449,20 @@ class OGPDatabaseMySQL extends OGPDatabase
 			' : '').'
 			WHERE user_id = '.$assign_id.' ' .($home_cfg_id ? 'AND `home_id`
 			IN (SELECT `home_id` FROM `'.$this->table_prefix.'server_homes` WHERE home_cfg_id = '.$home_cfg_id.'
-			'.($search_field ?" AND home_id = '$search_field' OR user_id_main = '$search_field' OR home_path = '$search_field' 
- 								OR home_name = '$search_field' 
- 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+			'.($search_field ?" AND home_id = '$search_field' OR user_id_main = '$search_field' OR home_path LIKE '%".$search_field."%'
+ 								OR home_name LIKE '%".$search_field."%'
+ 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
  								OR user_id = '$search_field'
- 								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+ 								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
  								OR agent_ip = '$search_field' OR port = '$search_field'
  								" : '').')'
 								: 
 								'
-				 			'.($search_field ?" AND home_cfg_id = '$home_cfg_id' OR home_id = '$search_field' OR user_id_main = '$search_field' OR home_path = '$search_field' 
- 								OR home_name = '$search_field' 
- 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+				 			'.($search_field ?" AND home_cfg_id = '$home_cfg_id' OR home_id = '$search_field' OR user_id_main = '$search_field' OR home_path LIKE '%".$search_field."%'
+ 								OR home_name LIKE '%".$search_field."%'
+ 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
  								OR user_id = '$search_field'
-								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
 								OR agent_ip = '$search_field' OR port = '$search_field'
 								" : '').'				
 								' 
@@ -1473,15 +1482,15 @@ class OGPDatabaseMySQL extends OGPDatabase
 			WHERE group_id IN (SELECT group_id FROM `'.$this->table_prefix.'user_groups` WHERE user_id = '.$assign_id.' )
 			
 			' .($home_cfg_id ? 'AND `home_id` IN (SELECT `home_id` FROM `'.$this->table_prefix.'server_homes` WHERE home_cfg_id = '.$home_cfg_id.'
-			'.($search_field ?" AND home_id = '$search_field' OR user_id_main = '$search_field' OR home_path = '$search_field' 
- 								OR home_name = '$search_field' 
- 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+			'.($search_field ?" AND home_id = '$search_field' OR user_id_main = '$search_field' OR home_path LIKE '%".$search_field."%'
+ 								OR home_name LIKE '%".$search_field."%'
+ 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
  								OR agent_ip = '$search_field' OR port = '$search_field'
  								" : '').')'
 			:'
-			'.($search_field ?" AND home_id = '$search_field' OR user_id_main = '$search_field' OR home_path = '$search_field' 
- 								OR home_name = '$search_field' 
- 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+			'.($search_field ?" AND home_id = '$search_field' OR user_id_main = '$search_field' OR home_path LIKE '%".$search_field."%'
+ 								OR home_name LIKE '%".$search_field."%'
+ 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
  								OR agent_ip = '$search_field' OR port = '$search_field'
  								" : '').'
 			'));
@@ -1515,7 +1524,7 @@ class OGPDatabaseMySQL extends OGPDatabase
 								%1$sconfig_mods.def_postcmd,
 								%1$sconfig_mods.mod_cfg_id
 						FROM %1$sserver_homes
-						'.($search_field ?'NATURAL JOIN `%1$suser_homes` ':'').'
+						'.($search_field ?'NATURAL JOIN `%1$suser_homes`':'').'
 						NATURAL JOIN %1$sremote_servers
 						NATURAL JOIN %1$sconfig_homes
 						LEFT JOIN %1$sgame_mods 
@@ -1534,20 +1543,23 @@ class OGPDatabaseMySQL extends OGPDatabase
 						AND %1$sserver_homes.home_cfg_id = \''.$home_cfg_id.'\'
 						'.($search_field ?'
 						AND %1$sserver_homes.home_id = \''.$search_field.'\'
-						OR user_id_main = \''.$search_field.'\' OR home_path = \''.$search_field.'\'
-						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
+						OR user_id_main = \''.$search_field.'\' OR home_path LIKE \'%%'.$search_field.'%%\'
+						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
 						OR user_id = \''.$search_field.'\'
-						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
-						OR home_name = \''.$search_field.'\'
+						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
+						OR home_name LIKE \'%%'.$search_field.'%%\'
 						OR agent_ip = \''.$search_field.'\' OR port = \''.$search_field.'\'
-						' : '').' ' : '
+						' : '').'
+						'
+						: 
+						'
 						'.($search_field ?'
 						AND %1$sserver_homes.home_id = \''.$search_field.'\'
-						OR user_id_main = \''.$search_field.'\' OR home_path = \''.$search_field.'\'
-						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
+						OR user_id_main = \''.$search_field.'\' OR home_path LIKE \'%%'.$search_field.'%%\'
+						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
 						OR user_id = \''.$search_field.'\'
-						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
-						OR home_name = \''.$search_field.'\'
+						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
+						OR home_name LIKE \'%%'.$search_field.'%%\'
 						OR agent_ip = \''.$search_field.'\' OR port = \''.$search_field.'\'
 						' : '').'
 						').' OR %1$shome_ip_ports.force_mod_id IS NULL LIMIT '.$gethome_page_forlimit.','.$home_limit.';';
@@ -1620,20 +1632,20 @@ class OGPDatabaseMySQL extends OGPDatabase
 						AND %1$sserver_homes.home_cfg_id = \''.$home_cfg_id.'\'
 						'.($search_field ?'
 						AND %1$sserver_homes.home_id = \''.$search_field.'\'
-						OR user_id_main = \''.$search_field.'\' OR home_path = \''.$search_field.'\'
-						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
+						OR user_id_main = \''.$search_field.'\' OR home_path LIKE \'%%'.$search_field.'%%\'
+						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
 						OR user_id = \''.$search_field.'\'
-						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
-						OR home_name = \''.$search_field.'\'
+						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
+						OR home_name LIKE \'%%'.$search_field.'%%\'
 						OR agent_ip = \''.$search_field.'\' OR port = \''.$search_field.'\'
 						' : '').' ' : '
 						'.($search_field ?'
 						AND %1$sserver_homes.home_id = \''.$search_field.'\'
-						OR user_id_main = \''.$search_field.'\' OR home_path = \''.$search_field.'\'
-						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
+						OR user_id_main = \''.$search_field.'\' OR home_path LIKE \'%%'.$search_field.'%%\'
+						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
 						OR user_id = \''.$search_field.'\'
-						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
-						OR home_name = \''.$search_field.'\'
+						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
+						OR home_name LIKE \'%%'.$search_field.'%%\'
 						OR agent_ip = \''.$search_field.'\' OR port = \''.$search_field.'\'
 						' : '').'
 						').'
@@ -1662,7 +1674,7 @@ class OGPDatabaseMySQL extends OGPDatabase
 								%1$sconfig_mods.def_precmd,
 								%1$sconfig_mods.def_postcmd,
 								%1$sconfig_mods.mod_cfg_id
-						FROM %1$sremote_servers 
+						FROM %1$sremote_servers
 						NATURAL JOIN %1$suser_group_homes 
 						NATURAL JOIN %1$sserver_homes 
 						NATURAL JOIN %1$sconfig_homes
@@ -1689,15 +1701,15 @@ class OGPDatabaseMySQL extends OGPDatabase
 						'.($search_field ?'
 						AND %1$sserver_homes.home_id = \''.$search_field.'\'
 						OR user_id_main = \''.$search_field.'\' OR home_path = \''.$search_field.'\'
-						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
-						OR home_name = \''.$search_field.'\'
+						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
+						OR home_name LIKE \'%%'.$search_field.'%%\'
 						OR agent_ip = \''.$search_field.'\' OR port = \''.$search_field.'\'
 						' : '').' ' : '
 						'.($search_field ?'
 						AND %1$sserver_homes.home_id = \''.$search_field.'\'
-						OR user_id_main = \''.$search_field.'\' OR home_path = \''.$search_field.'\'
-						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
-						OR home_name = \''.$search_field.'\'
+						OR user_id_main = \''.$search_field.'\' OR home_path LIKE \'%%'.$search_field.'%%\'
+						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
+						OR home_name LIKE \'%%'.$search_field.'%%\'
 						OR agent_ip = \''.$search_field.'\' OR port = \''.$search_field.'\'
 						' : '').'
 						').'
@@ -2662,18 +2674,17 @@ class OGPDatabaseMySQL extends OGPDatabase
 		return $this->listQuery($query);
 	}
 	
-	public function getGameHomes_limit($page_gameHomes,$limit_gameHomes,$search_field){
-		$game_home_id = ($page_gameHomes - 1) * $limit_gameHomes;
-		$query = sprintf('SELECT %1$sserver_homes.*, %1$sremote_servers.*, %1$sconfig_homes.*
-			FROM `%1$sserver_homes` NATURAL JOIN `%1$sconfig_homes` NATURAL JOIN `%1$sremote_servers` 
-			'.($search_field ? "WHERE home_id = '$search_field' OR remote_server_id = '$search_field'
-			OR user_id_main = '$search_field' OR home_path = '$search_field' OR home_cfg_id = '$search_field'
-			OR home_name = '$search_field' OR agent_ip = '$search_field' OR remote_server_name = '$search_field'
-			OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
-			" : "").'
-			ORDER BY home_id ASC LIMIT '.$game_home_id.','.$limit_gameHomes.'; ',
-			$this->table_prefix);
-		return $this->listQuery($query);
+	public function get_GameHomes_count($search_field) {
+		$sql = "SELECT COUNT(1) AS total FROM ".$this->table_prefix."server_homes NATURAL JOIN ".$this->table_prefix."remote_servers ";
+
+		if (!empty($search_field)) {
+			$sql .= "WHERE home_id = '$search_field' OR remote_server_id = '$search_field'
+					OR user_id_main = '$search_field' OR home_path = '$search_field' OR home_cfg_id = '$search_field'
+					OR home_name LIKE '%$search_field%' OR agent_ip = '$search_field' OR remote_server_name LIKE '%$search_field%'
+					OR user_id_main IN (SELECT user_id FROM ".$this->table_prefix."users WHERE users_login LIKE '%$search_field%')";
+		}
+
+		return $this->resultQuery($sql);
 	}
 	
    public function get_GameHomes_count($search_field){
@@ -2934,24 +2945,30 @@ class OGPDatabaseMySQL extends OGPDatabase
 		$this->query("INSERT INTO OGP_DB_PREFIXlogger (date, user_id, ip, message) VALUE (FROM_UNIXTIME(UNIX_TIMESTAMP(), '%d-%m-%Y %H:%i:%s'), $user_id, '$client_ip', '$message');");
 	}
 
-	public function get_logger_count($search_field){
-		return $this->resultQuery("SELECT COUNT(log_id) AS total FROM `".$this->table_prefix."logger` 
-		".($search_field ? " WHERE log_id = '$search_field' OR user_id = '$search_field' 
-		 OR ip = '$search_field' OR message = '$search_field' OR user_id
-		 IN 
-		 (SELECT user_id FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')" : "")."
-		;");
+	public function get_logger_count($search_field) {
+		$sql = "SELECT COUNT(1) AS total FROM ".$this->table_prefix."logger ";
+
+		if (!empty($search_field)) {
+			$sql .= "WHERE ip = '$search_field' OR message LIKE '%$search_field%'
+				OR user_id IN (SELECT user_id FROM `".$this->table_prefix."users` WHERE users_login LIKE '%$search_field%')";
+		}
+
+		return $this->resultQuery($sql);
 	}
 	
-	public function read_logger($page,$limit,$search_field){
+	public function read_logger($page,$limit, $search_field) {
 		$log_id = ($page - 1) * $limit;
-		return $this->resultQuery("SELECT * FROM `".$this->table_prefix."logger` 
-		".($search_field ? " WHERE log_id = '$search_field' OR date = '$search_field'
-		 OR user_id = '$search_field' OR ip = '$search_field' OR message = '$search_field' OR user_id 
-		 IN 
-		 (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')" : "")." 
-		ORDER BY log_id DESC LIMIT $log_id,$limit;
-		");
+
+		$sql = "SELECT * FROM ".$this->table_prefix."logger ";
+
+		if (!empty($search_field)) {
+			$sql .= "WHERE ip = '$search_field' OR message LIKE '%$search_field%'
+				OR user_id IN (SELECT user_id FROM `".$this->table_prefix."users` WHERE users_login LIKE '%$search_field%') ";
+		}
+
+		$sql .= "ORDER BY log_id DESC LIMIT $log_id, $limit;";
+
+		return $this->resultQuery($sql);
 	}
 	
 	public function del_logger_log($log_id){
@@ -3365,4 +3382,4 @@ class OGPDatabaseMySQL extends OGPDatabase
 	}
 }
 
-?>
+?>

includes/database_mysqli.php

@@ -253,33 +253,43 @@ class OGPDatabaseMySQL extends OGPDatabase
 		return $results;
 	}
 	
-	public function getUserList_limit($page_user,$limit_user,$search_field) {
-		
-       $user_get_id = ($page_user - 1) * $limit_user;		
-	
-		if ( !$this->link ) return;
-		$query = sprintf("SELECT user_id,users_login,users_lang,
-			users_role,users_fname,users_lname,users_email,user_expires,users_parent
-			FROM %susers 
-			".($search_field ? "WHERE `user_id` = '$search_field' OR `users_login` = '$search_field' OR `users_lang` = '$search_field'
-			OR `users_role` = '$search_field' OR `users_fname` = '$search_field' OR `users_lname` = '$search_field' OR `users_email` = '$search_field'
-			OR `user_expires` = '$search_field' OR `users_parent` = '$search_field' " : "" )."
-			ORDER BY users_login ASC LIMIT $user_get_id,$limit_user",
-			$this->table_prefix);
+	public function getUserList_limit($page_user, $limit_user, $search_field) {
+		$user_get_id = ($page_user - 1) * $limit_user;
+
+		$sql = "SELECT
+					user_id, users_login, users_lang,
+					users_role, users_fname, users_lname,
+					users_email, user_expires, users_parent
+			FROM ".$this->table_prefix."users ";
+
+		if (!empty($search_field)) {
+			$sql .= "WHERE user_id = '$search_field' OR users_login LIKE '%$search_field%' OR users_lang = '$search_field'
+						OR users_role = '$search_field' OR users_fname LIKE '%$search_field%' OR users_lname LIKE '%$search_field%' OR users_email LIKE '%$search_field%' ";
+		}
+
+		$sql .= "ORDER BY users_login ASC LIMIT $user_get_id, $limit_user";
+
 		++$this->queries_;
-		$result = mysqli_query($this->link,$query);
+		$result = mysqli_query($this->link, $sql);
+
 		$results = array();
-		while ( $row = mysqli_fetch_assoc( $result ) )
-			array_push($results,$row);
+		while ($row = mysqli_fetch_assoc($result)) {
+			array_push($results, $row);
+		}
+
 		return $results;
 	}
 	
-	public function get_user_count($search_field){
-		return $this->resultQuery("SELECT COUNT(user_id) AS total FROM `".$this->table_prefix."users` 
-		".($search_field ? "WHERE `user_id` = '$search_field' OR `users_login` = '$search_field' OR `users_lang` = '$search_field'
-			OR `users_role` = '$search_field' OR `users_fname` = '$search_field' OR `users_lname` = '$search_field' OR `users_email` = '$search_field'
-			OR `user_expires` = '$search_field' OR `users_parent` = '$search_field' " : "" )."
-		;");
+	public function get_user_count($search_field) {
+		$sql = "SELECT COUNT(1) AS total FROM ".$this->table_prefix."users ";
+
+		if (!empty($search_field)) {
+			$sql .= "WHERE user_id = '$search_field' OR users_login LIKE '%$search_field%' OR users_lang = '$search_field'
+						OR users_role = '$search_field' OR users_fname LIKE '%$search_field%' OR users_lname LIKE '%$search_field%' OR users_email LIKE '%$search_field%'";
+		}
+
+		++$this->queries_;
+		return $this->resultQuery($sql);
 	}
 
 	public function getGroupList() {
@@ -1410,18 +1420,18 @@ class OGPDatabaseMySQL extends OGPDatabase
 			' : '').'
 			'
  			.($home_cfg_id ?" WHERE home_cfg_id = '$home_cfg_id'
- 			".($search_field ?" AND home_id = '$search_field' OR user_id_main = '$search_field' OR home_path = '$search_field' 
- 								OR home_name = '$search_field' 
- 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+ 			".($search_field ?" AND home_id = '$search_field' OR user_id_main = '$search_field' OR home_path LIKE '%".$search_field."%'
+ 								OR home_name LIKE '%".$search_field."%'
+ 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
  								OR user_id = '$search_field'
- 								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+ 								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
  								OR agent_ip = '$search_field' OR port = '$search_field'
  								" : '')." ": '
- 			'.($search_field ?" WHERE home_cfg_id = '$home_cfg_id' OR home_id = '$search_field' OR user_id_main = '$search_field' OR home_path = '$search_field' 
- 								OR home_name = '$search_field' 
- 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+ 			'.($search_field ?" WHERE home_cfg_id = '$home_cfg_id' OR home_id = '$search_field' OR user_id_main = '$search_field' OR home_path LIKE '%".$search_field."%'
+ 								OR home_name LIKE '%".$search_field."%'
+ 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
  								OR user_id = '$search_field'
-								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
 								OR agent_ip = '$search_field' OR port = '$search_field'
 								" : '').'
 								'));
@@ -1436,20 +1446,20 @@ class OGPDatabaseMySQL extends OGPDatabase
 			' : '').'
 			WHERE user_id = '.$assign_id.' ' .($home_cfg_id ? 'AND `home_id`
 			IN (SELECT `home_id` FROM `'.$this->table_prefix.'server_homes` WHERE home_cfg_id = '.$home_cfg_id.'
-			'.($search_field ?" AND home_id = '$search_field' OR user_id_main = '$search_field' OR home_path = '$search_field' 
- 								OR home_name = '$search_field' 
- 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+			'.($search_field ?" AND home_id = '$search_field' OR user_id_main = '$search_field' OR home_path LIKE '%".$search_field."%'
+ 								OR home_name LIKE '%".$search_field."%'
+ 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
  								OR user_id = '$search_field'
- 								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+ 								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
  								OR agent_ip = '$search_field' OR port = '$search_field'
  								" : '').')'
 								: 
 								'
-				 			'.($search_field ?" AND home_cfg_id = '$home_cfg_id' OR home_id = '$search_field' OR user_id_main = '$search_field' OR home_path = '$search_field' 
- 								OR home_name = '$search_field' 
- 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+				 			'.($search_field ?" AND home_cfg_id = '$home_cfg_id' OR home_id = '$search_field' OR user_id_main = '$search_field' OR home_path LIKE '%".$search_field."%'
+ 								OR home_name LIKE '%".$search_field."%'
+ 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
  								OR user_id = '$search_field'
-								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
 								OR agent_ip = '$search_field' OR port = '$search_field'
 								" : '').'				
 								' 
@@ -1469,15 +1479,15 @@ class OGPDatabaseMySQL extends OGPDatabase
 			WHERE group_id IN (SELECT group_id FROM `'.$this->table_prefix.'user_groups` WHERE user_id = '.$assign_id.' )
 			
 			' .($home_cfg_id ? 'AND `home_id` IN (SELECT `home_id` FROM `'.$this->table_prefix.'server_homes` WHERE home_cfg_id = '.$home_cfg_id.'
-			'.($search_field ?" AND home_id = '$search_field' OR user_id_main = '$search_field' OR home_path = '$search_field' 
- 								OR home_name = '$search_field' 
- 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+			'.($search_field ?" AND home_id = '$search_field' OR user_id_main = '$search_field' OR home_path LIKE '%".$search_field."%'
+ 								OR home_name LIKE '%".$search_field."%'
+ 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
  								OR agent_ip = '$search_field' OR port = '$search_field'
  								" : '').')'
 			:'
-			'.($search_field ?" AND home_id = '$search_field' OR user_id_main = '$search_field' OR home_path = '$search_field' 
- 								OR home_name = '$search_field' 
- 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+			'.($search_field ?" AND home_id = '$search_field' OR user_id_main = '$search_field' OR home_path LIKE '%".$search_field."%'
+ 								OR home_name LIKE '%".$search_field."%'
+ 								OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login LIKE '%".$search_field."%')
  								OR agent_ip = '$search_field' OR port = '$search_field'
  								" : '').'
 			'));
@@ -1530,11 +1540,11 @@ class OGPDatabaseMySQL extends OGPDatabase
 						AND %1$sserver_homes.home_cfg_id = \''.$home_cfg_id.'\'
 						'.($search_field ?'
 						AND %1$sserver_homes.home_id = \''.$search_field.'\'
-						OR user_id_main = \''.$search_field.'\' OR home_path = \''.$search_field.'\'
-						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
+						OR user_id_main = \''.$search_field.'\' OR home_path LIKE \'%%'.$search_field.'%%\'
+						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
 						OR user_id = \''.$search_field.'\'
-						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
-						OR home_name = \''.$search_field.'\'
+						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
+						OR home_name LIKE \'%%'.$search_field.'%%\'
 						OR agent_ip = \''.$search_field.'\' OR port = \''.$search_field.'\'
 						' : '').'
 						'
@@ -1542,11 +1552,11 @@ class OGPDatabaseMySQL extends OGPDatabase
 						'
 						'.($search_field ?'
 						AND %1$sserver_homes.home_id = \''.$search_field.'\'
-						OR user_id_main = \''.$search_field.'\' OR home_path = \''.$search_field.'\'
-						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
+						OR user_id_main = \''.$search_field.'\' OR home_path LIKE \'%%'.$search_field.'%%\'
+						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
 						OR user_id = \''.$search_field.'\'
-						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
-						OR home_name = \''.$search_field.'\'
+						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
+						OR home_name LIKE \'%%'.$search_field.'%%\'
 						OR agent_ip = \''.$search_field.'\' OR port = \''.$search_field.'\'
 						' : '').'
 						').' OR %1$shome_ip_ports.force_mod_id IS NULL LIMIT '.$gethome_page_forlimit.','.$home_limit.';';
@@ -1619,20 +1629,20 @@ class OGPDatabaseMySQL extends OGPDatabase
 						AND %1$sserver_homes.home_cfg_id = \''.$home_cfg_id.'\'
 						'.($search_field ?'
 						AND %1$sserver_homes.home_id = \''.$search_field.'\'
-						OR user_id_main = \''.$search_field.'\' OR home_path = \''.$search_field.'\'
-						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
+						OR user_id_main = \''.$search_field.'\' OR home_path LIKE \'%%'.$search_field.'%%\'
+						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
 						OR user_id = \''.$search_field.'\'
-						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
-						OR home_name = \''.$search_field.'\'
+						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
+						OR home_name LIKE \'%%'.$search_field.'%%\'
 						OR agent_ip = \''.$search_field.'\' OR port = \''.$search_field.'\'
 						' : '').' ' : '
 						'.($search_field ?'
 						AND %1$sserver_homes.home_id = \''.$search_field.'\'
-						OR user_id_main = \''.$search_field.'\' OR home_path = \''.$search_field.'\'
-						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
+						OR user_id_main = \''.$search_field.'\' OR home_path LIKE \'%%'.$search_field.'%%\'
+						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
 						OR user_id = \''.$search_field.'\'
-						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
-						OR home_name = \''.$search_field.'\'
+						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
+						OR home_name LIKE \'%%'.$search_field.'%%\'
 						OR agent_ip = \''.$search_field.'\' OR port = \''.$search_field.'\'
 						' : '').'
 						').'
@@ -1688,15 +1698,15 @@ class OGPDatabaseMySQL extends OGPDatabase
 						'.($search_field ?'
 						AND %1$sserver_homes.home_id = \''.$search_field.'\'
 						OR user_id_main = \''.$search_field.'\' OR home_path = \''.$search_field.'\'
-						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
-						OR home_name = \''.$search_field.'\'
+						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
+						OR home_name LIKE \'%%'.$search_field.'%%\'
 						OR agent_ip = \''.$search_field.'\' OR port = \''.$search_field.'\'
 						' : '').' ' : '
 						'.($search_field ?'
 						AND %1$sserver_homes.home_id = \''.$search_field.'\'
-						OR user_id_main = \''.$search_field.'\' OR home_path = \''.$search_field.'\'
-						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
-						OR home_name = \''.$search_field.'\'
+						OR user_id_main = \''.$search_field.'\' OR home_path LIKE \'%%'.$search_field.'%%\'
+						OR user_id_main IN (SELECT `user_id` FROM `%1$susers` WHERE users_login LIKE \'%%'.$search_field.'%%\')
+						OR home_name LIKE \'%%'.$search_field.'%%\'
 						OR agent_ip = \''.$search_field.'\' OR port = \''.$search_field.'\'
 						' : '').'
 						').'
@@ -2671,29 +2681,36 @@ class OGPDatabaseMySQL extends OGPDatabase
 		return $this->listQuery($query);
 	}
 	
-	public function getGameHomes_limit($page_gameHomes,$limit_gameHomes,$search_field){
+	public function getGameHomes_limit($page_gameHomes, $limit_gameHomes, $search_field) {
 		$game_home_id = ($page_gameHomes - 1) * $limit_gameHomes;
-		$query = sprintf('SELECT %1$sserver_homes.*, %1$sremote_servers.*, %1$sconfig_homes.*
-			FROM `%1$sserver_homes` NATURAL JOIN `%1$sconfig_homes` NATURAL JOIN `%1$sremote_servers` 
-			'.($search_field ? "WHERE home_id = '$search_field' OR remote_server_id = '$search_field'
-			OR user_id_main = '$search_field' OR home_path = '$search_field' OR home_cfg_id = '$search_field'
-			OR home_name = '$search_field' OR agent_ip = '$search_field' OR remote_server_name = '$search_field'
-			OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
-			" : "").'
-			ORDER BY home_id ASC LIMIT '.$game_home_id.','.$limit_gameHomes.'; ',
-			$this->table_prefix);
-		return $this->listQuery($query);
+
+		$sql = sprintf('SELECT %1$sserver_homes.*, %1$sremote_servers.*, %1$sconfig_homes.* 
+					FROM %1$sserver_homes NATURAL JOIN %1$sconfig_homes NATURAL JOIN %1$sremote_servers ', $this->table_prefix);
+
+		if (!empty($search_field)) {
+			$sql .= "WHERE home_id = '$search_field' OR remote_server_id = '$search_field'
+					OR user_id_main = '$search_field' OR home_path = '$search_field' OR home_cfg_id = '$search_field'
+					OR home_name LIKE '%$search_field%' OR agent_ip = '$search_field' OR remote_server_name LIKE '%$search_field%'
+					OR user_id_main IN (SELECT user_id FROM ".$this->table_prefix."users WHERE users_login LIKE '%$search_field%') ";
+		}
+
+		$sql .= "ORDER BY home_id ASC LIMIT $game_home_id, $limit_gameHomes;";
+
+		return $this->listQuery($sql);
 	}
 	
-   public function get_GameHomes_count($search_field){
-      return $this->resultQuery("SELECT COUNT(home_id) AS total FROM `".$this->table_prefix."server_homes` NATURAL JOIN `".$this->table_prefix."remote_servers`
-	  ".($search_field ? "WHERE home_id = '$search_field' OR remote_server_id = '$search_field'
-			OR user_id_main = '$search_field' OR home_path = '$search_field' OR home_cfg_id = '$search_field'
-			OR home_name = '$search_field' OR agent_ip = '$search_field' OR remote_server_name = '$search_field'
-			OR user_id_main IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
-			" : "")."
-	  ;");
-   }
+	public function get_GameHomes_count($search_field) {
+		$sql = "SELECT COUNT(1) AS total FROM ".$this->table_prefix."server_homes NATURAL JOIN ".$this->table_prefix."remote_servers ";
+
+		if (!empty($search_field)) {
+			$sql .= "WHERE home_id = '$search_field' OR remote_server_id = '$search_field'
+					OR user_id_main = '$search_field' OR home_path = '$search_field' OR home_cfg_id = '$search_field'
+					OR home_name LIKE '%$search_field%' OR agent_ip = '$search_field' OR remote_server_name LIKE '%$search_field%'
+					OR user_id_main IN (SELECT user_id FROM ".$this->table_prefix."users WHERE users_login LIKE '%$search_field%')";
+		}
+
+		return $this->resultQuery($sql);
+	}
 	
 	public function changeLastParam($home_id,$json) {
 		$query = sprintf("UPDATE `%sserver_homes` SET `last_param` = '%s' WHERE `home_id` = %d",
@@ -2943,24 +2960,30 @@ class OGPDatabaseMySQL extends OGPDatabase
 		$this->query("INSERT INTO OGP_DB_PREFIXlogger (date, user_id, ip, message) VALUE (FROM_UNIXTIME(UNIX_TIMESTAMP(), '%d-%m-%Y %H:%i:%s'), $user_id, '$client_ip', '$message');");
 	}
 
-	public function get_logger_count($search_field){
-		return $this->resultQuery("SELECT COUNT(log_id) AS total FROM `".$this->table_prefix."logger` 
-		".($search_field ? " WHERE log_id = '$search_field' OR user_id = '$search_field' 
-		 OR ip = '$search_field' OR message = '$search_field' OR user_id
-		 IN 
-		 (SELECT user_id FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')" : "")."
-		;");
+	public function get_logger_count($search_field) {
+		$sql = "SELECT COUNT(1) AS total FROM ".$this->table_prefix."logger ";
+
+		if (!empty($search_field)) {
+			$sql .= "WHERE ip = '$search_field' OR message LIKE '%$search_field%'
+				OR user_id IN (SELECT user_id FROM `".$this->table_prefix."users` WHERE users_login LIKE '%$search_field%')";
+		}
+
+		return $this->resultQuery($sql);
 	}
 	
-	public function read_logger($page,$limit,$search_field){
+	public function read_logger($page,$limit, $search_field) {
 		$log_id = ($page - 1) * $limit;
-		return $this->resultQuery("SELECT * FROM `".$this->table_prefix."logger` 
-		".($search_field ? " WHERE log_id = '$search_field' OR date = '$search_field'
-		 OR user_id = '$search_field' OR ip = '$search_field' OR message = '$search_field' OR user_id 
-		 IN 
-		 (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')" : "")." 
-		ORDER BY log_id DESC LIMIT $log_id,$limit;
-		");
+
+		$sql = "SELECT * FROM ".$this->table_prefix."logger ";
+
+		if (!empty($search_field)) {
+			$sql .= "WHERE ip = '$search_field' OR message LIKE '%$search_field%'
+				OR user_id IN (SELECT user_id FROM `".$this->table_prefix."users` WHERE users_login LIKE '%$search_field%') ";
+		}
+
+		$sql .= "ORDER BY log_id DESC LIMIT $log_id, $limit;";
+
+		return $this->resultQuery($sql);
 	}
 	
 	public function del_logger_log($log_id){
@@ -3374,4 +3397,4 @@ class OGPDatabaseMySQL extends OGPDatabase
 	}
 }
 
-?>
+?>

lang/English/global.php

@@ -125,4 +125,5 @@ define('admin_dsi', "DSi Settings");
 define('user_dsi', "DSi");
 define('list_dsi', "DSi List");
 define('no_remote_servers', "There is no known remote servers! Add a server to use this function.");
+define('no_results_found', "No search results found for %s");
 ?>

lang/English/modules/update.php

@@ -53,4 +53,8 @@ define('blacklist_files', "Blacklist files");
 define('blacklist_files_info', "All marked files will not be updated.");
 define('save_to_blacklist', "Save to blacklist");
 define('no_new_updates', "No new updates");
+define('module_file_missing', "directory is missing the module.php file.");
+define('query_failed', "Failed to execute query");
+define('query_failed_2', "to database.");
+define('missing_zip_extension', "The php-zip extension is not loaded. Please enable it to use the update module.");
 ?>

modules/administration/watch_logger.php

@@ -24,9 +24,28 @@
  */
 
 function exec_ogp_module() {
-	global $db, $loggedInUserInfo;
+	global $db, $view, $loggedInUserInfo;
+
+	$search_field = (isset($_GET['search']) && !empty($_GET['search'])) ? $_GET['search'] : false;
+	$p = (isset($_GET['page']) && (int)$_GET['page'] > 0) ? (int)$_GET['page'] : 1;
+	$l = (isset($_GET['limit']) && (int)$_GET['limit'] > 0) ? (int)$_GET['limit'] : 10;
+
+	if(hasValue($loggedInUserInfo) && is_array($loggedInUserInfo) && $loggedInUserInfo["users_page_limit"] && !hasValue($_GET['limit'])){
+		$l = $loggedInUserInfo["users_page_limit"];
+	}
+
 	echo "<h2>".get_lang('watch_logger')."</h2>";
-	?>
+
+	$logs = $db->read_logger($p, $l, $search_field);
+
+	if (empty($logs)) {
+		print_failure(get_lang_f('no_results_found', htmlentities($search_field)));
+
+		$view->refresh("?m=administration&p=watch_logger", 5);
+		return;
+	}
+
+?>
 	<!-- Search, Empty Logger, and Paging Options Table -->
 	<table style="width: 100%;">
 		<tr>
@@ -65,16 +84,6 @@ function exec_ogp_module() {
 	if( isset( $_POST['empty_logger'] ) )
 		$db->empty_logger();
 	
-	$search_field = (isset($_GET['search']) && !empty($_GET['search'])) ? $_GET['search'] : false;
-	$p = (isset($_GET['page']) && (int)$_GET['page'] > 0) ? (int)$_GET['page'] : 1;
-	$l = (isset($_GET['limit']) && (int)$_GET['limit'] > 0) ? (int)$_GET['limit'] : 10;
-	
-	if(hasValue($loggedInUserInfo) && is_array($loggedInUserInfo) && $loggedInUserInfo["users_page_limit"] && !hasValue($_GET['limit'])){
-		$l = $loggedInUserInfo["users_page_limit"];
-	}
-	
-	$logs = $db->read_logger($p,$l,$search_field);
-	
 	if($logs)
 	{
 		foreach($logs as $log)
@@ -129,4 +138,4 @@ function exec_ogp_module() {
 	}
 	echo paginationPages($count_logs[0]['total'], $p, $l, $uri, 3, 'watchLogger');
 }
-?>
+?>

modules/gamemanager/server_monitor.php

@@ -159,7 +159,13 @@ function exec_ogp_module() {
 	if( $server_homes === FALSE )
 	{
 		// If there are no games, then there can not be any mods either.
-		print_failure( no_game_homes_assigned );
+
+		if (!empty($search_field)) {
+			print_failure(get_lang_f('no_results_found', htmlentities($search_field)));
+		} else {
+			print_failure(get_lang('no_game_homes_assigned'));
+		}
+
 		if ( $isAdmin )
 		{
 			echo "<p><a href='?m=user_games&amp;p=assign&amp;user_id=$_SESSION[user_id]'>".
@@ -665,4 +671,4 @@ function exec_ogp_module() {
 	</script>
 	<?php
 }
-?>
+?>

modules/update/update.php

@@ -48,15 +48,20 @@ function check_file($local_path, $remote_url)
 
 function exec_ogp_module()
 {
+	global $db, $settings;
+	define('REPONAME', 'OGP-Website');
+
 	if ($_SESSION['users_group'] != "admin") 
 	{
 		print_failure(get_lang('no_access'));
 		return;
 	}
 
-	global $db, $settings;
-	
-	define('REPONAME', 'OGP-Website');
+	// Check if PHP-ZIP is installed, otherwise we won't be able to extract the downloaded update.
+	if (extension_loaded('zip') === false) {
+		print_failure(get_lang('missing_zip_extension'));
+		return;
+	}
 	
 	// GitHub URL
 	if(function_exists("getOGPGitHubURL") && function_exists("getOGPGitHubURLUnstrict") && function_exists("getGitHubOrganization")){
@@ -148,4 +153,4 @@ function exec_ogp_module()
 		}
 	}
 }
-?>
+?>

modules/user_admin/edit_user.php

@@ -137,7 +137,7 @@ function exec_ogp_module() {
 			if($months == 'X' || $days == 'X' || $years == 'X' || $hours == 'X' || $mins == 'X')
 				$expire_timestamp = "X";
 			else
-				$expire_timestamp = mktime( $hours, $mins, 0, $months, $days, $years, -1);
+				$expire_timestamp = mktime( $hours, $mins, 0, $months, $days, $years);
 
 			$fields['users_role'] = sanitizeInputStr($_POST['newrole']);
 			$fields['users_comment'] = sanitizeInputStr($_POST['comment']);
@@ -287,4 +287,4 @@ function exec_ogp_module() {
 	$ft->end_form();
 	echo "</div>";
 }
-?>
+?>

modules/user_admin/show_users.php

@@ -46,7 +46,7 @@ td.actions{
  */
 
 function exec_ogp_module() {
-    global $db, $loggedInUserInfo;
+    global $db, $view, $loggedInUserInfo;
 	
 	$page_user = (isset($_GET['page']) && (int)$_GET['page'] > 0) ? (int)$_GET['page'] : 1;
 	$limit_user = (isset($_GET['limit']) && (int)$_GET['limit'] > 0) ? (int)$_GET['limit'] : 10;
@@ -55,14 +55,33 @@ function exec_ogp_module() {
 	if(hasValue($loggedInUserInfo) && is_array($loggedInUserInfo) && $loggedInUserInfo["users_page_limit"] && !hasValue($_GET['limit'])){
 		$limit_user = $loggedInUserInfo["users_page_limit"];
 	}
-	
-    echo '<h2>'.get_lang('users')."</h2>";
-	echo '<form action="home.php" method="GET" style="float:left;">
-		<p><a href="?m=user_admin&amp;p=add">'.get_lang("add_new_user").'</a></p>
-		<input type ="hidden" name="m" value="user_admin" />
-		<input name="search" type="text" id="search" />
-		<input type="submit" value="'.get_lang('search').'" />
-		</form>';
+
+	echo '<h2>'.get_lang('users')."</h2>";
+
+	$result = $db->getUserList_limit($page_user, $limit_user, $search_field);
+
+	if (empty($result) && $search_field !== false) {
+		print_failure(get_lang_f('no_results_found', htmlentities($search_field)));
+
+		$view->refresh("?m=user_admin", 5);
+		return;
+	}
+
+	echo '<table style="width: 100%;">
+			<tr>
+				<td style="width: 50%; vertical-align: middle; text-align: left;">
+					<p><a href="?m=user_admin&amp;p=add">'.get_lang("add_new_user").'</a></p>
+				</td>
+				<td style="width: 50%; vertical-align: middle; text-align: right;">
+					<form action="home.php" method="GET" style="float:right;">
+					<input type ="hidden" name="m" value="user_admin" />
+					<input name="search" type="text" id="search" />
+					<input type="submit" value="'.get_lang('search').'" />
+					</form>
+				</td>
+			</tr>
+		</table>';
+
     echo '<table class="userListTable center" style="width: 100%;margin-top:100px;">';
     echo '<tr><th>'.get_lang('actions')."</th><th>".get_lang('username')."</th>";
     echo "<th>".get_lang('user_role')."</th>";
@@ -70,7 +89,6 @@ function exec_ogp_module() {
     echo "<th>".get_lang('expires')."</th>";
     echo "<th class='subuserColumn'>".get_lang('subusers')."</th></tr>";
 
-    $result = $db->getUserList_limit($page_user,$limit_user,$search_field);
     $i = 0;
     foreach ( $result as $row )
     {

modules/user_games/show_homes.php

@@ -24,7 +24,7 @@
 
 function exec_ogp_module()
 {
-	global $db, $loggedInUserInfo;
+	global $db, $view, $loggedInUserInfo;
 	$search_field = (isset($_GET['search']) && !empty($_GET['search'])) ? $_GET['search'] : false;
 	
 	$page_GameHomes = (isset($_GET['page']) && (int)$_GET['page'] > 0) ? (int)$_GET['page'] : 1;
@@ -33,22 +33,37 @@ function exec_ogp_module()
 	if(hasValue($loggedInUserInfo) && is_array($loggedInUserInfo) && $loggedInUserInfo["users_page_limit"] && !hasValue($_GET['limit'])){
 		$limit_GameHomes = $loggedInUserInfo["users_page_limit"];
 	}
-	
-	echo "<h2>".get_lang('game_servers')."</h2>";
-	echo '<form action="home.php" method="GET" style="margin-bottom:10px;float:left;">
-		<p><a href="?m=user_games&amp;p=add">'.get_lang("add_new_game_home").'</a></p>
-		<input type ="hidden" name="m" value="user_games" />
-		<input name="search" type="text" id="search" />
-		<input type="submit" value="'.get_lang('search').'" />
-		</form>';	
 
 	$game_homes = $db->getGameHomes_limit($page_GameHomes,$limit_GameHomes,$search_field);
-	if ( empty($game_homes) )
-	{
-		echo "<p>".get_lang('no_game_homes_found')."</p>";
+	
+	if (empty($game_homes)) {
+		if (!empty($search_field)) {
+			print_failure(get_lang_f('no_results_found', htmlentities($search_field)));
+
+			$view->refresh("?m=user_games", 5);
+		} else {
+			print_failure(get_lang('no_game_homes_found'));
+		}
+
 		return;
 	}
 
+	echo "<h2>".get_lang('game_servers')."</h2>";
+	echo '<table style="width: 100%; margin-bottom: 50px;">
+			<tr>
+				<td style="width: 50%; vertical-align: middle; text-align: left;">
+					<p><a href="?m=user_games&amp;p=add">'.get_lang("add_new_game_home").'</a></p>
+				</td>
+				<td style="width: 50%; vertical-align: middle; text-align: right;">
+					<form action="home.php" method="GET" style="float:right;">
+					<input type ="hidden" name="m" value="user_games" />
+					<input name="search" type="text" id="search" />
+					<input type="submit" value="'.get_lang('search').'" />
+					</form>
+				</td>
+			</tr>
+		</table>';	
+
 	echo "<h2>".get_lang('available_game_homes')."</h2>";
 	echo '<table class="center">';
 	echo "<tr><th>".get_lang('home_id')."</th><th>".get_lang('game_server')."</th>
@@ -105,4 +120,4 @@ function exec_ogp_module()
 	</script>
 	<?php	
 }
-?>
+?>