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

Conflicts:
	Templates/Profile/overview.tpl

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/config.tpl

@@ -179,7 +179,32 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
 		<td><b><?php echo (ERROR_REPORT=="error_reporting (0);")? "No": "Yes";?></b></td>
 	</tr>
 	</table>
+    <table id="member">
+        <thead>
+            <tr>
+                <th>New Mechanics and Functions <a href="admin.php?p=editNewFunctions"><img src="../img/admin/edit.gif" title="Edit New Mechanics and Functions"></a></th>
+            </tr>
+        </thead>
+    </table>
 
+    <table id="profile">
+        <tr>
+            <td class="b"><?php echo SERV_VARIABLE ?></td>
+            <td class="b"><?php echo SERV_VALUE ?></td>
+        </tr>
+        <tr>
+            <td>Display oasis in profile <em class="tooltip">?<span class="classic">Enable (Disable) the display of oases of each village in the player profile</span></em></td>
+            <td><?php echo NEW_FUNCTIONS_OASIS ? "<b><font color='Green'>Enabled</font></b>" : "<b><font color='Red'>Disabled</font></b>"; ?></td>
+        </tr>
+        <tr>
+            <td>Alliance invitation message <em class="tooltip">?<span class="classic">Enable (Disable) sending an in-game message to the player, if he was invited to the alliance</span></em></td>
+            <td><?php echo NEW_FUNCTIONS_ALLIANCE_INVITATION ? "<b><font color='Green'>Enabled</font></b>" : "<b><font color='Red'>Disabled</font></b>"; ?></td>
+        </tr>
+        <tr>
+            <td>New Alliance & Embassy Mechanics <em class="tooltip">?<span class="classic">For this setting, you can find more information on the link: <a href="https://github.com/Shadowss/TravianZ/wiki/New-Alliance-&-Embassy-Mechanics" target="_blank">https://github.com</a></span></em></td>
+            <td><?php echo NEW_FUNCTIONS_EMBASSY_MECHANICS ? "<b><font color='Green'>Enabled</font></b>" : "<b><font color='Red'>Disabled</font></b>"; ?></td>
+        </tr>
+    </table>
     <table id="member">
         <thead>
             <tr>

Admin/Templates/editNewFunctions.tpl

@@ -0,0 +1,62 @@
+<?php
+#################################################################################
+##              -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =-                 ##
+## --------------------------------------------------------------------------- ##
+##  Filename       editNewFunctions.tpl                                        ##
+##  Developed by:  velhbxtyrj                                                  ##
+##  License:       TravianZ Project                                            ##
+##  Copyright:     TravianZ (c) 2010-2014. All rights reserved.                ##
+##                                                                             ##
+#################################################################################
+if (!isset($_SESSION)) {
+ session_start();
+}
+if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
+?>
+<h2><center><?php echo SERV_CONFIG ?></center></h2>
+	<form action="../GameEngine/Admin/Mods/editNewFunctions.php" method="POST">
+		<input type="hidden" name="id" id="id" value="<?php echo $_SESSION['id']; ?>">
+			<br />
+			<table id="profile" cellpadding="0" cellspacing="0">
+				<thead>
+					<tr>
+						<th colspan="2">Edit New Mechanics and Functions</th>
+					</tr>
+				</thead>
+				<tbody>
+				<tr>
+					<td width="50%">Display oasis in profile <em class="tooltip">?<span class="classic">Turns on or off the display of oases of each village in the player profile</span></em></td>
+					<td width="50%">
+                        <select name="new_functions_oasis">
+								<option value="True" <?php if(NEW_FUNCTIONS_OASIS == true) echo "selected";?>>True</option>
+								<option value="False" <?php if(NEW_FUNCTIONS_OASIS == false) echo "selected";?>>False</option>
+						</select>
+                    </td>
+				</tr>
+                <tr>
+					<td>Alliance invitation message <em class="tooltip">?<span class="classic">Enable (Disable) sending an in-game message to the player, if he was invited to the alliance</span></em></td>
+					<td>
+                        <select name="new_functions_alliance_invitation">
+								<option value="True" <?php if(NEW_FUNCTIONS_ALLIANCE_INVITATION == true) echo "selected";?>>True</option>
+								<option value="False" <?php if(NEW_FUNCTIONS_ALLIANCE_INVITATION == false) echo "selected";?>>False</option>
+						</select>
+                    </td>
+				</tr>
+                <tr>
+					<td>New Alliance & Embassy Mechanics <em class="tooltip">?<span class="classic">For this setting, you can find more information on the link: <a href="https://github.com/Shadowss/TravianZ/wiki/New-Alliance-&-Embassy-Mechanics" target="_blank">https://github.com</a></span></em></td>
+					<td>
+                        <select name="new_functions_embassy_mechanics">
+								<option value="True" <?php if(NEW_FUNCTIONS_EMBASSY_MECHANICS == true) echo "selected";?>>True</option>
+								<option value="False" <?php if(NEW_FUNCTIONS_EMBASSY_MECHANICS == false) echo "selected";?>>False</option>
+						</select>
+                    </td>
+				</tr>
+				</tbody>
+			</table>
+			<br />
+			<table width="100%">
+				<tr><td align="left"><a href="../Admin/admin.php?p=config"><< <?php echo EDIT_BACK ?></a></td>
+					<td align="right"><input type="image" border="0" src="../img/admin/b/ok1.gif"></td>
+				</tr>
+			</table>
+		</form>

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>