Przeglądaj źródła

Merge branch 'master' of github.com:OpenGamePanel/OGP-Website

own3mall 9 lat temu
rodzic
commit
4254a02801
100 zmienionych plików z 1225 dodań i 517 usunięć
  1. 1 1
      home.php
  2. BIN
      images/icons/egs.png
  3. BIN
      images/icons/openttd.png
  4. 2 1
      includes/api.php
  5. 4 4
      includes/database.php
  6. 186 29
      includes/database_mysql.php
  7. 190 31
      includes/database_mysqli.php
  8. 2 1
      includes/form_table_class.php
  9. 4 2
      includes/functions.php
  10. 2 2
      includes/helpers.php
  11. 1 1
      includes/html_functions.php
  12. 1 1
      includes/lang.php
  13. 1 1
      includes/lib_remote.php
  14. 1 1
      includes/navig.php
  15. 2 1
      includes/refreshed.php
  16. 1 1
      includes/view.php
  17. 1 1
      index.php
  18. 2 1
      install.php
  19. 9 9
      lang/Arabic/global.php
  20. 4 4
      lang/Arabic/install.php
  21. 4 4
      lang/Arabic/modules/addonsmanager.php
  22. 1 1
      lang/Arabic/modules/administration.php
  23. 2 2
      lang/Arabic/modules/dashboard.php
  24. 2 2
      lang/Arabic/modules/gamemanager.php
  25. 19 19
      lang/Arabic/modules/lostpwd.php
  26. 30 30
      lang/Arabic/modules/register.php
  27. 33 31
      lang/Arabic/modules/server.php
  28. 15 15
      lang/Arabic/modules/status.php
  29. 39 39
      lang/Arabic/modules/subusers.php
  30. 2 2
      lang/Arabic/modules/update.php
  31. 5 5
      lang/Arabic/modules/user_games.php
  32. 3 1
      lang/Danish/modules/server.php
  33. 1 2
      lang/English/global.php
  34. 1 1
      lang/English/install.php
  35. 1 1
      lang/English/modules/TS3Admin.php
  36. 1 1
      lang/English/modules/addonsmanager.php
  37. 1 1
      lang/English/modules/administration.php
  38. 1 1
      lang/English/modules/config_games.php
  39. 1 1
      lang/English/modules/dashboard.php
  40. 1 1
      lang/English/modules/extras.php
  41. 1 1
      lang/English/modules/ftp.php
  42. 2 2
      lang/English/modules/gamemanager.php
  43. 1 1
      lang/English/modules/litefm.php
  44. 1 1
      lang/English/modules/lostpwd.php
  45. 1 1
      lang/English/modules/modulemanager.php
  46. 1 1
      lang/English/modules/mysql.php
  47. 1 1
      lang/English/modules/register.php
  48. 2 1
      lang/English/modules/server.php
  49. 1 1
      lang/English/modules/settings.php
  50. 1 1
      lang/English/modules/status.php
  51. 1 1
      lang/English/modules/subusers.php
  52. 2 2
      lang/English/modules/update.php
  53. 2 2
      lang/English/modules/user_admin.php
  54. 1 1
      lang/English/modules/user_games.php
  55. 3 1
      lang/French/modules/server.php
  56. 3 1
      lang/German/modules/server.php
  57. 5 3
      lang/Hungarian/modules/server.php
  58. 3 1
      lang/Italian/modules/server.php
  59. 3 1
      lang/Polish/modules/server.php
  60. 3 1
      lang/Portuguese/modules/server.php
  61. 3 1
      lang/Russian/modules/server.php
  62. 3 1
      lang/Spanish/modules/server.php
  63. 2 2
      lang/lang-check.php
  64. 21 20
      modules/TS3Admin/TS3Admin.php
  65. 1 1
      modules/TS3Admin/module.php
  66. 1 1
      modules/TS3Admin/templates/selectvServer.tpl
  67. 2 2
      modules/TS3Admin/templates/vServerOverview.tpl
  68. 20 9
      modules/TS3Admin/ts3webinterface.class.php
  69. 2 2
      modules/addonsmanager/addons_installer.php
  70. 0 0
      modules/addonsmanager/addons_manager.php
  71. 1 1
      modules/addonsmanager/module.php
  72. 2 1
      modules/addonsmanager/user_addons.php
  73. 2 1
      modules/administration/administration.php
  74. 2 1
      modules/administration/backupdwl.php
  75. 2 1
      modules/administration/banlist.php
  76. 2 1
      modules/administration/iframe.php
  77. 1 1
      modules/administration/module.php
  78. 16 6
      modules/administration/watch_logger.php
  79. 2 2
      modules/config_games/cli-params.php
  80. 1 1
      modules/config_games/config_servers.php
  81. 2 1
      modules/config_games/create.php
  82. 1 1
      modules/config_games/module.php
  83. 1 1
      modules/config_games/server_config_parser.php
  84. 12 16
      modules/config_games/server_configs/arkse_linux64.xml
  85. 12 16
      modules/config_games/server_configs/arkse_win64.xml
  86. 73 0
      modules/config_games/server_configs/egs_win64.xml
  87. 0 27
      modules/config_games/server_configs/openttd.xml
  88. 59 0
      modules/config_games/server_configs/openttd_linux32.xml
  89. 59 0
      modules/config_games/server_configs/openttd_linux64.xml
  90. 59 0
      modules/config_games/server_configs/openttd_win32.xml
  91. 59 0
      modules/config_games/server_configs/openttd_win64.xml
  92. 0 39
      modules/config_games/server_configs/rust_legacy_win32.xml
  93. 81 0
      modules/config_games/server_configs/squad_linux64.xml
  94. 36 31
      modules/config_games/server_configs/teamspeak3_linux32.xml
  95. 36 31
      modules/config_games/server_configs/teamspeak3_linux64.xml
  96. 14 9
      modules/config_games/server_configs/teamspeak3_win32.xml
  97. 14 9
      modules/config_games/server_configs/teamspeak3_win64.xml
  98. 2 1
      modules/config_games/set_mods.php
  99. 2 1
      modules/config_games/set_params.php
  100. 2 2
      modules/config_games/xml_config_creator.php

+ 1 - 1
home.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2015 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

BIN
images/icons/egs.png


BIN
images/icons/openttd.png


+ 2 - 1
includes/api.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -21,6 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
+
 function pretty_text_ttf($im, $fontsize, $angle, $x, $y, $color, $font, $string, $outline = false) {
 	$black  = imagecolorallocate($bgImg, 0, 0, 0);
 

+ 4 - 4
includes/database.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -63,7 +63,7 @@ abstract class OGPDatabase {
 
     abstract public function getUserList();
     
-    abstract public function getUserList_limit($page_user,$limit_user);
+    abstract public function getUserList_limit($page_user,$limit_user,$search_field);
 
     abstract public function getGroupList();
 
@@ -178,7 +178,7 @@ abstract class OGPDatabase {
 
     abstract public function getHomesFor($id_type,$assign_id);
     
-    abstract public function getHomesFor_limit($id_type,$assign_id,$home_page,$home_limit,$home_cfg_id);
+    abstract public function getHomesFor_limit($id_type,$assign_id,$home_page,$home_limit,$home_cfg_id,$search_field);
 
     abstract public function getHomeMods($home_id);
 
@@ -256,7 +256,7 @@ abstract class OGPDatabase {
 
     abstract public function getGameHomes();
     
-    abstract public function getGameHomes_limit($page_gameHomes,$limit_gameHomes);
+    abstract public function getGameHomes_limit($page_gameHomes,$limit_gameHomes,$search_field);
 
     /// \return true If username and password match.
     /// \return false If username and password does not match

+ 186 - 29
includes/database_mysql.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2015 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -256,29 +256,34 @@ class OGPDatabaseMySQL extends OGPDatabase
 		return $results;
 	}
 	
-	public function getUserList_limit($page_user,$limit_user) {
+	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 ORDER BY users_login ASC LIMIT $user_get_id,$limit_user",
+			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);
-
 		++$this->queries_;
 		$result = mysql_query($query,$this->link);
-
 		$results = array();
-
 		while ( $row = mysql_fetch_assoc( $result ) )
 			array_push($results,$row);
-
 		return $results;
 	}
 	
-	public function get_user_count(){
-		return $this->resultQuery("SELECT COUNT(user_id) AS total FROM `".$this->table_prefix."users`;");
+	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 getGroupList() {
@@ -1398,27 +1403,98 @@ class OGPDatabaseMySQL extends OGPDatabase
 		}
 	}
 
-	public function getHomesFor_count($id_type,$assign_id,$home_cfg_id){
+	public function getHomesFor_count($id_type,$assign_id,$home_cfg_id,$search_field){
 		if ( $id_type == "admin" )
 		{
-			return $this->resultQuery('SELECT COUNT(home_id) AS total FROM `'.$this->table_prefix.'server_homes`' . ($home_cfg_id ?' WHERE home_cfg_id = '.$home_cfg_id : ''));
+			return $this->resultQuery('SELECT COUNT('.($search_field ?'distinct':'').' home_id) AS total FROM `'.$this->table_prefix.'server_homes`
+			'.($search_field ? '
+			NATURAL JOIN `'.$this->table_prefix.'user_homes`
+			NATURAL JOIN `'.$this->table_prefix.'remote_servers` 
+ 			NATURAL JOIN `'.$this->table_prefix.'home_ip_ports`
+			' : '').'
+			'
+ 			.($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')
+ 								OR user_id = '$search_field'
+ 								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$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')
+ 								OR user_id = '$search_field'
+								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+								OR agent_ip = '$search_field' OR port = '$search_field'
+								" : '').'
+								'));
 		}
 		else if ( $id_type == "user_and_group" )
 		{
-			return $this->resultQuery('SELECT COUNT(home_id) AS total FROM `'.$this->table_prefix.'user_homes` 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.' )': ''));
+			return $this->resultQuery('SELECT COUNT('.($search_field ?'distinct':'').' home_id) AS total FROM `'.$this->table_prefix.'user_homes`
+			'.($search_field ? '
+			NATURAL JOIN `'.$this->table_prefix.'server_homes`
+			NATURAL JOIN `'.$this->table_prefix.'remote_servers` 
+ 			NATURAL JOIN `'.$this->table_prefix.'home_ip_ports`
+			' : '').'
+			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')
+ 								OR user_id = '$search_field'
+ 								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$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')
+ 								OR user_id = '$search_field'
+								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+								OR agent_ip = '$search_field' OR port = '$search_field'
+								" : '').'				
+								' 
+								));
+		
+		
 		}
 		else if ( $id_type == "subuser" )
 		{
-			return $this->resultQuery('SELECT COUNT(home_id) AS total FROM `'.$this->table_prefix.'user_group_homes` 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.' )': ''));
+			return $this->resultQuery('SELECT COUNT('.($search_field ?'distinct':'').' home_id) AS total FROM `'.$this->table_prefix.'user_group_homes`
+			'.($search_field ? '
+			NATURAL JOIN `'.$this->table_prefix.'user_homes`
+			NATURAL JOIN `'.$this->table_prefix.'server_homes`
+			NATURAL JOIN `'.$this->table_prefix.'remote_servers` 
+ 			NATURAL JOIN `'.$this->table_prefix.'home_ip_ports`
+			' : '').'			
+			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')
+ 								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')
+ 								OR agent_ip = '$search_field' OR port = '$search_field'
+ 								" : '').'
+			'));
 		}		
 		
 	}
 	
-	public function getHomesFor_limit($id_type,$assign_id,$home_page,$home_limit,$home_cfg_id){
+	public function getHomesFor_limit($id_type,$assign_id,$home_page,$home_limit,$home_cfg_id,$search_field){
 	$gethome_page_forlimit = ($home_page - 1) * $home_limit;	
 		if ( $id_type == "admin" )
 		{
-			$template = 'SELECT	%1$sserver_homes.*, 
+			$template = 'SELECT '.($search_field ?'distinct':'').' 
+								%1$sserver_homes.*, 
 								%1$sremote_servers.*, 
 								%1$sconfig_homes.*, 
 								%1$shome_ip_ports.port,
@@ -1439,6 +1515,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` ':'').'
 						NATURAL JOIN %1$sremote_servers
 						NATURAL JOIN %1$sconfig_homes
 						LEFT JOIN %1$sgame_mods 
@@ -1453,8 +1530,27 @@ class OGPDatabaseMySQL extends OGPDatabase
 							FROM `%1$shome_ip_ports`
 							WHERE `force_mod_id` = %1$sgame_mods.mod_id OR %1$shome_ip_ports.force_mod_id = 0
 						)
-						'.($home_cfg_id ? 'AND %1$sserver_homes.home_cfg_id = '.$home_cfg_id : '').'
-						OR %1$shome_ip_ports.force_mod_id IS NULL LIMIT '.$gethome_page_forlimit.','.$home_limit.';';
+						'.($home_cfg_id ? '
+						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 = \''.$search_field.'\'
+						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
+						OR home_name = \''.$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 = \''.$search_field.'\'
+						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
+						OR home_name = \''.$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.';';
 						
 			$template2 = 'SELECT user_expiration_date, home_id FROM %1$suser_homes WHERE user_id = %2$d;';
 			$template3 = 'SELECT user_group_expiration_date, home_id FROM %1$suser_group_homes WHERE group_id IN(
@@ -1481,7 +1577,8 @@ class OGPDatabaseMySQL extends OGPDatabase
 		}
 		else if ( $id_type == "user_and_group" )
 		{
-			$template = 'SELECT	%1$suser_homes.*, 
+			$template = 'SELECT	'.($search_field ?'distinct':'').'
+								%1$suser_homes.*, 
 								%1$sserver_homes.*, 
 								%1$sremote_servers.*, 
 								%1$sconfig_homes.*, 
@@ -1519,11 +1616,32 @@ class OGPDatabaseMySQL extends OGPDatabase
 								FROM `%1$shome_ip_ports`
 								WHERE `force_mod_id` = %1$sgame_mods.mod_id OR %1$shome_ip_ports.force_mod_id = 0
 							)
-							'.($home_cfg_id ? 'AND %1$sserver_homes.home_cfg_id = '.$home_cfg_id : '').'
+						'.($home_cfg_id ? '
+						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 = \''.$search_field.'\'
+						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
+						OR home_name = \''.$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 = \''.$search_field.'\'
+						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
+						OR home_name = \''.$search_field.'\'
+						OR agent_ip = \''.$search_field.'\' OR port = \''.$search_field.'\'
+						' : '').'
+						').'
 							OR %1$shome_ip_ports.force_mod_id IS NULL
 						)
 						UNION
-						SELECT	%1$suser_group_homes.*,
+						SELECT	'.($search_field ?'distinct':'').'
+								%1$suser_group_homes.*,
 								%1$sserver_homes.*, 
 								%1$sremote_servers.*, 
 								%1$sconfig_homes.*, 
@@ -1566,7 +1684,23 @@ class OGPDatabaseMySQL extends OGPDatabase
 								FROM `%1$shome_ip_ports`
 								WHERE `force_mod_id` = %1$sgame_mods.mod_id OR %1$shome_ip_ports.force_mod_id = 0
 							)
-							'.($home_cfg_id ? 'AND %1$sserver_homes.home_cfg_id = '.$home_cfg_id : '').'
+						'.($home_cfg_id ? '
+						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 home_name = \''.$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 agent_ip = \''.$search_field.'\' OR port = \''.$search_field.'\'
+						' : '').'
+						').'
 							OR %1$shome_ip_ports.force_mod_id IS NULL 
 						) 
 						LIMIT '.$gethome_page_forlimit.','.$home_limit.';';
@@ -2528,16 +2662,28 @@ class OGPDatabaseMySQL extends OGPDatabase
 		return $this->listQuery($query);
 	}
 	
-	public function getGameHomes_limit($page_gameHomes,$limit_gameHomes){
+	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` ORDER BY home_id ASC LIMIT '.$game_home_id.','.$limit_gameHomes.'; ',
+			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(){
-      return $this->resultQuery("SELECT COUNT(home_id) AS total FROM `".$this->table_prefix."server_homes`;");
+   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 changeLastParam($home_id,$json) {
@@ -2788,13 +2934,24 @@ 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(){
-		return $this->resultQuery("SELECT COUNT(log_id) AS total FROM `".$this->table_prefix."logger`;");
+	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 read_logger($page,$limit){
+	public function read_logger($page,$limit,$search_field){
 		$log_id = ($page - 1) * $limit;
-		return $this->resultQuery("SELECT * FROM `".$this->table_prefix."logger` ORDER BY log_id DESC LIMIT $log_id,$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;
+		");
 	}
 	
 	public function del_logger_log($log_id){

+ 190 - 31
includes/database_mysqli.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2015 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -253,29 +253,33 @@ class OGPDatabaseMySQL extends OGPDatabase
 		return $results;
 	}
 	
-	public function getUserList_limit($page_user,$limit_user) {
+	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 ORDER BY users_login ASC LIMIT $user_get_id,$limit_user",
+			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);
-
 		++$this->queries_;
 		$result = mysqli_query($this->link,$query);
-
 		$results = array();
-
 		while ( $row = mysqli_fetch_assoc( $result ) )
 			array_push($results,$row);
-
 		return $results;
 	}
 	
-	public function get_user_count(){
-		return $this->resultQuery("SELECT COUNT(user_id) AS total FROM `".$this->table_prefix."users`;");
+	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 getGroupList() {
@@ -1395,27 +1399,98 @@ class OGPDatabaseMySQL extends OGPDatabase
 		}
 	}
 	
-	public function getHomesFor_count($id_type,$assign_id,$home_cfg_id){
+	public function getHomesFor_count($id_type,$assign_id,$home_cfg_id,$search_field){
 		if ( $id_type == "admin" )
 		{
-			return $this->resultQuery('SELECT COUNT(home_id) AS total FROM `'.$this->table_prefix.'server_homes`' . ($home_cfg_id ?' WHERE home_cfg_id = '.$home_cfg_id : ''));
+			return $this->resultQuery('SELECT COUNT('.($search_field ?'distinct':'').' home_id) AS total FROM `'.$this->table_prefix.'server_homes`
+			'.($search_field ? '
+			NATURAL JOIN `'.$this->table_prefix.'user_homes`
+			NATURAL JOIN `'.$this->table_prefix.'remote_servers` 
+ 			NATURAL JOIN `'.$this->table_prefix.'home_ip_ports`
+			' : '').'
+			'
+ 			.($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')
+ 								OR user_id = '$search_field'
+ 								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$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')
+ 								OR user_id = '$search_field'
+								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+								OR agent_ip = '$search_field' OR port = '$search_field'
+								" : '').'
+								'));
 		}
 		else if ( $id_type == "user_and_group" )
 		{
-			return $this->resultQuery('SELECT COUNT(home_id) AS total FROM `'.$this->table_prefix.'user_homes` 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.' )': ''));
+			return $this->resultQuery('SELECT COUNT('.($search_field ?'distinct':'').' home_id) AS total FROM `'.$this->table_prefix.'user_homes`
+			'.($search_field ? '
+			NATURAL JOIN `'.$this->table_prefix.'server_homes`
+			NATURAL JOIN `'.$this->table_prefix.'remote_servers` 
+ 			NATURAL JOIN `'.$this->table_prefix.'home_ip_ports`
+			' : '').'
+			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')
+ 								OR user_id = '$search_field'
+ 								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$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')
+ 								OR user_id = '$search_field'
+								OR user_id IN (SELECT `user_id` FROM `".$this->table_prefix."users` WHERE users_login = '$search_field')
+								OR agent_ip = '$search_field' OR port = '$search_field'
+								" : '').'				
+								' 
+								));
+		
+		
 		}
 		else if ( $id_type == "subuser" )
 		{
-			return $this->resultQuery('SELECT COUNT(home_id) AS total FROM `'.$this->table_prefix.'user_group_homes` 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.' )': ''));
+			return $this->resultQuery('SELECT COUNT('.($search_field ?'distinct':'').' home_id) AS total FROM `'.$this->table_prefix.'user_group_homes`
+			'.($search_field ? '
+			NATURAL JOIN `'.$this->table_prefix.'user_homes`
+			NATURAL JOIN `'.$this->table_prefix.'server_homes`
+			NATURAL JOIN `'.$this->table_prefix.'remote_servers` 
+ 			NATURAL JOIN `'.$this->table_prefix.'home_ip_ports`
+			' : '').'			
+			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')
+ 								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')
+ 								OR agent_ip = '$search_field' OR port = '$search_field'
+ 								" : '').'
+			'));
 		}		
 		
 	}
 	
-	public function getHomesFor_limit($id_type,$assign_id,$home_page,$home_limit,$home_cfg_id){
+	public function getHomesFor_limit($id_type,$assign_id,$home_page,$home_limit,$home_cfg_id,$search_field){
 	$gethome_page_forlimit = ($home_page - 1) * $home_limit;	
 		if ( $id_type == "admin" )
 		{
-			$template = 'SELECT	%1$sserver_homes.*, 
+			$template = 'SELECT '.($search_field ?'distinct':'').' 
+								%1$sserver_homes.*, 
 								%1$sremote_servers.*, 
 								%1$sconfig_homes.*, 
 								%1$shome_ip_ports.port,
@@ -1436,6 +1511,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`':'').'
 						NATURAL JOIN %1$sremote_servers
 						NATURAL JOIN %1$sconfig_homes
 						LEFT JOIN %1$sgame_mods 
@@ -1450,8 +1526,30 @@ class OGPDatabaseMySQL extends OGPDatabase
 							FROM `%1$shome_ip_ports`
 							WHERE `force_mod_id` = %1$sgame_mods.mod_id OR %1$shome_ip_ports.force_mod_id = 0
 						)
-						'.($home_cfg_id ? 'AND %1$sserver_homes.home_cfg_id = '.$home_cfg_id : '').'
-						OR %1$shome_ip_ports.force_mod_id IS NULL LIMIT '.$gethome_page_forlimit.','.$home_limit.';';
+						'.($home_cfg_id ? '
+						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 = \''.$search_field.'\'
+						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
+						OR home_name = \''.$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 = \''.$search_field.'\'
+						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
+						OR home_name = \''.$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.';';
 						
 			$template2 = 'SELECT user_expiration_date, home_id FROM %1$suser_homes WHERE user_id = %2$d;';
 			$template3 = 'SELECT user_group_expiration_date, home_id FROM %1$suser_group_homes WHERE group_id IN(
@@ -1478,7 +1576,8 @@ class OGPDatabaseMySQL extends OGPDatabase
 		}
 		else if ( $id_type == "user_and_group" )
 		{
-			$template = 'SELECT	%1$suser_homes.*, 
+			$template = 'SELECT	'.($search_field ?'distinct':'').'
+								%1$suser_homes.*, 
 								%1$sserver_homes.*, 
 								%1$sremote_servers.*, 
 								%1$sconfig_homes.*, 
@@ -1516,11 +1615,32 @@ class OGPDatabaseMySQL extends OGPDatabase
 								FROM `%1$shome_ip_ports`
 								WHERE `force_mod_id` = %1$sgame_mods.mod_id OR %1$shome_ip_ports.force_mod_id = 0
 							)
-							'.($home_cfg_id ? 'AND %1$sserver_homes.home_cfg_id = '.$home_cfg_id : '').'
+						'.($home_cfg_id ? '
+						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 = \''.$search_field.'\'
+						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
+						OR home_name = \''.$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 = \''.$search_field.'\'
+						OR user_id IN (SELECT `user_id` FROM `%1$susers` WHERE users_login = \''.$search_field.'\')
+						OR home_name = \''.$search_field.'\'
+						OR agent_ip = \''.$search_field.'\' OR port = \''.$search_field.'\'
+						' : '').'
+						').'
 							OR %1$shome_ip_ports.force_mod_id IS NULL
 						)
 						UNION
-						SELECT	%1$suser_group_homes.*,
+						SELECT	'.($search_field ?'distinct':'').'
+								%1$suser_group_homes.*,
 								%1$sserver_homes.*, 
 								%1$sremote_servers.*, 
 								%1$sconfig_homes.*, 
@@ -1541,7 +1661,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
@@ -1563,8 +1683,24 @@ class OGPDatabaseMySQL extends OGPDatabase
 								FROM `%1$shome_ip_ports`
 								WHERE `force_mod_id` = %1$sgame_mods.mod_id OR %1$shome_ip_ports.force_mod_id = 0
 							)
-							'.($home_cfg_id ? 'AND %1$sserver_homes.home_cfg_id = '.$home_cfg_id : '').'
-							OR %1$shome_ip_ports.force_mod_id IS NULL
+						'.($home_cfg_id ? '
+						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 home_name = \''.$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 agent_ip = \''.$search_field.'\' OR port = \''.$search_field.'\'
+						' : '').'
+						').'
+							OR %1$shome_ip_ports.force_mod_id IS NULL 
 						) 
 						LIMIT '.$gethome_page_forlimit.','.$home_limit.';';
 		}
@@ -2535,16 +2671,28 @@ class OGPDatabaseMySQL extends OGPDatabase
 		return $this->listQuery($query);
 	}
 	
-	public function getGameHomes_limit($page_gameHomes,$limit_gameHomes){
+	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` ORDER BY home_id ASC LIMIT '.$game_home_id.','.$limit_gameHomes.'; ',
+			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(){
-      return $this->resultQuery("SELECT COUNT(home_id) AS total FROM `".$this->table_prefix."server_homes`;");
+   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 changeLastParam($home_id,$json) {
@@ -2795,13 +2943,24 @@ 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(){
-		return $this->resultQuery("SELECT COUNT(log_id) AS total FROM `".$this->table_prefix."logger`;");
+	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 read_logger($page,$limit){
+	public function read_logger($page,$limit,$search_field){
 		$log_id = ($page - 1) * $limit;
-		return $this->resultQuery("SELECT * FROM `".$this->table_prefix."logger` ORDER BY log_id DESC LIMIT $log_id,$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;
+		");
 	}
 	
 	public function del_logger_log($log_id){

+ 2 - 1
includes/form_table_class.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -21,6 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
+
  ?>
 <style>
 .tip{

+ 4 - 2
includes/functions.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2014 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -226,6 +226,8 @@ function create_home_selector_address($module, $subpage, $server_homes, $extra_i
 					$home_id, SORT_DESC, $server_homes);
 	foreach ( $server_homes as $server_home )
 	{
+		$display_ip = checkDisplayPublicIP($server_home['display_public_ip'],$server_home['ip']);
+
 		if(isset($_GET['home_id-mod_id-ip-port']) and 
 		   $get_home_id == $server_home['home_id'] and 
 		   $get_mod_id == $server_home['mod_id'] and 
@@ -237,7 +239,7 @@ function create_home_selector_address($module, $subpage, $server_homes, $extra_i
 		echo "<option value='". $server_home['home_id'] .
 			 "-" . $server_home['mod_id'] . "-" . $server_home['ip'] . 
 			 "-" . $server_home['port'] . "' $selected >" . 
-			 htmlentities($server_home['home_name']) . " - " . $server_home['ip'] .
+			 htmlentities($server_home['home_name']) . " - " . $display_ip .
 			 ":" . $server_home['port'] . "</option>\n";
 	}
 	echo "</select>\n";

+ 2 - 2
includes/helpers.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
- 
+
 // Ignore any request with unwanted values at 'm' or 'p'
 if( isset($_REQUEST['m']) and !preg_match("/^([a-z]|[0-9]|_|-)+$/i", $_REQUEST['m']) )
 	unset($_POST['m'], $_GET['m'], $_REQUEST['m']);

+ 1 - 1
includes/html_functions.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
includes/lang.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
includes/lib_remote.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
includes/navig.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 2 - 1
includes/refreshed.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -21,6 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
+
 #	Open Game Panel refreshed Class
 #	Wrote by: Nirock
 #	Sample Setup:

+ 1 - 1
includes/view.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2014 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
index.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 2 - 1
install.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -21,6 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
+
 error_reporting(E_ALL);
 $_GET['action'] = true;
 define("MODULES", "modules/");

+ 9 - 9
lang/Arabic/global.php

@@ -22,7 +22,7 @@
  *
  */
 
-define('lang_charset', "ISO");
+define('lang_charset', "UTF-8");
 define('already_logged_in_redirecting_to_dashboard', "تم تسجيل الدخول بالفعل ، إعادة توجيه إلى لوحة التحكم.");
 define('logging_in', "تسجيل الدخول");
 define('redirecting_in', "توجيه الى");
@@ -47,7 +47,7 @@ define('delete', "حذف");
 define('edit', "تعديل");
 define('actions', "Actions");
 define('invalid_subpage', "صفحة فرعية غير صالحة.");
-define('invalid_home_id', "Invalid home ID entered.");
+define('invalid_home_id', "الأيدي اللذي تم ادخاله غير صالح.");
 define('note', "ملاحظة");
 define('hint', "ملاحظة");
 define('yes', "نعم");
@@ -70,17 +70,17 @@ define('invalid_redirect', "إعادة توجيه");
 define('login_title', "تسجيل الدخول للوحة التحكم");
 define('module_not_installed', "الموديول لم يتم تثبيته.");
 define('no_access_to_home', "ليس لديك حق الوصول إلى هذا المكان.");
-define('not_available', "N/A");
+define('not_available', "غير موجود");
 define('offline', "أوفلاين");
 define('online', "أونلاين");
 define('invalid_url', "عنوان غير صالح");
-define('xml_file_not_valid', "XML file '%s' could not be validated with schema '%s'.");
-define('unable_to_load_xml', "Unable to load XML file '%s'. Permission issue?");
+define('xml_file_not_valid', "ملف الXML '%s' تعذر التحقق من صحة المخطط '%s'");
+define('unable_to_load_xml', "تعذر تحميل ملف XML '%s'. إذن المشكلة؟");
 define('gamemanager', "مدير اللعبة");
 define('game_monitor', "مراقب اللعبة");
 define('dashboard', "لوحة التحكم");
 define('user_addons', "الإضافات");
-define('ftp', "FTP");
+define('ftp', "الأف تي بي");
 define('shop', "متجر");
 define('TS3Admin', "أدمن TS3");
 define('administration', "الادارة");
@@ -102,12 +102,12 @@ define('update', "تحديث اللوحة");
 define('extras', "إضافات");
 define('show', "أظهر");
 define('show_all', "أظهر كل السيرفرات");
-define('cur_theme', "%s Theme");
+define('cur_theme', "%s قالب");
 define('copyright', "حقوق الملكية");
 define('all_rights_reserved', "كل الحقوق محفوظة");
 define('version', "نسخة");
 define('show_version', "أظهر النسخة");
-define('queries_executed', "queries executed");
+define('queries_executed', "الاستعلامات التي تم تنفيذها");
 define('lang', "لغة");
 define('get_size', "الحصول على الحجم");
 define('total_size', "الحجم الإجمالي");
@@ -124,6 +124,6 @@ define('set_expiration_date', "ضع تاريخ الإنتهاء");
 define('admin_dsi', "إعدادات DSi");
 define('user_dsi', "DSi");
 define('list_dsi', "قائمة DSi");
-define('no_remote_servers', "There is no known remote servers! Add a server to use this function.");
+define('no_remote_servers', "لا توجد خوادم بعيدة معروفة! إضافة خادم لاستخدام هذه الوظيفة.");
 
 ?>

+ 4 - 4
lang/Arabic/install.php

@@ -31,7 +31,7 @@ define('execute_permission_required', "صلاحية التنفيذ مطلوبة"
 define('create_an_empty_file', "أنشأ ملف فارغ");
 define('found', "وجد");
 define('not_found', "لم يتم إيجاد");
-define('pear_xxtea_info', "Pear Crypt_XXTEA is required for OGP usage. In most of the Linux systems this module can be installed with pear with the following command 'pear install Crypt_XXTEA-beta'.");
+define('pear_xxtea_info', "Pear Crypt_XXTEA مطلوب للاستخدام OGP. في معظم أنظمة لينكس يمكن تثبيت هذه الوحدة مع pear مع الأمر التالي \"pear install Crypt_XXTEA-beta\".");
 define('refresh', "تحديث");
 define('checking_required_modules', "التحقق من الموديولات المطلوبة");
 define('database_type', "نوع قاعدة البيانات");
@@ -40,7 +40,7 @@ define('database_hostname', "اسم مضيف قاعدة البيانات");
 define('database_username', "إسم مستخدم قاعدة البيانات");
 define('database_password', "كلمة مرور قاعدة البيانات");
 define('database_name', "اسم قاعدة البيانات");
-define('database_prefix', "Database Prefix");
+define('database_prefix', "بادئة قاعدة البيانات");
 define('next', "التالى");
 define('encryption_key', "مفتاح التشفير (Agent)");
 define('agent_port', "بورت (Agent)");
@@ -60,9 +60,9 @@ define('password_too_short', "كلمة المرور قصيرة جدا ، يجب
 define('password_contains_invalid_characters', "تحتوي كلمة المرور على أحرف غير صالحة.");
 define('invalid_email_address', "لقد أدخلت عنوان بريد إلكتروني غير صالح.");
 define('setup_complete', "اكتمل التثبيت بنجاح. لوحة التحكم OGP جاهزة الآن للاستخدام.");
-define('remove_install_and_secure_config', "You should delete install.php from your server and chmod your includes/config.inc.php back to 644 for security purposes.");
+define('remove_install_and_secure_config', "يجب حذف install.php من الخادم الخاص بك و عمل شمود لمجلد includes/config.inc.php وذالك بالعودة إلى 644 لأغراض أمنية.");
 define('go_to_panel', "انقر هنا للدخول إلى لوحة OGP الخاصة بك.");
 define('unable_to_resolve', "إذا لم تتمكن من حل هذه المشكلة، يرجى زيارة موقع OGP");
-define('slogan', "The Open-Source one!");
+define('slogan', "المصدر المفتوح واحد!");
 define('default_welcome_title_message', "مرحبا! <b style='font-size:12px; font-weight:normal;'>يمكنك تغير هذا العنوان من '<a href='?m=settings&p=themes'>إعدادات المظهر</a>' تحت '<a href='?m=administration&p=main'>الإدارة</a>' tab.</b>");
 ?>

+ 4 - 4
lang/Arabic/modules/addonsmanager.php

@@ -27,7 +27,7 @@ define('install_mappack', "تثبيت الخرائط");
 define('install_config', "تثبيت الإعدادات");
 define('game_name', "إسم اللعبة");
 define('directory', "المسار");
-define('remote_server', "Remote server");
+define('remote_server', "سيرفر التحكم");
 define('select_addon', "إختر إضافة");
 define('install', "تثبيت");
 define('failed_to_start_file_download', "فشل بدأ تحميل الملف.");
@@ -36,7 +36,7 @@ define('addon_installed_successfully', "تم تثبيت الإضافة بنجا
 define('path', "المسار");
 define('wait_while_decompressing', "انتظر حتى يتم فك الملف %s .");
 define('addon_name', "إسم الإضافة");
-define('url', "URL");
+define('url', "الرابط");
 define('select_game_type', "إختر نوع اللعبة");
 define('plugin', "إضافة");
 define('mappack', "حزمة الخريطه");
@@ -57,10 +57,10 @@ define('fill_the_addon_name', "من فضلك ، أضف إسم حزمة الاض
 define('select_an_addon_type', "من فضلك ، اختر نوع الإضافة");
 define('select_a_game_type', "من فضلك ، إختر نوع اللعبة");
 define('edit_addon', "تعديل الإضافة");
-define('post-script', "Post-install script(bash)");
+define('post-script', "النص البرمجي بعد التثبيت (باش)");
 define('replacements', "الاستبدالات:");
 define('addon_name_info', "أدخل اسم لهذه الإضافة ، هذا الإسم هو مايراه المستخدم");
-define('url_info', "أدخل عنوان ويب يحتوى على ملف ليتم تحميله ، إذا كان مضغوطا بامتداد zip أو tar.gz سيتم فك الضغط فى المسار الأساسى للسيرفر أو فى المسار الذى بالأسفل.");
+define('url_info', "أدخل عنوان الويب الذي يحتوى على ملف ليتم تحميله ، إذا كان مضغوطا بامتداد zip أو tar.gz سيتم فك الضغط فى المسار الأساسى للسيرفر أو فى المسار الذى بالأسفل.");
 define('path_info', "المسار يجب أن يكون قريبا لمجلد السيرفر ولا يحتى على شرطات مائلة فى البداية أو النهاية ، مثال : cstrike/cfg . اذا ترك فارغاً سيتم استخدام المسار الأساسى للسيرفر.");
 define('post-script_info', "أدخل كود الباش ، ستم تنفيذه كسكريبت ، يمكنك استخدام استبدال النص لتخصيص التثبيت ، سيتم استبدالها بالبيانات من السيرفر الذي تقوم بتثبيت الإضافة به. السكريبت سيبدأ من المجلد الأساسى للسيرفر أو المسار المحدد .");
 ?>

+ 1 - 1
lang/Arabic/modules/administration.php

@@ -35,7 +35,7 @@ define('change_buttons_order', "تغير ترتيب الأزرار");
 define('when', "تاريخ/وقت");
 define('who', "إسم مستخدم");
 define('where', "عنوان ip");
-define('what', "Action");
+define('what', "عمل");
 define('search', "بحث");
 define('empty_logger', "سجل فارغ");
 define('ban_list', "قائمة الحظر");

+ 2 - 2
lang/Arabic/modules/dashboard.php

@@ -30,7 +30,7 @@ define('welcome_text', "مرحبا بك إلى لوحة تحكم (OGP).
 OGP هو مشروع مفتوح المصدر ـ والذى يتيح لك تثبيت وبدأ ومراقبة مختلف سيرفرات الألعاب.");
 define('any_server_is_online', "أى سيرفر أونلاين");
 define('current_map', "الخريطة الحالية");
-define('server_ip_port', "IP:Port");
+define('server_ip_port', "الأيبي:بورت");
 define('statistics', "الإحصائيات");
 define('servers', "السيرفرات");
 define('players', "اللاعبين");
@@ -40,5 +40,5 @@ define('online_servers', "السيرفرات الأونلاين");
 define('add_games_in', "إذا كنت ترغب في إضافة ألعاب يمكنك أن تفعل ذلك في %s");
 define('currently_online', "متاح حاليا");
 define('game_servers', "سيرفرات الألعاب");
-define('select_remote_server', "Select remote server");
+define('select_remote_server', "حدد سيرفر التحكم");
 ?>

+ 2 - 2
lang/Arabic/modules/gamemanager.php

@@ -23,9 +23,9 @@
  */
 
 define('game_manager', "مدير اللعبة");
-define('no_games_to_monitor', "You do not have any games configured to you that can be monitored.");
+define('no_games_to_monitor', "لم يكن لديك أي ألعاب تكوين لك التي يمكن رصدها.");
 define('status', "الحالة");
-define('fail_no_mods', "No mods enabled for this game! You need to ask your OGP admin to add mod(s) for the game assigned for you.");
+define('fail_no_mods', "لا يوجد وحدات لهذه اللعبة! يجب أن تطلب من مشرف أوغب إضافة وحدة (وحدات) مود للعبة المخصصة لك.");
 define('no_game_homes_assigned', "No game servers assigned for you. You need to ask your OGP admin to assign games for you.");
 define('select_game_home_to_configure', "Select a game server that you want to configure");
 define('file_manager', "مدير الملفات");

+ 19 - 19
lang/Arabic/modules/lostpwd.php

@@ -22,23 +22,23 @@
  *
  */
 
-define('recover', "Recover a forgotten password");
-define('back', "Back");
-define('incomplete', "Please go back and complete all the fields in the form.");
-define('subject', "Password request");
-define('password_message', "Hello,<br><br>Your password has been successfully reseted.<br><br>New Password: %s<br><br>Remember to change your password often.<br><br>Please do not reply to this email!<br><br>______________________________<br>OGP Mailer");
-define('send', "Your password has been sent! Please check your email!");
-define('here', "Here");
-define('to_login', "to login");
-define('errormail', "Your email address is not correct.");
-define('submit', "Submit");
-define('click', "Click");
-define('mail_settings_missing', "Panel mail settings are not complete so it can not send your password. Contact your OGP admin.");
-define('mail_failed', "Failed to send email.");
-define('email', "Email");
-define('enter_email', "Please enter your email address");
-define('webmaster', "Webmaster");
-define('confirm_send', "For security reasons we have sent you a confirmation link before you restart your password.<br><b style='color:red;'>Please check your inbox.</b>");
-define('confirm_change_subject', "Password reset, confirmation email");
-define('confirm_change_password_message', "Hello,<br><br>Please click on the link below to reset your password:<br><br>%s<br><br>Note: If you do not have requested the reset of your password, you can ignore this email.<br><br>Please do not reply to this email!<br><br>______________________________<br>OGP Mailer");
+define('recover', "استرداد كلمة مرور منسية");
+define('back', "رجوع");
+define('incomplete', "يرجى العودة وإكمال كافة الحقول في النموذج.");
+define('subject', "طلب كلمة مرور");
+define('password_message', "مرحبا <br> <br> تمت إعادة تعيين كلمة المرور بنجاح.<br> <br>كلمة السر الجديدة: %s <br> <br> تذكر تغيير كلمة المرور الخاصة بك في كثير من الأحيان.<br> <br>رجاءا لا ترد على هذا الأيميل!<br> <br>______________________________<br> OGP Mailer");
+define('send', "تم إرسال كلمة المرور الخاصة بك! الرجاء التحقق من البريد الإلكتروني الخاص بك!");
+define('here', "هنا");
+define('to_login', "لتسجيل الدخول");
+define('errormail', "عنوان البريد الإلكتروني الخاص بك غير صحيح.");
+define('submit', "إرسال");
+define('click', "انقر");
+define('mail_settings_missing', "إعدادات البريد الخاصة باللوحة غير كاملة بحيث لا يمكن إرسال كلمة المرور. اتصل بمشرف OGP.");
+define('mail_failed', "أخفق إرسال البريد الإلكتروني.");
+define('email', "البريد الإلكتروني");
+define('enter_email', "الرجاء إدخال عنوان البريد الإلكتروني الخاص بك");
+define('webmaster', "المسؤول عن الموقع");
+define('confirm_send', "لأسباب أمنية، أرسلنا لك رابط تأكيد قبل إعادة تشغيل كلمة المرور.<br><b style='color:red;'>يرجى التحقق من البريد الوارد الخاص بك.</b>");
+define('confirm_change_subject', "إعادة تعيين كلمة المرور، تأكيد البريد الإلكتروني");
+define('confirm_change_password_message', "مرحبا،<br><br>يرجى النقر على الرابط أدناه لإعادة تعيين كلمة المرور:<br><br>%s<br><br>ملاحظة: إذا لم تكن قد طلبت إعادة تعيين كلمة المرور، فيمكنك تجاهل هذه الرسالة الإلكترونية.<br><br>رجاءا لا ترد على هذا الأيميل!<br><br>______________________________<br>OGP Mailer");
 ?>

+ 30 - 30
lang/Arabic/modules/register.php

@@ -22,34 +22,34 @@
  *
  */
 
-define('login_name', "Username");
-define('users_fname', "First name");
-define('users_lname', "Last name");
-define('users_passwd', "Password");
-define('users_cpasswd', "Verify password");
-define('passwd_len', "Password must be longer than 6 characters");
-define('err_password', "Password cannot be empty");
-define('err_confirm_password', "Verify password field cannot be empty");
-define('err_password_mismatch', "Passwords do not match");
-define('phone_number', "Phone number");
-define('users_email', "Email");
-define('register_a_new_user', "Register a new user");
-define('password_mismatch', "Passwords mismatch");
-define('confirm_password', "Confirm password");
-define('successfull', "Successful");
-define('click_here', "Click here");
-define('to_login', "to login.");
-define('registered_on', "Registered on: %s.");
-define('register_message', "Hello,<br><br>Your Open Game Panel account has been created and you may now login using the following account information:<br><br>Username: %s<br>Password: %s<br><br>Remember to change your password often and the first time you login.<br><br>Please do not reply to this email!<br><br>______________________________<br>OGP Mailer");
-define('err_captcha', "Captcha does not match.");
-define('err_login_name', "User name is empty or in use.");
-define('err_first_name', "Enter your name.");
-define('err_last_name', "Last Name not entered.");
-define('err_phone_number', "Phone number is empty.");
-define('err_email_address', "Empty or incorrect email address.");
-define('err_email_address_already_in_use_by', "Email address already in use by <b>%s</b>.");
-define('user_registration', "User Registration");
-define('your_account_details_has_been_sent_by_email_to', "Your account details has been sent by email to <b>%s</b>.");
-define('account_created', "Your account has been created.");
-define('subject', "%s :: Account Information");
+define('login_name', "اسم المستخدم");
+define('users_fname', "الاسم الأول");
+define('users_lname', "الاسم الأخير");
+define('users_passwd', "كلمة المرور");
+define('users_cpasswd', "التحقق من كلمة المرور");
+define('passwd_len', "يجب أن تكون كلمة المرور أطول من 6 أحرف");
+define('err_password', "لا يمكن أن تكون كلمة المرور فارغة");
+define('err_confirm_password', "التحقق من أن حقل كلمة المرور لا يمكن أن يكون فارغا");
+define('err_password_mismatch', "كلمات المرور غير متطابقة");
+define('phone_number', "رقم الهاتف");
+define('users_email', "البريد الإلكتروني");
+define('register_a_new_user', "تسجيل مستخدم جديد");
+define('password_mismatch', "عدم تطابق كلمات المرور");
+define('confirm_password', "تأكيد كلمة المرور");
+define('successfull', "نجح");
+define('click_here', "انقر هنا");
+define('to_login', "لتسجيل الدخول.");
+define('registered_on', "مسجل في: %s.");
+define('register_message', "مرحبا، <br><br>تم إنشاء حساب Open Game Panel، ويمكنك الآن تسجيل الدخول باستخدام معلومات الحساب التالية:<br><br>اسم المستخدم: %s<br>كلمه السر: %s<br><br>تذكر تغيير كلمة المرور الخاصة بك في كثير من الأحيان، وأول مرة تقوم بتسجيل الدخول.<br><br>رجاءا لا ترد على هذا الأيميل!<br><br>______________________________<br>OGP Mailer");
+define('err_captcha', "لا يتطابق CAPTCHA.");
+define('err_login_name', "اسم المستخدم فارغ أو قيد الاستخدام.");
+define('err_first_name', "أدخل أسمك.");
+define('err_last_name', "لم يتم إدخال الاسم الأخير.");
+define('err_phone_number', "رقم الهاتف فارغ.");
+define('err_email_address', "عنوان بريد إلكتروني فارغ أو غير صحيح.");
+define('err_email_address_already_in_use_by', "عنوان البريد الإلكتروني قيد الاستخدام من قبل <b>%s</b>.");
+define('user_registration', "تسجيل المستخدم");
+define('your_account_details_has_been_sent_by_email_to', "تم إرسال تفاصيل حسابك عبر البريد الإلكتروني إلى <b>%s</b>.");
+define('account_created', "لقد تم إنشاء حسابك.");
+define('subject', "%s :: معلومات الحساب");
 ?>

+ 33 - 31
lang/Arabic/modules/server.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -22,45 +22,45 @@
  *
  */
 
-define('add_new_remote_host', "Add New Remote Host");
-define('configured_remote_hosts', "Configured Remote Host");
-define('remote_host', "Remote Host");
-define('remote_host_info', "The remote host must be a pingable hostname!");
-define('remote_host_port', "Remote Host Port");
-define('remote_host_port_info', "The port that is listened by the OGP agent on remote host. Default: 12679.");
-define('remote_host_name', "Remote Host Name");
-define('ogp_user', "OGP Agent Username");
-define('remote_host_name_info', "Remote host name is used to help users to identify their servers.");
-define('add_remote_host', "Add Remote Host");
-define('remote_encryption_key', "Remote Encryption Key");
-define('remote_encryption_key_info', "Remote encryption key is used to encrypt the data between the Panel and Agent. This key must be same in both sides.");
-define('server_name', "Server Name");
-define('agent_ip_port', "Agent IP:Port");
-define('agent_status', "Agent Status");
-define('ips', "IPs");
-define('add_more_ips', "If you want to enter more IPs press 'Set IPs' when all fields are full and an empty field will appear.");
-define('encryption_key_mismatch', "Encryption key does not match with the Agent. Please recheck your Agent configuration.");
+define('add_new_remote_host', "إضافة مضيف بعيد جديد");
+define('configured_remote_hosts', "تكوين المضيف البعيد");
+define('remote_host', "المضيف البعيد");
+define('remote_host_info', "يجب أن يكون المضيف البعيد اسم مضيف قابل للتوسيع!");
+define('remote_host_port', "بورت المضيف البعيد");
+define('remote_host_port_info', "البورت الذي يستمع إليه وكيل OGP على المضيف البعيد. الأصلي:12679");
+define('remote_host_name', "إسم المضيف البعيد");
+define('ogp_user', "اسم مستخدم وكيل OGP");
+define('remote_host_name_info', "يستخدم اسم المضيف البعيد لمساعدة المستخدمين على تحديد خوادمهم.");
+define('add_remote_host', "إضافة المضيف البعيد");
+define('remote_encryption_key', "مفتاح التشفير عن بعد");
+define('remote_encryption_key_info', "يستخدم مفتاح التشفير عن بعد لتشفير البيانات بين الفريق والوكيل. يجب أن يكون هذا المفتاح نفسه في كلا الجانبين.");
+define('server_name', "إسم السيرفر");
+define('agent_ip_port', "وكيل أيبي:بورت");
+define('agent_status', "حالة الوكيل");
+define('ips', "الأيبيهات");
+define('add_more_ips', "إذا كنت ترغب في إدخال المزيد من الأيبيهات اضغط على \"تعيين الأيبي\" عندما تكون جميع الحقول ممتلئة وسوف يظهر حقل فارغ.");
+define('encryption_key_mismatch', "لا يتطابق مفتاح التشفير مع الوكيل. يرجى إعادة التحقق من تهيئة الوكيل.");
 define('no_ip_for_remote_host', "You need to add at least one (1) IP address for each remote host.");
 define('note_remote_host', "A remote host is a server where the OGP agent is running on. Each host can have multiple number of IP addresses on which users can bind servers to.");
 define('ip_administration', "Server &amp; IP Administration :: Open Game Panel");
 define('unknown_error', "Unknown error - status_chk returned");
 define('remote_host_user_name', "UNIX user");
 define('remote_host_user_name_info', "Username where the Agent is running. Example: Jonhy");
-define('remote_host_ftp_ip', "FTP IP");
-define('remote_host_ftp_ip_info', "The FTP server <b>IP</b> for the current agent.");
-define('remote_host_ftp_port', "FTP port");
-define('remote_host_ftp_port_info', "The FTP server <b>port</b> for the current agent.");
-define('view_log', "View log");
-define('status', "Status");
-define('stop_firewall', "Stop Firewall");
-define('start_firewall', "Start Firewall");
+define('remote_host_ftp_ip', "أيبي الأف تي بي");
+define('remote_host_ftp_ip_info', "سيرفر الأف تي بي <b>الأيبي</b> للوكيل الحالي.");
+define('remote_host_ftp_port', "بورت الأف تي بي");
+define('remote_host_ftp_port_info', "سيرفر الأف تي بي <b>بورت</b> للوكيل الحالي.");
+define('view_log', "عرض السجل");
+define('status', "الحالة");
+define('stop_firewall', "إيقاف جدار الحماية");
+define('start_firewall', "تشغيل جدار الحماية");
 define('seconds', "Seconds");
-define('reboot', "Remote Server Reboot");
-define('restart', "Restart Agent");
+define('reboot', "إعادة تشغيل سيرفر التحكم");
+define('restart', "إعادة تشغبل الوكيل");
 define('confirm_reboot', "Are you sure you want to remotely reboot the entire physical server named '%s'?");
 define('confirm_restart', "Are you sure you want to restart the agent named '%s'?");
-define('restarting', "Restarting agent... Please wait.");
-define('restarted', "Agent successfully restarted.");
+define('restarting', "إعادة تشغيل الوكيل... الرجاء الإنتظار");
+define('restarted', "تم إعادة تشغيل الوكيل بنجاح");
 define('reboot_success', "Server named '%s' was successfully rebooted. You will not be able to access the server until it has successfully booted.");
 define('invalid_remote_host_id', "Invalid remote host id '%s' given.");
 define('remote_host_removed', "Remote host called '%s' removed successfully.");
@@ -134,4 +134,6 @@ define('firewall_status', "Firewall status");
 define('save_firewall_settings', "Save firewall settings");
 define('reset_firewall', "Reset Firewall");
 define('firewall_settings', "Firewall Settings");
+define('default_public_ip', "Default Public IP");
+define('display_public_ip', "Display Public IP");
 ?>

+ 15 - 15
lang/Arabic/modules/status.php

@@ -22,19 +22,19 @@
  *
  */
 
-define('system_uptime', "System Uptime");
-define('system_up_time', "Up Time");
-define('system_up_since', "Since");
-define('cpu_usage', "CPU Usage");
-define('cpu_load', "Load");
-define('ram_usage', "RAM Usage");
-define('ram_used', "Memory Used");
-define('ram_of', "of");
-define('storage_space', "Storage Space");
-define('storage_total', "Disk Space");
-define('storage_used', "Used");
-define('storage_free', "Free Space");
-define('process_monitor', "Process Monitor");
-define('status_extension_required', "Extension Required");
-define('gd_info', "PHP Extension <a href=\"http://php.net/manual/en/image.installation.php\">GD</a> is required to generate these bar images!");
+define('system_uptime', "مدة تشغيل النظام");
+define('system_up_time', "مدة التشغيل");
+define('system_up_since', "منذ");
+define('cpu_usage', "استخدام المعالج");
+define('cpu_load', "حمل");
+define('ram_usage', "استخدام ذاكرة الوصول العشوائي");
+define('ram_used', "الذاكرة المستخدمة");
+define('ram_of', "من");
+define('storage_space', "مساحة التخزين");
+define('storage_total', "مساحة القرص");
+define('storage_used', "مستخدم");
+define('storage_free', "مساحة فارغة");
+define('process_monitor', "مراقبة العمليات");
+define('status_extension_required', "تمديد مطلوب");
+define('gd_info', "تمديدGD<a href=\"http://php.net/manual/en/image.installation.php\"> PHP</a> هو المطلوب لتوليد شريط الصور!");
 ?>

+ 39 - 39
lang/Arabic/modules/subusers.php

@@ -22,43 +22,43 @@
  *
  */
 
-define('login_name', "Username");
-define('first_name', "First name");
-define('last_name', "Last name");
-define('phone_number', "Phone number");
-define('email_address', "Email");
-define('register_a_new_user', "Register a new user");
-define('password_mismatch', "Passwords mismatch.");
-define('confirm_password', "Confirm password");
-define('subuser_password', "Sub-User Password");
-define('subuser_man', "Sub-User Management");
-define('successfull', "Successfull");
-define('click_here', "Click here");
-define('to_login', "to login.");
-define('registered_on', "Registered on");
-define('register_message', "Hello,<br><br>Your Open Game Panel account has been created and you may now login using the following account information:<br><br>Username: %s<br>Password: %s<br><br>Remember to change your password often and the first time you login.<br><br>Please do not reply to this email!<br><br>______________________________<br>OGP Mailer");
-define('err_password', "Password cannot be empty");
-define('err_confirm_password', "Verify password field cannot be empty");
-define('err_password_mismatch', "Passwords do not match");
-define('err_captcha', "Captcha does not match.");
-define('err_login_name', "User name is empty or in use.");
-define('err_first_name', "Enter your name.");
-define('err_last_name', "Last Name not entered.");
-define('err_phone_number', "Phone number is empty.");
-define('err_email_address', "Empty or incorrect email address.");
-define('err_users_parent', "Sub-user accounts may not create other users.");
-define('err_parent_user', "The parent user ID must reference a valid pre-existing user.");
-define('err_email_address_already_in_use_by', "Email address already in use by <b>%s</b>.");
-define('user_registration', "User Registration");
-define('your_account_details_has_been_sent_by_email_to', "Your account details has been sent by email to <b>%s</b>.");
-define('subject', "Hello %s, welcome to %s.");
-define('sub_user', "Sub Users");
-define('create_sub_user', "Add Sub User");
-define('listdel_sub_user', "List, Modify Sub User Account Information, or Delete Sub User");
-define('delete_sub_user', "Edit / Delete Sub User");
-define('del_subuser_conf', "Are you sure you want to delete this account:");
-define('no_subusers', "No subusers have been created under your account yet!");
-define('subuser_deleted', "Sub-User %s was successfully deleted from the database!");
-define('subuser_added', "Sub-User %s was successfully created and added to the database!");
-define('your_subusers', "Owned Sub-User Accounts");
+define('login_name', "إسم المستخدم");
+define('first_name', "الاسم الأول");
+define('last_name', "الاسم الأخير");
+define('phone_number', "رقم الهاتف");
+define('email_address', "البريد الإلكتروني");
+define('register_a_new_user', "تسجيل مستخدم جديد");
+define('password_mismatch', "عدم تطابق كلمات المرور");
+define('confirm_password', "تأكيد كلمة المرور");
+define('subuser_password', "كلمة مرور المستخدم الفرعي");
+define('subuser_man', "إدارة المستخدم الفرعي");
+define('successfull', "نجح");
+define('click_here', "انقر هنا");
+define('to_login', "لتسجيل الدخول.");
+define('registered_on', "مسجل في");
+define('register_message', "مرحبا، <br><br>تم إنشاء حساب Open Game Panel، ويمكنك الآن تسجيل الدخول باستخدام معلومات الحساب التالية:<br><br>اسم المستخدم: %s<br>كلمه السر: %s<br><br>تذكر تغيير كلمة المرور الخاصة بك في كثير من الأحيان، وأول مرة تقوم بتسجيل الدخول.<br><br>رجاءا لا ترد على هذا الأيميل!<br><br>______________________________<br>OGP Mailer");
+define('err_password', "لا يمكن أن تكون كلمة المرور فارغة");
+define('err_confirm_password', "التحقق من أن حقل كلمة المرور لا يمكن أن يكون فارغا");
+define('err_password_mismatch', "كلمات المرور غير متطابقة");
+define('err_captcha', "لا يتطابق CAPTCHA.");
+define('err_login_name', "اسم المستخدم فارغ أو قيد الاستخدام.");
+define('err_first_name', "أدخل أسمك.");
+define('err_last_name', "لم يتم إدخال الاسم الأخير.");
+define('err_phone_number', "رقم الهاتف فارغ.");
+define('err_email_address', "عنوان بريد إلكتروني فارغ أو غير صحيح.");
+define('err_users_parent', "لا يجوز لحسابات المستخدمين الفرعية إنشاء مستخدمين آخرين.");
+define('err_parent_user', "يجب أن يشير معرف مستخدم الأصل إلى مستخدم موجود مسبقا صالح.");
+define('err_email_address_already_in_use_by', "عنوان البريد الإلكتروني قيد الاستخدام من قبل <b>%s</b>.");
+define('user_registration', "تسجيل المستخدم");
+define('your_account_details_has_been_sent_by_email_to', "تم إرسال تفاصيل حسابك عبر البريد الإلكتروني إلى <b>%s</b>.");
+define('subject', "مرحبا %s, مرحبا بك في %s.");
+define('sub_user', "المستخدمين الفرعيين");
+define('create_sub_user', "إضافة مستخدم فرعي");
+define('listdel_sub_user', "قائمة، تعديل معلومات حساب المستخدم الفرعي، أو حذف المستخدم الفرعي");
+define('delete_sub_user', "تحرير / حذف المستخدم الفرعي");
+define('del_subuser_conf', "هل تريد بالتأكيد حذف هذا الحساب:");
+define('no_subusers', "لم يتم إنشاء أي مستخدمين فرعيين ضمن حسابك حتى الآن!");
+define('subuser_deleted', "المستخدم الفرعي %s تم حذفه بنجاح من قاعدة البيانات!");
+define('subuser_added', "المستخدم الفرعي %s تم إنشاء بنجاح وإضافة إلى قاعدة البيانات!");
+define('your_subusers', "حسابات المستخدمين الفرعية المملوكة");
 ?>

+ 2 - 2
lang/Arabic/modules/update.php

@@ -39,8 +39,8 @@ define('files_overwritten', "%s ملف استبدل");
 define('files_not_overwritten', "%s لم يتم استبداله لانه بالقائمة السوداء");
 define('can_not_update_non_writable_files', "لايمكن تحديث الملفات/المجلدات التالية لانها غير قابلة لإستبدال");
 define('dwl_failed', "رابط التحميل غير متوفر: \"%s\".<br>جرب مجدداً في وقت لاحق.");
-define('temp_folder_not_writable', "The download can not be placed, because Apache does not have write permision at the system temporary folder(%s).");
-define('base_dir_not_writable', "The Panel can not update, because Apache does not have write permission on \"%s\" folder.");
+define('temp_folder_not_writable', "لا يمكن وضع التنزيل، لأن أباتشي ليس لديه إذن الكتابة في مجلد النظام المؤقت (%s).");
+define('base_dir_not_writable', "لا يمكن تحديث اللوحة، لأن أباتشي ليس لديه إذن الكتابة على مجلد \"%s\".");
 define('new_files', "%s ملف جديد");
 define('updated_files', "تحديث الملفات:<br>%s");
 define('select_mirror', "إختر مرآه");

+ 5 - 5
lang/Arabic/modules/user_games.php

@@ -33,7 +33,7 @@ define('add_game_home', "أضف سيرفر لعبة");
 define('game_path_empty', "مسار اللعبة لايمكن أن يكون فارغا");
 define('game_home_added', "تم إضافة سيرفر اللعبة بنجاح. إعادة توجيه لصفحة الإعدادت.");
 define('failed_to_add_home_to_db', "أخفقت إضافة الصفحة الرئيسية لقاعدة البيانات .خطأ %s.");
-define('caution_agent_offline_can_not_get_os_and_arch_showing_servers_for_all_platforms', "<b>Caution!</b> The Agent is offline, can not get OS type and architecture,<br> Showing servers for all platforms:");
+define('caution_agent_offline_can_not_get_os_and_arch_showing_servers_for_all_platforms', "<b>الحذر!</b> وكيل غير متواجد حاليا، لا يمكن الحصول على نوع نظام التشغيل والهندسة المعمارية،<br> عرض الخوادم لجميع الأنظمة الأساسية:");
 define('select_remote_server', "إختر ريموت سيرفر");
 define('no_remote_servers_configured', "لا يوجد ريموت سيرفر مجهز للبانل .<br> تحتاج إلى ريموت سيرفر قبل أن تسطيع إضافة سيرفرات للمستخدمين");
 define('no_game_configurations_found', "لم يتم العثور على تهيئة لعبة. تحتاج إلى إضافة تهيئة اللعبة من");
@@ -57,8 +57,8 @@ define('ips_and_ports', "IPs و Ports");
 define('mod_name', "إسم المود");
 define('max_players', "الحد الأقصى للاعبين");
 define('extra_cmd_line_args', "Extra Command Line Args");
-define('extra_cmd_line_info', "The Extra command line args provides a way to enter extra arguments to the game command line when it is started.");
-define('cpu_affinity', "CPU Affinity");
+define('extra_cmd_line_info', "سطر الأوامر الإضافية يوفر وسيلة لإدخال حجج إضافية إلى سطر الأوامر اللعبة عند بدء تشغيله.");
+define('cpu_affinity', "وحدة المعالجة المركزية متقاربة");
 define('nice_level', "مستوى لطيف");
 define('set_options', "ضف خياراً");
 define('remove_mod', "إمسح المود");
@@ -88,7 +88,7 @@ define('error_ocurred_on_remote_server', "Error ocurred on remote server,");
 define('ftp_password_can_not_be_changed', "FTP password can not be changed.");
 define('ftp_can_not_be_switched_on', "FTP can not be switched ON.");
 define('ftp_can_not_be_switched_off', "FTP can not be switched OFF.");
-define('invalid_home_id_entered', "Invalid home id entered.");
+define('invalid_home_id_entered', "تم إدخال أيدي غير صالح.");
 define('ip_port_already_in_use', "The %s:%s is already in use. Choose another one.");
 define('successfully_assigned_ip_port_to_server_id', "Successfully assigned %s:%s to home with ID %s.");
 define('no_ip_addresses_configured', "Your game server does not have any IP-addresses configured to it. You can configure them from ");
@@ -96,7 +96,7 @@ define('server_page', "صفحة السيرفر");
 define('successfully_removed_mod', "تم حذف مود اللعبة بنجاح.");
 define('warning_agent_offline_defaulting_CPU_count_to_1', "Warning - Agent offline, defaulting CPU count to 1.");
 define('mod_install_cmds', "Mod Install CMDs");
-define('cmds_for', "Commands for");
+define('cmds_for', "أوامر ل");
 define('preinstall_cmds', "Preinstall Commands");
 define('postinstall_cmds', "Postinstall Commands");
 define('edit_preinstall_cmds', "Edit Preinstall Commands");

+ 3 - 1
lang/Danish/modules/server.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -134,4 +134,6 @@ define('firewall_status', "Firewall status");
 define('save_firewall_settings', "Save firewall settings");
 define('reset_firewall', "Reset Firewall");
 define('firewall_settings', "Firewall Settings");
+define('default_public_ip', "Default Public IP");
+define('display_public_ip', "Display Public IP");
 ?>

+ 1 - 2
lang/English/global.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -125,5 +125,4 @@ 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.");
-
 ?>

+ 1 - 1
lang/English/install.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
lang/English/modules/TS3Admin.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
lang/English/modules/addonsmanager.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
lang/English/modules/administration.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
lang/English/modules/config_games.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
lang/English/modules/dashboard.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
lang/English/modules/extras.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
lang/English/modules/ftp.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 2 - 2
lang/English/modules/gamemanager.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -198,4 +198,4 @@ define('attempting_nonmaster_update', "You are attempting to update this server
 define('cannot_update_from_own_self', "Local Server Update may not run on a master server.");
 define('show_server_id', "Show Server IDs");
 define('hide_server_id', "Hide Server IDs");
-?>
+?>

+ 1 - 1
lang/English/modules/litefm.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
lang/English/modules/lostpwd.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
lang/English/modules/modulemanager.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
lang/English/modules/mysql.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
lang/English/modules/register.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 2 - 1
lang/English/modules/server.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -134,4 +134,5 @@ define('firewall_status', "Firewall status");
 define('save_firewall_settings', "Save firewall settings");
 define('reset_firewall', "Reset Firewall");
 define('firewall_settings', "Firewall Settings");
+define('display_public_ip', "Display Public IP");
 ?>

+ 1 - 1
lang/English/modules/settings.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
lang/English/modules/status.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
lang/English/modules/subusers.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 2 - 2
lang/English/modules/update.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -53,4 +53,4 @@ 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");
-?>
+?>

+ 2 - 2
lang/English/modules/user_admin.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -108,4 +108,4 @@ define('editing_profile', "Editing Profile: %s");
 define('valid_user', "Please specify a valid user.");
 define('enter_valid_username', "Please enter a valid username.");
 define('unexpected_role', "Unexpected user role received.");
-?>
+?>

+ 1 - 1
lang/English/modules/user_games.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 3 - 1
lang/French/modules/server.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -134,4 +134,6 @@ define('firewall_status', "Statut du Firewall");
 define('save_firewall_settings', "Enregistrer les paramètres du Firewall");
 define('reset_firewall', "Reset du Firewall");
 define('firewall_settings', "Paramètres du Firewall");
+define('default_public_ip', "Adresse IP Publique par Défaut");
+define('display_public_ip', "Montrer IP Publique");
 ?>

+ 3 - 1
lang/German/modules/server.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -135,4 +135,6 @@ define('firewall_status', "Firewall status");
 define('save_firewall_settings', "Save firewall settings");
 define('reset_firewall', "Reset Firewall");
 define('firewall_settings', "Firewall Settings");
+define('default_public_ip', "Default Public IP");
+define('display_public_ip', "Display Public IP");
 ?>

+ 5 - 3
lang/Hungarian/modules/server.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -42,7 +42,7 @@ define('add_more_ips', "Ha több IP-t akarsz megadni akkor kattints az 'IP-k be
 define('encryption_key_mismatch', "A titkosítási kulcs nem egyezik meg az Agentel. Kérlek, ellenőrizd az Agented konfigurációját.");
 define('no_ip_for_remote_host', "Legalább 1 IP-t meg kell adnod minden egyes távoli kiszolgálóhoz.");
 define('note_remote_host', "A remote host is a server where the OGP agent is running on. Each host can have multiple number of IP addresses on which users can bind servers to.");
-define('ip_administration', "Server &amp; IP Administration :: Open Game Panel");
+define('ip_administration', "Szerver és IP adminisztráció :: Open Game Panel");
 define('unknown_error', "Ismeretlen hiba - status_chk visszaérkezett");
 define('remote_host_user_name', "UNIX felhasználó");
 define('remote_host_user_name_info', "Felhasználó neve, ahol az Agent fut. Példa: Jonhy");
@@ -87,7 +87,7 @@ define('could_not_add_server', "Nem lehet hozzáadni a szervert");
 define('to_db', "az adatbázisba.");
 define('added_server', "Szerver hozzáadva");
 define('with_port', "porttal");
-define('to_db_succesfully', "to the database successfully.");
+define('to_db_succesfully', "az adatbázisba sikeresen.");
 define('unable_discover', "Unable to auto discover IPs on");
 define('set_ip_manually', "Manuálisan kell beállítanod.");
 define('found_ips', "Talált IPk");
@@ -134,4 +134,6 @@ define('firewall_status', "Tűzfal állapota");
 define('save_firewall_settings', "Tűzfal beállítások mentése");
 define('reset_firewall', "Tűzfal visszaállítása");
 define('firewall_settings', "Tűzfal beállítások");
+define('default_public_ip', "Alapértelmezett nyilvános IP");
+define('display_public_ip', "Nyilvános IP megjelenítése");
 ?>

+ 3 - 1
lang/Italian/modules/server.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -134,4 +134,6 @@ define('firewall_status', "Firewall status");
 define('save_firewall_settings', "Save firewall settings");
 define('reset_firewall', "Reset Firewall");
 define('firewall_settings', "Firewall Settings");
+define('default_public_ip', "Default Public IP");
+define('display_public_ip', "Display Public IP");
 ?>

+ 3 - 1
lang/Polish/modules/server.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -134,4 +134,6 @@ define('firewall_status', "Status zapory");
 define('save_firewall_settings', "Zapisz ustawienia zapory");
 define('reset_firewall', "Restart zapory");
 define('firewall_settings', "Ustawienia Zapory");
+define('default_public_ip', "Default Public IP");
+define('display_public_ip', "Display Public IP");
 ?>

+ 3 - 1
lang/Portuguese/modules/server.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -134,4 +134,6 @@ define('firewall_status', "Firewall status");
 define('save_firewall_settings', "Save firewall settings");
 define('reset_firewall', "Reset Firewall");
 define('firewall_settings', "Firewall Settings");
+define('default_public_ip', "Default Public IP");
+define('display_public_ip', "Display Public IP");
 ?>

+ 3 - 1
lang/Russian/modules/server.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -134,4 +134,6 @@ define('firewall_status', "Firewall status");
 define('save_firewall_settings', "Save firewall settings");
 define('reset_firewall', "Reset Firewall");
 define('firewall_settings', "Firewall Settings");
+define('default_public_ip', "Default Public IP");
+define('display_public_ip', "Display Public IP");
 ?>

+ 3 - 1
lang/Spanish/modules/server.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2016 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -134,4 +134,6 @@ define('firewall_status', "Estado del cortafuegos");
 define('save_firewall_settings', "Guardar configuración del cortafuegos");
 define('reset_firewall', "Restablecer cortafuegos");
 define('firewall_settings', "Configuración del cortafuegos");
+define('default_public_ip', "Default Public IP");
+define('display_public_ip', "Display Public IP");
 ?>

+ 2 - 2
lang/lang-check.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
- 
+
 error_reporting(E_ERROR);
 chdir("..");
 require_once("includes/helpers.php");

+ 21 - 20
modules/TS3Admin/TS3Admin.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -28,11 +28,11 @@ function exec_ogp_module()
 	if( is_writable( $templates_folder ) )
 	{
 		global $db,$settings;
-		$isAdmin = $db->isAdmin( $_SESSION['user_id'] );	
-			
-		if( isset($_GET['changeRemoteServer']) ) 
+		$isAdmin = $db->isAdmin( $_SESSION['user_id'] );
+
+		if( isset($_GET['changeRemoteServer']) )
 			unset($_SESSION['ts3_ip']);
-			
+
 		if( isset( $_GET['changevServer'] ) OR  !isset( $_SESSION['ts3_ip'] ))
 		{
 			if(!$isAdmin)
@@ -50,8 +50,9 @@ function exec_ogp_module()
 					 <option></option>\n";
 				foreach ( $remote_servers as $server )
 				{
+					$display_ip = checkDisplayPublicIP($server['display_public_ip'],$server['agent_ip']);
 					echo "<option value='".$server['remote_server_id']."'>".
-						$server['remote_server_name']." (".$server['agent_ip'].")</option>\n";
+						$server['remote_server_name']." (".$display_ip.")</option>\n";
 				}
 				echo "</select>
 					  </form>
@@ -59,10 +60,10 @@ function exec_ogp_module()
 
 			} else {
 				echo get_lang('no_remote_servers');
-				
+
 			}
 		}
-		
+
 		if( isset( $_GET['rserver_id'] ) )
 		{
 			$_SESSION['rserver_id'] = $_GET['rserver_id'];
@@ -74,12 +75,12 @@ function exec_ogp_module()
 			{
 				$TS3_list = $db->resultQuery("SELECT * FROM OGP_DB_PREFIXts3_homes WHERE user_id='".$_SESSION['user_id']."' AND rserver_id='".$_SESSION['rserver_id']."'");
 			}
-			
+
 			if( !empty( $TS3_list ) )
-			{	
+			{
 				$remote_server = $db->getRemoteServer($_SESSION['rserver_id']);
 				$_SESSION['remote_key'] = $remote_server['encryption_key'];
-					
+
 				if( isset( $_POST['vserver_id'] ) AND !$isAdmin )
 				{
 					foreach($TS3_list as $TS3)
@@ -115,10 +116,10 @@ function exec_ogp_module()
 						{
 							echo "</tr><tr>";
 							$counter = 0;
-						}	  
+						}
 					}
 					echo "</tr></table>";
-				}	
+				}
 			}
 			else
 			{
@@ -127,7 +128,7 @@ function exec_ogp_module()
 			}
 		}
 		if( !isset( $_SESSION['ts3_ip'] ) ) return;
-		
+
 		if( isset($_GET['type']) && $_GET['type'] == "cleared" )
 		{
 			$refreshing = TRUE;
@@ -148,23 +149,23 @@ function exec_ogp_module()
 			if( !$refreshing )
 				echo '<a href="home.php?m=TS3Admin&changeRemoteServer">'.get_lang("change_remote_server").'</a>&nbsp;';
 		}
-			
+
 		define('TS3WEBINTERFACE_IP', $_SESSION['ts3_ip']);	// edit server ip
 		define('TS3WEBINTERFACE_PORT', "10011");	// edit server query port
-		define('TS3WEBINTERFACE_NAME', "serveradmin");	
+		define('TS3WEBINTERFACE_NAME', "serveradmin");
 		define('TS3WEBINTERFACE_PWD', $_SESSION['ts3_pwd']);
 		if ( !$isAdmin )
 			define('TS3WEBINTERFACE_VSERVER_ID', $_SESSION['ts3_vserver_id']);
 		define('TS3WEBINTERFACE_LANG', $settings['panel_language']);	// edit language
 
-		
+
 		require('ts3webinterface.class.php');
-		
+
 		$wi = new TS3webinterface(TS3WEBINTERFACE_IP, TS3WEBINTERFACE_PORT);
 	}
 	else
 	{
 		print_failure( get_lang_f( 'temp_folder_not_writable', $templates_folder ) );
-	} 
+	}
 }
-?>
+?>

+ 1 - 1
modules/TS3Admin/module.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
modules/TS3Admin/templates/selectvServer.tpl

@@ -18,7 +18,7 @@
 			<td><input type="radio" name="vserver" value="{$curvServer.virtualserver_id}" /></td>
 			<td>{$curvServer.virtualserver_id}</td>
 			<td>{$curvServer.virtualserver_name}</td>
-			<td>{$IP}:{$curvServer.virtualserver_port}</td>
+			<td>{$display_public_ip}:{$curvServer.virtualserver_port}</td>
 			<td><span id="serverstatus{$curvServer.virtualserver_id}" class="{if $curvServer.virtualserver_status=="none"}offline{else}{$curvServer.virtualserver_status}{/if}">{if $curvServer.virtualserver_status=="none"}offline{else}{$curvServer.virtualserver_status}{/if}</span></td>
 			<td>{$curvServer.virtualserver_clientsonline}/{$curvServer.virtualserver_maxclients}</td>
 			<td><!--'.TS3webinterface::parseTime($data[$i]['virtualserver_uptime']).'--><!--{$curvServer.virtualserver_uptime}-->{$webinterface->parseTime($curvServer.virtualserver_uptime)}</td>

+ 2 - 2
modules/TS3Admin/templates/vServerOverview.tpl

@@ -54,7 +54,7 @@
 	</tr>
 	<tr>
 		<td><b>{$lang.vsoverview_info_state}</b></td>
-		<td><span id="serverstatus" class="{$data.virtualserver_status}">{$data.virtualserver_status}</span>{if $data.virtualserver_status == "online"} - {$lang.vsselect_ip}:{$lang.vsselect_port} <a href="ts3server://{$IP}:{$data.virtualserver_port}">{$IP}:{$data.virtualserver_port}</a>{/if}</td>
+		<td><span id="serverstatus" class="{$data.virtualserver_status}">{$data.virtualserver_status}</span>{if $data.virtualserver_status == "online"} - {$lang.vsselect_ip}:{$lang.vsselect_port} <a href="ts3server://{$display_public_ip}:{$data.virtualserver_port}">{$display_public_ip}:{$data.virtualserver_port}</a>{/if}</td>
 	</tr>
 	<tr>
 		<td><b>{$lang.vsoverview_info_uptime}</b></td>
@@ -175,4 +175,4 @@
 		<td><span id="connection_bandwidth_received_last_minute_total">{$webinterface->convertByteToKB($data.connection_bandwidth_received_last_minute_total)}</span> <span class="small">kB/s</span></td>
 	</tr>
 </table>
-</fieldset>
+</fieldset>

+ 20 - 9
modules/TS3Admin/ts3webinterface.class.php

@@ -297,6 +297,8 @@ class TS3webinterface
 	
 	private function switchAction()
 	{
+		global $db;
+
 		if( isset($_GET['getchannelbackup']) && $this->session['lvserver'] != 0 )
 		{
 			if( $channelBackupString = $this->getChannelBackupString() )
@@ -615,9 +617,9 @@ class TS3webinterface
 			{
 				$this->template->assign('title', $this->language['title'].' :: '.$this->language['login']);
 				$this->template->display('header.tpl');
-				
+
 				$addData = array();
-				
+
 				/*if( !isset($_GET['do']) ) $_GET['do'] = '';
 				switch($_GET['do'])
 				{
@@ -630,7 +632,7 @@ class TS3webinterface
 						{
 							//$addData = $this->server->de_escape($addData[0]);
 							$addData = $addData[0];
-							
+
 							array_unshift($addData, 'OK');
 						}
 						else
@@ -646,27 +648,31 @@ class TS3webinterface
 				}
 					/*break;
 				}*/
-				
+
 				$vServerList = $this->server->r_serverlist();
 				if( !isset($vServerList[0]) )
 				{
 					$tmp = array($vServerList);
 					$vServerList = $tmp;
 				}
-				
+
+				$getPublicIp = $db->resultQuery("SELECT display_public_ip FROM OGP_DB_PREFIXremote_servers WHERE remote_server_id=".$_SESSION['rserver_id']);
+				$display_ip = checkDisplayPublicIP($getPublicIp[0]['display_public_ip'],$this->serverIP);
+
 				$this->template->assign('IP', $this->serverIP);
+				$this->template->assign('display_public_ip', $display_ip);
 				$this->template->assign('selectvServer', $vServerList);
 				$this->template->assign('addData', $addData);
-				
+
 				$updateAvailable = $this->checkForUpdate();
 				$this->template->assign('updateAvailable', $updateAvailable);
 				if( $updateAvailable != "" )
 				{
 					$this->template->display('updateAvailable.tpl');
 				}
-				
+
 				$this->template->display('selectvServer.tpl');
-				
+
 				$this->template->display('footer.tpl');
 			}
 			else
@@ -799,7 +805,6 @@ class TS3webinterface
 					
 					$this->template->assign('banList', $this->server->r_banlist());
 					
-					
 					$this->template->display('vServerLiveview.tpl');
 				}
 				else
@@ -841,6 +846,12 @@ class TS3webinterface
 					}
 					$this->template->assign('is_parent_user', $is_parent_user);
 					$this->template->assign('subusers_installed', $subusers_installed);
+
+	                                $getPublicIp = $db->resultQuery("SELECT display_public_ip FROM OGP_DB_PREFIXremote_servers WHERE remote_server_id=".$_SESSION['rserver_id']);
+        	                        $display_ip = checkDisplayPublicIP($getPublicIp[0]['display_public_ip'],$this->serverIP);
+
+					$this->template->assign('display_public_ip', $display_ip);
+
 					$this->template->assign('IP', $this->serverIP);
 					$this->template->display('vServerOverview.tpl');
 				}

+ 2 - 2
modules/addonsmanager/addons_installer.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
- 
+
 function do_progress($kbytes,$totalsize)
 {
 	$mbytes = round($kbytes / 1024, 2);

Plik diff jest za duży
+ 0 - 0
modules/addonsmanager/addons_manager.php


+ 1 - 1
modules/addonsmanager/module.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 2 - 1
modules/addonsmanager/user_addons.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -21,6 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
+
 function exec_ogp_module() {
 	global $db;
 	$home_id = $_GET['home_id'];

+ 2 - 1
modules/administration/administration.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -21,6 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
+
 function exec_ogp_module() 
 {
 	global $db,$view;

+ 2 - 1
modules/administration/backupdwl.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -21,6 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
+
 function exec_ogp_module() 
 {
 	$path = getcwd()."/".$_GET['randir']."/"; // change the path to fit your websites document structure

+ 2 - 1
modules/administration/banlist.php

@@ -3,7 +3,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -22,6 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
+
 function exec_ogp_module() 
 {
 	echo "<h2>".get_lang('ban_list')."</h2>";

+ 2 - 1
modules/administration/iframe.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -21,6 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
+
 function exec_ogp_module() 
 {
 

+ 1 - 1
modules/administration/module.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 16 - 6
modules/administration/watch_logger.php

@@ -3,7 +3,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -22,6 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
+
 function exec_ogp_module() {
 	global $db, $loggedInUserInfo;
 	echo "<h2>".get_lang('watch_logger')."</h2>";
@@ -30,9 +31,12 @@ function exec_ogp_module() {
 	<table style="width: 100%;">
 		<tr>
 			<td style="width: 50%; vertical-align: middle; text-align: left;">
-				<form onsubmit="event.preventDefault();" style="display: inline;">
+				<form action="home.php" method="GET" style="display: inline;">
 					<b><?php print_lang('search'); ?>:</b>
-					<input type="text" id="search">
+					<input type ="hidden" name="m" value="administration" />
+					<input type ="hidden" name="p" value="watch_logger" />
+					<input name="search" type="text" id="search">
+					<input type="submit" value="search" />
 				</form>
 				<form method=POST style="display: inline;">
 					<input type="submit" name="empty_logger" value="<?php print_lang('empty_logger'); ?>" >
@@ -62,6 +66,7 @@ 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;
 	
@@ -69,7 +74,7 @@ function exec_ogp_module() {
 		$l = $loggedInUserInfo["users_page_limit"];
 	}
 	
-	$logs = $db->read_logger($p,$l);
+	$logs = $db->read_logger($p,$l,$search_field);
 	
 	if($logs)
 	{
@@ -115,9 +120,14 @@ function exec_ogp_module() {
 	echo "</tbody>\n";
 	echo "<tfoot style='border:1px solid grey;'></tfoot>\n";
 	echo "</table>\n";
-	$count_logs = $db->get_logger_count();
-
+	$count_logs = $db->get_logger_count($search_field);
+	
+	if(isset($_GET['search']) && !empty($_GET['search'])){
+	$uri = '?m=administration&p=watch_logger&search='.$_GET['search'].'&limit='.$l.'&page=';
+	}
+	else{
 	$uri = '?m=administration&p=watch_logger&limit='.$l.'&page=';
+	}
 	echo paginationPages($count_logs[0]['total'], $p, $l, $uri, 3, 'watchLogger');
 }
 ?>

+ 2 - 2
modules/config_games/cli-params.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
- 
+
 function exec_ogp_module() {
 	@$arch = $_POST['arch'];
 	@$os = $_POST['os'];

+ 1 - 1
modules/config_games/config_servers.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 2 - 1
modules/config_games/create.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -21,6 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
+
 function exec_ogp_module() {
 	@$arch = $_POST['arch'];
 	@$os = $_POST['os'];

+ 1 - 1
modules/config_games/module.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 1 - 1
modules/config_games/server_config_parser.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *

+ 12 - 16
modules/config_games/server_configs/arkse_linux64.xml

@@ -5,7 +5,7 @@
   <installer>steamcmd</installer>
   <game_name>ARK: Survival Evolved</game_name>
   <server_exec_name>ShooterGameServer</server_exec_name>
-  <cli_template>%MAP%%IP%%PORT%%QUERY_PORT%%PLAYERS%%CONTROL_PASSWORD%%PDS%%PDI%%PDD%%PUS%%PUI%%PUD%%ASDN%%POP%%POPI%%PTA%?listen %AMM% %CDO% %CID% %FACF% %NTFF% -server -log</cli_template>
+  <cli_template>%MAP%%IP%%PORT%%QUERY_PORT%%PLAYERS%%RCON%%CONTROL_PASSWORD%%PDS%%PDI%%PDD%%PUS%%PUI%%PUD%%ASDN%%POP%%POPI%%PTA%?listen %AMM% %CDO% %CID% %FACF% %NTFF% -server -log</cli_template>
   <cli_params>
     <cli_param id="MAP" cli_string="" />
     <cli_param id="IP" cli_string="?Multihome=" />
@@ -35,6 +35,12 @@
     </text>
   </replace_texts>
   <server_params>
+    <param key="?RCONEnabled=" type="select" id="RCON">
+      <option value="True">True</option>
+      <option value="False">False</option>
+      <options>ns</options>
+      <desc>Enable or disable remote control.</desc>
+    </param>
     <param key="-automanagedmods" type="checkbox_key_value" id="AMM">
       <desc>Enable automatic MOD downloading, installing and updating.</desc>
     </param>
@@ -118,17 +124,7 @@
     </param>
   </server_params>
   <custom_fields>
-    <field key="RCONEnabled" type="select">
-      <option value="True">Yes</option>
-      <option value="False">No</option>
-      <default>RCONEnabled=.*</default>
-      <default_value>True</default_value>
-      <var>RCONEnabled=</var>
-      <filepath>ShooterGame/Saved/Config/LinuxServer/GameUserSettings.ini</filepath>
-      <options>sq</options>
-      <desc>Enable or disable remote control.</desc>
-    </field>
-    <field key="RCONPort" type="text">
+    <field key="RCON Port" type="text">
       <default>RCONPort=.*</default>
       <default_value>27020</default_value>
       <var>RCONPort=</var>
@@ -145,10 +141,10 @@
       else
         echo "File $maplist not found."
         echo "Generating new maplist file in $maplist!"
-        touch maplist.txt
-        echo ScorchedEarth_P> maplist.txt
-        echo TheCenter>> maplist.txt
-        echo TheIsland>> maplist.txt
+        touch $maplist
+        echo ScorchedEarth_P> $maplist
+        echo TheCenter>> $maplist
+        echo TheIsland>> $maplist
     fi
     if [ -f "Engine/Binaries/ThirdParty/SteamCMD/Linux/linux32/steamcmd" ]
       then

+ 12 - 16
modules/config_games/server_configs/arkse_win64.xml

@@ -5,7 +5,7 @@
   <installer>steamcmd</installer>
   <game_name>ARK: Survival Evolved</game_name>
   <server_exec_name>ShooterGameServer.exe</server_exec_name>
-  <cli_template>%MAP%%IP%%PORT%%QUERY_PORT%%PLAYERS%%CONTROL_PASSWORD%%PDS%%PDI%%PDD%%PUS%%PUI%%PUD%%ASDN%%POP%%POPI%%PTA%?listen %AMM% %CDO% %CID% %FACF% %NTFF% -server -log</cli_template>
+  <cli_template>%MAP%%IP%%PORT%%QUERY_PORT%%PLAYERS%%RCON%%CONTROL_PASSWORD%%PDS%%PDI%%PDD%%PUS%%PUI%%PUD%%ASDN%%POP%%POPI%%PTA%?listen %AMM% %CDO% %CID% %FACF% %NTFF% -server -log</cli_template>
   <cli_params>
     <cli_param id="MAP" cli_string="" />
     <cli_param id="IP" cli_string="?Multihome=" />
@@ -35,6 +35,12 @@
     </text>
   </replace_texts>
   <server_params>
+    <param key="?RCONEnabled=" type="select" id="RCON">
+      <option value="True">True</option>
+      <option value="False">False</option>
+      <options>ns</options>
+      <desc>Enable or disable remote control.</desc>
+    </param>
     <param key="-automanagedmods" type="checkbox_key_value" id="AMM">
       <desc>Enable automatic MOD downloading, installing and updating.</desc>
     </param>
@@ -118,17 +124,7 @@
     </param>
   </server_params>
   <custom_fields>
-    <field key="RCONEnabled" type="select">
-      <option value="True">Yes</option>
-      <option value="False">No</option>
-      <default>RCONEnabled=.*</default>
-      <default_value>True</default_value>
-      <var>RCONEnabled=</var>
-      <filepath>ShooterGame/Saved/Config/WindowsServer/GameUserSettings.ini</filepath>
-      <options>sq</options>
-      <desc>Enable or disable remote control.</desc>
-    </field>
-    <field key="RCONPort" type="text">
+    <field key="RCON Port" type="text">
       <default>RCONPort=.*</default>
       <default_value>27020</default_value>
       <var>RCONPort=</var>
@@ -145,10 +141,10 @@
       else
         echo "File $maplist not found."
         echo "Generating new maplist file in $maplist!"
-        touch maplist.txt
-        echo ScorchedEarth_P> maplist.txt
-        echo TheCenter>> maplist.txt
-        echo TheIsland>> maplist.txt
+        touch $maplist
+        echo ScorchedEarth_P> $maplist
+        echo TheCenter>> $maplist
+        echo TheIsland>> $maplist
     fi
   </post_install>
 </game_config>

+ 73 - 0
modules/config_games/server_configs/egs_win64.xml

@@ -0,0 +1,73 @@
+<game_config>
+  <game_key>egs_win64</game_key>
+  <protocol>lgsl</protocol>
+  <lgsl_query_name>source</lgsl_query_name>
+  <installer>steamcmd</installer>
+  <game_name>Empyrion – Galactic Survival</game_name>
+  <server_exec_name>EmpyrionLauncher.exe</server_exec_name>
+  <cli_template>-startDedi</cli_template>
+  <console_log>Logs/Dedicated.log</console_log>
+  <max_user_amount>12</max_user_amount>
+  <mods>
+    <mod key="egs1">
+      <name>Stable</name>
+      <installer_name>530870</installer_name>
+      <installer_login>anonymous</installer_login>
+    </mod>
+    <mod key="egs2">
+      <name>Experimental</name>
+      <installer_name>530870</installer_name>
+      <installer_login>anonymous</installer_login>
+      <betaname>experimental</betaname>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="home_name">
+      <default>Srv_Name: .*</default>
+      <var>Srv_Name: </var>
+      <filepath>dedicated.yaml</filepath>
+    </text>
+    <text key="port">
+      <default>Srv_Port: .*</default>
+      <var>Srv_Port: </var>
+      <filepath>dedicated.yaml</filepath>
+    </text>
+    <text key="max_players">
+      <default>Srv_MaxPlayers: .*</default>
+      <var>Srv_MaxPlayers: </var>
+      <filepath>dedicated.yaml</filepath>
+    </text>
+    <text key="control_password">
+      <default>Tel_Pwd: .*</default>
+      <var>Tel_Pwd: </var>
+      <filepath>dedicated.yaml</filepath>
+    </text>
+  </replace_texts>
+  <custom_fields>
+    <field key="Enable Telnet" type="select">
+      <option value="true">True</option>
+      <option value="false">False</option>
+      <default>Tel_Enabled: .*</default>
+      <default_value>true</default_value>
+      <var>Tel_Enabled: </var>
+      <filepath>dedicated.yaml</filepath>
+      <desc>Activate Telnet server.</desc>
+    </field>
+    <field key="Telnet Port" type="text">
+      <default>Tel_Port: .*</default>
+      <default_value>30004</default_value>
+      <var>Tel_Port: </var>
+      <filepath>dedicated.yaml</filepath>
+      <desc>Port of Telnet.</desc>
+    </field>
+    <field key="Activate EAC" type="select">
+      <option value="true">True</option>
+      <option value="false">False</option>
+      <default>EACActive: .*</default>
+      <default_value>false</default_value>
+      <var>EACActive: </var>
+      <filepath>dedicated.yaml</filepath>
+      <desc>Activate Easy Anti Cheat.</desc>
+    </field>
+  </custom_fields>
+</game_config>

+ 0 - 27
modules/config_games/server_configs/openttd.xml

@@ -1,27 +0,0 @@
-<game_config>
-  <game_key>openttd_linux32</game_key>
-  <protocol>lgsl</protocol>
-  <lgsl_query_name>openttd</lgsl_query_name>
-  <game_name>OpenTTD</game_name>
-  <server_exec_name>openttd</server_exec_name>
-  <cli_template>-D %IP%:%PORT% %SAVEGAME%</cli_template>
-  <cli_params>
-    <cli_param id="IP" cli_string="" />
-    <cli_param id="PORT" cli_string="" />
-  </cli_params>
-  <mods>
-    <mod key="default">
-      <name>none</name>
-    </mod>
-  </mods>
-  <server_params>
-   <param id='SAVEGAME' key='-g' type='select'>
-    <option value=''>No</option>
-    <option value='save/autosave/ogp.sav'>Yes</option>
-    <desc>Should the last game be loaded</desc>
-   </param>
-  </server_params>
-  <pre_start>
-   find save/autosave -type f | sort -r | head -n1 | xargs -I &apos;{}&apos; mv -f &apos;{}&apos; save/autosave/ogp.sav
-  </pre_start>
-</game_config>

+ 59 - 0
modules/config_games/server_configs/openttd_linux32.xml

@@ -0,0 +1,59 @@
+<game_config>
+  <game_key>openttd_linux32</game_key>
+  <protocol>lgsl</protocol>
+  <lgsl_query_name>openttd</lgsl_query_name>
+  <game_name>OpenTTD</game_name>
+  <server_exec_name>openttd</server_exec_name>
+  <cli_template>-D %IP%:%PORT% %SAVEGAME%</cli_template>
+  <cli_params>
+    <cli_param id="IP" cli_string="" />
+    <cli_param id="PORT" cli_string="" />
+  </cli_params>
+  <max_user_amount>255</max_user_amount>
+  <mods>
+    <mod key="default">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="home_name">
+      <default>server_name = .*</default>
+      <var>server_name = </var>
+      <filepath>openttd.cfg</filepath>
+    </text>
+    <text key="max_players">
+      <default>max_clients = .*</default>
+      <var>max_clients = </var>
+      <filepath>openttd.cfg</filepath>
+    </text>
+    <text key="control_password">
+      <default>rcon_password = .*</default>
+      <var>rcon_password = </var>
+      <filepath>openttd.cfg</filepath>
+    </text>
+    <text key="control_password">
+      <default>admin_password = .*</default>
+      <var>admin_password = </var>
+      <filepath>openttd.cfg</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+    <param key="-g" type="select" id="SAVEGAME">
+      <option value="">No</option>
+      <option value="save/autosave/latest_autosave.sav">Yes</option>
+      <desc>If no, starts a new game. If yes, loads the latest autosaved game.</desc>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="Server Admin Port" type="text">
+      <default>server_admin_port = .*</default>
+      <default_value>3977</default_value>
+      <var>server_admin_port = </var>
+      <filepath>openttd.cfg</filepath>
+      <desc>The port the admin interface of an OpenTTD server is listening on.</desc>
+    </field>
+  </custom_fields>
+  <pre_start>
+    ls -t save/autosave | head -n1 | xargs -I {} cp -f save/autosave/{} save/autosave/latest_autosave.sav
+  </pre_start>
+</game_config>

+ 59 - 0
modules/config_games/server_configs/openttd_linux64.xml

@@ -0,0 +1,59 @@
+<game_config>
+  <game_key>openttd_linux64</game_key>
+  <protocol>lgsl</protocol>
+  <lgsl_query_name>openttd</lgsl_query_name>
+  <game_name>OpenTTD</game_name>
+  <server_exec_name>openttd</server_exec_name>
+  <cli_template>-D %IP%:%PORT% %SAVEGAME%</cli_template>
+  <cli_params>
+    <cli_param id="IP" cli_string="" />
+    <cli_param id="PORT" cli_string="" />
+  </cli_params>
+  <max_user_amount>255</max_user_amount>
+  <mods>
+    <mod key="default">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="home_name">
+      <default>server_name = .*</default>
+      <var>server_name = </var>
+      <filepath>openttd.cfg</filepath>
+    </text>
+    <text key="max_players">
+      <default>max_clients = .*</default>
+      <var>max_clients = </var>
+      <filepath>openttd.cfg</filepath>
+    </text>
+    <text key="control_password">
+      <default>rcon_password = .*</default>
+      <var>rcon_password = </var>
+      <filepath>openttd.cfg</filepath>
+    </text>
+    <text key="control_password">
+      <default>admin_password = .*</default>
+      <var>admin_password = </var>
+      <filepath>openttd.cfg</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+    <param key="-g" type="select" id="SAVEGAME">
+      <option value="">No</option>
+      <option value="save/autosave/latest_autosave.sav">Yes</option>
+      <desc>If no, starts a new game. If yes, loads the latest autosaved game.</desc>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="Server Admin Port" type="text">
+      <default>server_admin_port = .*</default>
+      <default_value>3977</default_value>
+      <var>server_admin_port = </var>
+      <filepath>openttd.cfg</filepath>
+      <desc>The port the admin interface of an OpenTTD server is listening on.</desc>
+    </field>
+  </custom_fields>
+  <pre_start>
+    ls -t save/autosave | head -n1 | xargs -I {} cp -f save/autosave/{} save/autosave/latest_autosave.sav
+  </pre_start>
+</game_config>

+ 59 - 0
modules/config_games/server_configs/openttd_win32.xml

@@ -0,0 +1,59 @@
+<game_config>
+  <game_key>openttd_win32</game_key>
+  <protocol>lgsl</protocol>
+  <lgsl_query_name>openttd</lgsl_query_name>
+  <game_name>OpenTTD</game_name>
+  <server_exec_name>openttd.exe</server_exec_name>
+  <cli_template>-D %IP%:%PORT% %SAVEGAME%</cli_template>
+  <cli_params>
+    <cli_param id="IP" cli_string="" />
+    <cli_param id="PORT" cli_string="" />
+  </cli_params>
+  <max_user_amount>255</max_user_amount>
+  <mods>
+    <mod key="default">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="home_name">
+      <default>server_name = .*</default>
+      <var>server_name = </var>
+      <filepath>openttd.cfg</filepath>
+    </text>
+    <text key="max_players">
+      <default>max_clients = .*</default>
+      <var>max_clients = </var>
+      <filepath>openttd.cfg</filepath>
+    </text>
+    <text key="control_password">
+      <default>rcon_password = .*</default>
+      <var>rcon_password = </var>
+      <filepath>openttd.cfg</filepath>
+    </text>
+    <text key="control_password">
+      <default>admin_password = .*</default>
+      <var>admin_password = </var>
+      <filepath>openttd.cfg</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+    <param key="-g" type="select" id="SAVEGAME">
+      <option value="">No</option>
+      <option value="save/autosave/latest_autosave.sav">Yes</option>
+      <desc>If no, starts a new game. If yes, loads the latest autosaved game.</desc>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="Server Admin Port" type="text">
+      <default>server_admin_port = .*</default>
+      <default_value>3977</default_value>
+      <var>server_admin_port = </var>
+      <filepath>openttd.cfg</filepath>
+      <desc>The port the admin interface of an OpenTTD server is listening on.</desc>
+    </field>
+  </custom_fields>
+  <pre_start>
+    ls -t save/autosave | head -n1 | xargs -I {} cp -f save/autosave/{} save/autosave/latest_autosave.sav
+  </pre_start>
+</game_config>

+ 59 - 0
modules/config_games/server_configs/openttd_win64.xml

@@ -0,0 +1,59 @@
+<game_config>
+  <game_key>openttd_win64</game_key>
+  <protocol>lgsl</protocol>
+  <lgsl_query_name>openttd</lgsl_query_name>
+  <game_name>OpenTTD</game_name>
+  <server_exec_name>openttd.exe</server_exec_name>
+  <cli_template>-D %IP%:%PORT% %SAVEGAME%</cli_template>
+  <cli_params>
+    <cli_param id="IP" cli_string="" />
+    <cli_param id="PORT" cli_string="" />
+  </cli_params>
+  <max_user_amount>255</max_user_amount>
+  <mods>
+    <mod key="default">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="home_name">
+      <default>server_name = .*</default>
+      <var>server_name = </var>
+      <filepath>openttd.cfg</filepath>
+    </text>
+    <text key="max_players">
+      <default>max_clients = .*</default>
+      <var>max_clients = </var>
+      <filepath>openttd.cfg</filepath>
+    </text>
+    <text key="control_password">
+      <default>rcon_password = .*</default>
+      <var>rcon_password = </var>
+      <filepath>openttd.cfg</filepath>
+    </text>
+    <text key="control_password">
+      <default>admin_password = .*</default>
+      <var>admin_password = </var>
+      <filepath>openttd.cfg</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+    <param key="-g" type="select" id="SAVEGAME">
+      <option value="">No</option>
+      <option value="save/autosave/latest_autosave.sav">Yes</option>
+      <desc>If no, starts a new game. If yes, loads the latest autosaved game.</desc>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="Server Admin Port" type="text">
+      <default>server_admin_port = .*</default>
+      <default_value>3977</default_value>
+      <var>server_admin_port = </var>
+      <filepath>openttd.cfg</filepath>
+      <desc>The port the admin interface of an OpenTTD server is listening on.</desc>
+    </field>
+  </custom_fields>
+  <pre_start>
+    ls -t save/autosave | head -n1 | xargs -I {} cp -f save/autosave/{} save/autosave/latest_autosave.sav
+  </pre_start>
+</game_config>

+ 0 - 39
modules/config_games/server_configs/rust_legacy_win32.xml

@@ -1,39 +0,0 @@
-<game_config>
-  <game_key>rust_legacy_win32</game_key>
-  <protocol>gameq</protocol>
-  <gameq_query_name>source</gameq_query_name>
-  <installer>steamcmd</installer>
-  <game_name>Rust</game_name>
-  <server_exec_name>RustDedicated.exe</server_exec_name>
-  <query_port type="add">1</query_port>
-  <cli_template>-batchmode %HOSTNAME% %IP% %PORT% %PLAYERS% -datadir "serverdata/"</cli_template>
-  <cli_params>
-    <cli_param id="IP" cli_string="-ip" options="s" />
-    <cli_param id="PORT" cli_string="-port" options="s" />
-    <cli_param id="PLAYERS" cli_string="-maxplayers" options="s" />
-    <cli_param id="HOSTNAME" cli_string="-hostname" options="sq" />
-  </cli_params>
-  <console_log>RustDedicated_Data/output_log.txt</console_log>
-  <max_user_amount>500</max_user_amount>
-  <mods>
-    <mod key="rust">
-      <name>none</name>
-      <installer_name>258550</installer_name>
-      <installer_login>anonymous</installer_login>
-     <betaname>experimental</betaname>
-    </mod>
-  </mods>
-  <server_params>
-    <param key="cfg" type="text">
-      <default>cfg/server.cfg</default>
-      <caption>Server config</caption>
-      <desc>Executes a custom server configuration file on start.</desc>
-    </param>
-   <param key="-map" type="text">
-      <default>rust_island_2013</default>
-      <caption>Map</caption>
-      <desc>The map to load.</desc>
-    </param>
-  </server_params>
-</game_config>
- 

+ 81 - 0
modules/config_games/server_configs/squad_linux64.xml

@@ -0,0 +1,81 @@
+<game_config>
+  <game_key>squad_linux64</game_key>
+  <protocol>lgsl</protocol>
+  <lgsl_query_name>squad</lgsl_query_name>
+  <installer>steamcmd</installer>
+  <game_name>Squad</game_name>
+  <server_exec_name>SquadServer.sh</server_exec_name>
+  <cli_template>%IP% %PORT% %QUERY_PORT% %PLAYERS% %TICKRATE% %MAP% -log</cli_template>
+  <cli_params>
+    <cli_param id="IP" cli_string="MultiHome=" />
+    <cli_param id="PORT" cli_string="Port=" />
+    <cli_param id="PLAYERS" cli_string="FIXEDMAXPLAYERS=" />
+  </cli_params>
+  <reserve_ports>
+    <port type="add" id="QUERY_PORT" cli_string="QueryPort=">19378</port>
+  </reserve_ports>
+  <console_log>Squad/Saved/Logs/Squad.log</console_log>
+  <max_user_amount>80</max_user_amount>
+  <mods>
+    <mod key="squad">
+      <name>None</name>
+      <installer_name>403240</installer_name>
+      <installer_login>anonymous</installer_login>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="home_name">
+      <default>ServerName=.*</default>
+      <var>ServerName=</var>
+      <filepath>Squad/ServerConfig/Server.cfg</filepath>
+      <options></options>
+    </text>
+    <text key="max_players">
+      <default>MaxPlayers=.*</default>
+      <var>MaxPlayers=</var>
+      <filepath>Squad/ServerConfig/Server.cfg</filepath>
+      <options></options>
+    </text>
+    <text key="ip">
+      <default>Ip=.*</default>
+      <var>Ip=</var>
+      <filepath>Squad/ServerConfig/Rcon.cfg</filepath>
+      <options></options>
+    </text>
+    <text key="control_password">
+      <default>Password=.*</default>
+      <var>Password=</var>
+      <filepath>Squad/ServerConfig/Rcon.cfg</filepath>
+      <options></options>
+    </text>
+  </replace_texts>
+  <server_params>
+  <param key="FIXEDMAXTICKRATE=" type="text" id="TICKRATE">
+      <default>50</default>
+      <caption></caption>
+      <desc>MAX server tickrate.</desc>
+      <options>ns</options>
+    </param>
+  <param key="RANDOM=" type="select" id="MAP">
+      <option value="ALWAYS">Always</option>
+      <option value="FIRST">First</option>
+      <option value="NONE">None</option>
+      <caption></caption>
+      <desc>Randomize map rotation.</desc>
+      <options>ns</options>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="RCON Port" type="text">
+      <default>Port=.*</default>
+      <default_value>21114</default_value>
+      <var>Port=</var>
+      <filepath>Squad/ServerConfig/Rcon.cfg</filepath>
+      <options></options>
+      <desc></desc>
+    </field>
+  </custom_fields>
+  <post_install>
+    sed -i '4s/IP/Ip/g' Squad/ServerConfig/Rcon.cfg
+  </post_install>
+</game_config>

+ 36 - 31
modules/config_games/server_configs/teamspeak3_linux32.xml

@@ -1,31 +1,36 @@
-<game_config>
-  <game_key>teamspeak3_linux32</game_key>
-  <protocol>teamspeak3</protocol>
-  <game_name>TeamSpeak 3</game_name>
-  <server_exec_name>ts3server_minimal_runscript.sh</server_exec_name>
-  <cli_template>voice_ip=%IP% %PORT% query_ip=%IP% %QUERY_PORT_TS3% filetransfer_ip=%IP% %FILETRANS_PORT_TS3% %CONTROL_PASSWORD% logappend=1</cli_template>
-  <cli_params>
-	<cli_param id="IP" cli_string="" />
-    <cli_param id="PORT" cli_string="default_voice_port=" />
-    <cli_param id="CONTROL_PASSWORD" cli_string="serveradmin_password=" />
-  </cli_params>
-  <reserve_ports>
-    <port type="add" id="QUERY_PORT_TS3" cli_string="query_port=">24</port>
-    <port type="add" id="FILETRANS_PORT_TS3" cli_string="filetransfer_port=">124</port>
-  </reserve_ports>
-  <console_log>teamspeak3-server_linux_x86/logs/ts3server_0.log</console_log>
-  <exe_location>teamspeak3-server_linux_x86</exe_location>
-  <mods>
-    <mod key="ts3">
-      <name>None</name>
-    </mod>
-  </mods>
-  <replace_texts>
-    <text key="webhost_ip">
-      <default></default>
-      <var></var>
-      <filepath>teamspeak3-server_linux_x86/query_ip_whitelist.txt</filepath>
-      <options></options>
-    </text>
-  </replace_texts>
-</game_config>
+<game_config>
+  <game_key>teamspeak3_linux32</game_key>
+  <protocol>teamspeak3</protocol>
+  <game_name>TeamSpeak 3</game_name>
+  <server_exec_name>ts3server_minimal_runscript.sh</server_exec_name>
+  <cli_template>voice_ip=%IP% %PORT% query_ip=%IP% %QUERY_PORT% filetransfer_ip=%IP% %FILETRANSFER_PORT% %CONTROL_PASSWORD% %LOG%</cli_template>
+  <cli_params>
+    <cli_param id="IP" cli_string="" />
+    <cli_param id="PORT" cli_string="default_voice_port=" />
+    <cli_param id="CONTROL_PASSWORD" cli_string="serveradmin_password=" />
+  </cli_params>
+  <reserve_ports>
+    <port type="add" id="QUERY_PORT" cli_string="query_port=">24</port>
+    <port type="add" id="FILETRANSFER_PORT" cli_string="filetransfer_port=">20046</port>
+  </reserve_ports>
+  <console_log>teamspeak3-server_linux_x86/logs/ts3server_0.log</console_log>
+  <exe_location>teamspeak3-server_linux_x86</exe_location>
+  <mods>
+    <mod key="default">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="webhost_ip">
+      <filepath>teamspeak3-server_linux_x86/query_ip_whitelist.txt</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+    <param key="logappend=" type="select" id="LOG">
+      <option value="0">Disabled</option>
+      <option value="1">Enabled</option>
+      <options>ns</options>
+      <desc>The log output will be appended to the previous log file.</desc>
+    </param>
+  </server_params>
+</game_config>

+ 36 - 31
modules/config_games/server_configs/teamspeak3_linux64.xml

@@ -1,31 +1,36 @@
-<game_config>
-  <game_key>teamspeak3_linux64</game_key>
-  <protocol>teamspeak3</protocol>
-  <game_name>TeamSpeak 3</game_name>
-  <server_exec_name>ts3server_minimal_runscript.sh</server_exec_name>
-  <cli_template>voice_ip=%IP% %PORT% query_ip=%IP% %QUERY_PORT_TS3% filetransfer_ip=%IP% %FILETRANS_PORT_TS3% %CONTROL_PASSWORD% logappend=1</cli_template>
-  <cli_params>
-	<cli_param id="IP" cli_string="" />
-    <cli_param id="PORT" cli_string="default_voice_port=" />
-    <cli_param id="CONTROL_PASSWORD" cli_string="serveradmin_password=" />
-  </cli_params>
-  <reserve_ports>
-    <port type="add" id="QUERY_PORT_TS3" cli_string="query_port=">24</port>
-    <port type="add" id="FILETRANS_PORT_TS3" cli_string="filetransfer_port=">124</port>
-  </reserve_ports>
-  <console_log>teamspeak3-server_linux_amd64/logs/ts3server_0.log</console_log>
-  <exe_location>teamspeak3-server_linux_amd64</exe_location>
-  <mods>
-    <mod key="ts3">
-      <name>None</name>
-    </mod>
-  </mods>
-  <replace_texts>
-    <text key="webhost_ip">
-      <default></default>
-      <var></var>
-      <filepath>teamspeak3-server_linux_amd64/query_ip_whitelist.txt</filepath>
-      <options></options>
-    </text>
-  </replace_texts>
-</game_config>
+<game_config>
+  <game_key>teamspeak3_linux64</game_key>
+  <protocol>teamspeak3</protocol>
+  <game_name>TeamSpeak 3</game_name>
+  <server_exec_name>ts3server_minimal_runscript.sh</server_exec_name>
+  <cli_template>voice_ip=%IP% %PORT% query_ip=%IP% %QUERY_PORT% filetransfer_ip=%IP% %FILETRANSFER_PORT% %CONTROL_PASSWORD% %LOG%</cli_template>
+  <cli_params>
+    <cli_param id="IP" cli_string="" />
+    <cli_param id="PORT" cli_string="default_voice_port=" />
+    <cli_param id="CONTROL_PASSWORD" cli_string="serveradmin_password=" />
+  </cli_params>
+  <reserve_ports>
+    <port type="add" id="QUERY_PORT" cli_string="query_port=">24</port>
+    <port type="add" id="FILETRANSFER_PORT" cli_string="filetransfer_port=">20046</port>
+  </reserve_ports>
+  <console_log>teamspeak3-server_linux_amd64/logs/ts3server_0.log</console_log>
+  <exe_location>teamspeak3-server_linux_amd64</exe_location>
+  <mods>
+    <mod key="default">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="webhost_ip">
+      <filepath>teamspeak3-server_linux_amd64/query_ip_whitelist.txt</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+    <param key="logappend=" type="select" id="LOG">
+      <option value="0">Disabled</option>
+      <option value="1">Enabled</option>
+      <options>ns</options>
+      <desc>The log output will be appended to the previous log file.</desc>
+    </param>
+  </server_params>
+</game_config>

+ 14 - 9
modules/config_games/server_configs/teamspeak3_win32.xml

@@ -3,29 +3,34 @@
   <protocol>teamspeak3</protocol>
   <game_name>TeamSpeak 3</game_name>
   <server_exec_name>ts3server.exe</server_exec_name>
-  <cli_template>voice_ip=%IP% %PORT% query_ip=%IP% %QUERY_PORT_TS3% filetransfer_ip=%IP% %FILETRANS_PORT_TS3% %CONTROL_PASSWORD% logappend=1</cli_template>
+  <cli_template>voice_ip=%IP% %PORT% query_ip=%IP% %QUERY_PORT% filetransfer_ip=%IP% %FILETRANSFER_PORT% %CONTROL_PASSWORD% %LOG%</cli_template>
   <cli_params>
-	<cli_param id="IP" cli_string="" />  
+    <cli_param id="IP" cli_string="" />
     <cli_param id="PORT" cli_string="default_voice_port=" />
     <cli_param id="CONTROL_PASSWORD" cli_string="serveradmin_password=" />
   </cli_params>
   <reserve_ports>
-    <port type="add" id="QUERY_PORT_TS3" cli_string="query_port=">24</port>
-    <port type="add" id="FILETRANS_PORT_TS3" cli_string="filetransfer_port=">124</port>
+    <port type="add" id="QUERY_PORT" cli_string="query_port=">24</port>
+    <port type="add" id="FILETRANSFER_PORT" cli_string="filetransfer_port=">20046</port>
   </reserve_ports>
   <console_log>teamspeak3-server_win32/logs/ts3server_0.log</console_log>
   <exe_location>teamspeak3-server_win32</exe_location>
   <mods>
-    <mod key="ts3">
+    <mod key="default">
       <name>None</name>
     </mod>
   </mods>
   <replace_texts>
     <text key="webhost_ip">
-      <default></default>
-      <var></var>
       <filepath>teamspeak3-server_win32/query_ip_whitelist.txt</filepath>
-      <options></options>
     </text>
   </replace_texts>
-</game_config>
+  <server_params>
+    <param key="logappend=" type="select" id="LOG">
+      <option value="0">Disabled</option>
+      <option value="1">Enabled</option>
+      <options>ns</options>
+      <desc>The log output will be appended to the previous log file.</desc>
+    </param>
+  </server_params>
+</game_config>

+ 14 - 9
modules/config_games/server_configs/teamspeak3_win64.xml

@@ -3,29 +3,34 @@
   <protocol>teamspeak3</protocol>
   <game_name>TeamSpeak 3</game_name>
   <server_exec_name>ts3server.exe</server_exec_name>
-  <cli_template>voice_ip=%IP% %PORT% query_ip=%IP% %QUERY_PORT_TS3% filetransfer_ip=%IP% %FILETRANS_PORT_TS3% %CONTROL_PASSWORD% logappend=1</cli_template>
+  <cli_template>voice_ip=%IP% %PORT% query_ip=%IP% %QUERY_PORT% filetransfer_ip=%IP% %FILETRANSFER_PORT% %CONTROL_PASSWORD% %LOG%</cli_template>
   <cli_params>
-	<cli_param id="IP" cli_string="" />
+    <cli_param id="IP" cli_string="" />
     <cli_param id="PORT" cli_string="default_voice_port=" />
     <cli_param id="CONTROL_PASSWORD" cli_string="serveradmin_password=" />
   </cli_params>
   <reserve_ports>
-    <port type="add" id="QUERY_PORT_TS3" cli_string="query_port=">24</port>
-    <port type="add" id="FILETRANS_PORT_TS3" cli_string="filetransfer_port=">124</port>
+    <port type="add" id="QUERY_PORT" cli_string="query_port=">24</port>
+    <port type="add" id="FILETRANSFER_PORT" cli_string="filetransfer_port=">20046</port>
   </reserve_ports>
   <console_log>teamspeak3-server_win64/logs/ts3server_0.log</console_log>
   <exe_location>teamspeak3-server_win64</exe_location>
   <mods>
-    <mod key="ts3">
+    <mod key="default">
       <name>None</name>
     </mod>
   </mods>
   <replace_texts>
     <text key="webhost_ip">
-      <default></default>
-      <var></var>
       <filepath>teamspeak3-server_win64/query_ip_whitelist.txt</filepath>
-      <options></options>
     </text>
   </replace_texts>
-</game_config>
+  <server_params>
+    <param key="logappend=" type="select" id="LOG">
+      <option value="0">Disabled</option>
+      <option value="1">Enabled</option>
+      <options>ns</options>
+      <desc>The log output will be appended to the previous log file.</desc>
+    </param>
+  </server_params>
+</game_config>

+ 2 - 1
modules/config_games/set_mods.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -21,6 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
+
 function exec_ogp_module() {
 	@$arch = $_POST['arch'];
 	@$os = $_POST['os'];

+ 2 - 1
modules/config_games/set_params.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -21,6 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
+
 function exec_ogp_module() {
 	@$arch = $_POST['arch'];
 	@$os = $_POST['os'];

+ 2 - 2
modules/config_games/xml_config_creator.php

@@ -2,7 +2,7 @@
 /*
  *
  * OGP - Open Game Panel
- * Copyright (C) Copyright (C) 2008 - 2013 The OGP Development Team
+ * Copyright (C) 2008 - 2017 The OGP Development Team
  *
  * http://www.opengamepanel.org/
  *
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
- 
+
 function exec_ogp_module() {
 	?>
 	<h2>XML Config Creator</h2>

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików