diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index f05c6949..e853aab4 100644 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -2435,23 +2435,13 @@ $crannyimg = "setMovementProc($data['moveid']); - if($chiefing_village != 1){ + if($chiefing_village != 1 && $village_destroyed != 1){ $database->addMovement(4,$to['wref'],$from['wref'],$data['ref'],time(),$endtime); - }else{ - $database->addEnforce2($data,$owntribe,$troopsdead1,$troopsdead2,$troopsdead3,$troopsdead4,$troopsdead5,$troopsdead6,$troopsdead7,$troopsdead8,$troopsdead9,$troopsdead10,$troopsdead11); - } // send the bounty on type 6. if($type !== 1) { $reference = $database->sendResource($steal[0],$steal[1],$steal[2],$steal[3],0,0); - $isoasis1 = $database->isVillageOases($to['wref']); - if ($isoasis1 == 0){ - //$database->modifyResource($to['wref'],$steal[0],$steal[1],$steal[2],$steal[3],0); - }else{ - //$database->modifyOasisResource($to['wref'],$steal[0],$steal[1],$steal[2],$steal[3],0); - } - $database->addMovement(6,$to['wref'],$from['wref'],$reference,time(),$endtime); - //$database->updateVillage($to['wref']); + $database->addMovement(6,$to['wref'],$from['wref'],$reference,time(),$endtime,1,0,0,0,0,$data['ref']); $totalstolengain=$steal[0]+$steal[1]+$steal[2]+$steal[3]; $totalstolentaken=($totalstolentaken-($steal[0]+$steal[1]+$steal[2]+$steal[3])); $database->modifyPoints($from['owner'],'RR',$totalstolengain); @@ -2459,6 +2449,9 @@ $crannyimg = "modifyPointsAlly($targetally,'RR',$totalstolentaken ); $database->modifyPointsAlly($ownally,'RR',$totalstolengain); } + }else if($chiefing_village == 1){ + $database->addEnforce2($data,$owntribe,$troopsdead1,$troopsdead2,$troopsdead3,$troopsdead4,$troopsdead5,$troopsdead6,$troopsdead7,$troopsdead8,$troopsdead9,$troopsdead10,$troopsdead11); + } } else //else they die and don't return or report. { @@ -2500,7 +2493,14 @@ $crannyimg = "query($q); $q = "UPDATE ".TB_PREFIX."wdata set occupied = 0 where id = ".$data['to']; $database->query($q); - $q = "DELETE FROM ".TB_PREFIX."movement where to = ".$data['to']." or from = ".$data['to']; + $getmovement = $database->getMovement(3,$data['to'],1); + foreach($getmovement as $movedata) { + $time = time(); + $time2 = $time - $movedata['starttime']; + $database->addMovement(4,$movedata['to'],$movedata['from'],$movedata['ref'],$time,$time+$time2); + $database->setMovementProc($movedata['moveid']); + } + $q = "DELETE FROM ".TB_PREFIX."movement where from = ".$data['to']; $database->query($q); } } diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php index f227077e..0e9ed75c 100644 --- a/GameEngine/Database/db_MYSQL.php +++ b/GameEngine/Database/db_MYSQL.php @@ -2061,9 +2061,6 @@ class MYSQL_DB { case 7: $q = "SELECT * FROM " . TB_PREFIX . "movement where " . TB_PREFIX . "movement." . $where . " = $village and sort_type = 4 and ref = 0 and proc = 0 ORDER BY endtime ASC"; break; - case 8: - $q = "SELECT * FROM " . TB_PREFIX . "movement, " . TB_PREFIX . "attacks where " . TB_PREFIX . "movement." . $where . " = $village and " . TB_PREFIX . "movement.ref = " . TB_PREFIX . "attacks.id and " . TB_PREFIX . "movement.proc = 0 and " . TB_PREFIX . "movement.sort_type = 4 OR " . TB_PREFIX . "movement." . $where . " = $village and sort_type = 4 and ref = 0 and proc = 0 ORDER BY endtime ASC"; - break; case 34: $q = "SELECT * FROM " . TB_PREFIX . "movement, " . TB_PREFIX . "attacks where " . TB_PREFIX . "movement." . $where . " = $village and " . TB_PREFIX . "movement.ref = " . TB_PREFIX . "attacks.id and " . TB_PREFIX . "movement.proc = 0 and " . TB_PREFIX . "movement.sort_type = 3 or " . TB_PREFIX . "movement." . $where . " = $village and " . TB_PREFIX . "movement.ref = " . TB_PREFIX . "attacks.id and " . TB_PREFIX . "movement.proc = 0 and " . TB_PREFIX . "movement.sort_type = 4 ORDER BY endtime ASC"; break; @@ -2089,8 +2086,8 @@ class MYSQL_DB { } } - function addMovement($type, $from, $to, $ref, $time, $endtime, $send = 1, $wood = 0, $clay = 0, $iron = 0, $crop = 0) { - $q = "INSERT INTO " . TB_PREFIX . "movement values (0,$type,$from,$to,$ref,$time,$endtime,0,$send,$wood,$clay,$iron,$crop)"; + function addMovement($type, $from, $to, $ref, $time, $endtime, $send = 1, $wood = 0, $clay = 0, $iron = 0, $crop = 0, $ref2 = 0) { + $q = "INSERT INTO " . TB_PREFIX . "movement values (0,$type,$from,$to,$ref,$ref2,$time,$endtime,0,$send,$wood,$clay,$iron,$crop)"; return mysql_query($q, $this->connection); } diff --git a/Templates/Alliance/changename.tpl b/Templates/Alliance/changename.tpl index 4d40845d..d7dd4e30 100644 --- a/Templates/Alliance/changename.tpl +++ b/Templates/Alliance/changename.tpl @@ -21,13 +21,13 @@ if($session->access!=BANNED){ Tag - + Name - + diff --git a/Templates/Alliance/chgdiplo.tpl b/Templates/Alliance/chgdiplo.tpl index c7ce0a39..97fca659 100644 --- a/Templates/Alliance/chgdiplo.tpl +++ b/Templates/Alliance/chgdiplo.tpl @@ -40,7 +40,7 @@ Alliance - + diff --git a/Templates/Build/16_incomming.tpl b/Templates/Build/16_incomming.tpl index 278ee30d..81dbd193 100644 --- a/Templates/Build/16_incomming.tpl +++ b/Templates/Build/16_incomming.tpl @@ -7,9 +7,11 @@ $send = $database->getMovement("1",$village->wid,1); $total_for2 = count($send); for($y=0;$y < $total_for;$y++){ for($i=0;$i < $total_for2;$i++){ +if($units[$y]['ref'] == $send[$i]['ref2']){ $res1 = mysql_query("SELECT * FROM " . TB_PREFIX . "send where id = ".$send[$i]['ref'].""); $res = mysql_fetch_array($res1); } +} $timer = $y+1; if ($units[$y]['sort_type']==3){ if ($units[$y]['attack_type']==3){ diff --git a/Templates/Build/18_create.tpl b/Templates/Build/18_create.tpl index 793802f5..085997b2 100644 --- a/Templates/Build/18_create.tpl +++ b/Templates/Build/18_create.tpl @@ -9,7 +9,7 @@ Tag - " maxlength="8"> + " maxlength="15"> getError("ally1"); ?> @@ -17,7 +17,7 @@ Name - " maxlength="25"> + " maxlength="50"> getError("ally2"); ?> diff --git a/allianz.php b/allianz.php index 3f23d41b..65885fb8 100644 --- a/allianz.php +++ b/allianz.php @@ -270,26 +270,19 @@ if($_GET['aid'] or $_GET['fid'] or $_GET['fid2'] or $session->alliance!=0){ } break; case 101: - $post = preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['id']); - $database->diplomacyCancelOffer($post); + $database->diplomacyCancelOffer($_POST['id']); include ("Templates/Alliance/chgdiplo.tpl"); break; case 102: - $post = preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['id']); - $post2 = preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['alli2']); - $database->diplomacyInviteDenied($post, $post2); + $database->diplomacyInviteDenied($_POST['id'], $_POST['alli2']); include ("Templates/Alliance/chgdiplo.tpl"); break; case 103: - $post = preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['id']); - $post2 = preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['alli2']); - $database->diplomacyInviteAccept($post, $post2); + $database->diplomacyInviteAccept($_POST['id'], $_POST['alli2']); include ("Templates/Alliance/chgdiplo.tpl"); break; case 104: - $post = preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['id']); - $post2 = preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['alli2']); - $database->diplomacyCancelExistingRelationship($post, $post2); + $database->diplomacyCancelExistingRelationship($_POST['id'], $_POST['alli2']); include ("Templates/Alliance/chgdiplo.tpl"); } } else { diff --git a/anmelden.php b/anmelden.php index 82689114..9ee5f294 100644 --- a/anmelden.php +++ b/anmelden.php @@ -62,14 +62,14 @@ if(REG_OPEN == true){ ?> - + getError('email'); ?> - + getError('pw'); ?> diff --git a/install/data/sql.sql b/install/data/sql.sql index 27e9c517..42d71b74 100644 --- a/install/data/sql.sql +++ b/install/data/sql.sql @@ -68,7 +68,7 @@ CREATE TABLE `%PREFIX%links` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%abdata` ( - `vref` int(10) unsigned NOT NULL, + `vref` int(11) unsigned NOT NULL, `a1` tinyint(2) unsigned NOT NULL DEFAULT '0', `a2` tinyint(2) unsigned NOT NULL DEFAULT '0', `a3` tinyint(2) unsigned NOT NULL DEFAULT '0', @@ -101,13 +101,13 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%abdata` ( CREATE TABLE IF NOT EXISTS `%PREFIX%activate` ( `id` int(255) unsigned NOT NULL AUTO_INCREMENT, - `username` varchar(45) NOT NULL, - `password` varchar(45) NOT NULL, + `username` varchar(100) NOT NULL, + `password` varchar(100) NOT NULL, `email` text NOT NULL, `tribe` tinyint(1) unsigned NOT NULL, `access` tinyint(1) unsigned NOT NULL DEFAULT '1', `act` varchar(10) NOT NULL, - `timestamp` int(10) unsigned NOT NULL DEFAULT '0', + `timestamp` int(11) unsigned NOT NULL DEFAULT '0', `location` text NOT NULL, `act2` varchar(10) NOT NULL, PRIMARY KEY (`id`) @@ -142,7 +142,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%active` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%admin_log` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `user` text NOT NULL, `log` text NOT NULL, `time` int(25) NOT NULL, @@ -178,15 +178,15 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%allimedal` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%artefacts` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `vref` int(10) unsigned NOT NULL, - `owner` int(10) unsigned NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `vref` int(11) unsigned NOT NULL, + `owner` int(11) unsigned NOT NULL, `type` int(3) unsigned NOT NULL, - `size` int(10) unsigned NOT NULL, - `conquered` int(10) unsigned NOT NULL, - `name` varchar(45) NOT NULL, + `size` int(11) unsigned NOT NULL, + `conquered` int(11) unsigned NOT NULL, + `name` varchar(100) NOT NULL, `desc` text NOT NULL, - `effect` varchar(45) NOT NULL, + `effect` varchar(100) NOT NULL, `img` varchar(20) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -201,13 +201,13 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%artefacts` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%alidata` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `name` varchar(25) NOT NULL, - `tag` varchar(8) NOT NULL, - `leader` int(10) unsigned NOT NULL, - `coor` int(10) unsigned NOT NULL, - `advisor` int(10) unsigned NOT NULL, - `recruiter` int(10) unsigned NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(100) NOT NULL, + `tag` varchar(100) NOT NULL, + `leader` int(11) unsigned NOT NULL, + `coor` int(11) unsigned NOT NULL, + `advisor` int(11) unsigned NOT NULL, + `recruiter` int(11) unsigned NOT NULL, `notice` text NOT NULL, `desc` text NOT NULL, `max` tinyint(2) unsigned NOT NULL, @@ -235,10 +235,10 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%alidata` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%ali_invite` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `uid` int(10) unsigned NOT NULL, - `alliance` int(10) unsigned NOT NULL, - `sender` int(10) NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `uid` int(11) unsigned NOT NULL, + `alliance` int(11) unsigned NOT NULL, + `sender` int(11) NOT NULL, `timestamp` int(11) NOT NULL, `accept` int(1) NOT NULL, PRIMARY KEY (`id`) @@ -256,10 +256,10 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%ali_invite` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%ali_log` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `aid` int(10) NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `aid` int(11) NOT NULL, `comment` text NOT NULL, - `date` int(10) unsigned NOT NULL, + `date` int(11) unsigned NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -275,10 +275,10 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%ali_log` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%ali_permission` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `uid` int(10) unsigned NOT NULL, - `alliance` int(10) unsigned NOT NULL, - `rank` varchar(20) NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `uid` int(11) unsigned NOT NULL, + `alliance` int(11) unsigned NOT NULL, + `rank` varchar(100) NOT NULL, `opt1` int(1) unsigned NOT NULL DEFAULT '0', `opt2` int(1) unsigned NOT NULL DEFAULT '0', `opt3` int(1) unsigned NOT NULL DEFAULT '0', @@ -302,7 +302,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%ali_permission` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%attacks` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `vref` int(11) unsigned NOT NULL, `t1` int(11) unsigned NOT NULL, `t2` int(11) unsigned NOT NULL, @@ -343,10 +343,10 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%attacks` ( CREATE TABLE IF NOT EXISTS `%PREFIX%banlist` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `uid` int(10) NOT NULL, - `name` varchar(30) NOT NULL, + `uid` int(11) NOT NULL, + `name` varchar(100) NOT NULL, `reason` varchar(30) NOT NULL, - `time` int(10) NOT NULL, + `time` int(11) NOT NULL, `end` varchar(10) NOT NULL, `admin` int(11) NOT NULL, `active` int(11) NOT NULL, @@ -365,12 +365,12 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%banlist` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%bdata` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `wid` int(10) unsigned NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `wid` int(11) unsigned NOT NULL, `field` tinyint(2) unsigned NOT NULL, `type` tinyint(2) unsigned NOT NULL, `loopcon` tinyint(1) unsigned NOT NULL, - `timestamp` int(10) unsigned NOT NULL, + `timestamp` int(11) unsigned NOT NULL, `master` tinyint(1) unsigned NOT NULL, `level` tinyint(3) unsigned NOT NULL, PRIMARY KEY (`id`) @@ -388,8 +388,8 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%bdata` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%build_log` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `wid` int(10) unsigned NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `wid` int(11) unsigned NOT NULL, `log` text NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -407,7 +407,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%build_log` ( CREATE TABLE IF NOT EXISTS `%PREFIX%chat` ( `id` int(20) unsigned NOT NULL AUTO_INCREMENT, - `id_user` int(10) NOT NULL, + `id_user` int(11) NOT NULL, `name` varchar(255) NOT NULL, `alli` varchar(255) NOT NULL, `date` varchar(255) NOT NULL, @@ -427,8 +427,8 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%chat` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%deleting` ( - `uid` int(10) unsigned NOT NULL, - `timestamp` int(10) unsigned NOT NULL, + `uid` int(11) unsigned NOT NULL, + `timestamp` int(11) unsigned NOT NULL, PRIMARY KEY (`uid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; @@ -444,9 +444,9 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%deleting` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%demolition` ( - `vref` int(10) unsigned NOT NULL, - `buildnumber` int(10) unsigned NOT NULL DEFAULT '0', - `lvl` int(10) unsigned NOT NULL DEFAULT '0', + `vref` int(11) unsigned NOT NULL, + `buildnumber` int(11) unsigned NOT NULL DEFAULT '0', + `lvl` int(11) unsigned NOT NULL DEFAULT '0', `timetofinish` int(11) NOT NULL, PRIMARY KEY (`vref`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -463,9 +463,9 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%demolition` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%diplomacy` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `alli1` int(10) unsigned NOT NULL, - `alli2` int(10) unsigned NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `alli1` int(11) unsigned NOT NULL, + `alli2` int(11) unsigned NOT NULL, `type` tinyint(1) unsigned NOT NULL, `accepted` int(1) NOT NULL, PRIMARY KEY (`id`) @@ -482,7 +482,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%diplomacy` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%enforcement` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `u1` int(11) unsigned NOT NULL DEFAULT '0', `u2` int(11) unsigned NOT NULL DEFAULT '0', `u3` int(11) unsigned NOT NULL DEFAULT '0', @@ -534,8 +534,8 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%enforcement` ( `u49` int(11) unsigned NOT NULL DEFAULT '0', `u50` int(11) unsigned NOT NULL DEFAULT '0', `hero` tinyint(1) unsigned NOT NULL DEFAULT '0', - `from` int(10) unsigned NOT NULL DEFAULT '0', - `vref` int(10) unsigned NOT NULL DEFAULT '0', + `from` int(11) unsigned NOT NULL DEFAULT '0', + `vref` int(11) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -550,10 +550,10 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%enforcement` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%farmlist` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `wref` int(10) unsigned NOT NULL, - `owner` int(10) unsigned NOT NULL, - `name` varchar(45) NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `wref` int(11) unsigned NOT NULL, + `owner` int(11) unsigned NOT NULL, + `name` varchar(100) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -569,7 +569,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%farmlist` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%fdata` ( - `vref` int(10) unsigned NOT NULL, + `vref` int(11) unsigned NOT NULL, `f1` tinyint(2) unsigned NOT NULL DEFAULT '0', `f1t` tinyint(2) unsigned NOT NULL DEFAULT '0', `f2` tinyint(2) unsigned NOT NULL DEFAULT '0', @@ -652,7 +652,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%fdata` ( `f40t` tinyint(2) unsigned NOT NULL DEFAULT '0', `f99` tinyint(2) unsigned NOT NULL DEFAULT '0', `f99t` tinyint(2) unsigned NOT NULL DEFAULT '0', - `wwname` varchar(25) NOT NULL DEFAULT 'World Wonder', + `wwname` varchar(100) NOT NULL DEFAULT 'World Wonder', PRIMARY KEY (`vref`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED; @@ -753,9 +753,9 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%forum_topic` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%general` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `casualties` int(10) unsigned NOT NULL, - `time` int(10) unsigned NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `casualties` int(11) unsigned NOT NULL, + `time` int(11) unsigned NOT NULL, `shown` tinyint(1) unsigned NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -772,8 +772,8 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%general` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%gold_fin_log` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `wid` int(10) unsigned NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `wid` int(11) unsigned NOT NULL, `log` text NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -824,8 +824,8 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%hero` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%illegal_log` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `user` int(10) unsigned NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `user` int(11) unsigned NOT NULL, `log` text NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -842,8 +842,8 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%illegal_log` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%login_log` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `uid` int(10) unsigned NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `uid` int(11) unsigned NOT NULL, `ip` varchar(15) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -860,7 +860,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%login_log` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%market` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `vref` int(11) unsigned NOT NULL, `gtype` tinyint(1) unsigned NOT NULL, `gamt` int(11) unsigned NOT NULL, @@ -885,8 +885,8 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%market` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%market_log` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `wid` int(10) unsigned NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `wid` int(11) unsigned NOT NULL, `log` text NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -903,17 +903,17 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%market_log` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%mdata` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `target` int(10) unsigned NOT NULL, - `owner` int(10) unsigned NOT NULL, - `topic` varchar(45) NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `target` int(11) unsigned NOT NULL, + `owner` int(11) unsigned NOT NULL, + `topic` varchar(100) NOT NULL, `message` text NOT NULL, `viewed` tinyint(1) unsigned NOT NULL, `archived` tinyint(1) unsigned NOT NULL, `send` tinyint(1) unsigned NOT NULL, `time` int(11) unsigned NOT NULL DEFAULT '0', - `deltarget` int(10) unsigned NOT NULL, - `delowner` int(10) unsigned NOT NULL, + `deltarget` int(11) unsigned NOT NULL, + `delowner` int(11) unsigned NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -929,11 +929,11 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%mdata` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%medal` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `userid` int(10) unsigned NOT NULL, - `categorie` int(10) unsigned NOT NULL, - `plaats` int(10) unsigned NOT NULL, - `week` int(10) unsigned NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `userid` int(11) unsigned NOT NULL, + `categorie` int(11) unsigned NOT NULL, + `plaats` int(11) unsigned NOT NULL, + `week` int(11) unsigned NOT NULL, `points` varchar(15) NOT NULL, `img` varchar(10) NOT NULL, `del` tinyint(1) unsigned NOT NULL, @@ -952,11 +952,12 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%medal` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%movement` ( - `moveid` int(10) unsigned NOT NULL AUTO_INCREMENT, + `moveid` int(11) unsigned NOT NULL AUTO_INCREMENT, `sort_type` tinyint(4) unsigned NOT NULL DEFAULT '0', `from` int(11) unsigned NOT NULL DEFAULT '0', `to` int(11) unsigned NOT NULL DEFAULT '0', `ref` int(11) unsigned NOT NULL DEFAULT '0', + `ref2` int(11) unsigned NOT NULL DEFAULT '0', `starttime` int(11) unsigned NOT NULL DEFAULT '0', `endtime` int(11) unsigned NOT NULL DEFAULT '0', `proc` tinyint(1) unsigned NOT NULL DEFAULT '0', @@ -980,14 +981,14 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%movement` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%ndata` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `uid` int(10) unsigned NOT NULL, - `toWref` int(10) unsigned NOT NULL, - `ally` int(10) unsigned NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `uid` int(11) unsigned NOT NULL, + `toWref` int(11) unsigned NOT NULL, + `ally` int(11) unsigned NOT NULL, `topic` text NOT NULL, `ntype` tinyint(1) unsigned NOT NULL, `data` text NOT NULL, - `time` int(10) unsigned NOT NULL, + `time` int(11) unsigned NOT NULL, `viewed` tinyint(1) unsigned NOT NULL, `archive` tinyint(1) unsigned NOT NULL, `del` tinyint(1) unsigned NOT NULL, @@ -1006,18 +1007,18 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%ndata` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%odata` ( - `wref` int(10) unsigned NOT NULL, + `wref` int(11) unsigned NOT NULL, `type` tinyint(2) unsigned NOT NULL, - `conqured` int(10) unsigned NOT NULL, - `wood` int(10) unsigned NOT NULL, - `iron` int(10) unsigned NOT NULL, - `clay` int(10) unsigned NOT NULL, - `maxstore` int(10) unsigned NOT NULL, - `crop` int(10) unsigned NOT NULL, - `maxcrop` int(10) unsigned NOT NULL, - `lastupdated` int(10) unsigned NOT NULL, - `loyalty` int(10) NOT NULL DEFAULT '100', - `owner` int(10) unsigned NOT NULL DEFAULT '2', + `conqured` int(11) unsigned NOT NULL, + `wood` int(11) unsigned NOT NULL, + `iron` int(11) unsigned NOT NULL, + `clay` int(11) unsigned NOT NULL, + `maxstore` int(11) unsigned NOT NULL, + `crop` int(11) unsigned NOT NULL, + `maxcrop` int(11) unsigned NOT NULL, + `lastupdated` int(11) unsigned NOT NULL, + `loyalty` int(11) NOT NULL DEFAULT '100', + `owner` int(11) unsigned NOT NULL DEFAULT '2', `name` varchar(32) NOT NULL DEFAULT 'Unoccupied Oasis', PRIMARY KEY (`wref`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; @@ -1035,7 +1036,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%odata` ( CREATE TABLE IF NOT EXISTS `%PREFIX%online` ( `name` varchar(32) NOT NULL, - `uid` int(10) unsigned NOT NULL, + `uid` int(11) unsigned NOT NULL, `time` varchar(32) NOT NULL, `sit` tinyint(1) unsigned NOT NULL, UNIQUE KEY `name` (`name`) @@ -1052,9 +1053,9 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%online` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%raidlist` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `lid` int(10) NOT NULL, - `towref` int(10) unsigned NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `lid` int(11) NOT NULL, + `towref` int(11) unsigned NOT NULL, `x` int(11) NOT NULL, `y` int(11) NOT NULL, `distance` varchar(5) NOT NULL DEFAULT '0', @@ -1083,10 +1084,10 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%raidlist` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%research` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `vref` int(10) unsigned NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `vref` int(11) unsigned NOT NULL, `tech` varchar(3) NOT NULL, - `timestamp` int(10) unsigned NOT NULL, + `timestamp` int(11) unsigned NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1130,7 +1131,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%route` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%send` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `wood` int(11) unsigned NOT NULL, `clay` int(11) unsigned NOT NULL, `iron` int(11) unsigned NOT NULL, @@ -1151,7 +1152,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%send` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%tdata` ( - `vref` int(10) unsigned NOT NULL, + `vref` int(11) unsigned NOT NULL, `t2` tinyint(1) unsigned NOT NULL DEFAULT '0', `t3` tinyint(1) unsigned NOT NULL DEFAULT '0', `t4` tinyint(1) unsigned NOT NULL DEFAULT '0', @@ -1207,8 +1208,8 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%tdata` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%tech_log` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `wid` int(10) unsigned NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `wid` int(11) unsigned NOT NULL, `log` text NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1225,14 +1226,14 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%tech_log` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%training` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `vref` int(10) unsigned NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `vref` int(11) unsigned NOT NULL, `unit` tinyint(2) unsigned NOT NULL, - `amt` int(10) unsigned NOT NULL, - `pop` int(10) unsigned NOT NULL, - `timestamp` int(10) unsigned NOT NULL, - `eachtime` int(10) unsigned NOT NULL, - `timestamp2` int(10) unsigned NOT NULL, + `amt` int(11) unsigned NOT NULL, + `pop` int(11) unsigned NOT NULL, + `timestamp` int(11) unsigned NOT NULL, + `eachtime` int(11) unsigned NOT NULL, + `timestamp2` int(11) unsigned NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1248,7 +1249,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%training` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%units` ( - `vref` int(10) unsigned NOT NULL, + `vref` int(11) unsigned NOT NULL, `u1` int(11) unsigned NOT NULL DEFAULT '0', `u2` int(11) unsigned NOT NULL DEFAULT '0', `u3` int(11) unsigned NOT NULL DEFAULT '0', @@ -1317,9 +1318,9 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%units` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%users` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `username` varchar(45) NOT NULL, - `password` varchar(45) NOT NULL, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `username` varchar(100) NOT NULL, + `password` varchar(100) NOT NULL, `email` text NOT NULL, `tribe` tinyint(1) unsigned NOT NULL, `access` tinyint(1) unsigned NOT NULL DEFAULT '1', @@ -1329,23 +1330,23 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%users` ( `location` text NOT NULL, `desc1` text NOT NULL, `desc2` text NOT NULL, - `plus` int(10) unsigned NOT NULL DEFAULT '0', - `goldclub` int(10) unsigned NOT NULL DEFAULT '0', - `b1` int(10) unsigned NOT NULL DEFAULT '0', - `b2` int(10) unsigned NOT NULL DEFAULT '0', - `b3` int(10) unsigned NOT NULL DEFAULT '0', - `b4` int(10) unsigned NOT NULL DEFAULT '0', - `sit1` int(10) unsigned NOT NULL DEFAULT '0', - `sit2` int(10) unsigned NOT NULL DEFAULT '0', - `alliance` int(10) unsigned NOT NULL DEFAULT '0', - `sessid` varchar(45) NOT NULL, + `plus` int(11) unsigned NOT NULL DEFAULT '0', + `goldclub` int(11) unsigned NOT NULL DEFAULT '0', + `b1` int(11) unsigned NOT NULL DEFAULT '0', + `b2` int(11) unsigned NOT NULL DEFAULT '0', + `b3` int(11) unsigned NOT NULL DEFAULT '0', + `b4` int(11) unsigned NOT NULL DEFAULT '0', + `sit1` int(11) unsigned NOT NULL DEFAULT '0', + `sit2` int(11) unsigned NOT NULL DEFAULT '0', + `alliance` int(11) unsigned NOT NULL DEFAULT '0', + `sessid` varchar(100) NOT NULL, `act` varchar(10) NOT NULL, - `timestamp` int(10) unsigned NOT NULL DEFAULT '0', - `ap` int(10) unsigned NOT NULL DEFAULT '0', - `apall` int(10) unsigned NOT NULL DEFAULT '0', - `dp` int(10) unsigned NOT NULL DEFAULT '0', - `dpall` int(10) unsigned NOT NULL DEFAULT '0', - `protect` int(10) unsigned NOT NULL, + `timestamp` int(11) unsigned NOT NULL DEFAULT '0', + `ap` int(11) unsigned NOT NULL DEFAULT '0', + `apall` int(11) unsigned NOT NULL DEFAULT '0', + `dp` int(11) unsigned NOT NULL DEFAULT '0', + `dpall` int(11) unsigned NOT NULL DEFAULT '0', + `protect` int(11) unsigned NOT NULL, `quest` tinyint(2) NOT NULL, `gpack` varchar(255) NOT NULL DEFAULT 'gpack/travian_default/', `cp` float(14,5) unsigned NOT NULL DEFAULT '1', @@ -1355,48 +1356,48 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%users` ( `ok` tinyint(1) unsigned NOT NULL DEFAULT '0', `clp` bigint(255) NOT NULL DEFAULT '0', `oldrank` bigint(255) unsigned NOT NULL DEFAULT '0', - `regtime` int(10) unsigned NOT NULL DEFAULT '0', - `invited` int(10) unsigned NOT NULL DEFAULT '0', - `friend0` int(10) unsigned NOT NULL, - `friend1` int(10) unsigned NOT NULL, - `friend2` int(10) unsigned NOT NULL, - `friend3` int(10) unsigned NOT NULL, - `friend4` int(10) unsigned NOT NULL, - `friend5` int(10) unsigned NOT NULL, - `friend6` int(10) unsigned NOT NULL, - `friend7` int(10) unsigned NOT NULL, - `friend8` int(10) unsigned NOT NULL, - `friend9` int(10) unsigned NOT NULL, - `friend10` int(10) unsigned NOT NULL, - `friend11` int(10) unsigned NOT NULL, - `friend12` int(10) unsigned NOT NULL, - `friend13` int(10) unsigned NOT NULL, - `friend14` int(10) unsigned NOT NULL, - `friend15` int(10) unsigned NOT NULL, - `friend16` int(10) unsigned NOT NULL, - `friend17` int(10) unsigned NOT NULL, - `friend18` int(10) unsigned NOT NULL, - `friend19` int(10) unsigned NOT NULL, - `friend0wait` int(10) unsigned NOT NULL, - `friend1wait` int(10) unsigned NOT NULL, - `friend2wait` int(10) unsigned NOT NULL, - `friend3wait` int(10) unsigned NOT NULL, - `friend4wait` int(10) unsigned NOT NULL, - `friend5wait` int(10) unsigned NOT NULL, - `friend6wait` int(10) unsigned NOT NULL, - `friend7wait` int(10) unsigned NOT NULL, - `friend8wait` int(10) unsigned NOT NULL, - `friend9wait` int(10) unsigned NOT NULL, - `friend10wait` int(10) unsigned NOT NULL, - `friend11wait` int(10) unsigned NOT NULL, - `friend12wait` int(10) unsigned NOT NULL, - `friend13wait` int(10) unsigned NOT NULL, - `friend14wait` int(10) unsigned NOT NULL, - `friend15wait` int(10) unsigned NOT NULL, - `friend16wait` int(10) unsigned NOT NULL, - `friend17wait` int(10) unsigned NOT NULL, - `friend18wait` int(10) unsigned NOT NULL, - `friend19wait` int(10) unsigned NOT NULL, + `regtime` int(11) unsigned NOT NULL DEFAULT '0', + `invited` int(11) unsigned NOT NULL DEFAULT '0', + `friend0` int(11) unsigned NOT NULL, + `friend1` int(11) unsigned NOT NULL, + `friend2` int(11) unsigned NOT NULL, + `friend3` int(11) unsigned NOT NULL, + `friend4` int(11) unsigned NOT NULL, + `friend5` int(11) unsigned NOT NULL, + `friend6` int(11) unsigned NOT NULL, + `friend7` int(11) unsigned NOT NULL, + `friend8` int(11) unsigned NOT NULL, + `friend9` int(11) unsigned NOT NULL, + `friend10` int(11) unsigned NOT NULL, + `friend11` int(11) unsigned NOT NULL, + `friend12` int(11) unsigned NOT NULL, + `friend13` int(11) unsigned NOT NULL, + `friend14` int(11) unsigned NOT NULL, + `friend15` int(11) unsigned NOT NULL, + `friend16` int(11) unsigned NOT NULL, + `friend17` int(11) unsigned NOT NULL, + `friend18` int(11) unsigned NOT NULL, + `friend19` int(11) unsigned NOT NULL, + `friend0wait` int(11) unsigned NOT NULL, + `friend1wait` int(11) unsigned NOT NULL, + `friend2wait` int(11) unsigned NOT NULL, + `friend3wait` int(11) unsigned NOT NULL, + `friend4wait` int(11) unsigned NOT NULL, + `friend5wait` int(11) unsigned NOT NULL, + `friend6wait` int(11) unsigned NOT NULL, + `friend7wait` int(11) unsigned NOT NULL, + `friend8wait` int(11) unsigned NOT NULL, + `friend9wait` int(11) unsigned NOT NULL, + `friend10wait` int(11) unsigned NOT NULL, + `friend11wait` int(11) unsigned NOT NULL, + `friend12wait` int(11) unsigned NOT NULL, + `friend13wait` int(11) unsigned NOT NULL, + `friend14wait` int(11) unsigned NOT NULL, + `friend15wait` int(11) unsigned NOT NULL, + `friend16wait` int(11) unsigned NOT NULL, + `friend17wait` int(11) unsigned NOT NULL, + `friend18wait` int(11) unsigned NOT NULL, + `friend19wait` int(11) unsigned NOT NULL, `maxevasion` mediumint(3) unsigned NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ; @@ -1418,28 +1419,28 @@ INSERT INTO `%PREFIX%users` (`id`, `username`, `password`, `email`, `tribe`, `ac -- CREATE TABLE IF NOT EXISTS `%PREFIX%vdata` ( -`wref` int(10) unsigned NOT NULL, -`owner` int(10) unsigned NOT NULL, -`name` varchar(45) NOT NULL, +`wref` int(11) unsigned NOT NULL, +`owner` int(11) unsigned NOT NULL, +`name` varchar(100) NOT NULL, `capital` tinyint(1) unsigned NOT NULL, -`pop` int(10) unsigned NOT NULL, -`cp` int(10) unsigned NOT NULL, -`celebration` int(10) NOT NULL DEFAULT '0', -`type` int(10) NOT NULL DEFAULT '0', +`pop` int(11) unsigned NOT NULL, +`cp` int(11) unsigned NOT NULL, +`celebration` int(11) NOT NULL DEFAULT '0', +`type` int(11) NOT NULL DEFAULT '0', `wood` float(12,2) NOT NULL, `clay` float(12,2) NOT NULL, `iron` float(12,2) NOT NULL, -`maxstore` int(10) unsigned NOT NULL, +`maxstore` int(11) unsigned NOT NULL, `crop` float(12,2) NOT NULL, -`maxcrop` int(10) unsigned NOT NULL, +`maxcrop` int(11) unsigned NOT NULL, `lastupdate` int(11) unsigned NOT NULL, `loyalty` float(9,6) unsigned NOT NULL DEFAULT '100', -`exp1` int(10) NOT NULL, -`exp2` int(10) NOT NULL, -`exp3` int(10) NOT NULL, +`exp1` int(11) NOT NULL, +`exp2` int(11) NOT NULL, +`exp3` int(11) NOT NULL, `created` int(11) NOT NULL, `natar` tinyint(1) unsigned NOT NULL, -`starv` int(10) unsigned NOT NULL, +`starv` int(11) unsigned NOT NULL, `evasion` tinyint(1) unsigned NOT NULL, PRIMARY KEY (`wref`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; @@ -1456,7 +1457,7 @@ PRIMARY KEY (`wref`) -- CREATE TABLE IF NOT EXISTS `%PREFIX%wdata` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `fieldtype` tinyint(2) unsigned NOT NULL, `oasistype` tinyint(2) unsigned NOT NULL, `x` int(11) NOT NULL, @@ -1476,9 +1477,9 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%wdata` ( -- CREATE TABLE IF NOT EXISTS `%PREFIX%password` ( - `uid` int(10) unsigned NOT NULL, - `npw` varchar(45) NOT NULL, - `cpw` varchar(45) NOT NULL, + `uid` int(11) unsigned NOT NULL, + `npw` varchar(100) NOT NULL, + `cpw` varchar(100) NOT NULL, `used` tinyint(1) NOT NULL DEFAULT '0', `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`uid`)