Merge branch 'master' of https://github.com/Shadowss/TravianZ

Admin/Templates/alliance.tpl

@@ -91,7 +91,7 @@ if($_GET['aid'])
 										$player = mysqli_fetch_assoc(mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE id = ".(int) $row['uid'].""));
 										if($row['opt1'] == 1) { $position1 = "Assign To Position"; } else { $position1 = "No Assigning Positions"; }
 										if($row['opt2'] == 1) { $position2 = "Kick Players"; } else { $position2 = "No Kicking Players"; }
-										if($row['opt3'] == 1) { $position3 = "Change Alliance Description"; } else { $position3 = "No Changing Description"; }
+										if($row['opt3'] == 1) { $position3 = "Change Description"; } else { $position3 = "No Changing Description"; }
 										if($row['opt4'] == 1) { $position4 = "Invite Players"; } else { $position4 = "No Invitations"; }
 										if($row['opt5'] == 1) { $position5 = "Manage Forums"; } else { $position5 = "No Forum Management"; }
 										if($row['opt6'] == 1) { $position6 = "Alliance Diplomacy"; } else { $position6 = "No Diplomacy"; }
@@ -151,9 +151,9 @@ if($_GET['aid'])
 								</tr>
 								<tr>
 									<td class="desc2" colspan="2">
-										<center>
-											<?php echo nl2br($alidata['desc']); ?>
-										</center>
+										<center><div class="desc2div">
+											<?php echo nl2br($alidata['notice']); ?>
+										</div></center>
 									</td>
 								</tr>
 								<tr>
@@ -163,9 +163,9 @@ if($_GET['aid'])
 						</table>
 					</td>
 						<td class="desc1">
-							<center>
-								<?php echo nl2br($alidata['notice']); ?>
-							</center>
+							<center><div class="desc1div">
+								<?php echo nl2br($alidata['desc']); ?>
+							</div></center>
 						</td>
 					</tr>
 				</tr>

Admin/Templates/playerinfo.tpl

@@ -261,9 +261,9 @@
 								</td>
 							</tr>
 						</table>
-					<td class="desc1">
+					<td class="desc1"><div class="desc1div">
 						<center><?php echo nl2br($profiel[1]); ?></center>
-					</td>
+					</div></td>
 				</tr>
 			</tbody>
 		</table>

GameEngine/Admin/Mods/addUsers.php

@@ -135,7 +135,7 @@ WHERE id = ".(int) $uid) or die(mysqli_error($database->dblink));
                 }
 
                 $database->updateUserField($uid,"act","",1);
-                $wid = $database->generateBase($kid,0,false);
+                $wid = $database->generateBase($kid);
                 $database->setFieldTaken($wid);
 
                 //calculate random generate value and level building

GameEngine/Automation.php

@@ -3889,7 +3889,7 @@ class Automation {
             $starv = $getVillage['starv'];
             if ($crop < $villageUpkeep){
                 //Add starvation data
-                $database->setVillageFields($wref, ['starv', 'starvupdate'], [$villageUpkeep, time()]);
+                $database->setVillageFields($wref, ['starv'], [$villageUpkeep]);
             }
         }
     }

GameEngine/Database.php

@@ -1288,17 +1288,17 @@ class MYSQLi_DB implements IDbConnection {
             }
 
             switch($sector){
-            case 1:
-                $q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and (x < -$wide1 and x > -$wide2) and (y > $wide1 and y < $wide2) and occupied = 0"; //x- y+
-                break;
-            case 2:
-                $q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and (x > $wide1 and x < $wide2) and (y > $wide1 and y < $wide2) and occupied = 0"; //x+ y+
-                break;
-            case 3:
-                $q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and (x < -$wide1 and x > -$wide2) and (y < -$wide1 and y > -$wide2) and occupied = 0"; //x- y-
-                break;
-            default:
-                $q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and (x > $wide1 and x < $wide2) and (y < -$wide1 and y > -$wide2) and occupied = 0"; //x+ y-
+                case 1:
+                    $q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and (x < -$wide1 and x > -$wide2) and (y > $wide1 and y < $wide2) and occupied = 0"; //x- y+
+                    break;
+                case 2:
+                    $q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and (x > $wide1 and x < $wide2) and (y > $wide1 and y < $wide2) and occupied = 0"; //x+ y+
+                    break;
+                case 3:
+                    $q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and (x < -$wide1 and x > -$wide2) and (y < -$wide1 and y > -$wide2) and occupied = 0"; //x- y-
+                    break;
+                default:
+                    $q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and (x > $wide1 and x < $wide2) and (y < -$wide1 and y > -$wide2) and occupied = 0"; //x+ y-
             }
             
             $result = mysqli_query($this->dblink,$q);

Templates/Alliance/overview.tpl

@@ -106,12 +106,14 @@ include("alli_menu.tpl");
             </tr>
 			<?php } ?>
             <tr>
-                <td class="desc2" colspan="2"><?php echo stripslashes(nl2br($profiel[0])); ?>
+                <td class="desc2" colspan="2">
+                    <div class="desc2div"><?php echo stripslashes(nl2br($profiel[0])); ?></div>
                 </td>
             </tr>
             </table>
     </td>
-    <td class="desc1"><?php echo stripslashes(nl2br($profiel[1])); ?>
+    <td class="desc1">
+        <div class="desc1div"><?php echo stripslashes(nl2br($profiel[1])); ?></div>
     </td>
 </tr>
 </tbody>

Templates/Build/27_1.tpl

@@ -45,7 +45,7 @@ Treasury <b>' . $reqlvl . '</b>, Effect <b>' . $effect . '</b>
 </div>
 </td>';
         echo '<td class="pla"><a href="karte.php?d=' . $artefact['vref'] . '&c=' . $generator->getMapCheck($artefact['vref']) . '">' . $database->getVillageField($artefact['vref'], "name") . '</a></td>';
-        echo '<td class="dist">' . date("d/m/Y H:i", $artefact['conquered']) . '</td></tr>';
+        echo '<td class="dist">' . date("d.m.Y H:i", $artefact['conquered']) . '</td></tr>';
 }
                 }
 

Templates/Plus/3.tpl

@@ -71,6 +71,7 @@ else
         $holdmr = intval($holdtotmin - (($holdhr * 60) + ($holdtotday * 1440)));
         echo "<b> " . ($holdmr) . "</b> mins</font>";
     }
+}
     ?>
     </span></td>
 			<td class="dur"><?php
@@ -101,7 +102,6 @@ if (PLUS_TIME >= 86400) {
             echo '<a href="plus.php?s=1"><span class="none">too little gold';
         }
     }
-}
 ?>
     </span></a>
 			</td>

Templates/Profile/overview.tpl

@@ -146,7 +146,7 @@ if($displayarray['vac_mode'] == 1) echo "<tr><th colspan='2'><font color='Maroon
 
         </td>
         <td class="desc1" >
-            <div><?php echo nl2br($profiel[1]); ?>
+            <div class="desc1div"><?php echo nl2br($profiel[1]); ?>
             
             </div>
         </td>

Templates/menu.tpl

@@ -121,11 +121,11 @@ div.c1 {text-align: center}
     <div id="stime">
         <div id="ltime">
             <div id="ltimeWrap">
-                Calculated in <b><?php
-                echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
-                ?></b> ms
-                <br>
-                Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+                <?php echo CALCULATED_IN;?> <b><?php
+echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
+?></b> ms
+
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
             </div>
         </div>
     </div>

a2b2.php

@@ -359,9 +359,11 @@ include("Templates/res.tpl");
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000); ?></b> ms
+<?php echo CALCULATED_IN;?> <b><?php
+echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
+?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>

berichte.php

@@ -136,15 +136,15 @@ include("Templates/res.tpl");
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
 
 <div id="ce"></div>
 </body>
-</html>
+</html>

crop_finder.php

@@ -226,17 +226,11 @@ include("Templates/news.tpl");
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
-
-echo round(($generator->pageLoadTimeEnd() - $start_timer) * 1000);
-
+<?php echo CALCULATED_IN;?> <b><?php
+echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php
-
-   echo date('H:i:s');
-
-?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>

dorf2.php

@@ -93,11 +93,11 @@ include("Templates/res.tpl");
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>

dorf3.php

@@ -112,11 +112,11 @@ include("Templates/res.tpl");
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>

gpack/travian_default/lang/en/compact.css

@@ -3203,9 +3203,15 @@ td.cbg2 {
 .ddb {
     float: left;
 }
+.desc1div {
+    width: 236px;
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+}
 .desc2div {
-    overflow: hidden;
     width: 235px;
+    word-wrap: break-word;
+    overflow-wrap: break-word;
 }
 div.activation_time {
     padding-left: 5px;

img/admin/admin.css

@@ -527,7 +527,7 @@ table#profile thead th, table#profile tfoot th {background-image:url(../un/a/c2.
 table#profile thead td, table#profile tfoot td {background-color:#F3F3F3; text-align:center; width:50%;}
 table#profile tbody th, table#profile tbody td {text-align:left;}
 table#profile td.details {width:50%; height:156px; padding:0px; vertical-align:top; border-bottom:none;}
-table#profile td.details table {border-collapse:collapse; line-height:16px; margin-top:0px; width:100%;}
+table#profile td.details table {border-collapse:collapse; line-height:16px; margin-top:0px; width:100%; height:100%}
 table#profile td.details table th {width:50%; border-left:none; border-top:none; background:none;}
 table#profile td.details table td {border-right:none; border-left:none; border-top:none; text-align:left;}
 table#profile td.desc1, table#profile td.desc2 {width:50%; padding:0px 7px; vertical-align:middle;}
@@ -572,6 +572,17 @@ input#btn_forward {width:97px; background-image: url(b/forward.gif);}
 input#btn_demolish {width:97px; background-image: url(b/demolish.gif);}
 input#btn_search {width:97px; background-image: url(b/search.gif);}
 
+.desc1div {
+    width: 235px;
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+}
+.desc2div {
+    width: 234px;
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+}
+
 /* Start tooltips for the admin panel settings */
 .tooltip {
     position: relative;

karte.php

@@ -109,14 +109,14 @@ include("Templates/res.tpl");
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
 <div id="ce"></div>
 </body>
-</html>
+</html>

logout.php

@@ -83,14 +83,14 @@ include("Templates/footer.tpl");
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
 <div id="ce"></div>
 </body>
-</html>
+</html>

maintenance.php

@@ -108,8 +108,11 @@ if($_SESSION['ok'] == 2){
 			<div id="stime">
 				<div id="ltime">
 					<div id="ltimeWrap">
-						Calculated in <b><?php echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);?></b> ms
-						<br/>Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+						<?php echo CALCULATED_IN;?> <b><?php
+echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
+?></b> ms
+
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 					</div>
 				</div>
 			</div>

nachrichten.php

@@ -172,14 +172,14 @@ include("Templates/res.tpl");
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
 <div id="ce"></div>
 </body>
-</html>
+</html>

plus.php

@@ -170,15 +170,15 @@ include("Templates/res.tpl");
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
 
 <div id="ce"></div>
 </body>
-</html>
+</html>

plus1.php

@@ -97,15 +97,15 @@ include("Templates/res.tpl");
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
 
 <div id="ce"></div>
 </body>
-</html>
+</html>

rules.php

@@ -87,14 +87,14 @@ include("Templates/res.tpl");
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
 <div id="ce"></div>
 </body>
-</html>
+</html>

spieler.php

@@ -180,11 +180,11 @@ include("Templates/res.tpl");
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>

statistiken.php

@@ -190,11 +190,11 @@ include("Templates/res.tpl");
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
-echo round(($generator->pageLoadTimeEnd()-$__start)*1000);
+<?php echo CALCULATED_IN;?> <b><?php
+echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>

support.php

@@ -160,11 +160,11 @@ include("Templates/res.tpl");
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>

version.php

@@ -127,11 +127,11 @@ include("Templates/res.tpl");
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>

warsim.php

@@ -184,11 +184,11 @@ include("Templates/res.tpl");
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>

winner.php

@@ -243,8 +243,11 @@ if(isset($_GET['newdid'])) {
 			<div id="stime">
 				<div id="ltime">
 					<div id="ltimeWrap">
-						Calculated in <b><?php echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);?></b> ms
-						<br/>Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+						<?php echo CALCULATED_IN;?> <b><?php
+echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
+?></b> ms
+
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 					</div>
 				</div>
 			</div>