From 93e5869d7adad046b1a4d48cfe130dfdc606f819 Mon Sep 17 00:00:00 2001
From: unknown <Idan@Idan-Laptop.(none)>
Date: Tue, 19 Jun 2012 19:15:22 +0300
Subject: [PATCH] delete my config + fix error in automation.php when are not
 any users in the server and include admin in rank is disable

---
 GameEngine/Database/db_MYSQL.php |   2 +-
 GameEngine/Ranking.php           |  10 +-
 GameEngine/config.php            | 270 -------------------------------
 3 files changed, 3 insertions(+), 279 deletions(-)
 delete mode 100644 GameEngine/config.php

diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php
index 752c8862..f227077e 100644
--- a/GameEngine/Database/db_MYSQL.php
+++ b/GameEngine/Database/db_MYSQL.php
@@ -2631,7 +2631,7 @@ class MYSQL_DB {
 	}
 
 	function countUser() {
-		$q = "SELECT count(id) FROM " . TB_PREFIX . "users where id != 0";
+		$q = "SELECT count(id) FROM " . TB_PREFIX . "users where id > 5";
 		$result = mysql_query($q, $this->connection);
 		$row = mysql_fetch_row($result);
 		return $row[0];
diff --git a/GameEngine/Ranking.php b/GameEngine/Ranking.php
index 193b363f..0df7c2fd 100644
--- a/GameEngine/Ranking.php
+++ b/GameEngine/Ranking.php
@@ -173,12 +173,8 @@
 
 			public function procRankArray() {
 				global $database, $multisort;
-				//$array = $database->getRanking();
+				if($database->countUser() > 0){
 				$holder = array();
-				//$value['totalvillage'] = count($database->getVillagesID($value['id']));
-				//$value['totalvillage'] = count($database->getVillagesID($value['id']));
-				//$value['totalpop'] = $database->getVSumField($value['id'],"pop");
-				//$value['aname'] = $database->getAllianceName($value['alliance']);
 				$q = "SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.username username," . TB_PREFIX . "users.alliance alliance, (
 
 			SELECT SUM( " . TB_PREFIX . "vdata.pop )
@@ -207,24 +203,22 @@
 				}
 
 				foreach($datas as $result) {
-					//$value = $array[$result['userid']];
 					$value['userid'] = $result['userid'];
 					$value['username'] = $result['username'];
 					$value['alliance'] = $result['alliance'];
 					$value['aname'] = $result['allitag'];
 					$value['totalpop'] = $result['totalpop'];
 					$value['totalvillage'] = $result['totalvillages'];
-					//SELECT (SELECT SUM(".TB_PREFIX."vdata.pop) FROM ".TB_PREFIX."vdata WHERE ".TB_PREFIX."vdata.owner = 2)  totalpop, (SELECT COUNT(".TB_PREFIX."vdata.wref) FROM ".TB_PREFIX."vdata WHERE ".TB_PREFIX."vdata.owner = 2) totalvillages, (SELECT ".TB_PREFIX."alidata.tag FROM ".TB_PREFIX."alidata WHERE ".TB_PREFIX."alidata.id = ".TB_PREFIX."users.alliance AND ".TB_PREFIX."users.id = 2);
 					array_push($holder, $value);
 				}
 
-				//$holder = $multisort->sorte($holder, "'totalvillage'", false, 2, "'totalpop'", false, 2);
 				$newholder = array("pad");
 				foreach($holder as $key) {
 					array_push($newholder, $key);
 				}
 				$this->rankarray = $newholder;
 			}
+			}
 
 			private function procRankRaceArray($race) {
 				global $database, $multisort;
diff --git a/GameEngine/config.php b/GameEngine/config.php
deleted file mode 100644
index f9f8a3fa..00000000
--- a/GameEngine/config.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?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