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

lang/Arabic/modules/dashboard.php

@@ -40,5 +40,5 @@ define('OGP_LANG_online_servers', "السيرفرات الأونلاين");
 define('OGP_LANG_add_games_in', "إذا كنت ترغب في إضافة ألعاب يمكنك أن تفعل ذلك في %s");
 define('OGP_LANG_currently_online', "متاح حاليا");
 define('OGP_LANG_game_servers', "سيرفرات الألعاب");
-define('OGP_LANG_select_remote_server', "Select Remote Server");
+define('OGP_LANG_select_remote_server', "حدد سيرفر التحكم");
 ?>

lang/French/modules/addonsmanager.php

@@ -63,8 +63,8 @@ define('OGP_LANG_addon_name_info', "Saisissez un nom pour votre Addon, ce sera l
 define('OGP_LANG_url_info', "Saisissez l'adresse internet (URL) hébergeant les fichiers à télécharger, si les fichiers sont compressés en zip ou en tar.gz, il seront automatiquement décompressés dans le répertoire racine du serveur ou dans le répertoire indiqué dans la rubrique 'Chemin'.");
 define('OGP_LANG_path_info', "Le répertoire doit être relatif au répertoire du serveur et ne contenir aucun slashes ('/') ni au début ni à la fin, exemple: 'cstrike/cfg'. Si le champ reste vide, le chemin par défaut sera le répertoire racine du serveur.");
 define('OGP_LANG_post-script_info', "Saisissez votre code en langage Bash, il sera exécuté comme un script, vous pouvez utiliser les variables de remplacement pour personnaliser l'installation, elles seront remplacées par les données du serveur pour lequel l'Addon est installé. Le script s'exécutera depuis le répertoire racine du serveur ou depuis le répertoire indiqué dans la rubrique 'Chemin'.");
-define('OGP_LANG_show_to_group', "Show to group");
-define('OGP_LANG_all_groups', "All groups");
-define('OGP_LANG_show_addons_for_selected_group', "Show addons for selected group");
-define('OGP_LANG_group', "Group");
+define('OGP_LANG_show_to_group', "Montrer au groupe");
+define('OGP_LANG_all_groups', "Tous les groupes");
+define('OGP_LANG_show_addons_for_selected_group', "Montrer l'addon pour le groupe sélectionné");
+define('OGP_LANG_group', "Groupe");
 ?>

lang/Hungarian/global.php

@@ -99,7 +99,7 @@ define('OGP_LANG_ftp_admin', "FTP felhasználók");
 define('OGP_LANG_orders', "Rendelések");
 define('OGP_LANG_services', "Szolgáltatások");
 define('OGP_LANG_shop_settings', "Bolt beállítások");
-define('OGP_LANG_update', "Panel frissítés");
+define('OGP_LANG_update', "Panel frissítése");
 define('OGP_LANG_extras', "Extrák");
 define('OGP_LANG_show', "Mutasd ezt");
 define('OGP_LANG_show_all', "Összes szerver mutatása");

lang/Hungarian/modules/addonsmanager.php

@@ -63,8 +63,8 @@ define('OGP_LANG_addon_name_info', "Add meg ennek a kiegészítőnek a nevét, e
 define('OGP_LANG_url_info', "Adj meg egy webcímet ami tartalmazza a fájlt a letöltéshez, ha tömörítve van zip vagy tar.gz arhívumba, az ki lesz csomagolva a szerveren az alul megadott könyvtárba.");
 define('OGP_LANG_path_info', "Az elérési útnak relatívnak kell lennie a szerver mappához és nem tartalmazhat perjeleket az elején és a végén, pl.: cstrike/cfg. Ha üresen hagyod, akkor a szerver gyökérkönyvtárának az útvonalát fogja használni.");
 define('OGP_LANG_post-script_info', "Írd be a Bash nyelvi kódot, ez skriptként fog végrehajtódni, a szövegcserék használatával testre szabhatod a telepítést, azok helyettesítve lesznek a szerver adataival, amelyek a bővítményt telepíti. A parancsfájl a szerver gyökérmappájából vagy a megadott elérési útból indul.");
-define('OGP_LANG_show_to_group', "Show to group");
-define('OGP_LANG_all_groups', "All groups");
-define('OGP_LANG_show_addons_for_selected_group', "Show addons for selected group");
-define('OGP_LANG_group', "Group");
+define('OGP_LANG_show_to_group', "Mutasd csoportnak");
+define('OGP_LANG_all_groups', "Minden csoport");
+define('OGP_LANG_show_addons_for_selected_group', "A kijelölt csoportok kiegészítőinek megjelenítése");
+define('OGP_LANG_group', "Csoport");
 ?>

lang/Spanish/modules/dashboard.php

@@ -39,5 +39,5 @@ define('OGP_LANG_online_servers', "Servidores Online");
 define('OGP_LANG_add_games_in', "Sí desea añadir servidores vaya a %s");
 define('OGP_LANG_currently_online', "Ahora en Linea");
 define('OGP_LANG_game_servers', "Servidores de Juegos");
-define('OGP_LANG_select_remote_server', "Select Remote Server");
+define('OGP_LANG_select_remote_server', "Elije un servidor remoto");
 ?>

lang/Spanish/modules/litefm.php

@@ -82,7 +82,7 @@ define('OGP_LANG_message', "Mensaje");
 define('OGP_LANG_dest_email', "Email de destino");
 define('OGP_LANG_remove', "Borrar");
 define('OGP_LANG_send_by_email', "Enviar por email");
-define('OGP_LANG_send_by_email_info', "Para enviar archivos el paquete 'mutt' debe estar instalado en todos los agentes disponibles.");
+define('OGP_LANG_send_by_email_info', "Para poder enviar archivos por correo electrónico el paquete 'mutt' debe estar instalado en el sistema operativo de todos los agentes disponibles.");
 define('OGP_LANG_settings_updated', "Configuración actualizada.");
 define('OGP_LANG_update_settings', "Actualizar configuración");
 ?>

modules/config_games/server_configs/empyriongs_win64.xml

@@ -3,7 +3,7 @@
   <protocol>lgsl</protocol>
   <lgsl_query_name>empyriongs</lgsl_query_name>
   <installer>steamcmd</installer>
-  <game_name>Empyrion – Galactic Survival (won't work, prototype only)</game_name>
+  <game_name>Empyrion – Galactic Survival (WIP)</game_name>
   <server_exec_name>EmpyrionLauncher.exe</server_exec_name>
   <cli_template>-startDedi -dedicated dedicated.yaml</cli_template>
   <console_log>Logs/Dedicated.log</console_log>

modules/config_games/server_configs/starbound_linux64.xml

@@ -1,64 +1,93 @@
 <game_config>
-	<game_key>starbound_linux64</game_key>
-	<protocol>gameq</protocol>
-	<gameq_query_name>starbound</gameq_query_name>
-	<installer>steamcmd</installer>
-	<game_name>Starbound</game_name>
-	<server_exec_name>starbound_server</server_exec_name>
-	<exe_location>linux</exe_location>
-	<max_user_amount>512</max_user_amount>
-	<mods>
-		<mod key="starbound">
-			<name>none</name>
-			<installer_name>533830</installer_name>
-		</mod>
-	</mods>
-	<replace_texts>
-		<text key="home_name">
-			<default>"serverName" : "[\w\-\s]*"</default>
-			<var>"serverName" :</var>
-			<filepath>storage/starbound_server.config</filepath>
-			<options>sq</options>
-		</text>
-		<text key="control_password">
-			<default>"rconServerPassword" : "[\w\-\s]*"</default>
-			<var>"rconServerPassword" :</var>
-			<filepath>storage/starbound_server.config</filepath>
-			<options>sq</options>
-		</text>
-		<text key="port">
-			<default>"gameServerPort" : [\w\-\s]*</default>
-			<var>"gameServerPort" :</var>
-			<filepath>storage/starbound_server.config</filepath>
-			<options>s</options>
-		</text>
-		<text key="max_players">
-			<default>"maxPlayers" : [\w\-\s]*</default>
-			<var>"maxPlayers" :</var>
-			<filepath>storage/starbound_server.config</filepath>
-			<options>s</options>
-		</text>
-		<text key="true">
-			<default>"runRconServer" : [\w\-\s]*</default>
-			<var>"runRconServer" : true</var>
-			<filepath>storage/starbound_server.config</filepath>
-			<options></options>
-		</text>
-		<text key="true">
-			<default>"runQueryServer" : [\w\-\s]*</default>
-			<var>"runQueryServer" : true</var>
-			<filepath>storage/starbound_server.config</filepath>
-			<options></options>
-		</text>
-	</replace_texts>
-	<custom_fields>
-		<field key="rconServerPort" type="text">
-			<default>"rconServerPort" : [\w\-\s]*</default>
-			<default_value>21026</default_value>
-			<var>"rconServerPort" :</var>
-			<filepath>storage/starbound_server.config</filepath>
-			<options>s</options>
-			<desc>RCON Server port</desc>
-		</field>
-	</custom_fields>
+  <game_key>starbound_linux64</game_key>
+  <protocol>gameq</protocol>
+  <gameq_query_name>starbound</gameq_query_name>
+  <installer>steamcmd</installer>
+  <game_name>Starbound</game_name>
+  <server_exec_name>starbound_server</server_exec_name>
+  <console_log>storage/starbound_server.log</console_log>
+  <exe_location>linux</exe_location>
+  <max_user_amount>128</max_user_amount>
+  <mods>
+    <mod key="starbound1">
+      <name>Stable</name>
+      <installer_name>533830</installer_name>
+    </mod>
+    <mod key="starbound2">
+      <name>Unstable</name>
+      <installer_name>532330</installer_name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="ip">
+      <default>"gameServerBind" : "[\:\.\d]*"</default>
+      <var>"gameServerBind" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>sq</options>
+    </text>
+    <text key="ip">
+      <default>"queryServerBind" : "[\:\.\d]*"</default>
+      <var>"queryServerBind" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>sq</options>
+    </text>
+    <text key="ip">
+      <default>"rconServerBind" : "[\:\.\d]*"</default>
+      <var>"rconServerBind" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>sq</options>
+    </text>
+    <text key="port">
+      <default>"gameServerPort" : [\w\-\s]*</default>
+      <var>"gameServerPort" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>s</options>
+    </text>
+    <text key="control_password">
+      <default>"rconServerPassword" : "[\w\-\s]*"</default>
+      <var>"rconServerPassword" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>sq</options>
+    </text>
+    <text key="max_players">
+      <default>"maxPlayers" : [\w\-\s]*</default>
+      <var>"maxPlayers" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>s</options>
+    </text>
+    <text key="home_name">
+      <default>"serverName" : "[\w\-\s]*"</default>
+      <var>"serverName" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>sq</options>
+    </text>
+    <text key="true">
+      <default>"runQueryServer" : [\w\-\s]*</default>
+      <var>"runQueryServer" : true</var>
+      <filepath>storage/starbound_server.config</filepath>
+    </text>
+  </replace_texts>
+  <custom_fields>
+    <field key="RCON Enabled" type="select">
+      <option value="false">False</option>
+      <option value="true">True</option>
+      <default>"runRconServer" : [\w\-\s]*</default>
+      <default_value>false</default_value>
+      <var>"runRconServer" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>s</options>
+      <desc>Enable/Disable RCON.</desc>
+    </field>
+    <field key="RCON Port" type="text">
+      <default>"rconServerPort" : [\w\-\s]*</default>
+      <default_value>21026</default_value>
+      <var>"rconServerPort" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>s</options>
+      <desc>Port of RCON.</desc>
+    </field>
+  </custom_fields>
+  <configuration_files>
+    <file description="Server Configurations">storage/starbound_server.config</file>
+  </configuration_files>
 </game_config>

modules/config_games/server_configs/starbound_win64.xml

@@ -0,0 +1,93 @@
+<game_config>
+  <game_key>starbound_win64</game_key>
+  <protocol>gameq</protocol>
+  <gameq_query_name>starbound</gameq_query_name>
+  <installer>steamcmd</installer>
+  <game_name>Starbound</game_name>
+  <server_exec_name>starbound_server.exe</server_exec_name>
+  <console_log>storage/starbound_server.log</console_log>
+  <exe_location>win64</exe_location>
+  <max_user_amount>128</max_user_amount>
+  <mods>
+    <mod key="starbound1">
+      <name>Stable</name>
+      <installer_name>533830</installer_name>
+    </mod>
+    <mod key="starbound2">
+      <name>Unstable</name>
+      <installer_name>532330</installer_name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="ip">
+      <default>"gameServerBind" : "[\*\.\d]*"</default>
+      <var>"gameServerBind" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>sq</options>
+    </text>
+    <text key="ip">
+      <default>"queryServerBind" : "[\*\.\d]*"</default>
+      <var>"queryServerBind" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>sq</options>
+    </text>
+    <text key="ip">
+      <default>"rconServerBind" : "[\*\.\d]*"</default>
+      <var>"rconServerBind" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>sq</options>
+    </text>
+    <text key="port">
+      <default>"gameServerPort" : [\w\-\s]*</default>
+      <var>"gameServerPort" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>s</options>
+    </text>
+    <text key="control_password">
+      <default>"rconServerPassword" : "[\w\-\s]*"</default>
+      <var>"rconServerPassword" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>sq</options>
+    </text>
+    <text key="max_players">
+      <default>"maxPlayers" : [\w\-\s]*</default>
+      <var>"maxPlayers" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>s</options>
+    </text>
+    <text key="home_name">
+      <default>"serverName" : "[\w\-\s]*"</default>
+      <var>"serverName" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>sq</options>
+    </text>
+    <text key="true">
+      <default>"runQueryServer" : [\w\-\s]*</default>
+      <var>"runQueryServer" : true</var>
+      <filepath>storage/starbound_server.config</filepath>
+    </text>
+  </replace_texts>
+  <custom_fields>
+    <field key="RCON Enabled" type="select">
+      <option value="false">False</option>
+      <option value="true">True</option>
+      <default>"runRconServer" : [\w\-\s]*</default>
+      <default_value>false</default_value>
+      <var>"runRconServer" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>s</options>
+      <desc>Enable/Disable RCON.</desc>
+    </field>
+    <field key="RCON Port" type="text">
+      <default>"rconServerPort" : [\w\-\s]*</default>
+      <default_value>21026</default_value>
+      <var>"rconServerPort" :</var>
+      <filepath>storage/starbound_server.config</filepath>
+      <options>s</options>
+      <desc>Port of RCON.</desc>
+    </field>
+  </custom_fields>
+  <configuration_files>
+    <file description="Server Configurations">storage/starbound_server.config</file>
+  </configuration_files>
+</game_config>

modules/config_games/server_configs/wreckfest_win32.xml

@@ -0,0 +1,67 @@
+<game_config>
+  <game_key>wreckfest_win32</game_key>
+  <protocol>lgsl</protocol>
+  <lgsl_query_name>wreckfest</lgsl_query_name>
+  <installer>steamcmd</installer>
+  <game_name>Wreckfest</game_name>
+  <server_exec_name>server/Wreckfest.exe</server_exec_name>
+  <query_port type="add">-6524</query_port>
+  <cli_template>-s server_config=server_config.cfg</cli_template>
+  <max_user_amount>24</max_user_amount>
+  <mods>
+    <mod key="default">
+      <name>None</name>
+      <installer_name>361580</installer_name>
+      <installer_login>anonymous</installer_login>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="port">
+      <default>game_port=.*</default>
+      <var>game_port=</var>
+      <filepath>server_config.cfg</filepath>
+    </text>
+    <text key="query_port">
+      <default>query_port=.*</default>
+      <var>query_port=</var>
+      <filepath>server_config.cfg</filepath>
+    </text>
+    <text key="max_players">
+      <default>max_players=.*</default>
+      <var>max_players=</var>
+      <filepath>server_config.cfg</filepath>
+      <occurrence>2</occurrence>
+    </text>
+    <text key="home_name">
+      <default>server_name=.*</default>
+      <var>server_name=</var>
+      <filepath>server_config.cfg</filepath>
+      <occurrence>2</occurrence>
+    </text>
+  </replace_texts>
+  <custom_fields>
+    <field key="Steam Port" type="text">
+      <default>steam_port=.*</default>
+      <default_value>27015</default_value>
+      <var>steam_port=</var>
+      <filepath>server_config.cfg</filepath>
+      <options>ns</options>
+      <access>admin</access>
+      <desc>Port of Game.</desc>
+    </field>
+  </custom_fields>
+  <post_install>
+    config="server_config.cfg"
+    if [ -s "$config" ]
+      then
+        echo "File $config found. OK!"
+      else
+        echo "File $config not found."
+        echo "Copying default config file in $config!"
+        cp -f initial_$config $config
+    fi
+  </post_install>
+  <configuration_files>
+    <file description="Advanced Modifications">server_config.cfg</file>
+  </configuration_files>
+</game_config>

protocol/GameQ/gameq/protocols/starbound.php

@@ -19,9 +19,6 @@
 /**
  * Starbound Protocol Class
  *
- * Unable to test if player information is returned.  Also appears the challenge procedure
- * is ignored.
- *
  * @author Austin Bischoff <[email protected]>
  */
 class GameQ_Protocols_Starbound extends GameQ_Protocols_Source
@@ -30,25 +27,4 @@ class GameQ_Protocols_Starbound extends GameQ_Protocols_Source
 	protected $name_long = "Starbound";
 
 	protected $port = 21025;
-        
-        /**
-	 * Array of packets we want to look up. (Modified from A2S default.)
-	 * Each key should correspond to a defined method in this or a parent class
-	 *
-	 * @var array
-	 */
-	protected $packets = array(
-		self::PACKET_CHALLENGE => "\xFF\xFF\xFF\xFF\x57",
-		self::PACKET_DETAILS => "\xFF\xFF\xFF\xFFTSource Engine Query\x00",
-		self::PACKET_PLAYERS => "\xFF\xFF\xFF\xFF\x55%s",
-		self::PACKET_RULES => "\xFF\xFF\xFF\xFF\x56%s",
-	);
-        
-        /**
-	* Set the packet mode to linear, Starbound does not support multi packet mode.
-	*
-	* @var string
-	*/
-	protected $packet_mode = self::PACKET_MODE_LINEAR;
-
 }

protocol/lgsl/lgsl_protocol.php

@@ -159,7 +159,8 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"wolfet"		=> "Wolfenstein: Enemy Territory",
 		"wolfrtcw"		=> "Wolfenstein: Return To Castle Wolfenstein",
 		"wolf2009"		=> "Wolfenstein ( 2009 By Raven )",
-		"xonotic"		=> "Xonotic"); 
+		"wreckfest"		=> "Wreckfest",
+		"xonotic"		=> "Xonotic");
 	}
 
 //------------------------------------------------------------------------------------------------------------+
@@ -314,6 +315,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"wolfet"		=> "02",
 		"wolfrtcw"		=> "02",
 		"wolf2009"		=> "10",
+		"wreckfest"		=> "05",
 		"xonotic"		=> "02");
 
 		return $lgsl_protocol_list;
@@ -461,6 +463,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"wolfet"		=> "qtracker://{IP}:{S_PORT}?game=WolfensteinEnemyTerritory&action=show",
 		"wolfrtcw"		=> "qtracker://{IP}:{S_PORT}?game=ReturntoCastleWolfenstein&action=show",
 		"wolf2009"		=> "http://en.wikipedia.org/wiki/Wolfenstein_(2009_video_game)",
+		"wreckfest"		=> "http://www.wreckfestgame.com/",
 		"xonotic"		=> "qtracker://{IP}:{S_PORT}?game=Xonotic&action=show");
 
 		// SOFTWARE PORT IS THE QUERY PORT UNLESS SET
@@ -549,6 +552,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 			case "ut3"				: $c_to_q = -1277;	$c_def = 7777;	$q_def = 6500;	$c_to_s = 0;	break;
 			case "vietcong"			: $c_to_q = 10000;	$c_def = 5425;	$q_def = 15425;	$c_to_s = 0;	break;
 			case "vietcong2"		: $c_to_q = 0;		$c_def = 5001;	$q_def = 19967;	$c_to_s = 0;	break;
+			case "wreckfest"		: $c_to_q = -6524;	$c_def = 33540;	$q_def = 27016;	$c_to_s = 0;	break;
 			default					: $c_to_q = 0;		$c_def = 0;		$q_def = 0;		$c_to_s = 0;	break;
 		}