fix forum link + fix send resouces by village name + fix details in attack window for natars

GameEngine/Alliance.php

@@ -318,6 +318,16 @@
        			$database->insertAlliNotice($session->alliance, '<a href="spieler.php?uid=' . $session->uid . '">' . $session->username . '</a> kicked <a href="spieler.php?uid=' . $post['a_user'] . '">' . $UserData['username'] . '</a>.');
        			//header("Location: build.php?id=".$post['id']);
        		}
+       	}
+		/*****************************************
+       	Function to set forum link
+       	*****************************************/
+       	public function setForumLink($post) {
+       		global $database, $session;
+       			if(isset($post['f_link'])){
+       			$database->setAlliForumLink($session->alliance, $post['f_link']);
+				header("Location: allianz.php?s=5");
+				}
        	}
        	/*****************************************
        	Function to quit from alliance

GameEngine/Database/db_MYSQL.php

@@ -1075,7 +1075,7 @@
             References: 
             *****************************************/
             function createAlliance($tag, $name, $uid, $max) {
-                $q = "INSERT into " . TB_PREFIX . "alidata values (0,'$name','$tag',$uid,0,0,0,'','',$max,'','','','','','','','')";
+                $q = "INSERT into " . TB_PREFIX . "alidata values (0,'$name','$tag',$uid,0,0,0,'','',$max,'','','','','','','','','')";
                 mysql_query($q, $this->connection);
                 return mysql_insert_id($this->connection);
             }
@@ -1285,6 +1285,11 @@
                 return mysql_query($q, $this->connection);
             }
 
+            function setAlliForumLink($aid, $link) {
+                $q = "UPDATE " . TB_PREFIX . "alidata SET `forumlink` = '$link' WHERE id = $aid";
+                return mysql_query($q, $this->connection);
+            }
+			
             function getUserAlliance($id) {
                 $q = "SELECT " . TB_PREFIX . "alidata.tag from " . TB_PREFIX . "users join " . TB_PREFIX . "alidata where " . TB_PREFIX . "users.alliance = " . TB_PREFIX . "alidata.id and " . TB_PREFIX . "users.id = $id";
                 $result = mysql_query($q, $this->connection);
@@ -1485,7 +1490,7 @@
             }
 
             function removeNotice($id) {
-                $q = "UPDATE " . TB_PREFIX . "ndata set del = 1 where id = $id";
+                $q = "UPDATE " . TB_PREFIX . "ndata set del = 1,viewed = 1 where id = $id";
                 return mysql_query($q, $this->connection);
             }
 

GameEngine/Market.php

@@ -95,13 +95,12 @@ class Market {
         $reqMerc = ceil((array_sum($resource)-0.1)/$this->maxcarry); 
 
         if($this->merchantAvail() != 0 && $reqMerc <= $this->merchantAvail()) { 
-                if(isset($post['dname']) && $post['dname'] != "") { 
-                    $id = $database->getVillageByName($post['dname']); 
-                    $coor = $database->getCoor($id); 
-                } 
                 if(isset($post['x']) && isset($post['y']) && $post['x'] != "" && $post['y'] != "") { 
                     $coor = array('x'=>$post['x'], 'y'=>$post['y']); 
                     $id = $generator->getBaseID($coor['x'],$coor['y']); 
+                }else if(isset($post['dname']) && $post['dname'] != "") { 
+                    $id = $database->getVillageByName($post['dname']); 
+                    $coor = $database->getCoor($id); 
                 } 
                 if($database->getVillageState($id)) {
 					$timetaken = $generator->procDistanceTime($coor,$village->coor,$session->tribe,0); 
@@ -243,8 +242,9 @@ class Market {
      
     private function tradeResource($post) { 
         global $session,$database,$village; 
+		for($i = 1; $i <= 40; $i++){
 		$wwvillage = $database->getResourceLevel($village->wid);
-		if($wwvillage['f99t']!=40){
+		if($wwvillage['f99t']!=40 and $wwvillage['f'.$i.'t']!=40){
         if($session->userinfo['gold'] >= 3) { 
             //kijken of ze niet meer gs invoeren dan ze hebben 
 			if($session->access == BANNED){
@@ -264,6 +264,7 @@ class Market {
         }
 	}
     } 
+	}
      
 }; 
 $market = new Market; 

Templates/Alliance/linkforum.tpl

@@ -22,7 +22,7 @@ if($session->access!=BANNED){
 </thead><tbody>
 
 <tr><th>URL</th>
-<td><input class="link text" type="text" name="f_link" value="" maxlength="200"></td>
+<td><input class="link text" type="text" name="f_link" value="<?php echo $allianceinfo['forumlink']; ?>" maxlength="200"></td>
 </tr>
 
 <tr>

Templates/Alliance/overview.tpl

@@ -1,4 +1,4 @@
-<?php
+<?php
 if(isset($_GET['aid'])) {
 $aid = $_GET['aid'];
 }
@@ -87,10 +87,17 @@ include("alli_menu.tpl");
                 echo "<td><a href='spieler.php?uid=".$member['id']."'>".$name."</td>";
                 echo "</tr>";
                 } 
-                }?>
+				}
+			if($allianceinfo['forumlink'] != ''){
+                echo "<tr>";
+                echo "<td><a href='".$allianceinfo['forumlink']."'>» to the forum</td>";
+                echo "</tr>";
+                }else{
+			?>
                 <tr>
                 <td colspan="2" class="emmty"></td>
             </tr>
+			<?php } ?>
             <tr>
                 <td class="desc2" colspan="2"><?php echo nl2br($profiel[0]); ?>
                 </td>

Templates/Build/17.tpl

@@ -30,6 +30,7 @@ if(isset($_POST['ft'])=='check' && $allres!=0 && ($_POST['x']!="" && $_POST['y']
 <input type="hidden" name="id" value="<?php echo $id; ?>">
 <input type="hidden" name="x" value="<?php echo $_POST['x']; ?>">
 <input type="hidden" name="y" value="<?php echo $_POST['y']; ?>">
+<input type="hidden" name="dname" value="<?php echo $_POST['dname']; ?>">
 <table id="send_select" class="send_res" cellpadding="1" cellspacing="1">
 	<tr>
 		<td class="ico"><img class="r1" src="img/x.gif" alt="Fa" title="Fa" /></td> 
@@ -67,15 +68,17 @@ if(isset($_POST['ft'])=='check' && $allres!=0 && ($_POST['x']!="" && $_POST['y']
 		$getvilowner = $database->getVillageField($getwref, "owner");
 		$getvilcoor['y'] = $_POST['y'];
 		$getvilcoor['x'] = $_POST['x'];
+		$time = $generator->procDistanceTime($getvilcoor,$village->coor,$session->tribe,0);
 		}
 		else if($_POST['dname']!=""){
 		$getwref = $database->getVillageByName($_POST['dname']);
 		$getvilcoor = $database->getCoor($getwref);
 		$getvilname = $database->getVillageField($getwref, "name");
 		$getvilowner = $database->getVillageField($getwref, "owner");
+		$time = $generator->procDistanceTime($getvilcoor,$village->coor,$session->tribe,0);
 		}
         ?>
-		<td><a href="karte.php?d=<?php echo $getwref; ?>&c=<?php echo $generator->getMapCheck($getwref); ?>"><?php echo $getvilname; ?>(<?php echo $getvilcoor['y']; ?>|<?php echo $getvilcoor['x']; ?>)<span class="clear"></span></a></td>
+		<td><a href="karte.php?d=<?php echo $getwref; ?>&c=<?php echo $generator->getMapCheck($getwref); ?>"><?php echo $getvilname; ?>(<?php echo $getvilcoor['x']; ?>|<?php echo $getvilcoor['y']; ?>)<span class="clear"></span></a></td>
 	</tr>
 	<tr>
 		<th>Player:</th>
@@ -83,7 +86,7 @@ if(isset($_POST['ft'])=='check' && $allres!=0 && ($_POST['x']!="" && $_POST['y']
 	</tr>
 	<tr>
 		<th>duration:</th>
-		<td>-</td>
+		<td><?php echo $generator->getTimeFormat($time); ?></td>
 	</tr>
 	<tr>
 		<th>Merchants:</th>
@@ -163,7 +166,6 @@ if(isset($_POST['ft'])=='check' && $allres!=0 && ($_POST['x']!="" && $_POST['y']
 	<tr> 
 		<td class="mer">Merchants <?php echo $market->merchantAvail(); ?>/<?php echo $market->merchant; ?></td> 
 	</tr> 
-	<tr> 
 		<td class="vil"> 
 			<span>Villages:</span> 
 			<input class="text" type="text" name="dname" value="" maxlength="20" tabindex="5"> 

Templates/a2b/attack_5.tpl

@@ -67,7 +67,7 @@ $actionType = "Raid";
 
 						<th>Destination:</th>
 
-						<td><a href="karte.php?d=&amp;c="><?php echo $process[1]; ?> (<?php echo $coor['x']; ?>|<?php echo $coor['y']; ?>)</a></td>
+                        <td><a href="karte.php?d=<?php echo $process[0]; ?>&c=<?php echo $generator->getMapCheck($process[0]); ?>"><?php echo $process[1]; ?> (<?php echo $coor['x']; ?>|<?php echo $coor['y']; ?>)</a></td>
 
 					</tr>
 
@@ -209,6 +209,7 @@ $actionType = "Raid";
                                 <?php } ?>
                                 <option value="38">Great warehouse</option>
                                 <option value="39">Great granary</option>
+								<option value="40">Wonder of the World</option> 
                             </optgroup>
                             <?php } ?>
                             <?php if($building->getTypeLevel(16) >= 10) { ?>
@@ -262,6 +263,7 @@ $actionType = "Raid";
                                 <?php } ?>
                                 <option value="38">Great warehouse</option>
                                 <option value="39">Great granary</option>
+								<option value="40">Wonder of the World</option> 
                             </optgroup>
                             <?php } ?>
                             <?php if($building->getTypeLevel(16) >= 10) { ?>
@@ -371,8 +373,8 @@ $actionType = "Raid";
 			<td colspan="10">
 
 			<div class="in">in <?php echo $generator->getTimeFormat($time); ?></div>
-
-			<div class="at">at <span id="tp2"> <?php echo date("H:i:s",time()+$time)?></span><span> hours</span></div>
+			
+            <div class="at">at <span id="tp2"> <?php echo $generator->procMtime(date('U')+$time,9)?></span><span> hours</span></div>
 
 			</td>
 

allianz.php

@@ -208,6 +208,7 @@ if($_GET['aid'] or $session->alliance!=0){
        			}
        			break;
        		case 5:
+				$alliance->setForumLink($_POST);
        			include ("Templates/Alliance/linkforum.tpl");
        			break;
        		case 6:

install/data/sql.sql

@@ -218,6 +218,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%alidata` (
   `Adp` bigint(255) unsigned NOT NULL DEFAULT '0',
   `clp` bigint(255) NOT NULL DEFAULT '0',
   `oldrank` bigint(255) unsigned NOT NULL DEFAULT '0',
+  `forumlink` varchar(150) NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;