Merge remote-tracking branch 'origin/master'

GameEngine/Technology.php

@@ -165,21 +165,6 @@ class Technology {
 
 	public function getUnitList() {
 		global $database,$village;
-	// FIX BY MisterX
-	/*
-  	$controlloTruppeInRinforzo = $database->getEnforceControllTroops($village->wid);
-     	for($i=1;$i<=50;$i++) {
-     	if($controlloTruppeInRinforzo['u'.$i] >= "30000000")
-     	mysqli_query("UPDATE ".TB_PREFIX."enforcement set u".$i." = '0' where vref = $village->wid");
-     	}
-	//FIX BY Shadow and made by NIKO28
-	$controlloTruppe = $database->getUnit($village->wid);
-   	for($i=1;$i<=50;$i++) {
-   	if($controlloTruppe['u'.$i] >= "10000000")
-   	mysqli_query("UPDATE ".TB_PREFIX."units set u".$i." = '0' where vref = $village->wid");
-   	}
-	*/
-	// END FIX
 		$unitarray = func_num_args() == 1? $database->getUnit(func_get_arg(0)) : $village->unitall;
 		$listArray = array();
 		for($i=1;$i<count($this->unarray);$i++) {

README.md

@@ -222,3 +222,6 @@ TPLinux Changes:
 13. Fix fullscreen map in rtl layout
 14. Fix divesion by Zero bug in general statics
 --
+
+
+[![Join the chat at https://gitter.im/TravianZ-V8/Lobby](https://badges.gitter.im/TravianZ-V8/Lobby.svg)](https://gitter.im/TravianZ-V8/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

Templates/Profile/menu.tpl

@@ -3,13 +3,7 @@
  | <a href="spieler.php?s=1" <?php if(isset($_GET['s']) && $_GET['s'] == 1) { echo "class=\"selected\""; } ?>>Profile</a>
  | <a href="spieler.php?s=2" <?php if(isset($_GET['s']) && $_GET['s'] == 2) { echo "class=\"selected\""; } ?>>Preferences</a>
  | <a href="spieler.php?s=3" <?php if(isset($_GET['s']) && $_GET['s'] == 3) { echo "class=\"selected\""; } ?>>Account</a>
-  <?php
- if(isset($displayarray) && $displayarray['username'] == "Shadow"){
- ?>
  | <a href="spieler.php?s=5" <?php if(isset($_GET['s']) && $_GET['s'] == 5) { echo "class=\"selected\""; } ?>>Vacation</a>
-  <?php
- }
- ?>
  <?php
  if(GP_ENABLE) {
  ?>

Templates/Profile/vacation.tpl

@@ -22,14 +22,46 @@ include("menu.tpl"); ?>
 <input type="hidden" name="ft" value="p4">
 <input type="hidden" name="uid" value="<?php echo $session->uid; ?>" />
 
-    <table cellpadding="1" cellspacing="1" id="del_acc" class="account"><thead>
+<table cellpadding="1" cellspacing="1" id="del_acc" class="account"><thead>
 <tr>
     <th colspan="2">Vacation Mode</th>
+
 </tr>
 </thead><tbody>
 <tr>
 	<td class="note" colspan="2">If you plan on being away for an extended period of time and do not wish to set a sitter, you can set your account to Holiday Mode. During this time your account will stop produceing resource , CP , research , trops , etc , and stop receiving attacks , reinforcements, raid , essentially freezing your account. Remember, this just freezes your Travian, not time. If you are a member of Gold Club it will run out during this time and if you have automatic renewal selected, the automatic renewal feature will be cancelled while in Holiday Mode.Please Note you must set min of 2 days vaction mode and NO MORE THEN 14 days.</td>
-</tr><tr>
+		</tr><tr>
+		
+
+<div>
+<h4 class="round">General description</h4>
+	Use vacation mode to protect your villages during you are away.<br/>
+	During the vacation will be inactive next actions:<br/>
+<ul>
+<li>Send or receive troops</li>
+<li>Start new construction order</li>
+<li>Use market</li>
+<li>Train new troops</li>
+<li>Join to an alliance</li>
+<li>Delete account</li>
+</ul></div>
+
+<h4 class="round">Conditions</h4>
+        <ul>
+           <li>No troops in movement</li>
+		   <li>No troops on way to other villages</li>
+		   <li>No troops send to reinforcements other villages</li>
+		   <li>No player have reinforcements on your villages</li>
+		   <li>Do not have Wonder World</li>
+		   <li>Do not have any artefacts</li>
+		   <li>You are no longer in player protections</li>
+		   <li>Do not have any troops in your traps</li>
+		   <li>Your account is not in deletion process.</li>        
+		   </ul>
+    </div>
+	</div>
+</div>
+
 
 <th>Want to activate Vacation Mode?</th>
         <td class="del_selection">