From 3ba3c0706dd55543b6535bbea49c48d17dffdc8c Mon Sep 17 00:00:00 2001
From: unknown <Idan@Idan-Laptop.(none)>
Date: Tue, 19 Jun 2012 15:02:38 +0300
Subject: [PATCH] some ranking updates

---
 GameEngine/Automation.php        |  20 +--
 GameEngine/Database/db_MYSQL.php |   2 +-
 GameEngine/Ranking.php           |  10 +-
 GameEngine/config.php            | 270 +++++++++++++++++++++++++++++++
 4 files changed, 286 insertions(+), 16 deletions(-)
 create mode 100644 GameEngine/config.php

diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php
index 7ec57f3a..74b82b6c 100644
--- a/GameEngine/Automation.php
+++ b/GameEngine/Automation.php
@@ -3831,12 +3831,10 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
 
 			private function procClimbers() {
 				global $database, $ranking;
-					$users = "SELECT * FROM " . TB_PREFIX . "users WHERE tribe!=0 AND tribe!=4 AND tribe!=5";
+					$users = "SELECT * FROM " . TB_PREFIX . "users WHERE access < " . (INCLUDE_ADMIN ? "10" : "8") . "";
 					$array = $database->query_return($users);
-					if(mysql_num_rows(mysql_query($users)) > 0){
 					$ranking->procRankArray();
-					foreach($array as $session){
-					$oldrank = $ranking->searchRank($session['username'], "username");
+					if(count($ranking->getRank()) > 0){
 					$q = "SELECT * FROM ".TB_PREFIX."medal order by week DESC LIMIT 0, 1";
 					$result = mysql_query($q);
 					if(mysql_num_rows($result)) {
@@ -3845,6 +3843,8 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
 					} else {
 						$week='1';
 					}
+					foreach($array as $session){
+					$oldrank = $ranking->searchRank($session['username'], "username");
 					if($week > 1){
 					if($session['oldrank'] > $oldrank) {
 						$totalpoints = $session['oldrank'] - $oldrank;
@@ -3863,15 +3863,16 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
 					}
 					$database->updateoldrank($session['id'], $oldrank);
 					}
-					$countally = count($database->countAlli());
-					if($countally > 0){
-					for($i=1;$i<=$countally;$i++){
-					$memberlist = $database->getAllMember($i);
+					}
+					$alliance = $database->getARanking();
+					$ranking->procARankArray();
+					if(count($ranking->getRank()) > 0){
+					foreach($alliance as $ally){
+					$memberlist = $database->getAllMember($ally['id']);
 					$oldrank = 0;
 					foreach($memberlist as $member) {
 						$oldrank += $database->getVSumField($member['id'],"pop");
 					}
-						$ally = $database->getAlliance($i);
 						if($ally['oldrank'] < $oldrank) {
 							$totalpoints = $oldrank - $ally['oldrank'];
 							$database->addclimberrankpopAlly($ally['id'], $totalpoints);
@@ -3884,7 +3885,6 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
 							}
 					}
 					}
-					}
 			}
 }
 $automation = new Automation;
diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php
index 331d027d..752c8862 100644
--- a/GameEngine/Database/db_MYSQL.php
+++ b/GameEngine/Database/db_MYSQL.php
@@ -2119,7 +2119,7 @@ class MYSQL_DB {
 	}
 
 	function getARanking() {
-		$q = "SELECT id,name,tag FROM " . TB_PREFIX . "alidata where id != ''";
+		$q = "SELECT id,name,tag FROM " . TB_PREFIX . "alidata where id != '' ORDER BY id DESC";
 		$result = mysql_query($q, $this->connection);
 		return $this->mysql_fetch_all($result);
 	}
diff --git a/GameEngine/Ranking.php b/GameEngine/Ranking.php
index eba1f988..193b363f 100644
--- a/GameEngine/Ranking.php
+++ b/GameEngine/Ranking.php
@@ -198,7 +198,7 @@
 			)allitag
 			FROM " . TB_PREFIX . "users
 			WHERE " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . "
-			ORDER BY totalpop DESC, totalvillages DESC, username ASC";
+			ORDER BY totalpop DESC, totalvillages DESC";
 
 
 				$result = (mysql_query($q));
@@ -253,7 +253,7 @@
 			)allitag
 			FROM " . TB_PREFIX . "users
 			WHERE " . TB_PREFIX . "users.tribe = $race AND " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . "
-			ORDER BY totalpop DESC, totalvillages DESC, username ASC";
+			ORDER BY totalpop DESC, totalvillages DESC";
 
 
 				$result = (mysql_query($q));
@@ -312,7 +312,7 @@
 			)pop
 			FROM " . TB_PREFIX . "users
 			WHERE " . TB_PREFIX . "users.apall >=0 AND " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . " AND " . TB_PREFIX . "users.tribe <= 3
-			ORDER BY " . TB_PREFIX . "users.apall DESC, pop DESC, username ASC";
+			ORDER BY " . TB_PREFIX . "users.apall DESC, pop DESC";
 				$result = mysql_query($q) or die(mysql_error());
 				while($row = mysql_Fetch_assoc($result)) {
 					$datas[] = $row;
@@ -355,7 +355,7 @@
 			)pop
 			FROM " . TB_PREFIX . "users
 			WHERE " . TB_PREFIX . "users.dpall >=0 AND " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . "
-			ORDER BY " . TB_PREFIX . "users.dpall DESC, pop DESC, username ASC";
+			ORDER BY " . TB_PREFIX . "users.dpall DESC, pop DESC";
 				$result = mysql_query($q) or die(mysql_error());
 				while($row = mysql_Fetch_assoc($result)) {
 					$datas[] = $row;
@@ -401,7 +401,7 @@
 				$this->rankarray = $newholder;
 			}
 
-			private function procARankArray() {
+			public function procARankArray() {
 				global $database, $multisort;
 				$array = $database->getARanking();
 				$holder = array();
diff --git a/GameEngine/config.php b/GameEngine/config.php
new file mode 100644
index 00000000..f9f8a3fa
--- /dev/null
+++ b/GameEngine/config.php
@@ -0,0 +1,270 @@
+<?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","TravianZ");
+
+// ***** Started
+// Defines when has server started.
+define("COMMENCE","1340053327");
+
+// ***** Server Start Date / Time
+define("START_DATE", "06/18/2012");
+define("START_TIME", "20:00");
+
+// ***** 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","10000");
+
+// ***** Evasion Speed
+define("EVASION_SPEED","6");
+
+// ***** 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",False);
+
+// ***** Enable T4 is Coming screen
+define("T4_COMING",false);
+
+// ***** 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",False);
+// ***** Tourn threshold
+define("TS_THRESHOLD",20);  
+
+// ***** Register open/close
+define("REG_OPEN",True);
+
+// ***** Peace system
+// 0 = None
+// 1 = Normal
+// 2 = Christmas
+// 3 = New Year
+// 4 = Easter
+define("PEACE",0);
+
+//////////////////////////////////
+//    **** LOG SETTINGS  ****   //
+//////////////////////////////////
+// LOG BUILDING/UPGRADING
+define("LOG_BUILD",false);
+// LOG RESEARCHES
+define("LOG_TECH",false);
+// LOG USER LOGIN (IP's)
+define("LOG_LOGIN",false);
+// LOG GOLD
+define("LOG_GOLD_FIN",false);
+// LOG ADMIN
+define("LOG_ADMIN",false);
+// LOG ATTACK REPORTS
+define("LOG_WAR",false);
+// LOG MARKET REPORTS
+define("LOG_MARKET",false);
+// LOG ILLEGAL ACTIONS
+define("LOG_ILLEGAL",false);
+
+
+
+//////////////////////////////////
+// ****  NEWSBOX SETTINGS  **** //
+//////////////////////////////////
+//true = enabled
+//false = disabled
+define("NEWSBOX1",false);
+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", "travianz");
+
+// ***** 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",false);
+// 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", "http://localhost/");
+define("HOMEPAGE", "http://localhost/");
+define("SERVER", "http://localhost/");
+
+$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.                ##
+##                                                                             ##
+#################################################################################
+
+?>
\ No newline at end of file