Merge pull request #298 from rocco27/master

Monthly update #2

lang/English/modules/register.php

@@ -52,4 +52,5 @@ define('OGP_LANG_user_registration', "User Registration");
 define('OGP_LANG_your_account_details_has_been_sent_by_email_to', "Your account details has been sent by email to <b>%s</b>.");
 define('OGP_LANG_account_created', "Your account has been created.");
 define('OGP_LANG_subject', "%s :: Account Information");
+define('OGP_LANG_form', "Register");
 ?>

modules/config_games/server_configs/homefront_win32.xml

@@ -33,7 +33,7 @@
   </replace_texts>
   <server_params>
     <param key="-authport=" type="text" id="STEAM_PORT">
-      <default>8770</default>
+      <default>8766</default>
       <options>ns</options>
       <access>admin</access>
       <desc>This is used to authenticate Steam accounts.</desc>

modules/config_games/server_configs/reignofkings_win64.xml

@@ -69,18 +69,9 @@
       <var>rConPort = '%key%'</var>
       <filepath>Configuration/ConsoleSettings.cfg</filepath>
       <options>key-regex</options>
+      <access>admin</access>
       <desc>Sets the port to RCON.</desc>
     </field>
-    <field key="Private" type="select">
-      <option value="False">False</option>
-      <option value="True">True</option>
-      <default>(isPrivate\s*=\s*')(.*)(')</default>
-      <default_value>False</default_value>
-      <var>isPrivate = '%key%'</var>
-      <filepath>Configuration/ServerSettings.cfg</filepath>
-      <options>key-regex</options>
-      <desc>Enables/disables the display in the public server browser.</desc>
-    </field>
     <field key="Level Name" type="select">
       <option value="CrownLand">CrownLand</option>
       <option value="StormWall">StormWall</option>
@@ -92,4 +83,10 @@
       <desc>Defines the map of the server.</desc>
     </field>
   </custom_fields>
+  <configuration_files>
+    <file description="Server Configurations">Configuration/ServerSettings.cfg</file>
+    <file description="Console Configurations">Configuration/ConsoleSettings.cfg</file>
+    <file description="User Configurations">Configuration/Users.cfg</file>
+    <file description="Whitelist Configurations">Configuration/Whitelist.cfg</file>
+  </configuration_files>
 </game_config>

protocol/TeamSpeak3/Adapter/Update.php

@@ -4,8 +4,6 @@
  * @file
  * TeamSpeak 3 PHP Framework
  *
- * $Id: Update.php 06/06/2016 22:27:13 scp@Svens-iMac $
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -20,12 +18,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package   TeamSpeak3
- * @version   1.1.24
  * @author    Sven 'ScP' Paulsen
  * @copyright Copyright (c) 2010 by Planet TeamSpeak. All rights reserved.
  */
 
 /**
+ * @deprecated
+ *
  * @class TeamSpeak3_Adapter_Update
  * @brief Provides methods to query the latest TeamSpeak 3 build numbers from the master server.
  */

protocol/TeamSpeak3/Helper/Convert.php

@@ -4,8 +4,6 @@
  * @file
  * TeamSpeak 3 PHP Framework
  *
- * $Id: Convert.php 06/06/2016 22:27:13 scp@Svens-iMac $
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -20,9 +18,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package   TeamSpeak3
- * @version   1.1.24
  * @author    Sven 'ScP' Paulsen
- * @copyright Copyright (c) 2010 by Planet TeamSpeak. All rights reserved.
+ * @copyright Copyright (c) Planet TeamSpeak. All rights reserved.
  */
 
 /**
@@ -332,7 +329,7 @@ class TeamSpeak3_Helper_Convert
   {
     if(!preg_match('/\A(?:(\xff\xd8\xff)|(GIF8[79]a)|(\x89PNG\x0d\x0a)|(BM)|(\x49\x49(\x2a\x00|\x00\x4a))|(FORM.{4}ILBM))/', $binary, $matches))
     {
-      return "application/octet-stream";
+      return "image/svg+xml";
     }
 
     $type = array(