diff --git a/Admin/Templates/search.tpl b/Admin/Templates/search.tpl
index 30fa80ed..efa2bfa1 100644
--- a/Admin/Templates/search.tpl
+++ b/Admin/Templates/search.tpl
@@ -21,10 +21,10 @@
diff --git a/Admin/Templates/usergold.tpl b/Admin/Templates/usergold.tpl
new file mode 100644
index 00000000..05990d90
--- /dev/null
+++ b/Admin/Templates/usergold.tpl
@@ -0,0 +1,69 @@
+
+
+
+
+ Gold Added';
+ }
+?>
\ No newline at end of file
diff --git a/Admin/Templates/villages.tpl b/Admin/Templates/villages.tpl
index e541eed5..56bfe6c5 100644
--- a/Admin/Templates/villages.tpl
+++ b/Admin/Templates/villages.tpl
@@ -25,6 +25,7 @@
| Name |
Population |
Coordinates |
+ Add Troops |
|
';
}
}
-
+$addTroops = ' Edit Troops';
echo '
| '.$varray[$i]['name'].' '.$capital.' |
'.$varray[$i]['pop'].' Recount |
('.$coorproc['x'].'|'.$coorproc['y'].') |
+ '.$addTroops.' |
'.$delLink.' |
';
diff --git a/Admin/admin.php b/Admin/admin.php
index 538634e0..6553aec4 100644
--- a/Admin/admin.php
+++ b/Admin/admin.php
@@ -100,7 +100,8 @@ $timeformat = new timeFormatGenerator;
Online Users
Players Not Activated
- Search
+ Search
+ Search Players/Alliances/Villages/E-mails/IPs/Deleted Players
Search Messages/Battle Reports
Ban
@@ -109,6 +110,7 @@ $timeformat = new timeFormatGenerator;
Gold
Give All Free Gold
+ Give Free Gold To Specific User
Reset Gold
Medals
diff --git a/GameEngine/Admin/Mods/gold_1.php b/GameEngine/Admin/Mods/gold_1.php
index a0b67a40..3a2b7857 100644
--- a/GameEngine/Admin/Mods/gold_1.php
+++ b/GameEngine/Admin/Mods/gold_1.php
@@ -25,5 +25,5 @@ if($sessionaccess != 9) die("Access Denied: You are not
mysql_query("UPDATE ".TB_PREFIX."users SET gold = gold + ".$_POST['gold']." WHERE id = ".$id."");
-header("Location: ../../../Admin/admin.php?p=player&uid=".$id."&g=ok");
+header("Location: ../../../Admin/admin.php?p=usergold&g");
?>
\ No newline at end of file
diff --git a/GameEngine/Admin/Mods/natarend.php b/GameEngine/Admin/Mods/natarend.php
index 39ada0ad..30ee68e2 100644
--- a/GameEngine/Admin/Mods/natarend.php
+++ b/GameEngine/Admin/Mods/natarend.php
@@ -29,7 +29,7 @@ for($i=1;$i<=$amt;$i++) {
$cp = $pop-1;
$q = "insert into `s1_vdata`(`wref`,`owner`,`name`,`capital`,`pop`,`cp`,`celebration`,`type`,`wood`,`clay`,`iron`,`maxstore`,`crop`,`maxcrop`,`lastupdate`,`loyalty`,`exp1`,`exp2`,`exp3`,`created`,`natar`) values ('$wid','3','WW village',0,$pop,$cp,0,0,80000.00,80000.00,80000.00,80000,80000.00,80000,1314974534,100,0,0,0,$time,1)";
mysql_query($q) or die(mysql_error());
- $q = "insert into ".TB_PREFIX."fdata (`vref`,`f1`,`f1t`,`f2`,`f2t`,`f3`,`f3t`,`f4`,`f4t`,`f5`,`f5t`,`f6`,`f6t`,`f7`,`f7t`,`f8`,`f8t`,`f9`,`f9t`,`f10`,`f10t`,`f11`,`f11t`,`f12`,`f12t`,`f13`,`f13t`,`f14`,`f14t`,`f15`,`f15t`,`f16`,`f16t`,`f17`,`f17t`,`f18`,`f18t`,`f19`,`f19t`,`f20`,`f20t`,`f21`,`f21t`,`f22`,`f22t`,`f23`,`f23t`,`f24`,`f24t`,`f25`,`f25t`,`f26`,`f26t`,`f27`,`f27t`,`f28`,`f28t`,`f29`,`f29t`,`f30`,`f30t`,`f31`,`f31t`,`f32`,`f32t`,`f33`,`f33t`,`f34`,`f34t`,`f35`,`f35t`,`f36`,`f36t`,`f37`,`f37t`,`f38`,`f38t`,`f39`,`f39t`,`f40`,`f40t`,`f99`,`f99t`,`wwname`) values ($wid,0,1,0,4,0,1,0,3,0,2,0,2,0,3,0,4,0,4,0,3,0,3,0,4,0,4,0,1,0,4,0,2,0,1,0,2,20,17,20,11,20,15,20,10,10,22,10,25,0,0,0,0,10,19,0,0,0,0,0,0,10,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,16,0,0,0,0,'World Wonder')";
+ $q = "insert into ".TB_PREFIX."fdata (`vref`,`f1`,`f1t`,`f2`,`f2t`,`f3`,`f3t`,`f4`,`f4t`,`f5`,`f5t`,`f6`,`f6t`,`f7`,`f7t`,`f8`,`f8t`,`f9`,`f9t`,`f10`,`f10t`,`f11`,`f11t`,`f12`,`f12t`,`f13`,`f13t`,`f14`,`f14t`,`f15`,`f15t`,`f16`,`f16t`,`f17`,`f17t`,`f18`,`f18t`,`f19`,`f19t`,`f20`,`f20t`,`f21`,`f21t`,`f22`,`f22t`,`f23`,`f23t`,`f24`,`f24t`,`f25`,`f25t`,`f26`,`f26t`,`f27`,`f27t`,`f28`,`f28t`,`f29`,`f29t`,`f30`,`f30t`,`f31`,`f31t`,`f32`,`f32t`,`f33`,`f33t`,`f34`,`f34t`,`f35`,`f35t`,`f36`,`f36t`,`f37`,`f37t`,`f38`,`f38t`,`f39`,`f39t`,`f40`,`f40t`,`f99`,`f99t`,`wwname`) values ($wid,0,1,0,4,0,1,0,3,0,2,0,2,0,3,0,4,0,4,0,3,0,3,0,4,0,4,0,1,0,4,0,2,0,1,0,2,20,17,20,11,20,15,20,10,10,22,10,25,0,0,0,0,10,19,0,0,0,0,0,0,10,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,16,0,0,0,40,'World Wonder')";
mysql_query($q);
$database->addUnits($wid);
$database->addTech($wid);
diff --git a/GameEngine/Admin/database.php b/GameEngine/Admin/database.php
index 135b0e0d..b1185267 100644
--- a/GameEngine/Admin/database.php
+++ b/GameEngine/Admin/database.php
@@ -196,25 +196,25 @@ class adm_DB {
}
function DelVillage($wref){
- $q = "SELECT * FROM ".TB_PREFIX."vdata WHERE `wref` = $wref and capital = 1;";
+ $q = "SELECT * FROM ".TB_PREFIX."vdata WHERE `wref` = $wref";
$result = mysql_query($q, $this->connection);
if(mysql_num_rows($result) > 0){
mysql_query("Insert into ".TB_PREFIX."admin_log values (0,".$_SESSION['id'].",'Deleted village $wref',".time().")");
- $q = "DELETE FROM ".TB_PREFIX."vdata WHERE `wref` = $wref and capital = 1;";
+ $q = "DELETE FROM ".TB_PREFIX."vdata WHERE `wref` = $wref";
mysql_query($q, $this->connection);
- $q = "DELETE FROM ".TB_PREFIX."units WHERE `vref` = $wref;";
+ $q = "DELETE FROM ".TB_PREFIX."units WHERE `vref` = $wref";
mysql_query($q, $this->connection);
- $q = "DELETE FROM ".TB_PREFIX."bdata WHERE `wid` = $wref;";
+ $q = "DELETE FROM ".TB_PREFIX."bdata WHERE `wid` = $wref";
mysql_query($q, $this->connection);
- $q = "DELETE FROM ".TB_PREFIX."abdata WHERE `wid` = $wref;";
+ $q = "DELETE FROM ".TB_PREFIX."abdata WHERE `wid` = $wref";
mysql_query($q, $this->connection);
- $q = "DELETE FROM ".TB_PREFIX."fdata WHERE `vref` = $wref;";
+ $q = "DELETE FROM ".TB_PREFIX."fdata WHERE `vref` = $wref";
mysql_query($q, $this->connection);
- $q = "DELETE FROM ".TB_PREFIX."training WHERE `vref` = $wref;";
+ $q = "DELETE FROM ".TB_PREFIX."training WHERE `vref` = $wref";
mysql_query($q, $this->connection);
- $q = "DELETE FROM ".TB_PREFIX."movement WHERE `from` = $wref;";
+ $q = "DELETE FROM ".TB_PREFIX."movement WHERE `from` = $wref";
mysql_query($q, $this->connection);
- $q = "UPDATE ".TB_PREFIX."wdata SET `occupied` = '0' WHERE `id` = $wref;";
+ $q = "UPDATE ".TB_PREFIX."wdata SET `occupied` = '0' WHERE `id` = $wref";
mysql_query($q, $this->connection);
}
}
diff --git a/GameEngine/Session.php b/GameEngine/Session.php
index 292881c3..88cddc93 100644
--- a/GameEngine/Session.php
+++ b/GameEngine/Session.php
@@ -8,7 +8,7 @@ ob_start();
## Copyright: TravianX (c) 2010-2011. All rights reserved. ##
## ##
#################################################################################
-if(!file_exists('GameEngine/config.php') && !file_exists('../../GameEngine/config.php')) {header("Location: install/");}
+if(!file_exists('GameEngine/config.php') && !file_exists('../../GameEngine/config.php') && !file_exists('../../config.php')) {header("Location: install/");}
$script_name = ($_SERVER['REQUEST_URI'] == 'karte.php') ? 'karte' : $_SERVER['REQUEST_URI'];
include ("Battle.php");