Merge pull request #204 from hardwarelayer/master

Master
This commit is contained in:
Shadow
2016-09-05 21:05:36 +03:00
committed by GitHub
8 changed files with 548 additions and 270 deletions
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -3863,6 +3863,6 @@ References:
};
$database = new MYSQL_DB;
$database = new MYSQLi_DB;
?>
+2
View File
@@ -61,6 +61,8 @@ class Session {
var $villages = array();
function Session() {
global $database; //TienTN fix
$this->time = time();
if (!isset($_SESSION)) session_start();
+19
View File
@@ -119,3 +119,22 @@ TravianZ is based on TravianX v6.0.0 or TravianZ or TravianX with some grapich c
106. Fix total of trapper bug is full trapp if 1 troop only you send.</br>
107. Fix invalid argument supplied if using masterbuilder</br>
108. Change entire database to InnoDB.
TienTN changes:
1. Change install/templates/config.tpl to deal with deprecated warning from new PHP version.
2. Fix install/data/sql.sql, to be executable in current MySQL version.
3. Fix db_MYSQL.php
with safe_mysql_fetch_all, and safe_mysql_fetch_array wrappers, to avoid
Warning: mysql_fetch_all/array() expects parameter 1 to be resource, boolean given
4. Fix the db_MYSQLi.php in class object declaration(if anybody want to use db_MYSQLi.php again)
5. Fix the unx.js file for error:
VM5051:1 Uncaught SyntaxError: Unexpected token )
jd.onreadystatechange @ unx.js?0ac36:170
This error arises when moving to the border of the map.
6. Fix the map loop moving bug:
Symptom: For map not set to size 400x400, on the map page,
when moving on and on in one direction, cross the map border(loop) two times,
the moving function will be crashed(freeze, you can't move any more).
I found out that unx.js handle a static map size(400x400).
So I fixed this with a m_c.world_max variable from mapview.tpl and changed the unx.js accordingly.
7. Fix the constructor global variable missing in Session.php
+1
View File
@@ -256,6 +256,7 @@ if (isset($neutralarray[0])) {
m_c.ad = [<?php echo '['.$map_js;?>];
m_c.z = {"x":<?php echo $x ?>,"y":<?php echo $y ?>};
m_c.size = 7;
m_c.world_max = <?php echo WORLD_MAX; /*TienTN: add a value to handle in unx.js instead of hardcoding*/ ?>;
var mdim = {"x":7,"y":7,"rad":3}
var mmode = 0;
function init_local(){map_init();}
+58 -58
View File
@@ -22,7 +22,7 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
--
CREATE TABLE IF NOT EXISTS `%PREFIX%a2b` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`ckey` varchar(255) NULL,
`time_check` int(11) NULL DEFAULT '0',
`to_vid` int(11) NULL,
@@ -50,7 +50,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%a2b` (
--
CREATE TABLE `%PREFIX%links` (
`id` INT( 25 ) NULL AUTO_INCREMENT PRIMARY KEY ,
`id` INT( 25 ) NOT NULL AUTO_INCREMENT PRIMARY KEY ,
`userid` INT( 25 ) NULL ,
`name` VARCHAR( 50 ) NULL ,
`url` VARCHAR( 150 ) NULL ,
@@ -68,7 +68,7 @@ CREATE TABLE `%PREFIX%links` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%abdata` (
`vref` int(11) NULL,
`vref` int(11) NOT NULL,
`a1` tinyint(2) NULL DEFAULT '0',
`a2` tinyint(2) NULL DEFAULT '0',
`a3` tinyint(2) NULL DEFAULT '0',
@@ -100,7 +100,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%abdata` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%activate` (
`id` int(255) NULL AUTO_INCREMENT,
`id` int(255) NOT NULL AUTO_INCREMENT,
`username` varchar(100) NULL,
`password` varchar(100) NULL,
`email` text NULL,
@@ -125,7 +125,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%activate` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%active` (
`username` varchar(100) NULL,
`username` varchar(100) NOT NULL,
`timestamp` int(11) NULL,
PRIMARY KEY (`username`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -142,7 +142,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%active` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%admin_log` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`user` text NULL,
`log` text NULL,
`time` int(25) NULL,
@@ -160,7 +160,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%admin_log` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%allimedal` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`allyid` int(11) NULL,
`categorie` int(11) NULL,
`plaats` int(11) NULL,
@@ -178,7 +178,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%allimedal` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%artefacts` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`vref` int(11) NULL,
`owner` int(11) NULL,
`type` tinyint(2) NULL,
@@ -206,7 +206,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%artefacts` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%alidata` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(100) NULL,
`tag` varchar(100) NULL,
`leader` int(11) NULL,
@@ -240,7 +240,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%alidata` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%ali_invite` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`uid` int(11) NULL,
`alliance` int(11) NULL,
`sender` int(11) NULL,
@@ -261,7 +261,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%ali_invite` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%ali_log` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`aid` int(11) NULL,
`comment` text NULL,
`date` int(11) NULL,
@@ -280,7 +280,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%ali_log` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%ali_permission` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`uid` int(11) NULL,
`alliance` int(11) NULL,
`rank` varchar(100) NULL,
@@ -307,7 +307,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%ali_permission` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%attacks` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`vref` int(11) NULL,
`t1` int(11) NULL,
`t2` int(11) NULL,
@@ -347,7 +347,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%attacks` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%banlist` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`uid` int(11) NULL,
`name` varchar(100) NULL,
`reason` varchar(30) NULL,
@@ -370,7 +370,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%banlist` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%bdata` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`wid` int(11) NULL,
`field` tinyint(2) NULL,
`type` tinyint(2) NULL,
@@ -393,7 +393,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%bdata` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%build_log` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`wid` int(11) NULL,
`log` text NULL,
`date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -412,7 +412,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%build_log` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%chat` (
`id` int(20) NULL AUTO_INCREMENT,
`id` int(20) NOT NULL AUTO_INCREMENT,
`id_user` int(11) NULL,
`name` varchar(255) NULL,
`alli` varchar(255) NULL,
@@ -449,7 +449,7 @@ INSERT INTO `%PREFIX%config` VALUES (0);
--
CREATE TABLE IF NOT EXISTS `%PREFIX%deleting` (
`uid` int(11) NULL,
`uid` int(11) NOT NULL,
`timestamp` int(11) NULL,
PRIMARY KEY (`uid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -466,7 +466,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%deleting` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%demolition` (
`vref` int(11) NULL,
`vref` int(11) NOT NULL,
`buildnumber` int(11) NULL DEFAULT '0',
`lvl` int(11) NULL DEFAULT '0',
`timetofinish` int(11) NULL,
@@ -485,7 +485,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%demolition` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%diplomacy` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`alli1` int(11) NULL,
`alli2` int(11) NULL,
`type` tinyint(1) NULL,
@@ -504,7 +504,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%diplomacy` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%enforcement` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`u1` int(11) NULL DEFAULT '0',
`u2` int(11) NULL DEFAULT '0',
`u3` int(11) NULL DEFAULT '0',
@@ -572,7 +572,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%enforcement` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%farmlist` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`wref` int(11) NULL,
`owner` int(11) NULL,
`name` varchar(100) NULL,
@@ -591,7 +591,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%farmlist` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%fdata` (
`vref` int(11) NULL,
`vref` int(11) NOT NULL,
`f1` tinyint(2) NULL DEFAULT '0',
`f1t` tinyint(2) NULL DEFAULT '0',
`f2` tinyint(2) NULL DEFAULT '0',
@@ -676,7 +676,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%fdata` (
`f99t` tinyint(2) NULL DEFAULT '0',
`wwname` varchar(100) NULL DEFAULT 'World Wonder',
PRIMARY KEY (`vref`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED;
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--
-- Dumping data for table `%prefix%fdata`
@@ -690,7 +690,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%fdata` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%forum_cat` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`owner` varchar(255) NULL,
`alliance` varchar(255) NULL,
`forum_name` varchar(255) NULL,
@@ -711,7 +711,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%forum_cat` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%forum_edit` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`alliance` varchar(255) NULL,
`result` varchar(255) NULL,
PRIMARY KEY (`id`)
@@ -729,7 +729,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%forum_edit` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%forum_post` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`post` longtext NULL,
`topic` varchar(255) NULL,
`owner` varchar(255) NULL,
@@ -787,7 +787,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%forum_survey` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%forum_topic` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`title` varchar(255) NULL,
`post` longtext NULL,
`date` varchar(255) NULL,
@@ -817,7 +817,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%forum_topic` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%general` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`casualties` int(11) NULL,
`time` int(11) NULL,
`shown` tinyint(1) NULL,
@@ -836,7 +836,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%general` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%gold_fin_log` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`wid` int(11) NULL,
`log` text NULL,
`date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -855,7 +855,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%gold_fin_log` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%hero` (
`heroid` int(11) NULL AUTO_INCREMENT,
`heroid` int(11) NOT NULL AUTO_INCREMENT,
`uid` int(11) NULL,
`unit` smallint(2) NULL,
`name` tinytext NULL,
@@ -891,7 +891,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%hero` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%illegal_log` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`user` int(11) NULL,
`log` text NULL,
`date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -910,7 +910,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%illegal_log` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%login_log` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`uid` int(11) NULL,
`ip` varchar(15) NULL,
`date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -929,7 +929,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%login_log` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%market` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`vref` int(11) NULL,
`gtype` tinyint(1) NULL,
`gamt` int(11) NULL,
@@ -954,7 +954,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%market` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%market_log` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`wid` int(11) NULL,
`log` text NULL,
`date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -973,7 +973,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%market_log` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%mdata` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`target` int(11) NULL,
`owner` int(11) NULL,
`topic` varchar(100) NULL,
@@ -1003,7 +1003,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%mdata` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%medal` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`userid` int(11) NULL,
`categorie` int(11) NULL,
`plaats` int(11) NULL,
@@ -1026,7 +1026,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%medal` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%movement` (
`moveid` int(11) NULL AUTO_INCREMENT,
`moveid` int(11) NOT NULL AUTO_INCREMENT,
`sort_type` tinyint(4) NULL DEFAULT '0',
`from` int(11) NULL DEFAULT '0',
`to` int(11) NULL DEFAULT '0',
@@ -1055,7 +1055,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%movement` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%ndata` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`uid` int(11) NULL,
`toWref` int(11) NULL,
`ally` int(11) NULL,
@@ -1081,7 +1081,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%ndata` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%odata` (
`wref` int(11) NULL,
`wref` int(11) NOT NULL,
`type` tinyint(2) NULL,
`conqured` int(11) NULL,
`wood` int(11) NULL,
@@ -1129,7 +1129,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%online` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%prisoners` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`wref` int(11) NULL,
`from` int(11) NULL,
`t1` int(11) NULL,
@@ -1158,7 +1158,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%prisoners` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%raidlist` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`lid` int(11) NULL,
`towref` int(11) NULL,
`x` int(11) NULL,
@@ -1189,7 +1189,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%raidlist` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%research` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`vref` int(11) NULL,
`tech` varchar(3) NULL,
`timestamp` int(11) NULL,
@@ -1208,7 +1208,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%research` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%route` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`uid` int(11) NULL,
`wid` int(11) NULL,
`from` int(11) NULL,
@@ -1236,7 +1236,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%route` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%send` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`wood` int(11) NULL,
`clay` int(11) NULL,
`iron` int(11) NULL,
@@ -1257,7 +1257,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%send` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%tdata` (
`vref` int(11) NULL,
`vref` int(11) NOT NULL,
`t2` tinyint(1) NULL DEFAULT '0',
`t3` tinyint(1) NULL DEFAULT '0',
`t4` tinyint(1) NULL DEFAULT '0',
@@ -1313,7 +1313,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%tdata` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%tech_log` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`wid` int(11) NULL,
`log` text NULL,
`date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -1332,7 +1332,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%tech_log` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%training` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`vref` int(11) NULL,
`unit` tinyint(2) NULL,
`amt` int(11) NULL,
@@ -1355,7 +1355,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%training` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%units` (
`vref` int(11) NULL,
`vref` int(11) NOT NULL,
`u1` int(11) NULL DEFAULT '0',
`u2` int(11) NULL DEFAULT '0',
`u3` int(11) NULL DEFAULT '0',
@@ -1424,7 +1424,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%units` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%users` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`username` varchar(100) NULL,
`password` varchar(100) NULL,
`email` text NULL,
@@ -1432,7 +1432,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%users` (
`access` tinyint(1) NULL DEFAULT '1',
`gold` int(9) NULL DEFAULT '0',
`gender` tinyint(1) NULL DEFAULT '0',
`birthday` date NULL DEFAULT '0000-00-00',
`birthday` date NULL DEFAULT '1970-01-01',
`location` text NULL,
`desc1` text NULL,
`desc2` text NULL,
@@ -1518,10 +1518,10 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%users` (
--
INSERT INTO `%PREFIX%users` (`id`, `username`, `password`, `email`, `tribe`, `access`, `gold`, `gender`, `birthday`, `location`, `desc1`, `desc2`, `plus`, `b1`, `b2`, `b3`, `b4`, `sit1`, `sit2`, `alliance`, `sessid`, `act`, `timestamp`, `ap`, `apall`, `dp`, `dpall`, `protect`, `quest`, `gpack`, `cp`, `lastupdate`, `RR`, `Rc`, `ok`) VALUES
(5, 'Multihunter', '', 'multihunter@travianx.mail', 0, 9, 0, 0, '0000-00-00', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 0, 0, 0, 0, 0, 'gpack/travian_default/', 1, 0, 0, 0, 0),
(1, 'Support', '', 'support@travianx.mail', 0, 8, 0, 0, '0000-00-00', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 0, 0, 0, 0, 0, 'gpack/travian_default/', 1, 0, 0, 0, 0),
(2, 'Nature', '4262cc190152adfc1a3fcf32af6aa430', 'support@travianx.mail', 4, 9, 0, 0, '0000-00-00', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 0, 0, 0, 0, 0, 'gpack/travian_default/', 1, 0, 0, 0, 0),
(4, 'Taskmaster', '', 'support@travianx.mail', 0, 8, 0, 0, '0000-00-00', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 0, 0, 0, 0, 0, 'gpack/travian_default/', 1, 0, 0, 0, 0);
(5, 'Multihunter', '', 'multihunter@travianx.mail', 0, 9, 0, 0, '1970-01-01', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 0, 0, 0, 0, 0, 'gpack/travian_default/', 1, 0, 0, 0, 0),
(1, 'Support', '', 'support@travianx.mail', 0, 8, 0, 0, '1970-01-01', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 0, 0, 0, 0, 0, 'gpack/travian_default/', 1, 0, 0, 0, 0),
(2, 'Nature', '4262cc190152adfc1a3fcf32af6aa430', 'support@travianx.mail', 4, 9, 0, 0, '1970-01-01', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 0, 0, 0, 0, 0, 'gpack/travian_default/', 1, 0, 0, 0, 0),
(4, 'Taskmaster', '', 'support@travianx.mail', 0, 8, 0, 0, '1970-01-01', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 0, 0, 0, 0, 0, 'gpack/travian_default/', 1, 0, 0, 0, 0);
-- --------------------------------------------------------
@@ -1530,7 +1530,7 @@ INSERT INTO `%PREFIX%users` (`id`, `username`, `password`, `email`, `tribe`, `ac
--
CREATE TABLE IF NOT EXISTS `%PREFIX%vdata` (
`wref` int(11) NULL,
`wref` int(11) NOT NULL,
`owner` int(11) NULL,
`name` varchar(100) NULL,
`capital` tinyint(1) NULL,
@@ -1570,7 +1570,7 @@ PRIMARY KEY (`wref`)
--
CREATE TABLE IF NOT EXISTS `%PREFIX%wdata` (
`id` int(11) NULL AUTO_INCREMENT,
`id` int(11) NOT NULL AUTO_INCREMENT,
`fieldtype` tinyint(2) NULL,
`oasistype` tinyint(2) NULL,
`x` int(11) NULL,
@@ -1590,7 +1590,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%wdata` (
--
CREATE TABLE IF NOT EXISTS `%PREFIX%password` (
`uid` int(11) NULL,
`uid` int(11) NOT NULL,
`npw` varchar(100) NULL,
`cpw` varchar(100) NULL,
`used` tinyint(1) NULL DEFAULT '0',
+1 -1
View File
@@ -321,7 +321,7 @@ echo "<div class=\"headline\"><span class=\"f10 c5\">Error creating constant.php
<option value="0">Fast</option>
</select></td></tr>
<tr> <td><span class="f9 c6">Error Reporting:</span></td><td><select name="error">
<option value="error_reporting (E_ALL ^ E_NOTICE);" selected="selected">Yes</option>
<option value="error_reporting (E_ALL ^ E_NOTICE ^ E_DEPRECATED);" selected="selected">Yes</option>
<option value="error_reporting (0);">No</option>
</select></td></tr><tr>
<td><span class="f9 c6">T4 is Coming screen:</span></td><td><select name="t4_coming">
+306 -68
View File
@@ -166,7 +166,11 @@ function fd(url,gd,hd,id){
var kd=jd.getResponseHeader('Content-Type');
kd=kd.substr(0,kd.indexOf(';'));
switch(kd){
case'application/json':gd((jd.responseText==''?null:eval('('+jd.responseText+')')));break;
case'application/json':
if (jd.responseText.indexOf('[]') < 0) {
gd((jd.responseText==''?null:eval('('+jd.responseText+')')));
}
break;
case'text/plain':case'text/html':gd(jd.responseText);break;
default:throw'Illegal content type';
}
@@ -189,16 +193,60 @@ else
{url+='&'+param;}
}
document.location.href=url;}
var rd={'index':0,'dir':0,'size':null,'fields':[],'cindex':0,'usealternate':false}
;var m_c=rd;var sd;var td;var ud;var vd;var wd;var xd;var yd;var zd;var $d;var _d=false;var ae;var be;var ce;var de=[];de[38]=1;de[39]=2;de[40]=3;de[37]=4;var ee={}
;var fe;var ge;function map_init(){sd=false;td=false;ud=false;vd=false;xd=0;wd=0;fe=he('karte2');ie(['i','a','t']);if(null==m_c.az){throw'm_c.az muss seitenspezifisch initialisiert werden.';}
for(var p in m_c.az){document.getElementById('ma_'+p).onclick=je;}
var ke=['mcx','mcy','x','y','map_infobox'];for(var i=0;i<ke.length;i++){ee[ke[i]]=document.getElementById(ke[i]);}
ke=['mcx','mcy'];for(var i=0;i<ke.length;i++){ee[ke[i]].onfocus=function(){vd=true;}
;ee[ke[i]].onblur=function(){vd=false;}
;}
var rd={'index':0,'dir':0,'size':null,'fields':[],'cindex':0,'usealternate':false};
var m_c=rd;
var sd;
var td;
var ud;
var vd;
var wd;
var xd;
var yd;
var zd;
var $d;
var _d=false;
var ae;
var be;
var ce;
var de=[];
de[38]=1;
de[39]=2;
de[40]=3;
de[37]=4;
var ee={};
var fe;
var ge;
function map_init(){
sd=false;
td=false;
ud=false;
vd=false;
xd=0;
wd=0;
fe=he('karte2');
ie(['i','a','t']);
if(null==m_c.az){
throw'm_c.az muss seitenspezifisch initialisiert werden.';
}
for(var p in m_c.az){
document.getElementById('ma_'+p).onclick=je;
}
var ke=['mcx','mcy','x','y','map_infobox'];
for(var i=0;i<ke.length;i++){
ee[ke[i]]=document.getElementById(ke[i]);
}
ke=['mcx','mcy'];
for(var i=0;i<ke.length;i++){
ee[ke[i]].onfocus=function(){vd=true;};
ee[ke[i]].onblur=function(){vd=false;};
}
ee.ibox_cells=[];ee.ibox_cells[0]=ee.map_infobox.firstChild.firstChild.lastChild;for(var i=1;i<=3;i++){ee.ibox_cells[i]=ee.map_infobox.firstChild.nextSibling.childNodes[i-1].lastChild}
ee.ibox_cells=[];
ee.ibox_cells[0]=ee.map_infobox.firstChild.firstChild.lastChild;
for(var i=1;i<=3;i++)
{
ee.ibox_cells[i]=ee.map_infobox.firstChild.nextSibling.childNodes[i-1].lastChild;
}
document.onkeyup=le;
document.onkeydown=me;
document.onkeypress=ne;
@@ -237,7 +285,11 @@ function ef(ff,gf){return((ff-1)*10)+gf
}
function hf(jf){ee.x.firstChild.nodeValue=jf.x;ee.y.firstChild.nodeValue=jf.y;}
function kf(jf){ee.mcx.value=jf.x;ee.mcy.value=jf.y;l=$$('div.cropfinder_icon a').set('href','cropfinder.php?x='+jf.x+'&y='+jf.y);}
function lf(x,y){return(400+x)+(400-y)*801+1;}
function lf(x,y){
var world_max = m_c.world_max;
var world_max_double = (world_max * 2)+1;
return(world_max+x)+(world_max-y)*world_max_double+1;
}
function ve(){if(mmode){zd=window.open(this.href,"map","top=100,left=25,width=1007,height=585");zd.focus();}
else{xe(true);fd('ajax.php?f=kp&z='+lf(m_c.z.x,m_c.z.y),function(mf){xe(false);ae=document.getElementsByTagName('body')[0];be=document.getElementsByTagName('html')[0];ae.parentNode.removeChild(ae);ce=document.createElement('body');ce.innerHTML=mf.lm;ce.style.backgroundColor='#ffffff';be.appendChild(ce);m_c=[];for(var qd in mf.dat.m_c){m_c[qd]=mf.dat.m_c[qd];}
m_c.fields=[];mdim=mf.dat.mdim;mmode=mf.dat.mmode;map_init();}
@@ -252,49 +304,190 @@ be.removeChild(ce);be.appendChild(ae);map_init();var of;var area;for(var i=0;i<m
}
hf(m_c.z);kf(m_c.z);}
return false;}
function je(){var qf=1*this.id.substring(4,5);var rf=1*(this.id.substring(5,7)=='p7'?mdim.x:1);map_scroll(qf,rf);return false;}
//this function is executed on map direction icon clicking
//ma_n1, ma_n2, ma_n3, ma_n4
// document.getElementById('ma_'+p).onclick=je;
function je(){
var qf=1*this.id.substring(4,5);
var rf=1*(this.id.substring(5,7)=='p7'?mdim.x:1);
// console.log(this.id + "--" + qf+"-"+rf);
map_scroll(qf,rf);
return false;
}
function sf(z){var x=z.x-mdim.rad;var y=z.y-mdim.rad;var tf=z.x+mdim.rad;var uf=z.y+mdim.rad;return{'x':x,'y':y,'xx':tf,'yy':uf}
;}
function vf(qf,rf,wf){if(wf==null){wf=0;}
if(m_c.size==null){throw'Globale Variable m_c.size muss auf den Wert von $travian[map_prefetch_rows]) gesetzt werden.';}
var xf,yf;if(null===rf||1===rf){yf=m_c.size-1;}
else if(mdim.x==rf){xf=mdim.x;yf=-(mdim.x-1);}
else{throw'Parameter steps muss 1 oder Breite der Karte in Feldern sein.';}
var x,y,tf,uf,z;var z=m_c.z;switch(qf){case 1:x=z.x+mdim.rad;y=z.y+mdim.rad+wf;tf=z.x-mdim.rad;uf=y+yf;break;case 2:x=z.x+mdim.rad+wf;y=z.y-mdim.rad;tf=x+yf;uf=z.y+mdim.rad;break;case 3:x=z.x+mdim.rad;y=z.y-mdim.rad-wf;tf=z.x-mdim.rad;uf=y-yf;break;case 4:x=z.x-mdim.rad-wf;y=z.y-mdim.rad;tf=x-yf;uf=z.y+mdim.rad;break;}
return{'x':x,'y':y,'xx':tf,'yy':uf}
;}
function zf($f){if($f>400){$f-=801;}
if($f<-400){$f+=801;}
return $f;}
function _f($f){if($f>400){$f=400;}
if($f<-400){$f=-400;}
return $f;}
function ag(qf,rf){var z={}
;z.x=m_c.z.x*1;z.y=m_c.z.y*1;switch(qf){case 1:z.y+=rf;break;case 2:z.x+=rf;break;case 3:z.y-=rf;break;case 4:z.x-=rf;break;}
m_c.z.x=zf(z.x);m_c.z.y=zf(z.y);}
function vf(qf,rf,wf){
if(wf==null){wf=0;}
if(m_c.size==null){
throw'Globale Variable m_c.size muss auf den Wert von $travian[map_prefetch_rows]) gesetzt werden.';
}
var xf,yf;
if(null===rf||1===rf){
yf=m_c.size-1;
}
else if(mdim.x==rf){
xf=mdim.x;yf=-(mdim.x-1);
}
else{
throw'Parameter steps muss 1 oder Breite der Karte in Feldern sein.';
}
var x,y,tf,uf,z;var z=m_c.z;
switch(qf){
case 1:
x=z.x+mdim.rad;y=z.y+mdim.rad+wf;
tf=z.x-mdim.rad;uf=y+yf;
break;
case 2:
x=z.x+mdim.rad+wf;y=z.y-mdim.rad;
tf=x+yf;uf=z.y+mdim.rad;
break;
case 3:
x=z.x+mdim.rad;y=z.y-mdim.rad-wf;
tf=z.x-mdim.rad;
uf=y-yf;
break;
case 4:
x=z.x-mdim.rad-wf;
y=z.y-mdim.rad;
tf=x-yf;
uf=z.y+mdim.rad;
break;
}
return{'x':x,'y':y,'xx':tf,'yy':uf};
}
function zf($f){
var world_max = m_c.world_max;
var world_max_double = (world_max * 2) + 1;
if($f>world_max){
$f-=world_max_double;
}
if($f<-world_max){
$f+=world_max_double;
}
return $f;
}
function _f($f){
if($f>m_c.world_max){
$f=m_c.world_max;
}
if($f<-m_c.world_max){
$f=-m_c.world_max;
}
return $f;
}
//tientn: m_c is the object hold all global variables
function ag(qf,rf){
var z={};
z.x=m_c.z.x*1;
z.y=m_c.z.y*1;
switch(qf){
case 1:
z.y+=rf;
break;
case 2:
z.x+=rf;
break;
case 3:
z.y-=rf;
break;
case 4:
z.x-=rf;
break;
}
m_c.z.x=zf(z.x);
m_c.z.y=zf(z.y);
}
function bg(cg){return'ajax.php?f=k7&x='+cg.x+'&y='+cg.y+'&xx='+cg.xx+'&yy='+cg.yy;}
function map_scroll(qf,rf,dg){var cg,eg;if(sd){return false;}
if(fg()){if(td){return false;}
sd=true;gg();m_c.usealternate=false;m_c.cindex=0;if(dg!==undefined){m_c.z.x=_f(dg.x);m_c.z.y=_f(dg.y);cg=sf(m_c.z);}
else{ag(qf,rf);cg=vf(qf,rf);}
hg=bg(cg);fd(hg,ig);}
else{if(jg()){if(td){return false;}
td=true;ag(qf,rf);cg=vf(qf,rf,2);hg=bg(cg);fd(hg,ig);}
else if(kg()){ag(qf,rf);lg();gg();}
else{ag(qf,rf);}
mg(qf,rf);}
function ig(ng){var og;if(jg()){og=pg(m_c.cindex);m_c.usealternate=false;td=false;}
else{og=m_c.cindex;}
m_c.fields[og]=ng;if(fg()){if(dg!==undefined){mg(0,0,m_c.z);qg('x');qg('y');}
else{mg(qf,rf);qg(qf);}
sd=false;}
}
function jg(){return m_c.usealternate;}
function fg(){return(qf!=m_c.dir||rf==mdim.x||(rf==1&&rf!=m_c.steps)||dg!==undefined);}
function kg(){return(m_c.index==m_c.size);}
}
function map_scroll(qf,rf,dg) {
var cg,eg;
if(sd){
return false;
}
if(fg()){
if(td){
return false;
}
sd=true;
gg();
m_c.usealternate=false;
m_c.cindex=0;
if(dg!==undefined){
m_c.z.x=_f(dg.x);
m_c.z.y=_f(dg.y);
cg=sf(m_c.z);
}
else{
ag(qf,rf);
cg=vf(qf,rf);
}
hg=bg(cg);
fd(hg,ig);
}
else{
if(jg()){
if(td){
return false;
}
td=true;
ag(qf,rf);
cg=vf(qf,rf,2);
hg=bg(cg);
fd(hg,ig);
}
else if(kg()){
ag(qf,rf);
lg();
gg();
}
else{
ag(qf,rf);
}
mg(qf,rf);
}
function ig(ng){
var og;
if(jg()){
og=pg(m_c.cindex);
m_c.usealternate=false;
td=false;
}
else{
og=m_c.cindex;
}
m_c.fields[og]=ng;
if(fg()){
if(dg!==undefined){
mg(0,0,m_c.z);
qg('x');
qg('y');
}
else{
mg(qf,rf);
qg(qf);
}
sd=false;
}
}
function jg(){
return m_c.usealternate;
}
function fg(){
return(qf!=m_c.dir||rf==mdim.x||(rf==1&&rf!=m_c.steps)||dg!==undefined);
}
function kg(){
return(m_c.index==m_c.size);
}
} //end of map_scroll
function rg(qf,rf){m_c.dir=qf;m_c.steps=rf;}
function gg(){m_c.index=0;}
function gg(){
m_c.index=0;
}
function sg(){m_c.index++;if(m_c.index==m_c.size-2){m_c.usealternate=true;}
}
function lg(){m_c.cindex=pg(m_c.cindex);}
@@ -319,11 +512,25 @@ area.details.normal_field=area.details.name===undefined&&area.details.typ==0;are
;area.details.classic_oasis=area.details.querystring==='';}
function df(dh){switch(dh){case 1:return[3,3,3,9];case 2:return[3,4,5,6];case 3:return[4,4,4,6];case 4:return[4,5,3,6];case 5:return[5,3,4,6];case 6:return[1,1,1,15];case 7:return[4,4,3,7];case 8:return[3,4,4,7];case 9:return[4,3,4,7];case 10:return[3,5,4,6];case 11:return[4,3,5,6];case 12:return[5,4,3,6];default:return false;}
}
function oe(){var x=parseInt(this.xp.value);var y=parseInt(this.yp.value);if(!isNaN(x)&&!isNaN(y)){map_scroll(0,0,{'x':x,'y':y}
);}
return false;}
function ne(e){if(vd){return true;}
var qd=(window.event)?event.keyCode:e.keyCode;var qf=eh(qd);if(qf!=0){return false;}
//document.map_coords.onsubmit=oe;
function oe(){
var x=parseInt(this.xp.value);
var y=parseInt(this.yp.value);
if(!isNaN(x)&&!isNaN(y)){
map_scroll(0,0,{'x':x,'y':y});
}
return false;
}
//document.onkeypress=ne;
function ne(e){
if(vd){
return true;
}
var qd=(window.event)?event.keyCode:e.keyCode;
var qf=eh(qd);
if(qf!=0){
return false;
}
}
function qe(){_d=true;hf(this.details);$e(this.details);fh(this);ge=this;}
function fh(area){if(!area.details.fresh.href){if(area.details.classic_oasis){area.removeAttribute('href');area.style.cursor='default';}
@@ -357,14 +564,31 @@ function vg(qf){for(var i=0;i<mdim.x;i++){for(var j=1;j<mdim.x;j++){switch(qf){c
}
}
}
function eh(qd){if(de[qd]!==undefined){return de[qd];}
return 0;}
function le(e){if(vd){return true;}
var qd=((window.event)?event.keyCode:e.keyCode);if(16==qd){ud=false;}
var qf=eh(qd);if(qf==wd&&wd!=0){wd=0;kf(m_c.z);ph();}
function eh(qd){
if(de[qd]!==undefined){
return de[qd];
}
return 0;
}
function m_r(qf,qh){if(wd==qf&&qh==xd){window.setTimeout(function(){m_r(qf,qh)}
,100);map_scroll(qf,1);}
//document.onkeyup=le;
function le(e){
if(vd){
return true;
}
var qd=((window.event)?event.keyCode:e.keyCode);
if(16==qd){
ud=false;
}
var qf=eh(qd);
if(qf==wd&&wd!=0){
wd=0;kf(m_c.z);ph();
}
}
function m_r(qf,qh){
if(wd==qf&&qh==xd){
window.setTimeout(function(){m_r(qf,qh)},100);
map_scroll(qf,1);
}
}
function qg(rh){var jb;switch(rh){case 2:case 4:case'x':jb='x';break;case 1:case 3:case'y':jb='y';break;}
var sh='m'+jb;var th;var uh;var vh=0;var wh=0;for(var i=0;i<mdim.x;i++){if(jb=='x'){vh=i;}
@@ -372,12 +596,26 @@ else{wh=i;}
if(ee[sh][i]){th=pe(vh,wh,'a').details[jb];ee[sh][i].firstChild.nodeValue=th;}
}
}
function me(e){if(vd){return true;}
var qd=(window.event)?event.keyCode:e.keyCode;if(qd==16){ud=true;}
var qf=eh(qd);if(qf!=0&&qf!=wd){var rf=(ud?mdim.x:1);map_scroll(qf,rf);var qh=new Date().getTime();if(rf==1){window.setTimeout(function(){m_r(qf,qh)}
,500);}
xd=qh;wd=qf;ph();}
if(qf!=0){return false;}
//document.onkeydown=me;
function me(e){
if(vd){
return true;
}
var qd=(window.event)?event.keyCode:e.keyCode;if(qd==16){ud=true;}
var qf=eh(qd);
if(qf!=0&&qf!=wd){
var rf=(ud?mdim.x:1);
map_scroll(qf,rf);
var qh=new Date().getTime();
if(rf==1){
window.setTimeout(function(){m_r(qf,qh)},500);
}
xd=qh;wd=qf;
ph();
}
if(qf!=0){
return false;
}
}
function ph(){window.setTimeout(function(){if(_d){$e(ge.details);}
}