xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-22 20:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	Admin/Templates/village.tpl
This commit is contained in:
Shadow
2014-03-04 13:47:54 +02:00
parent 19767cf6a6 f343a4a791
commit 2b02c0aadf
7 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Admin/Templates/village.tpl
+20
View File
@@ -164,24 +164,44 @@ if(isset($id))
<td><img class="r1" src="../img/x.gif"> Lumber</td> <td><img class="r1" src="../img/x.gif"> Lumber</td>
<td><center><?php echo floor($village['wood']); ?></center></td> <td><center><?php echo floor($village['wood']); ?></center></td>
<td rowspan="3"><center><?php echo $village['maxstore'];?></center></td> <td rowspan="3"><center><?php echo $village['maxstore'];?></center></td>
<<<<<<< HEAD
<td><center><?php echo $production['wood'];?></td> <td><center><?php echo $production['wood'];?></td>
=======
<td><center><?php echo $village->getProd("wood"); ?></td>
<td><a href="admin.php?p=editResources&did=<?php echo $_GET['did']; ?>"><img src="../img/admin/edit.gif" title="Edit Resources and Capacity"></a></td>
>>>>>>> f343a4a791674f8f8eb4866de9e9a9fe67b15824
</tr> </tr>
</tr> </tr>
<tr> <tr>
<td><img class="r2" src="../img/x.gif"> Clay</td> <td><img class="r2" src="../img/x.gif"> Clay</td>
<td><center><?php echo floor($village['clay']); ?></center></td> <td><center><?php echo floor($village['clay']); ?></center></td>
<<<<<<< HEAD
<td><center><?php echo $production['clay'];?></center></td> <td><center><?php echo $production['clay'];?></center></td>
=======
<td><center><?php echo $village->getProd("clay"); ?></center></td>
<td><a href="admin.php?p=editResources&did=<?php echo $_GET['did']; ?>"><img src="../img/admin/edit.gif" title="Edit Resources and Capacity"></a></td>
>>>>>>> f343a4a791674f8f8eb4866de9e9a9fe67b15824
</tr> </tr>
<tr> <tr>
<td><img class="r3" src="../img/x.gif"> Iron</td> <td><img class="r3" src="../img/x.gif"> Iron</td>
<td><center><?php echo floor($village['iron']); ?></center></td> <td><center><?php echo floor($village['iron']); ?></center></td>
<<<<<<< HEAD
<td><center><?php echo $production['iron'];?></center></td> <td><center><?php echo $production['iron'];?></center></td>
=======
<td><center><?php echo $village->getProd("iron"); ?></center></td>
<td><a href="admin.php?p=editResources&did=<?php echo $_GET['did']; ?>"><img src="../img/admin/edit.gif" title="Edit Resources and Capacity"></a></td>
>>>>>>> f343a4a791674f8f8eb4866de9e9a9fe67b15824
</tr> </tr>
<tr> <tr>
<td><img class="r4" src="../img/x.gif"> Crop</td> <td><img class="r4" src="../img/x.gif"> Crop</td>
<td><center><?php echo floor($village['crop']); ?></center></td> <td><center><?php echo floor($village['crop']); ?></center></td>
<td><center><?php echo $village['maxcrop'];?></center></td> <td><center><?php echo $village['maxcrop'];?></center></td>
<<<<<<< HEAD
<td><center><?php echo $production['crop'];?></center></td> <td><center><?php echo $production['crop'];?></center></td>
=======
<td><center><?php echo $village->getProd("crop"); ?></center></td>
<td><a href="admin.php?p=editResources&did=<?php echo $_GET['did']; ?>"><img src="../img/admin/edit.gif" title="Edit Resources and Capacity"></a></td>
>>>>>>> f343a4a791674f8f8eb4866de9e9a9fe67b15824
</tr> </tr>
</tbody> </tbody>
</table> </table>
GameEngine/Session.php
+21 -10
View File
@@ -84,16 +84,27 @@ class Session {
$_SESSION['checker'] = $generator->generateRandStr(3); $_SESSION['checker'] = $generator->generateRandStr(3);
$_SESSION['mchecker'] = $generator->generateRandStr(5); $_SESSION['mchecker'] = $generator->generateRandStr(5);
$_SESSION['qst'] = $database->getUserField($_SESSION['username'], "quest", 1); $_SESSION['qst'] = $database->getUserField($_SESSION['username'], "quest", 1);
if(!isset($_SESSION['wid'])) { $result = mysql_query("SELECT village_select FROM `". TB_PREFIX."users` WHERE `username`='".$_SESSION['username']."'");
$query = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `owner` = ' . $database->getUserField($_SESSION['username'], "id", 1) . ' LIMIT 1'); $dbarray = mysql_fetch_assoc($result);
$data = mysql_fetch_assoc($query); $selected_village=$dbarray['village_select'];
$_SESSION['wid'] = $data['wref']; if(!isset($_SESSION['wid'])) {
} else if($selected_village!='') {
if($_SESSION['wid'] == '') { $query = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `wref` = '.$selected_village);
$query = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `owner` = ' . $database->getUserField($_SESSION['username'], "id", 1) . ' LIMIT 1'); }else{
$data = mysql_fetch_assoc($query); $query = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `owner` = ' . $database->getUserField($_SESSION['username'], "id", 1) . ' LIMIT 1');
$_SESSION['wid'] = $data['wref']; }
} $data = mysql_fetch_assoc($query);
$_SESSION['wid'] = $data['wref'];
} else
if($_SESSION['wid'] == '') {
if($selected_village!='') {
$query = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `wref` = '.$selected_village);
}else{
$query = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `owner` = ' . $database->getUserField($_SESSION['username'], "id", 1) . ' LIMIT 1');
}
$data = mysql_fetch_assoc($query);
$_SESSION['wid'] = $data['wref'];
}
$this->PopulateVar(); $this->PopulateVar();
$logging->addLoginLog($this->uid, $_SERVER['REMOTE_ADDR']); $logging->addLoginLog($this->uid, $_SERVER['REMOTE_ADDR']);
Templates/News/newsbox1.tpl
+1 -1
View File
@@ -1,4 +1,4 @@
<h5><img src="img/en/t2/newsbox2.gif" alt="newsbox 2"></h5> <h5><img src="img/en/t2/newsbox1.gif" alt="newsbox 1"></h5>
<?php <?php
$online = mysql_num_rows(mysql_query("SELECT * FROM " . TB_PREFIX . "users WHERE " . time() . "-timestamp < (60*10) AND tribe!=0 AND tribe!=4 AND tribe!=5")); $online = mysql_num_rows(mysql_query("SELECT * FROM " . TB_PREFIX . "users WHERE " . time() . "-timestamp < (60*10) AND tribe!=0 AND tribe!=4 AND tribe!=5"));
dorf1.php
+2 -1
View File
@@ -15,7 +15,8 @@ if(isset($_GET['ok'])){
$database->updateUserField($session->uid,'ok','0','1'); $_SESSION['ok'] = '0'; $database->updateUserField($session->uid,'ok','0','1'); $_SESSION['ok'] = '0';
} }
if(isset($_GET['newdid'])) { if(isset($_GET['newdid'])) {
$_SESSION['wid'] = $_GET['newdid']; $_SESSION['wid'] = $_GET['newdid'];
$database->query("UPDATE ".TB_PREFIX."users SET village_select=".$_GET['newdid']." WHERE id=".$session->uid);
header("Location: ".$_SERVER['PHP_SELF']); header("Location: ".$_SERVER['PHP_SELF']);
}else{ }else{
$building->procBuild($_GET); $building->procBuild($_GET);
dorf2.php
+2 -1
View File
@@ -12,7 +12,8 @@
include("GameEngine/Village.php"); include("GameEngine/Village.php");
$start = $generator->pageLoadTimeStart(); $start = $generator->pageLoadTimeStart();
if(isset($_GET['newdid'])) { if(isset($_GET['newdid'])) {
$_SESSION['wid'] = $_GET['newdid']; $_SESSION['wid'] = $_GET['newdid'];
$database->query("UPDATE ".TB_PREFIX."users SET village_select=".$_GET['newdid']." WHERE id=".$session->uid);
header("Location: ".$_SERVER['PHP_SELF']); header("Location: ".$_SERVER['PHP_SELF']);
}else{ }else{
$building->procBuild($_GET); $building->procBuild($_GET);
dorf3.php
+2 -1
View File
@@ -14,7 +14,8 @@
include("GameEngine/Village.php"); include("GameEngine/Village.php");
$start = $generator->pageLoadTimeStart(); $start = $generator->pageLoadTimeStart();
if(isset($_GET['newdid'])) { if(isset($_GET['newdid'])) {
$_SESSION['wid'] = $_GET['newdid']; $_SESSION['wid'] = $_GET['newdid'];
$database->query("UPDATE ".TB_PREFIX."users SET village_select=".$_GET['newdid']." WHERE id=".$session->uid);
if(isset($_GET['s'])){ if(isset($_GET['s'])){
header("Location: ".$_SERVER['PHP_SELF']."?s=".$_GET['s']); header("Location: ".$_SERVER['PHP_SELF']."?s=".$_GET['s']);
}else{ }else{
install/data/sql.sql
+1
View File
@@ -1500,6 +1500,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%users` (
`friend18wait` int(11) unsigned NOT NULL, `friend18wait` int(11) unsigned NOT NULL,
`friend19wait` int(11) unsigned NOT NULL, `friend19wait` int(11) unsigned NOT NULL,
`maxevasion` mediumint(3) unsigned NOT NULL, `maxevasion` mediumint(3) unsigned NOT NULL,
`village_select` bigint(20) yes NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ;