Procházet zdrojové kódy

Little fixes in text replacements.

DieFeM před 12 roky
rodič
revize
a6c6431fa6

+ 10 - 10
modules/config_games/server_configs/7_days_to_die_alpha.xml

@@ -20,12 +20,12 @@
       <filepath>serverconfig.xml</filepath>
       <options>tagValueByName</options>
     </text>
-	<text key="max_players">
-	  <default>property</default>
-	  <var>ServerMaxPlayerCount</var>
-	  <filepath>serverconfig.xml</filepath>
-	  <options>tagValueByName</options>
-	</text>
+    <text key="max_players">
+      <default>property</default>
+      <var>ServerMaxPlayerCount</var>
+      <filepath>serverconfig.xml</filepath>
+      <options>tagValueByName</options>
+    </text>
     <text key="control_password">
       <default>property</default>
       <var>ControlPanelPassword</var>
@@ -44,13 +44,13 @@
       <filepath>serverconfig.xml</filepath>
       <options>tagValueByName</options>
     </text>
-	<text key="map">
+    <text key="map">
       <default>property</default>
       <var>GameWorld</var>
       <filepath>serverconfig.xml</filepath>
       <options>tagValueByName</options>
     </text>
-	<text key="query_port">
+    <text key="query_port">
       <default>property</default>
       <var>TelnetPort</var>
       <filepath>serverconfig.xml</filepath>
@@ -60,7 +60,7 @@
   <custom_fields>
     <field key="ControlPanelEnabled" type="select">
       <option value="true">Yes</option>
-	  <option value="false">No</option>
+      <option value="false">No</option>
       <default>property</default>
       <default_value>false</default_value>
       <var>ControlPanelEnabled</var>
@@ -70,7 +70,7 @@
     </field>
     <field key="TelnetEnabled" type="select">
       <option value="true">Yes</option>
-	  <option value="false">No</option>
+      <option value="false">No</option>
       <default>property</default>
       <default_value>true</default_value>
       <var>TelnetEnabled</var>

+ 13 - 13
modules/config_games/server_configs/7_days_to_die_beta.xml

@@ -12,9 +12,9 @@
   <mods>
     <mod key="7daystodie-alpha">
       <name>none</name>
-	  <installer_name>251570</installer_name>
-	  <betaname>alpha_6</betaname>
-	  <betapwd></betapwd>
+      <installer_name>251570</installer_name>
+      <betaname>alpha_6</betaname>
+      <betapwd></betapwd>
     </mod>
   </mods>
   <replace_texts>
@@ -24,12 +24,12 @@
       <filepath>serverconfig.xml</filepath>
       <options>tagValueByName</options>
     </text>
-	<text key="max_players">
-	  <default>property</default>
-	  <var>ServerMaxPlayerCount</var>
-	  <filepath>serverconfig.xml</filepath>
-	  <options>tagValueByName</options>
-	</text>
+    <text key="max_players">
+      <default>property</default>
+      <var>ServerMaxPlayerCount</var>
+      <filepath>serverconfig.xml</filepath>
+      <options>tagValueByName</options>
+    </text>
     <text key="control_password">
       <default>property</default>
       <var>ControlPanelPassword</var>
@@ -48,13 +48,13 @@
       <filepath>serverconfig.xml</filepath>
       <options>tagValueByName</options>
     </text>
-	<text key="map">
+    <text key="map">
       <default>property</default>
       <var>GameWorld</var>
       <filepath>serverconfig.xml</filepath>
       <options>tagValueByName</options>
     </text>
-	<text key="query_port">
+    <text key="query_port">
       <default>property</default>
       <var>TelnetPort</var>
       <filepath>serverconfig.xml</filepath>
@@ -64,7 +64,7 @@
   <custom_fields>
     <field key="ControlPanelEnabled" type="select">
       <option value="true">Yes</option>
-	  <option value="false">No</option>
+      <option value="false">No</option>
       <default>property</default>
       <default_value>false</default_value>
       <var>ControlPanelEnabled</var>
@@ -74,7 +74,7 @@
     </field>
     <field key="TelnetEnabled" type="select">
       <option value="true">Yes</option>
-	  <option value="false">No</option>
+      <option value="false">No</option>
       <default>property</default>
       <default_value>true</default_value>
       <var>TelnetEnabled</var>

+ 4 - 4
modules/config_games/server_configs/jcmp_linux.xml

@@ -23,25 +23,25 @@
   <replace_texts>
 	<text key="max_players">
 	  <default>(MaxPlayers\s*=)(.*)</default>
-	  <var>\1</var>
+	  <var>${1}</var>
 	  <filepath>config.lua</filepath>
 	  <options>sc</options>
 	</text>
     <text key="home_name">
       <default>(Name\s*=)(.*)</default>
-      <var>\1</var>
+      <var>${1}</var>
       <filepath>config.lua</filepath>
       <options>sqc</options>
     </text>
     <text key="ip">
       <default>(BindIP\s*=)(.*)</default>
-      <var>\1</var>
+      <var>${1}</var>
       <filepath>config.lua</filepath>
       <options>sqc</options>
     </text>
     <text key="port">
       <default>(BindPort\s*=)(.*)</default>
-      <var>\1</var>
+      <var>${1}</var>
       <filepath>config.lua</filepath>
       <options>sc</options>
     </text>

+ 4 - 4
modules/config_games/server_configs/jcmp_win32.xml

@@ -22,25 +22,25 @@
   <replace_texts>
 	<text key="max_players">
 	  <default>(MaxPlayers\s*=)(.*)</default>
-	  <var>\1</var>
+	  <var>${1}</var>
 	  <filepath>config.lua</filepath>
 	  <options>sc</options>
 	</text>
     <text key="home_name">
       <default>(Name\s*=)(.*)</default>
-      <var>\1</var>
+      <var>${1}</var>
       <filepath>config.lua</filepath>
       <options>sqc</options>
     </text>
     <text key="ip">
       <default>(BindIP\s*=)(.*)</default>
-      <var>\1</var>
+      <var>${1}</var>
       <filepath>config.lua</filepath>
       <options>sqc</options>
     </text>
     <text key="port">
       <default>(BindPort\s*=)(.*)</default>
-      <var>\1</var>
+      <var>${1}</var>
       <filepath>config.lua</filepath>
       <options>sc</options>
     </text>

+ 1 - 1
modules/gamemanager/cfg_text_replace.php

@@ -125,7 +125,7 @@ foreach($file_replacements as $filepath => $replacements)
 		if($param_enc != $file_enc)
 			$file_content = mb_convert_encoding($file_content, $param_enc, $file_enc);
 			
-		if( !in_array( $options, array("tags","tagValueByName","sc","sqc") ) )
+		if( !in_array( $options, array("tags","tagValueByName","sc","sqc","key-regex") ) )
 		{
 			$match_found = preg_match("/$default/m", $file_content);
 			if($var == "")