From 29b97b40d94bd3bcb191802640a22548711d807b Mon Sep 17 00:00:00 2001
From: unknown <Idan@Idan-Laptop.(none)>
Date: Mon, 9 Apr 2012 23:03:22 +0300
Subject: [PATCH] improve ally news + edit allianz.php and spieler.php + more
 little update for goldclub

---
 GameEngine/Alliance.php   |  16 +--
 GameEngine/config.php     | 254 ++++++++++++++++++++++++++++++++++++++
 Templates/Build/16.tpl    |   2 +-
 Templates/Build/16_99.tpl |   2 +-
 Templates/Plus/3.tpl      |   2 +-
 allianz.php               |   2 +-
 build.php                 |   2 +
 7 files changed, 268 insertions(+), 12 deletions(-)
 create mode 100644 GameEngine/config.php

diff --git a/GameEngine/Alliance.php b/GameEngine/Alliance.php
index f70fd0d6..46021a5d 100644
--- a/GameEngine/Alliance.php
+++ b/GameEngine/Alliance.php
@@ -155,10 +155,10 @@
        		foreach($this->inviteArray as $invite) {
        			if($invite['id'] == $get['d']) {
        				$database->removeInvitation($get['d']);
-       				$database->insertAlliNotice($session->alliance, '<a href="spieler.php?uid=' . $session->uid . '">' . $session->username . '</a> has deleted an invitation.');
+       				$database->insertAlliNotice($invite['alliance'], '<a href="spieler.php?uid=' . $session->uid . '">' . $session->username . '</a> has rejected the invitation.');
        			}
        		}
-       		//header("Location: build.php?id=".$get['id']);
+       		header("Location: build.php?id=".$get['id']);
        	}
 
        	/*****************************************
@@ -169,11 +169,11 @@
        		$inviteArray = $database->getAliInvitations($session->alliance);
        		foreach($inviteArray as $invite) {
        			if($invite['id'] == $get['d']) {
+				$invitename = $database->getUserArray($invite['uid'], 1);
        				$database->removeInvitation($get['d']);
-       				$database->insertAlliNotice($session->alliance, '<a href="spieler.php?uid=' . $session->uid . '">' . $session->username . '</a> has deleted an invitation.');
+       				$database->insertAlliNotice($session->alliance, '<a href="spieler.php?uid=' . $session->uid . '">' . $session->username . '</a> has deleted the invitation for <a href="spieler.php?uid=' . $invitename['id'] . '">' . $invitename['username'] . '</a>.');
        			}
        		}
-       		//header("Location: build.php?id=".$get['id']);
        	}
 
        	/*****************************************
@@ -222,7 +222,7 @@
        			// Asign Permissions
        			$database->createAlliPermissions($database->RemoveXSS($session->uid), $database->RemoveXSS($aid), 'Alliance founder', '1', '1', '1', '1', '1', '1', '1', '1');
        			// log the notice
-       			$database->insertAlliNotice($session->alliance, 'The alliance has been founded by <a href="spieler.php?uid=' . $session->uid . '">' . $session->username . '</a>');
+       			$database->insertAlliNotice($aid, 'The alliance has been founded by <a href="spieler.php?uid=' . $session->uid . '">' . $session->username . '</a>.');
        			header("Location: build.php?id=" . $post['id']);
        		}
        	}
@@ -274,7 +274,7 @@
        		} else {
        			$database->submitAlliProfile($database->RemoveXSS($session->alliance), $database->RemoveXSS($post['be2']), $database->RemoveXSS($post['be1']));
        			// log the notice
-       			$database->insertAlliNotice($session->alliance, '<a href="spieler.php?uid=' . $session->uid . '">' . $session->username . '</a> has changed the alliance description');
+       			$database->insertAlliNotice($session->alliance, '<a href="spieler.php?uid=' . $session->uid . '">' . $session->username . '</a> has changed the alliance description.');
        		}
        	}
 
@@ -333,8 +333,8 @@
        			$database->deleteAlliPermissions($session->uid);
        			// log the notice
        			$database->deleteAlliance($session->alliance);
-       			$database->insertAlliNotice($session->alliance, '<a href="spieler.php?uid=' . $session->uid . '">' . $session->username . '</a> has quit the alliance');
-       			header("Location: dorf1.php");
+       			$database->insertAlliNotice($session->alliance, '<a href="spieler.php?uid=' . $session->uid . '">' . $session->username . '</a> has quit the alliance.');
+       			header("Location: spieler.php?uid=".$session->uid);
        		}
        	}
 
diff --git a/GameEngine/config.php b/GameEngine/config.php
new file mode 100644
index 00000000..812857a8
--- /dev/null
+++ b/GameEngine/config.php
@@ -0,0 +1,254 @@
+<?php
+###############################  S  T  A  R  T   ################################
+##              -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =-                 ##
+## --------------------------------------------------------------------------- ##
+##  Filename       config.php                                                  ##
+##  Version        4.8.5                                                       ##
+##  Developed by:  Dzoki and Dixie Edited by Advocaite                         ##
+##  License:       TravianX Project                                            ##
+##  Copyright:     TravianX (c) 2010-2011. All rights reserved.                ##
+##                                                                             ##
+#################################################################################
+
+//////////////////////////////////
+// *****  ERROR REPORTING  *****//
+//////////////////////////////////
+// (E_ALL ^ E_NOTICE) = enabled
+// (0) = disabled
+error_reporting (E_ALL ^ E_NOTICE);
+
+//////////////////////////////////
+// *****  SERVER SETTINGS  *****//
+//////////////////////////////////
+
+// ***** Name
+define("SERVER_NAME","TravianX");
+
+// ***** Started
+// Defines when has server started.
+define("COMMENCE","1333809112");
+
+// ***** Language
+// Choose your server language.
+define("LANG","en");
+
+// ***** Speed
+// Choose your server speed. NOTICE: Higher speed, more likely
+// to have some bugs. Lower speed, most likely no major bugs.
+// Values: 1 (normal), 3 (3x speed) etc...
+define("SPEED", "100000");
+
+// ***** World size
+// Defines world size. NOTICE: DO NOT EDIT!!
+define("WORLD_MAX", "25");
+
+// ***** Graphic Pack
+// True = enabled, false = disabled
+//!!!!!!!!!!!! DO NOT ENABLE !!!!!!!!!!!!
+define("GP_ENABLE",false);
+// Graphic pack location (default: gpack/travian_default/)
+define("GP_LOCATE", "gpack/travian_default/");
+
+// ***** Troop Speed
+// Values: 1 (normal), 3 (3x speed) etc...
+define("INCREASE_SPEED","1000");
+
+// ***** Trader capacity
+// Values: 1 (normal), 3 (3x speed) etc...
+define("TRADER_CAPACITY","1");
+
+
+// ***** Village Expand
+// 1 = slow village expanding - more Cultural Points needed for every new village
+// 0 = fast village expanding - less Cultural Points needed for every new village
+define("CP", 1);
+
+// ***** Demolish Level Required
+// Defines which level of Main building is required to be able to
+// demolish. Min value = 1, max value = 20
+// Default: 10
+define("DEMOLISH_LEVEL_REQ","10");
+
+// ***** Change storage capacity
+define("STORAGE_MULTIPLIER","1");
+define("STORAGE_BASE",800*STORAGE_MULTIPLIER);
+
+// ***** Quest
+// Ingame quest enabled/disabled.
+define("QUEST",true);
+
+// ***** Beginners Protection
+// 3600 = 1 hour
+// 3600*12 = 12 hours
+// 3600*24 = 1 day
+// 3600*24*3 = 3 days
+// You can choose any value you want!
+define("PROTECTION","0");
+
+// ***** Enable WW Statistics
+define("WW",True);
+
+// ***** Enable T4 is Coming screen
+define("T4_COMING",true);
+
+// ***** Activation Mail
+// true = activation mail will be sent, users will have to finish registration
+//        by clicking on link recieved in mail.
+// false =  users can register with any mail. Not needed to be real one.
+define("AUTH_EMAIL",false);
+
+// ***** PLUS
+//Plus account lenght
+define("PLUS_TIME",3600*24*7);
+//+25% production lenght
+define("PLUS_PRODUCTION",3600*24*7);
+// ***** Great Workshop
+define("GREAT_WKS",True);
+// ***** Tourn threshold
+define("TS_THRESHOLD",20);  
+
+
+
+//////////////////////////////////
+//    **** LOG SETTINGS  ****   //
+//////////////////////////////////
+// LOG BUILDING/UPGRADING
+define("LOG_BUILD",true);
+// LOG RESEARCHES
+define("LOG_TECH",true);
+// LOG USER LOGIN (IP's)
+define("LOG_LOGIN",true);
+// LOG GOLD
+define("LOG_GOLD_FIN",true);
+// LOG ADMIN
+define("LOG_ADMIN",true);
+// LOG ATTACK REPORTS
+define("LOG_WAR",true);
+// LOG MARKET REPORTS
+define("LOG_MARKET",true);
+// LOG ILLEGAL ACTIONS
+define("LOG_ILLEGAL",true);
+
+
+
+//////////////////////////////////
+// ****  NEWSBOX SETTINGS  **** //
+//////////////////////////////////
+//true = enabled
+//false = disabled
+define("NEWSBOX1",true);
+define("NEWSBOX2",false);
+define("NEWSBOX3",false);
+
+
+
+//////////////////////////////////
+//   ****  SQL SETTINGS  ****   //
+//////////////////////////////////
+
+// ***** SQL Hostname
+// example. sql106.000space.com / localhost
+// If you host server on own PC than this value is: localhost
+// If you use online hosting, value must be written in host cpanel
+define("SQL_SERVER", "localhost");
+
+// ***** Database Username
+define("SQL_USER", "root");
+
+// ***** Database Password
+define("SQL_PASS", "");
+
+// ***** Database Name
+define("SQL_DB", "travianx");
+
+// ***** Database - Table Prefix
+define("TB_PREFIX", "s1_");
+
+// ***** Database type
+// 0 = MYSQL
+// 1 = MYSQLi
+// default: 1
+define("DB_TYPE", 0);
+
+
+
+////////////////////////////////////
+//   ****  EXTRA SETTINGS  ****   //
+////////////////////////////////////
+
+// ***** Censore words
+//define("WORD_CENSOR", "%ACTCEN%");
+
+// ***** Words (censore)
+// Choose which words do you want to be censored
+//define("CENSORED","%CENWORDS%");
+
+
+// ***** Limit Mailbox
+// Limits mailbox to defined number of mails. (IGM's)
+define("LIMIT_MAILBOX",true);
+// If enabled, define number of maximum mails.
+define("MAX_MAIL","30");
+
+// ***** Include administrator in statistics/rank
+define("INCLUDE_ADMIN", False);
+
+
+
+////////////////////////////////////
+//   ****  ADMIN SETTINGS  ****   //
+////////////////////////////////////
+
+// ***** Admin Email
+define("ADMIN_EMAIL", "");
+
+// ***** Admin Name
+define("ADMIN_NAME", "");
+
+
+
+//////////////////////////////////////////
+//   ****  DO NOT EDIT SETTINGS  ****   //
+//////////////////////////////////////////
+define("TRACK_USR","");
+define("USER_TIMEOUT",""); 
+define("ALLOW_BURST",false);
+define("BASIC_MAX",1);
+define("INNER_MAX",1);
+define("PLUS_MAX",1);
+define("ALLOW_ALL_TRIBE",false);
+define("CFM_ADMIN_ACT",true);
+define("SERVER_WEB_ROOT",false);
+define("USRNM_SPECIAL",true);
+define("USRNM_MIN_LENGTH",3);
+define("PW_MIN_LENGTH",4);
+define("BANNED",0);
+define("AUTH",1);
+define("USER",2);
+define("MULTIHUNTER",8);
+define("ADMIN",9);
+define("COOKIE_EXPIRE", 60*60*24*7); 
+define("COOKIE_PATH", "/"); 
+
+
+////////////////////////////////////////////
+//   ****  DOMAIN/SERVER SETTINGS  ****   //
+////////////////////////////////////////////
+define("DOMAIN", "");
+define("HOMEPAGE", "http://localhost/");
+define("SERVER", "");
+
+$requse = 0;
+
+###############################  E    N    D   ##################################
+##              -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =-                 ##
+## --------------------------------------------------------------------------- ##
+##  Filename       config.php                                                  ##
+##  Version        4.8.5                                                       ##
+##  Developed by:  Dzoki and Dixie Edited by Advocaite                         ##
+##  License:       TravianX Project                                            ##
+##  Copyright:     TravianX (c) 2010-2011. All rights reserved.                ##
+##                                                                             ##
+#################################################################################
+
+?>
diff --git a/Templates/Build/16.tpl b/Templates/Build/16.tpl
index d6985289..b29444db 100644
--- a/Templates/Build/16.tpl
+++ b/Templates/Build/16.tpl
@@ -8,7 +8,7 @@
 		<a href="build.php?id=<?php echo $id; ?>">Overview</a> |
 		<a href="a2b.php">Send troops</a> |
 		<a href="warsim.php">Combat Simulator</a> <?php if($session->goldclub==1){ ?>|
-		<a href="build.php?id=<?php echo $id; ?>&amp;t=99">Farmlist</a>
+		<a href="build.php?id=<?php echo $id; ?>&amp;t=99">Gold Club</a>
 		<?php } ?>
 		</div>
 <?php
diff --git a/Templates/Build/16_99.tpl b/Templates/Build/16_99.tpl
index 1a54a0d4..91a62fa6 100644
--- a/Templates/Build/16_99.tpl
+++ b/Templates/Build/16_99.tpl
@@ -13,7 +13,7 @@ if(!$session->goldclub) {
 		<a href="build.php?id=<?php echo $id; ?>">Overview</a> |
 		<a href="a2b.php">Send troops</a> |
 		<a href="warsim.php">Combat Simulator</a> <?php if($session->goldclub==1){ ?>|
-		<a href="build.php?id=<?php echo $id; ?>&amp;t=99">Farmlist</a>
+		<a href="build.php?id=<?php echo $id; ?>&amp;t=99">Gold Club</a>
 		<?php } ?>
 		</div>
 
diff --git a/Templates/Plus/3.tpl b/Templates/Plus/3.tpl
index fed9c886..4fd30282 100644
--- a/Templates/Plus/3.tpl
+++ b/Templates/Plus/3.tpl
@@ -455,7 +455,7 @@ if (mysql_num_rows($MyGold)) {
             <td class="man"></td>
             <td class="desc">
 <b>Gold Club</b></br>
-<font size="2">Gold Club including: farmlist, merchants run three times, crop finder, master builder, trade routes and automatic send away troops before an attack.</font>
+<font size="2">Gold Club including: farmlist, merchants run three times, crop finder, master builder, trade routes, raid statistics and automatic send away troops before an attack.</font>
         <span class="run">
     </span>
             </td>
diff --git a/allianz.php b/allianz.php
index de7ea319..df98af46 100644
--- a/allianz.php
+++ b/allianz.php
@@ -277,5 +277,5 @@ if($_GET['aid'] or $session->alliance!=0){
 </html>
 <?php
 }else{
-header("Location: dorf1.php");
+header("Location: spieler.php?uid=".$session->uid);
 }
\ No newline at end of file
diff --git a/build.php b/build.php
index 325a0d74..34b5a6e4 100644
--- a/build.php
+++ b/build.php
@@ -180,6 +180,8 @@ if(isset($_GET['id'])) {
 			include("Templates/Build/".$village->resarray['f'.$_GET['id'].'t'].".tpl");
 		}
 	}
+}else{
+header("Location: dorf1.php");
 }
 ?>