-
[LANG]title[/LANG]
-
diff --git a/cronjob.php b/cronjob.php
new file mode 100644
index 0000000..c50bc31
--- /dev/null
+++ b/cronjob.php
@@ -0,0 +1,61 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2013-01-17)
+ * @info $Id$
+ * @link http://2moons.cc/
+ */
+
+define('MODE', 'CRON');
+
+define('ROOT_PATH', str_replace('\\', '/',dirname(__FILE__)).'/');
+require(ROOT_PATH . 'includes/common.php');
+
+// Output transparent gif
+HTTP::sendHeader('Cache-Control', 'no-cache');
+HTTP::sendHeader('Content-Type', 'image/gif');
+HTTP::sendHeader('Expires', '0');
+$isSessionActive = $SESSION->isActiveSession();
+echo("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");
+
+if(!$isSessionActive)
+{
+ exit;
+}
+
+$cronjobID = HTTP::_GP('cronjobID', 0);
+
+if(empty($cronjobID))
+{
+ exit;
+}
+
+require ROOT_PATH.'includes/classes/Cronjob.class.php';
+
+$cronjobsTodo = Cronjob::getNeedTodoExecutedJobs();
+if(!in_array($cronjobID, $cronjobsTodo))
+{
+ exit;
+}
+
+Cronjob::execute($cronjobID);
diff --git a/cronjobs.php b/cronjobs.php
deleted file mode 100644
index 256d95a..0000000
--- a/cronjobs.php
+++ /dev/null
@@ -1,126 +0,0 @@
-.
- *
- * @package 2Moons
- * @author Slaver
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
- * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
- * @info $Id$
- * @link http://code.google.com/p/2moons/
- */
-
-define('INSIDE' , true);
-define('IN_CRON' , true);
-
-define('ROOT_PATH', str_replace('\\', '/',dirname(__FILE__)).'/');
-require(ROOT_PATH . 'includes/common.php');
-
-if (empty($_SESSION)) exit;
-
-// Output transparent gif
-header('Cache-Control: no-cache');
-header('Content-type: image/gif');
-header('Content-length: 43');
-header('Expires: 0');
-echo("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");
-$cron = request_var('cron','');
-switch($cron)
-{
- case "stats":
- if (TIMESTAMP >= ($CONF['stat_last_update'] + (60 * $CONF['stat_update_time'])))
- {
- update_config(array('stat_last_update' => TIMESTAMP));
- require_once(ROOT_PATH . 'includes/classes/class.statbuilder.php');
- $stat = new Statbuilder();
- $result = $stat->MakeStats();
- }
- break;
- case "daily":
- if (TIMESTAMP >= ($CONF['stat_last_db_update'] + (60 * 60 * 24)))
- {
- // Optimize Database
- update_config(array('stat_last_db_update' => TIMESTAMP));
- $prueba = $db->query("SHOW TABLE STATUS from ".DB_NAME.";");
- $table = "";
- while($pru = $db->fetch_array($prueba)){
- $compprefix = explode("_",$pru["Name"]);
-
- if($compprefix[0].'_' == DB_PREFIX && $compprefix[1] != 'session')
- {
- $table .= "`".$pru["Name"]."`, ";
- }
- }
- $db->query("OPTIMIZE TABLE ".substr($table, 0, -2).";");
-
- // Clear Cache
- ClearCache();
- // Set Bonus for RefLink
- if($CONF['ref_active'] == 1) {
- $Users = $db->query("SELECT `username`, `ref_id`, `id` FROM ".USERS." WHERE `ref_bonus` = 1 AND (SELECT `total_points` FROM ".STATPOINTS." as s WHERE s.`id_owner` = `id` AND s.`stat_type` = '1') >= ".$CONF['ref_minpoints'].";");
- $LANG->setDefault($CONF['lang']);
- while($User = $db->fetch_array($Users)) {
- $LANG->setUser($User['lang']);
- $LANG->includeLang(array('INGAME', 'TECH'));
- $db->multi_query("UPDATE ".USERS." SET `darkmatter` = `darkmatter` + '".$CONF['ref_bonus']."' WHERE `id` = '".$User['ref_id']."';UPDATE ".USERS." SET `ref_bonus` = `ref_bonus` = '0' WHERE `id` = '".$User['id']."';");
- $Message = sprintf($LNG['sys_refferal_text'], $User['username'], pretty_number($CONF['ref_minpoints']), $CONF['ref_bonus'], pretty_number($LNG['Darkmatter']));
- SendSimpleMessage($User['ref_id'], '', TIMESTAMP, 4, $LNG['sys_refferal_from'], sprintf($LNG['sys_refferal_title'], $User['username']), $Message);
- }
- }
- // Send inactive Players Mails
- if($CONF['sendmail_inactive'] == 1 && $CONF['mail_active'] == 1) {
- $Users = $db->query("SELECT `id`, `username`, `lang`, `email`, `onlinetime` FROM ".USERS." WHERE `inactive_mail` = '0' AND `onlinetime` < '".(TIMESTAMP - $CONF['del_user_sendmail'])."';");
- while($User = $db->fetch_array($Users)) {
- $MailSubject = sprintf($LNG['reg_mail_reg_done'], $CONF['game_name']);
- $MailRAW = file_get_contents("./language/".$User['lang']."/email/email_inactive.txt");
- $MailContent = sprintf($MailRAW, $User['username'], $CONF['game_name'].' - '.$CONF['uni_name'], tz_date($User['onlinetime']), PROTOCOL.$_SERVER['HTTP_HOST'].HTTP_ROOT);
- MailSend($User['email'], $User['username'], $MailSubject, $MailContent);
- $db->query("UPDATE ".USERS." SET `inactive_mail` = '1' WHERE `id` = '".$User['id']."';");
- }
- }
- }
- break;
- case "teamspeak":
- if ($CONF['ts_modon'] == 1 && TIMESTAMP >= ($CONF['ts_cron_last'] + 60 * $CONF['ts_cron_interval']))
- {
- update_config(array('ts_cron_last' => TIMESTAMP));
- if($CONF['ts_version'] == 2)
- {
- include_once(ROOT_PATH.'includes/libs/teamspeak/class.teamspeak2.php');
- $ts = new cyts();
- if($ts->connect($CONF['ts_server'], $CONF['ts_tcpport'], $CONF['ts_udpport'], $CONF['ts_timeout'])) {
- file_put_contents(ROOT_PATH.'cache/teamspeak_cache.php', serialize(array($ts->info_serverInfo(), $ts->info_globalInfo())));
- $ts->disconnect();
- }
- } elseif($CONF['ts_version'] == 3){
- require_once(ROOT_PATH . "includes/libs/teamspeak/class.teamspeak3.php");
- $tsAdmin = new ts3admin($CONF['ts_server'], $CONF['ts_udpport'], $CONF['ts_timeout']);
- $Active = $tsAdmin->connect();
- if($Active['success']) {
- $tsAdmin->selectServer($CONF['ts_tcpport'], 'port', true);
- $tsAdmin->login($CONF['ts_login'], $CONF['ts_password']);
- file_put_contents(ROOT_PATH.'cache/teamspeak_cache.php', serialize($tsAdmin->serverInfo()));
- $tsAdmin->logout();
- }
- }
- }
- break;
-}
-?>
\ No newline at end of file
diff --git a/game.php b/game.php
index 581bf16..eabaabd 100644
--- a/game.php
+++ b/game.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2012 Jan Kröpke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,308 +18,47 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
-define('INSIDE' , true);
+define('MODE', 'INGAME');
define('ROOT_PATH', str_replace('\\', '/',dirname(__FILE__)).'/');
-require_once(ROOT_PATH.'includes/functions/GetBuildingPrice.php');
-require_once(ROOT_PATH.'includes/functions/GetBuildingTime.php');
-require_once(ROOT_PATH.'includes/functions/IsElementBuyable.php');
-require(ROOT_PATH . 'includes/common.php');
-
-$page = request_var('page','');
-switch($page)
-{
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'changelog':
- include_once(ROOT_PATH . 'includes/pages/ShowChangelogPage.php');
- ShowChangelogPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'galaxy':
- if(CheckModule(11))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/class.ShowGalaxyPage.php');
- $ShowGalaxyPage = new ShowGalaxyPage();
- break;
- case 'phalanx':
- if(CheckModule(19))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/ShowPhalanxPage.php');
- ShowPhalanxPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'imperium':
- if(CheckModule(15))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/ShowImperiumPage.php');
- ShowImperiumPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'fleet':
- if(CheckModule(9))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/class.ShowFleetPages.php');
- ShowFleetPages::ShowFleetPage();
- break;
- case 'fleet1':
- if(CheckModule(9))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/class.ShowFleetPages.php');
- ShowFleetPages::ShowFleet1Page();
- break;
- case 'fleet2':
- if(CheckModule(9))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/class.ShowFleetPages.php');
- ShowFleetPages::ShowFleet2Page();
- break;
- case 'fleet3':
- if(CheckModule(9))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/class.ShowFleetPages.php');
- ShowFleetPages::ShowFleet3Page();
- break;
- case 'fleetajax':
- if(CheckModule(9) || CheckModule(24))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/class.ShowFleetPages.php');
- ShowFleetPages::FleetAjax();
- break;
- case 'missiles':
- if(CheckModule(9) || CheckModule(1))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/class.ShowFleetPages.php');
- ShowFleetPages::MissilesAjax();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'buildings':
- $mode = request_var('mode', '');
- switch ($mode)
- {
- case 'research':
- if(CheckModule(3))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/class.ShowResearchPage.php');
- new ShowResearchPage();
- break;
- case 'fleet':
- if(CheckModule(4))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/class.ShowShipyardPage.php');
- $FleetBuildingPage = new ShowShipyardPage();
- $FleetBuildingPage->FleetBuildingPage ();
- break;
- case 'defense':
- if(CheckModule(5))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/class.ShowShipyardPage.php');
- $DefensesBuildingPage = new ShowShipyardPage();
- $DefensesBuildingPage->DefensesBuildingPage ();
- break;
- default:
- if(CheckModule(2))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/class.ShowBuildingsPage.php');
- new ShowBuildingsPage();
- break;
- }
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'resources':
- if(CheckModule(23))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/ShowResourcesPage.php');
- ShowResourcesPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'officier':
- if(CheckModule(18) && CheckModule(8))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/class.ShowOfficierPage.php');
- new ShowOfficierPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'trader':
- if(CheckModule(13))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/ShowTraderPage.php');
- ShowTraderPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'techtree':
- if(CheckModule(28))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/ShowTechTreePage.php');
- ShowTechTreePage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'infos':
- if(CheckModule(14))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/class.ShowInfosPage.php');
- new ShowInfosPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'messages':
- if(CheckModule(16))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/class.ShowMessagesPage.php');
- new ShowMessagesPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'alliance':
- if(CheckModule(0))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/class.ShowAlliancePage.php');
- new ShowAlliancePage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'buddy':
- if(CheckModule(6))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/ShowBuddyPage.php');
- ShowBuddyPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'notes':
- if(CheckModule(17))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/class.ShowNotesPage.php');
- new ShowNotesPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'fleettrader':
- if(CheckModule(38))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/ShowFleetTraderPage.php');
- ShowFleetTraderPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'statistics':
- if(CheckModule(25))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/ShowStatisticsPage.php');
- ShowStatisticsPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'search':
- if(CheckModule(26))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/ShowSearchPage.php');
- ShowSearchPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'options':
- include_once(ROOT_PATH . 'includes/pages/class.ShowOptionsPage.php');
- new ShowOptionsPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'banned':
- if(CheckModule(21))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/ShowBannedPage.php');
- ShowBannedPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'topkb':
- if(CheckModule(12))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/ShowTopKB.php');
- ShowTopKB();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'records':
- if(CheckModule(22))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/ShowRecordsPage.php');
- ShowRecordsPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'chat':
- if(CheckModule(7))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/ShowChatPage.php');
- ShowChatPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'support':
- if(CheckModule(27))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/ShowSupportPage.php');
- new ShowSupportPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'playercard':
- if(CheckModule(20))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/ShowPlayerCard.php');
- ShowPlayerCard();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'faq':
- include_once(ROOT_PATH . 'includes/pages/ShowFAQ.php');
- ShowFAQPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'battlesim':
- if(CheckModule(39))
- message($LNG['sys_module_inactive'],"?page=overview", 3, true, true);
-
- include_once(ROOT_PATH . 'includes/pages/ShowBattleSimPage.php');
- ShowBattleSimPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'logout':
- include_once(ROOT_PATH . 'includes/pages/ShowLogoutPage.php');
- ShowLogoutPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
- case 'overview':
- default:
- include_once(ROOT_PATH . 'includes/pages/ShowOverviewPage.php');
- ShowOverviewPage();
- break;
-// ----------------------------------------------------------------------------------------------------------------------------------------------//
+require(ROOT_PATH.'includes/pages/game/class.AbstractPage.php');
+require(ROOT_PATH.'includes/pages/game/class.ShowErrorPage.php');
+require(ROOT_PATH.'includes/common.php');
+$page = HTTP::_GP('page', 'overview');
+$mode = HTTP::_GP('mode', 'show');
+$mode = str_replace(array('_', '\\', '/', '.', "\0"), '', $mode);
+$pageClass = 'Show'.ucwords($page).'Page';
+
+if(!file_exists(ROOT_PATH . 'includes/pages/game/class.'.$pageClass.'.php')) {
+ ShowErrorPage::printError($LNG['page_doesnt_exist']);
+}
+
+// Added Autoload in feature Versions
+require(ROOT_PATH . 'includes/pages/game/class.'.$pageClass.'.php');
+
+$pageObj = new $pageClass;
+// PHP 5.2 FIX
+// can't use $pageObj::$requireModule
+$pageProps = get_class_vars(get_class($pageObj));
+
+if(isset($pageProps['requireModule']) && $pageProps['requireModule'] !== 0 && !isModulAvalible($pageProps['requireModule'])) {
+ ShowErrorPage::printError($LNG['sys_module_inactive']);
+}
+
+if(!is_callable(array($pageObj, $mode))) {
+ if(!isset($pageProps['defaultController']) || !is_callable(array($pageObj, $pageProps['defaultController']))) {
+ ShowErrorPage::printError($LNG['page_doesnt_exist']);
+ }
+ $mode = $pageProps['defaultController'];
}
-?>
\ No newline at end of file
+
+$pageObj->{$mode}();
diff --git a/language/pt/extra/rules.txt b/includes/FIRST_INSTALL
similarity index 100%
rename from language/pt/extra/rules.txt
rename to includes/FIRST_INSTALL
diff --git a/includes/FleetHandler.php b/includes/FleetHandler.php
index d4b0249..5913773 100644
--- a/includes/FleetHandler.php
+++ b/includes/FleetHandler.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2012 Jan Kröpke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,48 +18,26 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
-if(php_sapi_name() === 'cli') {
- error_reporting(E_ALL ^ E_NOTICE);
- define('ROOT_PATH', str_replace('\\', '/', dirname(dirname(__FILE__))).'/');
- define('TIMESTAMP', time());
- ini_set('display_errors', 0);
- ini_set('error_log', ROOT_PATH.'/includes/cli_error.log');
- if(!function_exists('bcadd'))
- require_once(ROOT_PATH . 'includes/bcmath.php');
+#$GLOBALS['DATABASE']->query("LOCK TABLE ".AKS." WRITE, ".RW." WRITE, ".MESSAGES." WRITE, ".CONFIG." WRITE, ".FLEETS_EVENT." WRITE, ".FLEETS." WRITE, ".PLANETS." WRITE, ".PLANETS." as p WRITE, ".TOPKB." WRITE, ".USERS." WRITE, ".USERS." as u WRITE, ".STATPOINTS." WRITE;");
- require_once(ROOT_PATH . 'includes/config.php');
- require_once(ROOT_PATH . 'includes/constants.php');
- require_once(ROOT_PATH . 'includes/classes/class.MySQLi.php');
- require_once(ROOT_PATH . 'includes/classes/class.Lang.php');
- require_once(ROOT_PATH . 'includes/GeneralFunctions.php');
- require_once(ROOT_PATH . 'includes/vars.php');
- $db = new DB_MySQLi();
- unset($database);
- $LANG = new Language();
-}
-
-$db->query("LOCK TABLE ".AKS." WRITE, ".RW." WRITE, ".MESSAGES." WRITE, ".CONFIG." WRITE, ".FLEETS." WRITE, ".PLANETS." WRITE, ".PLANETS." as p WRITE, ".TOPKB." WRITE, ".USERS." WRITE, ".USERS." as u WRITE, ".STATPOINTS." WRITE;");
+$token = getRandomString();
-$FLEET = $db->query("SELECT * FROM ".FLEETS." WHERE (`fleet_start_time` <= '". TIMESTAMP ."' AND `fleet_mess` = '0') OR (`fleet_end_time` <= '". TIMESTAMP ."' AND `fleet_mess` = '1') OR (`fleet_end_stay` <= '". TIMESTAMP ."' AND `fleet_mess` = '2') ORDER BY `fleet_start_time` ASC;");
-if($db->num_rows($FLEET) > 0)
-{
- require_once(ROOT_PATH . 'includes/classes/class.FlyingFleetHandler.php');
+$fleetResult = $GLOBALS['DATABASE']->query("UPDATE ".FLEETS_EVENT." SET `lock` = '".$token."' WHERE `lock` IS NULL AND `time` <= ". TIMESTAMP .";");
- new FlyingFleetHandler($FLEET);
-}
-$db->free_result($FLEET);
-$db->query("UNLOCK TABLES");
+if($GLOBALS['DATABASE']->affectedRows() !== 0) {
+ require_once(ROOT_PATH . 'includes/classes/class.FlyingFleetHandler.php');
+
+ $fleetObj = new FlyingFleetHandler();
+ $fleetObj->setToken($token);
+ $fleetObj->run();
-if(php_sapi_name() === 'cli') {
- echo 'OK! - '.date(TIMEFORMAT)."\r\n";
-}
-?>
\ No newline at end of file
+ $GLOBALS['DATABASE']->query("UPDATE ".FLEETS_EVENT." SET `lock` = NULL WHERE `lock` = '".$token."';"); #UNLOCK TABLES
+}
\ No newline at end of file
diff --git a/includes/GeneralFunctions.php b/includes/GeneralFunctions.php
index 854931f..c099965 100644
--- a/includes/GeneralFunctions.php
+++ b/includes/GeneralFunctions.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2012 Jan Kröpke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,185 +18,268 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
function getUniverse()
{
- if(defined('IN_ADMIN') && isset($_SESSION['adminuni'])) {
+ $gameConfig = Config::getAll(NULL);
+
+ if(MODE == 'ADMIN' && isset($_SESSION['adminuni']))
+ {
$UNI = (int) $_SESSION['adminuni'];
- } elseif(defined('LOGIN') && isset($_REQUEST['uni'])) {
- $UNI = (int) $_REQUEST['uni'];
- } elseif(defined('LOGIN') && isset($_COOKIE['uni'])) {
- $UNI = (int) $_COOKIE['uni'];
- } elseif(isset($_SESSION['uni'])) {
- $UNI = $_SESSION['uni'];
- } else {
+ }
+ elseif(MODE == 'LOGIN')
+ {
+ if(isset($_COOKIE['uni']))
+ {
+ $UNI = (int) $_COOKIE['uni'];
+ }
+
+ if(isset($_REQUEST['uni']))
+ {
+ $UNI = (int) $_REQUEST['uni'];
+ }
+ }
+
+ if(!isset($UNI))
+ {
if(UNIS_WILDCAST === true) {
$UNI = explode('.', $_SERVER['HTTP_HOST']);
$UNI = substr($UNI[0], 3);
if(!is_numeric($UNI))
+ {
$UNI = ROOT_UNI;
+ }
} else {
- $UNI = ROOT_UNI;
+ if(count($gameConfig) == 1)
+ {
+ if(HTTP_ROOT != HTTP_BASE)
+ {
+ HTTP::redirectTo(PROTOCOL.HTTP_HOST.HTTP_BASE.HTTP_FILE, true);
+ }
+
+ $UNI = ROOT_UNI;
+ }
+ else
+ {
+ if(isset($_SERVER['REDIRECT_UNI'])) {
+ // Apache - faster then preg_match
+ $UNI = $_SERVER["REDIRECT_UNI"];
+ }
+ elseif(isset($_SERVER['REDIRECT_REDIRECT_UNI']))
+ {
+ // Patch for www.top-hoster.de - Hoster
+ $UNI = $_SERVER["REDIRECT_REDIRECT_UNI"];
+ }
+ elseif(strpos($_SERVER['SERVER_SOFTWARE'], 'Apache/') === false)
+ {
+ preg_match('!/uni([0-9]+)/!', HTTP_PATH, $match);
+ if(isset($match[1]))
+ {
+ $UNI = $match[1];
+ }
+ }
+
+ if(!isset($UNI) || !isset($gameConfig[$UNI]))
+ {
+ HTTP::redirectTo(PROTOCOL.HTTP_HOST.HTTP_BASE."uni".ROOT_UNI."/".HTTP_FILE, true);
+ }
+ }
}
}
return $UNI;
}
-function getFactors($USER, $Type = 'basic', $TIME = 0) {
- global $CONF, $resource, $pricelist;
+function t($key)
+{
+ global $LNG;
+
+ if(strpos($key, '.') === false)
+ {
+ $text = $LNG[$key];
+ }
+ else
+ {
+ $keys = explode('.', $key);
+ $text = $LNG[$keys[0]][$keys[1]];
+ }
+
+ $args = func_get_args();
+ array_shift($args);
+
+ switch (count($args)) {
+ case 0: return $text; break;
+ case 1: return sprintf($text, $args[0]); break;
+ case 2: return sprintf($text, $args[0], $args[1]); break;
+ case 3: return sprintf($text, $args[0], $args[1], $args[2]); break;
+ case 4: return sprintf($text, $args[0], $args[1], $args[2], $args[3]); break;
+ case 5: return sprintf($text, $args[0], $args[1], $args[2], $args[3], $args[4]); break;
+ case 6: return sprintf($text, $args[0], $args[1], $args[2], $args[3], $args[4], $args[5]); break;
+ case 7: return sprintf($text, $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6]); break;
+ case 8: return sprintf($text, $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], $args[7]); break;
+ case 9: return sprintf($text, $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], $args[7], $args[8]); break;
+ case 10: return call_user_func_array('sprintf', $args); break;
+ }
+}
+
+function getFactors($USER, $Type = 'basic', $TIME = NULL) {
+ global $CONF, $resource, $pricelist, $reslist;
if(empty($TIME))
$TIME = TIMESTAMP;
+
+ $bonusList = BuildFunctions::getBonusList();
+ $factor = ArrayUtil::combineArrayWithSingleElement($bonusList, 0);
+
+ foreach($reslist['bonus'] as $elementID) {
+ $bonus = $pricelist[$elementID]['bonus'];
- if($Type == 'basic') {
- return array(
- 'shipspeed' => $USER[$resource[613]] * $pricelist[613]['info'] + DMExtra($USER[$resource[706]], $TIME, $pricelist[706]['add'], 0),
- 'bulidspeed' => 1 - $USER[$resource[605]] * $pricelist[605]['info'] - DMExtra($USER[$resource[702]], $TIME, $pricelist[702]['add'], 0),
- 'techspeed' => 1 - $USER[$resource[606]] * $pricelist[606]['info'] - DMExtra($USER[$resource[705]], $TIME, $pricelist[705]['add'], 0),
- 'fleetspeed' => 1 - $USER[$resource[604]] * $pricelist[604]['info'],
- 'defspeed' => 1 - $USER[$resource[608]] * $pricelist[608]['info'],
- 'metal' => 1 + ($USER[$resource[601]] * $pricelist[601]['info']) + ($USER[$resource[131]] * 0.02) + DMExtra($USER[$resource[703]], $TIME, $pricelist[703]['add'], 0),
- 'crystal' => 1 + ($USER[$resource[601]] * $pricelist[601]['info']) + ($USER[$resource[132]] * 0.02) + DMExtra($USER[$resource[703]], $TIME, $pricelist[703]['add'], 0),
- 'deuterium' => 1 + ($USER[$resource[601]] * $pricelist[601]['info']) + ($USER[$resource[133]] * 0.02) + DMExtra($USER[$resource[703]], $TIME, $pricelist[703]['add'], 0),
- 'energy' => 1 + ($USER[$resource[603]] * $pricelist[603]['info']) + DMExtra($USER[$resource[704]], $TIME, $pricelist[704]['add'], 0),
- );
- }
-
- if($Type == 'attack') {
- return array(
- 'attack' => $USER[$resource[602]] * $pricelist[602]['info'] + DMExtra($USER[$resource[700]], $TIME, $pricelist[700]['add'], 0),
- 'defensive' => $USER[$resource[602]] * $pricelist[602]['info'] + DMExtra($USER[$resource[701]], $TIME, $pricelist[701]['add'], 0),
- 'shield' => $USER[$resource[602]] * $pricelist[602]['info'],
- );
+ if (isset($PLANET[$resource[$elementID]])) {
+ $elementLevel = $PLANET[$resource[$elementID]];
+ } elseif (isset($USER[$resource[$elementID]])) {
+ $elementLevel = $USER[$resource[$elementID]];
+ } else {
+ continue;
+ }
+
+ if(in_array($elementID, $reslist['dmfunc'])) {
+ if(DMExtra($elementLevel, $TIME, false, true)) {
+ continue;
+ }
+
+ foreach($bonusList as $bonusKey)
+ {
+ $factor[$bonusKey] += $bonus[$bonusKey][0];
+ }
+ } else {
+ foreach($bonusList as $bonusKey)
+ {
+ $factor[$bonusKey] += $elementLevel * $bonus[$bonusKey][0];
+ }
+ }
}
+
+ return $factor;
}
function getPlanets($USER)
{
- global $db;
- if(isset($USER['PLANETS']))
+ if(isset($USER['PLANETS']))
return $USER['PLANETS'];
$Order = $USER['planet_sort_order'] == 1 ? "DESC" : "ASC" ;
$Sort = $USER['planet_sort'];
- $QryPlanets = "SELECT `id`, `name`, `galaxy`, `system`, `planet`, `planet_type`, `image`, `b_building`, `b_building_id` FROM ".PLANETS." WHERE `id_owner` = '".$USER['id']."' AND `destruyed` = '0' ORDER BY ";
+ $QryPlanets = "SELECT id, name, galaxy, system, planet, planet_type, image, b_building, b_building_id FROM ".PLANETS." WHERE id_owner = '".$USER['id']."' AND destruyed = '0' ORDER BY ";
if($Sort == 0)
- $QryPlanets .= "`id` ". $Order;
+ $QryPlanets .= "id ". $Order;
elseif($Sort == 1)
- $QryPlanets .= "`galaxy`, `system`, `planet`, `planet_type` ". $Order;
+ $QryPlanets .= "galaxy, system, planet, planet_type ". $Order;
elseif ($Sort == 2)
- $QryPlanets .= "`name` ". $Order;
+ $QryPlanets .= "name ". $Order;
- $PlanetRAW = $db->query($QryPlanets);
+ $PlanetRAW = $GLOBALS['DATABASE']->query($QryPlanets);
+
+ $Planets = array();
- while($Planet = $db->fetch_array($PlanetRAW))
+ while($Planet = $GLOBALS['DATABASE']->fetch_array($PlanetRAW))
$Planets[$Planet['id']] = $Planet;
- $db->free_result($PlanetRAW);
+ $GLOBALS['DATABASE']->free_result($PlanetRAW);
return $Planets;
}
-function tz_dst($timezone) {
- if($timezone == $GLOBALS['CONF']['timezone'])
- return (int) date("I");
+function get_timezone_selector() {
+ global $LNG;
- $OLD = date_default_timezone_get();
- $DST = (int) date("I");
- return $DST;
-}
+ // New Timezone Selector, better support for changes in tzdata (new russian timezones, e.g.)
+ // http://www.php.net/manual/en/datetimezone.listidentifiers.php
+
+ $timezones = array();
+ $timezone_identifiers = DateTimeZone::listIdentifiers();
-function tz_getlist() {
- return array('-12', '-11', '-10', '-9.5', '-9', '-8', '-7', '-6', '-5', '-4.5', '-4', '-3.5', '-3', '-2', '-1', '0', '1', '2', '3', '3.5', '4', '4.5', '5', '5.5', '5.75', '6', '6.5', '7', '8', '8.75', '9', '9.5', '10', '10.5', '11', '11.5', '12', '12.75', '13', '14');
+ foreach( $timezone_identifiers as $value )
+ {
+ if ( preg_match( '/^(America|Antartica|Arctic|Asia|Atlantic|Europe|Indian|Pacific)\//', $value ) )
+ {
+ $ex=explode('/',$value); //obtain continent,city
+ $city = isset($ex[2])? $ex[1].' - '.$ex[2]:$ex[1]; //in case a timezone has more than one
+ $timezones[$ex[0]][$value] = str_replace('_', ' ', $city);
+ }
+ }
+ return $timezones;
}
-function tz_diff() {
- $UTC = (int) date("Z");
+function locale_date_format($format, $time, $LNG = NULL) {
+
+ //Workaound for locale Names.
- if(isset($GLOBALS['USER'])) {
- $timezone = (float) $GLOBALS['USER']['timezone'];
- $DST = $GLOBALS['USER']['dst'];
- } elseif(isset($_SESSION['USER'])) {
- $timezone = (float) $_SESSION['USER']['timezone'];
- $DST = $_SESSION['USER']['dst'];
+ if(!isset($LNG)) {
+ $LNG = $GLOBALS['LNG'];
}
- if($DST == 2)
- $DST = tz_dst($timezone);
- return (($timezone + $DST) * 3600) - $UTC;
-}
-
-function tz_date($time, $Dateformat = '', $LNG = array(), $ToGMT = false) {
- if(!$ToGMT)
- $time = $time + tz_diff();
- else
- $time = $time + (int) date("Z") - (int) date("I");
+ $weekDay = date('w', $time);
+ $months = date('n', $time) - 1;
- if(empty($LNG))
- $LNG = $GLOBALS['LNG'];
-
- if(empty($Dateformat))
- $Dateformat = $LNG['php_tdformat'];
+ $format = str_replace(array('D', 'M'), array('$D$', '$M$'), $format);
+ $format = str_replace('$D$', addcslashes($LNG['week_day'][$weekDay], 'A..z'), $format);
+ $format = str_replace('$M$', addcslashes($LNG['months'][$months], 'A..z'), $format);
- $Dateformat = str_replace(array('D', 'M'), array("XXX", "YYY"), $Dateformat);
- $Dateformat = str_replace(array("XXX", "YYY"), array(addcslashes($LNG['week_day'][(date('w', $time))], 'A..z'), addcslashes($LNG['months'][(date('n', $time) - 1)], 'A..z')), $Dateformat);
-
- return date($Dateformat, $time);
+ return $format;
}
-function update_config($Values, $UNI = 0)
-{
- global $CONF, $db;
- $SQLBASE = "";
- $SQLUNI = "";
- $UNI = (empty($UNI)) ? $GLOBALS['UNI'] : $UNI;
- $BasicConf = array('VERSION', 'game_name', 'stat', 'stat_level', 'stat_last_update', 'stat_settings', 'stat_update_time', 'stat_last_db_update', 'stats_fly_lock', 'cron_lock', 'ts_modon', 'ts_server', 'ts_tcpport', 'ts_udpport', 'ts_timeout', 'ts_version', 'ts_cron_last', 'ts_cron_interval', 'ts_login', 'ts_password', 'capaktiv', 'cappublic', 'capprivate', 'mail_active', 'mail_use', 'smtp_host', 'smtp_port', 'smtp_user', 'smtp_pass', 'smtp_ssl', 'smtp_sendmail', 'smail_path', 'fb_on', 'fb_apikey', 'fb_skey', 'ga_active', 'ga_key', 'chat_closed', 'chat_allowchan', 'chat_allowmes', 'chat_allowdelmes', 'chat_logmessage', 'chat_nickchange', 'chat_botname', 'chat_channelname', 'chat_socket_active', 'chat_socket_host', 'chat_socket_ip', 'chat_socket_port', 'chat_socket_chatid', 'ttf_file', 'sendmail_inactive', 'del_user_sendmail', 'del_user_automatic', 'del_oldstuff', 'del_user_manually', 'ref_max_referals');
- foreach($Values as $Name => $Value) {
- if(!isset($CONF[$Name]))
- continue;
-
- $GLOBALS['CONFIG'][$UNI][$Name] = $Value;
-
- $CONF[$Name] = $Value;
- if(in_array($Name, $BasicConf))
- $SQLBASE .= "`".$Name."` = '".$db->sql_escape($Value)."', ";
- else
- $SQLUNI .= "`".$Name."` = '".$db->sql_escape($Value)."', ";
+function _date($format, $time = null, $toTimeZone = null, $LNG = NULL) {
+ global $CONF;
+
+ if(!isset($time)) {
+ $time = TIMESTAMP;
}
- if(!empty($SQLBASE))
- $db->query("UPDATE ".CONFIG." SET ".substr($SQLBASE, 0, -2).";");
- if(!empty($SQLUNI))
- $db->query("UPDATE ".CONFIG." SET ".substr($SQLUNI, 0, -2)." WHERE `uni` = '".$UNI."';");
-}
-
-function getConfig($UNI) {
- global $db;
- if(isset($GLOBALS['CONFIG'][$UNI]))
- return $GLOBALS['CONFIG'][$UNI];
- $CONF = $db->uniquequery("SELECT HIGH_PRIORITY * FROM `".CONFIG."` WHERE `uni` = '".$UNI."';");
- $CONF['moduls'] = explode(";", $CONF['moduls']);
-
+ if(isset($toTimeZone))
+ {
+ $date = new DateTime();
+ if(method_exists($date, 'setTimestamp'))
+ { // PHP > 5.3
+ $date->setTimestamp($time);
+ } else {
+ // PHP < 5.3
+ $tempDate = getdate((int) $time);
+ $date->setDate($tempDate['year'], $tempDate['mon'], $tempDate['mday']);
+ $date->setTime($tempDate['hours'], $tempDate['minutes'], $tempDate['seconds']);
+ }
+
+ $time -= $date->getOffset();
+ try {
+ $date->setTimezone(new DateTimeZone($toTimeZone));
+ } catch (Exception $e) {
+
+ }
+ $time += $date->getOffset();
+ }
- $GLOBALS['CONFIG'][$UNI] = $CONF;
- return $CONF;
+ $format = locale_date_format($format, $time, $LNG);
+ return date($format, $time);
}
function ValidateAddress($address) {
- $ValideAdress = function_exists('filter_var') ? filter_var($address, FILTER_VALIDATE_EMAIL) !== FALSE : preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address);
-
- return $ValideAdress;
+ if(function_exists('filter_var')) {
+ return filter_var($address, FILTER_VALIDATE_EMAIL) !== FALSE;
+ } else {
+ /*
+ Regex expression from swift mailer (http://swiftmailer.org)
+ RFC 2822
+ */
+ return preg_match('/^(?:(?:(?:(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?(?:[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_\{\}\|~]+(\.[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_\{\}\|~]+)*)+(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?)|(?:(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?"((?:(?:[ \t]*(?:\r\n))?[ \t])?(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21\x23-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])))*(?:(?:[ \t]*(?:\r\n))?[ \t])?"(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?))@(?:(?:(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?(?:[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_\{\}\|~]+(\.[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_\{\}\|~]+)*)+(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?)|(?:(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?\[((?:(?:[ \t]*(?:\r\n))?[ \t])?(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x5A\x5E-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])))*?(?:(?:[ \t]*(?:\r\n))?[ \t])?\](?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?)))$/D', $address);
+ }
}
function message($mes, $dest = "", $time = "3", $topnav = false, $menu = true)
@@ -213,67 +296,90 @@ function CalculateMaxPlanetFields($planet)
return $planet['field_max'] + ($planet[$resource[33]] * FIELDS_BY_TERRAFORMER) + ($planet[$resource[41]] * FIELDS_BY_MOONBASIS_LEVEL);
}
-function pretty_time ($seconds)
+function pretty_time($seconds)
{
- $day = floor($seconds / (24 * 3600));
- $hs = floor($seconds / 3600 % 24);
- $ms = floor($seconds / 60 % 60);
- $sr = floor($seconds / 1 % 60);
-
- $hh = $hs < 10 ? "0" . $hs : $hs;
- $mm = $ms < 10 ? "0" . $ms : $ms;
- $ss = $sr < 10 ? "0" . $sr : $sr;
-
+ global $LNG;
+
+ $day = floor($seconds / 86400);
+ $hour = floor($seconds / 3600 % 24);
+ $minute = floor($seconds / 60 % 60);
+ $second = floor($seconds % 60);
+
$time = '';
- $time .= $day != 0 ? $day . 'd ' : '';
- $time .= $hs != 0 ? $hh . 'h ' : '00h ';
- $time .= $ms != 0 ? $mm . 'm ' : '00m ';
- $time .= $ss . 's';
+
+ if($day >= 10) {
+ $time .= $day.$LNG['short_day'].' ';
+ } elseif($day > 0) {
+ $time .= '0'.$day.$LNG['short_day'].' ';
+ }
+
+ if($hour >= 10) {
+ $time .= $hour.$LNG['short_hour'].' ';
+ } else {
+ $time .= '0'.$hour.$LNG['short_hour'].' ';
+ }
+
+ if($minute >= 10) {
+ $time .= $minute.$LNG['short_minute'].' ';
+ } else {
+ $time .= '0'.$minute.$LNG['short_minute'].' ';
+ }
+
+ if($second >= 10) {
+ $time .= $second.$LNG['short_second'].' ';
+ } else {
+ $time .= '0'.$second.$LNG['short_second'].' ';
+ }
return $time;
}
-function pretty_time_hour ($seconds)
+function pretty_fly_time($seconds)
{
- $min = floor($seconds / 60 % 60);
+ $hour = floor($seconds / 3600);
+ $minute = floor($seconds / 60 % 60);
+ $second = floor($seconds % 60);
+
$time = '';
- $time .= $min != 0 ? $min . 'min ' : '';
+
+ if($hour >= 10) {
+ $time .= $hour;
+ } else {
+ $time .= '0'.$hour;
+ }
+
+ $time .= ':';
+
+ if($minute >= 10) {
+ $time .= $minute;
+ } else {
+ $time .= '0'.$minute;
+ }
+
+ $time .= ':';
+
+ if($second >= 10) {
+ $time .= $second;
+ } else {
+ $time .= '0'.$second;
+ }
+
return $time;
}
function GetStartAdressLink($FleetRow, $FleetType)
{
- return '['.$FleetRow['fleet_start_galaxy'].':'.$FleetRow['fleet_start_system'].':'.$FleetRow['fleet_start_planet'].']';
+ return '['.$FleetRow['fleet_start_galaxy'].':'.$FleetRow['fleet_start_system'].':'.$FleetRow['fleet_start_planet'].']';
}
function GetTargetAdressLink($FleetRow, $FleetType)
{
- return '['.$FleetRow['fleet_end_galaxy'].':'.$FleetRow['fleet_end_system'].':'.$FleetRow['fleet_end_planet'].']';
+ return '['.$FleetRow['fleet_end_galaxy'].':'.$FleetRow['fleet_end_system'].':'.$FleetRow['fleet_end_planet'].']';
}
function BuildPlanetAdressLink($CurrentPlanet)
{
- return '['.$CurrentPlanet['galaxy'].':'.$CurrentPlanet['system'].':'.$CurrentPlanet['planet'].']';
-}
-
-function colorNumber($n, $s = '')
-{
- if ($n > 0)
- return (empty($s)) ? colorGreen($n) : colorGreen($s);
- elseif ($n < 0)
- return (empty($s)) ? colorRed($n) : colorRed($s);
- else
- return (empty($s)) ? $n : $s;
-}
-
-function colorRed($n)
-{
- return '' . $n . '';
-}
-
-function colorGreen($n)
-{
- return '' . $n . '';
+ return '['.$CurrentPlanet['galaxy'].':'.$CurrentPlanet['system'].':'.$CurrentPlanet['planet'].']';
}
function pretty_number($n, $dec = 0)
@@ -281,90 +387,23 @@ function pretty_number($n, $dec = 0)
return number_format(floattostring($n, $dec), $dec, ',', '.');
}
-function request_var($var_name, $default, $multibyte = false, $specialtype = '')
-{
- if(!isset($_REQUEST[$var_name]))
- return $default;
-
- $var = $_REQUEST[$var_name];
- $type = gettype($default);
- settype($var, $type);
- if ($type == 'string')
- {
- $var = trim(htmlspecialchars(str_replace(array("\r\n", "\r", "\0"), array("\n", "\n", ''), $var), ENT_COMPAT, 'UTF-8'));
-
- if (!empty($var))
- {
- // Make sure multibyte characters are wellformed
- if ($multibyte)
- {
- if (!preg_match('/^./u', $var))
- {
- $var = '';
- }
- }
- else
- {
- // no multibyte, allow only ASCII (0-127)
- $var = preg_replace('/[\x80-\xFF]/', '?', $var);
- }
- }
- }
- return $var;
-}
-
-function request_outofint($var_name, $Negative = false)
-{
- return $Negative ? floor(request_var($var_name, 0.0)) : max(floor(request_var($var_name, 0.0)), 0) ;
-}
-
function GetUserByID($UserID, $GetInfo = "*")
{
- global $db;
-
if(is_array($GetInfo)) {
$GetOnSelect = "";
foreach($GetInfo as $id => $col)
{
- $GetOnSelect .= "`".$col."`,";
+ $GetOnSelect .= "".$col.",";
}
$GetOnSelect = substr($GetOnSelect, 0, -1);
}
else
$GetOnSelect = $GetInfo;
- $User = $db->uniquequery("SELECT ".$GetOnSelect." FROM ".USERS." WHERE `id` = '". $UserID ."';");
+ $User = $GLOBALS['DATABASE']->getFirstRow("SELECT ".$GetOnSelect." FROM ".USERS." WHERE id = '". $UserID ."';");
return $User;
}
-function MailSend($MailTarget, $MailTargetName, $MailSubject, $MailContent)
-{
- global $CONF;
- require_once('./includes/classes/class.phpmailer.php');
- $mail = new PHPMailer(true);
- if($CONF['mail_use'] == 2) {
- $mail->IsSMTP();
- $mail->SMTPAuth = true;
- $mail->SMTPSecure = $CONF['smtp_ssl'];
- $mail->Host = $CONF['smtp_host'];
- $mail->Port = $CONF['smtp_port'];
- $mail->Username = $CONF['smtp_user'];
- $mail->Password = $CONF['smtp_pass'];
- $mail->SMTPDebug = ($CONF['debug'] == 1) ? 2 : 0;
- } elseif($CONF['mail_use'] == 1) {
- $mail->IsSendmail();
- $mai->Sendmail = $CONF['smail_path'];
- } else {
- $mail->IsMail();
- }
- $mail->CharSet = 'UTF-8';
- $mail->Subject = $MailSubject;
- $mail->Body = $MailContent;
- $mail->SetFrom($CONF['smtp_sendmail'], $CONF['game_name']);
- $mail->AddAddress($MailTarget, $MailTargetName);
- $mail->Send();
-}
-
function makebr($text)
{
// XHTML FIX for PHP 5.3.0
@@ -376,141 +415,109 @@ function makebr($text)
function CheckPlanetIfExist($Galaxy, $System, $Planet, $Universe, $Planettype = 1)
{
- global $db;
- $QrySelectGalaxy = $db->countquery("SELECT COUNT(*) FROM ".PLANETS." WHERE `universe` = '".$Universe."' AND `galaxy` = '".$Galaxy."' AND `system` = '".$System."' AND `planet` = '".$Planet."' AND `planet_type` = '".$Planettype."';");
+ $QrySelectGalaxy = $GLOBALS['DATABASE']->getFirstCell("SELECT COUNT(*) FROM ".PLANETS." WHERE universe = '".$Universe."' AND galaxy = '".$Galaxy."' AND system = '".$System."' AND planet = '".$Planet."' AND planet_type = '".$Planettype."';");
return $QrySelectGalaxy ? true : false;
}
function CheckNoobProtec($OwnerPlayer, $TargetPlayer, $Player)
{
global $CONF;
- if($CONF['noobprotection'] == 0 || $CONF['noobprotectionmulti'] == 0 || $OwnerPlayer['total_points'] <= $CONF['noobprotectiontime'] || $Player['banaday'] > TIMESTAMP || $Player['onlinetime'] < (TIMESTAMP - 60 * 60 * 24 * 7))
+ if(
+ Config::get('noobprotection') == 0
+ || Config::get('noobprotectiontime') == 0
+ || Config::get('noobprotectionmulti') == 0
+ || $Player['banaday'] > TIMESTAMP
+ || $Player['onlinetime'] < TIMESTAMP - INACTIVE
+ ) {
return array('NoobPlayer' => false, 'StrongPlayer' => false);
-
+ }
+
return array(
- 'NoobPlayer' => $OwnerPlayer['total_points'] > $TargetPlayer['total_points'] * $CONF['noobprotectionmulti'],
- 'StrongPlayer' => $OwnerPlayer['total_points'] * $CONF['noobprotectionmulti'] < $TargetPlayer['total_points']
+ 'NoobPlayer' => (
+ /* WAHR:
+ Wenn Spieler mehr als 25000 Punkte hat UND
+ Wenn ZielSpieler weniger als 80% der Punkte des Spieler hat.
+ ODER weniger als 5.000 hat.
+ */
+ // Addional Comment: Letzteres ist eigentlich sinnfrei, bitte testen.a
+ ($TargetPlayer['total_points'] <= Config::get('noobprotectiontime')) && // Default: 25.000
+ ($OwnerPlayer['total_points'] > $TargetPlayer['total_points'] * Config::get('noobprotectionmulti'))
+ ),
+ 'StrongPlayer' => (
+ /* WAHR:
+ Wenn Spieler weniger als 5000 Punkte hat UND
+ Mehr als das funfache der eigende Punkte hat
+ */
+ ($OwnerPlayer['total_points'] < Config::get('noobprotectiontime')) && // Default: 5.000
+ ($OwnerPlayer['total_points'] * Config::get('noobprotectionmulti') < $TargetPlayer['total_points'])
+ ),
);
}
-function CheckName($String)
-{
- return(ctype_alnum($String) || (UTF8_SUPPORT && !empty($String))) ? true : false;
-}
-
-function exception_handler($exception)
+function CheckName($name)
{
- global $CONF;
-
- @session_write_close();
- if($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1' && !headers_sent())
- header('HTTP/1.1 503 Service Unavailable');
-
- echo '';
- echo '';
- echo '';
- echo '';
- echo '';
- echo '';
- echo '';
- echo ''.$CONF['game_name'].' - FATAL ERROR ';
- echo '';
- echo '';
- echo '';
- echo '';
- echo '';
- echo '';
- echo '
';
- echo '';
- echo '';
- exit;
+ if(UTF8_SUPPORT) {
+ return preg_match("/^[\p{L}\p{N}_\-. ]*$/u", $name);
+ } else {
+ return preg_match("/^[A-z0-9_\-. ]*$/", $name);
+ }
}
function SendSimpleMessage($Owner, $Sender, $Time, $Type, $From, $Subject, $Message)
{
- global $db;
-
+
$SQL = "INSERT INTO ".MESSAGES." SET
- `message_owner` = ".(int) $Owner.",
- `message_sender` = ".(int) $Sender.",
- `message_time` = ".(int) $Time.",
- `message_type` = ".(int) $Type.",
- `message_from` = '".$db->sql_escape($From) ."',
- `message_subject` = '". $db->sql_escape($Subject) ."',
- `message_text` = '".$db->sql_escape($Message)."',
- `message_unread` = '1',
- `message_universe` = ".$GLOBALS['UNI'].";";
+ message_owner = ".(int) $Owner.",
+ message_sender = ".(int) $Sender.",
+ message_time = ".(int) $Time.",
+ message_type = ".(int) $Type.",
+ message_from = '".$GLOBALS['DATABASE']->sql_escape($From) ."',
+ message_subject = '". $GLOBALS['DATABASE']->sql_escape($Subject) ."',
+ message_text = '".$GLOBALS['DATABASE']->sql_escape($Message)."',
+ message_unread = '1',
+ message_universe = ".$GLOBALS['UNI'].";";
- $db->query($SQL);
+ $GLOBALS['DATABASE']->query($SQL);
}
-function shortly_number($number)
+function shortly_number($number, $decial = NULL)
{
- $length = strlen(floattostring(abs($number)));
- if($length < 4)
- return pretty_number($number);
- elseif($length < 7)
- return pretty_number($number/1000).' K';
- elseif($length < 13)
- return pretty_number($number/1000000).' M';
- elseif($length < 19)
- return pretty_number($number/1000000000000).' B';
- elseif($length < 25)
- return pretty_number($number/1000000000000000000).' T';
- elseif($length < 31)
- return pretty_number($number/1000000000000000000000000).' Q';
- elseif($length < 37)
- return pretty_number($number/1000000000000000000000000000000).' Q+';
- elseif($length < 43)
- return pretty_number($number/1000000000000000000000000000000000000).' S';
- elseif($length < 49)
- return pretty_number($number/1000000000000000000000000000000000000000000).' S+';
- elseif($length < 55)
- return pretty_number($number/1000000000000000000000000000000000000000000000000).' O';
- else
- return pretty_number($number/1000000000000000000000000000000000000000000000000000000).' N';
+ $negate = $number < 0 ? -1 : 1;
+ $number = abs($number);
+ $unit = array("", "K", "M", "B", "T", "Q", "Q+", "S", "S+", "O", "N");
+ $key = 0;
+
+ if($number >= 1000000) {
+ ++$key;
+ while($number >= 1000000)
+ {
+ ++$key;
+ $number = $number / 1000000;
+ }
+ } elseif($number >= 1000) {
+ ++$key;
+ $number = $number / 1000;
+ }
+
+ $decial = !is_numeric($decial) ? ((int) (((int)$number != $number) && $key != 0 && $number != 0 && $number < 100)) : $decial;
+ return pretty_number($negate * $number, $decial).' '.$unit[$key];
}
function floattostring($Numeric, $Pro = 0, $Output = false){
return ($Output) ? str_replace(",",".", sprintf("%.".$Pro."f", $Numeric)) : sprintf("%.".$Pro."f", $Numeric);
}
-function CheckModule($ID)
+function isModulAvalible($ID)
{
if(!isset($GLOBALS['CONF']['moduls'][$ID]))
$GLOBALS['CONF']['moduls'][$ID] = 1;
- return ((!isset($_SESSION) || $_SESSION['authlevel'] !== AUTH_USR) && $GLOBALS['CONF']['moduls'][$ID] == 0) ? true : false;
-}
-
-function redirectTo($URL)
-{
- @session_write_close();
- if($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1')
- header('HTTP/1.1 302 Found');
-
- header('Location: '.PROTOCOL.$_SERVER['HTTP_HOST'].HTTP_ROOT.$URL);
- exit;
+ return $GLOBALS['CONF']['moduls'][$ID] == 1 || (isset($USER['authlevel']) && $USER['authlevel'] > AUTH_USR);
}
function ClearCache()
{
- $DIRS = array('cache/');
+ $DIRS = array('cache/', 'cache/templates/');
foreach($DIRS as $DIR) {
$FILES = array_diff(scandir($DIR), array('..', '.', '.htaccess'));
foreach($FILES as $FILE) {
@@ -520,54 +527,239 @@ function ClearCache()
unlink(ROOT_PATH.$DIR.$FILE);
}
}
+
+ require_once ROOT_PATH.'includes/classes/Cronjob.class.php';
+ Cronjob::reCalculateCronjobs();
+ $GLOBALS['DATABASE']->query("UPDATE ".PLANETS." SET eco_hash = '';");
+ clearstatcache();
}
-function MaxPlanets($Level, $Universe)
+function allowedTo($side)
{
- return min($GLOBALS['CONFIG'][$Universe]['min_player_planets'] + ceil($Level / 2) * PLANETS_PER_TECH, $GLOBALS['CONFIG'][$Universe]['max_player_planets']);
+ global $USER;
+ return ($USER['authlevel'] == AUTH_ADM || (isset($USER['rights']) && $USER['rights'][$side] == 1));
+}
+
+function isactiveDMExtra($Extra, $Time) {
+ return $Time - $Extra <= 0;
}
-function GetCrons()
+function DMExtra($Extra, $Time, $true, $false) {
+ return isactiveDMExtra($Extra, $Time) ? $true : $false;
+}
+
+function getRandomString() {
+ return md5(uniqid());
+}
+
+function isVacationMode($USER)
{
- global $CONF;
- $Crons = '';
- $Crons .= TIMESTAMP >= ($CONF['stat_last_update'] + (60 * $CONF['stat_update_time'])) ? '
' : '';
-
- $Crons .= $CONF['ts_modon'] == 1 && TIMESTAMP >= ($CONF['ts_cron_last'] + 60 * $CONF['ts_cron_interval']) ? '
' : '';
-
- $Crons .= TIMESTAMP >= ($CONF['stat_last_db_update'] + 86400) ? '
' : ''; //Daily Cronjob
-
- return $Crons;
+ return ($USER['urlaubs_modus'] == 1) ? true : false;
}
-function r_implode($glue, $pieces)
+function cryptPassword($password)
{
- $retVal = array();
- foreach($pieces as $r_pieces)
+ // http://www.phpgangsta.de/schoener-hashen-mit-bcrypt
+ global $resource, $salt;
+ if(!CRYPT_BLOWFISH || !isset($salt))
{
- $retVal[] = is_array($r_pieces) ? r_implode($glue, $r_pieces) : $r_pieces;
+ return md5($password);
+ } else {
+ return crypt($password, '$2a$09$'.$salt.'$');
}
- return implode($glue, $retVal);
-}
-
-function allowedTo($side)
-{
- return ($GLOBALS['USER']['authlevel'] == AUTH_ADM || $GLOBALS['USER']['rights'][$side] == 1);
}
-function isactiveDMExtra($Extra, $Time) {
- return $Time - $Extra <= 0;
+function combineArrayWithSingleElement($keys, $var) {
+ return array_combine($keys, array_fill(0, count($keys), $var));
}
-function DMExtra($Extra, $Time, $true, $false) {
- return isactiveDMExtra($Extra, $Time) ? $true : $false;
+function clearGIF() {
+ header('Cache-Control: no-cache');
+ header('Content-type: image/gif');
+ header('Content-length: 43');
+ header('Expires: 0');
+ echo("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");
+ exit;
}
-if(!function_exists('ctype_alnum')):
+function fleetAmountToArray($fleetAmount)
+{
+ $fleetTyps = explode(';', $fleetAmount);
+
+ $fleetAmount = array();
+
+ foreach ($fleetTyps as $fleetTyp)
+ {
+ $temp = explode(',', $fleetTyp);
+
+ if (empty($temp[0])) continue;
-function ctype_alnum($test){
- return preg_match("/[^A-z0-9_\- ]/", $test) != 1;
+ if (!isset($fleetAmount[$temp[0]]))
+ {
+ $fleetAmount[$temp[0]] = 0;
+ }
+
+ $fleetAmount[$temp[0]] += $temp[1];
+ }
+
+ return $fleetAmount;
}
-endif;
-?>
\ No newline at end of file
+function exceptionHandler($exception)
+{
+ global $CONF;
+ if(!headers_sent()) {
+ if (!class_exists('HTTP', false)) {
+ require_once(ROOT_PATH . 'includes/classes/HTTP.class.php');
+ }
+
+ HTTP::sendHeader('HTTP/1.1 503 Service Unavailable');
+ }
+
+ if(method_exists($exception, 'getSeverity')) {
+ $errno = $exception->getSeverity();
+ } else {
+ $errno = E_USER_ERROR;
+ }
+
+ $errorType = array(
+ E_ERROR => 'ERROR',
+ E_WARNING => 'WARNING',
+ E_PARSE => 'PARSING ERROR',
+ E_NOTICE => 'NOTICE',
+ E_CORE_ERROR => 'CORE ERROR',
+ E_CORE_WARNING => 'CORE WARNING',
+ E_COMPILE_ERROR => 'COMPILE ERROR',
+ E_COMPILE_WARNING => 'COMPILE WARNING',
+ E_USER_ERROR => 'USER ERROR',
+ E_USER_WARNING => 'USER WARNING',
+ E_USER_NOTICE => 'USER NOTICE',
+ E_STRICT => 'STRICT NOTICE',
+ E_RECOVERABLE_ERROR => 'RECOVERABLE ERROR'
+ );
+
+ try
+ {
+ if(!class_exists('Config', false))
+ {
+ throw new Exception("No config class");
+ }
+ $VERSION = Config::get('VERSION');
+ } catch(Exception $e) {
+ if(file_exists(ROOT_PATH.'install/VERSION'))
+ {
+ $VERSION = file_get_contents(ROOT_PATH.'install/VERSION').' (FILE)';
+ }
+ else
+ {
+ $VERSION = 'UNKNOWN';
+ }
+ }
+
+ try
+ {
+ if(!class_exists('Config', false))
+ {
+ throw new Exception("No config class");
+ }
+ $gameName = Config::get('game_name');
+ } catch(Exception $e) {
+ $gameName = '-';
+ }
+
+ $DIR = MODE == 'INSTALL' ? '..' : '.';
+ ob_start();
+ echo '
+
+
+
+
+
+
+ '.$gameName.' - '.$errorType[$errno].'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+';
+
+ echo str_replace(array('\\', ROOT_PATH, substr(ROOT_PATH, 0, 15)), array('/', '/', 'FILEPATH '), ob_get_clean());
+
+ $errorText = date("[d-M-Y H:i:s]", TIMESTAMP).' '.$errorType[$errno].': "'.strip_tags($exception->getMessage())."\"\r\n";
+ $errorText .= 'File: '.$exception->getFile().' | Line: '.$exception->getLine()."\r\n";
+ $errorText .= 'URL: '.PROTOCOL.HTTP_HOST.$_SERVER['REQUEST_URI'].' | Version: '.$VERSION."\r\n";
+ $errorText .= "Stack trace:\r\n";
+ $errorText .= str_replace(ROOT_PATH, '/', htmlspecialchars(str_replace('\\', '/',$exception->getTraceAsString())))."\r\n";
+
+ if(is_writable(ROOT_PATH.'includes/error.log'))
+ {
+ file_put_contents(ROOT_PATH.'includes/error.log', $errorText, FILE_APPEND);
+ }
+}
+
+function errorHandler($errno, $errstr, $errfile, $errline)
+{
+ if (!($errno & error_reporting())) {
+ return;
+ }
+
+ throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
+}
\ No newline at end of file
diff --git a/includes/PlanetData.php b/includes/PlanetData.php
index b0bdc7b..139dfbd 100644
--- a/includes/PlanetData.php
+++ b/includes/PlanetData.php
@@ -1,5 +1,31 @@
.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2013-01-17)
+ * @info $Id$
+ * @link http://2moons.cc/
+ */
+
$PlanetData = array(
1 => array('temp' => mt_rand(220, 260), 'fields' => mt_rand(95, 108), 'image' => array('trocken' => mt_rand(1, 10), 'wuesten' => mt_rand(1, 4))),
2 => array('temp' => mt_rand(170, 210), 'fields' => mt_rand(97, 110), 'image' => array('trocken' => mt_rand(1, 10), 'wuesten' => mt_rand(1, 4))),
diff --git a/includes/bcmath.php b/includes/bcmath.php
deleted file mode 100644
index a6f2fc9..0000000
--- a/includes/bcmath.php
+++ /dev/null
@@ -1,112 +0,0 @@
-.
- *
- * @package 2Moons
- * @author Slaver
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
- * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
- * @info $Id$
- * @link http://code.google.com/p/2moons/
- */
-
-function bcadd($Num1, $Num2, $Scale = 0) {
- if(!preg_match("/^\+?(\d+)(\.\d+)?$/",$Num1,$Tmp1) || !preg_match("/^\+?(\d+)(\.\d+)?$/",$Num2,$Tmp2)) return('0');
-
- $Output = array();
-
- $Dec1 = isset($Tmp1[2]) ? rtrim(substr($Tmp1[2], 1), '0'):'';
- $Dec2 = isset($Tmp2[2]) ? rtrim(substr($Tmp2[2], 1), '0'):'';
-
- $DLen = max(strlen($Dec1), strlen($Dec2));
-
- if($Scale==null) $Scale = $DLen;
-
- $Num1 = strrev(ltrim($Tmp1[1], '0').str_pad($Dec1, $DLen, '0'));
- $Num2 = strrev(ltrim($Tmp2[1], '0').str_pad($Dec2, $DLen, '0'));
-
- $MLen = max(strlen($Num1), strlen($Num2));
-
- $Num1 = str_pad($Num1, $MLen, '0');
- $Num2 = str_pad($Num2, $MLen, '0');
-
- for($i=0;$i<$MLen;$i++) {
- $Sum = ((int)$Num1{$i} + (int)$Num2{$i});
- if(isset($Output[$i])) $Sum += $Output[$i];
- $Output[$i] = $Sum % 10;
-
- if($Sum > 9)
- $Output[$i+1]=1;
- }
-
- $Output=strrev(implode($Output));
-
- $Decimal = str_pad(substr($Output, -$DLen, $Scale), $Scale, '0');
- $Output = ($MLen-$DLen<1) ? '0' : substr($Output,0,-$DLen);
- $Output .= ($Scale>0) ? ".".$Decimal : '';
- return $Output;
-}
-
-function bcsub($Num1 ,$Num2, $Scale = 0) {
- return round($Num1 - $Num2, $Scale);
-}
-
-function bcmul($Num1 ,$Num2, $Scale = 0) {
- return round($Num1 * $Num2, $Scale);
-}
-
-function bcdiv($Num1 ,$Num2, $Scale = 0) {
- return round($Num1 / $Num2, $Scale);
-}
-
-function bcpow($Num1 ,$Num2, $Scale = 0) {
- return round(pow($Num1, $Num2), $Scale);
-}
-
-function bccomp($Num1, $Num2, $Scale = 0) {
- if(!preg_match("/^\+?(\d+)(\.\d+)?$/", $Num1, $Tmp1) || !preg_match("/^\+?(\d+)(\.\d+)?$/", $Num2, $Tmp2)) return('0');
-
- $Num1 = ltrim($Tmp1[1],'0');
- $Num2 = ltrim($Tmp2[1],'0');
-
- if(strlen($Num1) > strlen($Num2)) return(1);
- if(strlen($Num1) < strlen($Num2)) return(-1);
-
- $Dec1 = isset($Tmp1[2]) ? rtrim(substr($Tmp1[2],1),'0') : '';
- $Dec2 = isset($Tmp2[2]) ? rtrim(substr($Tmp2[2],1),'0') : '';
-
- if($Scale != null) {
- $Dec1 = substr($Dec1,0,$Scale);
- $Dec2 = substr($Dec2,0,$Scale);
- }
-
- $DLen = max(strlen($Dec1), strlen($Dec2));
-
- $Num1 .= str_pad($Dec1, $DLen, '0');
- $Num2 .= str_pad($Dec2, $DLen, '0');
-
- for($i=0; $i (int)$Num2{$i}) return 1 ;
- if((int)$Num1{$i} < (int)$Num2{$i}) return -1 ;
- }
-
- return 0;
-}
-?>
\ No newline at end of file
diff --git a/includes/classes/ArrayUtil.class.php b/includes/classes/ArrayUtil.class.php
new file mode 100644
index 0000000..087f185
--- /dev/null
+++ b/includes/classes/ArrayUtil.class.php
@@ -0,0 +1,84 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan
+ * @copyright 2006 Perberos (UGamela)
+ * @copyright 2008 Chlorel (XNova)
+ * @copyright 2009 Lucky (XGProyecto)
+ * @copyright 2012 Jan (2Moons)
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 2.0 (2012-11-31)
+ * @info $Id$
+ * @link http://code.google.com/p/2moons/
+ */
+
+class ArrayUtil
+{
+ function combineArrayWithSingleElement($keys, $var) {
+ if(empty($keys))
+ {
+ return array();
+ }
+ return array_combine($keys, array_fill(0, count($keys), $var));
+ }
+
+ function combineArrayWithKeyElements($keys, $var) {
+ $temp = array();
+ foreach($keys as $key)
+ {
+ if(isset($var[$key]))
+ {
+ $temp[$key] = $var[$key];
+ }
+ else
+ {
+ $temp[$key] = $key;
+ }
+ }
+
+ return $temp;
+ }
+
+ // http://www.php.net/manual/en/function.array-key-exists.php#81659
+ function arrayKeyExistsRecrusive($needle, $haystack)
+ {
+ $result = array_key_exists($needle, $haystack);
+
+ if ($result)
+ {
+ return $result;
+ }
+
+ foreach ($haystack as $v)
+ {
+ if (is_array($v))
+ {
+ $result = self::arrayKeyExistsRecrusive($needle, $v);
+ }
+
+ if ($result)
+ {
+ return $result;
+ }
+ }
+
+ return $result;
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/Config.class.php b/includes/classes/Config.class.php
new file mode 100644
index 0000000..65abe8a
--- /dev/null
+++ b/includes/classes/Config.class.php
@@ -0,0 +1,155 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2013-01-17)
+ * @info $Id$
+ * @link http://2moons.cc/
+ */
+
+class Config
+{
+ #static private $uniConfig;
+ #static private $gameConfig;
+ static private $config;
+
+ static function init()
+ {
+ $configResult = $GLOBALS['DATABASE']->query("SELECT * FROM ".CONFIG.";");
+
+ while($configRow = $GLOBALS['DATABASE']->fetch_array($configResult))
+ {
+ $configRow['moduls'] = explode(";", $configRow['moduls']);
+ self::$config[$configRow['uni']] = $configRow;
+ }
+
+ $GLOBALS['DATABASE']->free_result($configResult);
+ }
+
+ static function setGlobals()
+ {
+ // BC Wrapper
+ $GLOBALS['CONFIG'] = self::$config;
+ $GLOBALS['CONF'] = self::$config[$GLOBALS['UNI']];
+ }
+
+ static function get($key, $universe = NULL)
+ {
+ if(is_null($universe) || !isset(self::$config[$universe]))
+ {
+ $universe = $GLOBALS['UNI'];
+ }
+
+ if(isset(self::$config[$universe][$key]))
+ {
+ return self::$config[$universe][$key];
+ }
+
+
+ /* New Config
+ if(is_null($universe) || !isset(self::$uniConfig[$universe]))
+ {
+ $universe = $GLOBALS['UNI'];
+ }
+
+ if(isset(self::$uniConfig[$universe][$key]))
+ {
+ return self::$uniConfig[$universe][$key];
+ }
+
+ if(isset(self::$gameConfig[$key]))
+ {
+ return self::$gameConfig[$key];
+ }
+ */
+ throw new Exception("Unkown Config Key ".$key."!");
+ }
+
+ static function getAll($configType, $universe = NULL)
+ {
+ switch($configType)
+ {
+ default:
+ if(is_null($universe) || !isset(self::$config[$universe])) {
+ return self::$config;
+ }
+ else {
+ return self::$config[$universe];
+ }
+ break;
+ /* New Config
+ case 'universe':
+ return self::$uniConfig;
+ break;
+ case 'global':
+ return self::$gameConfig;
+ break; */
+ }
+
+ throw new Exception("Unkown ConfigType ".$configType."!");
+ }
+
+ static function update($newConfig, $universe = NULL)
+ {
+ if(is_null($universe) || !isset(self::$config[$universe])) {
+ $universe = $GLOBALS['UNI'];
+ }
+
+ $gameUpdate = array();
+ $uniUpdate = array();
+
+ foreach($newConfig as $configKey => $value)
+ {
+ if(!isset(self::$config[$universe][$configKey]))
+ {
+ throw new Exception("Unkown Config Key ".$configKey."!");
+ }
+
+ if(in_array($configKey, $GLOBALS['BASICCONFIG']))
+ {
+ foreach(array_keys(self::$config) as $uniID)
+ {
+ self::$config[$uniID][$configKey] = $value;
+ }
+ $gameUpdate[] = $configKey." = '".$GLOBALS['DATABASE']->escape($value)."'";
+ }
+ else
+ {
+ self::$config[$universe][$configKey] = $value;
+ $uniUpdate[] = $configKey." = '".$GLOBALS['DATABASE']->escape($value)."'";
+ }
+ }
+
+ if(!empty($uniUpdate))
+ {
+ $GLOBALS['DATABASE']->query("UPDATE ".CONFIG." SET ".implode(', ', $uniUpdate)." WHERE uni = ".$universe.";");
+ }
+
+ if(!empty($gameUpdate))
+ {
+ $GLOBALS['DATABASE']->query("UPDATE ".CONFIG." SET ".implode(', ', $gameUpdate).";");
+ }
+
+ $GLOBALS['CONFIG'] = self::$config;
+ $GLOBALS['CONF'] = self::$config[$GLOBALS['UNI']];
+ }
+}
diff --git a/includes/classes/Cronjob.class.php b/includes/classes/Cronjob.class.php
new file mode 100644
index 0000000..3cbd627
--- /dev/null
+++ b/includes/classes/Cronjob.class.php
@@ -0,0 +1,99 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2013-01-17)
+ * @info $Id$
+ * @link http://2moons.cc/
+ */
+
+class Cronjob
+{
+ function __construct()
+ {
+
+ }
+
+ static function execute($cronjobID)
+ {
+ $cronjobsList = array();
+ $cronjobsClassName = $GLOBALS['DATABASE']->getFirstCell("SELECT class FROM ".CRONJOBS." WHERE isActive = 1 AND cronjobID = ".$cronjobID." AND `lock` IS NULL;");
+ if(empty($cronjobsClassName))
+ {
+ throw new Exception("Unkown cronjob ".$cronjobID." or is deactived");
+ }
+
+ $GLOBALS['DATABASE']->query("UPDATE ".CRONJOBS." SET `lock` = '".md5(TIMESTAMP)."' WHERE cronjobID = ".$cronjobID.";");
+
+ $cronjobsPath = ROOT_PATH.'includes/classes/cronjob/'.$cronjobsClassName.'.class.php';
+
+ // die hard, if file not exists.
+ require_once($cronjobsPath);
+
+ $cronjobObj = new $cronjobsClassName;
+ $cronjobObj->run();
+ self::reCalculateCronjobs($cronjobID);
+ $GLOBALS['DATABASE']->query("UPDATE ".CRONJOBS." SET `lock` = NULL WHERE cronjobID = ".$cronjobID.";");
+ }
+
+ static function getNeedTodoExecutedJobs()
+ {
+ $cronjobsList = array();
+ $cronjobsRaw = $GLOBALS['DATABASE']->query("SELECT cronjobID FROM ".CRONJOBS." WHERE isActive = 1 AND nextTime < ".TIMESTAMP." AND `lock` IS NULL;");
+ while($cronjobRow = $GLOBALS['DATABASE']->fetchArray($cronjobsRaw))
+ {
+ $cronjobsList[] = $cronjobRow['cronjobID'];
+ }
+
+ $GLOBALS['DATABASE']->free_result($cronjobsRaw);
+
+ return $cronjobsList;
+ }
+
+ static function reCalculateCronjobs($cronjobID = NULL)
+ {
+
+ require_once ROOT_PATH.'includes/libs/tdcron/class.tdcron.php';
+ require_once ROOT_PATH.'includes/libs/tdcron/class.tdcron.entry.php';
+
+ $cronjobsList = array();
+ $SQL = "";
+ $where = "";
+
+ if(!empty($cronjobID))
+ {
+ $where = " WHERE cronjobID = ".$cronjobID;
+ }
+
+ $cronjobsRaw = $GLOBALS['DATABASE']->query("SELECT cronjobID, min, hours, dom, month, dow FROM ".CRONJOBS.$where.";");
+
+ while($cronjobRow = $GLOBALS['DATABASE']->fetchArray($cronjobsRaw))
+ {
+ $cronTabString = implode(' ', array($cronjobRow['min'], $cronjobRow['hours'], $cronjobRow['dom'], $cronjobRow['month'], $cronjobRow['dow']));
+ $nextTime = tdCron::getNextOccurrence($cronTabString, TIMESTAMP);
+
+ $SQL .= "UPDATE ".CRONJOBS." SET nextTime = ".$nextTime." WHERE cronjobID = ".$cronjobRow['cronjobID'].";";
+ }
+
+ $GLOBALS['DATABASE']->multi_query($SQL);
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/HTTP.class.php b/includes/classes/HTTP.class.php
new file mode 100644
index 0000000..ab2026b
--- /dev/null
+++ b/includes/classes/HTTP.class.php
@@ -0,0 +1,97 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2013-01-17)
+ * @info $Id$
+ * @link http://2moons.cc/
+ */
+
+class HTTP {
+
+ static public function redirectTo($URL, $external = false)
+ {
+ if($external)
+ {
+ self::sendHeader('Location', $URL);
+ }
+ else
+ {
+ self::sendHeader('Location', HTTP_PATH.$URL);
+ }
+ exit;
+ }
+
+ static public function sendHeader($name, $value = NULL)
+ {
+ header($name.(!is_null($value) ? ': '.$value : ''));
+ }
+
+ static public function sendCookie($name, $value = "", $toTime = NULL)
+ {
+ setcookie($name, $value, $toTime);
+ }
+
+ static public function _GP($name, $default, $multibyte = false, $highnum = false)
+ {
+ if(!isset($_REQUEST[$name]))
+ {
+ return $default;
+ }
+
+ if(is_int($default))
+ {
+ return (int) $_REQUEST[$name];
+ }
+
+ if(is_float($default))
+ {
+ return (float) $_REQUEST[$name];
+ }
+
+ if(is_string($default))
+ {
+ $var = trim(htmlspecialchars(str_replace(array("\r\n", "\r", "\0"), array("\n", "\n", ''), $_REQUEST[$name]), ENT_QUOTES, 'UTF-8'));
+
+ if (empty($var)) {
+ return $default;
+ }
+
+ if ($multibyte) {
+ if (!preg_match('/^./u', $var)) {
+ $var = '';
+ }
+ } else {
+ $var = preg_replace('/[\x80-\xFF]/', '?', $var); // no multibyte, allow only ASCII (0-127)
+ }
+
+ return $var;
+ }
+
+ if(is_array($default))
+ {
+ return (array) $_REQUEST[$name];
+ }
+
+ return $default;
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/HTTPRequest.class.php b/includes/classes/HTTPRequest.class.php
new file mode 100644
index 0000000..56cf1b7
--- /dev/null
+++ b/includes/classes/HTTPRequest.class.php
@@ -0,0 +1,69 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan
+ * @copyright 2006 Perberos (UGamela)
+ * @copyright 2008 Chlorel (XNova)
+ * @copyright 2009 Lucky (XGProyecto)
+ * @copyright 2012 Jan (2Moons)
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 2.0 (2012-11-31)
+ * @info $Id$
+ * @link http://code.google.com/p/2moons/
+ */
+
+class HTTPRequest
+{
+ private $url = NULL;
+ private $content = NULL;
+ private $ch = NULL;
+
+ function __construct($url = NULL)
+ {
+ $this->url = $url;
+ }
+
+ function send()
+ {
+ if(function_exists("curl_init"))
+ {
+ $this->ch = curl_init($this->url);
+ curl_setopt($this->ch, CURLOPT_HTTPGET, true);
+ curl_setopt($this->ch, CURLOPT_AUTOREFERER, true);
+ curl_setopt($this->ch, CURLOPT_FOLLOWLOCATION, true);
+ curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($this->ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; 2Moons/".Config::get('VERSION')."; +http://2moons.cc)");
+ curl_setopt($this->ch, CURLOPT_HTTPHEADER, array(
+ "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+ "Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3",
+ "Accept-Language: de-DE,de;q=0.8,en-US;q=0.6,en;q=0.4",
+ ));
+
+ $this->content = curl_exec($this->ch);
+ curl_close($this->ch);
+ }
+ }
+
+ function getResponse()
+ {
+ $this->send();
+ return $this->content;
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/Language.class.php b/includes/classes/Language.class.php
new file mode 100644
index 0000000..37a511e
--- /dev/null
+++ b/includes/classes/Language.class.php
@@ -0,0 +1,186 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kr�pke
+ * @copyright 2012 Jan Kr�pke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2013-01-17)
+ * @info $Id$
+ * @link http://2moons.cc/
+ */
+
+class Language implements ArrayAccess {
+ private $container = array();
+ private $language = array();
+ static private $allLangauges = array();
+
+ static function getAllowedLangs($OnlyKey = true)
+ {
+ if(count(self::$allLangauges) == 0) {
+ $GLOBALS['CACHE']->add('language', 'LanguageBuildCache');
+ self::$allLangauges = $GLOBALS['CACHE']->get('language');
+ }
+
+ if($OnlyKey) {
+ return array_keys(self::$allLangauges);
+ }
+ else {
+ return self::$allLangauges;
+ }
+ }
+
+ public function getUserAgentLanguage()
+ {
+ if (isset($_REQUEST['lang']) && in_array($_REQUEST['lang'], self::getAllowedLangs()))
+ {
+ HTTP::sendCookie('lang', $_REQUEST['lang'], 2147483647);
+ $this->setLanguage($_REQUEST['lang']);
+ return true;
+ }
+
+ if ((MODE === 'LOGIN' || MODE === 'INSTALL') && isset($_COOKIE['lang']) && in_array($_COOKIE['lang'], self::getAllowedLangs()))
+ {
+ $this->setLanguage($_COOKIE['lang']);
+ return true;
+ }
+
+ if (empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+ return false;
+ }
+
+ $quality = 0;
+
+
+ $accepted_languages = preg_split('/,\s*/', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+
+ $language = $this->getLanguage();
+ $current_q = 0;
+
+ foreach ($accepted_languages as $accepted_language)
+ {
+ $isValid = preg_match('/^([a-z]{1,8}(?:-[a-z]{1,8})*)'.'(?:;\s*q=(0(?:\.[0-9]{1,3})?|1(?:\.0{1,3})?))?$/i', $accepted_language, $matches);
+
+ if ($isValid !== 1)
+ {
+ continue;
+ }
+
+ list($code) = explode('-', strtolower($matches[1]));
+ $quality = isset($matches[2]) ? (float)$matches[2] : 1.0;
+
+ if($quality > $current_q && in_array($code, self::getAllowedLangs()))
+ {
+ $language = $code;
+ $current_q = $quality;
+ break;
+ }
+ }
+
+ HTTP::sendCookie('lang', $language, 2147483647);
+ $this->setLanguage($language);
+ }
+
+ public function __construct($language = NULL)
+ {
+ $this->setLanguage($language);
+ }
+
+ public function setLanguage($language)
+ {
+ if(!is_null($language) && in_array($language, self::getAllowedLangs()))
+ {
+ $this->language = $language;
+ }
+ elseif(MODE !== 'INSTALL')
+ {
+ $this->language = Config::get('lang');
+ }
+ else
+ {
+ $this->language = DEFAULT_LANG;
+ }
+ }
+
+ public function addData($data) {
+ $this->container = array_merge_recursive($this->container, $data);
+ }
+
+ public function getLanguage()
+ {
+ return $this->language;
+ }
+
+ public function getTemplate($templateName)
+ {
+ if(file_exists(ROOT_PATH.'language/'.$this->getLanguage().'/templates/'.$templateName.'.txt'))
+ {
+ return file_get_contents(ROOT_PATH.'language/'.$this->getLanguage().'/templates/'.$templateName.'.txt');
+ }
+ else
+ {
+ return '### Template "'.$templateName.'" on language "'.$this->getLanguage().'" not found! ###';
+ }
+ }
+
+ public function includeData($Files)
+ {
+ // Fixed BOM problems.
+ ob_start();
+
+ foreach($Files as $File) {
+ require(ROOT_PATH.'language/'.$this->getLanguage().'/'.$File.'.php');
+ }
+
+ if(file_exists(ROOT_PATH.'language/'.$this->getLanguage().'/CUSTOM.php'))
+ {
+ require(ROOT_PATH.'language/'.$this->getLanguage().'/CUSTOM.php');
+ }
+
+ ob_end_clean();
+ $this->addData($LNG);
+ }
+
+ public function insertData($Files)
+ {
+
+ }
+
+ /** ArrayAccess Functions **/
+
+ public function offsetSet($offset, $value) {
+ if (is_null($offset)) {
+ $this->container[] = $value;
+ } else {
+ $this->container[$offset] = $value;
+ }
+ }
+
+ public function offsetExists($offset) {
+ return isset($this->container[$offset]);
+ }
+
+ public function offsetUnset($offset) {
+ unset($this->container[$offset]);
+ }
+
+ public function offsetGet($offset) {
+ return isset($this->container[$offset]) ? $this->container[$offset] : $offset;
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/Mail.class.php b/includes/classes/Mail.class.php
new file mode 100644
index 0000000..ed7d667
--- /dev/null
+++ b/includes/classes/Mail.class.php
@@ -0,0 +1,100 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan
+ * @copyright 2006 Perberos (UGamela)
+ * @copyright 2008 Chlorel (XNova)
+ * @copyright 2009 Lucky (XGProyecto)
+ * @copyright 2012 Jan (2Moons)
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 2.0 (2012-11-31)
+ * @info $Id$
+ * @link http://code.google.com/p/2moons/
+ */
+
+class Mail
+{
+ function send($MailTarget, $MailTargetName, $MailSubject, $MailContent)
+ {
+ $transport = self::getSwiftTransport();
+ $mailer = Swift_Mailer::newInstance($transport);
+
+ $mailFrom = Config::get('smtp_sendmail');
+ $mailTo = Config::get('game_name');
+
+ $mail = Swift_Message::newInstance();
+ $mail->setSubject($MailSubject)
+ ->setFrom(array($mailFrom => $mailTo))
+ ->setTo(array($MailTarget => $MailTargetName))
+ ->setBody($MailContent);
+
+ $mailer->send($mail);
+ }
+
+ function multiSend($MailTargets, $MailSubject, $MailContent = NULL)
+ {
+ $transport = self::getSwiftTransport();
+ $mailer = Swift_Mailer::newInstance($transport);
+
+ $mailFrom = Config::get('smtp_sendmail');
+ $mailTo = Config::get('game_name');
+
+ $mail = Swift_Message::newInstance();
+ $mail->setSubject($MailSubject)
+ ->setFrom(array($mailFrom => $mailTo));
+
+ foreach($MailTargets as $address => $data)
+ {
+ $content = isset($data['body']) ? $data['body'] : $MailContent;
+ $mail->setTo(array($address => $data['username']))
+ ->setBody(strip_tags($content))
+ ->addPart($content, 'text/html');
+
+ $mailer->send($mail);
+ }
+ }
+
+ function getSwiftTransport()
+ {
+ require_once(ROOT_PATH.'includes/libs/swift/swift_required.php');
+
+ if(Config::get('mail_use') == 2)
+ {
+ $transport = Swift_SmtpTransport::newInstance(Config::get('smtp_host'), Config::get('smtp_port'));
+
+ if(Config::get('smtp_ssl') == 'ssl' || Config::get('smtp_ssl') == 'tls')
+ {
+ $transport->setEncryption(Config::get('smtp_ssl'));
+ }
+
+ if(Config::get('smtp_user') != '')
+ {
+ $transport->setUsername(Config::get('smtp_user'));
+ $transport->setPassword(Config::get('smtp_pass'));
+ }
+ }
+ elseif(Config::get('mailMethod') == 0)
+ {
+ $transport = Swift_MailTransport::newInstance();
+ }
+
+ return $transport;
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/PlayerUtil.class.php b/includes/classes/PlayerUtil.class.php
new file mode 100644
index 0000000..023a2f4
--- /dev/null
+++ b/includes/classes/PlayerUtil.class.php
@@ -0,0 +1,436 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2013-01-17)
+ * @info $Id$
+ * @link http://2moons.cc/
+ */
+
+class PlayerUtil {
+
+ const POSITION_NOT_AVALIBLE = 1;
+
+ static function cryptPassword($password)
+ {
+ // http://www.phpgangsta.de/schoener-hashen-mit-bcrypt
+ require(ROOT_PATH . 'includes/config.php');
+
+ if(!CRYPT_BLOWFISH || !isset($salt)) {
+ return md5($password);
+ } else {
+ return crypt($password, '$2a$09$'.$salt.'$');
+ }
+ }
+
+ static function isPositionFree($Universe, $Galaxy, $System, $Position, $Type = 1)
+ {
+ return $GLOBALS['DATABASE']->getFirstCell("SELECT COUNT(*) FROM ".PLANETS."
+ WHERE universe = ".$Universe." AND galaxy = ".$Galaxy."
+ AND system = ".$System." AND planet = ".$Position."
+ AND planet_type = ".$Type.";") == 0;
+ }
+
+ static function calculateMoonChance($FleetDebris, $universe)
+ {
+ return min(round($FleetDebris / 100000 * $uniConfig['planetMoonCreateChanceFactor'], 0), $uniConfig['planetMoonCreateMaxFactor']);
+ }
+
+ static function isNameValid($name)
+ {
+ if(UTF8_SUPPORT) {
+ return preg_match("/^[\p{L}\p{N}_\-. ]*$/u", $name);
+ } else {
+ return preg_match("/^[A-z0-9_\-. ]*$/", $name);
+ }
+ }
+
+ static function isMailValid($address) {
+
+ if(function_exists('filter_var')) {
+ return filter_var($address, FILTER_VALIDATE_EMAIL) !== FALSE;
+ } else {
+ /* Regex expression from swift mailer (http://swiftmailer.org) - RFC 2822 */
+ return preg_match('/^(?:(?:(?:(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?(?:[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_\{\}\|~]+(\.[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_\{\}\|~]+)*)+(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?)|(?:(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?"((?:(?:[ \t]*(?:\r\n))?[ \t])?(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21\x23-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])))*(?:(?:[ \t]*(?:\r\n))?[ \t])?"(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?))@(?:(?:(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?(?:[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_\{\}\|~]+(\.[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_\{\}\|~]+)*)+(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?)|(?:(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?\[((?:(?:[ \t]*(?:\r\n))?[ \t])?(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x5A\x5E-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])))*?(?:(?:[ \t]*(?:\r\n))?[ \t])?\](?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?)))$/D', $address);
+ }
+ }
+
+ static function createPlayer($Universe, $UserName, $UserPass, $UserMail, $UserLang = NULL, $Galaxy = NULL, $System = NULL, $Position = NULL, $planetname = NULL, $authlevel = 0, $UserIP = NULL)
+ {
+ $CONF = Config::getAll(NULL, $Universe);
+
+ if (isset($Galaxy, $System, $Position))
+ {
+ if ($CONF['max_galaxy'] < $Galaxy || 1 > $Galaxy) {
+ throw new Exception("Try to create a planet at position: ".$Galaxy.":".$System.":".$Position);
+ }
+
+ if ($CONF['max_system'] < $System || 1 > $System) {
+ throw new Exception("Try to create a planet at position: ".$Galaxy.":".$System.":".$Position);
+ }
+
+ if ($CONF['max_planets'] < $Position || 1 > $Position) {
+ throw new Exception("Try to create a planet at position: ".$Galaxy.":".$System.":".$Position);
+ }
+
+ if (!self::isPositionFree($Universe, $Galaxy, $System, $Position)) {
+ throw new Exception("Position is not empty: ".$Galaxy.":".$System.":".$Position);
+ }
+ } else {
+ $Galaxy = $CONF['LastSettedGalaxyPos'];
+ $System = $CONF['LastSettedSystemPos'];
+ $Planet = $CONF['LastSettedPlanetPos'];
+
+ do {
+ $Position = mt_rand(round($CONF['max_planets'] * 0.2), round($CONF['max_planets'] * 0.8));
+ if ($Planet < 3) {
+ $Planet += 1;
+ } else {
+ if ($System >= $CONF['max_system']) {
+ $System = 1;
+ if($Galaxy >= $CONF['max_galaxy']) {
+ $Galaxy = 1;
+ } else {
+ $Galaxy += 1;
+ }
+ } else {
+ $System += 1;
+ }
+ }
+ } while (self::isPositionFree($Universe, $Galaxy, $System, $Position) === false);
+
+ Config::update(array(
+ 'LastSettedGalaxyPos' => $Galaxy,
+ 'LastSettedSystemPos' => $System,
+ 'LastSettedPlanetPos' => $Planet,
+ ));
+ }
+
+ $SQL = "INSERT INTO ".USERS." SET
+ username = '".$GLOBALS['DATABASE']->escape($UserName)."',
+ email = '".$GLOBALS['DATABASE']->escape($UserMail)."',
+ email_2 = '".$GLOBALS['DATABASE']->escape($UserMail)."',
+ authlevel = ".$authlevel.",
+ universe = ".$Universe.",
+ lang = '".$UserLang."',
+ ip_at_reg = '".(!empty($UserIP) ? $UserIP : $_SERVER['REMOTE_ADDR'])."',
+ onlinetime = ".TIMESTAMP.",
+ register_time = ".TIMESTAMP.",
+ password = '".$UserPass."',
+ dpath = '".DEFAULT_THEME."',
+ timezone = '".$CONF['timezone']."',
+ uctime = 0";
+
+ foreach($GLOBALS['reslist']['resstype'][3] as $elementID) {
+ $SQL .= ", ".$GLOBALS['resource'][$elementID]." = ".$CONF[$GLOBALS['resource'][$elementID].'_start'];
+ }
+
+ $GLOBALS['DATABASE']->query($SQL);
+
+ $userID = $GLOBALS['DATABASE']->GetInsertID();
+ $planetID = self::createPlanet($Galaxy, $System, $Position, $Universe, $userID, $planetname, true, $authlevel);
+
+ $currentUserAmount = $CONF['users_amount'] + 1;
+
+ Config::update(array(
+ 'users_amount' => $currentUserAmount + 1,
+ ));
+
+ $SQL = "UPDATE ".USERS." SET
+ galaxy = ".$Galaxy.",
+ system = ".$System.",
+ planet = ".$Position.",
+ id_planet = ".$planetID."
+ WHERE id = ".$userID.";";
+
+ $GLOBALS['DATABASE']->query($SQL);
+
+ $SQL = "INSERT INTO ".STATPOINTS." SET
+ id_owner = ".$userID.",
+ universe = ".$Universe.",
+ stat_type = 1,
+ tech_rank = ".$currentUserAmount.",
+ build_rank = ".$currentUserAmount.",
+ defs_rank = ".$currentUserAmount.",
+ fleet_rank = ".$currentUserAmount.",
+ total_rank = ".$currentUserAmount.";";
+
+ $GLOBALS['DATABASE']->query($SQL);
+
+ return array($userID, $planetID);
+ }
+
+ static function createPlanet($Galaxy, $System, $Position, $Universe, $PlanetOwnerID, $PlanetName = NULL, $HomeWorld = false, $authlevel = 0)
+ {
+ $CONF = Config::getAll(NULL, $Universe);
+
+ if ($CONF['max_galaxy'] < $Galaxy || 1 > $Galaxy) {
+ throw new Exception("Try to create a planet at position: ".$Galaxy.":".$System.":".$Position);
+ }
+
+ if ($CONF['max_system'] < $System || 1 > $System) {
+ throw new Exception("Try to create a planet at position: ".$Galaxy.":".$System.":".$Position);
+ }
+
+ if ($CONF['max_planets'] < $Position || 1 > $Position) {
+ throw new Exception("Try to create a planet at position: ".$Galaxy.":".$System.":".$Position);
+ }
+
+ if (!self::isPositionFree($Universe, $Galaxy, $System, $Position)) {
+ throw new Exception("Position is not empty: ".$Galaxy.":".$System.":".$Position);
+ }
+
+ require(ROOT_PATH.'includes/PlanetData.php');
+
+ $Pos = ceil($Position / ($CONF['max_planets'] / count($PlanetData)));
+ $TMax = $PlanetData[$Pos]['temp'];
+ $TMin = $TMax - 40;
+
+ if($HomeWorld) {
+ $Fields = $CONF['initial_fields'];
+ } else {
+ $Fields = floor($PlanetData[$Pos]['fields'] * $CONF['planet_factor']);
+ }
+
+ $Types = array_keys($PlanetData[$Pos]['image']);
+ $Type = $Types[array_rand($Types)];
+ $Class = $Type.'planet'.($PlanetData[$Pos]['image'][$Type] < 10 ? '0' : '').$PlanetData[$Pos]['image'][$Type];
+
+ if(empty($PlanetName))
+ {
+ if($HomeWorld) {
+ $PlanetName = t('fcm_mainplanet');
+ } else {
+ $PlanetName = t('fcp_colony');
+ }
+ }
+
+ $SQL = "INSERT INTO ".PLANETS." SET
+ name = '".$GLOBALS['DATABASE']->escape($PlanetName)."',
+ universe = ".$Universe.",
+ id_owner = ".$PlanetOwnerID.",
+ galaxy = ".$Galaxy.",
+ system = ".$System.",
+ planet = ".$Position.",
+ last_update = ".TIMESTAMP.",
+ planet_type = '1',
+ image = '".$Class."',
+ diameter = ".floor(1000 * sqrt($Fields)).",
+ field_max = ".$Fields.",
+ temp_min = ".$TMin.",
+ temp_max = ".$TMax;
+
+
+ foreach($GLOBALS['reslist']['resstype'][1] as $elementID) {
+ $SQL .= ", ".$GLOBALS['resource'][$elementID]." = ".$CONF[$GLOBALS['resource'][$elementID].'_start'];
+ }
+
+ $GLOBALS['DATABASE']->query($SQL);
+ return $GLOBALS['DATABASE']->GetInsertID();
+ }
+
+ static function createMoon($Universe, $Galaxy, $System, $Position, $userID, $Chance, $Size = NULL)
+ {
+ $SQL = "SELECT id_luna, planet_type, id, name, temp_max, temp_min FROM ".PLANETS."
+ WHERE universe = ".$Universe."
+ AND galaxy = ".$Galaxy."
+ AND system = ".$System."
+ AND planet = ".$Position."
+ AND planet_type = '1';";
+
+ $MoonPlanet = $GLOBALS['DATABASE']->getFirstRow($SQL);
+
+ if ($MoonPlanet['id_luna'] != 0)
+ return false;
+
+ if($Size == 0) {
+ $size = floor(pow(mt_rand(10, 20) + 3 * $Chance, 0.5) * 1000); # New Calculation - 23.04.2011
+ } else {
+ $size = $Size;
+ }
+
+ $maxtemp = $MoonPlanet['temp_max'] - mt_rand(10, 45);
+ $mintemp = $MoonPlanet['temp_min'] - mt_rand(10, 45);
+
+ $GLOBALS['DATABASE']->multi_query("INSERT INTO ".PLANETS." SET
+ name = '".$MoonName."',
+ id_owner = ".$Owner.",
+ universe = ".$Universe.",
+ galaxy = ".$Galaxy.",
+ system = ".$System.",
+ planet = ".$Planet.",
+ last_update = ".TIMESTAMP.",
+ planet_type = '3',
+ image = 'mond',
+ diameter = ".$size.",
+ field_max = '1',
+ temp_min = ".$mintemp.",
+ temp_max = ".$maxtemp.",
+ metal = 0,
+ metal_perhour = 0,
+ crystal = 0,
+ crystal_perhour = 0,
+ deuterium = 0,
+ deuterium_perhour = 0;
+ SET @moonID = LAST_INSERT_ID();
+ UPDATE ".PLANETS." SET
+ id_luna = @moonID
+ WHERE
+ id = ".$MoonPlanet['id'].";");
+
+ return true;
+ }
+
+ static function deletePlayer($userID)
+ {
+ global $db;
+
+ if(ROOT_USER == $userID) {
+ return false;
+ }
+
+ $userData = $GLOBALS['DATABASE']->getFirstRow("SELECT universe, ally_id FROM ".USERS." WHERE id = '".$userID."';");
+ $SQL = "";
+
+ if (!empty($userData['ally_id']))
+ {
+ $memberCount = $GLOBALS['DATABASE']->getFirstCell("SELECT ally_members FROM ".ALLIANCE." WHERE id = ".$userData['ally_id'].";");
+
+ if ($memberCount == 1)
+ {
+ $SQL .= "UPDATE ".ALLIANCE." SET ally_members = ally_members - 1 WHERE id = ".$userData['ally_id'].";";
+ }
+ else
+ {
+ $SQL .= "DELETE FROM ".ALLIANCE." WHERE id = ".$userData['ally_id'].";";
+ $SQL .= "DELETE FROM ".STATPOINTS." WHERE stat_type = '2' AND id_owner = ".$userData['ally_id'].";";
+ $SQL .= "UPDATE ".STATPOINTS." WHERE id_ally = 0 AND id_ally = ".$userData['ally_id'].";";
+ }
+ }
+
+ $SQL .= "DELETE FROM ".ALLIANCE_REQUEST." WHERE userID = ".$userID.";";
+ $SQL .= "DELETE FROM ".BUDDY." WHERE owner = ".$userID." OR sender = ".$userID.";";
+ $SQL .= "DELETE FROM ".FLEETS." WHERE fleet_owner = ".$userID.";";
+ $SQL .= "DELETE FROM ".MESSAGES." WHERE message_owner = ".$userID.";";
+ $SQL .= "DELETE FROM ".NOTES." WHERE owner = ".$userID.";";
+ $SQL .= "DELETE FROM ".PLANETS." WHERE id_owner = ".$userID.";";
+ $SQL .= "DELETE FROM ".USERS." WHERE id = ".$userID.";";
+ $SQL .= "DELETE FROM ".STATPOINTS." WHERE stat_type = '1' AND id_owner = ".$userID.";";
+ $GLOBALS['DATABASE']->multi_query($SQL);
+
+ $fleetData = $GLOBALS['DATABASE']->query("SELECT fleet_id FROM ".FLEETS." WHERE fleet_target_owner = ".$userID.";");
+
+ while($FleetID = $GLOBALS['DATABASE']->fetchArray($fleetData)) {
+ FleetUtil::SendFleetBack($userID, $FleetID['fleet_id']);
+ }
+
+ $GLOBALS['DATABASE']->free_result($fleetData);
+
+ $GLOBALS['DATABASE']->query("UPDATE ".UNIVERSE." SET userAmount = userAmount - 1 WHERE universe = ".$userData['universe'].";");
+
+ $GLOBALS['CACHE']->flush('universe');
+ }
+
+ static function deletePlanet($planetID)
+ {
+ $planetData = $GLOBALS['DATABASE']->getFirstRow("SELECT planet_type FROM ".PLANETS." WHERE id = ".$planetID." AND id NOT IN (SELECT id_planet FROM ".USERS.");");
+
+ if(empty($planetData)) {
+ return false;
+ }
+
+ $fleetData = $GLOBALS['DATABASE']->query("SELECT fleet_id FROM ".FLEETS." WHERE fleet_end_id = ".$planetID.";");
+
+ while($FleetID = $GLOBALS['DATABASE']->fetchArray($fleetData)) {
+ FleetUtil::SendFleetBack($$planetID, $FleetID['fleet_id']);
+ }
+
+ $GLOBALS['DATABASE']->free_result($fleetData);
+
+ if ($planetData['planet_type'] == 3) {
+ $GLOBALS['DATABASE']->multi_query("DELETE FROM ".PLANETS." WHERE id = ".$planetID.";UPDATE ".PLANETS." SET id_luna = 0 WHERE id_luna = ".$planetID.";");
+ } else {
+ $GLOBALS['DATABASE']->query("DELETE FROM ".PLANETS." WHERE id = ".$planetID." OR id_luna = ".$planetID.";");
+ }
+ }
+
+ static function maxPlanetCount($USER)
+ {
+ global $resource;
+ $CONF = Config::getAll('universe', $USER['universe']);
+
+ if($CONF['min_player_planets'] == 0)
+ {
+ $CONF['planets_tech'] = 999;
+ }
+
+ if($CONF['min_player_planets'] == 0)
+ {
+ $CONF['planets_officier'] = 999;
+ }
+
+ // http://owiki.de/index.php/Astrophysik#.C3.9Cbersicht
+ return (int) ceil($CONF['min_player_planets'] + min($CONF['planets_tech'], $USER[$resource[124]] * $CONF['planets_per_tech']) + min($CONF['planets_officier'],$USER['factor']['Planets']));
+ }
+
+ static function allowPlanetPosition($position, $USER)
+ {
+ // http://owiki.de/index.php/Astrophysik#.C3.9Cbersicht
+
+ global $resource;
+ $CONF = Config::getAll('universe', $USER['universe']);
+ switch($position) {
+ case 1:
+ case ($CONF['max_planets']):
+ return $USER[$resource[124]] >= 8;
+ break;
+ case 2:
+ case ($CONF['max_planets']-1):
+ return $USER[$resource[124]] >= 6;
+ break;
+ case 3:
+ case ($CONF['max_planets']-2):
+ return $USER[$resource[124]] >= 4;
+ break;
+ default:
+ return $USER[$resource[124]] >= 1;
+ break;
+ }
+ }
+
+ static function sendMessage($userID, $senderID, $senderName, $messageType, $subject, $text, $time, $parentID = NULL, $hasRead = 0, $universe = NULL)
+ {
+ $SQL = "INSERT INTO ".MESSAGES." SET
+ parentMessageID = ".(empty($parentID) ? "messageID" : $parentID).",
+ senderID = ".$senderID.",
+ senderName = '".$GLOBALS['DATABASE']->escape($senderName)."',
+ userID = ".$userID.",
+ time = ".$time.",
+ messageType = ".$messageType.",
+ subject = '".$GLOBALS['DATABASE']->escape($subject)."',
+ text = '".$GLOBALS['DATABASE']->escape($text)."',
+ hasRead = ".$hasRead.",
+ universe = ".Globals::getUni().";";
+
+ $GLOBALS['DATABASE']->query($SQL);
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/SQLDumper.class.php b/includes/classes/SQLDumper.class.php
new file mode 100644
index 0000000..8dba4bd
--- /dev/null
+++ b/includes/classes/SQLDumper.class.php
@@ -0,0 +1,233 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kr�pke
+ * @copyright 2012 Jan Kr�pke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2013-01-17)
+ * @info $Id$
+ * @link http://2moons.cc/
+ */
+
+class SQLDumper
+{
+ public function dumpTablesToFile($dbTables, $filePath)
+ {
+ if($this->canNative('mysqldump'))
+ {
+ return $this->nativeDumpToFile($dbTables, $filePath);
+ }
+ else
+ {
+ return $this->softwareDumpToFile($dbTables, $filePath);
+ }
+ }
+
+ private function setTimelimit()
+ {
+ @set_time_limit(600); // 10 Minutes
+ }
+
+ private function canNative($command)
+ {
+ return function_exists('shell_exec') && function_exists('escapeshellarg') && shell_exec($command) !== NULL;
+ }
+
+ private function nativeDumpToFile($dbTables, $filePath)
+ {
+ require ROOT_PATH.'includes/config.php';
+ $dbTables = array_map('escapeshellarg', $dbTables);
+ $sqlDump = shell_exec("mysqldump --host='".escapeshellarg($database['host'])."' --port=".((int) $database['port'])." --user='".escapeshellarg($database['user'])."' --password='".escapeshellarg($database['userpw'])."' --no-create-db --order-by-primary --add-drop-table --comments --complete-insert --hex-blob '".escapeshellarg($database['databasename'])."' ".implode(' ', $dbTables)." 2>&1 1> ".$filePath);
+ if(strlen($sqlDump) !== 0) #mysqldump error
+ {
+ throw new Exception($sqlDump);
+ }
+ }
+
+ private function softwareDumpToFile($dbTables, $filePath)
+ {
+ $this->setTimelimit();
+ require ROOT_PATH.'includes/config.php';
+ $intergerTypes = array('tinyint', 'smallint', 'mediumint', 'int', 'bigint', 'decimal', 'float', 'double', 'real');
+ $gameVersion = Config::get('VERSION');
+ $serverVersion = $GLOBALS['DATABASE']->getServerVersion();
+ $fp = fopen($filePath, 'w');
+ fwrite($fp, "-- MySQL dump | 2Moons dumper v{$gameVersion}
+--
+-- Host: {$database['host']} Database: {$database['databasename']}
+-- ------------------------------------------------------
+-- Server version {$serverVersion}
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+");
+
+ foreach($dbTables as $dbTable)
+ {
+ $columNames = array();
+ $numColums = array();
+ $firstRow = true;
+
+ fwrite($fp, "--
+-- Table structure for table `{$dbTable}`
+--
+
+DROP TABLE IF EXISTS `{$dbTable}`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+
+");
+ $createTable = $GLOBALS['DATABASE']->getFirstRow("SHOW CREATE TABLE ".$dbTable);
+ fwrite($fp, $createTable['Create Table'].';');
+ fwrite($fp, "
+
+/*!40101 SET character_set_client = @saved_cs_client */;");
+ if($GLOBALS['DATABASE']->getFirstCell("SELECT COUNT(*) FROM ".$dbTable.";") == 0)
+ {
+ fwrite($fp, "
+
+--
+-- No data for table `{$dbTable}`
+--
+
+");
+ continue;
+ }
+ fwrite($fp, "
+
+--
+-- Dumping data for table `{$dbTable}`
+--
+
+LOCK TABLES `{$dbTable}` WRITE;
+/*!40000 ALTER TABLE `{$dbTable}` DISABLE KEYS */;
+
+");
+ $columsData = $GLOBALS['DATABASE']->query("SHOW COLUMNS FROM `".$dbTable."`");
+
+ $columNames = array();
+ while($columData = $GLOBALS['DATABASE']->fetchArray($columsData))
+ {
+ $columNames[] = $columData['Field'];
+ foreach($intergerTypes as $type)
+ {
+ if(strpos($columData['Type'], $type.'(') !== false)
+ {
+ $numColums[] = $columData['Field'];
+ break;
+ }
+ }
+ }
+ $GLOBALS['DATABASE']->free_result($columsData);
+
+
+ $insertInto = "INSERT INTO `{$dbTable}` (`".implode("`, `", $columNames)."`) VALUES\r\n";
+
+ fwrite($fp, $insertInto);
+ $i = 0;
+ $tableData = $GLOBALS['DATABASE']->query("SELECT * FROM ".$dbTable);
+ while($tableRow = $GLOBALS['DATABASE']->fetchArray($tableData))
+ {
+ $rowData = array();
+ $i++;
+ if(($i % 50) === 0)
+ {
+ $firstRow = true;
+ fwrite($fp, ";\r\n");
+ fwrite($fp, $insertInto);
+ }
+
+ if(!$firstRow)
+ {
+ fwrite($fp, ",\r\n");
+ }
+ else
+ {
+ $firstRow = false;
+ }
+
+ foreach($tableRow as $colum => $value)
+ {
+ if(in_array($colum, $numColums))
+ {
+ $rowData[] = $value === NULL ? 'NULL' : $value;
+ }
+ else
+ {
+ $rowData[] = $value === NULL ? 'NULL' : "'".$GLOBALS['DATABASE']->escape($value)."'";
+ }
+ }
+ fwrite($fp, "(".implode(", ",$rowData).")");
+ }
+ $GLOBALS['DATABASE']->free_result($tableData);
+ fwrite($fp, ";
+
+/*!40000 ALTER TABLE `{$dbTable}` ENABLE KEYS */;
+UNLOCK TABLES;
+
+");
+ }
+ fwrite($fp, "/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on ".date("Y-d-m H:i:s"));
+ fclose($fp);
+ }
+
+ public function restoreDatabase($filePath)
+ {
+ // Ugly.
+ $this->setTimelimit();
+
+ if($this->canNative('mysql'))
+ {
+
+ $sqlDump = shell_exec("mysql --host='".escapeshellarg($database['host'])."' --port=".((int) $database['port'])." --user='".escapeshellarg($database['user'])."' --password='".escapeshellarg($database['userpw'])."' '".escapeshellarg($database['databasename'])."' < ".escapeshellarg($filePath)." 2>&1 1> /dev/null");
+ if(strlen($sqlDump) !== 0) #mysql error
+ {
+ throw new Exception($sqlDump);
+ }
+ }
+ else
+ {
+ $backupQuery = explode(";\r\n", file_get_contents($filePath));
+ foreach($backupQuery as $query)
+ {
+ $GLOBALS['DATABASE']->multi_query($query);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/cache/builder/BannedBuildCache.class.php b/includes/classes/cache/builder/BannedBuildCache.class.php
new file mode 100644
index 0000000..3bcd3a0
--- /dev/null
+++ b/includes/classes/cache/builder/BannedBuildCache.class.php
@@ -0,0 +1,42 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2013-01-17)
+ * @info $Id$
+ * @link http://2moons.cc/
+ */
+
+class BannedBuildCache
+{
+ function buildCache()
+ {
+ $Data = Core::getDB()->query("SELECT userID, MAX(banTime) FROM ".BANNED." WHERE banTime > ".TIMESTAMP." GROUP BY userID;");
+ $Bans = array();
+ while($Row = $Data->fetchObject())
+ {
+ $Bans[$Row->userID] = $Row;
+ }
+
+ return $Bans;
+ }
+}
diff --git a/includes/classes/cache/builder/LanguageBuildCache.class.php b/includes/classes/cache/builder/LanguageBuildCache.class.php
new file mode 100644
index 0000000..c4d87bb
--- /dev/null
+++ b/includes/classes/cache/builder/LanguageBuildCache.class.php
@@ -0,0 +1,50 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kr�pke
+ * @copyright 2012 Jan Kr�pke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2013-01-17)
+ * @info $Id$
+ * @link http://2moons.cc/
+ */
+
+class LanguageBuildCache
+{
+ function buildCache()
+ {
+ $languages = array();
+ foreach (new DirectoryIterator(ROOT_PATH.'language/') as $fileInfo) {
+ if(!$fileInfo->isDir()) continue;
+
+ $Lang = $fileInfo->getBasename();
+
+ if(!file_exists(ROOT_PATH.'language/'.$Lang.'/LANG.cfg')) continue;
+
+ // Fixed BOM problems.
+ ob_start();
+ require(ROOT_PATH.'language/'.$Lang.'/LANG.cfg');
+ ob_end_clean();
+ $languages[$Lang] = $Language['name'];
+ }
+
+ return $languages;
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/cache/builder/TeamspeakBuildCache.class.php b/includes/classes/cache/builder/TeamspeakBuildCache.class.php
new file mode 100644
index 0000000..7b62520
--- /dev/null
+++ b/includes/classes/cache/builder/TeamspeakBuildCache.class.php
@@ -0,0 +1,95 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kr�pke
+ * @copyright 2012 Jan Kr�pke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2013-01-17)
+ * @info $Id$
+ * @link http://2moons.cc/
+ */
+
+
+class TeamspeakBuildCache
+{
+ function buildCache()
+ {
+ global $CONF;
+
+ $teamspeakData = array();
+
+ switch($CONF['ts_version'])
+ {
+ case 2:
+ include_once(ROOT_PATH.'includes/libs/teamspeak/class.teamspeak2.php');
+ $ts = new cyts();
+
+ if($ts->connect($CONF['ts_server'], $CONF['ts_tcpport'], $CONF['ts_udpport'], $CONF['ts_timeout'])) {
+ $serverInfo = $ts->info_serverInfo();
+ $teamspeakData = array(
+ 'password' => '', // NO Server-API avalible.
+ 'current' => $serverInfo["server_currentusers"],
+ 'maxuser' => $serverInfo["server_maxusers"],
+ );
+ $ts->disconnect();
+ } else {
+ throw new Exception('Teamspeak-Error: '.$ts->debug());
+ }
+ break;
+ case 3:
+ require_once(ROOT_PATH . "includes/libs/teamspeak/class.teamspeak3.php");
+ $tsAdmin = new ts3admin($CONF['ts_server'], $CONF['ts_udpport'], $CONF['ts_timeout']);
+ $connected = $tsAdmin->connect();
+ if(!$connected['success'])
+ {
+ throw new Exception('Teamspeak-Error: '.implode("
\r\n", $connected['errors'])); + } + + $selected = $tsAdmin->selectServer($CONF['ts_tcpport'], 'port', true); + if(!$selected['success']) + { + throw new Exception('Teamspeak-Error: '.implode("
\r\n", $selected['errors'])); + } + + $loggedIn = $tsAdmin->login($CONF['ts_login'], $CONF['ts_password']); + if(!$loggedIn['success']) + { + throw new Exception('Teamspeak-Error: '.implode("
\r\n", $loggedIn['errors'])); + } + + $serverInfo = $tsAdmin->serverInfo(); + if(!$serverInfo['success']) + { + throw new Exception('Teamspeak-Error: '.implode("
\r\n", $serverInfo['errors'])); + } + + $teamspeakData = array( + 'password' => $serverInfo['data']['virtualserver_password'], + 'current' => $serverInfo['data']['virtualserver_clientsonline'] - 1, + 'maxuser' => $serverInfo['data']['virtualserver_maxclients'], + ); + + $tsAdmin->logout(); + break; + } + + return $teamspeakData; + } +} \ No newline at end of file diff --git a/includes/classes/cache/builder/VarsBuildCache.class.php b/includes/classes/cache/builder/VarsBuildCache.class.php new file mode 100644 index 0000000..a3d0570 --- /dev/null +++ b/includes/classes/cache/builder/VarsBuildCache.class.php @@ -0,0 +1,176 @@ +. + * + * @package 2Moons + * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2013-01-17)
+ * @info $Id$
+ * @link http://2moons.cc/
+ */
+
+class VarsBuildCache
+{
+ function buildCache()
+ {
+ $resource = array();
+ $requeriments = array();
+ $pricelist = array();
+ $CombatCaps = array();
+ $reslist = array();
+
+ $reslist['prod'] = array();
+ $reslist['storage'] = array();
+ $reslist['bonus'] = array();
+ $reslist['one'] = array();
+ $reslist['build'] = array();
+ $reslist['allow'][1] = array();
+ $reslist['allow'][3] = array();
+ $reslist['tech'] = array();
+ $reslist['fleet'] = array();
+ $reslist['defense'] = array();
+ $reslist['officier'] = array();
+ $reslist['dmfunc'] = array();
+
+ $reqResult = $GLOBALS['DATABASE']->query("SELECT * FROM ".VARS_REQUIRE.";");
+ while($reqRow = $GLOBALS['DATABASE']->fetch_array($reqResult)) {
+ $requeriments[$reqRow['elementID']][$reqRow['requireID']] = $reqRow['requireLevel'];
+ }
+
+ $varsResult = $GLOBALS['DATABASE']->query("SELECT * FROM ".VARS.";");
+ while($varsRow = $GLOBALS['DATABASE']->fetch_array($varsResult)) {
+ $resource[$varsRow['elementID']] = $varsRow['name'];
+ $CombatCaps[$varsRow['elementID']] = array(
+ 'attack' => $varsRow['attack'],
+ 'shield' => $varsRow['defend'],
+ );
+
+ $pricelist[$varsRow['elementID']] = array(
+ 'cost' => array(
+ 901 => $varsRow['cost901'],
+ 902 => $varsRow['cost902'],
+ 903 => $varsRow['cost903'],
+ 911 => $varsRow['cost911'],
+ 921 => $varsRow['cost921'],
+ ),
+ 'factor' => $varsRow['factor'],
+ 'max' => $varsRow['maxLevel'],
+ 'consumption' => $varsRow['consumption1'],
+ 'consumption2' => $varsRow['consumption2'],
+ 'speed' => $varsRow['speed1'],
+ 'speed2' => $varsRow['speed2'],
+ 'capacity' => $varsRow['capacity'],
+ 'tech' => $varsRow['speedTech'],
+ 'time' => $varsRow['timeBonus'],
+ 'bonus' => array(
+ 'Attack' => array($varsRow['bonusAttack'], $varsRow['bonusAttackUnit']),
+ 'Defensive' => array($varsRow['bonusDefensive'], $varsRow['bonusDefensiveUnit']),
+ 'Shield' => array($varsRow['bonusShield'], $varsRow['bonusShieldUnit']),
+ 'BuildTime' => array($varsRow['bonusBuildTime'], $varsRow['bonusBuildTimeUnit']),
+ 'ResearchTime' => array($varsRow['bonusResearchTime'], $varsRow['bonusResearchTimeUnit']),
+ 'ShipTime' => array($varsRow['bonusShipTime'], $varsRow['bonusShipTimeUnit']),
+ 'DefensiveTime' => array($varsRow['bonusDefensiveTime'], $varsRow['bonusDefensiveTimeUnit']),
+ 'Resource' => array($varsRow['bonusResource'], $varsRow['bonusResourceUnit']),
+ 'Energy' => array($varsRow['bonusEnergy'], $varsRow['bonusEnergyUnit']),
+ 'ResourceStorage' => array($varsRow['bonusResourceStorage'], $varsRow['bonusResourceStorageUnit']),
+ 'ShipStorage' => array($varsRow['bonusShipStorage'], $varsRow['bonusShipStorageUnit']),
+ 'FlyTime' => array($varsRow['bonusFlyTime'], $varsRow['bonusFlyTimeUnit']),
+ 'FleetSlots' => array($varsRow['bonusFleetSlots'], $varsRow['bonusFleetSlotsUnit']),
+ 'Planets' => array($varsRow['bonusPlanets'], $varsRow['bonusPlanetsUnit']),
+ 'SpyPower' => array($varsRow['bonusSpyPower'], $varsRow['bonusSpyPowerUnit']),
+ 'Expedition' => array($varsRow['bonusExpedition'], $varsRow['bonusExpeditionUnit']),
+ 'GateCoolTime' => array($varsRow['bonusGateCoolTime'], $varsRow['bonusGateCoolTimeUnit']),
+ 'MoreFound' => array($varsRow['bonusMoreFound'], $varsRow['bonusMoreFoundUnit']),
+ ),
+ );
+
+ $ProdGrid[$varsRow['elementID']]['production'] = array(
+ 901 => $varsRow['production901'],
+ 902 => $varsRow['production902'],
+ 903 => $varsRow['production903'],
+ 911 => $varsRow['production911'],
+ );
+
+ $ProdGrid[$varsRow['elementID']]['storage'] = array(
+ 901 => $varsRow['storage901'],
+ 902 => $varsRow['storage902'],
+ 903 => $varsRow['storage903'],
+ );
+
+ if(array_filter($ProdGrid[$varsRow['elementID']]['production']))
+ $reslist['prod'][] = $varsRow['elementID'];
+
+ if(array_filter($ProdGrid[$varsRow['elementID']]['storage']))
+ $reslist['storage'][] = $varsRow['elementID'];
+
+ if(($varsRow['bonusAttack'] + $varsRow['bonusDefensive'] + $varsRow['bonusShield'] + $varsRow['bonusBuildTime'] +
+ $varsRow['bonusResearchTime'] + $varsRow['bonusShipTime'] + $varsRow['bonusDefensiveTime'] + $varsRow['bonusResource'] +
+ $varsRow['bonusEnergy'] + $varsRow['bonusResourceStorage'] + $varsRow['bonusShipStorage'] + $varsRow['bonusFlyTime'] +
+ $varsRow['bonusFleetSlots'] + $varsRow['bonusPlanets'] + $varsRow['bonusSpyPower'] + $varsRow['bonusExpedition'] +
+ $varsRow['bonusGateCoolTime'] + $varsRow['bonusMoreFound']) != 0)
+ {
+ $reslist['bonus'][] = $varsRow['elementID'];
+ }
+ if($varsRow['onePerPlanet'] == 1)
+ $reslist['one'][] = $varsRow['elementID'];
+
+ switch($varsRow['class']) {
+ case 0:
+ $reslist['build'][] = $varsRow['elementID'];
+ $tmp = explode(',', $varsRow['onPlanetType']);
+ foreach($tmp as $type)
+ $reslist['allow'][$type][] = $varsRow['elementID'];
+ break;
+ case 100:
+ $reslist['tech'][] = $varsRow['elementID'];
+ break;
+ case 200:
+ $reslist['fleet'][] = $varsRow['elementID'];
+ break;
+ case 400:
+ $reslist['defense'][] = $varsRow['elementID'];
+ break;
+ case 500:
+ $reslist['missile'][] = $varsRow['elementID'];
+ break;
+ case 600:
+ $reslist['officier'][] = $varsRow['elementID'];
+ break;
+ case 700:
+ $reslist['dmfunc'][] = $varsRow['elementID'];
+ break;
+ }
+ }
+
+ $rapidResult = $GLOBALS['DATABASE']->query("SELECT * FROM ".VARS_RAPIDFIRE.";");
+ while($rapidRow = $GLOBALS['DATABASE']->fetch_array($rapidResult)) {
+ $CombatCaps[$rapidRow['elementID']]['sd'][$rapidRow['rapidfireID']] = $rapidRow['shoots'];
+ }
+
+ return array(
+ 'reslist' => $reslist,
+ 'ProdGrid' => $ProdGrid,
+ 'CombatCaps' => $CombatCaps,
+ 'resource' => $resource,
+ 'pricelist' => $pricelist,
+ 'requeriments' => $requeriments,
+ );
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/cache/ressource/CacheFile.class.php b/includes/classes/cache/ressource/CacheFile.class.php
new file mode 100644
index 0000000..4aab070
--- /dev/null
+++ b/includes/classes/cache/ressource/CacheFile.class.php
@@ -0,0 +1,47 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2013-01-17)
+ * @info $Id$
+ * @link http://2moons.cc/
+ */
+
+class CacheFile {
+ function store($Key, $Value) {
+ file_put_contents(CACHE_PATH.'cache.'.$Key.'.php', $Value);
+ }
+
+ function open($Key) {
+ if(!file_exists(CACHE_PATH.'cache.'.$Key.'.php'))
+ return false;
+
+ return file_get_contents(CACHE_PATH.'cache.'.$Key.'.php');
+ }
+
+ function flush($Key) {
+ if(!file_exists(CACHE_PATH.'cache.'.$Key.'.php'))
+ return false;
+
+ unlink(CACHE_PATH.'cache.'.$Key.'.php');
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/class.BBCode.php b/includes/classes/class.BBCode.php
index 98c524e..ad44ef7 100644
--- a/includes/classes/class.BBCode.php
+++ b/includes/classes/class.BBCode.php
@@ -1975,5 +1975,3 @@ function _dumpToString () {
return $str;
}
}
-
-?>
\ No newline at end of file
diff --git a/includes/classes/class.BuildFunctions.php b/includes/classes/class.BuildFunctions.php
new file mode 100644
index 0000000..b048394
--- /dev/null
+++ b/includes/classes/class.BuildFunctions.php
@@ -0,0 +1,282 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2013-01-17)
+ * @info $Id$
+ * @link http://2moons.cc/
+ */
+
+class BuildFunctions
+{
+
+ static $bonusList = array(
+ 'Attack',
+ 'Defensive',
+ 'Shield',
+ 'BuildTime',
+ 'ResearchTime',
+ 'ShipTime',
+ 'DefensiveTime',
+ 'Resource',
+ 'Energy',
+ 'ResourceStorage',
+ 'ShipStorage',
+ 'FlyTime',
+ 'FleetSlots',
+ 'Planets',
+ 'SpyPower',
+ 'Expedition',
+ 'GateCoolTime',
+ 'MoreFound',
+ );
+
+ public static function getBonusList()
+ {
+ return self::$bonusList;
+ }
+
+ public static function getRestPrice($USER, $PLANET, $Element, $elementPrice = NULL)
+ {
+ global $resource;
+
+ if(!isset($elementPrice)) {
+ $elementPrice = self::getElementPrice($USER, $PLANET, $Element);
+ }
+
+ $overflow = array();
+
+ foreach ($elementPrice as $resType => $resPrice) {
+ $avalible = isset($PLANET[$resource[$resType]]) ? $PLANET[$resource[$resType]] : $USER[$resource[$resType]];
+ $overflow[$resType] = max($resPrice - $avalible, 0);
+ }
+
+ return $overflow;
+ }
+
+ public static function getElementPrice($USER, $PLANET, $Element, $forDestroy = false, $forLevel = NULL) {
+ global $pricelist, $resource, $reslist;
+
+ if (in_array($Element, $reslist['fleet']) || in_array($Element, $reslist['defense'])) {
+ $elementLevel = $forLevel;
+ } elseif (isset($forLevel)) {
+ $elementLevel = $forLevel;
+ } elseif (isset($PLANET[$resource[$Element]])) {
+ $elementLevel = $PLANET[$resource[$Element]];
+ } elseif (isset($USER[$resource[$Element]])) {
+ $elementLevel = $USER[$resource[$Element]];
+ } else {
+ return array();
+ }
+
+ $price = array();
+ foreach ($reslist['ressources'] as $resType)
+ {
+ if (!isset($pricelist[$Element]['cost'][$resType])) {
+ continue;
+ }
+ $ressourceAmount = $pricelist[$Element]['cost'][$resType];
+
+ if ($ressourceAmount == 0) {
+ continue;
+ }
+
+ $price[$resType] = $ressourceAmount;
+
+ if(isset($pricelist[$Element]['factor']) && $pricelist[$Element]['factor'] != 0 && $pricelist[$Element]['factor'] != 1) {
+ $price[$resType] *= pow($pricelist[$Element]['factor'], $elementLevel);
+ }
+
+ if($forLevel && (in_array($Element, $reslist['fleet']) || in_array($Element, $reslist['defense']))) {
+ $price[$resType] *= $elementLevel;
+ }
+
+ if($forDestroy === true) {
+ $price[$resType] /= 2;
+ }
+ }
+
+ return $price;
+ }
+
+ public static function isTechnologieAccessible($USER, $PLANET, $Element)
+ {
+ global $requeriments, $resource;
+
+ if(!isset($requeriments[$Element]))
+ return true;
+
+ foreach($requeriments[$Element] as $ReqElement => $EleLevel)
+ {
+ if (
+ (isset($USER[$resource[$ReqElement]]) && $USER[$resource[$ReqElement]] < $EleLevel) ||
+ (isset($PLANET[$resource[$ReqElement]]) && $PLANET[$resource[$ReqElement]] < $EleLevel)
+ ) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public static function getBuildingTime($USER, $PLANET, $Element, $elementPrice = NULL, $forDestroy = false, $forLevel = NULL)
+ {
+ global $resource, $reslist, $requeriments;
+
+ $CONF = Config::getAll(NULL, $USER['universe']);
+
+ $time = 0;
+
+ if(!isset($elementPrice)) {
+ $elementPrice = self::getElementPrice($USER, $PLANET, $Element, $forDestroy, $forLevel);
+ }
+
+ $elementCost = 0;
+
+ if(isset($elementPrice[901])) {
+ $elementCost += $elementPrice[901];
+ }
+
+ if(isset($elementPrice[902])) {
+ $elementCost += $elementPrice[902];
+ }
+
+ if (in_array($Element, $reslist['build'])) {
+ $time = $elementCost / (Config::get('game_speed') * (1 + $PLANET[$resource[14]])) * pow(0.5, $PLANET[$resource[15]]) * (1 + $USER['factor']['BuildTime']);
+ } elseif (in_array($Element, $reslist['fleet'])) {
+ $time = $elementCost / (Config::get('game_speed') * (1 + $PLANET[$resource[21]])) * pow(0.5, $PLANET[$resource[15]]) * (1 + $USER['factor']['ShipTime']);
+ } elseif (in_array($Element, $reslist['defense'])) {
+ $time = $elementCost / (Config::get('game_speed') * (1 + $PLANET[$resource[21]])) * pow(0.5, $PLANET[$resource[15]]) * (1 + $USER['factor']['DefensiveTime']);
+ } elseif (in_array($Element, $reslist['tech'])) {
+ if(is_numeric($PLANET[$resource[31].'_inter']))
+ {
+ $Level = $PLANET[$resource[31]];
+ } else {
+ $Level = 0;
+ foreach($PLANET[$resource[31].'_inter'] as $Levels)
+ {
+ if(!isset($requeriments[$Element][31]) || $Levels >= $requeriments[$Element][31])
+ $Level += $Levels;
+ }
+ }
+
+ $time = $elementCost / (1000 * (1 + $Level)) / (Config::get('game_speed') / 2500) * pow(1 - Config::get('factor_university') / 100, $PLANET[$resource[6]]) * (1 + $USER['factor']['ResearchTime']);
+ }
+
+ if($forDestroy) {
+ $time = floor($time * 1300);
+ } else {
+ $time = floor($time * 3600);
+ }
+
+ return max($time, Config::get('min_build_time'));
+ }
+
+ public static function isElementBuyable($USER, $PLANET, $Element, $elementPrice = NULL, $forDestroy = false, $forLevel = NULL)
+ {
+ $rest = self::getRestPrice($USER, $PLANET, $Element, $elementPrice, $forDestroy, $forLevel);
+ return count(array_filter($rest)) === 0;
+ }
+
+ public static function getMaxConstructibleElements($USER, $PLANET, $Element, $elementPrice = NULL)
+ {
+ global $resource, $reslist;
+
+ if(!isset($elementPrice)) {
+ $elementPrice = self::getElementPrice($USER, $PLANET, $Element);
+ }
+
+ $maxElement = array();
+
+ foreach($elementPrice as $resourceID => $price)
+ {
+ if(isset($PLANET[$resource[$resourceID]]))
+ {
+ $maxElement[] = floor($PLANET[$resource[$resourceID]] / $price);
+ }
+ elseif(isset($USER[$resource[$resourceID]]))
+ {
+ $maxElement[] = floor($USER[$resource[$resourceID]] / $price);
+ }
+ else
+ {
+ throw new Exception("Unknown Ressource ".$resourceID." at element ".$Element.".");
+ }
+ }
+
+ if(in_array($Element, $reslist['one'])) {
+ $maxElement[] = 1;
+ }
+
+ return min($maxElement);
+ }
+
+ public static function getMaxConstructibleRockets($USER, $PLANET, $Missiles = NULL)
+ {
+ global $resource, $CONF, $reslist;
+
+ if(!isset($Missiles))
+ {
+ $Missiles = array();
+
+ foreach($reslist['missile'] as $elementID)
+ {
+ $Missiles[$elementID] = $PLANET[$resource[$elementID]];
+ }
+ }
+
+ $BuildArray = !empty($PLANET['b_hangar_id']) ? unserialize($PLANET['b_hangar_id']) : array();
+ $MaxMissiles = $PLANET[$resource[44]] * 10 * max(Config::get('silo_factor'), 1);
+
+ foreach($BuildArray as $ElementArray) {
+ if(isset($Missiles[$ElementArray[0]]))
+ $Missiles[$ElementArray[0]] += $ElementArray[1];
+ }
+
+ $ActuMissiles = $Missiles[502] + (2 * $Missiles[503]);
+ $MissilesSpace = max(0, $MaxMissiles - $ActuMissiles);
+
+ return array(
+ 502 => $MissilesSpace,
+ 503 => floor($MissilesSpace / 2),
+ );
+ }
+
+ public static function getAvalibleBonus($Element)
+ {
+ global $pricelist;
+
+ $elementBonus = array();
+
+ foreach(self::$bonusList as $bonus)
+ {
+ $temp = (float) $pricelist[$Element]['bonus'][$bonus][0];
+ if(empty($temp))
+ {
+ continue;
+ }
+
+ $elementBonus[$bonus] = $pricelist[$Element]['bonus'][$bonus];
+ }
+
+ return $elementBonus;
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/class.Cache.php b/includes/classes/class.Cache.php
new file mode 100644
index 0000000..676a31f
--- /dev/null
+++ b/includes/classes/class.Cache.php
@@ -0,0 +1,92 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2013-01-17)
+ * @info $Id$
+ * @link http://2moons.cc/
+ */
+
+include(ROOT_PATH.'includes/classes/cache/ressource/CacheFile.class.php');
+
+class Cache {
+ private $cacheRessource;
+ private $cacheBuilder = array();
+ private $cacheObj = array();
+
+ function __construct() {
+ $this->cacheRessource = new CacheFile();
+ }
+
+ function add($Key, $ClassName) {
+ $this->cacheBuilder[$Key] = $ClassName;
+ }
+
+ function get($Key, $rebuild = true) {
+ if(!isset($this->cacheObj[$Key]) && !$this->load($Key))
+ {
+ if($rebuild)
+ {
+ $this->buildCache($Key);
+ }
+ else
+ {
+ return array();
+ }
+ }
+ return $this->cacheObj[$Key];
+ }
+
+ function flush($Key) {
+ if(!isset($this->cacheObj[$Key]) && !$this->load($Key))
+ $this->buildCache($Key);
+
+ $this->cacheRessource->flush($Key);
+ return $this->buildCache($Key);
+ }
+
+ function load($Key) {
+ $cacheData = $this->cacheRessource->open($Key);
+
+ if($cacheData === false)
+ return false;
+
+ $cacheData = unserialize($cacheData);
+ if($cacheData === false)
+ return false;
+
+ $this->cacheObj[$Key] = $cacheData;
+ return true;
+ }
+
+ function buildCache($Key) {
+ $className = $this->cacheBuilder[$Key];
+ include_once(ROOT_PATH.'includes/classes/cache/builder/'.$className.'.class.php');
+ $cacheBuilder = new $className();
+ $cacheData = $cacheBuilder->buildCache();
+ $cacheData = (array) $cacheData;
+ $this->cacheObj[$Key] = $cacheData;
+ $cacheData = serialize($cacheData);
+ $this->cacheRessource->store($Key, $cacheData);
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/class.MySQLi.php b/includes/classes/class.Database.php
similarity index 79%
rename from includes/classes/class.MySQLi.php
rename to includes/classes/class.Database.php
index 1e7a13b..bc5be8a 100644
--- a/includes/classes/class.MySQLi.php
+++ b/includes/classes/class.Database.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2012 Jan Kröpke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,16 +18,15 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
-class DB_mysqli extends mysqli
+class Database extends mysqli
{
protected $con;
protected $exception;
@@ -43,10 +42,9 @@ class DB_mysqli extends mysqli
*
* @return void
*/
- public function __construct($exception = true)
+ public function __construct()
{
$this->con = $GLOBALS['database'];
- $this->exception = $exception;
if (!isset($this->con['port'])) {
$this->con['port'] = 3306;
@@ -56,24 +54,11 @@ public function __construct($exception = true)
if(mysqli_connect_error())
{
- if($this->exception == true)
- throw new Exception("Connection to database failed: ".mysqli_connect_error());
- elseif(defined('INSTALL'))
- return false;
+ throw new Exception("Connection to database failed: ".mysqli_connect_error());
}
parent::set_charset("utf8");
- parent::query("SET SESSION sql_mode = '';");
- }
-
- /**
- * Close current database connection.
- *
- * @return void
- */
- public function __destruct()
- {
- if(!mysqli_connect_error())
- parent::close();
+ #parent::query("SET SESSION sql_mode = '';");
+ parent::query("SET SESSION sql_mode = 'STRICT_ALL_TABLES';");
}
/**
@@ -92,21 +77,15 @@ public function query($resource)
}
else
{
- if($this->exception == true) {
- throw new Exception("SQL Error: ".$this->error."
Query Code: ".$resource); - } else { - return "SQL Error: ".$this->error; - } + throw new Exception("SQL Error: ".$this->error."
Query Code: ".$resource); } return false; } - /** - * Purpose a query on selected database. - * - * @param string The SQL query - * - * @return resource Results of the query - */ + + public function getFirstRow($resource) + { + return $this->uniquequery($resource); + } public function uniquequery($resource) { @@ -124,6 +103,10 @@ public function uniquequery($resource) * @return resource Results of the query */ + public function getFirstCell($resource) + { + return $this->countquery($resource); + } public function countquery($resource) { $result = $this->query($resource); @@ -162,6 +145,11 @@ public function fetchquery($resource, $encode = array()) * * @return array The data of a row */ + public function fetchArray($result) + { + return $result->fetch_array(MYSQLI_ASSOC); + } + public function fetch_array($result) { return $result->fetch_array(MYSQLI_ASSOC); @@ -186,10 +174,15 @@ public function fetch_num($result) * * @return integer The total row number */ - public function num_rows($query) + public function numRows($query) { return $query->num_rows; } + + public function affectedRows() + { + return $this->affected_rows; + } /** * Returns the total row numbers of a query. @@ -211,6 +204,11 @@ public function GetInsertID() * @return string Returns the escaped string, or false on error. */ + public function escape($string, $flag = false) + { + return $this->sql_escape($string, $flag); + } + public function sql_escape($string, $flag = false) { return ($flag === false) ? parent::escape_string($string): addcslashes(parent::escape_string($string), '%_'); @@ -273,11 +271,7 @@ public function multi_query($resource) if ($this->errno) { - if($this->exception == true) { - throw new Exception("SQL Error: ".$this->error."
Query Code: ".$resource); - } else { - return "SQL Error: ".$this->error; - } + throw new Exception("SQL Error: ".$this->error."
Query Code: ".$resource); } } @@ -286,5 +280,3 @@ public function get_sql() return $this->queryCount; } } - -?> \ No newline at end of file diff --git a/includes/classes/class.FleetFunctions.php b/includes/classes/class.FleetFunctions.php index 259affc..c6af3db 100644 --- a/includes/classes/class.FleetFunctions.php +++ b/includes/classes/class.FleetFunctions.php @@ -2,7 +2,7 @@ /** * 2Moons - * Copyright (C) 2011 Slaver + * Copyright (C) 2012 Jan Kröpke * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,17 +18,18 @@ * along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
-abstract class FleetFunctions
+class FleetFunctions
{
+ static $allowedSpeed = array(10 => 100, 9 => 90, 8 => 80, 7 => 70, 6 => 60, 5 => 50, 4 => 40, 3 => 30, 2 => 20, 1 => 10);
+
private static function GetShipConsumption($Ship, $Player)
{
global $pricelist;
@@ -38,58 +39,97 @@ private static function GetShipConsumption($Ship, $Player)
private static function OnlyShipByID($Ships, $ShipID)
{
- foreach($Ships as $Ship => $Amount){
- if($ShipID != $Ship && $Amount != 0) return false;
- }
-
- return true;
+ return isset($Ships[$ShipID]) && count($Ships) === 1;
}
private static function GetShipSpeed($Ship, $Player)
{
global $pricelist;
- if($pricelist[$Ship]['tech'] == 1) // Combustion
- return $pricelist[$Ship]['speed'] * (1 + (0.1 * $Player['combustion_tech']));
- elseif($pricelist[$Ship]['tech'] == 2) // Impulse
- return $pricelist[$Ship]['speed'] * (1 + (0.2 * $Player['impulse_motor_tech']));
- elseif($pricelist[$Ship]['tech'] == 3) // Hyperspace
- return $pricelist[$Ship]['speed'] * (1 + (0.3 * $Player['hyperspace_motor_tech']));
- elseif($pricelist[$Ship]['tech'] == 4) // Special: Small Transporter
- return (($Player['impulse_motor_tech'] >= 5) ? $pricelist[$Ship]['speed2'] * (1 + (0.2 * $Player['impulse_motor_tech'])) : $pricelist[$Ship]['speed'] * (1 + (0.1 * $Player['combustion_tech'])));
- elseif($pricelist[$Ship]['tech'] == 5) // Special: Battleship
- return (($Player['hyperspace_motor_tech'] >= 8) ? $pricelist[$Ship]['speed2'] * (1 + (0.3 * $Player['hyperspace_motor_tech'])) : $pricelist[$Ship]['speed'] * (1 + (0.2 * $Player['impulse_motor_tech'])));
- else
- return 0;
+
+ $techSpeed = $pricelist[$Ship]['tech'];
+
+ if($techSpeed == 4) {
+ $techSpeed = $Player['impulse_motor_tech'] >= 5 ? 2 : 1;
+ }
+ if($techSpeed == 5) {
+ $techSpeed = $Player['hyperspace_motor_tech'] >= 8 ? 3 : 2;
+ }
+
+
+ switch($techSpeed)
+ {
+ case 1:
+ $speed = $pricelist[$Ship]['speed'] * (1 + (0.1 * $Player['combustion_tech']));
+ break;
+ case 2:
+ $speed = $pricelist[$Ship]['speed'] * (1 + (0.2 * $Player['impulse_motor_tech']));
+ break;
+ case 3:
+ $speed = $pricelist[$Ship]['speed'] * (1 + (0.3 * $Player['hyperspace_motor_tech']));
+ break;
+ default:
+ $speed = 0;
+ break;
+ }
+
+ return $speed;
+ }
+
+ public static function getExpeditionLimit($USER)
+ {
+ return floor(sqrt($USER[$GLOBALS['resource'][124]]));
}
- public static function GetAvailableSpeeds()
+ public static function getDMMissionLimit($USER)
{
- return array(10 => 100, 9 => 90, 8 => 80, 7 => 70, 6 => 60, 5 => 50, 4 => 40, 3 => 30, 2 => 20, 1 => 10);
+ return Config::get('max_dm_missions');
}
- public static function CheckUserSpeed($GenFleetSpeed)
+ public static function getMissileRange($Level)
{
- return (array_key_exists($GenFleetSpeed, self::GetAvailableSpeeds())) ? true : false;
+ return max(($Level * 5) - 1, 0);
+ }
+
+ public static function CheckUserSpeed($speed)
+ {
+ return isset(self::$allowedSpeed[$speed]);
}
- public static function GetTargetDistance ($OrigGalaxy, $DestGalaxy, $OrigSystem, $DestSystem, $OrigPlanet, $DestPlanet)
+ public static function GetTargetDistance($start, $target)
{
- if (($OrigGalaxy - $DestGalaxy) != 0)
- $distance = abs($OrigGalaxy - $DestGalaxy) * 20000;
- elseif (($OrigSystem - $DestSystem) != 0)
- $distance = abs($OrigSystem - $DestSystem) * 95 + 2700;
- elseif (($OrigPlanet - $DestPlanet) != 0)
- $distance = abs($OrigPlanet - $DestPlanet) * 5 + 1000;
- else
- $distance = 5;
+ if ($start[0] != $target[0])
+ return abs($start[0] - $target[0]) * 20000;
+
+ if ($start[1] != $target[1])
+ return abs($start[1] - $target[1]) * 95 + 2700;
+
+ if ($start[2] != $target[2])
+ return abs($start[2] - $target[2]) * 5 + 1000;
- return $distance;
+ return 5;
}
- public static function GetMissionDuration($SpeedFactor, $MaxFleetSpeed, $Distance, $GameSpeed, $CurrentUser)
+ public static function GetMissionDuration($SpeedFactor, $MaxFleetSpeed, $Distance, $GameSpeed, $USER)
{
- global $resource;
- return max(((((3500 / ($SpeedFactor * 0.1)) * pow($Distance * 10 / $MaxFleetSpeed, 0.5) + 10)) / $GameSpeed), 5);
+ $SpeedFactor = (3500 / ($SpeedFactor * 0.1));
+ $SpeedFactor *= pow($Distance * 10 / $MaxFleetSpeed, 0.5);
+ $SpeedFactor += 10;
+ $SpeedFactor /= $GameSpeed;
+
+ if(isset($USER['factor']['FlyTime']))
+ {
+ $SpeedFactor *= max(0, 1 + $USER['factor']['FlyTime']);
+ }
+
+ return max($SpeedFactor, MIN_FLEET_TIME);
+ }
+
+ public static function GetMIPDuration($startSystem, $targetSystem)
+ {
+ $Distance = abs($startSystem - $targetSystem);
+ $Duration = max(round((30 + 60 * $Distance) / self::GetGameSpeedFactor()), MIN_FLEET_TIME);
+
+ return $Duration;
}
public static function GetGameSpeedFactor()
@@ -97,10 +137,10 @@ public static function GetGameSpeedFactor()
return $GLOBALS['CONF']['fleet_speed'] / 2500;
}
- public static function GetMaxFleetSlots($CurrentUser)
+ public static function GetMaxFleetSlots($USER)
{
- global $resource, $pricelist;
- return (1 + $CurrentUser[$resource[108]]) + ($CurrentUser['rpg_commandant'] * $pricelist[611]['info']);
+ global $resource;
+ return 1 + $USER[$resource[108]] + $USER['factor']['FleetSlots'];
}
public static function GetFleetRoom($Fleet)
@@ -116,8 +156,6 @@ public static function GetFleetRoom($Fleet)
public static function GetFleetMaxSpeed ($Fleets, $Player)
{
- global $reslist, $pricelist;
-
$FleetArray = (!is_array($Fleets)) ? array($Fleets => 1) : $Fleets;
$speedalls = array();
@@ -125,160 +163,121 @@ public static function GetFleetMaxSpeed ($Fleets, $Player)
$speedalls[$Ship] = self::GetShipSpeed($Ship, $Player);
}
- return (is_array($Fleets)) ? min($speedalls) : $speedalls[$Ship];
+ return min($speedalls);
}
public static function GetFleetConsumption($FleetArray, $MissionDuration, $MissionDistance, $FleetMaxSpeed, $Player, $GameSpeed)
{
$consumption = 0;
- $basicConsumption = 0;
foreach ($FleetArray as $Ship => $Count)
{
- $ShipSpeed = self::GetShipSpeed($Ship, $Player);
- $ShipConsumption = self::GetShipConsumption($Ship, $Player);
- $spd = 35000 / (round($MissionDuration, 0) * $GameSpeed - 10) * sqrt($MissionDistance * 10 / $ShipSpeed);
- $basicConsumption = $ShipConsumption * $Count;
- $consumption += $basicConsumption * $MissionDistance / 35000 * (($spd / 10) + 1) * (($spd / 10) + 1);
+ $ShipSpeed = self::GetShipSpeed($Ship, $Player);
+ $ShipConsumption = self::GetShipConsumption($Ship, $Player);
+
+ $spd = 35000 / (round($MissionDuration, 0) * $GameSpeed - 10) * sqrt($MissionDistance * 10 / $ShipSpeed);
+ $basicConsumption = $ShipConsumption * $Count;
+ $consumption += $basicConsumption * $MissionDistance / 35000 * (($spd / 10) + 1) * (($spd / 10) + 1);
}
return (round($consumption) + 1);
}
- public static function GetFleetArray($FleetArray)
- {
- $FleetArray = unserialize(base64_decode(str_rot13($FleetArray)));
- if(!is_array($FleetArray))
- self::GotoFleetPage();
-
- return $FleetArray;
- }
-
- public static function SetFleetArray($FleetArray)
- {
- return str_rot13(base64_encode(serialize($FleetArray)));
- }
-
- public static function CleanFleetArray(&$FleetArray)
- {
- foreach($FleetArray as $ShipID => $Count) {
- if ($Count <= 0) unset($FleetArray[$ShipID]);
- }
- }
-
- public static function GetFleetMissions($MisInfo)
+ public static function GetFleetMissions($USER, $MisInfo, $Planet)
{
- global $LNG, $resource, $CONF;
- $Missions = self::GetAvailableMissions($MisInfo);
-
- if (!empty($Missions[15])) {
- for($i = 1;$i <= $MisInfo['CurrentUser'][$resource[124]];$i++) {
- $StayBlock[$i] = $i / $CONF['halt_speed'];
+ global $resource, $CONF;
+ $Missions = self::GetAvailableMissions($USER, $MisInfo, $Planet);
+ $stayBlock = array();;
+ if (in_array(15, $Missions)) {
+ for($i = 1;$i <= $USER[$resource[124]];$i++) {
+ $stayBlock[$i] = round($i / Config::get('halt_speed'), 2);
}
}
- elseif(!empty($Missions[5]))
- $StayBlock = array(1 => 1, 2 => 2, 4 => 4, 8 => 8, 12 => 12, 16 => 16, 32 => 32);
-
-
- return array('MissionSelector' => $Missions, 'StayBlock' => $StayBlock);
- }
- public static function GetUserShotcut($CurrentUser)
- {
- $Shoutcut = unserialize($CurrentUser['fleet_shortcut']);
- if (empty($Shoutcut))
- return array();
-
- $ShortCutList = array();
-
- foreach ($Shoutcut as $ShortCutRow)
- {
- $ShortCutList[] = array(
- 'name' => $ShortCutRow[0],
- 'galaxy' => $ShortCutRow[1],
- 'system' => $ShortCutRow[2],
- 'planet' => $ShortCutRow[3],
- 'planet_type' => $ShortCutRow[4],
- );
+ elseif(in_array(11, $Missions))
+ {
+ $stayBlock = array(1 => 1);
+ }
+ elseif(in_array(5, $Missions))
+ {
+ $stayBlock = array(1 => 1, 2 => 2, 4 => 4, 8 => 8, 12 => 12, 16 => 16, 32 => 32);
}
- return $ShortCutList;
+
+ return array('MissionSelector' => $Missions, 'StayBlock' => $stayBlock);
}
- public static function GetColonyList($Colony)
+ public static function GetACSDuration($FleetGroup)
{
- global $PLANET;
- foreach($Colony as $CurPlanetID => $CurPlanet)
- {
- if ($PLANET['id'] == $CurPlanet['id'])
- continue;
-
- $ColonyList[] = array(
- 'name' => $CurPlanet['name'],
- 'galaxy' => $CurPlanet['galaxy'],
- 'system' => $CurPlanet['system'],
- 'planet' => $CurPlanet['planet'],
- 'planet_type' => $CurPlanet['planet_type'],
- );
- }
+ if(empty($FleetGroup))
+ return 0;
- return $ColonyList;
+ $GetAKS = $GLOBALS['DATABASE']->getFirstCell("SELECT ankunft FROM ".AKS." WHERE id = ".$FleetGroup.";");
+
+ return !empty($GetAKS) ? $GetAKS - TIMESTAMP : 0;
}
- public static function IsAKS($CurrentUserID)
+ public static function setACSTime($timeDifference, $FleetGroup)
{
- global $db, $CONF;
-
- $GetAKS = $db->query("SELECT a.`id`, a.`name`, p.`galaxy`, p.`system`, p.`planet`, p.`planet_type` FROM ".AKS." a INNER JOIN ".PLANETS." p ON p.id = a.target WHERE a.`eingeladen` LIKE '%,".$CurrentUserID.",%' AND '".$CONF['max_fleets_per_acs']."' > (SELECT COUNT(*) FROM ".FLEETS." WHERE `fleet_group` = a.`id`);");
- $AKSList = array();
- while($row = $db->fetch_array($GetAKS))
- $AKSList[] = $row;
-
- $db->free_result($GetAKS);
-
- return $AKSList;
+ if(empty($FleetGroup))
+ return false;
+
+ $GLOBALS['DATABASE']->multi_query("UPDATE ".AKS." SET ankunft = ankunft + ".$timeDifference." WHERE id = ".$FleetGroup.";
+ UPDATE ".FLEETS.", ".FLEETS_EVENT." SET
+ fleet_start_time = fleet_start_time + ".$timeDifference.",
+ fleet_end_stay = fleet_end_stay + ".$timeDifference.",
+ fleet_end_time = fleet_end_time + ".$timeDifference.",
+ time = time + ".$timeDifference."
+ WHERE fleet_group = ".$FleetGroup." AND fleet_id = fleetID;");
+
+ return true;
}
- public static function GetCurrentFleets($CurrentUserID, $Mission = 0)
+ public static function GetCurrentFleets($USERID, $Mission = 0)
{
- global $db;
-
- $ActualFleets = $db->uniquequery("SELECT COUNT(*) as state FROM ".FLEETS." WHERE `fleet_owner` = '".$CurrentUserID."' AND ".(($Mission != 0)?"`fleet_mission` = '".$Mission."'":"`fleet_mission` != 10").";");
+
+ $ActualFleets = $GLOBALS['DATABASE']->getFirstRow("SELECT COUNT(*) as state FROM ".FLEETS." WHERE fleet_owner = '".$USERID."' AND ".(($Mission != 0)?"fleet_mission = '".$Mission."'":"fleet_mission != 10").";");
return $ActualFleets['state'];
}
- public static function SendFleetBack($CurrentUser, $FleetID)
+ public static function SendFleetBack($USER, $FleetID)
{
- global $db;
+
- $FleetRow = $db->uniquequery("SELECT `start_time`, `fleet_mission`, `fleet_group`, `fleet_owner`, `fleet_mess` FROM ".FLEETS." WHERE `fleet_id` = '". $FleetID ."';");
- if ($FleetRow['fleet_owner'] != $CurrentUser['id'] || $FleetRow['fleet_mess'] == 1)
+ $FleetRow = $GLOBALS['DATABASE']->getFirstRow("SELECT start_time, fleet_mission, fleet_group, fleet_owner, fleet_mess FROM ".FLEETS." WHERE fleet_id = '". $FleetID ."';");
+ if ($FleetRow['fleet_owner'] != $USER['id'] || $FleetRow['fleet_mess'] == 1)
return;
- $where = 'fleet_id';
+ $sqlWhere = 'fleet_id';
- if($FleetRow['fleet_mission'] == 1 && $FleetRow['fleet_group'] > 0)
+ if($FleetRow['fleet_mission'] == 1 && $FleetRow['fleet_group'] != 0)
{
- $Aks = $db->countquery("SELECT FIND_IN_SET('".$FleetRow['fleet_owner']."', `eingeladen`) FROM ".AKS." WHERE id = '". $FleetRow['fleet_group'] ."';");
+ $acsResult = $GLOBALS['DATABASE']->getFirstCell("SELECT COUNT(*) FROM ".USERS_ACS." WHERE acsID = ".$FleetRow['fleet_group'].";");
- if($Aks != 0)
+ if($acsResult != 0)
{
- $db->query("DELETE FROM ".AKS." WHERE id ='". $FleetRow['fleet_group'] ."';");
+ $GLOBALS['DATABASE']->multi_query("DELETE FROM ".AKS." WHERE id = ".$FleetRow['fleet_group'].";
+ DELETE FROM ".USERS_ACS." WHERE acsID = ".$FleetRow['fleet_group'].";");
+
$FleetID = $FleetRow['fleet_group'];
- $where = 'fleet_group';
+ $sqlWhere = 'fleet_group';
}
}
- $db->multi_query("UPDATE ".FLEETS." SET
- `fleet_group` = 0,
- `fleet_end_stay` = ".TIMESTAMP.",
- `fleet_end_time` = ".((TIMESTAMP - $FleetRow['start_time']) + TIMESTAMP).",
- `fleet_mess` = 1
- WHERE `".$where."` = '".$FleetID."';
- UPDATE ".LOG_FLEETS." SET
- `fleet_end_stay` = ".TIMESTAMP.",
- `fleet_end_time` = ".((TIMESTAMP - $FleetRow['start_time']) + TIMESTAMP).",
- `fleet_mess` = 1,
- `fleet_state` = 2
- WHERE `".$where."` = '".$FleetID."';");
+ $fleetEndTime = (TIMESTAMP - $FleetRow['start_time']) + TIMESTAMP;
+
+ $GLOBALS['DATABASE']->multi_query("UPDATE ".FLEETS.", ".FLEETS_EVENT." SET
+ fleet_group = 0,
+ fleet_end_stay = ".TIMESTAMP.",
+ fleet_end_time = ".$fleetEndTime.",
+ fleet_mess = 1,
+ hasCanceled = 1,
+ time = ".$fleetEndTime."
+ WHERE ".$sqlWhere." = ".$FleetID." AND fleet_id = fleetID;
+ UPDATE ".LOG_FLEETS." SET
+ fleet_end_stay = ".TIMESTAMP.",
+ fleet_end_time = ".$fleetEndTime.",
+ fleet_mess = 1,
+ fleet_state = 2
+ WHERE ".$sqlWhere." = ".$FleetID.";");
}
public static function GetFleetShipInfo($FleetArray, $Player)
@@ -290,188 +289,151 @@ public static function GetFleetShipInfo($FleetArray, $Player)
return $FleetInfo;
}
- public static function GotoFleetPage()
+ public static function GotoFleetPage($Code = 0)
{
+ global $LNG;
$temp = debug_backtrace();
if($GLOBALS['CONF']['debug'] == 1)
- FirePHP::getInstance(true)->log(str_replace($_SERVER["DOCUMENT_ROOT"],'.',$temp[0]['file'])." on ".$temp[0]['line']);
-
- redirectTo("game.php?page=fleet");
- }
-
- public static function GetAKSPage($CurrentUser, $CurrentPlanet, $fleetid)
- {
- global $resource, $pricelist, $reslist, $LNG, $db, $UNI;
-
- $addname = request_var('addtogroup', '', UTF8_SUPPORT);
- $aks_invited_mr = request_var('aks_invited_mr', 0);
- $name = request_var('name', '', UTF8_SUPPORT);
-
-
- $query = $db->query("SELECT * FROM ".FLEETS." WHERE fleet_id = '" . $fleetid . "';");
-
- if ($db->num_rows($query) != 1)
- self::GotoFleetPage();
-
- $daten = $db->fetch_array($query);
-
- if ($daten['fleet_start_time'] <= TIMESTAMP || $daten['fleet_end_time'] < TIMESTAMP || $daten['fleet_mess'] == 1)
- self::GotoFleetPage();
-
- if (empty($daten['fleet_group']))
- {
- $rand = mt_rand(100000, 999999999);
- $aks_code_mr = "AG".$rand;
- $aks_invited_mr = $CurrentUser['id'];
-
- $db->query(
- "INSERT INTO ".AKS." SET
- `name` = '" . $aks_code_mr . "',
- `ankunft` = '" . $daten['fleet_start_time'] . "',
- `target` = '" . $daten['fleet_end_id'] . "',
- `eingeladen` = ',".$aks_invited_mr.",';
- ");
-
- $db->query("UPDATE ".FLEETS." SET
- `fleet_group` = ".$db->GetInsertID()."
- WHERE
- `fleet_id` = '" . $fleetid . "';");
-
- $aks = array(
- 'name' => $aks_code_mr,
- 'eingeladen' => $CurrentUser['id'],
- );
- }
- else
- {
- $AKSRAW = $db->query("SELECT `id`, `eingeladen`, `name` FROM ".AKS." WHERE `id` = '" . $daten['fleet_group'] . "';");
-
- if ($db->num_rows($AKSRAW) != 1)
- self::GotoFleetPage();
-
- $aks = $db->fetch_array($AKSRAW);
- }
-
- if(!empty($name)) {
- if(UTF8_SUPPORT && !ctype_alnum($name)) {
- exit($LNG['fl_acs_newname_alphanum']);
- }
- $db->query("UPDATE ".AKS." SET `name` = '".$db->sql_escape($name)."' WHERE `id` = '".$daten['fleet_group']."';");
- exit;
- }
-
- if(!empty($addname))
- {
- $member_qry_mr = $db->uniquequery("SELECT `id` FROM ".USERS." WHERE `username` = '".$db->sql_escape($addname)."' AND `universe` = ".$UNI.";");
- $added_user_id_mr = $member_qry_mr['id'];
-
- foreach(explode(",", $aks['eingeladen']) as $a => $b)
- {
- if (!empty($b) && $added_user_id_mr == $b)
- redirectTo("game.php?page=fleet&action=getakspage&fleetid=".$daten['fleet_id']);
- }
-
- if(empty($added_user_id_mr))
- $add_user_message_mr = "".$LNG['fl_player']." ".$addname." ".$LNG['fl_dont_exist'];
- else
- {
- $aks['eingeladen'] = $aks['eingeladen'].$added_user_id_mr.',';
- $db->query("UPDATE ".AKS." SET `eingeladen` = '".$aks['eingeladen']."' WHERE `id` = '".$daten['fleet_group']."';");
- $add_user_message_mr = "".$LNG['fl_player']." ".$addname." ". $LNG['fl_add_to_attack'];
- $invite_message = $LNG['fl_player'] . $CurrentUser['username'] . $LNG['fl_acs_invitation_message'];
- SendSimpleMessage ($added_user_id_mr, $CurrentUser['id'], TIMESTAMP, 1, $CurrentUser['username'], $LNG['fl_acs_invitation_title'], $invite_message);
- }
- }
- $members = explode(",", $aks['eingeladen']);
- foreach($members as $a => $b)
{
- if (empty($b))
- continue;
-
- $member_qry_mr = $db->query("SELECT `username` FROM ".USERS." WHERE `id` ='".$b."' ;");
- while($row = $db->fetch_array($member_qry_mr))
- {
- $pageDos .= "";
- }
+ exit(str_replace($_SERVER["DOCUMENT_ROOT"],'.',$temp[0]['file'])." on ".$temp[0]['line']. " | Code: ".$Code." | Error: ".(isset($LNG['fl_send_error'][$Code]) ? $LNG['fl_send_error'][$Code] : ''));
}
-
- $AKSArray = array(
- 'selector' => $pageDos,
- 'fleetid' => $fleetid,
- 'aks_invited_mr' => $aks['eingeladen'],
- 'aks_code_mr' => $aks['name'],
- 'add_user_message_mr' => $add_user_message_mr,
- 'fl_acs_change' => $LNG['fl_acs_change'],
- 'fl_acs_change_name' => $LNG['fl_acs_change_name'],
- 'fl_invite_members' => $LNG['fl_invite_members'],
- 'fl_members_invited' => $LNG['fl_members_invited'],
- 'fl_modify_sac_name' => $LNG['fl_modify_sac_name'],
- 'fl_sac_of_fleet' => $LNG['fl_sac_of_fleet'],
- 'fl_continue' => $LNG['fl_continue'],
- );
- return $AKSArray;
+
+ HTTP::redirectTo('game.php?page=fleetTable&code='.$Code);
}
- public static function GetAvailableMissions($MissionInfo)
- {
- global $LNG, $db, $UNI, $CONF;
- $GetInfoPlanet = $db->uniquequery("SELECT `id_owner`, `der_metal`, `der_crystal` FROM `".PLANETS."` WHERE `universe` = '".$UNI."' AND `galaxy` = ".$MissionInfo['galaxy']." AND `system` = ".$MissionInfo['system']." AND `planet` = ".$MissionInfo['planet']." AND `planet_type` = '1';");
- $YourPlanet = (isset($GetInfoPlanet['id_owner']) && $GetInfoPlanet['id_owner'] == $MissionInfo['CurrentUser']['id']) ? true : false;
- $UsedPlanet = (isset($GetInfoPlanet['id_owner'])) ? true : false;
- $missiontype = array();
+ public static function GetAvailableMissions($USER, $MissionInfo, $GetInfoPlanet)
+ {
+ global $CONF;
+ $YourPlanet = (!empty($GetInfoPlanet['id_owner']) && $GetInfoPlanet['id_owner'] == $USER['id']) ? true : false;
+ $UsedPlanet = (!empty($GetInfoPlanet['id_owner'])) ? true : false;
+ $avalibleMissions = array();
- if ($MissionInfo['planet'] == ($CONF['max_planets'] + 1) && !CheckModule(30))
- $missiontype[15] = $LNG['type_mission'][15];
+ if ($MissionInfo['planet'] == (Config::get('max_planets') + 1) && isModulAvalible(MODULE_MISSION_EXPEDITION))
+ $avalibleMissions[] = 15;
elseif ($MissionInfo['planettype'] == 2) {
- if ((isset($MissionInfo['Ship'][209]) || isset($MissionInfo['Ship'][219])) && !CheckModule(32) && !($GetInfoPlanet['der_metal'] == 0 && $GetInfoPlanet['der_crystal'] == 0))
- $missiontype[8] = $LNG['type_mission'][8];
+ if ((isset($MissionInfo['Ship'][209]) || isset($MissionInfo['Ship'][219])) && isModulAvalible(MODULE_MISSION_RECYCLE) && !($GetInfoPlanet['der_metal'] == 0 && $GetInfoPlanet['der_crystal'] == 0))
+ $avalibleMissions[] = 8;
} else {
if (!$UsedPlanet) {
- if (isset($MissionInfo['Ship'][208]) && $MissionInfo['planettype'] == 1 && !CheckModule(35))
- $missiontype[7] = $LNG['type_mission'][7];
+ if (isset($MissionInfo['Ship'][208]) && $MissionInfo['planettype'] == 1 && isModulAvalible(MODULE_MISSION_COLONY))
+ $avalibleMissions[] = 7;
} else {
- if(!CheckModule(34))
- $missiontype[3] = $LNG['type_mission'][3];
+ if(isModulAvalible(MODULE_MISSION_TRANSPORT))
+ $avalibleMissions[] = 3;
- if (!$YourPlanet && self::OnlyShipByID($MissionInfo['Ship'], 210) && !CheckModule(24))
- $missiontype[6] = $LNG['type_mission'][6];
+ if (!$YourPlanet && self::OnlyShipByID($MissionInfo['Ship'], 210) && isModulAvalible(MODULE_MISSION_SPY))
+ $avalibleMissions[] = 6;
if (!$YourPlanet) {
- if(!CheckModule(1))
- $missiontype[1] = $LNG['type_mission'][1];
- if(!CheckModule(33))
- $missiontype[5] = $LNG['type_mission'][5];}
+ if(isModulAvalible(MODULE_MISSION_ATTACK))
+ $avalibleMissions[] = 1;
+ if(isModulAvalible(MODULE_MISSION_HOLD))
+ $avalibleMissions[] = 5;}
- elseif(!CheckModule(36)) {
- $missiontype[4] = $LNG['type_mission'][4];}
+ elseif(isModulAvalible(MODULE_MISSION_STATION)) {
+ $avalibleMissions[] = 4;}
- if (!empty($MissionInfo['IsAKS']) && !$YourPlanet && !CheckModule(1))
- $missiontype[2] = $LNG['type_mission'][2];
+ if (!empty($MissionInfo['IsAKS']) && !$YourPlanet && isModulAvalible(MODULE_MISSION_ATTACK) && isModulAvalible(MODULE_MISSION_ACS))
+ $avalibleMissions[] = 2;
- if (!$YourPlanet && $MissionInfo['planettype'] == 3 && isset($MissionInfo['Ship'][214]) && !CheckModule(29))
- $missiontype[9] = $LNG['type_mission'][9];
+ if (!$YourPlanet && $MissionInfo['planettype'] == 3 && isset($MissionInfo['Ship'][214]) && isModulAvalible(MODULE_MISSION_DESTROY))
+ $avalibleMissions[] = 9;
- if ($YourPlanet && $MissionInfo['planettype'] == 3 && self::OnlyShipByID($MissionInfo['Ship'], 220) && !CheckModule(31))
- $missiontype[11] = $LNG['type_mission'][11];
+ if ($YourPlanet && $MissionInfo['planettype'] == 3 && self::OnlyShipByID($MissionInfo['Ship'], 220) && isModulAvalible(MODULE_MISSION_DARKMATTER))
+ $avalibleMissions[] = 11;
}
}
- return $missiontype;
+ return $avalibleMissions;
}
public static function CheckBash($Target)
{
- global $db, $USER;
+ global $USER;
if(!BASH_ON)
return false;
- $Count = $db->countquery("SELECT COUNT(*) FROM `uni1_log_fleets`
- WHERE `fleet_owner` = ".$USER['id']."
- AND `fleet_end_id` = ".$Target."
- AND `fleet_state` != 2
- AND `fleet_start_time` > ".(TIMESTAMP - BASH_TIME)."
- AND `fleet_mission` IN (1,2,9);");
+ $Count = $GLOBALS['DATABASE']->getFirstCell("SELECT COUNT(*) FROM ".LOG_FLEETS."
+ WHERE fleet_owner = ".$USER['id']."
+ AND fleet_end_id = ".$Target."
+ AND fleet_state != 2
+ AND fleet_start_time > ".(TIMESTAMP - BASH_TIME)."
+ AND fleet_mission IN (1,2,9);");
return $Count >= BASH_COUNT;
}
-}
-?>
\ No newline at end of file
+
+ public static function sendFleet($fleetArray, $fleetMission, $fleetStartOwner, $fleetStartPlanetID, $fleetStartPlanetGalaxy, $fleetStartPlanetSystem, $fleetStartPlanetPlanet, $fleetStartPlanetType, $fleetTargetOwner, $fleetTargetPlanetID, $fleetTargetPlanetGalaxy, $fleetTargetPlanetSystem, $fleetTargetPlanetPlanet, $fleetTargetPlanetType, $fleetRessource, $fleetStartTime, $fleetStayTime, $fleetEndTime, $fleetGroup = 0, $missleTarget = 0)
+ {
+ global $resource, $UNI;
+ $fleetShipCount = array_sum($fleetArray);
+ $fleetData = array();
+ $planetQuery = "";
+ foreach($fleetArray as $ShipID => $ShipCount) {
+ $fleetData[] = $ShipID.','.floattostring($ShipCount);
+ $planetQuery[] = $resource[$ShipID]." = ".$resource[$ShipID]." - ".floattostring($ShipCount);
+ }
+
+ $SQL = "LOCK TABLE ".LOG_FLEETS." WRITE, ".FLEETS_EVENT." WRITE, ".FLEETS." WRITE, ".PLANETS." WRITE;
+ UPDATE ".PLANETS." SET ".implode(", ", $planetQuery)." WHERE id = ".$fleetStartPlanetID.";
+ INSERT INTO ".FLEETS." SET
+ fleet_owner = ".$fleetStartOwner.",
+ fleet_target_owner = ".$fleetTargetOwner.",
+ fleet_mission = ".$fleetMission.",
+ fleet_amount = ".$fleetShipCount.",
+ fleet_array = '".implode(';',$fleetData)."',
+ fleet_universe = ".$UNI.",
+ fleet_start_time = ".$fleetStartTime.",
+ fleet_end_stay = ".$fleetStayTime.",
+ fleet_end_time = ".$fleetEndTime.",
+ fleet_start_id = ".$fleetStartPlanetID.",
+ fleet_start_galaxy = ".$fleetStartPlanetGalaxy.",
+ fleet_start_system = ".$fleetStartPlanetSystem.",
+ fleet_start_planet = ".$fleetStartPlanetPlanet.",
+ fleet_start_type = ".$fleetStartPlanetType.",
+ fleet_end_id = ".$fleetTargetPlanetID.",
+ fleet_end_galaxy = ".$fleetTargetPlanetGalaxy.",
+ fleet_end_system = ".$fleetTargetPlanetSystem.",
+ fleet_end_planet = ".$fleetTargetPlanetPlanet.",
+ fleet_end_type = ".$fleetTargetPlanetType.",
+ fleet_resource_metal = ".$fleetRessource[901].",
+ fleet_resource_crystal = ".$fleetRessource[902].",
+ fleet_resource_deuterium = ".$fleetRessource[903].",
+ fleet_group = ".$fleetGroup.",
+ fleet_target_obj = ".$missleTarget.",
+ start_time = ".TIMESTAMP.";
+ SET @fleetID = LAST_INSERT_ID();
+ INSERT INTO ".FLEETS_EVENT." SET
+ fleetID = @fleetID,
+ `time` = ".$fleetStartTime.";
+ INSERT INTO ".LOG_FLEETS." SET
+ fleet_id = @fleetID,
+ fleet_owner = ".$fleetStartOwner.",
+ fleet_target_owner = ".$fleetTargetOwner.",
+ fleet_mission = ".$fleetMission.",
+ fleet_amount = ".$fleetShipCount.",
+ fleet_array = '".implode(',',$fleetData)."',
+ fleet_universe = ".$UNI.",
+ fleet_start_time = ".$fleetStartTime.",
+ fleet_end_stay = ".$fleetStayTime.",
+ fleet_end_time = ".$fleetEndTime.",
+ fleet_start_id = ".$fleetStartPlanetID.",
+ fleet_start_galaxy = ".$fleetStartPlanetGalaxy.",
+ fleet_start_system = ".$fleetStartPlanetSystem.",
+ fleet_start_planet = ".$fleetStartPlanetPlanet.",
+ fleet_start_type = ".$fleetStartPlanetType.",
+ fleet_end_id = ".$fleetTargetPlanetID.",
+ fleet_end_galaxy = ".$fleetTargetPlanetGalaxy.",
+ fleet_end_system = ".$fleetTargetPlanetSystem.",
+ fleet_end_planet = ".$fleetTargetPlanetPlanet.",
+ fleet_end_type = ".$fleetTargetPlanetType.",
+ fleet_resource_metal = ".$fleetRessource[901].",
+ fleet_resource_crystal = ".$fleetRessource[902].",
+ fleet_resource_deuterium = ".$fleetRessource[903].",
+ fleet_group = ".$fleetGroup.",
+ fleet_target_obj = ".$missleTarget.",
+ start_time = ".TIMESTAMP.";
+ UNLOCK TABLES;";
+
+ $GLOBALS['DATABASE']->multi_query($SQL);
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/class.FlyingFleetHandler.php b/includes/classes/class.FlyingFleetHandler.php
index 7ce8659..e83d7a0 100644
--- a/includes/classes/class.FlyingFleetHandler.php
+++ b/includes/classes/class.FlyingFleetHandler.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2012 Jan Kröpke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,75 +18,88 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
-if (!defined('INSIDE')) die(header("location:../../"));
-
class FlyingFleetHandler
{
- function __construct($fleetquery)
- {
- global $db;
- $MissionsPattern = array(
- 1 => 'MissionCaseAttack',
- 2 => 'MissionCaseACS',
- 3 => 'MissionCaseTransport',
- 4 => 'MissionCaseStay',
- 5 => 'MissionCaseStayAlly',
- 6 => 'MissionCaseSpy',
- 7 => 'MissionCaseColonisation',
- 8 => 'MissionCaseRecycling',
- 9 => 'MissionCaseDestruction',
- 10 => 'MissionCaseMIP',
- 11 => 'MissionCaseFoundDM',
- 15 => 'MissionCaseExpedition',
- );
+ protected $token;
+
+ public static $MissionsPattern = array(
+ 1 => 'MissionCaseAttack',
+ 2 => 'MissionCaseACS',
+ 3 => 'MissionCaseTransport',
+ 4 => 'MissionCaseStay',
+ 5 => 'MissionCaseStayAlly',
+ 6 => 'MissionCaseSpy',
+ 7 => 'MissionCaseColonisation',
+ 8 => 'MissionCaseRecycling',
+ 9 => 'MissionCaseDestruction',
+ 10 => 'MissionCaseMIP',
+ 11 => 'MissionCaseFoundDM',
+ 15 => 'MissionCaseExpedition',
+ );
+ function setToken($token)
+ {
+ $this->token = $token;
+ }
+
+
+ function run()
+ {
+
require_once(ROOT_PATH.'includes/classes/class.MissionFunctions.php');
- while ($CurrentFleet = $db->fetch_array($fleetquery))
+
+ $fleetResult = $GLOBALS['DATABASE']->query("SELECT ".FLEETS.".*
+ FROM ".FLEETS_EVENT."
+ INNER JOIN ".FLEETS." ON fleetID = fleet_id
+ WHERE `lock` = '".$this->token."';");
+ while ($fleetRow = $GLOBALS['DATABASE']->fetch_array($fleetResult))
{
- if(!isset($MissionsPattern[$CurrentFleet['fleet_mission']])) {
- $db->query("DELETE FROM ".FLEETS." WHERE `fleet_id` = '".$CurrentFleet['fleet_id']."';");
+ if(!isset(self::$MissionsPattern[$fleetRow['fleet_mission']])) {
+ $GLOBALS['DATABASE']->query("DELETE FROM ".FLEETS." WHERE `fleet_id` = '".$fleetRow['fleet_id']."';");
continue;
}
- if(!$this->IfFleetBusy($CurrentFleet['fleet_id'])) continue;
- getConfig($CurrentFleet['fleet_universe']);
+ #if(!$this->IfFleetBusy($fleetRow['fleet_id'])) continue;
- require_once(ROOT_PATH.'includes/classes/missions/'.$MissionsPattern[$CurrentFleet['fleet_mission']].'.php');
- $Mission = new $MissionsPattern[$CurrentFleet['fleet_mission']]($CurrentFleet);
+ $missionName = self::$MissionsPattern[$fleetRow['fleet_mission']];
- if($CurrentFleet['fleet_mess'] == 0 && $CurrentFleet['fleet_start_time'] <= TIMESTAMP)
- $Mission->TargetEvent();
- elseif($CurrentFleet['fleet_mess'] == 2 && $CurrentFleet['fleet_end_stay'] <= TIMESTAMP)
- $Mission->EndStayEvent();
- elseif($CurrentFleet['fleet_mess'] == 1 && $CurrentFleet['fleet_end_time'] <= TIMESTAMP)
- $Mission->ReturnEvent();
-
- $Mission = NULL;
- unset($Mission);
+ require_once(ROOT_PATH.'includes/classes/missions/'.$missionName.'.php');
+ $Mission = new $missionName($fleetRow);
+
+ switch($fleetRow['fleet_mess'])
+ {
+ case 0:
+ $Mission->TargetEvent();
+ break;
+ case 1:
+ $Mission->ReturnEvent();
+ break;
+ case 2:
+ $Mission->EndStayEvent();
+ break;
+ }
- $db->query("UPDATE ".FLEETS." SET `fleet_busy` = '0' WHERE `fleet_id` = '".$CurrentFleet['fleet_id']."';");
+ #$GLOBALS['DATABASE']->query("UPDATE ".FLEETS." SET `fleet_busy` = '0' WHERE `fleet_id` = '".$fleetRow['fleet_id']."';");
}
+ $GLOBALS['DATABASE']->free_result($fleetResult);
}
function IfFleetBusy($FleetID)
{
- global $db;
- $FleetInfo = $db->uniquequery("SELECT fleet_busy FROM ".FLEETS." WHERE `fleet_id` = '".$FleetID."';");
+ $FleetInfo = $GLOBALS['DATABASE']->getFirstRow("SELECT fleet_busy FROM ".FLEETS." WHERE `fleet_id` = '".$FleetID."';");
if($FleetInfo['fleet_busy'] == 1) {
return false;
} else {
- $db->query("UPDATE ".FLEETS." SET `fleet_busy` = '1' WHERE `fleet_id` = '".$FleetID."';");
+ $GLOBALS['DATABASE']->query("UPDATE ".FLEETS." SET `fleet_busy` = '1' WHERE `fleet_id` = '".$FleetID."';");
return true;
}
}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/includes/classes/class.FlyingFleetsTable.php b/includes/classes/class.FlyingFleetsTable.php
index cccd3c3..3dab471 100644
--- a/includes/classes/class.FlyingFleetsTable.php
+++ b/includes/classes/class.FlyingFleetsTable.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2012 Jan Kr?pke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,165 +18,130 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kr?pke
+ * @copyright 2012 Jan Kr?pke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.5 (2011-07-31)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
-if(!defined('INSIDE')){ die(header("location:../../"));}
-
class FlyingFleetsTable
{
- private function BuildHostileFleetPlayerLink($FleetRow, $Names)
- {
- global $LNG, $USER;
-
- return $Names['own_username'].' (N)';
+ protected $Mode = null;
+ protected $UserID = null;
+ protected $PlanetID = null;
+ protected $IsPhalanx = false;
+ protected $missions = false;
+
+ function __construct() {
+
}
-
- // For ShowFlyingFleets.php in admin panel.
- public function BuildFlyingFleetTable()
- {
- global $LNG, $db;
- $Table = array();
+
+ function setUser($UserID) {
+ $this->UserID = $UserID;
+ }
+
+ function setPlanet($PlanetID) {
+ $this->PlanetID = $PlanetID;
+ }
+
+ function setPhalanxMode() {
+ $this->IsPhalanx = true;
+ }
+
+ function setMissions($missions) {
+ $this->missions = $missions;
+ }
+
+ function getFleets($acsID = false) {
+ global $USER, $resource;
- $FlyingFleets = $db->query("SELECT * FROM ".FLEETS." WHERE `fleeT_universe` = '".$_SESSION['adminuni']."' ORDER BY `fleet_end_time` ASC;");
-
- while ($CurrentFleet = $db->fetch_array($FlyingFleets))
- {
- $FleetOwner = $db->uniquequery("SELECT `username` FROM ".USERS." WHERE `id` = '". $CurrentFleet['fleet_owner'] ."';");
- $TargetOwner = $db->uniquequery("SELECT `username` FROM ".USERS." WHERE `id` = '". $CurrentFleet['fleet_target_owner'] ."';");
-
- $Bloc['Id'] = $CurrentFleet['fleet_id'];
- $Bloc['Mission'] = $this->CreateFleetPopupedMissionLink ( $CurrentFleet, $LNG['type_mission'][ $CurrentFleet['fleet_mission'] ], '' );
- $Bloc['Mission'] .= "
". (($CurrentFleet['fleet_mess'] == 1) ? "R" : "A" ); - $Bloc['Fleet'] = $this->CreateFleetPopupedFleetLink ( $CurrentFleet, $LNG['tech'][200], '' ); - $Bloc['St_Owner'] = "[". $CurrentFleet['fleet_owner'] ."]
". $FleetOwner['username']; - $Bloc['St_Posit'] = "[".$CurrentFleet['fleet_start_galaxy'] .":". $CurrentFleet['fleet_start_system'] .":". $CurrentFleet['fleet_start_planet'] ."]
". ( ($CurrentFleet['fleet_start_type'] == 1) ? "[P]": (($CurrentFleet['fleet_start_type'] == 2) ? "D" : "L" )) .""; - $Bloc['St_Time'] = tz_date($CurrentFleet['fleet_start_time']); - if (is_array($TargetOwner)) - $Bloc['En_Owner'] = "[". $CurrentFleet['fleet_target_owner'] ."]
". $TargetOwner['username']; - else - $Bloc['En_Owner'] = ""; - - $Bloc['En_Posit'] = "[".$CurrentFleet['fleet_end_galaxy'] .":". $CurrentFleet['fleet_end_system'] .":". $CurrentFleet['fleet_end_planet'] ."]
". ( ($CurrentFleet['fleet_end_type'] == 1) ? "[P]": (($CurrentFleet['fleet_end_type'] == 2) ? "D" : "L" )) .""; - - if ($CurrentFleet['fleet_mission'] == 5) - { - if ($CurrentFleet['fleet_mess'] == 2) - $Bloc['Wa_Time'] = tz_date($CurrentFleet['fleet_end_stay']); - elseif ($CurrentFleet['fleet_mess'] == 1) - $Bloc['Wa_Time'] = $LNG['cff_back']; - else - $Bloc['Wa_Time'] = $LNG['cff_to_destination']; - } - else - { - $Bloc['Wa_Time'] = ""; - } - - $Bloc['En_Time'] = tz_date($CurrentFleet['fleet_end_time']); - $Bloc['lock'] = $CurrentFleet['fleet_busy'] == 0 ? "".$LNG['ff_lock']."" : "".$LNG['ff_unlock'].""; - - $Table[] = $Bloc; + if($this->IsPhalanx) { + $SQLWhere = "(fleet_start_id = ".$this->PlanetID." AND fleet_mission != 4) OR (fleet_end_id = ".$this->PlanetID." AND fleet_mess IN (0, 2))"; + } elseif(!empty($acsID)) { + $SQLWhere = "fleet_group = ".$acsID; + } elseif($this->missions) { + $SQLWhere = "(fleet_owner = ". $this->UserID ." OR fleet_target_owner = ". $this->UserID .") AND fleet_mission IN (". $this->missions .")"; + } else { + $SQLWhere = "fleet_owner = ".$this->UserID." OR (fleet_target_owner = ".$this->UserID." AND fleet_mission != 8)"; } - return $Table; + return $GLOBALS['DATABASE']->query("SELECT DISTINCT fleet.*, ownuser.username as own_username, targetuser.username as target_username, ownplanet.name as own_planetname, targetplanet.name as target_planetname + FROM ".FLEETS." fleet + LEFT JOIN ".USERS." ownuser ON (ownuser.id = fleet.fleet_owner) + LEFT JOIN ".USERS." targetuser ON (targetuser.id = fleet.fleet_target_owner) + LEFT JOIN ".PLANETS." ownplanet ON (ownplanet.id = fleet.fleet_start_id) + LEFT JOIN ".PLANETS." targetplanet ON (targetplanet.id = fleet.fleet_end_id) + WHERE ".$SQLWhere.";"); } - - private function CreateFleetPopupedMissionLink($FleetRow, $Texte, $FleetType) + + function renderTable() { - global $LNG; - - $FleetTotalC = $FleetRow['fleet_resource_metal'] + $FleetRow['fleet_resource_crystal'] + $FleetRow['fleet_resource_deuterium'] + $FleetRow['fleet_resource_darkmatter']; - if ($FleetTotalC <> 0) + $fleetResult = $this->getFleets(); + $ACSDone = array(); + $FleetData = array(); + + while($fleetRow = $GLOBALS['DATABASE']->fetch_array($fleetResult)) { - $FRessource = '';
- $FRessource .= '
';
- $MissionPopup = ''.$Texte.'';
+ if ($fleetRow['fleet_mess'] == 0 && $fleetRow['fleet_start_time'] > TIMESTAMP && ($fleetRow['fleet_group'] == 0 || !isset($ACSDone[$fleetRow['fleet_group']])))
+ {
+ $ACSDone[$fleetRow['fleet_group']] = true;
+ $FleetData[$fleetRow['fleet_start_time'].$fleetRow['fleet_id']] = $this->BuildFleetEventTable($fleetRow, 0);
+ }
+
+ if ($fleetRow['fleet_mission'] == 10 || ($fleetRow['fleet_mission'] == 4 && $fleetRow['fleet_mess'] == 0))
+ continue;
+
+ if ($fleetRow['fleet_end_stay'] != $fleetRow['fleet_start_time'] && $fleetRow['fleet_end_stay'] > TIMESTAMP && ($this->IsPhalanx && $fleetRow['fleet_end_id'] == $this->PlanetID))
+ $FleetData[$fleetRow['fleet_end_stay'].$fleetRow['fleet_id']] = $this->BuildFleetEventTable($fleetRow, 2);
+
+ if ($fleetRow['fleet_owner'] != $this->UserID)
+ continue;
+
+ if ($fleetRow['fleet_end_time'] > TIMESTAMP)
+ $FleetData[$fleetRow['fleet_end_time'].$fleetRow['fleet_id']] = $this->BuildFleetEventTable($fleetRow, 1);
}
- else
- $MissionPopup = $Texte;
-
- return $MissionPopup;
+
+ ksort($FleetData);
+ $GLOBALS['DATABASE']->free_result($fleetResult);
+ return $FleetData;
}
-
- private function CreateFleetPopupedFleetLink($FleetRow, $Texte, $FleetType)
+
+ function BuildFleetEventTable($fleetRow, $FleetState)
{
- global $LNG;
-
- $FleetRec = explode(';', $FleetRow['fleet_array']);
- $FleetPopup = ''. $Texte .'';
-
- return $FleetPopup;
- }
-
- public function GetNames($FleetRow)
- {
- global $db;
- return $db->uniquequery("SELECT ou.username as own_username, tu.username as target_username, op.name as own_planetname, tp.name as target_planetname
- FROM ".USERS." as ou
- LEFT JOIN ".USERS." tu ON tu.id = '".$FleetRow['fleet_target_owner']."'
- LEFT JOIN ".PLANETS." op ON op.`id` = '".$FleetRow['fleet_start_id']."'
- LEFT JOIN ".PLANETS." tp ON tp.`id` = '".$FleetRow['fleet_end_id']."'
- WHERE ou.id = '".$FleetRow['fleet_owner']."';");
+
+ return array(
+ 'text' => $EventString,
+ 'returntime' => $Time,
+ 'resttime' => $Rest
+ );
}
-
- public function GetEventString($FleetRow, $Status, $Owner, $Label, $Record)
+
+ public function getEventData($fleetRow, $Status)
{
global $LNG;
+ $Owner = $fleetRow['fleet_owner'] == $this->UserID;
$FleetStyle = array (
1 => 'attack',
2 => 'federation',
@@ -188,103 +153,158 @@ public function GetEventString($FleetRow, $Status, $Owner, $Label, $Record)
8 => 'harvest',
9 => 'destroy',
10 => 'missile',
+ 11 => 'transport',
15 => 'transport',
);
+
$GoodMissions = array(3, 5);
- $MissionType = $FleetRow['fleet_mission'];
+ $MissionType = $fleetRow['fleet_mission'];
- $Names = $this->GetNames($FleetRow);
$FleetPrefix = ($Owner == true) ? 'own' : '';
$FleetType = $FleetPrefix.$FleetStyle[$MissionType];
- $FleetContent = $this->CreateFleetPopupedFleetLink($FleetRow, (($MissionType == 1 || $MissionType == 2) && $FleetRow['fleet_owner'] != $_SESSION['id'] && $Status == 0 && $Owner == true) ? $LNG['cff_acs_fleet'] : $LNG['ov_fleet'], $FleetPrefix.$FleetStyle[$MissionType]);
- $FleetCapacity = $this->CreateFleetPopupedMissionLink($FleetRow, $LNG['type_mission'][$MissionType], $FleetPrefix.$FleetStyle[$MissionType]);
+ $FleetName = (!$Owner && ($MissionType == 1 || $MissionType == 2) && $Status == FLEET_OUTWARD && $fleetRow['fleet_target_owner'] != $this->UserID) ? $LNG['cff_acs_fleet'] : $LNG['ov_fleet'];
+ $FleetContent = $this->CreateFleetPopupedFleetLink($fleetRow, $FleetName, $FleetPrefix.$FleetStyle[$MissionType]);
+ $FleetCapacity = $this->CreateFleetPopupedMissionLink($fleetRow, $LNG['type_mission'][$MissionType], $FleetPrefix.$FleetStyle[$MissionType]);
$FleetStatus = array(0 => 'flight', 1 => 'return' , 2 => 'holding');
- $StartType = $LNG['type_planet'][$FleetRow['fleet_start_type']];
- $TargetType = $LNG['type_planet'][$FleetRow['fleet_end_type']];
+ $StartType = $LNG['type_planet'][$fleetRow['fleet_start_type']];
+ $TargetType = $LNG['type_planet'][$fleetRow['fleet_end_type']];
if ($MissionType == 8) {
- if ($Status == 0)
- $EventString = sprintf($LNG['cff_mission_own_recy_0'], $FleetContent, $StartType, $Names['own_planetname'], GetStartAdressLink($FleetRow, $FleetType), GetTargetAdressLink($FleetRow, $FleetType), $FleetCapacity);
+ if ($Status == FLEET_OUTWARD)
+ $EventString = sprintf($LNG['cff_mission_own_recy_0'], $FleetContent, $StartType, $fleetRow['own_planetname'], GetStartAdressLink($fleetRow, $FleetType), GetTargetAdressLink($fleetRow, $FleetType), $FleetCapacity);
else
- $EventString = sprintf($LNG['cff_mission_own_recy_1'], $FleetContent, GetTargetAdressLink($FleetRow, $FleetType), $StartType, $Names['own_planetname'], GetStartAdressLink($FleetRow, $FleetType), $FleetCapacity);
+ $EventString = sprintf($LNG['cff_mission_own_recy_1'], $FleetContent, GetTargetAdressLink($fleetRow, $FleetType), $StartType, $fleetRow['own_planetname'], GetStartAdressLink($fleetRow, $FleetType), $FleetCapacity);
} elseif ($MissionType == 10) {
if ($Owner)
- $EventString = sprintf($LNG['cff_mission_own_mip'], $FleetRow['fleet_amount'], $StartType, $Names['own_planetname'], GetStartAdressLink($FleetRow, $FleetType), $TargetType, $Names['target_planetname'], GetTargetAdressLink($FleetRow, $FleetType));
+ $EventString = sprintf($LNG['cff_mission_own_mip'], $fleetRow['fleet_amount'], $StartType, $fleetRow['own_planetname'], GetStartAdressLink($fleetRow, $FleetType), $TargetType, $fleetRow['target_planetname'], GetTargetAdressLink($fleetRow, $FleetType));
else
- $EventString = sprintf($LNG['cff_mission_target_mip'], $FleetRow['fleet_amount'], $this->BuildHostileFleetPlayerLink($FleetRow, $Names), $StartType, $Names['own_planetname'], GetStartAdressLink($FleetRow, $FleetType), $TargetType, $Names['target_planetname'], GetTargetAdressLink($FleetRow, $FleetType));
+ $EventString = sprintf($LNG['cff_mission_target_mip'], $fleetRow['fleet_amount'], $this->BuildHostileFleetPlayerLink($fleetRow, $fleetRow), $StartType, $fleetRow['own_planetname'], GetStartAdressLink($fleetRow, $FleetType), $TargetType, $fleetRow['target_planetname'], GetTargetAdressLink($fleetRow, $FleetType));
} elseif ($MissionType == 11 || $MissionType == 15) {
- if ($Status == 0)
- $EventString = sprintf($LNG['cff_mission_own_expo_0'], $FleetContent, $StartType, $Names['own_planetname'], GetStartAdressLink($FleetRow, $FleetType), GetTargetAdressLink($FleetRow, $FleetType), $FleetCapacity);
- elseif ($Status == 2)
- $EventString = sprintf($LNG['cff_mission_own_expo_2'], $FleetContent, $StartType, $Names['own_planetname'], GetStartAdressLink($FleetRow, $FleetType), GetTargetAdressLink($FleetRow, $FleetType), $FleetCapacity);
+ if ($Status == FLEET_OUTWARD)
+ $EventString = sprintf($LNG['cff_mission_own_expo_0'], $FleetContent, $StartType, $fleetRow['own_planetname'], GetStartAdressLink($fleetRow, $FleetType), GetTargetAdressLink($fleetRow, $FleetType), $FleetCapacity);
+ elseif ($Status == FLEET_HOLD)
+ $EventString = sprintf($LNG['cff_mission_own_expo_2'], $FleetContent, $StartType, $fleetRow['own_planetname'], GetStartAdressLink($fleetRow, $FleetType), GetTargetAdressLink($fleetRow, $FleetType), $FleetCapacity);
else
- $EventString = sprintf($LNG['cff_mission_own_expo_1'], $FleetContent, GetTargetAdressLink($FleetRow, $FleetType), $StartType, $Names['own_planetname'], GetStartAdressLink($FleetRow, $FleetType), $FleetCapacity);
+ $EventString = sprintf($LNG['cff_mission_own_expo_1'], $FleetContent, GetTargetAdressLink($fleetRow, $FleetType), $StartType, $fleetRow['own_planetname'], GetStartAdressLink($fleetRow, $FleetType), $FleetCapacity);
} else {
if ($Owner == true) {
- if ($Status == 0) {
- if (($MissionType == 1 || $MissionType == 2) && $Status == 0 && $FleetRow['fleet_owner'] != $_SESSION['id'])
+ if ($Status == FLEET_OUTWARD) {
+ if (!$Owner && ($MissionType == 1 || $MissionType == 2))
$Message = $LNG['cff_mission_acs'] ;
else
$Message = $LNG['cff_mission_own_0'];
- $EventString = sprintf($Message, $FleetContent, $StartType, $Names['own_planetname'], GetStartAdressLink($FleetRow, $FleetType), $TargetType, $Names['target_planetname'], GetTargetAdressLink($FleetRow, $FleetType), $FleetCapacity);
- } elseif($Status == 1)
- $EventString = sprintf($LNG['cff_mission_own_1'], $FleetContent, $TargetType, $Names['target_planetname'], GetTargetAdressLink($FleetRow, $FleetType), $StartType, $Names['own_planetname'], GetStartAdressLink($FleetRow, $FleetType), $FleetCapacity);
+ $EventString = sprintf($Message, $FleetContent, $StartType, $fleetRow['own_planetname'], GetStartAdressLink($fleetRow, $FleetType), $TargetType, $fleetRow['target_planetname'], GetTargetAdressLink($fleetRow, $FleetType), $FleetCapacity);
+ } elseif($Status == FLEET_RETURN)
+ $EventString = sprintf($LNG['cff_mission_own_1'], $FleetContent, $TargetType, $fleetRow['target_planetname'], GetTargetAdressLink($fleetRow, $FleetType), $StartType, $fleetRow['own_planetname'], GetStartAdressLink($fleetRow, $FleetType), $FleetCapacity);
else
- $EventString = sprintf($LNG['cff_mission_own_2'], $FleetContent, $StartType, $Names['own_planetname'], GetStartAdressLink($FleetRow, $FleetType), $TargetType, $Names['target_planetname'], GetTargetAdressLink($FleetRow, $FleetType), $FleetCapacity);
+ $EventString = sprintf($LNG['cff_mission_own_2'], $FleetContent, $StartType, $fleetRow['own_planetname'], GetStartAdressLink($fleetRow, $FleetType), $TargetType, $fleetRow['target_planetname'], GetTargetAdressLink($fleetRow, $FleetType), $FleetCapacity);
} else {
- if ($Status == 2)
+ if ($Status == FLEET_HOLD)
$Message = $LNG['cff_mission_target_stay'];
elseif(in_array($MissionType, $GoodMissions))
$Message = $LNG['cff_mission_target_good'];
else
$Message = $LNG['cff_mission_target_bad'];
- $EventString = sprintf($Message, $FleetContent, $this->BuildHostileFleetPlayerLink($FleetRow, $Names), $StartType, $Names['own_planetname'], GetStartAdressLink($FleetRow, $FleetType), $TargetType, $Names['target_planetname'], GetTargetAdressLink($FleetRow, $FleetType), $FleetCapacity);
+ $EventString = sprintf($Message, $FleetContent, $this->BuildHostileFleetPlayerLink($fleetRow, $fleetRow), $StartType, $fleetRow['own_planetname'], GetStartAdressLink($fleetRow, $FleetType), $TargetType, $fleetRow['target_planetname'], GetTargetAdressLink($fleetRow, $FleetType), $FleetCapacity);
}
}
$EventString = ''.$EventString.'';
- if ($Status == 0)
- $Time = $FleetRow['fleet_start_time'];
- elseif ($Status == 1)
- $Time = $FleetRow['fleet_end_time'];
- elseif ($Status == 2)
- $Time = $FleetRow['fleet_end_stay'];
+ if ($Status == FLEET_OUTWARD)
+ $Time = $fleetRow['fleet_start_time'];
+ elseif ($Status == FLEET_RETURN)
+ $Time = $fleetRow['fleet_end_time'];
+ elseif ($Status == FLEET_HOLD)
+ $Time = $fleetRow['fleet_end_stay'];
+
$Rest = $Time - TIMESTAMP;
- $time = $time;
return array($Rest, $EventString, $Time);
}
+
+ private function BuildHostileFleetPlayerLink($fleetRow, $fleetRow)
+ {
+ global $LNG;
+ return $fleetRow['own_username'].' '.$LNG['PM'].'';
+ }
- //For overview and phalanx
- public function BuildFleetEventTable($FleetRow, $Status, $Owner, $Label, $Record, $isAKS = false)
+ private function CreateFleetPopupedMissionLink($fleetRow, $Texte, $FleetType)
{
- global $LNG, $db;
-
- if ($isAKS == true && $Status == 0 && ($FleetRow['fleet_mission'] == 1 || $FleetRow['fleet_mission'] == 2) && $FleetRow['fleet_group'] != 0)
+ global $LNG;
+ $FleetTotalC = $fleetRow['fleet_resource_metal'] + $fleetRow['fleet_resource_crystal'] + $fleetRow['fleet_resource_deuterium'] + $fleetRow['fleet_resource_darkmatter'];
+ if ($FleetTotalC != 0)
{
- $AKSFleets = $db->query("SELECT * FROM ".FLEETS." WHERE `fleet_group` = '".$FleetRow['fleet_group']."' ORDER BY `fleet_id` ASC;");
- $EventString = '';
- while($AKSRow = $db->fetch_array($AKSFleets))
- {
- $Return = $this->GetEventString($AKSRow, $Status, $Owner, $Label, $Record);
-
- $Rest = $Return[0];
- $EventString .= $Return[1].'
'; - $Time = $Return[2]; - } - $db->free_result($AKSFleets); + $textForBlind = $LNG['tech'][900].': '; + $textForBlind .= floattostring($fleetRow['fleet_resource_metal']).' '.$LNG['tech'][901]; + $textForBlind .= '; '.floattostring($fleetRow['fleet_resource_crystal']).' '.$LNG['tech'][902]; + $textForBlind .= '; '.floattostring($fleetRow['fleet_resource_deuterium']).' '.$LNG['tech'][903]; + if($fleetRow['fleet_resource_darkmatter'] > 0) + $textForBlind .= '; '.floattostring($fleetRow['fleet_resource_darkmatter']).' '.$LNG['tech'][921]; + + $FRessource = '';
+ $FRessource .= '
';
+
+ $MissionPopup = ''.$Texte.' ('.$textForBlind.')';
}
else
+ $MissionPopup = $Texte;
+
+ return $MissionPopup;
+ }
+
+ private function CreateFleetPopupedFleetLink($fleetRow, $Text, $FleetType)
+ {
+ global $LNG, $USER, $resource;
+ $SpyTech = $USER[$resource[106]];
+ $Owner = $fleetRow['fleet_owner'] == $this->UserID;
+ $FleetRec = explode(';', $fleetRow['fleet_array']);
+ $FleetPopup = ''. $Text .' ('.$textForBlind.')';
+
+ return $FleetPopup;
+ }
}
?>
\ No newline at end of file
diff --git a/includes/classes/class.GalaxyRows.php b/includes/classes/class.GalaxyRows.php
index 4c2fe41..73b33ab 100644
--- a/includes/classes/class.GalaxyRows.php
+++ b/includes/classes/class.GalaxyRows.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2012 Jan Kröpke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,196 +18,185 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
+require_once(ROOT_PATH . 'includes/classes/class.FleetFunctions.php');
+require_once(ROOT_PATH . 'includes/pages/game/class.ShowPhalanxPage.php');
+
class GalaxyRows
{
- public function allowMissiles($GalaxyRowPlanet)
- {
- global $USER, $PLANET, $resource;
- if ($PLANET[$resource[503]] == 0 || $GalaxyRowPlanet['galaxy'] != $PLANET['galaxy'] || $PLANET['planet_type'] != 1 || CheckModule(40))
- return false;
-
- $Range = $this->GetMissileRange($USER[$resource[117]]);
- $SystemLimitMin = max($PLANET['system'] - $Range, 1);
- $SystemLimitMax = $PLANET['system'] + $Range;
- return $GalaxyRowPlanet['system'] <= $SystemLimitMax && $GalaxyRowPlanet['system'] >= $SystemLimitMin ? true : false;
- }
- public function allowPhalanx($GalaxyRowPlanet)
- {
- global $USER, $PLANET, $resource;
- if (CheckModule(19) || $PLANET[$resource[42]] == 0)
- return false;
+ private $Galaxy;
+ private $System;
+ private $galaxyData;
+ private $galaxyRow;
+
+ const PLANET_DESTROYED = false;
+
+ function __construct() {
- $PhRange = $this->GetPhalanxRange($PLANET[$resource[42]]);
- $SystemLimitMin = max(1, $PLANET['system'] - $PhRange);
- $SystemLimitMax = $PLANET['system'] + $PhRange;
- return $GalaxyRowPlanet['system'] <= $SystemLimitMax && $GalaxyRowPlanet['system'] >= $SystemLimitMin;
-
}
- public function GetMissileRange($Level)
- {
- return max(($Level * 5) - 1, 0);
+ public function setGalaxy($Galaxy) {
+ $this->Galaxy = $Galaxy;
+ return $this;
}
-
- public function GetPhalanxRange($PhalanxLevel)
- {
- return ($PhalanxLevel == 1) ? 1 : pow($PhalanxLevel, 2) - 1;
+
+ public function setSystem($System) {
+ $this->System = $System;
+ return $this;
}
-
- public function GalaxyRowActions($GalaxyRowPlanet)
+
+ public function getGalaxyData()
{
- global $USER, $PLANET, $resource, $LNG;
+ global $UNI, $USER;
- $MissileBtn = $this->allowMissiles($GalaxyRowPlanet);
+ $galaxyResult = $GLOBALS['DATABASE']->query("SELECT SQL_BIG_RESULT DISTINCT
+ p.galaxy, p.system, p.planet, p.id, p.id_owner, p.name, p.image, p.last_update, p.diameter, p.temp_min, p.destruyed, p.der_metal, p.der_crystal, p.id_luna,
+ u.id as userid, u.ally_id, u.username, u.onlinetime, u.urlaubs_modus, u.banaday,
+ m.id as m_id, m.diameter as m_diameter, m.name as m_name, m.temp_min as m_temp_min, m.last_update as m_last_update,
+ s.total_points, s.total_rank,
+ a.id as allyid, a.ally_tag, a.ally_web, a.ally_members, a.ally_name,
+ allys.total_rank as ally_rank,
+ COUNT(buddy.id) as buddy,
+ d.level as diploLevel
+ FROM ".PLANETS." p
+ LEFT JOIN ".USERS." u ON p.id_owner = u.id
+ LEFT JOIN ".PLANETS." m ON m.id = p.id_luna
+ LEFT JOIN ".STATPOINTS." s ON s.id_owner = u.id AND s.stat_type = '1'
+ LEFT JOIN ".ALLIANCE." a ON a.id = u.ally_id
+ LEFT JOIN ".DIPLO." as d ON (d.owner_1 = ".$USER['ally_id']." AND d.owner_2 = a.id) OR (d.owner_1 = a.id AND d.owner_2 = ".$USER['ally_id'].") AND d.accept = 1
+ LEFT JOIN ".STATPOINTS." allys ON allys.stat_type = '2' AND allys.id_owner = a.id
+ LEFT JOIN ".BUDDY." buddy ON (buddy.sender = ".$USER['id']." AND buddy.owner = u.id ) OR (buddy.sender = u.id AND buddy.owner = ".$USER['id'].")
+ WHERE p.universe = ".$UNI." AND p.galaxy = ".$this->Galaxy." AND p.system = ".$this->System." AND p.planet_type = '1'
+ GROUP BY p.id;");
- $Result = array(
- 'esp' => (!CheckModule(24) && $USER["settings_esp"] == 1) ? true : false,
- 'message' => (!CheckModule(16) && $USER["settings_wri"] == 1) ? true : false,
- 'buddy' => (!CheckModule(6) && $USER["settings_bud"] == 1) ? true : false,
- 'missle' => ($USER["settings_mis"] == 1 && $MissileBtn == true) ? true : false,
- );
+ while($this->galaxyRow = $GLOBALS['DATABASE']->fetch_array($galaxyResult))
+ {
+ if ($this->galaxyRow['destruyed'] != 0)
+ {
+ $this->galaxyData[$this->galaxyRow['planet']] = self::PLANET_DESTROYED;
+ continue;
+ }
+
+ $this->galaxyData[$this->galaxyRow['planet']] = array();
+
+ $this->isOwnPlanet();
+ $this->setLastActivity();
+
+ $this->getAllowedMissions();
+
+ $this->getPlayerData();
+ $this->getPlanetData();
+ $this->getAllianceData();
+ $this->getDebrisData();
+ $this->getMoonData();
+ $this->getActionButtons();
+ }
- return $Result;
+ $GLOBALS['DATABASE']->free_result($galaxyResult);
+
+ return $this->galaxyData;
}
-
- public function GalaxyRowAlly($GalaxyRowPlanet)
+
+ protected function setLastActivity()
{
- global $USER, $LNG, $db;
-
- $Result = array(
- 'id' => $GalaxyRowPlanet['allyid'],
- 'name' => htmlspecialchars($GalaxyRowPlanet['ally_name'],ENT_QUOTES,"UTF-8"),
- 'member' => sprintf(($GalaxyRowPlanet['ally_members'] == 1)?$LNG['gl_member_add']:$LNG['gl_member'], $GalaxyRowPlanet['ally_members']),
- 'web' => $GalaxyRowPlanet['ally_web'],
- 'inally' => $USER['ally_id'] == $GalaxyRowPlanet['ally_id'],
- 'tag' => $GalaxyRowPlanet['ally_tag'],
- 'rank' => $GalaxyRowPlanet['ally_rank'],
- );
+ global $LNG;
+
+ $lastActivity = floor((TIMESTAMP - max($this->galaxyRow['last_update'], $this->galaxyRow['m_last_update'])) / 60);
- return $Result;
+ if ($lastActivity < 4) {
+ $this->galaxyData[$this->galaxyRow['planet']]['lastActivity'] = $LNG['gl_activity'];
+ } elseif($lastActivity < 15) {
+ $this->galaxyData[$this->galaxyRow['planet']]['lastActivity'] = sprintf($LNG['gl_activity_inactive'], $lastActivity);
+ } else {
+ $this->galaxyData[$this->galaxyRow['planet']]['lastActivity'] = '';
+ }
}
-
- public function GalaxyRowDebris($GalaxyRowPlanet)
+
+ protected function isOwnPlanet()
{
- global $USER, $PLANET, $LNG, $pricelist, $resource;
-
- $GRecNeeded = min(ceil(($GalaxyRowPlanet['der_metal'] + $GalaxyRowPlanet['der_crystal']) / $pricelist[219]['capacity']), $PLANET[$resource[219]]);
- $RecNeeded = min(ceil(max($GalaxyRowPlanet['der_metal'] + $GalaxyRowPlanet['der_crystal'] - ($GRecNeeded * $pricelist[219]['capacity']), 0) / $pricelist[209]['capacity']), $PLANET[$resource[209]]);
-
- $Result = array(
- 'metal' => pretty_number($GalaxyRowPlanet["der_metal"]),
- 'crystal' => pretty_number($GalaxyRowPlanet["der_crystal"]),
- 'RecSended' => $RecNeeded,
- 'GRecSended' => $GRecNeeded,
- 'recycle' => (!CheckModule(32)) ? $LNG['type_mission'][8]:false,
- );
-
- return $Result;
+ global $USER;
+
+ $this->galaxyData[$this->galaxyRow['planet']]['ownPlanet'] = $this->galaxyRow['id_owner'] == $USER['id'];
}
-
- public function GalaxyRowMoon($GalaxyRowPlanet, $IsOwn)
+
+ protected function getAllowedMissions()
{
- global $USER, $PLANET, $LNG, $resource;
+ global $PLANET, $resource;
- $Result = array(
- 'name' => htmlspecialchars($GalaxyRowPlanet['m_name'], ENT_QUOTES, "UTF-8"),
- 'temp_min' => number_format($GalaxyRowPlanet['m_temp_min'], 0, '', '.'),
- 'diameter' => number_format($GalaxyRowPlanet['m_diameter'], 0, '', '.'),
- 'attack' => (!CheckModule(1) && !$IsOwn) ? $LNG['type_mission'][1]:false,
- 'transport' => (!CheckModule(34)) ? $LNG['type_mission'][3]:false,
- 'stay' => (!CheckModule(36) && $IsOwn) ? $LNG['type_mission'][4]:false,
- 'stayally' => (!CheckModule(33) && !$IsOwn) ? $LNG['type_mission'][5]:false,
- 'spionage' => (!CheckModule(24) && !$IsOwn) ? $LNG['type_mission'][6]:false,
- 'destroy' => (!CheckModule(29) && !$IsOwn && $PLANET[$resource[214]] > 0) ? $LNG['type_mission'][9]:false,
+ $this->galaxyData[$this->galaxyRow['planet']]['missions'] = array(
+ 1 => !$this->galaxyData[$this->galaxyRow['planet']]['ownPlanet'] && isModulAvalible(MODULE_MISSION_ATTACK),
+ 3 => isModulAvalible(MODULE_MISSION_TRANSPORT),
+ 4 => $this->galaxyData[$this->galaxyRow['planet']]['ownPlanet'] && isModulAvalible(MODULE_MISSION_STATION),
+ 5 => !$this->galaxyData[$this->galaxyRow['planet']]['ownPlanet'] && isModulAvalible(MODULE_MISSION_HOLD),
+ 6 => !$this->galaxyData[$this->galaxyRow['planet']]['ownPlanet'] && isModulAvalible(MODULE_MISSION_SPY),
+ 8 => isModulAvalible(MODULE_MISSION_RECYCLE),
+ 9 => !$this->galaxyData[$this->galaxyRow['planet']]['ownPlanet'] && $PLANET[$resource[214]] > 0 && isModulAvalible(MODULE_MISSION_DESTROY),
+ 10 => !$this->galaxyData[$this->galaxyRow['planet']]['ownPlanet'] && $PLANET[$resource[503]] > 0 && isModulAvalible(MODULE_MISSION_ATTACK) && isModulAvalible(MODULE_MISSILEATTACK) && $this->inMissileRange(),
);
-
- return $Result;
}
- public function GalaxyRowPlanet($GalaxyRowPlanet, $IsOwn)
+ protected function inMissileRange()
{
- global $resource, $USER, $PLANET, $CONF, $LNG;
+ global $USER, $PLANET, $resource;
- if(!$IsOwn && $GalaxyRowPlanet['galaxy'] == $PLANET['galaxy'])
- {
- $PhalanxTypeLink = $this->allowPhalanx($GalaxyRowPlanet);
- $MissileBtn = $this->allowMissiles($GalaxyRowPlanet);
- } else {
- $PhalanxTypeLink = false;
- $MissileBtn = false;
- }
- $Result = array(
- 'id' => $GalaxyRowPlanet['id'],
- 'name' => htmlspecialchars($GalaxyRowPlanet['name'],ENT_QUOTES,"UTF-8"),
- 'image' => $GalaxyRowPlanet['image'],
- 'phalax' => !$PhalanxTypeLink ? false : $LNG['gl_phalanx'],
- 'missile' => !$MissileBtn ? false : $LNG['gl_missile_attack'],
- 'transport' => (CheckModule(34)) ? false : $LNG['type_mission'][3],
- 'spionage' => ($IsOwn || CheckModule(24)) ? false : $LNG['type_mission'][6],
- 'attack' => ($IsOwn || CheckModule(1)) ? false : $LNG['type_mission'][1],
- 'stay' => (!$IsOwn || CheckModule(36) && $IsOwn) ? false : $LNG['type_mission'][4],
- 'stayally' => ($IsOwn || CheckModule(33)) ? false : $LNG['type_mission'][5],
- );
- return $Result;
+ if ($this->galaxyRow['galaxy'] != $PLANET['galaxy'])
+ return false;
+
+ $Range = FleetFunctions::GetMissileRange($USER[$resource[117]]);
+ $systemMin = $PLANET['system'] - $Range;
+ $systemMax = $PLANET['system'] + $Range;
+
+ return $this->galaxyRow['system'] >= $systemMin && $this->galaxyRow['system'] <= $systemMax;
}
-
- public function GalaxyRowPlanetName($GalaxyRowPlanet)
+
+ protected function getActionButtons()
{
- global $USER, $LNG;
-
- $Onlinetime = floor((TIMESTAMP - $GalaxyRowPlanet['last_update']) / 60);
-
- if ($Onlinetime < 4)
- $Activity = $LNG['gl_activity'];
- elseif($Onlinetime < 15)
- $Activity = sprintf($LNG['gl_activity_inactive'], $Onlinetime);
- else
- $Activity = '';
-
- $Result = array(
- 'name' => htmlspecialchars($GalaxyRowPlanet['name'], ENT_QUOTES, "UTF-8"),
- 'activity' => $Activity,
- );
- return $Result;
+ global $USER;
+ if($this->galaxyData[$this->galaxyRow['planet']]['ownPlanet']) {
+ $this->galaxyData[$this->galaxyRow['planet']]['action'] = false;
+ } else {
+ $this->galaxyData[$this->galaxyRow['planet']]['action'] = array(
+ 'esp' => $USER['settings_esp'] == 1 && $this->galaxyData[$this->galaxyRow['planet']]['missions'][6],
+ 'message' => $USER['settings_wri'] == 1 && isModulAvalible(MODULE_MESSAGES),
+ 'buddy' => $USER['settings_bud'] == 1 && isModulAvalible(MODULE_BUDDYLIST) && $this->galaxyRow['buddy'] == 0,
+ 'missle' => $USER['settings_mis'] == 1 && $this->galaxyData[$this->galaxyRow['planet']]['missions'][10],
+ );
+ }
}
- public function GalaxyRowUser($GalaxyRowPlanet, $IsOwn)
+ protected function getPlayerData()
{
- global $USER, $LNG, $db;
+ global $USER, $LNG;
- $CurrentPoints = $USER['total_points'];
- $RowUserPoints = $GalaxyRowPlanet['total_points'];
- $IsNoobProtec = CheckNoobProtec($USER, $GalaxyRowPlanet, $GalaxyRowPlanet);
+ $IsNoobProtec = CheckNoobProtec($USER, $this->galaxyRow, $this->galaxyRow);
$Class = array();
- if ($GalaxyRowPlanet['banaday'] > TIMESTAMP && $GalaxyRowPlanet['urlaubs_modus'] == 1)
+ if ($this->galaxyRow['banaday'] > TIMESTAMP && $this->galaxyRow['urlaubs_modus'] == 1)
{
$Class = array('vacation', 'banned');
}
- elseif ($GalaxyRowPlanet['banaday'] > TIMESTAMP)
+ elseif ($this->galaxyRow['banaday'] > TIMESTAMP)
{
$Class = array('banned');
}
- elseif ($GalaxyRowPlanet['urlaubs_modus'] == 1)
+ elseif ($this->galaxyRow['urlaubs_modus'] == 1)
{
$Class = array('vacation');
}
- elseif ($GalaxyRowPlanet['onlinetime'] < (TIMESTAMP-60 * 60 * 24 * 7) && $GalaxyRowPlanet['onlinetime'] > (TIMESTAMP-60 * 60 * 24 * 28))
+ elseif ($this->galaxyRow['onlinetime'] < TIMESTAMP - INACTIVE_LONG)
{
- $Class = array('inactive');
+ $Class = array('inactive', 'longinactive');
}
- elseif ($GalaxyRowPlanet['onlinetime'] < (TIMESTAMP-60 * 60 * 24 * 28))
+ elseif ($this->galaxyRow['onlinetime'] < TIMESTAMP - INACTIVE)
{
- $Class = array('inactive', 'longinactive');
+ $Class = array('inactive');
}
elseif ($IsNoobProtec['NoobPlayer'])
{
@@ -217,18 +206,90 @@ public function GalaxyRowUser($GalaxyRowPlanet, $IsOwn)
{
$Class = array('strong');
}
-
- $Result = array(
- 'id' => $GalaxyRowPlanet['userid'],
- 'username' => htmlspecialchars($GalaxyRowPlanet['username'],ENT_QUOTES,"UTF-8"),
- 'rank' => $GalaxyRowPlanet['total_rank'],
- 'points' => pretty_number($GalaxyRowPlanet['total_points']),
- 'playerrank' => sprintf($LNG['gl_in_the_rank'], htmlspecialchars($GalaxyRowPlanet['username'],ENT_QUOTES,"UTF-8"), $GalaxyRowPlanet['total_rank']),
+
+ $this->galaxyData[$this->galaxyRow['planet']]['user'] = array(
+ 'id' => $this->galaxyRow['userid'],
+ 'username' => htmlspecialchars($this->galaxyRow['username'], ENT_QUOTES, "UTF-8"),
+ 'rank' => $this->galaxyRow['total_rank'],
+ 'points' => pretty_number($this->galaxyRow['total_points']),
+ 'playerrank' => isModulAvalible(25)?sprintf($LNG['gl_in_the_rank'], htmlspecialchars($this->galaxyRow['username'],ENT_QUOTES,"UTF-8"), $this->galaxyRow['total_rank']):htmlspecialchars($this->galaxyRow['username'],ENT_QUOTES,"UTF-8"),
'class' => $Class,
- 'isown' => ($GalaxyRowPlanet['userid'] != $USER['id']) ? true : false,
+ 'isBuddy' => $this->galaxyRow['buddy'] == 0,
+ );
+ }
+
+ protected function getAllianceData()
+ {
+ global $USER, $LNG;
+ if(empty($this->galaxyRow['allyid'])) {
+ $this->galaxyData[$this->galaxyRow['planet']]['alliance'] = false;
+ } else {
+ $Class = array();
+ switch($this->galaxyRow['diploLevel'])
+ {
+ case 1:
+ case 2:
+ $Class = array('member');
+ break;
+ case 4:
+ $Class = array('friend');
+ break;
+ case 5:
+ $Class = array('enemy');
+ break;
+ }
+
+ if($USER['ally_id'] == $this->galaxyRow['ally_id'])
+ {
+ $Class = array('member');
+ }
+
+ $this->galaxyData[$this->galaxyRow['planet']]['alliance'] = array(
+ 'id' => $this->galaxyRow['allyid'],
+ 'name' => htmlspecialchars($this->galaxyRow['ally_name'], ENT_QUOTES, "UTF-8"),
+ 'member' => sprintf(($this->galaxyRow['ally_members'] == 1) ? $LNG['gl_member_add'] : $LNG['gl_member'], $this->galaxyRow['ally_members']),
+ 'web' => $this->galaxyRow['ally_web'],
+ 'tag' => $this->galaxyRow['ally_tag'],
+ 'rank' => $this->galaxyRow['ally_rank'],
+ 'class' => $Class,
+ );
+ }
+ }
+
+ protected function getDebrisData()
+ {
+ $total = $this->galaxyRow['der_metal'] + $this->galaxyRow['der_crystal'];
+ if($total == 0) {
+ $this->galaxyData[$this->galaxyRow['planet']]['debris'] = false;
+ } else {
+ $this->galaxyData[$this->galaxyRow['planet']]['debris'] = array(
+ 'metal' => $this->galaxyRow['der_metal'],
+ 'crystal' => $this->galaxyRow['der_crystal'],
+ );
+ }
+ }
+
+ protected function getMoonData()
+ {
+ if(!isset($this->galaxyRow['m_id'])) {
+ $this->galaxyData[$this->galaxyRow['planet']]['moon'] = false;
+ } else {
+ $this->galaxyData[$this->galaxyRow['planet']]['moon'] = array(
+ 'id' => $this->galaxyRow['m_id'],
+ 'name' => htmlspecialchars($this->galaxyRow['m_name'], ENT_QUOTES, "UTF-8"),
+ 'temp_min' => $this->galaxyRow['m_temp_min'],
+ 'diameter' => $this->galaxyRow['m_diameter'],
+ );
+ }
+ }
+
+ protected function getPlanetData()
+ {
+ $this->galaxyData[$this->galaxyRow['planet']]['planet'] = array(
+ 'id' => $this->galaxyRow['id'],
+ 'name' => htmlspecialchars($this->galaxyRow['name'], ENT_QUOTES, "UTF-8"),
+ 'image' => $this->galaxyRow['image'],
+ 'phalanx' => isModulAvalible(MODULE_PHALANX) && ShowPhalanxPage::allowPhalanx($this->galaxyRow['galaxy'], $this->galaxyRow['system']),
);
-
- return $Result;
}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/includes/classes/class.Lang.php b/includes/classes/class.Lang.php
deleted file mode 100644
index ad02250..0000000
--- a/includes/classes/class.Lang.php
+++ /dev/null
@@ -1,179 +0,0 @@
-.
- *
- * @package 2Moons
- * @author Slaver
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
- * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
- * @info $Id$
- * @link http://code.google.com/p/2moons/
- */
-
-class Language
-{
- public $Default = '';
- public $User = '';
- public static $Languages;
-
- function __construct()
- {
- $this->Default = DEFAULT_LANG;
- $this->User = DEFAULT_LANG;
- }
-
- static function getAllowedLangs($OnlyKey = true)
- {
- if(!isset(self::$Languages))
- {
- if(file_exists(ROOT_PATH.'cache/cache.languages.php'))
- {
- self::$Languages = unserialize(file_get_contents(ROOT_PATH.'cache/cache.languages.php'));
- } else {
- $Langs = array_diff(scandir(ROOT_PATH.'language/'), array('..', '.', '.svn', '.htaccess', 'index.htm'));
- $Languages = array();
- foreach($Langs as $Lang) {
- if(!file_exists(ROOT_PATH.'language/'.$Lang.'/LANG.cfg'))
- continue;
-
- require(ROOT_PATH.'language/'.$Lang.'/LANG.cfg');
- $Languages[$Lang] = $Language['name'];
- }
- if(is_writable(ROOT_PATH.'cache'))
- file_put_contents(ROOT_PATH.'cache/cache.languages.php', serialize($Languages));
- self::$Languages = $Languages;
- }
- }
- return $OnlyKey ? array_keys(self::$Languages) : self::$Languages;
- }
-
- function setDefault($LANG)
- {
- if(!empty($LANG) && in_array($LANG, self::getAllowedLangs())) {
- $this->Default = $LANG;
- $this->User = $LANG;
- }
- }
-
- function setUser($LANG)
- {
- if(!empty($LANG) && in_array($LANG, self::getAllowedLangs()))
- $this->User = $LANG;
- }
-
- function getUser()
- {
- return $this->User;
- }
-
- function GetLangFromBrowser($strict_mode = true)
- {
- if(defined('LOGIN') && isset($_COOKIE['lang']) && in_array($_COOKIE['lang'], self::getAllowedLangs())) {
- $this->setUser($_COOKIE['lang']);
- return $this->User;
- }
-
- if(isset($_REQUEST['lang']) && in_array($_REQUEST['lang'], self::getAllowedLangs())) {
- $this->setUser($_REQUEST['lang']);
- return $this->User;
- }
-
- if (empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
- return $this->Default;
- }
-
- $accepted_languages = preg_split('/,\s*/', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
-
- $current_lang = $this->Default;
- $current_q = 0;
-
- foreach ($accepted_languages as $accepted_language) {
- $res = preg_match ('/^([a-z]{1,8}(?:-[a-z]{1,8})*)'.'(?:;\s*q=(0(?:\.[0-9]{1,3})?|1(?:\.0{1,3})?))?$/i', $accepted_language, $matches);
-
- if (!$res) {
- continue;
- }
-
- $LANG_code = explode ('-', $matches[1]);
- $LANG_quality = isset($matches[2]) ? (float)$matches[2] : 1.0;
-
- while (count ($LANG_code)) {
- if (in_array (strtolower (join ('-', $LANG_code)), self::getAllowedLangs())) {
- if ($LANG_quality > $current_q) {
- $current_lang = strtolower (join ('-', $LANG_code));
- $current_q = $LANG_quality;
- break;
- }
- }
- if ($strict_mode) {
- break;
- }
- array_pop ($LANG_code);
- }
- }
- $this->setUser($current_lang);
- return $this->User;
- }
-
- function includeLang($Files)
- {
- global $LNG;
- while (list(,$File) = each($Files)){
- require(ROOT_PATH . "language/de/".$File.'.php');
- require(ROOT_PATH . "language/".$this->User."/".$File.'.php');
- }
- }
-
- function getExtra($File)
- {
- if(file_exists(ROOT_PATH."language/".$this->User."/extra/".$File.".txt"))
- return file_get_contents(ROOT_PATH."language/".$this->User."/extra/".$File.".txt");
-
- return "";
- }
-
- function getMail($File)
- {
- if(file_exists(ROOT_PATH."language/".$this->User."/email/".$File.".txt"))
- return file_get_contents(ROOT_PATH."language/".$this->User."/email/".$File.".txt");
-
- return "";
- }
-
- function GetUserLang($ID, $Files = array())
- {
- global $db, $CONF;
- $LANGUAGE = is_numeric($ID) && !in_array($ID, self::getAllowedLangs()) ? $db->countquery("SELECT `lang` FROM ".USERS." WHERE `id` = '".$ID."';") : $ID;
-
- if(!in_array($LANGUAGE, self::getAllowedLangs()))
- $LANGUAGE = $this->Default;
-
- if(empty($Files))
- $Files = array('L18N', 'FLEET');
-
- while (list(,$File) = each($Files)){
- require(ROOT_PATH . "language/".$LANGUAGE."/".$File.'.php');
- }
-
- return $LNG;
- }
-}
-
-?>
\ No newline at end of file
diff --git a/includes/classes/class.Log.php b/includes/classes/class.Log.php
index 6378a24..19997e6 100644
--- a/includes/classes/class.Log.php
+++ b/includes/classes/class.Log.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2012 Jan Kröpke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,12 +18,11 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
* @version 1.3 (2011-01-21)
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
class Log
@@ -47,13 +46,9 @@ public function __isset($key){
return isset($this->data[$key]);
}
function save() {
- global $db;
$data = serialize(array($this->data['old'], $this->data['new']));
- $uni = ($this->data['universe'] == NULL ? $this->data['uni'] : $this->data['universe']);
- //var_dump($this->data['target']);
- $db->query("INSERT INTO ".LOG." (`id`,`mode`,`admin`,`target`,`time`,`data`,`universe`) VALUES
- (NULL , ".$this->data['mode'].", ".$this->data['admin'].", '".$this->data['target']."', ".TIMESTAMP." , '".$data."', '".$uni."');");
+ $uni = (empty($this->data['universe']) ? $this->data['uni'] : $this->data['universe']);
+ $GLOBALS['DATABASE']->query("INSERT INTO ".LOG." (`id`,`mode`,`admin`,`target`,`time`,`data`,`universe`) VALUES
+ (NULL , ".$GLOBALS['DATABASE']->sql_escape($this->data['mode']).", ".$GLOBALS['DATABASE']->sql_escape($this->data['admin']).", '".$GLOBALS['DATABASE']->sql_escape($this->data['target'])."', ".TIMESTAMP." , '".$GLOBALS['DATABASE']->sql_escape($data)."', '".$uni."');");
}
}
-
-?>
\ No newline at end of file
diff --git a/includes/classes/class.MissionFunctions.php b/includes/classes/class.MissionFunctions.php
index 5d0234c..02c5623 100644
--- a/includes/classes/class.MissionFunctions.php
+++ b/includes/classes/class.MissionFunctions.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2012 Jan Kröpke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,47 +18,65 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
-if (!defined('INSIDE')) exit;
-
class MissionFunctions
{
- function __construct()
- {
- $this->kill = 0;
- }
-
+ public $kill = 0;
+ public $_fleet = array();
+ public $_upd = array();
+
function UpdateFleet($Option, $Value)
{
$this->_fleet[$Option] = $Value;
$this->_upd[$Option] = $Value;
}
+
+ function setState($Value)
+ {
+ $this->_fleet['fleet_mess'] = $Value;
+ $this->_upd['fleet_mess'] = $Value;
+
+ switch($Value)
+ {
+ case FLEET_OUTWARD:
+ $this->eventTime = $this->_fleet['fleet_start_time'];
+ break;
+ case FLEET_RETURN:
+ $this->eventTime = $this->_fleet['fleet_end_time'];
+ break;
+ case FLEET_HOLD:
+ $this->eventTime = $this->_fleet['fleet_end_stay'];
+ break;
+ }
+ }
function SaveFleet()
{
- global $db;
if($this->kill == 1)
return;
+ $Qry = array();
+
foreach($this->_upd as $Opt => $Val)
{
$Qry[] = "`".$Opt."` = '".$Val."'";
}
- $db->query("UPDATE ".FLEETS." SET ".implode(', ',$Qry)." WHERE `fleet_id` = '".$this->_fleet['fleet_id']."';");
+ if(!empty($Qry)) {
+ $GLOBALS['DATABASE']->multi_query("UPDATE ".FLEETS." SET ".implode(', ',$Qry)." WHERE `fleet_id` = ".$this->_fleet['fleet_id'].";UPDATE ".FLEETS_EVENT." SET time = ".$this->eventTime." WHERE `fleetID` = ".$this->_fleet['fleet_id'].";");
+ }
}
function RestoreFleet($Start = true)
{
- global $resource, $db;
+ global $resource;
$FleetRecord = explode(';', $this->_fleet['fleet_array']);
$QryUpdFleet = '';
@@ -81,20 +99,19 @@ function RestoreFleet($Start = true)
$Qry .= "WHERE ";
$Qry .= "p.`id` = '".($Start == true ? $this->_fleet['fleet_start_id'] : $this->_fleet['fleet_end_id'])."' ";
$Qry .= "AND u.id = p.id_owner;";
- $Qry .= "DELETE FROM ".FLEETS." WHERE `fleet_id` = ".$this->_fleet['fleet_id'].";";
- $db->multi_query($Qry);
+ $GLOBALS['DATABASE']->multi_query($Qry);
+ $this->KillFleet();
}
function StoreGoodsToPlanet($Start = false)
{
- global $db;
- $Qry = "UPDATE ".PLANETS." SET ";
+ $Qry = "UPDATE ".PLANETS." SET ";
$Qry .= "`metal` = `metal` + ".$this->_fleet['fleet_resource_metal'].", ";
$Qry .= "`crystal` = `crystal` + ".$this->_fleet['fleet_resource_crystal'].", ";
$Qry .= "`deuterium` = `deuterium` + ".$this->_fleet['fleet_resource_deuterium']." ";
$Qry .= "WHERE ";
$Qry .= "`id` = ".($Start == true ? $this->_fleet['fleet_start_id'] : $this->_fleet['fleet_end_id']).";";
- $db->query($Qry);
+ $GLOBALS['DATABASE']->query($Qry);
$this->UpdateFleet('fleet_resource_metal', '0');
$this->UpdateFleet('fleet_resource_crystal', '0');
@@ -103,9 +120,21 @@ function StoreGoodsToPlanet($Start = false)
function KillFleet()
{
- global $db;
$this->kill = 1;
- $db->query("DELETE FROM ".FLEETS." WHERE `fleet_id` = ".$this->_fleet['fleet_id'].";");
- }
-}
-?>
\ No newline at end of file
+ $GLOBALS['DATABASE']->multi_query("DELETE FROM ".FLEETS." WHERE `fleet_id` = ".$this->_fleet['fleet_id'].";
+ DELETE FROM ".FLEETS_EVENT." WHERE `fleetID` = ".$this->_fleet['fleet_id'].";");
+ }
+
+ function getLanguage($language = NULL, $userID = NULL)
+ {
+ if(is_null($language) && !is_null($userID))
+ {
+ $language = $GLOBALS['DATABASE']->getFirstCell("SELECT lang FROM ".USERS." WHERE id = ".$this->_fleet['fleet_owner'].";");
+ }
+
+ $LNG = new Language($language);
+ $LNG->includeData(array('L18N', 'FLEET', 'TECH', 'CUSTOM'));
+
+ return $LNG;
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/class.PlanetRessUpdate.php b/includes/classes/class.PlanetRessUpdate.php
index 271f8cf..1c85185 100644
--- a/includes/classes/class.PlanetRessUpdate.php
+++ b/includes/classes/class.PlanetRessUpdate.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2012 Jan Kröpke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,13 +18,12 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
class ResourceUpdate
@@ -35,8 +34,7 @@ function __construct($Build = true, $Tech = true)
$this->Build = $Build;
$this->Tech = $Tech;
$this->USER = array();
- $this->PLANET = array();
- $this->DEBUG = FirePHP::getInstance(true);
+ $this->PLANET = array();
}
public function ReturnVars() {
@@ -53,21 +51,26 @@ public function ReturnVars() {
public function CreateHash() {
global $reslist, $resource;
$Hash = array();
- $Hash[] = $this->CONF['metal_basic_income'];
- $Hash[] = $this->CONF['crystal_basic_income'];
- $Hash[] = $this->CONF['deuterium_basic_income'];
foreach($reslist['prod'] as $ID) {
$Hash[] = $this->PLANET[$resource[$ID]];
$Hash[] = $this->PLANET[$resource[$ID].'_porcent'];
}
+ $ressource = array_merge(array(), $reslist['resstype'][1], $reslist['resstype'][2]);
+ foreach($ressource as $ID) {
+ $Hash[] = $this->CONF[$resource[$ID].'_basic_income'];
+ }
+
+ $Hash[] = $this->CONF['resource_multiplier'];
+ $Hash[] = $this->CONF['energySpeed'];
+ $Hash[] = $this->USER['factor']['Resource'];
+ $Hash[] = $this->USER['factor']['Energy'];
$Hash[] = $this->PLANET[$resource[22]];
$Hash[] = $this->PLANET[$resource[23]];
$Hash[] = $this->PLANET[$resource[24]];
- $Hash[] = $this->USER['factor']['metal'];
- $Hash[] = $this->USER['factor']['crystal'];
- $Hash[] = $this->USER['factor']['deuterium'];
- $Hash[] = $this->USER['factor']['energy'];
+ $Hash[] = $this->USER[$resource[131]];
+ $Hash[] = $this->USER[$resource[132]];
+ $Hash[] = $this->USER[$resource[133]];
return md5(implode("::", $Hash));
}
@@ -77,9 +80,10 @@ public function CalcResource($USER = NULL, $PLANET = NULL, $SAVE = false, $TIME
$this->USER = $this->GLOBALS ? $GLOBALS['USER'] : $USER;
$this->PLANET = $this->GLOBALS ? $GLOBALS['PLANET'] : $PLANET;
$this->TIME = is_null($TIME) ? TIMESTAMP : $TIME;
- $this->CONF = getConfig($this->USER['universe']);
+ $this->CONF = Config::getAll(NULL, $this->USER['universe']);
+# $this->CONF['energySpeed'] = 1;
- if(EH_ACTIVE_ECO === true || $this->USER['urlaubs_modus'] == 1)
+ if($this->USER['urlaubs_modus'] == 1)
return $this->ReturnVars();
if($this->Build)
@@ -102,14 +106,15 @@ public function CalcResource($USER = NULL, $PLANET = NULL, $SAVE = false, $TIME
public function UpdateRessource($TIME, $HASH = false)
{
$this->ProductionTime = ($TIME - $this->PLANET['last_update']);
- $this->DEBUG->log("Start UpdateRessource on Planet(ID: ".$this->PLANET['id']."): ".date("H:i:s", $this->PLANET['last_update'])." to ".date("H:i:s", $this->TIME)." (".pretty_number($this->ProductionTime)."s)");
+
if($this->ProductionTime > 0)
{
$this->PLANET['last_update'] = $TIME;
if($HASH === false) {
- $this->ReBuildCache($TIME);
+ $this->ReBuildCache();
} else {
$this->HASH = $this->CreateHash();
+
if($this->PLANET['eco_hash'] !== $this->HASH) {
$this->PLANET['eco_hash'] = $this->HASH;
$this->ReBuildCache();
@@ -124,14 +129,11 @@ private function ExecCalc()
if($this->PLANET['planet_type'] == 3)
return;
- $MaxMetalStorage = $this->PLANET['metal_max'] * $this->CONF['max_overflow'];
- $MaxCristalStorage = $this->PLANET['crystal_max'] * $this->CONF['max_overflow'];
- $MaxDeuteriumStorage = $this->PLANET['deuterium_max'] * $this->CONF['max_overflow'];
- $MetalTheorical = 0;
- $CristalTheorical = 0;
- $DeuteriumTheorical = 0;
+ $MaxMetalStorage = $this->PLANET['metal_max'] * $this->CONF['max_overflow'];
+ $MaxCristalStorage = $this->PLANET['crystal_max'] * $this->CONF['max_overflow'];
+ $MaxDeuteriumStorage = $this->PLANET['deuterium_max'] * $this->CONF['max_overflow'];
- $MetalTheorical = round($this->ProductionTime * (($this->CONF['metal_basic_income'] * $this->CONF['resource_multiplier']) + $this->PLANET['metal_perhour']) / 3600);
+ $MetalTheorical = $this->ProductionTime * (($this->CONF['metal_basic_income'] * $this->CONF['resource_multiplier']) + $this->PLANET['metal_perhour']) / 3600;
if($MetalTheorical < 0)
{
@@ -142,7 +144,7 @@ private function ExecCalc()
$this->PLANET['metal'] = min($this->PLANET['metal'] + $MetalTheorical, $MaxMetalStorage);
}
- $CristalTheorical = round($this->ProductionTime * (($this->CONF['crystal_basic_income'] * $this->CONF['resource_multiplier']) + $this->PLANET['crystal_perhour']) / 3600);
+ $CristalTheorical = $this->ProductionTime * (($this->CONF['crystal_basic_income'] * $this->CONF['resource_multiplier']) + $this->PLANET['crystal_perhour']) / 3600;
if ($CristalTheorical < 0)
{
$this->PLANET['crystal'] = max($this->PLANET['crystal'] + $CristalTheorical, 0);
@@ -152,7 +154,7 @@ private function ExecCalc()
$this->PLANET['crystal'] = min($this->PLANET['crystal'] + $CristalTheorical, $MaxCristalStorage);
}
- $DeuteriumTheorical = round($this->ProductionTime * (($this->CONF['deuterium_basic_income'] * $this->CONF['resource_multiplier']) + $this->PLANET['deuterium_perhour']) / 3600);
+ $DeuteriumTheorical = $this->ProductionTime * (($this->CONF['deuterium_basic_income'] * $this->CONF['resource_multiplier']) + $this->PLANET['deuterium_perhour']) / 3600;
if ($DeuteriumTheorical < 0)
{
$this->PLANET['deuterium'] = max($this->PLANET['deuterium'] + $DeuteriumTheorical, 0);
@@ -162,101 +164,126 @@ private function ExecCalc()
$this->PLANET['deuterium'] = min($this->PLANET['deuterium'] + $DeuteriumTheorical, $MaxDeuteriumStorage);
}
- $this->DEBUG->log("Add: Metal: ".pretty_number($MetalTheorical)." Crystal: ".pretty_number($CristalTheorical)." Deuterium: ".pretty_number($DeuteriumTheorical));
$this->PLANET['metal'] = max($this->PLANET['metal'], 0);
$this->PLANET['crystal'] = max($this->PLANET['crystal'], 0);
$this->PLANET['deuterium'] = max($this->PLANET['deuterium'], 0);
}
+ public static function getProd($Calculation)
+ {
+ return 'return '.$Calculation.';';
+ }
+
+ public static function getNetworkLevel($USER, $PLANET)
+ {
+ global $resource;
+
+ $lablevel = array();
+ if($USER[$resource[123]] == 0) {
+ $lablevel[] = $PLANET[$resource[31]];
+ } else {
+ $LevelRow = $GLOBALS['DATABASE']->query("SELECT ".$resource[31]." FROM ".PLANETS." WHERE id != '".$PLANET['id']."' AND id_owner = '".$USER['id']."' AND destruyed = 0 ORDER BY ".$resource[31]." DESC LIMIT ".($USER[$resource[123]]).";");
+ $lablevel[] = $PLANET[$resource[31]];
+ while($Levels = $GLOBALS['DATABASE']->fetch_array($LevelRow))
+ {
+ $lablevel[] = $Levels[$resource[31]];
+ }
+ $GLOBALS['DATABASE']->free_result($LevelRow);
+ }
+
+ return $lablevel;
+ }
+
public function ReBuildCache()
{
global $ProdGrid, $resource, $reslist, $pricelist;
- $this->PLANET['metal_max'] = floor(2.5 * pow(1.8331954764, $this->PLANET[$resource[22]])) * 5000 * (1 + ($this->USER['rpg_stockeur'] * $pricelist[607]['info'])) * $this->CONF['resource_multiplier'] * STORAGE_FACTOR;
- $this->PLANET['crystal_max'] = floor(2.5 * pow(1.8331954764, $this->PLANET[$resource[23]])) * 5000 * (1 + ($this->USER['rpg_stockeur'] * $pricelist[607]['info'])) * $this->CONF['resource_multiplier'] * STORAGE_FACTOR;
- $this->PLANET['deuterium_max'] = floor(2.5 * pow(1.8331954764, $this->PLANET[$resource[24]])) * 5000 * (1 + ($this->USER['rpg_stockeur'] * $pricelist[607]['info'])) * $this->CONF['resource_multiplier'] * STORAGE_FACTOR;
-
- $this->DEBUG->log("Storage: Metal: ".pretty_number($this->PLANET['metal_max'])." Crystal: ".pretty_number($this->PLANET['crystal_max'])." Deuterium: ".pretty_number($this->PLANET['deuterium_max']));
-
if ($this->PLANET['planet_type'] == 3)
{
$this->CONF['metal_basic_income'] = 0;
$this->CONF['crystal_basic_income'] = 0;
$this->CONF['deuterium_basic_income'] = 0;
- $this->PLANET['metal_perhour'] = 0;
- $this->PLANET['crystal_perhour'] = 0;
- $this->PLANET['deuterium_perhour'] = 0;
- $this->PLANET['energy_used'] = 0;
- $this->PLANET['metal_proc'] = array(0);
- $this->PLANET['crystal_proc'] = array(0);
- $this->PLANET['deuterium_proc'] = array(0);
- $this->PLANET['deuterium_userd_proc'] = array(0);
- $this->PLANET['energy_used_proc'] = array(0);
- if($this->PLANET[$resource[212]] == 0) {
- $this->PLANET['energy_max_proc'] = array(0);
- $this->PLANET['energy_max'] = 0;
- } else {
- $BuildTemp = $this->PLANET['temp_max'];
- $BuildLevelFactor = $this->PLANET[$resource[212].'_porcent'];
- $BuildLevel = $this->PLANET[$resource[212]];
- $this->PLANET['energy_max_proc'][212] = round(eval($ProdGrid[212]['energy']) * ($this->CONF['resource_multiplier']));
- $this->PLANET['energy_max'] = $this->PLANET['energy_max_proc'][212];
- }
}
- else
+
+ $temp = array(
+ 901 => array(
+ 'max' => 0,
+ 'plus' => 0,
+ 'minus' => 0,
+ ),
+ 902 => array(
+ 'max' => 0,
+ 'plus' => 0,
+ 'minus' => 0,
+ ),
+ 903 => array(
+ 'max' => 0,
+ 'plus' => 0,
+ 'minus' => 0,
+ ),
+ 911 => array(
+ 'plus' => 0,
+ 'minus' => 0,
+ )
+ );
+
+ $BuildTemp = $this->PLANET['temp_max'];
+ $BuildEnergy = $this->USER[$resource[113]];
+
+ foreach($reslist['storage'] as $ProdID)
{
- $this->PLANET['metal_proc'] = array();
- $this->PLANET['crystal_proc'] = array();
- $this->PLANET['deuterium_proc'] = array();
- $this->PLANET['deuterium_userd_proc'] = array();
- $this->PLANET['energy_used_proc'] = array();
- $this->PLANET['energy_max_proc'] = array();
- $BuildTemp = $this->PLANET['temp_max'];
- $BuildEnergy = $this->USER[$resource[113]];
-
- foreach($reslist['prod'] as $id => $ProdID)
- {
- $BuildLevelFactor = $this->PLANET[$resource[$ProdID].'_porcent'];
- $BuildLevel = $this->PLANET[$resource[$ProdID]];
- $this->PLANET['metal_proc'][$ProdID] = round(eval($ProdGrid[$ProdID]['metal']) * $this->CONF['resource_multiplier']);
- $this->PLANET['crystal_proc'][$ProdID] = round(eval($ProdGrid[$ProdID]['crystal']) * $this->CONF['resource_multiplier']);
+ foreach($reslist['resstype'][1] as $ID)
+ {
+ if(!isset($ProdGrid[$ProdID]['storage'][$ID]))
+ continue;
+
+ $BuildLevel = $this->PLANET[$resource[$ProdID]];
+ $temp[$ID]['max'] += round(eval(self::getProd($ProdGrid[$ProdID]['storage'][$ID])));
+ }
+ }
+
+ $ressIDs = array_merge(array(), $reslist['resstype'][1], $reslist['resstype'][2]);
+
+ foreach($reslist['prod'] as $ProdID)
+ {
+ $BuildLevelFactor = $this->PLANET[$resource[$ProdID].'_porcent'];
+ $BuildLevel = $this->PLANET[$resource[$ProdID]];
+
+ foreach($ressIDs as $ID)
+ {
+ if(!isset($ProdGrid[$ProdID]['production'][$ID]))
+ continue;
- $Energy = round(eval($ProdGrid[$ProdID]['energy']) * ($this->CONF['resource_multiplier']));
- if ($Energy < 0) {
- $this->PLANET['deuterium_proc'][$ProdID] = round(eval($ProdGrid[$ProdID]['deuterium']) * $this->CONF['resource_multiplier']);
- $this->PLANET['energy_used_proc'][$ProdID] = $Energy;
+ $Production = eval(self::getProd($ProdGrid[$ProdID]['production'][$ID]));
+
+ if($Production > 0) {
+ $temp[$ID]['plus'] += $Production;
} else {
- if($ProdID == 12 && $this->PLANET['deuterium'] == 0)
- continue;
-
- $this->PLANET['deuterium_userd_proc'][$ProdID] = round(eval($ProdGrid[$ProdID]['deuterium']) * ($this->CONF['resource_multiplier']));
- $this->PLANET['energy_max_proc'][$ProdID] = $Energy;
+ if(in_array($ID, $reslist['resstype'][1]) && $this->PLANET[$resource[$ID]] == 0) {
+ continue;
+ }
+
+ $temp[$ID]['minus'] += $Production;
}
}
+ }
+
+ $this->PLANET['metal_max'] = $temp[901]['max'] * $this->CONF['resource_multiplier'] * STORAGE_FACTOR * (1 + $this->USER['factor']['ResourceStorage']);
+ $this->PLANET['crystal_max'] = $temp[902]['max'] * $this->CONF['resource_multiplier'] * STORAGE_FACTOR * (1 + $this->USER['factor']['ResourceStorage']);
+ $this->PLANET['deuterium_max'] = $temp[903]['max'] * $this->CONF['resource_multiplier'] * STORAGE_FACTOR * (1 + $this->USER['factor']['ResourceStorage']);
- $this->PLANET['energy_used'] = array_sum($this->PLANET['energy_used_proc']);
- $this->PLANET['energy_max'] = round(array_sum($this->PLANET['energy_max_proc']) * $this->USER['factor']['energy']);
-
- if ($this->PLANET['energy_max'] == 0)
- {
- $this->PLANET['metal_perhour'] = $this->CONF['metal_basic_income'];
- $this->PLANET['crystal_perhour'] = $this->CONF['crystal_basic_income'];
- $this->PLANET['deuterium_perhour'] = $this->CONF['deuterium_basic_income'];
- $this->PLANET['level_proc'] = 0;
- }
- elseif ($this->PLANET['energy_max'] >= abs($this->PLANET['energy_used'] ))
- $this->PLANET['level_proc'] = 1;
- else
- $this->PLANET['level_proc'] = $this->PLANET['energy_max'] / abs($this->PLANET['energy_used']);
-
- if($this->PLANET['level_proc'] > 100)
- $this->PLANET['level_proc'] = 1;
- elseif ($this->PLANET['level_proc'] < 0)
- $this->PLANET['level_proc'] = 0;
+ $this->PLANET['energy'] = round($temp[911]['plus'] * $this->CONF['energySpeed'] * (1 + $this->USER['factor']['Energy']));
+ $this->PLANET['energy_used'] = $temp[911]['minus'];
+ if($this->PLANET['energy_used'] == 0) {
+ $this->PLANET['metal_perhour'] = 0;
+ $this->PLANET['crystal_perhour'] = 0;
+ $this->PLANET['deuterium_perhour'] = 0;
+ } else {
+ $prodLevel = min(1, $this->PLANET['energy'] / abs($this->PLANET['energy_used']));
- $this->PLANET['metal_perhour'] = round(array_sum($this->PLANET['metal_proc']) * $this->USER['factor']['metal'] * $this->PLANET['level_proc']);
- $this->PLANET['crystal_perhour'] = round(array_sum($this->PLANET['crystal_proc']) * $this->USER['factor']['crystal'] * $this->PLANET['level_proc']);
- $this->PLANET['deuterium_perhour'] = round(array_sum($this->PLANET['deuterium_proc']) * $this->USER['factor']['deuterium'] * $this->PLANET['level_proc'] + array_sum($this->PLANET['deuterium_userd_proc']));
+ $this->PLANET['metal_perhour'] = ($temp[901]['plus'] * (1 + $this->USER['factor']['Resource'] + 0.02 * $this->USER[$resource[131]]) * $prodLevel + $temp[901]['minus']) * $this->CONF['resource_multiplier'];
+ $this->PLANET['crystal_perhour'] = ($temp[902]['plus'] * (1 + $this->USER['factor']['Resource'] + 0.02 * $this->USER[$resource[132]]) * $prodLevel + $temp[902]['minus']) * $this->CONF['resource_multiplier'];
+ $this->PLANET['deuterium_perhour'] = ($temp[903]['plus'] * (1 + $this->USER['factor']['Resource'] + 0.02 * $this->USER[$resource[133]]) * $prodLevel + $temp[903]['minus']) * $this->CONF['resource_multiplier'];
}
}
@@ -276,7 +303,7 @@ private function ShipyardQueue()
$BuildArray = array();
foreach($BuildQueue as $Item)
{
- $AcumTime = GetBuildingTime($this->USER, $this->PLANET, $Item[0]);
+ $AcumTime = BuildFunctions::getBuildingTime($this->USER, $this->PLANET, $Item[0]);
$BuildArray[] = array($Item[0], $Item[1], $AcumTime);
}
@@ -307,8 +334,6 @@ private function ShipyardQueue()
continue;
}
- $this->DEBUG->log("Done(Ship[ID:".$Element."]): ".pretty_number($Build));
-
if(!isset($this->Builded[$Element]))
$this->Builded[$Element] = 0;
@@ -325,7 +350,7 @@ private function ShipyardQueue()
$NewQueue[] = array($Element, $Count);
}
$this->PLANET['b_hangar_id'] = !empty($NewQueue) ? serialize($NewQueue) : '';
- $this->DEBUG->log("Queue(Hanger): ".$this->PLANET['b_hangar_id']);
+
}
private function BuildingQueue()
@@ -336,7 +361,7 @@ private function BuildingQueue()
private function CheckPlanetBuildingQueue()
{
- global $resource, $db, $reslist;
+ global $resource, $reslist;
if (empty($this->PLANET['b_building_id']) || $this->PLANET['b_building'] > $this->TIME)
return false;
@@ -364,7 +389,7 @@ private function CheckPlanetBuildingQueue()
$this->Builded[$Element] -= 1;
}
- $this->DEBUG->log("Done: Build(ID: ".$Element."): ".($this->PLANET[$resource[$Element]] - ($BuildMode == 'build' ? 1 : -1))." -> ".$this->PLANET[$resource[$Element]]);
+
array_shift($CurrentQueue);
$OnHash = in_array($Element, $reslist['prod']);
$this->UpdateRessource($BuildEndTime, !$OnHash);
@@ -372,7 +397,7 @@ private function CheckPlanetBuildingQueue()
if (count($CurrentQueue) == 0) {
$this->PLANET['b_building'] = 0;
$this->PLANET['b_building_id'] = '';
- $this->DEBUG->log("Queue(Builds): ".$this->PLANET['b_building_id']);
+
return false;
} else {
$this->PLANET['b_building_id'] = serialize($CurrentQueue);
@@ -382,7 +407,7 @@ private function CheckPlanetBuildingQueue()
public function SetNextQueueElementOnTop()
{
- global $resource, $db, $LNG;
+ global $resource, $LNG;
if (empty($this->PLANET['b_building_id'])) {
$this->PLANET['b_building'] = 0;
@@ -394,41 +419,43 @@ public function SetNextQueueElementOnTop()
$Loop = true;
while ($Loop == true)
{
- $ListIDArray = $CurrentQueue[0];
- $Element = $ListIDArray[0];
- $Level = $ListIDArray[1];
- $BuildMode = $ListIDArray[4];
- $ForDestroy = ($BuildMode == 'destroy') ? true : false;
- $BuildTime = GetBuildingTime($this->USER, $this->PLANET, $Element, $ForDestroy);
- $BuildEndTime = $this->PLANET['b_building'] + $BuildTime;
- $CurrentQueue[0] = array($Element, $Level, $BuildTime, $BuildEndTime, $BuildMode);
- $HaveNoMoreLevel = false;
-
- $HaveRessources = IsElementBuyable($this->USER, $this->PLANET, $Element, true, $ForDestroy);
+ $ListIDArray = $CurrentQueue[0];
+ $Element = $ListIDArray[0];
+ $Level = $ListIDArray[1];
+ $BuildMode = $ListIDArray[4];
+ $ForDestroy = ($BuildMode == 'destroy') ? true : false;
+ $costRessources = BuildFunctions::getElementPrice($this->USER, $this->PLANET, $Element, $ForDestroy);
+ $BuildTime = BuildFunctions::getBuildingTime($this->USER, $this->PLANET, $Element, $costRessources);
+ $HaveRessources = BuildFunctions::isElementBuyable($this->USER, $this->PLANET, $Element, $costRessources);
+ $BuildEndTime = $this->PLANET['b_building'] + $BuildTime;
+ $CurrentQueue[0] = array($Element, $Level, $BuildTime, $BuildEndTime, $BuildMode);
+ $HaveNoMoreLevel = false;
if($ForDestroy && $this->PLANET[$resource[$Element]] == 0) {
$HaveRessources = false;
$HaveNoMoreLevel = true;
}
- if($HaveRessources == true) {
- $Needed = GetBuildingPrice ($this->USER, $this->PLANET, $Element, true, $ForDestroy);
- $this->PLANET['metal'] -= $Needed['metal'];
- $this->PLANET['crystal'] -= $Needed['crystal'];
- $this->PLANET['deuterium'] -= $Needed['deuterium'];
- $this->USER['darkmatter'] -= $Needed['darkmatter'];
+ if($HaveRessources === true) {
+ if(isset($costRessources[901])) { $this->PLANET[$resource[901]] -= $costRessources[901]; }
+ if(isset($costRessources[902])) { $this->PLANET[$resource[902]] -= $costRessources[902]; }
+ if(isset($costRessources[903])) { $this->PLANET[$resource[903]] -= $costRessources[903]; }
+ if(isset($costRessources[921])) { $this->USER[$resource[921]] -= $costRessources[921]; }
$NewQueue = serialize($CurrentQueue);
$Loop = false;
} else {
if($this->USER['hof'] == 1){
- if ($ForDestroy || $HaveNoMoreLevel)
+ if ($HaveNoMoreLevel) {
$Message = sprintf($LNG['sys_nomore_level'], $LNG['tech'][$Element]);
- else
- {
- $Needed = GetBuildingPrice($this->USER, $this->PLANET, $Element, true, $ForDestroy);
- $Message = sprintf($LNG['sys_notenough_money'], $this->PLANET['name'], $this->PLANET['id'], $this->PLANET['galaxy'], $this->PLANET['system'], $this->PLANET['planet'], $LNG['tech'][$Element], pretty_number ($this->PLANET['metal']), $LNG['Metal'], pretty_number ($this->PLANET['crystal']), $LNG['Crystal'], pretty_number ($this->PLANET['deuterium']), $LNG['Deuterium'], pretty_number ($Needed['metal']), $LNG['Metal'], pretty_number ($Needed['crystal']), $LNG['Crystal'], pretty_number ($Needed['deuterium']), $LNG['Deuterium']);
+ } else {
+ if(!isset($costRessources[901])) { $costRessources[901] = 0; }
+ if(!isset($costRessources[902])) { $costRessources[902] = 0; }
+ if(!isset($costRessources[903])) { $costRessources[903] = 0; }
+
+ $Message = sprintf($LNG['sys_notenough_money'], $this->PLANET['name'], $this->PLANET['id'], $this->PLANET['galaxy'], $this->PLANET['system'], $this->PLANET['planet'], $LNG['tech'][$Element], pretty_number ($this->PLANET['metal']), $LNG['tech'][901], pretty_number($this->PLANET['crystal']), $LNG['tech'][902], pretty_number ($this->PLANET['deuterium']), $LNG['tech'][903], pretty_number($costRessources[901]), $LNG['tech'][901], pretty_number ($costRessources[902]), $LNG['tech'][902], pretty_number ($costRessources[903]), $LNG['tech'][903]);
}
- SendSimpleMessage($this->USER['id'], '', $this->TIME, 99, $LNG['sys_buildlist'], $LNG['sys_buildlist_fail'], $Message);
+
+ SendSimpleMessage($this->USER['id'], 0, $this->TIME, 99, $LNG['sys_buildlist'], $LNG['sys_buildlist_fail'], $Message);
}
array_shift($CurrentQueue);
@@ -442,7 +469,7 @@ public function SetNextQueueElementOnTop()
$NewQueue = array();
foreach($CurrentQueue as $ListIDArray)
{
- $ListIDArray[2] = GetBuildingTime($this->USER, $this->PLANET, $ListIDArray[0], $ListIDArray[4] == 'destroy');
+ $ListIDArray[2] = BuildFunctions::getBuildingTime($this->USER, $this->PLANET, $ListIDArray[0], NULL, $ListIDArray[4] == 'destroy');
$BaseTime += $ListIDArray[2];
$ListIDArray[3] = $BaseTime;
$NewQueue[] = $ListIDArray;
@@ -454,7 +481,6 @@ public function SetNextQueueElementOnTop()
$this->PLANET['b_building'] = $BuildEndTime;
$this->PLANET['b_building_id'] = $NewQueue;
- $this->DEBUG->log("Queue(Builds): ".$this->PLANET['b_building_id']);
}
private function ResearchQueue()
@@ -465,7 +491,7 @@ private function ResearchQueue()
private function CheckUserTechQueue()
{
- global $resource, $db;
+ global $resource;
if (empty($this->USER['b_tech_id']) || $this->USER['b_tech'] > $this->TIME)
return false;
@@ -476,7 +502,7 @@ private function CheckUserTechQueue()
$this->Builded[$this->USER['b_tech_id']] += 1;
$this->USER[$resource[$this->USER['b_tech_id']]] += 1;
- $this->DEBUG->log("Done: Ship(ID:".$Element."): ".($this->USER[$resource[$this->USER['b_tech_id']]] - 1)." -> ".$this->USER[$resource[$this->USER['b_tech_id']]]);
+
$CurrentQueue = unserialize($this->USER['b_tech_queue']);
array_shift($CurrentQueue);
@@ -486,7 +512,7 @@ private function CheckUserTechQueue()
$this->USER['b_tech_id'] = 0;
$this->USER['b_tech_planet'] = 0;
$this->USER['b_tech_queue'] = '';
- $this->DEBUG->log("Queue(Tech): ".$this->USER['b_tech_queue']);
+
return false;
} else {
$this->USER['b_tech_queue'] = serialize(array_values($CurrentQueue));
@@ -496,7 +522,7 @@ private function CheckUserTechQueue()
public function SetNextQueueTechOnTop()
{
- global $resource, $db, $LNG;
+ global $resource, $LNG;
if (empty($this->USER['b_tech_queue'])) {
$this->USER['b_tech'] = 0;
@@ -512,48 +538,47 @@ public function SetNextQueueTechOnTop()
{
$ListIDArray = $CurrentQueue[0];
if($ListIDArray[4] != $this->PLANET['id'])
- $PLANET = $db->uniquequery("SELECT * FROM ".PLANETS." WHERE `id` = '".$ListIDArray[4]."';");
+ $PLANET = $GLOBALS['DATABASE']->getFirstRow("SELECT * FROM ".PLANETS." WHERE id = '".$ListIDArray[4]."';");
else
$PLANET = $this->PLANET;
- $PLANET[$resource[31].'_inter'] = $this->CheckAndGetLabLevel($this->USER, $PLANET);
+ $PLANET[$resource[31].'_inter'] = self::getNetworkLevel($this->USER, $PLANET);
$Element = $ListIDArray[0];
$Level = $ListIDArray[1];
- $BuildTime = GetBuildingTime($this->USER, $PLANET, $Element);
+ $costRessources = BuildFunctions::getElementPrice($this->USER, $PLANET, $Element);
+ $BuildTime = BuildFunctions::getBuildingTime($this->USER, $PLANET, $Element, $costRessources);
+ $HaveRessources = BuildFunctions::isElementBuyable($this->USER, $PLANET, $Element, $costRessources);
$BuildEndTime = $this->USER['b_tech'] + $BuildTime;
$CurrentQueue[0] = array($Element, $Level, $BuildTime, $BuildEndTime, $PLANET['id']);
- if($PLANET['id'] != $this->PLANET['id']) {
- $IsHash = in_array($Element, array(131, 132, 133));
+ $isAnotherPlanet = $ListIDArray[4] != $this->PLANET['id'];
+
+ if($isAnotherPlanet) {
+ $IsHash = !in_array($Element, array(131, 132, 133));
$RPLANET = new ResourceUpdate(true, false);
list(, $PLANET) = $RPLANET->CalcResource($this->USER, $PLANET, false, $this->USER['b_tech'], $IsHash);
}
- $HaveRessources = IsElementBuyable($this->USER, $PLANET, $Element, true, false);
-
if($HaveRessources == true) {
- $Needed = GetBuildingPrice($this->USER, $PLANET, $Element);
- $PLANET['metal'] -= $Needed['metal'];
- $PLANET['crystal'] -= $Needed['crystal'];
- $PLANET['deuterium'] -= $Needed['deuterium'];
- $this->USER['darkmatter'] -= $Needed['darkmatter'];
+ if(isset($costRessources[901])) { $PLANET[$resource[901]] -= $costRessources[901]; }
+ if(isset($costRessources[902])) { $PLANET[$resource[902]] -= $costRessources[902]; }
+ if(isset($costRessources[903])) { $PLANET[$resource[903]] -= $costRessources[903]; }
+ if(isset($costRessources[921])) { $this->USER[$resource[921]] -= $costRessources[921]; }
$this->USER['b_tech_id'] = $Element;
$this->USER['b_tech'] = $BuildEndTime;
$this->USER['b_tech_planet'] = $PLANET['id'];
$this->USER['b_tech_queue'] = serialize($CurrentQueue);
$Loop = false;
-
- if($ListIDArray[4] != $this->PLANET['id'])
- $RPLANET->SavePlanetToDB($this->USER, $PLANET);
- else
- $this->PLANET = $PLANET;
} else {
if($this->USER['hof'] == 1){
- $Needed = GetBuildingPrice($this->USER, $RPLANET->PLANET, $Element, true, $ForDestroy);
- $Message = sprintf($LNG['sys_notenough_money'], $PLANET['name'], $PLANET['id'], $PLANET['galaxy'], $PLANET['system'], $PLANET['planet'], $LNG['tech'][$Element], pretty_number($RPLANET->PLANET['metal']), $LNG['Metal'], pretty_number($RPLANET->PLANET['crystal']), $LNG['Crystal'], pretty_number($RPLANET->PLANET['deuterium']), $LNG['Deuterium'], pretty_number ($Needed['metal']), $LNG['Metal'], pretty_number ($Needed['crystal']), $LNG['Crystal'], pretty_number ($Needed['deuterium']), $LNG['Deuterium']);
- SendSimpleMessage($this->USER['id'], '', $this->TIME, 99, $LNG['sys_techlist'], $LNG['sys_buildlist_fail'], $Message);
+ if(!isset($costRessources[901])) { $costRessources[901] = 0; }
+ if(!isset($costRessources[902])) { $costRessources[902] = 0; }
+ if(!isset($costRessources[903])) { $costRessources[903] = 0; }
+
+ $Message = sprintf($LNG['sys_notenough_money'], $PLANET['name'], $PLANET['id'], $PLANET['galaxy'], $PLANET['system'], $PLANET['planet'], $LNG['tech'][$Element], pretty_number ($PLANET['metal']), $LNG['tech'][901], pretty_number($PLANET['crystal']), $LNG['tech'][902], pretty_number ($PLANET['deuterium']), $LNG['tech'][903], pretty_number($costRessources[901]), $LNG['tech'][901], pretty_number ($costRessources[902]), $LNG['tech'][902], pretty_number ($costRessources[903]), $LNG['tech'][903]);
+ SendSimpleMessage($this->USER['id'], 0, $this->USER['b_tech'], 99, $LNG['sys_techlist'], $LNG['sys_buildlist_fail'], $Message);
}
array_shift($CurrentQueue);
@@ -570,7 +595,7 @@ public function SetNextQueueTechOnTop()
$NewQueue = array();
foreach($CurrentQueue as $ListIDArray)
{
- $ListIDArray[2] = GetBuildingTime($this->USER, $Planet, $ListIDArray[0]);
+ $ListIDArray[2] = BuildFunctions::getBuildingTime($this->USER, $PLANET, $ListIDArray[0]);
$BaseTime += $ListIDArray[2];
$ListIDArray[3] = $BaseTime;
$NewQueue[] = $ListIDArray;
@@ -578,31 +603,18 @@ public function SetNextQueueTechOnTop()
$CurrentQueue = $NewQueue;
}
}
+
+ if($isAnotherPlanet)
+ $RPLANET->SavePlanetToDB($this->USER, $PLANET);
+ else
+ $this->PLANET = $PLANET;
}
- $this->DEBUG->log("Queue(Tech): ".$this->USER['b_tech_queue']);
- }
-
- public function CheckAndGetLabLevel()
- {
- global $resource, $db, $USER, $PLANET;
- if($USER[$resource[123]] == 0)
- $lablevel = $PLANET[$resource[31]];
- else {
- $LevelRow = $db->query("SELECT ".$resource[31]." FROM ".PLANETS." WHERE `id` != '".$PLANET['id']."' AND `id_owner` = '".$USER['id']."' AND `destruyed` = 0 ORDER BY ".$resource[31]." DESC LIMIT ".($USER[$resource[123]]).";");
- $lablevel[] = $PLANET[$resource[31]];
- while($Levels = $db->fetch_array($LevelRow))
- {
- $lablevel[] = $Levels[$resource[31]];
- }
- $db->free_result($LevelRow);
- }
- return $lablevel;
}
public function SavePlanetToDB($USER = NULL, $PLANET = NULL)
{
- global $resource, $db, $reslist;
+ global $resource, $reslist;
if(is_null($USER))
global $USER;
@@ -610,57 +622,58 @@ public function SavePlanetToDB($USER = NULL, $PLANET = NULL)
if(is_null($PLANET))
global $PLANET;
- $Qry = "LOCK TABLE ".PLANETS." as p WRITE, ".USERS." as u WRITE, ".SESSION." as s WRITE;
- UPDATE ".PLANETS." as p, ".USERS." as u, ".SESSION." as s SET
- `p`.`metal` = '".floattostring($PLANET['metal'])."',
- `p`.`crystal` = '".floattostring($PLANET['crystal'])."',
- `p`.`deuterium` = '".floattostring($PLANET['deuterium'])."',
- `p`.`eco_hash` = '".$PLANET['eco_hash']."',
- `p`.`last_update` = '".$PLANET['last_update']."',
- `p`.`b_building` = '".$PLANET['b_building']."',
- `p`.`b_building_id` = '".$PLANET['b_building_id']."',
- `p`.`field_current` = '".$PLANET['field_current']."',
- `p`.`b_hangar_id` = '".$PLANET['b_hangar_id']."',
- `p`.`metal_perhour` = '".$PLANET['metal_perhour']."',
- `p`.`crystal_perhour` = '".$PLANET['crystal_perhour']."',
- `p`.`deuterium_perhour` = '".$PLANET['deuterium_perhour']."',
- `p`.`metal_max` = '".$PLANET['metal_max']."',
- `p`.`crystal_max` = '".$PLANET['crystal_max']."',
- `p`.`deuterium_max` = '".$PLANET['deuterium_max']."',
- `p`.`energy_used` = '".$PLANET['energy_used']."',
- `p`.`energy_max` = '".$PLANET['energy_max']."',
- `p`.`b_hangar` = '". $PLANET['b_hangar'] ."', ";
+ $Qry = "LOCK TABLE ".PLANETS." as p WRITE, ".USERS." as u WRITE;
+ UPDATE ".PLANETS." as p, ".USERS." as u SET
+ p.metal = ".$PLANET['metal'].",
+ p.crystal = ".$PLANET['crystal'].",
+ p.deuterium = ".$PLANET['deuterium'].",
+ p.eco_hash = '".$PLANET['eco_hash']."',
+ p.last_update = ".$PLANET['last_update'].",
+ p.b_building = '".$PLANET['b_building']."',
+ p.b_building_id = '".$PLANET['b_building_id']."',
+ p.field_current = ".$PLANET['field_current'].",
+ p.b_hangar_id = '".$PLANET['b_hangar_id']."',
+ p.metal_perhour = ".$PLANET['metal_perhour'].",
+ p.crystal_perhour = ".$PLANET['crystal_perhour'].",
+ p.deuterium_perhour = ".$PLANET['deuterium_perhour'].",
+ p.metal_max = ".$PLANET['metal_max'].",
+ p.crystal_max = ".$PLANET['crystal_max'].",
+ p.deuterium_max = ".$PLANET['deuterium_max'].",
+ p.energy_used = ".$PLANET['energy_used'].",
+ p.energy = ".$PLANET['energy'].",
+ p.b_hangar = ". $PLANET['b_hangar'] .", ";
if (!empty($this->Builded))
{
foreach($this->Builded as $Element => $Count)
{
- $Element = (int)$Element;
- if(empty($resource[$Element]) || empty($Count))
+ $Element = (int) $Element;
+
+ if(empty($resource[$Element]) || empty($Count)) {
continue;
+ }
- if(in_array($Element, $reslist['one']))
- $Qry .= "`p`.`".$resource[$Element]."` = '1', ";
- elseif(isset($PLANET[$resource[$Element]]))
- $Qry .= "`p`.`".$resource[$Element]."` = `p`.`".$resource[$Element]."` + '".$Count."', ";
- elseif(isset($USER[$resource[$Element]]))
- $Qry .= "`u`.`".$resource[$Element]."` = `u`.`".$resource[$Element]."` + '".$Count."', ";
+ if(in_array($Element, $reslist['one'])) {
+ $Qry .= "p.".$resource[$Element]." = '1', ";
+ } elseif(isset($PLANET[$resource[$Element]])) {
+ $Qry .= "p.".$resource[$Element]." = p.".$resource[$Element]." + ".floattostring($Count).", ";
+ } elseif(isset($USER[$resource[$Element]])) {
+ $Qry .= "u.".$resource[$Element]." = u.".$resource[$Element]." + ".floattostring($Count).", ";
+ }
}
}
- $Qry .= "`u`.`darkmatter` = '".$USER['darkmatter']."',
- `u`.`b_tech` = '".$USER['b_tech']."',
- `u`.`b_tech_id` = '".$USER['b_tech_id']."',
- `u`.`b_tech_planet` = '".$USER['b_tech_planet']."',
- `u`.`b_tech_queue` = '".$USER['b_tech_queue']."'
+ $Qry .= "u.darkmatter = ".$USER['darkmatter'].",
+ u.b_tech = '".$USER['b_tech']."',
+ u.b_tech_id = '".$USER['b_tech_id']."',
+ u.b_tech_planet = '".$USER['b_tech_planet']."',
+ u.b_tech_queue = '".$USER['b_tech_queue']."'
WHERE
- `p`.`id` = '". $PLANET['id'] ."' AND
- `u`.`id` = '".$USER['id']."' AND
- `s`.`sess_id` = '".session_id()."';
+ p.id = ".$PLANET['id']." AND
+ u.id = ".$USER['id'].";
UNLOCK TABLES;";
- $db->multi_query($Qry);
+ $GLOBALS['DATABASE']->multi_query($Qry);
$this->Builded = array();
- $this->DEBUG->log("Total: Metal: ".pretty_number($PLANET['metal'])." Crystal: ".pretty_number($PLANET['crystal'])." Deuterium: ".pretty_number($PLANET['deuterium']));
+
return array($USER, $PLANET);
}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/includes/classes/class.Records.php b/includes/classes/class.Records.php
deleted file mode 100644
index b0577b6..0000000
--- a/includes/classes/class.Records.php
+++ /dev/null
@@ -1,86 +0,0 @@
-.
- *
- * @package 2Moons
- * @author Slaver
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
- * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
- * @info $Id$
- * @link http://code.google.com/p/2moons/
- */
-
-class records
-{
- public static $File = "cache/CacheRecords.php";
- public $maxinfos = array();
-
- function SetIfRecord($ID, $Data)
- {
- global $CONF, $resource;
- if(($CONF['stat'] == 1 && $Data['authlevel'] >= $CONF['stat_level']) || !empty($Data['bana']))
- return;
-
- if(!isset($this->maxinfos[$Data['universe']]))
- $this->maxinfos[$Data['universe']] = array();
-
- if(!isset($this->maxinfos[$Data['universe']][$ID]))
- $this->maxinfos[$Data['universe']][$ID] = array('maxlvl' => 0, 'username' => '');
-
- if($Data[$resource[$ID]] == 0)
- return;
-
- if($this->maxinfos[$Data['universe']][$ID]['maxlvl'] < $Data[$resource[$ID]])
- $this->maxinfos[$Data['universe']][$ID] = array('maxlvl' => $Data[$resource[$ID]], 'username' => $this->GetPlayerCardLink($Data));
- elseif($this->maxinfos[$Data['universe']][$ID]['maxlvl'] == $Data[$resource[$ID]] && strpos($this->maxinfos[$Data['universe']][$ID]['username'], '>'.$Data['username'].'<') === false)
- $this->maxinfos[$Data['universe']][$ID]['username'] = implode(array($this->maxinfos[$Data['universe']][$ID]['username'], $this->GetPlayerCardLink($Data)), '
'); - } - - function GetPlayerCardLink($Data) - { - return ''.$Data['username'].''; - } - - function BuildRecordCache() - { - $Elements = array_merge($GLOBALS['reslist']['build'], $GLOBALS['reslist']['tech'], $GLOBALS['reslist']['fleet'], $GLOBALS['reslist']['defense']); - $PHP = "maxinfos as $Uni => $Records) { - $PHP .= "\t".$Uni." => array(\n"; - foreach($Elements as $ElementID) { - $PHP .= "\t\t".$ElementID." => array('username' => '".(isset($Records[$ElementID]['username']) ? $Records[$ElementID]['username'] : '')."', 'maxlvl' => '".(isset($Records[$ElementID]['maxlvl']) ? pretty_number($Records[$ElementID]['maxlvl']) : '0')."'),\n"; - } - $PHP .= "\t),\n"; - } - $PHP .= "\n);\n?>"; - file_put_contents(ROOT_PATH.self::$File, $PHP); - } - - function GetRecords($Uni) - { - if(!file_exists(ROOT_PATH.self::$File)) - return array(); - - require(ROOT_PATH.self::$File); - return $RecordsArray[$Uni]; - } -} - -?> \ No newline at end of file diff --git a/includes/classes/class.Session.php b/includes/classes/class.Session.php index bc696f3..287a0ca 100644 --- a/includes/classes/class.Session.php +++ b/includes/classes/class.Session.php @@ -2,7 +2,7 @@ /** * 2Moons - * Copyright (C) 2011 Slaver + * Copyright (C) 2012 Jan * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,46 +18,93 @@ * along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan
+ * @copyright 2006 Perberos (UGamela)
+ * @copyright 2008 Chlorel (XNova)
+ * @copyright 2012 Jan (2Moons)
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 2.0 (2012-11-31)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
class Session
{
- function IsUserLogin()
+ private static $obj;
+
+ function __construct()
{
- return !empty($_SESSION['id']);
+ ini_set('session.use_cookies', '1');
+ ini_set('session.use_only_cookies', '1');
+ ini_set('session.use_trans_sid', 0);
+ ini_set('session.auto_start', '0');
+ ini_set('session.serialize_handler', 'php');
+ ini_set('session.gc_maxlifetime', SESSION_LIFETIME);
+ ini_set('session.gc_probability', '1');
+ ini_set('session.gc_divisor', '1000');
+ ini_set('session.bug_compat_warn', '0');
+ ini_set('session.bug_compat_42', '0');
+ ini_set('session.cookie_httponly', true);
+
+ //session_set_cookie_params(SESSION_LIFETIME, HTTP_ROOT, HTTP_HOST, HTTPS, true);
+
+ $HTTP_ROOT = MODE === 'INSTALL' ? dirname(HTTP_ROOT) : HTTP_ROOT;
+
+ session_set_cookie_params(SESSION_LIFETIME, $HTTP_ROOT, NULL, HTTPS, true);
+ session_cache_limiter('nocache');
+ session_name('2Moons');
}
- function GetSessionFromDB()
+ static function redirectCode($Code)
{
- global $db;
- return $db->uniquequery("SELECT * FROM ".SESSION." WHERE `sess_id` = '".session_id()."' AND `user_id` = '".$_SESSION['id']."';");
+ HTTP::redirectTo('index.php?code='.$Code);
}
- function ErrorMessage($Code)
+ static function create($userID, $planetID = 0)
{
- redirectTo('index.php?code='.$Code);
+ self::$obj = new self;
+
+ if(!isset($_SESSION)) {
+ session_start();
+ }
+
+ $GLOBALS['DATABASE']->query("REPLACE INTO ".SESSION." SET
+ sessionID = '".session_id()."',
+ userID = ".$userID.",
+ lastonline = ".TIMESTAMP.",
+ userIP = '".$_SERVER['REMOTE_ADDR']."';");
+
+ $_SESSION['id'] = $userID;
+ $_SESSION['agent'] = $_SERVER['HTTP_USER_AGENT'];
+ $_SESSION['planet'] = $planetID;
+
+ return self::$obj;
}
- function CreateSession($ID, $Username, $MainPlanet, $Universe, $Authlevel = 0, $dpath = DEFAULT_THEME)
+ function CreateSession($userID, $userName, $planetID = 0, $uni, $authlevel, $dpath)
{
- global $db;
- $Path = $this->GetPath();
- $db->query("INSERT INTO ".SESSION." (`sess_id`, `user_id`, `user_ip`, `user_side`, `user_lastactivity`) VALUES ('".session_id()."', '".$ID."', '".$_SERVER['REMOTE_ADDR']."', '".$db->sql_escape($Path)."', '".TIMESTAMP."') ON DUPLICATE KEY UPDATE `sess_id` = '".session_id()."', `user_id` = '".$ID."', `user_ip` = '".$_SERVER['REMOTE_ADDR']."', `user_side` = '".$db->sql_escape($Path)."';");
- $_SESSION['id'] = $ID;
- $_SESSION['username'] = $Username;
- $_SESSION['authlevel'] = $Authlevel;
- $_SESSION['path'] = $Path;
- $_SESSION['dpath'] = $dpath;
- $_SESSION['planet'] = $MainPlanet;
- $_SESSION['uni'] = $Universe;
- $_SESSION['agent'] = $_SERVER['HTTP_USER_AGENT'];
+ self::create($userID, $planetID = 0);
+ $_SESSIOn['authlevel'] = $authlevel;
+ $_SESSIOn['uni'] = $uni;
+ $_SESSIOn['dpath'] = $dpath;
+ }
+
+ function IsUserLogin()
+ {
+ return $this->isActiveSession();
+ }
+
+ function isActiveSession()
+ {
+ if(!isset($_SESSION)) {
+ session_start();
+ }
+ return !empty($_SESSION['id']);
+ }
+
+ function GetSessionFromDB()
+ {
+ return $GLOBALS['DATABASE']->getFirstRow("SELECT * FROM ".SESSION." WHERE sessionID = '".session_id()."' AND userID = ".$_SESSION['id'].";");
}
function GetPath()
@@ -65,36 +112,31 @@ function GetPath()
return basename($_SERVER['SCRIPT_NAME']).(!empty($_SERVER['QUERY_STRING']) ? '?'.$_SERVER['QUERY_STRING'] : '');
}
- function UpdateSession()
- {
- global $CONF, $db;
-
- if(request_var('ajax', 0) == 1)
- return true;
-
+ function updateSession()
+ {
$_SESSION['last'] = $this->GetSessionFromDB();
- if(empty($_SESSION['last']) || !$this->CompareIPs($_SESSION['last']['user_ip'])) {
+ if(empty($_SESSION['last']) || !$this->CompareIPs($_SESSION['last']['userIP']))
+ {
$this->DestroySession();
- $this->ErrorMessage(2);
+ self::redirectCode(2);
}
- $SelectPlanet = request_var('cp',0);
+ $SelectPlanet = HTTP::_GP('cp',0);
+
if(!empty($SelectPlanet))
- $IsPlanetMine = $db->uniquequery("SELECT `id` FROM ".PLANETS." WHERE `id` = '".$SelectPlanet."' AND `id_owner` = '".$_SESSION['id']."';");
-
+ {
+ $IsPlanetMine = $GLOBALS['DATABASE']->getFirstRow("SELECT id FROM ".PLANETS." WHERE id = '".$SelectPlanet."' AND id_owner = '".$_SESSION['id']."';");
+ }
$_SESSION['path'] = $this->GetPath();
$_SESSION['planet'] = !empty($IsPlanetMine['id']) ? $IsPlanetMine['id'] : $_SESSION['planet'];
- $SQL = "UPDATE ".USERS." as u, ".SESSION." as s SET ";
- $SQL .= "u.`onlinetime` = '".TIMESTAMP."', ";
- $SQL .= "u.`user_lastip` = '".$_SERVER['REMOTE_ADDR'] ."', ";
- $SQL .= "s.`user_ip` = '".$_SERVER['REMOTE_ADDR']."', ";
- $SQL .= "s.`user_side` = '".$db->sql_escape($_SESSION['path'])."', ";
- $SQL .= "s.`user_lastactivity` = '".TIMESTAMP."' ";
- $SQL .= "WHERE ";
- $SQL .= "u.`id` = '".$_SESSION['id']."' AND s.`sess_id` = '".session_id()."';";
- $db->query($SQL);
-
+ $GLOBALS['DATABASE']->query("UPDATE ".USERS." u, ".SESSION." s SET
+ u.onlinetime = ".TIMESTAMP.",
+ s.lastonline = ".TIMESTAMP.",
+ u.user_lastip = '".$_SERVER['REMOTE_ADDR']."',
+ s.userIP = '".$_SERVER['REMOTE_ADDR']."'
+ WHERE
+ sessionID = '".session_id()."' AND u.id = s.userID;");
return true;
}
@@ -140,10 +182,9 @@ function short_ipv6($ip, $length)
function DestroySession()
{
- global $db;
- $db->query("DELETE FROM ".SESSION." WHERE sess_id = '".session_id()."'");
- session_destroy();
- setcookie(session_name(), '', time() - 42000);
+ $GLOBALS['DATABASE']->query("DELETE FROM ".SESSION." WHERE sessionID = '".session_id()."';");
+ @session_destroy();
}
-}
-?>
\ No newline at end of file
+
+
+}
\ No newline at end of file
diff --git a/includes/classes/class.StatBanner.php b/includes/classes/class.StatBanner.php
index b01eb53..22aba07 100644
--- a/includes/classes/class.StatBanner.php
+++ b/includes/classes/class.StatBanner.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2012 Jan Kröpke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,91 +18,80 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
class StatBanner {
- private $textcolor = "FFFFFF";
- private $source = "styles/images/banner.jpg";
+ private $source = "styles/resource/images/banner.jpg";
// Function to center text in the created banner
- private function CenterTextBanner($z,$y,$zone) {
- $a = strlen($z);
- $b = imagefontwidth($y);
- $c = $a*$b;
- $d = $zone-$c;
- $e = $d/2;
- return $e;
+ private function CenterTextBanner($X, $String, $Font, $Size) {
+
+ $boxSize = imagettfbbox($Size, 0, $Font, $String);
+
+ $minX = min(array($boxSize[0], $boxSize[2], $boxSize[4], $boxSize[6]));
+ $maxX = max(array($boxSize[0], $boxSize[2], $boxSize[4], $boxSize[6]));
+
+ $boxWidth = $maxX - $minX;
+ return $X - ($boxWidth * 0.7);
}
public function GetData($id)
{
- global $db;
- return $db->uniquequery("SELECT a.username, b.build_points, b.fleet_points, b.defs_points, b.tech_points, b.total_points, b.total_rank, c.name, c.galaxy, c.system, c.planet, d.game_name, d.users_amount, d.ttf_file FROM ".USERS." as a, ".STATPOINTS." as b, ".PLANETS." as c ,".CONFIG." as d WHERE a.id = '".$id."' AND b.stat_type = '1' AND b.id_owner = '".$id."' AND c.id = a.id_planet AND d.uni = a.universe;");
+ return $GLOBALS['DATABASE']->getFirstRow("SELECT a.username, a.wons, a.loos, a.draws, b.total_points, b.total_rank, c.name, c.galaxy, c.system, c.planet, d.game_name, d.users_amount, d.ttf_file FROM ".USERS." as a, ".STATPOINTS." as b, ".PLANETS." as c ,".CONFIG." as d WHERE a.id = '".$id."' AND b.stat_type = '1' AND b.id_owner = '".$id."' AND c.id = a.id_planet AND d.uni = a.universe;");
}
- public function CreateUTF8Banner($Query) {
- global $LNG, $LANG;
+ public function CreateUTF8Banner($data) {
+ global $LNG;
$image = imagecreatefromjpeg($this->source);
- $date = date($LNG['php_dateformat'], TIMESTAMP);
+ $date = _date($LNG['php_dateformat'], TIMESTAMP);
- $Font = $Query['ttf_file'];
+ $Font = $data['ttf_file'];
if(!file_exists($Font))
$this->BannerError('TTF Font missing!');
- // Variables
- $b_univ = $Query['game_name'];
- $b_user = $Query['username'];
- $b_planet = $Query['name'];
- $b_xyz = "[".$Query['galaxy'].":".$Query['system'].":".$Query['planet']."]";
- $b_lvl = $Query['total_rank'] ."/".$Query['users_amount'];
- $b_build = $LNG['ub_buildings'] .": ".shortly_number($Query['build_points']);
- $b_fleet = $LNG['ub_fleets'] .": ".shortly_number($Query['fleet_points']);
- $b_def = $LNG['ub_defenses'] .": ".shortly_number($Query['defs_points']);
- $b_search = $LNG['ub_researh'] .": ".shortly_number($Query['tech_points']);
- $b_total = $LNG['ub_points'] .": ".shortly_number($Query['total_points']);
-
-
- // Colors
- $red = hexdec(substr($this->textcolor,0,2));
- $green = hexdec(substr($this->textcolor,2,4));
- $blue = hexdec(substr($this->textcolor,4,6));
- $select = imagecolorallocate($image,$red,$green,$blue);
-
- // Display
- // Univers name
- imagettftext($image, 7, 0, $this->CenterTextBanner($b_univ, 1, 630), 65, $select, $Font, $b_univ);
- // Today date
- imagettftext($image, 7, 0, $this->CenterTextBanner($date, 1, 630), 75, $select, $Font, $date);
- // Player name
- imagettftext($image, 10, 0, 15, 18, $select, $Font, $b_user);
- // Player b_planet
- imagettftext($image, 10, 0, 150, 18, $select, $Font, $b_planet." ".$b_xyz);
- // Player level
- imagettftext($image, 14, 0, $this->CenterTextBanner($b_lvl,10,795), 46, $select, $Font, $b_lvl);
- // Player stats
- imagettftext($image, 10, 0, 15, 36, $select, $Font, $b_build);
- imagettftext($image, 10, 0, 15, 51, $select, $Font, $b_fleet);
- imagettftext($image, 10, 0, 230, 36, $select, $Font, $b_search);
- imagettftext($image, 10, 0, 230, 51, $select, $Font, $b_def);
- imagettftext($image, 10, 0, 15, 66, $select, $Font, $b_total);
+ // Colors
+ $color = imagecolorallocate($image, 255, 255, 225);
+ $shadow = imagecolorallocate($image, 33, 33, 33);
+
+ $total = $data['wons'] + $data['loos'] + $data['draws'];
+
+ $quote = $total != 0 ? $data['wons'] / $total * 100 : 0;
+
+ // Username
+ imagettftext($image, 20, 0, 20, 31, $shadow, $Font, $data['username']);
+ imagettftext($image, 20, 0, 20, 30, $color, $Font, $data['username']);
+
+ imagettftext($image, 16, 0, 250, 31, $shadow, $Font, $data['game_name']);
+ imagettftext($image, 16, 0, 250, 30, $color, $Font, $data['game_name']);
+
+ imagettftext($image, 11, 0, 20, 60, $shadow, $Font, $LNG['ub_rank'].': '.$data['total_rank']);
+ imagettftext($image, 11, 0, 20, 59, $color, $Font, $LNG['ub_rank'].': '.$data['total_rank']);
+
+ imagettftext($image, 11, 0, 20, 81, $shadow, $Font, $LNG['ub_points'].': '.html_entity_decode(shortly_number($data['total_points'])));
+ imagettftext($image, 11, 0, 20, 80, $color, $Font, $LNG['ub_points'].': '.html_entity_decode(shortly_number($data['total_points'])));
+
+ imagettftext($image, 11, 0, 250, 60, $shadow, $Font, $LNG['ub_fights'].': '.html_entity_decode(shortly_number($total, 0)));
+ imagettftext($image, 11, 0, 250, 59, $color, $Font, $LNG['ub_fights'].': '.html_entity_decode(shortly_number($total, 0)));
+
+ imagettftext($image, 11, 0, 250, 81, $shadow, $Font, $LNG['ub_quote'].': '.html_entity_decode(shortly_number($quote, 2)).'%');
+ imagettftext($image, 11, 0, 250, 80, $color, $Font, $LNG['ub_quote'].': '.html_entity_decode(shortly_number($quote, 2)).'%');
if(!isset($_GET['debug']))
- header("Content-type: image/jpg");
+ HTTP::sendHeader('Content-type', 'image/jpg');
ImageJPEG($image);
imagedestroy($image);
}
function BannerError($Message) {
- header("Content-type: image/jpg");
+ HTTP::sendHeader('Content-type', 'image/jpg');
$im = ImageCreate(450, 80);
$background_color = ImageColorAllocate ($im, 255, 255, 255);
$text_color = ImageColorAllocate($im, 233, 14, 91);
@@ -111,5 +100,4 @@ function BannerError($Message) {
imagedestroy($im);
exit;
}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/includes/classes/class.StringParser.php b/includes/classes/class.StringParser.php
index 87c2d32..c3a4bcb 100644
--- a/includes/classes/class.StringParser.php
+++ b/includes/classes/class.StringParser.php
@@ -1540,5 +1540,3 @@ function _dumpToString () {
return "text \"".substr (preg_replace ('/\s+/', ' ', $this->content), 0, 40)."\" [f:".preg_replace ('/\s+/', ' ', join(':', array_keys ($this->_flags)))."]";
}
}
-
-?>
\ No newline at end of file
diff --git a/includes/classes/class.SupportTickets.php b/includes/classes/class.SupportTickets.php
new file mode 100644
index 0000000..bacb546
--- /dev/null
+++ b/includes/classes/class.SupportTickets.php
@@ -0,0 +1,70 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2013-01-17)
+ * @info $Id$
+ * @link http://2moons.cc/
+ */
+
+class SupportTickets
+{
+ function __construct()
+ {
+
+ }
+
+ function createTicket($ownerID, $categoryID, $subject) {
+ global $UNI;
+
+ $GLOBALS['DATABASE']->query("INSERT INTO ".TICKETS." SET ownerID = ".$ownerID.", universe = ".$UNI.", categoryID = ".$categoryID.", subject = '".$GLOBALS['DATABASE']->sql_escape($subject)."', time = ".TIMESTAMP.";");
+
+ return $GLOBALS['DATABASE']->GetInsertID();
+ }
+
+ function createAnswer($ticketID, $ownerID, $ownerName, $subject, $message, $status) {
+
+ $GLOBALS['DATABASE']->query("INSERT INTO ".TICKETS_ANSWER." SET ticketID = ".$ticketID.",
+ ownerID = ".$ownerID.",
+ ownerName = '".$GLOBALS['DATABASE']->sql_escape($ownerName)."',
+ subject = '".$GLOBALS['DATABASE']->sql_escape($subject)."',
+ message = '".$GLOBALS['DATABASE']->sql_escape($message)."',
+ time = ".TIMESTAMP.";");
+ $GLOBALS['DATABASE']->query("UPDATE ".TICKETS." SET status = ".$status." WHERE ticketID = ".$ticketID.";");
+
+ return $GLOBALS['DATABASE']->GetInsertID();
+ }
+
+ function getCategoryList() {
+
+ $categoryResult = $GLOBALS['DATABASE']->query("SELECT * FROM ".TICKETS_CATEGORY.";");
+ $categoryList = array();
+
+ while($categoryRow = $GLOBALS['DATABASE']->fetch_array($categoryResult)) {
+ $categoryList[$categoryRow['categoryID']] = $categoryRow['name'];
+ }
+
+ $GLOBALS['DATABASE']->free_result($categoryResult);
+
+ return $categoryList;
+ }
+}
diff --git a/includes/classes/class.phpmailer.php b/includes/classes/class.phpmailer.php
deleted file mode 100644
index ae227a8..0000000
--- a/includes/classes/class.phpmailer.php
+++ /dev/null
@@ -1,2320 +0,0 @@
-exceptions = ($exceptions == true);
- }
-
- /**
- * Sets message type to HTML.
- * @param bool $ishtml
- * @return void
- */
- public function IsHTML($ishtml = true) {
- if ($ishtml) {
- $this->ContentType = 'text/html';
- } else {
- $this->ContentType = 'text/plain';
- }
- }
-
- /**
- * Sets Mailer to send message using SMTP.
- * @return void
- */
- public function IsSMTP() {
- $this->Mailer = 'smtp';
- }
-
- /**
- * Sets Mailer to send message using PHP mail() function.
- * @return void
- */
- public function IsMail() {
- $this->Mailer = 'mail';
- }
-
- /**
- * Sets Mailer to send message using the $Sendmail program.
- * @return void
- */
- public function IsSendmail() {
- if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
- $this->Sendmail = '/var/qmail/bin/sendmail';
- }
- $this->Mailer = 'sendmail';
- }
-
- /**
- * Sets Mailer to send message using the qmail MTA.
- * @return void
- */
- public function IsQmail() {
- if (stristr(ini_get('sendmail_path'), 'qmail')) {
- $this->Sendmail = '/var/qmail/bin/sendmail';
- }
- $this->Mailer = 'sendmail';
- }
-
- /////////////////////////////////////////////////
- // METHODS, RECIPIENTS
- /////////////////////////////////////////////////
-
- /**
- * Adds a "To" address.
- * @param string $address
- * @param string $name
- * @return boolean true on success, false if address already used
- */
- public function AddAddress($address, $name = '') {
- return $this->AddAnAddress('to', $address, $name);
- }
-
- /**
- * Adds a "Cc" address.
- * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
- * @param string $address
- * @param string $name
- * @return boolean true on success, false if address already used
- */
- public function AddCC($address, $name = '') {
- return $this->AddAnAddress('cc', $address, $name);
- }
-
- /**
- * Adds a "Bcc" address.
- * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
- * @param string $address
- * @param string $name
- * @return boolean true on success, false if address already used
- */
- public function AddBCC($address, $name = '') {
- return $this->AddAnAddress('bcc', $address, $name);
- }
-
- /**
- * Adds a "Reply-to" address.
- * @param string $address
- * @param string $name
- * @return boolean
- */
- public function AddReplyTo($address, $name = '') {
- return $this->AddAnAddress('ReplyTo', $address, $name);
- }
-
- /**
- * Adds an address to one of the recipient arrays
- * Addresses that have been added already return false, but do not throw exceptions
- * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
- * @param string $address The email address to send to
- * @param string $name
- * @return boolean true on success, false if address already used or invalid in some way
- * @access private
- */
- private function AddAnAddress($kind, $address, $name = '') {
- if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
- echo 'Invalid recipient array: ' . kind;
- return false;
- }
- $address = trim($address);
- $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
- if (!self::ValidateAddress($address)) {
- $this->SetError($this->Lang('invalid_address').': '. $address);
- if ($this->exceptions) {
- throw new phpmailerException($this->Lang('invalid_address').': '.$address);
- }
- echo $this->Lang('invalid_address').': '.$address;
- return false;
- }
- if ($kind != 'ReplyTo') {
- if (!isset($this->all_recipients[strtolower($address)])) {
- array_push($this->$kind, array($address, $name));
- $this->all_recipients[strtolower($address)] = true;
- return true;
- }
- } else {
- if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
- $this->ReplyTo[strtolower($address)] = array($address, $name);
- return true;
- }
- }
- return false;
-}
-
-/**
- * Set the From and FromName properties
- * @param string $address
- * @param string $name
- * @return boolean
- */
- public function SetFrom($address, $name = '',$auto=1) {
- $address = trim($address);
- $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
- if (!self::ValidateAddress($address)) {
- $this->SetError($this->Lang('invalid_address').': '. $address);
- if ($this->exceptions) {
- throw new phpmailerException($this->Lang('invalid_address').': '.$address);
- }
- echo $this->Lang('invalid_address').': '.$address;
- return false;
- }
- $this->From = $address;
- $this->FromName = $name;
- if ($auto) {
- if (empty($this->ReplyTo)) {
- $this->AddAnAddress('ReplyTo', $address, $name);
- }
- if (empty($this->Sender)) {
- $this->Sender = $address;
- }
- }
- return true;
- }
-
- /**
- * Check that a string looks roughly like an email address should
- * Static so it can be used without instantiation
- * Tries to use PHP built-in validator in the filter extension (from PHP 5.2), falls back to a reasonably competent regex validator
- * Conforms approximately to RFC2822
- * @link http://www.hexillion.com/samples/#Regex Original pattern found here
- * @param string $address The email address to check
- * @return boolean
- * @static
- * @access public
- */
- public static function ValidateAddress($address) {
- if (function_exists('filter_var')) { //Introduced in PHP 5.2
- if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
- return false;
- } else {
- return true;
- }
- } else {
- return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address);
- }
- }
-
- /////////////////////////////////////////////////
- // METHODS, MAIL SENDING
- /////////////////////////////////////////////////
-
- /**
- * Creates message and assigns Mailer. If the message is
- * not sent successfully then it returns false. Use the ErrorInfo
- * variable to view description of the error.
- * @return bool
- */
- public function Send() {
- try {
- if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
- throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
- }
-
- // Set whether the message is multipart/alternative
- if(!empty($this->AltBody)) {
- $this->ContentType = 'multipart/alternative';
- }
-
- $this->error_count = 0; // reset errors
- $this->SetMessageType();
- $header = $this->CreateHeader();
- $body = $this->CreateBody();
-
- if (empty($this->Body)) {
- throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL);
- }
-
- // digitally sign with DKIM if enabled
- if ($this->DKIM_domain && $this->DKIM_private) {
- $header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
- $header = str_replace("\r\n","\n",$header_dkim) . $header;
- }
-
- // Choose the mailer and send through it
- switch($this->Mailer) {
- case 'sendmail':
- return $this->SendmailSend($header, $body);
- case 'smtp':
- return $this->SmtpSend($header, $body);
- default:
- return $this->MailSend($header, $body);
- }
-
- } catch (phpmailerException $e) {
- $this->SetError($e->getMessage());
- if ($this->exceptions) {
- throw $e;
- }
- echo $e->getMessage()."\n";
- return false;
- }
- }
-
- /**
- * Sends mail using the $Sendmail program.
- * @param string $header The message headers
- * @param string $body The message body
- * @access protected
- * @return bool
- */
- protected function SendmailSend($header, $body) {
- if ($this->Sender != '') {
- $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
- } else {
- $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
- }
- if ($this->SingleTo === true) {
- foreach ($this->SingleToArray as $key => $val) {
- if(!@$mail = popen($sendmail, 'w')) {
- throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
- }
- fputs($mail, "To: " . $val . "\n");
- fputs($mail, $header);
- fputs($mail, $body);
- $result = pclose($mail);
- // implement call back function if it exists
- $isSent = ($result == 0) ? 1 : 0;
- $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
- if($result != 0) {
- throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
- }
- }
- } else {
- if(!@$mail = popen($sendmail, 'w')) {
- throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
- }
- fputs($mail, $header);
- fputs($mail, $body);
- $result = pclose($mail);
- // implement call back function if it exists
- $isSent = ($result == 0) ? 1 : 0;
- $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
- if($result != 0) {
- throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
- }
- }
- return true;
- }
-
- /**
- * Sends mail using the PHP mail() function.
- * @param string $header The message headers
- * @param string $body The message body
- * @access protected
- * @return bool
- */
- protected function MailSend($header, $body) {
- $toArr = array();
- foreach($this->to as $t) {
- $toArr[] = $this->AddrFormat($t);
- }
- $to = implode(', ', $toArr);
-
- $params = sprintf("-oi -f %s", $this->Sender);
- if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
- $old_from = ini_get('sendmail_from');
- ini_set('sendmail_from', $this->Sender);
- if ($this->SingleTo === true && count($toArr) > 1) {
- foreach ($toArr as $key => $val) {
- $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
- // implement call back function if it exists
- $isSent = ($rt == 1) ? 1 : 0;
- $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
- }
- } else {
- $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
- // implement call back function if it exists
- $isSent = ($rt == 1) ? 1 : 0;
- $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
- }
- } else {
- if ($this->SingleTo === true && count($toArr) > 1) {
- foreach ($toArr as $key => $val) {
- $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
- // implement call back function if it exists
- $isSent = ($rt == 1) ? 1 : 0;
- $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
- }
- } else {
- $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
- // implement call back function if it exists
- $isSent = ($rt == 1) ? 1 : 0;
- $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
- }
- }
- if (isset($old_from)) {
- ini_set('sendmail_from', $old_from);
- }
- if(!$rt) {
- throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
- }
- return true;
- }
-
- /**
- * Sends mail via SMTP using PhpSMTP
- * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
- * @param string $header The message headers
- * @param string $body The message body
- * @uses SMTP
- * @access protected
- * @return bool
- */
- protected function SmtpSend($header, $body) {
- require_once $this->PluginDir . 'class.smtp.php';
- $bad_rcpt = array();
-
- if(!$this->SmtpConnect()) {
- throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
- }
- $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
- if(!$this->smtp->Mail($smtp_from)) {
- throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
- }
-
- // Attempt to send attach all recipients
- foreach($this->to as $to) {
- if (!$this->smtp->Recipient($to[0])) {
- $bad_rcpt[] = $to[0];
- // implement call back function if it exists
- $isSent = 0;
- $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
- } else {
- // implement call back function if it exists
- $isSent = 1;
- $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
- }
- }
- foreach($this->cc as $cc) {
- if (!$this->smtp->Recipient($cc[0])) {
- $bad_rcpt[] = $cc[0];
- // implement call back function if it exists
- $isSent = 0;
- $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
- } else {
- // implement call back function if it exists
- $isSent = 1;
- $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
- }
- }
- foreach($this->bcc as $bcc) {
- if (!$this->smtp->Recipient($bcc[0])) {
- $bad_rcpt[] = $bcc[0];
- // implement call back function if it exists
- $isSent = 0;
- $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
- } else {
- // implement call back function if it exists
- $isSent = 1;
- $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
- }
- }
-
-
- if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
- $badaddresses = implode(', ', $bad_rcpt);
- throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
- }
- if(!$this->smtp->Data($header . $body)) {
- throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
- }
- if($this->SMTPKeepAlive == true) {
- $this->smtp->Reset();
- }
- return true;
- }
-
- /**
- * Initiates a connection to an SMTP server.
- * Returns false if the operation failed.
- * @uses SMTP
- * @access public
- * @return bool
- */
- public function SmtpConnect() {
- if(is_null($this->smtp)) {
- $this->smtp = new SMTP();
- }
-
- $this->smtp->do_debug = $this->SMTPDebug;
- $hosts = explode(';', $this->Host);
- $index = 0;
- $connection = $this->smtp->Connected();
-
- // Retry while there is no connection
- try {
- while($index < count($hosts) && !$connection) {
- $hostinfo = array();
- if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
- $host = $hostinfo[1];
- $port = $hostinfo[2];
- } else {
- $host = $hosts[$index];
- $port = $this->Port;
- }
-
- $tls = ($this->SMTPSecure == 'tls');
- $ssl = ($this->SMTPSecure == 'ssl');
-
- if ($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
-
- $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
- $this->smtp->Hello($hello);
-
- if ($tls) {
- if (!$this->smtp->StartTLS()) {
- throw new phpmailerException($this->Lang('tls'));
- }
-
- //We must resend HELO after tls negotiation
- $this->smtp->Hello($hello);
- }
-
- $connection = true;
- if ($this->SMTPAuth) {
- if (!$this->smtp->Authenticate($this->Username, $this->Password)) {
- throw new phpmailerException($this->Lang('authenticate'));
- }
- }
- }
- $index++;
- if (!$connection) {
- throw new phpmailerException($this->Lang('connect_host'));
- }
- }
- } catch (phpmailerException $e) {
- $this->smtp->Reset();
- throw $e;
- }
- return true;
- }
-
- /**
- * Closes the active SMTP session if one exists.
- * @return void
- */
- public function SmtpClose() {
- if(!is_null($this->smtp)) {
- if($this->smtp->Connected()) {
- $this->smtp->Quit();
- $this->smtp->Close();
- }
- }
- }
-
- /**
- * Sets the language for all class error messages.
- * Returns false if it cannot load the language file. The default language is English.
- * @param string $LNGcode ISO 639-1 2-character language code (e.g. Portuguese: "br")
- * @param string $LNG_path Path to the language file directory
- * @access public
- */
- function SetLanguage($LNGcode = 'en', $LNG_path = 'language/') {
- //Define full set of translatable strings
- $PHPMAILER_LANG = array(
- 'provide_address' => 'You must provide at least one recipient email address.',
- 'mailer_not_supported' => ' mailer is not supported.',
- 'execute' => 'Could not execute: ',
- 'instantiate' => 'Could not instantiate mail function.',
- 'authenticate' => 'SMTP Error: Could not authenticate.',
- 'from_failed' => 'The following From address failed: ',
- 'recipients_failed' => 'SMTP Error: The following recipients failed: ',
- 'data_not_accepted' => 'SMTP Error: Data not accepted.',
- 'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
- 'file_access' => 'Could not access file: ',
- 'file_open' => 'File Error: Could not open file: ',
- 'encoding' => 'Unknown encoding: ',
- 'signing' => 'Signing Error: ',
- 'smtp_error' => 'SMTP server error: ',
- 'empty_message' => 'Message body empty',
- 'invalid_address' => 'Invalid address',
- 'variable_set' => 'Cannot set or reset variable: '
- );
- //Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"!
- $l = true;
- if ($LNGcode != 'en') { //There is no English translation file
- $l = @include $LNG_path.'phpmailer.lang-'.$LNGcode.'.php';
- }
- $this->language = $PHPMAILER_LANG;
- return ($l == true); //Returns false if language not found
- }
-
- /**
- * Return the current array of language strings
- * @return array
- */
- public function GetTranslations() {
- return $this->language;
- }
-
- /////////////////////////////////////////////////
- // METHODS, MESSAGE CREATION
- /////////////////////////////////////////////////
-
- /**
- * Creates recipient headers.
- * @access public
- * @return string
- */
- public function AddrAppend($type, $addr) {
- $addr_str = $type . ': ';
- $addresses = array();
- foreach ($addr as $a) {
- $addresses[] = $this->AddrFormat($a);
- }
- $addr_str .= implode(', ', $addresses);
- $addr_str .= $this->LE;
-
- return $addr_str;
- }
-
- /**
- * Formats an address correctly.
- * @access public
- * @return string
- */
- public function AddrFormat($addr) {
- if (empty($addr[1])) {
- return $this->SecureHeader($addr[0]);
- } else {
- return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
- }
- }
-
- /**
- * Wraps message for use with mailers that do not
- * automatically perform wrapping and for quoted-printable.
- * Original written by philippe.
- * @param string $message The message to wrap
- * @param integer $length The line length to wrap to
- * @param boolean $qp_mode Whether to run in Quoted-Printable mode
- * @access public
- * @return string
- */
- public function WrapText($message, $length, $qp_mode = false) {
- $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
- // If utf-8 encoding is used, we will need to make sure we don't
- // split multibyte characters when we wrap
- $is_utf8 = (strtolower($this->CharSet) == "utf-8");
-
- $message = $this->FixEOL($message);
- if (substr($message, -1) == $this->LE) {
- $message = substr($message, 0, -1);
- }
-
- $line = explode($this->LE, $message);
- $message = '';
- for ($i=0 ;$i < count($line); $i++) {
- $line_part = explode(' ', $line[$i]);
- $buf = '';
- for ($e = 0; $e $length)) {
- $space_left = $length - strlen($buf) - 1;
- if ($e != 0) {
- if ($space_left > 20) {
- $len = $space_left;
- if ($is_utf8) {
- $len = $this->UTF8CharBoundary($word, $len);
- } elseif (substr($word, $len - 1, 1) == "=") {
- $len--;
- } elseif (substr($word, $len - 2, 1) == "=") {
- $len -= 2;
- }
- $part = substr($word, 0, $len);
- $word = substr($word, $len);
- $buf .= ' ' . $part;
- $message .= $buf . sprintf("=%s", $this->LE);
- } else {
- $message .= $buf . $soft_break;
- }
- $buf = '';
- }
- while (strlen($word) > 0) {
- $len = $length;
- if ($is_utf8) {
- $len = $this->UTF8CharBoundary($word, $len);
- } elseif (substr($word, $len - 1, 1) == "=") {
- $len--;
- } elseif (substr($word, $len - 2, 1) == "=") {
- $len -= 2;
- }
- $part = substr($word, 0, $len);
- $word = substr($word, $len);
-
- if (strlen($word) > 0) {
- $message .= $part . sprintf("=%s", $this->LE);
- } else {
- $buf = $part;
- }
- }
- } else {
- $buf_o = $buf;
- $buf .= ($e == 0) ? $word : (' ' . $word);
-
- if (strlen($buf) > $length and $buf_o != '') {
- $message .= $buf_o . $soft_break;
- $buf = $word;
- }
- }
- }
- $message .= $buf . $this->LE;
- }
-
- return $message;
- }
-
- /**
- * Finds last character boundary prior to maxLength in a utf-8
- * quoted (printable) encoded string.
- * Original written by Colin Brown.
- * @access public
- * @param string $encodedText utf-8 QP text
- * @param int $maxLength find last character boundary prior to this length
- * @return int
- */
- public function UTF8CharBoundary($encodedText, $maxLength) {
- $foundSplitPos = false;
- $lookBack = 3;
- while (!$foundSplitPos) {
- $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
- $encodedCharPos = strpos($lastChunk, "=");
- if ($encodedCharPos !== false) {
- // Found start of encoded character byte within $lookBack block.
- // Check the encoded byte value (the 2 chars after the '=')
- $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
- $dec = hexdec($hex);
- if ($dec < 128) { // Single byte character.
- // If the encoded char was found at pos 0, it will fit
- // otherwise reduce maxLength to start of the encoded char
- $maxLength = ($encodedCharPos == 0) ? $maxLength :
- $maxLength - ($lookBack - $encodedCharPos);
- $foundSplitPos = true;
- } elseif ($dec >= 192) { // First byte of a multi byte character
- // Reduce maxLength to split at start of character
- $maxLength = $maxLength - ($lookBack - $encodedCharPos);
- $foundSplitPos = true;
- } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back
- $lookBack += 3;
- }
- } else {
- // No encoded character found
- $foundSplitPos = true;
- }
- }
- return $maxLength;
- }
-
-
- /**
- * Set the body wrapping.
- * @access public
- * @return void
- */
- public function SetWordWrap() {
- if($this->WordWrap < 1) {
- return;
- }
-
- switch($this->message_type) {
- case 'alt':
- case 'alt_attachments':
- $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
- break;
- default:
- $this->Body = $this->WrapText($this->Body, $this->WordWrap);
- break;
- }
- }
-
- /**
- * Assembles message header.
- * @access public
- * @return string The assembled header
- */
- public function CreateHeader() {
- $result = '';
-
- // Set the boundaries
- $uniq_id = md5(uniqid(TIMESTAMP));
- $this->boundary[1] = 'b1_' . $uniq_id;
- $this->boundary[2] = 'b2_' . $uniq_id;
-
- $result .= $this->HeaderLine('Date', self::RFCDate());
- if($this->Sender == '') {
- $result .= $this->HeaderLine('Return-Path', trim($this->From));
- } else {
- $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
- }
-
- // To be created automatically by mail()
- if($this->Mailer != 'mail') {
- if ($this->SingleTo === true) {
- foreach($this->to as $t) {
- $this->SingleToArray[] = $this->AddrFormat($t);
- }
- } else {
- if(count($this->to) > 0) {
- $result .= $this->AddrAppend('To', $this->to);
- } elseif (count($this->cc) == 0) {
- $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
- }
- }
- }
-
- $from = array();
- $from[0][0] = trim($this->From);
- $from[0][1] = $this->FromName;
- $result .= $this->AddrAppend('From', $from);
-
- // sendmail and mail() extract Cc from the header before sending
- if(count($this->cc) > 0) {
- $result .= $this->AddrAppend('Cc', $this->cc);
- }
-
- // sendmail and mail() extract Bcc from the header before sending
- if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
- $result .= $this->AddrAppend('Bcc', $this->bcc);
- }
-
- if(count($this->ReplyTo) > 0) {
- $result .= $this->AddrAppend('Reply-to', $this->ReplyTo);
- }
-
- // mail() sets the subject itself
- if($this->Mailer != 'mail') {
- $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
- }
-
- if($this->MessageID != '') {
- $result .= $this->HeaderLine('Message-ID',$this->MessageID);
- } else {
- $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
- }
- $result .= $this->HeaderLine('X-Priority', $this->Priority);
- $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (phpmailer.sourceforge.net)');
-
- if($this->ConfirmReadingTo != '') {
- $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
- }
-
- // Add custom headers
- for($index = 0; $index < count($this->CustomHeader); $index++) {
- $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
- }
- if (!$this->sign_key_file) {
- $result .= $this->HeaderLine('MIME-Version', '1.0');
- $result .= $this->GetMailMIME();
- }
-
- return $result;
- }
-
- /**
- * Returns the message MIME.
- * @access public
- * @return string
- */
- public function GetMailMIME() {
- $result = '';
- switch($this->message_type) {
- case 'plain':
- $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
- $result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet);
- break;
- case 'attachments':
- case 'alt_attachments':
- if($this->InlineImageExists()){
- $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
- } else {
- $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
- $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
- }
- break;
- case 'alt':
- $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
- $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
- break;
- }
-
- if($this->Mailer != 'mail') {
- $result .= $this->LE.$this->LE;
- }
-
- return $result;
- }
-
- /**
- * Assembles the message body. Returns an empty string on failure.
- * @access public
- * @return string The assembled message body
- */
- public function CreateBody() {
- $body = '';
-
- if ($this->sign_key_file) {
- $body .= $this->GetMailMIME();
- }
-
- $this->SetWordWrap();
-
- switch($this->message_type) {
- case 'alt':
- $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
- $body .= $this->EncodeString($this->AltBody, $this->Encoding);
- $body .= $this->LE.$this->LE;
- $body .= $this->GetBoundary($this->boundary[1], '', 'text/html', '');
- $body .= $this->EncodeString($this->Body, $this->Encoding);
- $body .= $this->LE.$this->LE;
- $body .= $this->EndBoundary($this->boundary[1]);
- break;
- case 'plain':
- $body .= $this->EncodeString($this->Body, $this->Encoding);
- break;
- case 'attachments':
- $body .= $this->GetBoundary($this->boundary[1], '', '', '');
- $body .= $this->EncodeString($this->Body, $this->Encoding);
- $body .= $this->LE;
- $body .= $this->AttachAll();
- break;
- case 'alt_attachments':
- $body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
- $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
- $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
- $body .= $this->EncodeString($this->AltBody, $this->Encoding);
- $body .= $this->LE.$this->LE;
- $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
- $body .= $this->EncodeString($this->Body, $this->Encoding);
- $body .= $this->LE.$this->LE;
- $body .= $this->EndBoundary($this->boundary[2]);
- $body .= $this->AttachAll();
- break;
- }
-
- if ($this->IsError()) {
- $body = '';
- } elseif ($this->sign_key_file) {
- try {
- $file = tempnam('', 'mail');
- file_put_contents($file, $body); //TODO check this worked
- $signed = tempnam("", "signed");
- if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), NULL)) {
- @unlink($file);
- @unlink($signed);
- $body = file_get_contents($signed);
- } else {
- @unlink($file);
- @unlink($signed);
- throw new phpmailerException($this->Lang("signing").openssl_error_string());
- }
- } catch (phpmailerException $e) {
- $body = '';
- if ($this->exceptions) {
- throw $e;
- }
- }
- }
-
- return $body;
- }
-
- /**
- * Returns the start of a message boundary.
- * @access private
- */
- private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
- $result = '';
- if($charSet == '') {
- $charSet = $this->CharSet;
- }
- if($contentType == '') {
- $contentType = $this->ContentType;
- }
- if($encoding == '') {
- $encoding = $this->Encoding;
- }
- $result .= $this->TextLine('--' . $boundary);
- $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
- $result .= $this->LE;
- $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
- $result .= $this->LE;
-
- return $result;
- }
-
- /**
- * Returns the end of a message boundary.
- * @access private
- */
- private function EndBoundary($boundary) {
- return $this->LE . '--' . $boundary . '--' . $this->LE;
- }
-
- /**
- * Sets the message type.
- * @access private
- * @return void
- */
- private function SetMessageType() {
- if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
- $this->message_type = 'plain';
- } else {
- if(count($this->attachment) > 0) {
- $this->message_type = 'attachments';
- }
- if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
- $this->message_type = 'alt';
- }
- if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
- $this->message_type = 'alt_attachments';
- }
- }
- }
-
- /**
- * Returns a formatted header line.
- * @access public
- * @return string
- */
- public function HeaderLine($name, $value) {
- return $name . ': ' . $value . $this->LE;
- }
-
- /**
- * Returns a formatted mail line.
- * @access public
- * @return string
- */
- public function TextLine($value) {
- return $value . $this->LE;
- }
-
- /////////////////////////////////////////////////
- // CLASS METHODS, ATTACHMENTS
- /////////////////////////////////////////////////
-
- /**
- * Adds an attachment from a path on the filesystem.
- * Returns false if the file could not be found
- * or accessed.
- * @param string $path Path to the attachment.
- * @param string $name Overrides the attachment name.
- * @param string $encoding File encoding (see $Encoding).
- * @param string $type File extension (MIME) type.
- * @return bool
- */
- public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
- try {
- if ( !@is_file($path) ) {
- throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
- }
- $filename = basename($path);
- if ( $name == '' ) {
- $name = $filename;
- }
-
- $this->attachment[] = array(
- 0 => $path,
- 1 => $filename,
- 2 => $name,
- 3 => $encoding,
- 4 => $type,
- 5 => false, // isStringAttachment
- 6 => 'attachment',
- 7 => 0
- );
-
- } catch (phpmailerException $e) {
- $this->SetError($e->getMessage());
- if ($this->exceptions) {
- throw $e;
- }
- echo $e->getMessage()."\n";
- if ( $e->getCode() == self::STOP_CRITICAL ) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Return the current array of attachments
- * @return array
- */
- public function GetAttachments() {
- return $this->attachment;
- }
-
- /**
- * Attaches all fs, string, and binary attachments to the message.
- * Returns an empty string on failure.
- * @access private
- * @return string
- */
- private function AttachAll() {
- // Return text of body
- $mime = array();
- $cidUniq = array();
- $incl = array();
-
- // Add all attachments
- foreach ($this->attachment as $attachment) {
- // Check for string attachment
- $bString = $attachment[5];
- if ($bString) {
- $string = $attachment[0];
- } else {
- $path = $attachment[0];
- }
-
- if (in_array($attachment[0], $incl)) { continue; }
- $filename = $attachment[1];
- $name = $attachment[2];
- $encoding = $attachment[3];
- $type = $attachment[4];
- $disposition = $attachment[6];
- $cid = $attachment[7];
- $incl[] = $attachment[0];
- if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
- $cidUniq[$cid] = true;
-
- $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
- $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
- $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
-
- if($disposition == 'inline') {
- $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
- }
-
- $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
-
- // Encode as string attachment
- if($bString) {
- $mime[] = $this->EncodeString($string, $encoding);
- if($this->IsError()) {
- return '';
- }
- $mime[] = $this->LE.$this->LE;
- } else {
- $mime[] = $this->EncodeFile($path, $encoding);
- if($this->IsError()) {
- return '';
- }
- $mime[] = $this->LE.$this->LE;
- }
- }
-
- $mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
-
- return join('', $mime);
- }
-
- /**
- * Encodes attachment in requested format.
- * Returns an empty string on failure.
- * @param string $path The full path to the file
- * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
- * @see EncodeFile()
- * @access private
- * @return string
- */
- private function EncodeFile($path, $encoding = 'base64') {
- try {
- if (!is_readable($path)) {
- throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
- }
- if (function_exists('get_magic_quotes')) {
- function get_magic_quotes() {
- return false;
- }
- }
- if (PHP_VERSION < 6) {
- $magic_quotes = get_magic_quotes_runTIMESTAMP;
- set_magic_quotes_runtime(0);
- }
- $file_buffer = file_get_contents($path);
- $file_buffer = $this->EncodeString($file_buffer, $encoding);
- if (PHP_VERSION < 6) { set_magic_quotes_runtime($magic_quotes); }
- return $file_buffer;
- } catch (Exception $e) {
- $this->SetError($e->getMessage());
- return '';
- }
- }
-
- /**
- * Encodes string to requested format.
- * Returns an empty string on failure.
- * @param string $str The text to encode
- * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
- * @access public
- * @return string
- */
- public function EncodeString ($str, $encoding = 'base64') {
- $encoded = '';
- switch(strtolower($encoding)) {
- case 'base64':
- $encoded = chunk_split(base64_encode($str), 76, $this->LE);
- break;
- case '7bit':
- case '8bit':
- $encoded = $this->FixEOL($str);
- //Make sure it ends with a line break
- if (substr($encoded, -(strlen($this->LE))) != $this->LE)
- $encoded .= $this->LE;
- break;
- case 'binary':
- $encoded = $str;
- break;
- case 'quoted-printable':
- $encoded = $this->EncodeQP($str);
- break;
- default:
- $this->SetError($this->Lang('encoding') . $encoding);
- break;
- }
- return $encoded;
- }
-
- /**
- * Encode a header string to best (shortest) of Q, B, quoted or none.
- * @access public
- * @return string
- */
- public function EncodeHeader($str, $position = 'text') {
- $x = 0;
-
- switch (strtolower($position)) {
- case 'phrase':
- if (!preg_match('/[\200-\377]/', $str)) {
- // Can't use addslashes as we don't know what value has magic_quotes_sybase
- $encoded = addcslashes($str, "\0..\37\177\\\"");
- if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
- return ($encoded);
- } else {
- return ("\"$encoded\"");
- }
- }
- $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
- break;
- case 'comment':
- $x = preg_match_all('/[()"]/', $str, $matches);
- // Fall-through
- case 'text':
- default:
- $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
- break;
- }
-
- if ($x == 0) {
- return ($str);
- }
-
- $maxlen = 75 - 7 - strlen($this->CharSet);
- // Try to select the encoding which should produce the shortest output
- if (strlen($str)/3 < $x) {
- $encoding = 'B';
- if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
- // Use a custom function which correctly encodes and wraps long
- // multibyte strings without breaking lines within a character
- $encoded = $this->Base64EncodeWrapMB($str);
- } else {
- $encoded = base64_encode($str);
- $maxlen -= $maxlen % 4;
- $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
- }
- } else {
- $encoding = 'Q';
- $encoded = $this->EncodeQ($str, $position);
- $encoded = $this->WrapText($encoded, $maxlen, true);
- $encoded = str_replace('='.$this->LE, "\n", trim($encoded));
- }
-
- $encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded);
- $encoded = trim(str_replace("\n", $this->LE, $encoded));
-
- return $encoded;
- }
-
- /**
- * Checks if a string contains multibyte characters.
- * @access public
- * @param string $str multi-byte text to wrap encode
- * @return bool
- */
- public function HasMultiBytes($str) {
- if (function_exists('mb_strlen')) {
- return (strlen($str) > mb_strlen($str, $this->CharSet));
- } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
- return false;
- }
- }
-
- /**
- * Correctly encodes and wraps long multibyte strings for mail headers
- * without breaking lines within a character.
- * Adapted from a function by paravoid at http://uk.php.net/manual/en/function.mb-encode-mimeheader.php
- * @access public
- * @param string $str multi-byte text to wrap encode
- * @return string
- */
- public function Base64EncodeWrapMB($str) {
- $start = "=?".$this->CharSet."?B?";
- $end = "?=";
- $encoded = "";
-
- $mb_length = mb_strlen($str, $this->CharSet);
- // Each line must have length <= 75, including $start and $end
- $length = 75 - strlen($start) - strlen($end);
- // Average multi-byte ratio
- $ratio = $mb_length / strlen($str);
- // Base64 has a 4:3 ratio
- $offset = $avgLength = floor($length * $ratio * .75);
-
- for ($i = 0; $i < $mb_length; $i += $offset) {
- $lookBack = 0;
-
- do {
- $offset = $avgLength - $lookBack;
- $chunk = mb_substr($str, $i, $offset, $this->CharSet);
- $chunk = base64_encode($chunk);
- $lookBack++;
- }
- while (strlen($chunk) > $length);
-
- $encoded .= $chunk . $this->LE;
- }
-
- // Chomp the last linefeed
- $encoded = substr($encoded, 0, -strlen($this->LE));
- return $encoded;
- }
-
- /**
- * Encode string to quoted-printable.
- * Only uses standard PHP, slow, but will always work
- * @access public
- * @param string $string the text to encode
- * @param integer $line_max Number of chars allowed on a line before wrapping
- * @return string
- */
- public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) {
- $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
- $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
- $eol = "\r\n";
- $escape = '=';
- $output = '';
- while( list(, $line) = each($lines) ) {
- $linlen = strlen($line);
- $newline = '';
- for($i = 0; $i < $linlen; $i++) {
- $c = substr( $line, $i, 1 );
- $dec = ord( $c );
- if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
- $c = '=2E';
- }
- if ( $dec == 32 ) {
- if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
- $c = '=20';
- } else if ( $space_conv ) {
- $c = '=20';
- }
- } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
- $h2 = floor($dec/16);
- $h1 = floor($dec%16);
- $c = $escape.$hex[$h2].$hex[$h1];
- }
- if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
- $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
- $newline = '';
- // check if newline first character will be point or not
- if ( $dec == 46 ) {
- $c = '=2E';
- }
- }
- $newline .= $c;
- } // end of for
- $output .= $newline.$eol;
- } // end of while
- return $output;
- }
-
- /**
- * Encode string to RFC2045 (6.7) quoted-printable format
- * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version
- * Also results in same content as you started with after decoding
- * @see EncodeQPphp()
- * @access public
- * @param string $string the text to encode
- * @param integer $line_max Number of chars allowed on a line before wrapping
- * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function
- * @return string
- * @author Marcus Bointon
- */
- public function EncodeQP($string, $line_max = 76, $space_conv = false) {
- if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3)
- return quoted_printable_encode($string);
- }
- $filters = stream_get_filters();
- if (!in_array('convert.*', $filters)) { //Got convert stream filter?
- return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation
- }
- $fp = fopen('php://temp/', 'r+');
- $string = preg_replace('/\r\n?/', $this->LE, $string); //Normalise line breaks
- $params = array('line-length' => $line_max, 'line-break-chars' => $this->LE);
- $s = stream_filter_append($fp, 'convert.quoted-printable-encode', STREAM_FILTER_READ, $params);
- fputs($fp, $string);
- rewind($fp);
- $out = stream_get_contents($fp);
- stream_filter_remove($s);
- $out = preg_replace('/^\./m', '=2E', $out); //Encode . if it is first char on a line, workaround for bug in Exchange
- fclose($fp);
- return $out;
- }
-
- /**
- * Encode string to q encoding.
- * @link http://tools.ietf.org/html/rfc2047
- * @param string $str the text to encode
- * @param string $position Where the text is going to be used, see the RFC for what that means
- * @access public
- * @return string
- */
- public function EncodeQ ($str, $position = 'text') {
- // There should not be any EOL in the string
- $encoded = preg_replace('/[\r\n]*/', '', $str);
-
- switch (strtolower($position)) {
- case 'phrase':
- $encoded = preg_replace("/([^A-Za-z0-9!*+\/ -])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
- break;
- case 'comment':
- $encoded = preg_replace("/([\(\)\"])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
- case 'text':
- default:
- // Replace every high ascii, control =, ? and _ characters
- //TODO using /e (equivalent to eval()) is probably not a good idea
- $encoded = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
- "'='.sprintf('%02X', ord('\\1'))", $encoded);
- break;
- }
-
- // Replace every spaces to _ (more readable than =20)
- $encoded = str_replace(' ', '_', $encoded);
-
- return $encoded;
- }
-
- /**
- * Adds a string or binary attachment (non-filesystem) to the list.
- * This method can be used to attach ascii or binary data,
- * such as a BLOB record from a database.
- * @param string $string String attachment data.
- * @param string $filename Name of the attachment.
- * @param string $encoding File encoding (see $Encoding).
- * @param string $type File extension (MIME) type.
- * @return void
- */
- public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') {
- // Append to $attachment array
- $this->attachment[] = array(
- 0 => $string,
- 1 => $filename,
- 2 => basename($filename),
- 3 => $encoding,
- 4 => $type,
- 5 => true, // isStringAttachment
- 6 => 'attachment',
- 7 => 0
- );
- }
-
- /**
- * Adds an embedded attachment. This can include images, sounds, and
- * just about any other document. Make sure to set the $type to an
- * image type. For JPEG images use "image/jpeg" and for GIF images
- * use "image/gif".
- * @param string $path Path to the attachment.
- * @param string $cid Content ID of the attachment. Use this to identify
- * the Id for accessing the image in an HTML form.
- * @param string $name Overrides the attachment name.
- * @param string $encoding File encoding (see $Encoding).
- * @param string $type File extension (MIME) type.
- * @return bool
- */
- public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
-
- if ( !@is_file($path) ) {
- $this->SetError($this->Lang('file_access') . $path);
- return false;
- }
-
- $filename = basename($path);
- if ( $name == '' ) {
- $name = $filename;
- }
-
- // Append to $attachment array
- $this->attachment[] = array(
- 0 => $path,
- 1 => $filename,
- 2 => $name,
- 3 => $encoding,
- 4 => $type,
- 5 => false, // isStringAttachment
- 6 => 'inline',
- 7 => $cid
- );
-
- return true;
- }
-
- /**
- * Returns true if an inline attachment is present.
- * @access public
- * @return bool
- */
- public function InlineImageExists() {
- foreach($this->attachment as $attachment) {
- if ($attachment[6] == 'inline') {
- return true;
- }
- }
- return false;
- }
-
- /////////////////////////////////////////////////
- // CLASS METHODS, MESSAGE RESET
- /////////////////////////////////////////////////
-
- /**
- * Clears all recipients assigned in the TO array. Returns void.
- * @return void
- */
- public function ClearAddresses() {
- foreach($this->to as $to) {
- unset($this->all_recipients[strtolower($to[0])]);
- }
- $this->to = array();
- }
-
- /**
- * Clears all recipients assigned in the CC array. Returns void.
- * @return void
- */
- public function ClearCCs() {
- foreach($this->cc as $cc) {
- unset($this->all_recipients[strtolower($cc[0])]);
- }
- $this->cc = array();
- }
-
- /**
- * Clears all recipients assigned in the BCC array. Returns void.
- * @return void
- */
- public function ClearBCCs() {
- foreach($this->bcc as $bcc) {
- unset($this->all_recipients[strtolower($bcc[0])]);
- }
- $this->bcc = array();
- }
-
- /**
- * Clears all recipients assigned in the ReplyTo array. Returns void.
- * @return void
- */
- public function ClearReplyTos() {
- $this->ReplyTo = array();
- }
-
- /**
- * Clears all recipients assigned in the TO, CC and BCC
- * array. Returns void.
- * @return void
- */
- public function ClearAllRecipients() {
- $this->to = array();
- $this->cc = array();
- $this->bcc = array();
- $this->all_recipients = array();
- }
-
- /**
- * Clears all previously set filesystem, string, and binary
- * attachments. Returns void.
- * @return void
- */
- public function ClearAttachments() {
- $this->attachment = array();
- }
-
- /**
- * Clears all custom headers. Returns void.
- * @return void
- */
- public function ClearCustomHeaders() {
- $this->CustomHeader = array();
- }
-
- /////////////////////////////////////////////////
- // CLASS METHODS, MISCELLANEOUS
- /////////////////////////////////////////////////
-
- /**
- * Adds the error message to the error container.
- * @access protected
- * @return void
- */
- protected function SetError($msg) {
- $this->error_count++;
- if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
- $lasterror = $this->smtp->getError();
- if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
- $msg .= 'DKIM_private);
- if ($this->DKIM_passphrase!='') {
- $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
- } else {
- $privKey = $privKeyStr;
- }
- if (openssl_sign($s, $signature, $privKey)) {
- return base64_encode($signature);
- }
- }
-
- /**
- * Generate DKIM Canonicalization Header
- *
- * @access public
- * @param string $s Header
- */
- public function DKIM_HeaderC($s) {
- $s=preg_replace("/\r\n\s+/"," ",$s);
- $lines=explode("\r\n",$s);
- foreach ($lines as $key=>$line) {
- list($heading,$value)=explode(":",$line,2);
- $heading=strtolower($heading);
- $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
- $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value
- }
- $s=implode("\r\n",$lines);
- return $s;
- }
-
- /**
- * Generate DKIM Canonicalization Body
- *
- * @access public
- * @param string $body Message Body
- */
- public function DKIM_BodyC($body) {
- if ($body == '') return "\r\n";
- // stabilize line endings
- $body=str_replace("\r\n","\n",$body);
- $body=str_replace("\n","\r\n",$body);
- // END stabilize line endings
- while (substr($body,strlen($body)-4,4) == "\r\n\r\n") {
- $body=substr($body,0,strlen($body)-2);
- }
- return $body;
- }
-
- /**
- * Create the DKIM header, body, as new header
- *
- * @access public
- * @param string $headers_line Header lines
- * @param string $subject Subject
- * @param string $body Body
- */
- public function DKIM_Add($headers_line,$subject,$body) {
- $DKIMsignatureType = 'rsa-sha1'; // Signature & hash algorithms
- $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
- $DKIMquery = 'dns/txt'; // Query method
- $DKIMtime = TIMESTAMP ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
- $subject_header = "Subject: $subject";
- $headers = explode("\r\n",$headers_line);
- foreach($headers as $header) {
- if (strpos($header,'From:') === 0) {
- $from_header=$header;
- } elseif (strpos($header,'To:') === 0) {
- $to_header=$header;
- }
- }
- $from = str_replace('|','=7C',$this->DKIM_QP($from_header));
- $to = str_replace('|','=7C',$this->DKIM_QP($to_header));
- $subject = str_replace('|','=7C',$this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable
- $body = $this->DKIM_BodyC($body);
- $DKIMlen = strlen($body) ; // Length of body
- $DKIMb64 = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body
- $ident = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";";
- $dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n".
- "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n".
- "\th=From:To:Subject;\r\n".
- "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n".
- "\tz=$from\r\n".
- "\t|$to\r\n".
- "\t|$subject;\r\n".
- "\tbh=" . $DKIMb64 . ";\r\n".
- "\tb=";
- $toSign = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
- $signed = $this->DKIM_Sign($toSign);
- return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n";
- }
-
- protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) {
- if (!empty($this->action_function) && function_exists($this->action_function)) {
- $params = array($isSent,$to,$cc,$bcc,$subject,$body);
- call_user_func_array($this->action_function,$params);
- }
- }
-}
-
-class phpmailerException extends Exception {
- public function errorMessage() {
- $errorMsg = '' . $this->getMessage() . "
\n"; - return $errorMsg; - } -} -?> \ No newline at end of file diff --git a/includes/classes/class.smtp.php b/includes/classes/class.smtp.php deleted file mode 100644 index 47c012f..0000000 --- a/includes/classes/class.smtp.php +++ /dev/null @@ -1,814 +0,0 @@ -smtp_conn = 0; - $this->error = null; - $this->helo_rply = null; - - $this->do_debug = 0; - } - - ///////////////////////////////////////////////// - // CONNECTION FUNCTIONS - ///////////////////////////////////////////////// - - /** - * Connect to the server specified on the port specified. - * If the port is not specified use the default SMTP_PORT. - * If tval is specified then a connection will try and be - * established with the server for that number of seconds. - * If tval is not specified the default is 30 seconds to - * try on the connection. - * - * SMTP CODE SUCCESS: 220 - * SMTP CODE FAILURE: 421 - * @access public - * @return bool - */ - public function Connect($host, $port = 0, $tval = 30) { - // set the error val to null so there is no confusion - $this->error = null; - - // make sure we are __not__ connected - if($this->connected()) { - // already connected, generate error - $this->error = array("error" => "Already connected to a server"); - return false; - } - - if(empty($port)) { - $port = $this->SMTP_PORT; - } - - // connect to the smtp server - $this->smtp_conn = @fsockopen($host, // the host of the server - $port, // the port to use - $errno, // error number if any - $errstr, // error message if any - $tval); // give up after ? secs - // verify we connected properly - if(empty($this->smtp_conn)) { - $this->error = array("error" => "Failed to connect to server", - "errno" => $errno, - "errstr" => $errstr); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)" . $this->CRLF . '
'; - } - return false; - } - - // SMTP server can take longer to respond, give longer timeout for first read - // Windows does not have support for this timeout function - if(substr(PHP_OS, 0, 3) != "WIN") - socket_set_timeout($this->smtp_conn, $tval, 0); - - // get any announcement - $announce = $this->get_lines(); - - if($this->do_debug >= 2) { - echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '
'; - } - - return true; - } - - /** - * Initiate a TLS communication with the server. - * - * SMTP CODE 220 Ready to start TLS - * SMTP CODE 501 Syntax error (no parameters allowed) - * SMTP CODE 454 TLS not available due to temporary reason - * @access public - * @return bool success - */ - public function StartTLS() { - $this->error = null; # to avoid confusion - - if(!$this->connected()) { - $this->error = array("error" => "Called StartTLS() without being connected"); - return false; - } - - fputs($this->smtp_conn,"STARTTLS" . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($this->do_debug >= 2) { - echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '
'; - } - - if($code != 220) { - $this->error = - array("error" => "STARTTLS not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - - // Begin encrypted connection - if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) { - return false; - } - - return true; - } - - /** - * Performs SMTP authentication. Must be run after running the - * Hello() method. Returns true if successfully authenticated. - * @access public - * @return bool - */ - public function Authenticate($USERname, $password) { - // Start authentication - fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($code != 334) { - $this->error = - array("error" => "AUTH not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - - // Send encoded username - fputs($this->smtp_conn, base64_encode($USERname) . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($code != 334) { - $this->error = - array("error" => "Username not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - - // Send encoded password - fputs($this->smtp_conn, base64_encode($password) . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($code != 235) { - $this->error = - array("error" => "Password not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - - return true; - } - - /** - * Returns true if connected to a server otherwise false - * @access public - * @return bool - */ - public function Connected() { - if(!empty($this->smtp_conn)) { - $sock_status = socket_get_status($this->smtp_conn); - if($sock_status["eof"]) { - // the socket is valid but we are not connected - if($this->do_debug >= 1) { - echo "SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected"; - } - $this->Close(); - return false; - } - return true; // everything looks good - } - return false; - } - - /** - * Closes the socket and cleans up the state of the class. - * It is not considered good to use this function without - * first trying to use QUIT. - * @access public - * @return void - */ - public function Close() { - $this->error = null; // so there is no confusion - $this->helo_rply = null; - if(!empty($this->smtp_conn)) { - // close the connection and cleanup - fclose($this->smtp_conn); - $this->smtp_conn = 0; - } - } - - ///////////////////////////////////////////////// - // SMTP COMMANDS - ///////////////////////////////////////////////// - - /** - * Issues a data command and sends the msg_data to the server - * finializing the mail transaction. $msg_data is the message - * that is to be send with the headers. Each header needs to be - * on a single line followed by a with the message headers
- * and the message body being seperated by and additional .
- *
- * Implements rfc 821: DATA
- *
- * SMTP CODE INTERMEDIATE: 354
- * [data]
- * .
- * SMTP CODE SUCCESS: 250
- * SMTP CODE FAILURE: 552,554,451,452
- * SMTP CODE FAILURE: 451,554
- * SMTP CODE ERROR : 500,501,503,421
- * @access public
- * @return bool
- */
- public function Data($msg_data) {
- $this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Data() without being connected");
- return false;
- }
-
- fputs($this->smtp_conn,"DATA" . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '
'; - } - - if($code != 354) { - $this->error = - array("error" => "DATA command not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - - /* the server is ready to accept data! - * according to rfc 821 we should not send more than 1000 - * including the CRLF - * characters on a single line so we will break the data up - * into lines by \r and/or \n then if needed we will break - * each of those into smaller lines to fit within the limit. - * in addition we will be looking for lines that start with - * a period '.' and append and additional period '.' to that - * line. NOTE: this does not count towards limit. - */ - - // normalize the line breaks so we know the explode works - $msg_data = str_replace("\r\n","\n",$msg_data); - $msg_data = str_replace("\r","\n",$msg_data); - $lines = explode("\n",$msg_data); - - /* we need to find a good way to determine is headers are - * in the msg_data or if it is a straight msg body - * currently I am assuming rfc 822 definitions of msg headers - * and if the first field of the first line (':' sperated) - * does not contain a space then it _should_ be a header - * and we can process all lines before a blank "" line as - * headers. - */ - - $field = substr($lines[0],0,strpos($lines[0],":")); - $in_headers = false; - if(!empty($field) && !strstr($field," ")) { - $in_headers = true; - } - - $max_line_length = 998; // used below; set here for ease in change - - while(list(,$line) = @each($lines)) { - $lines_out = null; - if($line == "" && $in_headers) { - $in_headers = false; - } - // ok we need to break this line up into several smaller lines - while(strlen($line) > $max_line_length) { - $pos = strrpos(substr($line,0,$max_line_length)," "); - - // Patch to fix DOS attack - if(!$pos) { - $pos = $max_line_length - 1; - $lines_out[] = substr($line,0,$pos); - $line = substr($line,$pos); - } else { - $lines_out[] = substr($line,0,$pos); - $line = substr($line,$pos + 1); - } - - /* if processing headers add a LWSP-char to the front of new line - * rfc 822 on long msg headers - */ - if($in_headers) { - $line = "\t" . $line; - } - } - $lines_out[] = $line; - - // send the lines to the server - while(list(,$line_out) = @each($lines_out)) { - if(strlen($line_out) > 0) - { - if(substr($line_out, 0, 1) == ".") { - $line_out = "." . $line_out; - } - } - fputs($this->smtp_conn,$line_out . $this->CRLF); - } - } - - // message data has been sent - fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($this->do_debug >= 2) { - echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '
'; - } - - if($code != 250) { - $this->error = - array("error" => "DATA not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - return true; - } - - /** - * Sends the HELO command to the smtp server. - * This makes sure that we and the server are in - * the same known state. - * - * Implements from rfc 821: HELO
- *
- * SMTP CODE SUCCESS: 250
- * SMTP CODE ERROR : 500, 501, 504, 421
- * @access public
- * @return bool
- */
- public function Hello($host = '') {
- $this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Hello() without being connected");
- return false;
- }
-
- // if hostname for HELO was not specified send default
- if(empty($host)) {
- // determine appropriate default to send to server
- $host = "localhost";
- }
-
- // Send extended hello first (RFC 2821)
- if(!$this->SendHello("EHLO", $host)) {
- if(!$this->SendHello("HELO", $host)) {
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * Sends a HELO/EHLO command.
- * @access private
- * @return bool
- */
- private function SendHello($hello, $host) {
- fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '
'; - } - - if($code != 250) { - $this->error = - array("error" => $hello . " not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - - $this->helo_rply = $rply; - - return true; - } - - /** - * Starts a mail transaction from the email address specified in - * $from. Returns true if successful or false otherwise. If True - * the mail transaction is started and then one or more Recipient - * commands may be called followed by a Data command. - * - * Implements rfc 821: MAIL FROM:
- *
- * SMTP CODE SUCCESS: 250
- * SMTP CODE SUCCESS: 552,451,452
- * SMTP CODE SUCCESS: 500,501,421
- * @access public
- * @return bool
- */
- public function Mail($from) {
- $this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Mail() without being connected");
- return false;
- }
-
- $useVerp = ($this->do_verp ? "XVERP" : "");
- fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '
'; - } - - if($code != 250) { - $this->error = - array("error" => "MAIL not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - return true; - } - - /** - * Sends the quit command to the server and then closes the socket - * if there is no error or the $close_on_error argument is true. - * - * Implements from rfc 821: QUIT
- *
- * SMTP CODE SUCCESS: 221
- * SMTP CODE ERROR : 500
- * @access public
- * @return bool
- */
- public function Quit($close_on_error = true) {
- $this->error = null; // so there is no confusion
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Quit() without being connected");
- return false;
- }
-
- // send the quit command to the server
- fputs($this->smtp_conn,"quit" . $this->CRLF);
-
- // get any good-bye messages
- $byemsg = $this->get_lines();
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '
'; - } - - $rval = true; - $e = null; - - $code = substr($byemsg,0,3); - if($code != 221) { - // use e as a tmp var cause Close will overwrite $this->error - $e = array("error" => "SMTP server rejected quit command", - "smtp_code" => $code, - "smtp_rply" => substr($byemsg,4)); - $rval = false; - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF . '
'; - } - } - - if(empty($e) || $close_on_error) { - $this->Close(); - } - - return $rval; - } - - /** - * Sends the command RCPT to the SMTP server with the TO: argument of $to. - * Returns true if the recipient was accepted false if it was rejected. - * - * Implements from rfc 821: RCPT TO:
- *
- * SMTP CODE SUCCESS: 250,251
- * SMTP CODE FAILURE: 550,551,552,553,450,451,452
- * SMTP CODE ERROR : 500,501,503,421
- * @access public
- * @return bool
- */
- public function Recipient($to) {
- $this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Recipient() without being connected");
- return false;
- }
-
- fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '
'; - } - - if($code != 250 && $code != 251) { - $this->error = - array("error" => "RCPT not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - return true; - } - - /** - * Sends the RSET command to abort and transaction that is - * currently in progress. Returns true if successful false - * otherwise. - * - * Implements rfc 821: RSET
- *
- * SMTP CODE SUCCESS: 250
- * SMTP CODE ERROR : 500,501,504,421
- * @access public
- * @return bool
- */
- public function Reset() {
- $this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Reset() without being connected");
- return false;
- }
-
- fputs($this->smtp_conn,"RSET" . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '
'; - } - - if($code != 250) { - $this->error = - array("error" => "RSET failed", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - - return true; - } - - /** - * Starts a mail transaction from the email address specified in - * $from. Returns true if successful or false otherwise. If True - * the mail transaction is started and then one or more Recipient - * commands may be called followed by a Data command. This command - * will send the message to the users terminal if they are logged - * in and send them an email. - * - * Implements rfc 821: SAML FROM:
- *
- * SMTP CODE SUCCESS: 250
- * SMTP CODE SUCCESS: 552,451,452
- * SMTP CODE SUCCESS: 500,501,502,421
- * @access public
- * @return bool
- */
- public function SendAndMail($from) {
- $this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called SendAndMail() without being connected");
- return false;
- }
-
- fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '
'; - } - - if($code != 250) { - $this->error = - array("error" => "SAML not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - return true; - } - - /** - * This is an optional command for SMTP that this class does not - * support. This method is here to make the RFC821 Definition - * complete for this class and __may__ be implimented in the future - * - * Implements from rfc 821: TURN
- *
- * SMTP CODE SUCCESS: 250
- * SMTP CODE FAILURE: 502
- * SMTP CODE ERROR : 500, 503
- * @access public
- * @return bool
- */
- public function Turn() {
- $this->error = array("error" => "This method, TURN, of the SMTP ".
- "is not implemented");
- if($this->do_debug >= 1) {
- echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '
'; - } - return false; - } - - /** - * Get the current error - * @access public - * @return array - */ - public function getError() { - return $this->error; - } - - ///////////////////////////////////////////////// - // INTERNAL FUNCTIONS - ///////////////////////////////////////////////// - - /** - * Read in as many lines as possible - * either before eof or socket timeout occurs on the operation. - * With SMTP we can tell if we have more lines to read if the - * 4th character is '-' symbol. If it is a space then we don't - * need to read anything else. - * @access private - * @return string - */ - private function get_lines() { - $data = ""; - while($str = @fgets($this->smtp_conn,515)) { - if($this->do_debug >= 4) { - echo "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF . '
'; - echo "SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF . '
'; - } - $data .= $str; - if($this->do_debug >= 4) { - echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '
'; - } - // if 4th character is a space, we are done reading, break the loop - if(substr($str,3,1) == " ") { break; } - } - return $data; - } - -} - -?> \ No newline at end of file diff --git a/includes/classes/class.statbuilder.php b/includes/classes/class.statbuilder.php index 62775f6..21723c8 100644 --- a/includes/classes/class.statbuilder.php +++ b/includes/classes/class.statbuilder.php @@ -2,7 +2,7 @@ /** * 2Moons - * Copyright (C) 2011 Slaver + * Copyright (C) 2012 Jan Kröpke * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,97 +18,60 @@ * along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
-require(ROOT_PATH.'includes/classes/class.Records.php');
-
-class statbuilder extends records
+class statbuilder
{
function __construct()
{
- global $db, $CONF;
+ global $CONF;
$this->starttime = microtime(true);
$this->memory = array(round(memory_get_usage() / 1024,1),round(memory_get_usage(1) / 1024,1));
$this->time = TIMESTAMP;
+
+ $this->recordData = array();
- $this->Unis = array($CONF['uni']);
- $Query = $db->query("SELECT `uni` FROM ".CONFIG." WHERE `uni` != '".$CONF['uni']."' ORDER BY `uni` ASC;");
- while($Uni = $db->fetch_array($Query))
+ $this->Unis = array(Config::get('uni'));
+ $Query = $GLOBALS['DATABASE']->query("SELECT uni FROM ".CONFIG." WHERE uni != '".Config::get('uni')."' ORDER BY uni ASC;");
+ while($Uni = $GLOBALS['DATABASE']->fetch_array($Query)) {
$this->Unis[] = $Uni['uni'];
+ }
}
private function SomeStatsInfos()
{
- global $db;
return array(
'stats_time' => $this->time,
'totaltime' => round(microtime(true) - $this->starttime, 7),
'memory_peak' => array(round(memory_get_peak_usage() / 1024,1), round(memory_get_peak_usage(1) / 1024,1)),
'initial_memory' => $this->memory,
'end_memory' => array(round(memory_get_usage() / 1024,1), round(memory_get_usage(1) / 1024,1)),
- 'sql_count' => $db->get_sql(),
+ 'sql_count' => $GLOBALS['DATABASE']->get_sql(),
);
}
private function AnotherCronJobs()
{
-
+
}
private function CheckUniverseAccounts($UniData)
{
+ $UniData = $UniData + array_combine($this->Unis, array_fill(1, count($this->Unis), 0));
foreach($UniData as $Uni => $Amount) {
- update_config(array('users_amount' => $Amount), $Uni);
+ Config::update(array('users_amount' => $Amount), $Uni);
}
- }
-
- private function DeleteSome()
- {
- global $db, $CONF;
-
- $db->query("LOCK TABLES ".ALLIANCE." WRITE, ".BUDDY." WRITE, ".CONFIG." WRITE, ".FLEETS." WRITE, ".NOTES." WRITE, ".MESSAGES." WRITE, ".PLANETS." WRITE, ".RW." WRITE, ".SESSION." WRITE, ".SUPP." WRITE, ".STATPOINTS." WRITE, ".TOPKB." WRITE, ".TOPKB_USERS." WRITE, ".USERS." WRITE;");
-
- //Delete old messages
- $del_before = TIMESTAMP - ($CONF['del_oldstuff'] * 86400);
- $del_inactive = TIMESTAMP - ($CONF['del_user_automatic'] * 86400);
- $del_deleted = TIMESTAMP - ($CONF['del_user_manually'] * 86400);
-
- $db->multi_query("DELETE FROM `".MESSAGES."` WHERE `message_time` < '". $del_before ."';DELETE FROM ".SUPP." WHERE `time` < '".$del_before."' AND `status` = 0;DELETE FROM ".ALLIANCE." WHERE `ally_members` = '0';DELETE FROM ".PLANETS." WHERE `destruyed` < ".TIMESTAMP." AND `destruyed` != 0;UPDATE ".USERS." SET `email_2` = `email` WHERE `setmail` < '".TIMESTAMP."';DELETE FROM ".SESSION." WHERE `user_lastactivity` < '".(TIMESTAMP - SESSION_LIFETIME)."';UPDATE ".USERS." SET `banaday` = '0', `bana` = '0' WHERE `banaday` <= '".TIMESTAMP."';");
-
- $ChooseToDelete = $db->query("SELECT `id` FROM `".USERS."` WHERE `authlevel` = '".AUTH_USR."' AND ((`db_deaktjava` != 0 AND `db_deaktjava` < '".$del_deleted."')".($del_inactive == TIMESTAMP ? "" : " OR `onlinetime` < '".$del_inactive."'").");");
-
- if(isset($ChooseToDelete))
- {
- include_once(ROOT_PATH.'includes/functions/DeleteSelectedUser.php');
- while($delete = $db->fetch_array($ChooseToDelete))
- {
- DeleteSelectedUser($delete['id']);
- }
- }
-
- $db->free_result($ChooseToDelete);
-
- foreach($this->Unis as $Uni)
- {
- $TopKBLow = $db->countquery("SELECT units FROM ".TOPKB." WHERE `universe` = ".$Uni." ORDER BY units DESC LIMIT 99,1;");
- if(isset($TopKBLow))
- $db->query("DELETE ".TOPKB.", ".TOPKB_USERS." FROM ".TOPKB." INNER JOIN ".TOPKB_USERS." USING (rid) WHERE `universe` = ".$Uni." AND `units` < ".$TopKBLow.";");
- }
-
- $db->query("DELETE FROM ".RW." WHERE `time` < ". $del_before ." AND `rid` NOT IN (SELECT `rid` FROM ".TOPKB.");");
- $db->query("UNLOCK TABLES;");
}
private function GetUsersInfosFromDB()
{
- global $db, $resource, $reslist;
+ global $resource, $reslist;
$select_defenses = '';
$select_buildings = '';
$selected_tech = '';
@@ -128,10 +91,11 @@ private function GetUsersInfosFromDB()
foreach($reslist['defense'] as $Defense){
$select_defenses .= " SUM(p.".$resource[$Defense].") as ".$resource[$Defense].",";
- }
+ }
+
$FlyingFleets = array();
- $SQLFleets = $db->query('SELECT fleet_array, fleet_owner FROM '.FLEETS.';');
- while ($CurFleets = $db->fetch_array($SQLFleets))
+ $SQLFleets = $GLOBALS['DATABASE']->query('SELECT fleet_array, fleet_owner FROM '.FLEETS.';');
+ while ($CurFleets = $GLOBALS['DATABASE']->fetch_array($SQLFleets))
{
$FleetRec = explode(";", $CurFleets['fleet_array']);
@@ -148,24 +112,48 @@ private function GetUsersInfosFromDB()
}
}
- $db->free_result($SQLFleets);
+ $GLOBALS['DATABASE']->free_result($SQLFleets);
$Return['Fleets'] = $FlyingFleets;
- $Return['Planets'] = $db->query('SELECT SQL_BIG_RESULT DISTINCT '.$select_buildings.' p.id, p.universe, p.id_owner, u.authlevel, u.bana, u.username FROM '.PLANETS.' as p LEFT JOIN '.USERS.' as u ON u.id = p.id_owner;');
- $Return['Users'] = $db->query('SELECT SQL_BIG_RESULT DISTINCT '.$selected_tech.$select_fleets.$select_defenses.' u.id, u.ally_id, u.authlevel, u.bana, u.universe, u.username, s.tech_rank AS old_tech_rank, s.build_rank AS old_build_rank, s.defs_rank AS old_defs_rank, s.fleet_rank AS old_fleet_rank, s.total_rank AS old_total_rank FROM '.USERS.' as u LEFT JOIN '.STATPOINTS.' as s ON s.stat_type = 1 AND s.id_owner = u.id LEFT JOIN '.PLANETS.' as p ON u.id = p.id_owner GROUP BY s.id_owner, u.id, u.authlevel;');
- $Return['Alliance'] = $db->query('SELECT SQL_BIG_RESULT DISTINCT a.id, a.ally_universe, s.tech_rank AS old_tech_rank, s.build_rank AS old_build_rank, s.defs_rank AS old_defs_rank, s.fleet_rank AS old_fleet_rank, s.total_rank AS old_total_rank FROM '.ALLIANCE.' as a LEFT JOIN '.STATPOINTS.' as s ON s.stat_type = 2 AND s.id_owner = a.id;');
+ $Return['Planets'] = $GLOBALS['DATABASE']->query('SELECT SQL_BIG_RESULT DISTINCT '.$select_buildings.' p.id, p.universe, p.id_owner, u.authlevel, u.bana, u.username FROM '.PLANETS.' as p LEFT JOIN '.USERS.' as u ON u.id = p.id_owner;');
+ $Return['Users'] = $GLOBALS['DATABASE']->query('SELECT SQL_BIG_RESULT DISTINCT '.$selected_tech.$select_fleets.$select_defenses.' u.id, u.ally_id, u.authlevel, u.bana, u.universe, u.username, s.tech_rank AS old_tech_rank, s.build_rank AS old_build_rank, s.defs_rank AS old_defs_rank, s.fleet_rank AS old_fleet_rank, s.total_rank AS old_total_rank FROM '.USERS.' as u LEFT JOIN '.STATPOINTS.' as s ON s.stat_type = 1 AND s.id_owner = u.id LEFT JOIN '.PLANETS.' as p ON u.id = p.id_owner GROUP BY s.id_owner, u.id, u.authlevel;');
+ $Return['Alliance'] = $GLOBALS['DATABASE']->query('SELECT SQL_BIG_RESULT DISTINCT a.id, a.ally_universe, s.tech_rank AS old_tech_rank, s.build_rank AS old_build_rank, s.defs_rank AS old_defs_rank, s.fleet_rank AS old_fleet_rank, s.total_rank AS old_total_rank FROM '.ALLIANCE.' as a LEFT JOIN '.STATPOINTS.' as s ON s.stat_type = 2 AND s.id_owner = a.id;');
return $Return;
}
+ private function setRecords($userID, $elementID, $amount)
+ {
+ $this->recordData[$elementID][$amount][] = $userID;
+ }
+
+ private function writeRecordData()
+ {
+ $QueryData = array();
+ foreach($this->recordData as $elementID => $elementArray) {
+ krsort($elementArray, SORT_NUMERIC);
+ $userWinner = reset($elementArray);
+ $maxAmount = key($elementArray);
+ $userWinner = array_unique($userWinner);
+ foreach($userWinner as $userID) {
+ $QueryData[] = "(".$userID.",".$elementID.",".$maxAmount.")";
+ }
+ }
+
+ if(!empty($QueryData)) {
+ $SQL = "TRUNCATE TABLE ".RECORDS.";";
+ $SQL .= "INSERT INTO ".RECORDS." (userID, elementID, level) VALUES ".implode(', ', $QueryData).";";
+ $this->SaveDataIntoDB($SQL);
+ }
+ }
+
private function SaveDataIntoDB($Data)
{
- global $db;
if(!empty($Data))
- $db->multi_query($Data);
+ $GLOBALS['DATABASE']->multi_query($Data);
}
- private function GetTechnoPoints($CurrentUser)
+ private function GetTechnoPoints($USER)
{
global $resource, $reslist, $pricelist, $CONF;
$TechCounts = 0;
@@ -173,22 +161,23 @@ private function GetTechnoPoints($CurrentUser)
foreach($reslist['tech'] as $Techno)
{
- if($CurrentUser[$resource[$Techno]] == 0) continue;
+ if($USER[$resource[$Techno]] == 0) continue;
- $this->SetIfRecord($Techno, $CurrentUser);
-
- $Units = $pricelist[$Techno]['metal'] + $pricelist[$Techno]['crystal'] + $pricelist[$Techno]['deuterium'];
- for($Level = 1; $Level <= $CurrentUser[$resource[$Techno]]; $Level++)
+ $Units = $pricelist[$Techno]['cost'][901] + $pricelist[$Techno]['cost'][902] + $pricelist[$Techno]['cost'][903];
+ for($Level = 1; $Level <= $USER[$resource[$Techno]]; $Level++)
{
$TechPoints += $Units * pow($pricelist[$Techno]['factor'], $Level);
}
- $TechCounts += $CurrentUser[$resource[$Techno]];
+
+ $TechCounts += $USER[$resource[$Techno]];
+
+ $this->setRecords($USER['id'], $Techno, $USER[$resource[$Techno]]);
}
- return array('count' => $TechCounts, 'points' => ($TechPoints / $CONF['stat_settings']));
+ return array('count' => $TechCounts, 'points' => ($TechPoints / Config::get('stat_settings')));
}
- private function GetBuildPoints($CurrentPlanet)
+ private function GetBuildPoints($PLANET)
{
global $resource, $reslist, $pricelist, $CONF;
$BuildCounts = 0;
@@ -196,210 +185,214 @@ private function GetBuildPoints($CurrentPlanet)
foreach($reslist['build'] as $Build)
{
- if($CurrentPlanet[$resource[$Build]] == 0) continue;
-
- $this->SetIfRecord($Build, $CurrentPlanet);
+ if($PLANET[$resource[$Build]] == 0) continue;
- $Units = $pricelist[$Build]['metal'] + $pricelist[$Build]['crystal'] + $pricelist[$Build]['deuterium'];
- for($Level = 1; $Level <= $CurrentPlanet[$resource[$Build]]; $Level++)
+ $Units = $pricelist[$Build]['cost'][901] + $pricelist[$Build]['cost'][902] + $pricelist[$Build]['cost'][903];
+ for($Level = 1; $Level <= $PLANET[$resource[$Build]]; $Level++)
{
$BuildPoints += $Units * pow($pricelist[$Build]['factor'], $Level);
}
- $BuildCounts += $CurrentPlanet[$resource[$Build]];
+
+ $BuildCounts += $PLANET[$resource[$Build]];
+
+ $this->setRecords($PLANET['id_owner'], $Build, $PLANET[$resource[$Build]]);
}
- return array('count' => $BuildCounts, 'points' => ($BuildPoints / $CONF['stat_settings']));
+ return array('count' => $BuildCounts, 'points' => ($BuildPoints / Config::get('stat_settings')));
}
- private function GetDefensePoints($CurrentPlanet)
+ private function GetDefensePoints($USER)
{
global $resource, $reslist, $pricelist, $CONF;
$DefenseCounts = 0;
$DefensePoints = 0;
foreach($reslist['defense'] as $Defense) {
- $this->SetIfRecord($Defense, $CurrentPlanet);
+ if($USER[$resource[$Defense]] == 0) continue;
- $Units = $pricelist[$Defense]['metal'] + $pricelist[$Defense]['crystal'] + $pricelist[$Defense]['deuterium'];
- $DefensePoints += $Units * $CurrentPlanet[$resource[$Defense]];
- $DefenseCounts += $CurrentPlanet[$resource[$Defense]];
+ $Units = $pricelist[$Defense]['cost'][901] + $pricelist[$Defense]['cost'][902] + $pricelist[$Defense]['cost'][903];
+ $DefensePoints += $Units * $USER[$resource[$Defense]];
+ $DefenseCounts += $USER[$resource[$Defense]];
+
+ $this->setRecords($USER['id'], $Defense, $USER[$resource[$Defense]]);
}
- return array('count' => $DefenseCounts, 'points' => ($DefensePoints / $CONF['stat_settings']));
+ return array('count' => $DefenseCounts, 'points' => ($DefensePoints / Config::get('stat_settings')));
}
- private function GetFleetPoints($CurrentPlanet)
+ private function GetFleetPoints($USER)
{
global $resource, $reslist, $pricelist, $CONF;
$FleetCounts = 0;
$FleetPoints = 0;
- foreach($reslist['fleet'] as $Fleet) {
-
- $this->SetIfRecord($Fleet, $CurrentPlanet);
+ foreach($reslist['fleet'] as $Fleet) {
+ if($USER[$resource[$Fleet]] == 0) continue;
- $Units = $pricelist[$Fleet]['metal'] + $pricelist[$Fleet]['crystal'] + $pricelist[$Fleet]['deuterium'];
- $FleetPoints += $Units * $CurrentPlanet[$resource[$Fleet]];
- $FleetCounts += $CurrentPlanet[$resource[$Fleet]];
+ $Units = $pricelist[$Fleet]['cost'][901] + $pricelist[$Fleet]['cost'][902] + $pricelist[$Fleet]['cost'][903];
+ $FleetPoints += $Units * $USER[$resource[$Fleet]];
+ $FleetCounts += $USER[$resource[$Fleet]];
+
+ $this->setRecords($USER['id'], $Fleet, $USER[$resource[$Fleet]]);
}
- return array('count' => $FleetCounts, 'points' => ($FleetPoints / $CONF['stat_settings']));
+ return array('count' => $FleetCounts, 'points' => ($FleetPoints / Config::get('stat_settings')));
}
private function SetNewRanks()
{
- global $db, $CONF;
+ global $CONF;
$QryUpdateStats = "";
foreach($this->Unis as $Uni)
{
$tech = array();
$Rank = 1;
- $RankQry = $db->query("SELECT s.`id_owner` FROM ".STATPOINTS." as s, ".USERS." as u WHERE s.`universe` = '".$Uni."' AND s.`stat_type` = '1' AND s.`id_owner` = `u`.id ".(($CONF['stat'] == 2)?'AND u.`authlevel` < '.$CONF['stat_level'].' ':'')." ORDER BY `tech_points` DESC;");
- while ($CurUser = $db->fetch_array($RankQry))
+ $RankQry = $GLOBALS['DATABASE']->query("SELECT s.id_owner FROM ".STATPOINTS." as s, ".USERS." as u WHERE s.universe = '".$Uni."' AND s.stat_type = '1' AND s.id_owner = u.id ".((Config::get('stat') == 2)?'AND u.authlevel < '.Config::get('stat_level').' ':'')." ORDER BY tech_points DESC;");
+ while ($CurUser = $GLOBALS['DATABASE']->fetch_array($RankQry))
{
$tech[$CurUser['id_owner']] = $Rank;
$Rank++;
}
- $db->free_result($RankQry);
+ $GLOBALS['DATABASE']->free_result($RankQry);
$build = array();
$Rank = 1;
- $RankQry = $db->query("SELECT s.`id_owner` FROM ".STATPOINTS." as s, ".USERS." as u WHERE s.`universe` = '".$Uni."' AND s.`stat_type` = '1' AND s.`id_owner` = `u`.id ".(($CONF['stat'] == 2)?'AND u.`authlevel` < '.$CONF['stat_level'].' ':'')." ORDER BY `build_points` DESC;");
- while ($CurUser = $db->fetch_array($RankQry))
+ $RankQry = $GLOBALS['DATABASE']->query("SELECT s.id_owner FROM ".STATPOINTS." as s, ".USERS." as u WHERE s.universe = '".$Uni."' AND s.stat_type = '1' AND s.id_owner = u.id ".((Config::get('stat') == 2)?'AND u.authlevel < '.Config::get('stat_level').' ':'')." ORDER BY build_points DESC;");
+ while ($CurUser = $GLOBALS['DATABASE']->fetch_array($RankQry))
{
$build[$CurUser['id_owner']] = $Rank;
$Rank++;
}
- $db->free_result($RankQry);
+ $GLOBALS['DATABASE']->free_result($RankQry);
$defs = array();
$Rank = 1;
- $RankQry = $db->query("SELECT s.`id_owner` FROM ".STATPOINTS." as s, ".USERS." as u WHERE s.`universe` = '".$Uni."' AND s.`stat_type` = '1' AND s.`id_owner` = `u`.id ".(($CONF['stat'] == 2)?'AND u.`authlevel` < '.$CONF['stat_level'].' ':'')." ORDER BY `defs_points` DESC;");
- while ($CurUser = $db->fetch_array($RankQry))
+ $RankQry = $GLOBALS['DATABASE']->query("SELECT s.id_owner FROM ".STATPOINTS." as s, ".USERS." as u WHERE s.universe = '".$Uni."' AND s.stat_type = '1' AND s.id_owner = u.id ".((Config::get('stat') == 2)?'AND u.authlevel < '.Config::get('stat_level').' ':'')." ORDER BY defs_points DESC;");
+ while ($CurUser = $GLOBALS['DATABASE']->fetch_array($RankQry))
{
$defs[$CurUser['id_owner']] = $Rank;
$Rank++;
}
- $db->free_result($RankQry);
+ $GLOBALS['DATABASE']->free_result($RankQry);
$fleet = array();
$Rank = 1;
- $RankQry = $db->query("SELECT s.`id_owner` FROM ".STATPOINTS." as s, ".USERS." as u WHERE s.`universe` = '".$Uni."' AND s.`stat_type` = '1' AND s.`id_owner` = `u`.id ".(($CONF['stat'] == 2)?'AND u.`authlevel` < '.$CONF['stat_level'].' ':'')." ORDER BY `fleet_points` DESC;");
- while ($CurUser = $db->fetch_array($RankQry))
+ $RankQry = $GLOBALS['DATABASE']->query("SELECT s.id_owner FROM ".STATPOINTS." as s, ".USERS." as u WHERE s.universe = '".$Uni."' AND s.stat_type = '1' AND s.id_owner = u.id ".((Config::get('stat') == 2)?'AND u.authlevel < '.Config::get('stat_level').' ':'')." ORDER BY fleet_points DESC;");
+ while ($CurUser = $GLOBALS['DATABASE']->fetch_array($RankQry))
{
$fleet[$CurUser['id_owner']] = $Rank;
$Rank++;
}
- $db->free_result($RankQry);
+ $GLOBALS['DATABASE']->free_result($RankQry);
$Rank = 1;
- $RankQry = $db->query("SELECT s.`id_owner` FROM ".STATPOINTS." as s, ".USERS." as u WHERE s.`universe` = '".$Uni."' AND s.`stat_type` = '1' AND s.`id_owner` = `u`.id ".(($CONF['stat'] == 2)?'AND u.`authlevel` < '.$CONF['stat_level'].' ':'')." ORDER BY `total_points` DESC;");
+ $RankQry = $GLOBALS['DATABASE']->query("SELECT s.id_owner FROM ".STATPOINTS." as s, ".USERS." as u WHERE s.universe = '".$Uni."' AND s.stat_type = '1' AND s.id_owner = u.id ".((Config::get('stat') == 2)?'AND u.authlevel < '.Config::get('stat_level').' ':'')." ORDER BY total_points DESC;");
- while($CurUser = $db->fetch_array($RankQry))
+ while($CurUser = $GLOBALS['DATABASE']->fetch_array($RankQry))
{
- $QryUpdateStats .= "UPDATE ".STATPOINTS." SET `tech_rank` = '". $tech[$CurUser['id_owner']] ."', `build_rank` = '". $build[$CurUser['id_owner']] ."', `defs_rank` = '". $defs[$CurUser['id_owner']] ."', `fleet_rank` = '". $fleet[$CurUser['id_owner']] ."', `total_rank` = '". $Rank ."' WHERE `stat_type` = '1' AND `id_owner` = '". $CurUser['id_owner'] ."';";
+ $QryUpdateStats .= "UPDATE ".STATPOINTS." SET tech_rank = '". $tech[$CurUser['id_owner']] ."', build_rank = '". $build[$CurUser['id_owner']] ."', defs_rank = '". $defs[$CurUser['id_owner']] ."', fleet_rank = '". $fleet[$CurUser['id_owner']] ."', total_rank = '". $Rank ."' WHERE stat_type = '1' AND id_owner = '". $CurUser['id_owner'] ."';";
$Rank++;
}
- $db->free_result($RankQry);
+ $GLOBALS['DATABASE']->free_result($RankQry);
$tech = array();
$Rank = 1;
- $RankQry = $db->query("SELECT s.`id_owner` FROM ".STATPOINTS." as s WHERE s.`universe` = '".$Uni."' AND s.`stat_type` = '2' ORDER BY `tech_points` DESC;");
- while ($CurUser = $db->fetch_array($RankQry))
+ $RankQry = $GLOBALS['DATABASE']->query("SELECT s.id_owner FROM ".STATPOINTS." as s WHERE s.universe = '".$Uni."' AND s.stat_type = '2' ORDER BY tech_points DESC;");
+ while ($CurUser = $GLOBALS['DATABASE']->fetch_array($RankQry))
{
$tech[$CurUser['id_owner']] = $Rank;
$Rank++;
}
- $db->free_result($RankQry);
+ $GLOBALS['DATABASE']->free_result($RankQry);
$build = array();
$Rank = 1;
- $RankQry = $db->query("SELECT s.`id_owner` FROM ".STATPOINTS." as s WHERE s.`universe` = '".$Uni."' AND s.`stat_type` = '2' ORDER BY `build_points` DESC;");
- while ($CurUser = $db->fetch_array($RankQry))
+ $RankQry = $GLOBALS['DATABASE']->query("SELECT s.id_owner FROM ".STATPOINTS." as s WHERE s.universe = '".$Uni."' AND s.stat_type = '2' ORDER BY build_points DESC;");
+ while ($CurUser = $GLOBALS['DATABASE']->fetch_array($RankQry))
{
$build[$CurUser['id_owner']] = $Rank;
$Rank++;
}
- $db->free_result($RankQry);
+ $GLOBALS['DATABASE']->free_result($RankQry);
$defs = array();
$Rank = 1;
- $RankQry = $db->query("SELECT s.`id_owner` FROM ".STATPOINTS." as s WHERE s.`universe` = '".$Uni."' AND s.`stat_type` = '2' ORDER BY `defs_points` DESC;");
- while ($CurUser = $db->fetch_array($RankQry))
+ $RankQry = $GLOBALS['DATABASE']->query("SELECT s.id_owner FROM ".STATPOINTS." as s WHERE s.universe = '".$Uni."' AND s.stat_type = '2' ORDER BY defs_points DESC;");
+ while ($CurUser = $GLOBALS['DATABASE']->fetch_array($RankQry))
{
$defs[$CurUser['id_owner']] = $Rank;
$Rank++;
}
- $db->free_result($RankQry);
+ $GLOBALS['DATABASE']->free_result($RankQry);
$fleet = array();
$Rank = 1;
- $RankQry = $db->query("SELECT s.`id_owner` FROM ".STATPOINTS." as s WHERE s.`universe` = '".$Uni."' AND s.`stat_type` = '2' ORDER BY `fleet_points` DESC;");
- while ($CurUser = $db->fetch_array($RankQry))
+ $RankQry = $GLOBALS['DATABASE']->query("SELECT s.id_owner FROM ".STATPOINTS." as s WHERE s.universe = '".$Uni."' AND s.stat_type = '2' ORDER BY fleet_points DESC;");
+ while ($CurUser = $GLOBALS['DATABASE']->fetch_array($RankQry))
{
$fleet[$CurUser['id_owner']] = $Rank;
$Rank++;
}
- $db->free_result($RankQry);
+ $GLOBALS['DATABASE']->free_result($RankQry);
$Rank = 1;
- $RankQry = $db->query("SELECT s.`id_owner` FROM ".STATPOINTS." as s WHERE s.`universe` = '".$Uni."' AND s.`stat_type` = '2' ORDER BY `total_points` DESC;");
+ $RankQry = $GLOBALS['DATABASE']->query("SELECT s.id_owner FROM ".STATPOINTS." as s WHERE s.universe = '".$Uni."' AND s.stat_type = '2' ORDER BY total_points DESC;");
- while($CurUser = $db->fetch_array($RankQry))
+ while($CurUser = $GLOBALS['DATABASE']->fetch_array($RankQry))
{
- $QryUpdateStats .= "UPDATE ".STATPOINTS." SET `tech_rank` = '". $tech[$CurUser['id_owner']] ."', `build_rank` = '". $build[$CurUser['id_owner']] ."', `defs_rank` = '". $defs[$CurUser['id_owner']] ."', `fleet_rank` = '". $fleet[$CurUser['id_owner']] ."', `total_rank` = '". $Rank ."' WHERE `stat_type` = '2' AND `id_owner` = '". $CurUser['id_owner'] ."';";
+ $QryUpdateStats .= "UPDATE ".STATPOINTS." SET tech_rank = '". $tech[$CurUser['id_owner']] ."', build_rank = '". $build[$CurUser['id_owner']] ."', defs_rank = '". $defs[$CurUser['id_owner']] ."', fleet_rank = '". $fleet[$CurUser['id_owner']] ."', total_rank = '". $Rank ."' WHERE stat_type = '2' AND id_owner = '". $CurUser['id_owner'] ."';";
$Rank++;
}
- $db->free_result($RankQry);
+ $GLOBALS['DATABASE']->free_result($RankQry);
}
return $QryUpdateStats;
}
final public function MakeStats()
{
- global $db, $CONF, $resource;
- $this->DeleteSome();
+ global $CONF, $resource;
$AllyPoints = array();
$UserPoints = array();
$TotalData = $this->GetUsersInfosFromDB();
$FinalSQL = 'TRUNCATE TABLE '.STATPOINTS.';';
- $FinalSQL .= "INSERT INTO ".STATPOINTS." (`id_owner`, `id_ally`, `stat_type`, `universe`, `tech_old_rank`, `tech_points`, `tech_count`, `build_old_rank`, `build_points`, `build_count`, `defs_old_rank`, `defs_points`, `defs_count`, `fleet_old_rank`, `fleet_points`, `fleet_count`, `total_old_rank`, `total_points`, `total_count`) VALUES ";
+ $FinalSQL .= "INSERT INTO ".STATPOINTS." (id_owner, id_ally, stat_type, universe, tech_old_rank, tech_points, tech_count, build_old_rank, build_points, build_count, defs_old_rank, defs_points, defs_count, fleet_old_rank, fleet_points, fleet_count, total_old_rank, total_points, total_count) VALUES ";
- while($PlanetData = $db->fetch_array($TotalData['Planets']))
+ while($PlanetData = $GLOBALS['DATABASE']->fetch_array($TotalData['Planets']))
{
- if((in_array($CONF['stat'], array(1, 2)) && $PlanetData['authlevel'] >= $CONF['stat_level']) || !empty($PlanetData['bana'])) continue;
+ if((in_array(Config::get('stat'), array(1, 2)) && $PlanetData['authlevel'] >= Config::get('stat_level')) || !empty($PlanetData['bana'])) continue;
- if(!isset($UserPoints[$PlanetData['id_owner']]))
+ if(!isset($UserPoints[$PlanetData['id_owner']])) {
$UserPoints[$PlanetData['id_owner']]['build']['count'] = $UserPoints[$PlanetData['id_owner']]['build']['points'] = 0;
+ }
- $BuildPoints = $this->GetBuildPoints($PlanetData);
+ $BuildPoints = $this->GetBuildPoints($PlanetData);
$UserPoints[$PlanetData['id_owner']]['build']['count'] += $BuildPoints['count'];
$UserPoints[$PlanetData['id_owner']]['build']['points'] += $BuildPoints['points'];
}
- $db->free_result($TotalData['Planets']);
+ $GLOBALS['DATABASE']->free_result($TotalData['Planets']);
$UniData = array();
- while($UserData = $db->fetch_array($TotalData['Users']))
+ while($UserData = $GLOBALS['DATABASE']->fetch_array($TotalData['Users']))
{
if(!isset($UniData[$UserData['universe']]))
$UniData[$UserData['universe']] = 0;
$UniData[$UserData['universe']]++;
- if ((in_array($CONF['stat'], array(1, 2)) && $UserData['authlevel'] >= $CONF['stat_level']) || !empty($UserData['bana']))
+ if ((in_array(Config::get('stat'), array(1, 2)) && $UserData['authlevel'] >= Config::get('stat_level')) || !empty($UserData['bana']))
{
$FinalSQL .= "(".$UserData['id'].",".$UserData['ally_id'].",1,".$UserData['universe'].",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), ";
continue;
@@ -421,14 +414,32 @@ final public function MakeStats()
$UserPoints[$UserData['id']]['techno']['count'] = $TechnoPoints['count'];
$UserPoints[$UserData['id']]['techno']['points'] = $TechnoPoints['points'];
- $UserPoints[$UserData['id']]['total']['count'] = $UserPoints[$UserData['id']]['techno']['count'] + $UserPoints[$UserData['id']]['build']['count'] + $UserPoints[$UserData['id']]['defense']['count'] + $UserPoints[$UserData['id']]['fleet']['count'];
- $UserPoints[$UserData['id']]['total']['points'] = $UserPoints[$UserData['id']]['techno']['points'] + $UserPoints[$UserData['id']]['build']['points'] + $UserPoints[$UserData['id']]['defense']['points'] + $UserPoints[$UserData['id']]['fleet']['points'];
+ $UserPoints[$UserData['id']]['total']['count'] = $UserPoints[$UserData['id']]['techno']['count']
+ + $UserPoints[$UserData['id']]['build']['count']
+ + $UserPoints[$UserData['id']]['defense']['count']
+ + $UserPoints[$UserData['id']]['fleet']['count'];
+
+ $UserPoints[$UserData['id']]['total']['points'] = $UserPoints[$UserData['id']]['techno']['points']
+ + $UserPoints[$UserData['id']]['build']['points']
+ + $UserPoints[$UserData['id']]['defense']['points']
+ + $UserPoints[$UserData['id']]['fleet']['points'];
if($UserData['ally_id'] != 0)
{
if(!isset($AllyPoints[$UserData['ally_id']]))
- $AllyPoints[$UserData['ally_id']]['build']['count'] = $AllyPoints[$UserData['ally_id']]['build']['points'] = $AllyPoints[$UserData['ally_id']]['fleet']['count'] = $AllyPoints[$UserData['ally_id']]['fleet']['points'] = $AllyPoints[$UserData['ally_id']]['defense']['count'] = $AllyPoints[$UserData['ally_id']]['defense']['points'] = $AllyPoints[$UserData['ally_id']]['techno']['count'] = $AllyPoints[$UserData['ally_id']]['techno']['points'] = $AllyPoints[$UserData['ally_id']]['total']['count'] = $AllyPoints[$UserData['ally_id']]['total']['points'] = 0;
-
+ {
+ $AllyPoints[$UserData['ally_id']]['build']['count'] = 0;
+ $AllyPoints[$UserData['ally_id']]['build']['points'] = 0;
+ $AllyPoints[$UserData['ally_id']]['fleet']['count'] = 0;
+ $AllyPoints[$UserData['ally_id']]['fleet']['points'] = 0;
+ $AllyPoints[$UserData['ally_id']]['defense']['count'] = 0;
+ $AllyPoints[$UserData['ally_id']]['defense']['points'] = 0;
+ $AllyPoints[$UserData['ally_id']]['techno']['count'] = 0;
+ $AllyPoints[$UserData['ally_id']]['techno']['points'] = 0;
+ $AllyPoints[$UserData['ally_id']]['total']['count'] = 0;
+ $AllyPoints[$UserData['ally_id']]['total']['points'] = 0;
+ }
+
$AllyPoints[$UserData['ally_id']]['build']['count'] += $UserPoints[$UserData['id']]['build']['count'];
$AllyPoints[$UserData['ally_id']]['build']['points'] += $UserPoints[$UserData['id']]['build']['points'];
$AllyPoints[$UserData['ally_id']]['fleet']['count'] += $UserPoints[$UserData['id']]['fleet']['count'];
@@ -441,10 +452,28 @@ final public function MakeStats()
$AllyPoints[$UserData['ally_id']]['total']['points'] += $UserPoints[$UserData['id']]['total']['points'];
}
- $FinalSQL .= "('".$UserData['id']."','".$UserData['ally_id']."', 1, ".$UserData['universe'].", '".(int)$UserData['old_tech_rank']."', '".floattostring($UserPoints[$UserData['id']]['techno']['points'])."', '".floattostring($UserPoints[$UserData['id']]['techno']['count'])."', '".(int)$UserData['old_build_rank']."','".floattostring($UserPoints[$UserData['id']]['build']['points'])."', '".floattostring($UserPoints[$UserData['id']]['build']['count'])."', '".(int)$UserData['old_defs_rank']."', '".floattostring($UserPoints[$UserData['id']]['defense']['points'])."', '".floattostring($UserPoints[$UserData['id']]['defense']['count'])."', '".(int)$UserData['old_fleet_rank']."', '".floattostring($UserPoints[$UserData['id']]['fleet']['points'])."', '".floattostring($UserPoints[$UserData['id']]['fleet']['count'])."', '".(int)$UserData['old_total_rank']."', '".floattostring($UserPoints[$UserData['id']]['total']['points'])."', '".floattostring($UserPoints[$UserData['id']]['total']['count'])."'), ";
+ $FinalSQL .= "(".
+ $UserData['id'].", ".
+ $UserData['ally_id'].", 1, ".
+ $UserData['universe'].", ".
+ (isset($UserData['old_tech_rank']) ? $UserData['old_tech_rank'] : 0).", ".
+ (isset($UserPoints[$UserData['id']]['techno']['points']) ? min($UserPoints[$UserData['id']]['techno']['points'], 1E50) : 0).", ".
+ (isset($UserPoints[$UserData['id']]['techno']['count']) ? $UserPoints[$UserData['id']]['techno']['count'] : 0).", ".
+ (isset($UserData['old_build_rank']) ? $UserData['old_build_rank'] : 0).", ".
+ (isset($UserPoints[$UserData['id']]['build']['points']) ? min($UserPoints[$UserData['id']]['build']['points'], 1E50) : 0).", ".
+ (isset($UserPoints[$UserData['id']]['build']['count']) ? $UserPoints[$UserData['id']]['build']['count'] : 0).", ".
+ (isset($UserData['old_defs_rank']) ? $UserData['old_defs_rank'] : 0).", ".
+ (isset($UserPoints[$UserData['id']]['defense']['points']) ? min($UserPoints[$UserData['id']]['defense']['points'], 1E50) : 0).", ".
+ (isset($UserPoints[$UserData['id']]['defense']['count']) ? $UserPoints[$UserData['id']]['defense']['count'] : 0).", ".
+ (isset($UserData['old_fleet_rank']) ? $UserData['old_fleet_rank'] : 0).", ".
+ (isset($UserPoints[$UserData['id']]['fleet']['points']) ? min($UserPoints[$UserData['id']]['fleet']['points'], 1E50) : 0).", ".
+ (isset($UserPoints[$UserData['id']]['fleet']['count']) ? $UserPoints[$UserData['id']]['fleet']['count'] : 0).", ".
+ (isset($UserData['old_total_rank']) ? $UserData['old_total_rank'] : 0).", ".
+ (isset($UserPoints[$UserData['id']]['total']['points']) ? min($UserPoints[$UserData['id']]['total']['points'], 1E50) : 0).", ".
+ (isset($UserPoints[$UserData['id']]['total']['count']) ? $UserPoints[$UserData['id']]['total']['count'] : 0)."), ";
}
- $db->free_result($TotalData['Users']);
+ $GLOBALS['DATABASE']->free_result($TotalData['Users']);
$FinalSQL = substr($FinalSQL, 0, -2).';';
@@ -453,26 +482,41 @@ final public function MakeStats()
if(count($AllyPoints) != 0)
{
- $AllySQL = "INSERT INTO ".STATPOINTS." (`id_owner`, `id_ally`, `stat_type`, `universe`, `tech_old_rank`, `tech_points`, `tech_count`, `build_old_rank`, `build_points`, `build_count`, `defs_old_rank`, `defs_points`, `defs_count`, `fleet_old_rank`, `fleet_points`, `fleet_count`, `total_old_rank`, `total_points`, `total_count`) VALUES ";
- while($AllianceData = $db->fetch_array($TotalData['Alliance']))
+ $AllySQL = "INSERT INTO ".STATPOINTS." (id_owner, id_ally, stat_type, universe, tech_old_rank, tech_points, tech_count, build_old_rank, build_points, build_count, defs_old_rank, defs_points, defs_count, fleet_old_rank, fleet_points, fleet_count, total_old_rank, total_points, total_count) VALUES ";
+ while($AllianceData = $GLOBALS['DATABASE']->fetch_array($TotalData['Alliance']))
{
- $AllySQL .= "('".$AllianceData['id']."', 0, 2, ".$AllianceData['ally_universe'].",'".(int)$AllyPoints['old_tech_rank']."', '".floattostring($AllyPoints[$AllianceData['id']]['techno']['points'])."', '".floattostring($AllyPoints[$AllianceData['id']]['techno']['count'])."', '".(int)$AllianceData['old_build_rank']."', '".floattostring($AllyPoints[$AllianceData['id']]['build']['points'])."', '".floattostring($AllyPoints[$AllianceData['id']]['build']['count'])."', '".(int)$AllianceData['old_defs_rank']."', '".floattostring($AllyPoints[$AllianceData['id']]['defense']['points'])."', '".floattostring($AllyPoints[$AllianceData['id']]['defense']['count'])."', '".(int)$AllianceData['old_fleet_rank']."', '".floattostring($AllyPoints[$AllianceData['id']]['fleet']['points'])."', '".floattostring($AllyPoints[$AllianceData['id']]['fleet']['count'])."', '".(int)$AllianceData['old_total_rank']."', '".floattostring($AllyPoints[$AllianceData['id']]['total']['points'])."', '".floattostring($AllyPoints[$AllianceData['id']]['total']['count'])."'), ";
+ $AllySQL .= "(".
+ $AllianceData['id'].", 0, 2, ".
+ $AllianceData['ally_universe'].", ".
+ (isset($AllyPoints['old_tech_rank']) ? $AllyPoints['old_tech_rank'] : 0).", ".
+ (isset($AllyPoints[$AllianceData['id']]['techno']['points']) ? min($AllyPoints[$AllianceData['id']]['techno']['points'], 1E50) : 0).", ".
+ (isset($AllyPoints[$AllianceData['id']]['techno']['count']) ? $AllyPoints[$AllianceData['id']]['techno']['count'] : 0).", ".
+ (isset($AllianceData['old_build_rank']) ? $AllianceData['old_build_rank'] : 0).", ".
+ (isset($AllyPoints[$AllianceData['id']]['build']['points']) ? min($AllyPoints[$AllianceData['id']]['build']['points'], 1E50) : 0).", ".
+ (isset($AllyPoints[$AllianceData['id']]['build']['count']) ? $AllyPoints[$AllianceData['id']]['build']['count'] : 0).", ".
+ (isset($AllianceData['old_defs_rank']) ? $AllianceData['old_defs_rank'] : 0).", ".
+ (isset($AllyPoints[$AllianceData['id']]['defense']['points']) ? min($AllyPoints[$AllianceData['id']]['defense']['points'], 1E50) : 0).", ".
+ (isset($AllyPoints[$AllianceData['id']]['defense']['count']) ? $AllyPoints[$AllianceData['id']]['defense']['count'] : 0).", ".
+ (isset($AllianceData['old_fleet_rank']) ? $AllianceData['old_fleet_rank'] : 0).", ".
+ (isset($AllyPoints[$AllianceData['id']]['fleet']['points']) ? min($AllyPoints[$AllianceData['id']]['fleet']['points'], 1E50) : 0).", ".
+ (isset($AllyPoints[$AllianceData['id']]['fleet']['count']) ? $AllyPoints[$AllianceData['id']]['fleet']['count'] : 0).", ".
+ (isset($AllianceData['old_total_rank']) ? $AllianceData['old_total_rank'] : 0).", ".
+ (isset($AllyPoints[$AllianceData['id']]['total']['points']) ? min($AllyPoints[$AllianceData['id']]['total']['points'], 1E50) : 0).", ".
+ (isset($AllyPoints[$AllianceData['id']]['total']['count']) ? $AllyPoints[$AllianceData['id']]['total']['count'] : 0)."), ";
}
unset($AllyPoints);
$AllySQL = substr($AllySQL, 0, -2).';';
$this->SaveDataIntoDB($AllySQL);
- }
+ }
- $db->free_result($TotalData['Alliance']);
+ $GLOBALS['DATABASE']->free_result($TotalData['Alliance']);
$RankSQL = $this->SetNewRanks();
$this->SaveDataIntoDB($RankSQL);
- $this->CheckUniverseAccounts($UniData);
- $this->BuildRecordCache();
+ $this->CheckUniverseAccounts($UniData);
+ $this->writeRecordData();
$this->AnotherCronJobs();
return $this->SomeStatsInfos();
}
}
-
-?>
\ No newline at end of file
diff --git a/includes/classes/class.template.php b/includes/classes/class.template.php
index c63e137..1678590 100644
--- a/includes/classes/class.template.php
+++ b/includes/classes/class.template.php
@@ -31,18 +31,28 @@
class template extends Smarty
{
+ protected $window = 'full';
+ protected $jsscript = array();
+ protected $script = array();
+
function __construct()
{
parent::__construct();
- $this->force_compile = false;
- $this->caching = false;
- $this->compile_check = true; #Set false for production!
- $this->jsscript = array();
- $this->script = array();
- $this->compile_dir = is_writable(ROOT_PATH.'cache/') ? ROOT_PATH.'cache/' : $this->getTempPath();
- $this->template_dir = ROOT_PATH.'/styles/templates/';
- $this->Popup = false;
- $this->Dialog = false;
+ $this->smartySettings();
+ }
+
+ function smartySettings()
+ {
+ $this->force_compile = false;
+ $this->caching = true; #Set true for production!
+ $this->merge_compiled_includes = true;
+ $this->compile_check = true; #Set false for production!
+ $this->php_handling = Smarty::PHP_REMOVE;
+
+ $this->setCompileDir(is_writable(ROOT_PATH.'cache/') ? ROOT_PATH.'cache/' : $this->getTempPath());
+ $this->setCacheDir(ROOT_PATH.'cache/templates');
+ $this->setTemplateDir(ROOT_PATH.'styles/templates/');
+ #$this->loadFilter('output', 'trimwhitespace');
}
public function loadscript($script)
@@ -62,213 +72,74 @@ public function getTempPath()
return BasicFileUtil::getTempFolder();
}
- public function assign_vars(array $var = array())
+ public function assign_vars($var, $nocache = true)
{
- parent::assign($var);
+ parent::assign($var, NULL, $nocache);
}
- private function Menus()
+ private function adm_main()
{
- global $PLANET, $LNG, $USER, $CONF, $resource, $db;
-
- //PlanetMenu
- if(isset($USER['PLANETS']))
- $USER['PLANETS'] = getPlanets($USER);
+ global $LNG, $CONF, $USER;
- if($PLANET[$resource[43]] > 0)
- $this->loadscript("gate.js");
-
- $this->loadscript("topnav.js");
- $this->loadscript("planetmenu.js");
- $this->phpself = "?page=".request_var('page', '')."&mode=".request_var('mode', '');
- $PlanetSelect = array();
- $Scripttime = array();
- foreach($USER['PLANETS'] as $CurPlanetID => $PlanetQuery)
- {
- if(!empty($PlanetQuery['b_building_id']))
- {
- $QueueArray = unserialize($PlanetQuery['b_building_id']);
- foreach($QueueArray as $ListIDArray)
- {
- if($ListIDArray[3] > TIMESTAMP)
- $Scripttime[$PlanetQuery['id']][] = $ListIDArray[3] - TIMESTAMP;
- }
+ $dateTimeServer = new DateTime("now");
+ if(isset($USER['timezone'])) {
+ try {
+ $dateTimeUser = new DateTime("now", new DateTimeZone($USER['timezone']));
+ } catch (Exception $e) {
+ $dateTimeUser = $dateTimeServer;
}
- $Planetlist[$PlanetQuery['id']] = array(
- 'url' => $this->phpself."&cp=".$PlanetQuery['id'],
- 'name' => $PlanetQuery['name'].(($PlanetQuery['planet_type'] == 3) ? " (".$LNG['fcm_moon'].")":""),
- 'image' => $PlanetQuery['image'],
- 'galaxy' => $PlanetQuery['galaxy'],
- 'system' => $PlanetQuery['system'],
- 'planet' => $PlanetQuery['planet'],
- 'ptype' => $PlanetQuery['planet_type'],
- );
-
- $PlanetSelect[$this->phpself."&cp=".$PlanetQuery['id']] = $PlanetQuery['name'].(($PlanetQuery['planet_type'] == 3) ? " (" . $LNG['fcm_moon'] . ")":"")." [".$PlanetQuery['galaxy'].":".$PlanetQuery['system'].":".$PlanetQuery['planet']."] ";
- }
-
- if($USER['urlaubs_modus'] == 1) {
- $CONF['metal_basic_income'] = 0;
- $CONF['crystal_basic_income'] = 0;
- $CONF['deuterium_basic_income'] = 0;
+ } else {
+ $dateTimeUser = $dateTimeServer;
}
- $Messages = $db->countquery("SELECT COUNT(*) FROM ".MESSAGES." WHERE `message_owner` = ".$USER['id']." AND `message_unread` = '1'");
-
- $this->assign_vars(array(
- 'PlanetMenu' => $Planetlist,
- 'show_planetmenu' => $LNG['show_planetmenu'],
- 'current_pid' => $PLANET['id'],
- 'Scripttime' => json_encode($Scripttime),
- 'new_message' => $Messages,
- 'forum_url' => $CONF['forum_url'],
- 'topnav' => true,
- 'metal' => $PLANET['metal'],
- 'crystal' => $PLANET['crystal'],
- 'deuterium' => $PLANET['deuterium'],
- 'energy' => (($PLANET['energy_max'] + $PLANET['energy_used']) < 0) ? colorRed(shortly_number($PLANET['energy_max'] + $PLANET['energy_used']).'/'.shortly_number($PLANET['energy_max'])) : shortly_number($PLANET['energy_max'] + $PLANET['energy_used']) . '/' . shortly_number($PLANET['energy_max']),
- 'energy_alt' => pretty_number($PLANET['energy_max'] + $PLANET['energy_used']).'/'.pretty_number($PLANET['energy_max']),
- 'darkmatter' => $USER['darkmatter'],
- 'metal_max' => $PLANET['metal_max'],
- 'crystal_max' => $PLANET['crystal_max'],
- 'deuterium_max' => $PLANET['deuterium_max'],
- 'js_metal_max' => floattostring($PLANET['metal_max']),
- 'js_crystal_max' => floattostring($PLANET['crystal_max']),
- 'js_deuterium_max' => floattostring($PLANET['deuterium_max']),
- 'js_metal_hr' => $PLANET['planet_type'] == 1 ? floattostring($PLANET['metal_perhour'] + $CONF['metal_basic_income'] * $CONF['resource_multiplier']) : 0,
- 'js_crystal_hr' => $PLANET['planet_type'] == 1 ? floattostring($PLANET['crystal_perhour'] + $CONF['crystal_basic_income'] * $CONF['resource_multiplier']) : 0,
- 'js_deuterium_hr' => $PLANET['planet_type'] == 1 ? floattostring($PLANET['deuterium_perhour'] + $CONF['deuterium_basic_income'] * $CONF['resource_multiplier']) : 0,
- 'current_planet' => $this->phpself."&cp=".$PLANET['id'],
- 'tn_vacation_mode' => $LNG['tn_vacation_mode'],
- 'closed' => !$CONF['game_disable'] ? $LNG['ov_closed'] : false,
- 'vacation' => $USER['urlaubs_modus'] ? tz_date($USER['urlaubs_until']) : false,
- 'delete' => $USER['db_deaktjava'] ? sprintf($LNG['tn_delete_mode'], tz_date($USER['db_deaktjava'] + ($CONF['del_user_manually'] * 86400))) : false,
- 'image' => $PLANET['image'],
- 'settings_tnstor' => $USER['settings_tnstor'],
- 'PlanetSelect' => $PlanetSelect,
- 'Metal' => $LNG['Metal'],
- 'Crystal' => $LNG['Crystal'],
- 'Deuterium' => $LNG['Deuterium'],
- 'Darkmatter' => $LNG['Darkmatter'],
- 'Energy' => $LNG['Energy'],
- 'class' => 'normal',
- ));
- }
-
- private function main()
- {
- global $USER, $CONF, $LANG, $LNG, $THEME;
- $this->assign_vars(array(
- 'title' => $CONF['game_name'],
- 'uni_name' => $CONF['uni_name'],
- 'dpath' => $THEME->getTheme(),
- 'vmode' => $USER['urlaubs_modus'],
- 'is_pmenu' => $USER['settings_planetmenu'],
- 'authlevel' => $USER['authlevel'],
- 'lang' => $LANG->getUser(),
- 'ready' => $LNG['ready'],
- 'date' => explode("|", date('Y\|n\|j\|G\|i\|s\|Z', TIMESTAMP)),
- 'cron' => GetCrons(),
- 'ga_active' => $CONF['ga_active'],
- 'ga_key' => $CONF['ga_key'],
- 'debug' => $CONF['debug'],
- 'fcm_info' => $LNG['fcm_info'],
- 'VERSION' => $CONF['VERSION'],
- 'REV' => substr($CONF['VERSION'], -4),
- 'js_tdformat' => $LNG['js_tdformat'],
- 'week_day' => json_encode($LNG['week_day']),
- 'months' => json_encode($LNG['months']),
- 'TimeZone' => ($USER['timezone'] + $USER['dst']) * 3600,
- 'Offset' => tz_diff(),
- ));
- }
-
- private function adm_main()
- {
- global $LNG, $CONF;
$this->assign_vars(array(
'scripts' => $this->script,
- 'title' => $CONF['game_name'].' - '.$LNG['adm_cp_title'],
+ 'title' => Config::get('game_name').' - '.$LNG['adm_cp_title'],
'fcm_info' => $LNG['fcm_info'],
+ 'lang' => $LNG->getLanguage(),
+ 'REV' => substr(Config::get('VERSION'), -4),
+ 'date' => explode("|", date('Y\|n\|j\|G\|i\|s\|Z', TIMESTAMP)),
+ 'Offset' => $dateTimeUser->getOffset() - $dateTimeServer->getOffset(),
+ 'VERSION' => Config::get('VERSION'),
+ 'dpath' => 'styles/theme/gow/',
+ 'bodyclass' => 'full'
));
}
- public function login_main()
- {
- global $USER, $CONF, $LNG, $LANG, $UNI;
- $this->assign_vars(array(
- 'cappublic' => $CONF['cappublic'],
- 'servername' => $CONF['game_name'],
- 'forum_url' => $CONF['forum_url'],
- 'fb_active' => $CONF['fb_on'],
- 'fb_key' => $CONF['fb_apikey'],
- 'mail_active' => $CONF['mail_active'],
- 'forum' => $LNG['forum'],
- 'register_closed' => $LNG['register_closed'],
- 'fb_perm' => sprintf($LNG['fb_perm'], $CONF['game_name']),
- 'menu_index' => $LNG['menu_index'],
- 'menu_news' => $LNG['menu_news'],
- 'menu_rules' => $LNG['menu_rules'],
- 'menu_agb' => $LNG['menu_agb'],
- 'menu_pranger' => $LNG['menu_pranger'],
- 'menu_top100' => $LNG['menu_top100'],
- 'menu_disclamer' => $LNG['menu_disclamer'],
- 'game_captcha' => $CONF['capaktiv'],
- 'reg_close' => $CONF['reg_closed'],
- 'ref_active' => $CONF['ref_active'],
- 'ga_active' => $CONF['ga_active'],
- 'ga_key' => $CONF['ga_key'],
- 'getajax' => request_var('getajax', 0),
- 'lang' => $LANG->getUser(),
- 'UNI' => $UNI,
- 'VERSION' => $CONF['VERSION'],
- 'REV' => substr($CONF['VERSION'], -4),
- 'langs' => json_encode(Language::getAllowedLangs(false)),
- ));
- }
-
- public function isPopup()
- {
- $this->assign_vars(array(
- 'class' => 'popup',
- ));
- $this->Popup = true;
- }
-
- public function isDialog()
- {
- $this->Dialog = true;
- }
-
public function show($file)
{
- global $USER, $PLANET, $CONF, $LNG, $db, $THEME;
+ global $USER, $PLANET, $CONF, $LNG, $THEME;
if($THEME->isCustomTPL($file))
- $this->template_dir = $THEME->getTemplatePath();
+ $this->setTemplateDir($THEME->getTemplatePath());
- if(!defined('INSTALL')) {
- if(defined('IN_ADMIN')) {
- $this->adm_main();
- } elseif(defined('LOGIN')) {
- $this->template_dir .= 'index/';
- $this->login_main();
- } elseif(!$this->Dialog) {
- if(!defined('AJAX')) {
- $_SESSION['USER'] = $USER;
- $_SESSION['PLANET'] = $PLANET;
- }
- $this->main();
- if($this->Popup === false)
- $this->Menus();
- }
+ $tplDir = $this->getTemplateDir();
+
+ if(MODE === 'INSTALL') {
+ $this->setTemplateDir($tplDir[0].'install/');
+ } elseif(MODE === 'ADMIN') {
+ $this->setTemplateDir($tplDir[0].'adm/');
+ $this->adm_main();
}
$this->assign_vars(array(
- 'scripts' => $this->jsscript,
- 'execscript' => implode("\n", $this->script),
+ 'scripts' => $this->jsscript,
+ 'execscript' => implode("\n", $this->script),
));
-
+
+ $this->assign_vars(array(
+ 'LNG' => $LNG,
+ ), false);
+
+ $this->compile_id = $LNG->getLanguage();
+
+ parent::display($file);
+ }
+
+ public function display($file)
+ {
+ global $LNG;
+ $this->compile_id = $LNG->getLanguage();
parent::display($file);
}
@@ -283,8 +154,6 @@ public function gotoside($dest, $time = 3)
public function message($mes, $dest = false, $time = 3, $Fatal = false)
{
global $LNG, $THEME;
- if($Fatal)
- $this->isPopup(true);
$this->assign_vars(array(
'mes' => $mes,
@@ -294,12 +163,19 @@ public function message($mes, $dest = false, $time = 3, $Fatal = false)
));
$this->gotoside($dest, $time);
- if (defined('IN_ADMIN')) {
- $this->show('adm/error_message_body.tpl');
- exit;
- }
$this->show('error_message_body.tpl');
}
+
+ public static function printMessage($Message, $fullSide = true, $redirect = NULL) {
+ $template = new self;
+ if(!isset($redirect)) {
+ $redirect = array(false, 0);
+ }
+
+ $template->message($Message, $redirect[0], $redirect[1], !$fullSide);
+ exit;
+ }
+
/**
* Workaround for new Smarty Method to add custom props...
*/
@@ -338,5 +214,3 @@ public function __set($name, $value)
}
}
}
-
-?>
\ No newline at end of file
diff --git a/includes/classes/class.theme.php b/includes/classes/class.theme.php
index 06aafcf..314528e 100644
--- a/includes/classes/class.theme.php
+++ b/includes/classes/class.theme.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2012 Jan Kröpke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,13 +18,12 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
class Theme
@@ -49,6 +48,7 @@ function setUserTheme($Theme) {
$this->skin = $Theme;
$this->parseStyleCFG();
+ $this->setStyleSettings();
}
function getTheme() {
@@ -76,6 +76,24 @@ function parseStyleCFG() {
$this->customtpls = (array) $Skin['templates'];
}
+ function setStyleSettings() {
+ if(file_exists(ROOT_PATH.'styles/theme/'.$this->skin.'/settings.cfg')) {
+ require(ROOT_PATH.'styles/theme/'.$this->skin.'/settings.cfg');
+ }
+
+ $this->THEMESETTINGS = array_merge(array(
+ 'PLANET_ROWS_ON_OVERVIEW' => 2,
+ 'SHORTCUT_ROWS_ON_FLEET1' => 2,
+ 'COLONY_ROWS_ON_FLEET1' => 2,
+ 'ACS_ROWS_ON_FLEET1' => 1,
+ 'TOPNAV_SHORTLY_NUBMER' => 0,
+ ), $THEMESETTINGS);
+ }
+
+ function getStyleSettings() {
+ return $this->THEMESETTINGS;
+ }
+
static function getAvalibleSkins() {
if(!isset(self::$Themes))
{
@@ -99,5 +117,3 @@ static function getAvalibleSkins() {
return self::$Themes;
}
}
-
-?>
\ No newline at end of file
diff --git a/includes/classes/cronjob/CleanerCronjob.class.php b/includes/classes/cronjob/CleanerCronjob.class.php
new file mode 100644
index 0000000..51eb2b2
--- /dev/null
+++ b/includes/classes/cronjob/CleanerCronjob.class.php
@@ -0,0 +1,81 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2009 Lucky
+ * @copyright 2011 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2011-12-10)
+ * @info $Id$
+ * @link http://code.google.com/p/2moons/
+ */
+
+class CleanerCronjob
+{
+ function run()
+ {
+ $CONF = Config::getAll(NULL, ROOT_UNI);
+
+ $unis = array_keys(Config::getAll(NULL));
+
+ $GLOBALS['DATABASE']->query("LOCK TABLES ".ALLIANCE." WRITE, ".ALLIANCE_REQUEST." WRITE,
+ ".BUDDY." WRITE, ".CONFIG." WRITE, ".FLEETS." WRITE, ".FLEETS_EVENT." WRITE,
+ ".NOTES." WRITE, ".MESSAGES." WRITE, ".PLANETS." WRITE,
+ ".RW." WRITE, ".SESSION." WRITE, ".STATPOINTS." WRITE,
+ ".TOPKB." WRITE, ".TOPKB_USERS." WRITE, ".USERS." WRITE;");
+
+ //Delete old messages
+ $del_before = TIMESTAMP - ($CONF['del_oldstuff'] * 86400);
+ $del_inactive = TIMESTAMP - ($CONF['del_user_automatic'] * 86400);
+ $del_deleted = TIMESTAMP - ($CONF['del_user_manually'] * 86400);
+
+ $GLOBALS['DATABASE']->multi_query("DELETE FROM ".MESSAGES." WHERE `message_time` < '". $del_before ."';
+ DELETE FROM ".ALLIANCE." WHERE `ally_members` = '0';
+ DELETE FROM ".PLANETS." WHERE `destruyed` < ".TIMESTAMP." AND `destruyed` != 0;
+ DELETE FROM ".SESSION." WHERE `lastonline` < '".(TIMESTAMP - SESSION_LIFETIME)."';
+ DELETE FROM ".FLEETS_EVENT." WHERE fleetID NOT IN (SELECT fleet_id FROM ".FLEETS.");
+ UPDATE ".USERS." SET `email_2` = `email` WHERE `setmail` < '".TIMESTAMP."';");
+
+ $ChooseToDelete = $GLOBALS['DATABASE']->query("SELECT `id` FROM `".USERS."` WHERE `authlevel` = '".AUTH_USR."' AND ((`db_deaktjava` != 0 AND `db_deaktjava` < '".$del_deleted."')".($del_inactive == TIMESTAMP ? "" : " OR `onlinetime` < '".$del_inactive."'").");");
+
+ if(isset($ChooseToDelete))
+ {
+ include_once(ROOT_PATH.'includes/functions/DeleteSelectedUser.php');
+ while($delete = $GLOBALS['DATABASE']->fetch_array($ChooseToDelete))
+ {
+ DeleteSelectedUser($delete['id']);
+ }
+ }
+
+ $GLOBALS['DATABASE']->free_result($ChooseToDelete);
+
+ foreach($unis as $uni)
+ {
+ $battleHallLowest = $GLOBALS['DATABASE']->getFirstCell("SELECT units FROM ".TOPKB." WHERE `universe` = ".$uni." ORDER BY units DESC LIMIT 99,1;");
+ if(isset($battleHallLowest))
+ {
+ $GLOBALS['DATABASE']->query("DELETE ".TOPKB.", ".TOPKB_USERS." FROM ".TOPKB." INNER JOIN ".TOPKB_USERS." USING (rid) WHERE `universe` = ".$uni." AND `units` < ".$battleHallLowest.";");
+ }
+ }
+
+ $GLOBALS['DATABASE']->query("DELETE FROM ".RW." WHERE `time` < ". $del_before ." AND `rid` NOT IN (SELECT `rid` FROM ".TOPKB.");");
+ $GLOBALS['DATABASE']->query("UNLOCK TABLES;");
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/cronjob/DailyCronjob.class.php b/includes/classes/cronjob/DailyCronjob.class.php
new file mode 100644
index 0000000..9ffe768
--- /dev/null
+++ b/includes/classes/cronjob/DailyCronjob.class.php
@@ -0,0 +1,68 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2009 Lucky
+ * @copyright 2011 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2011-12-10)
+ * @info $Id$
+ * @link http://code.google.com/p/2moons/
+ */
+
+class DailyCronJob
+{
+ function run()
+ {
+ $this->optimizeTables();
+ $this->clearCache();
+ $this->reCalculateCronjobs();
+ $this->clearEcoCache();
+ }
+
+ function optimizeTables()
+ {
+ $tables = $GLOBALS['DATABASE']->query("SHOW TABLE STATUS FROM ".DB_NAME.";");
+ $SQL = array();
+ while($table = $GLOBALS['DATABASE']->fetch_array($tables)){
+ $prefix = explode("_", $table['Name']);
+
+ if($prefix[0].'_' === DB_PREFIX && $prefix[1] !== 'session')
+ $SQL[] = $table['Name'];
+ }
+
+ $GLOBALS['DATABASE']->query("OPTIMIZE TABLE ".implode(', ',$SQL).";");
+ }
+
+ function clearCache()
+ {
+ ClearCache();
+ }
+
+ function reCalculateCronjobs()
+ {
+ Cronjob::reCalculateCronjobs();
+ }
+
+ function clearEcoCache()
+ {
+ $GLOBALS['DATABASE']->query("UPDATE ".PLANETS." SET eco_hash = '';");
+ }
+}
diff --git a/includes/classes/cronjob/DumpCronjob.class.php b/includes/classes/cronjob/DumpCronjob.class.php
new file mode 100644
index 0000000..781824f
--- /dev/null
+++ b/includes/classes/cronjob/DumpCronjob.class.php
@@ -0,0 +1,60 @@
+
+.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2009 Lucky
+ * @copyright 2011 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2011-12-10)
+ * @info $Id$
+ * @link http://code.google.com/p/2moons/
+ */
+
+class DumpCronjob
+{
+ function run()
+ {
+ $prefixCounts = strlen(DB_PREFIX);
+ $dbTables = array();
+ $sqlTableRaw = $GLOBALS['DATABASE']->query("SHOW TABLE STATUS FROM `".DB_NAME."`;");
+
+ while($table = $GLOBALS['DATABASE']->fetchArray($sqlTableRaw))
+ {
+ if(DB_PREFIX == substr($table['Name'], 0, $prefixCounts))
+ {
+ $dbTables[] = $table['Name'];
+ }
+ }
+
+ if(empty($dbTables))
+ {
+ throw new Exception('No tables found for dump.');
+ }
+
+ $fileName = '2MoonsBackup_'.date('d_m_Y_H_i_s', TIMESTAMP).'.sql';
+ $filePath = ROOT_PATH.'includes/backups/'.$fileName;
+
+ require ROOT_PATH.'includes/classes/SQLDumper.class.php';
+
+ $dump = new SQLDumper;
+ $dump->dumpTablesToFile($dbTables, $filePath);
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/cronjob/InactiveMailCronjob.class.php b/includes/classes/cronjob/InactiveMailCronjob.class.php
new file mode 100644
index 0000000..3e4473b
--- /dev/null
+++ b/includes/classes/cronjob/InactiveMailCronjob.class.php
@@ -0,0 +1,63 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2009 Lucky
+ * @copyright 2011 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2011-12-10)
+ * @info $Id$
+ * @link http://code.google.com/p/2moons/
+ */
+
+class InactiveMailCronjob
+{
+ function run()
+ {
+ global $LNG;
+
+ $CONFIG = Config::getAll(NULL);
+ $CONF = $CONFIG[ROOT_UNI];
+ $langObjects = array();
+
+ require_once ROOT_PATH.'includes/classes/Mail.class.php';
+
+ if($CONF['mail_active'] == 1) {
+ $Users = $GLOBALS['DATABASE']->query("SELECT `id`, `username`, `lang`, `email`, `onlinetime`, `universe` FROM ".USERS." WHERE `inactive_mail` = '0' AND `onlinetime` < '".(TIMESTAMP - $CONF['del_user_sendmail'] * 24 * 60 * 60)."';");
+ while($User = $GLOBALS['DATABASE']->fetch_array($Users))
+ {
+ if(!isset($langObjects[$User['lang']]))
+ {
+ $langObjects[$User['lang']] = new Language($User['lang']);
+ $langObjects[$User['lang']]->includeData(array('L18N', 'INGAME', 'PUBLIC', 'CUSTOM'));
+ }
+
+ $LNG = $langObjects[$User['lang']];
+
+ $MailSubject = sprintf($LNG['spec_mail_inactive_title'], $CONF['game_name'].' - '.$CONFIG[$User['universe']]['uni_name']);
+ $MailRAW = $LNG->getTemplate('email_inactive');
+ $MailContent = sprintf($MailRAW, $User['username'], $CONF['game_name'].' - '.$CONFIG[$User['universe']]['uni_name'], _date($LNG['php_tdformat'], $User['onlinetime']), PROTOCOL.$_SERVER['HTTP_HOST'].HTTP_ROOT);
+
+ Mail::send($User['email'], $User['username'], $MailSubject, $MailContent);
+ $GLOBALS['DATABASE']->query("UPDATE ".USERS." SET `inactive_mail` = '1' WHERE `id` = '".$User['id']."';");
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/cronjob/ReferralCronjob.class.php b/includes/classes/cronjob/ReferralCronjob.class.php
new file mode 100644
index 0000000..c36912d
--- /dev/null
+++ b/includes/classes/cronjob/ReferralCronjob.class.php
@@ -0,0 +1,65 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2009 Lucky
+ * @copyright 2011 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2011-12-10)
+ * @info $Id$
+ * @link http://code.google.com/p/2moons/
+ */
+
+class ReferralCronJob
+{
+ function run()
+ {
+ $CONF = Config::getAll(NULL, ROOT_UNI);
+
+ if($CONF['ref_active'] != 1)
+ {
+ return;
+ }
+
+ $Users = $GLOBALS['DATABASE']->query("SELECT user.`username`, user.`ref_id`, user.`id`, user.`lang`
+ FROM ".USERS." user
+ INNER JOIN ".STATPOINTS." as stats
+ ON stats.`id_owner` = user.`id` AND stats.`stat_type` = '1' AND stats.`total_points` >= ".$CONF['ref_minpoints']."
+ WHERE user.`ref_bonus` = 1;");
+
+ $langObjects = array();
+
+ while($User = $GLOBALS['DATABASE']->fetch_array($Users))
+ {
+ if(!isset($langObjects[$User['lang']]))
+ {
+ $langObjects[$User['lang']] = new Language($User['lang']);
+ $langObjects[$User['lang']]->includeData(array('L18N', 'INGAME', 'TECH', 'CUSTOM'));
+ }
+
+ $LNG = $langObjects[$User['lang']];
+ $GLOBALS['DATABASE']->multi_query("UPDATE ".USERS." SET `darkmatter` = `darkmatter` + ".$CONF['ref_bonus']." WHERE `id` = ".$User['ref_id'].";
+ UPDATE ".USERS." SET `ref_bonus` = `ref_bonus` = '0' WHERE `id` = ".$User['id'].";");
+
+ $Message = sprintf($LNG['sys_refferal_text'], $User['username'], pretty_number($CONF['ref_minpoints']), pretty_number($CONF['ref_bonus']), $LNG['tech'][921]);
+ SendSimpleMessage($User['ref_id'], '', TIMESTAMP, 4, $LNG['sys_refferal_from'], sprintf($LNG['sys_refferal_title'], $User['username']), $Message);
+ }
+ }
+}
\ No newline at end of file
diff --git a/includes/pages/ShowFAQ.php b/includes/classes/cronjob/StatisticCronjob.class.php
similarity index 57%
rename from includes/pages/ShowFAQ.php
rename to includes/classes/cronjob/StatisticCronjob.class.php
index 4bbc263..1f459bc 100644
--- a/includes/pages/ShowFAQ.php
+++ b/includes/classes/cronjob/StatisticCronjob.class.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2011 Jan Kröpke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,30 +18,25 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2009 Lucky
+ * @copyright 2011 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2011-12-10)
* @info $Id$
* @link http://code.google.com/p/2moons/
*/
-
-function ShowFAQPage()
-{
- global $USER, $PLANET, $LNG, $LANG;
- $PlanetRess = new ResourceUpdate();
- $PlanetRess->CalcResource();
- $PlanetRess->SavePlanetToDB();
- $template = new template();
- $LANG->includeLang(array('FAQ'));
- $template->assign_vars(array(
- 'FAQList' => $LNG['faq'],
- 'faq_overview' => $LNG['faq_overview'],
- ));
-
- $template->show("faq_overview.tpl");
-}
-?>
\ No newline at end of file
+class StatisticCronjob
+{
+ function run()
+ {
+ require_once(ROOT_PATH.'includes/classes/class.statbuilder.php');
+ $stat = new Statbuilder();
+ $result = $stat->MakeStats();
+ Config::update(array(
+ 'stat_last_update' => TIMESTAMP
+ ));
+ }
+}
\ No newline at end of file
diff --git a/includes/pages/ShowLogoutPage.php b/includes/classes/cronjob/TeamSpeakCronjob.class.php
similarity index 55%
rename from includes/pages/ShowLogoutPage.php
rename to includes/classes/cronjob/TeamSpeakCronjob.class.php
index c0f16d7..97e25af 100644
--- a/includes/pages/ShowLogoutPage.php
+++ b/includes/classes/cronjob/TeamSpeakCronjob.class.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2011 Jan Kröpke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,31 +18,20 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2009 Lucky
+ * @copyright 2011 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2011-12-10)
* @info $Id$
* @link http://code.google.com/p/2moons/
*/
-function ShowLogoutPage()
+class TeamSpeakCronjob
{
- global $LNG, $SESSION;
-
- $SESSION->DestroySession();
-
- $template = new template();
- $template->cache = true;
- $template->isPopup(true);
- $template->assign_vars(array(
- 'lo_title' => $LNG['lo_title'],
- 'lo_logout' => $LNG['lo_logout'],
- 'lo_redirect' => $LNG['lo_redirect'],
- 'lo_notify' => $LNG['lo_notify'],
- 'lo_continue' => $LNG['lo_continue'],
- ));
- $template->show("logout_overview.tpl");
-}
-?>
\ No newline at end of file
+ function run()
+ {
+ $GLOBALS['CACHE']->add('teamspeak', 'TeamspeakBuildCache');
+ $GLOBALS['CACHE']->flush('teamspeak');
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/cronjob/TrackingCronjob.class.php b/includes/classes/cronjob/TrackingCronjob.class.php
new file mode 100644
index 0000000..0b5130a
--- /dev/null
+++ b/includes/classes/cronjob/TrackingCronjob.class.php
@@ -0,0 +1,71 @@
+.
+ *
+ * @package 2Moons
+ * @author Jan Kröpke
+ * @copyright 2009 Lucky
+ * @copyright 2011 Jan Kröpke
+ * @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
+ * @version 1.7.0 (2011-12-10)
+ * @info $Id$
+ * @link http://code.google.com/p/2moons/
+ */
+
+class TrackingCronjob
+{
+ function run()
+ {
+ $serverData['php'] = PHP_VERSION;
+
+ try {
+ $serverData['installSince'] = $GLOBALS['DATABASE']->getFirstCell("SELECT register_time FROM ".USERS." WHERE id = ".ROOT_USER);
+ } catch (Exception $e) {
+ $serverData['installSince'] = NULL;
+ }
+
+ try {
+ $serverData['users'] = $GLOBALS['DATABASE']->getFirstCell("SELECT COUNT(*) FROM ".USERS.";");
+ } catch (Exception $e) {
+ $serverData['users'] = NULL;
+ }
+
+ try {
+ $serverData['unis'] = $GLOBALS['DATABASE']->getFirstCell("SELECT COUNT(*) FROM ".CONFIG.";");
+ } catch (Exception $e) {
+ $serverData['unis'] = NULL;
+ }
+
+ try {
+ $serverData['version'] = Config::get('VERSION');
+ } catch (Exception $e) {
+ $serverData['version'] = NULL;
+ }
+
+ $this->ch = curl_init('http://tracking.2moons.cc/');
+ curl_setopt($this->ch, CURLOPT_HTTPGET, true);
+ curl_setopt($this->ch, CURLOPT_AUTOREFERER, true);
+ curl_setopt($this->ch, CURLOPT_FOLLOWLOCATION, true);
+ curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($this->ch, CURLOPT_POSTFIELDS, $serverData);
+ curl_setopt($this->ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; 2Moons/".Config::get('VERSION')."; +http://2moons.cc)");
+
+ curl_exec($this->ch);
+ curl_close($this->ch);
+ }
+}
\ No newline at end of file
diff --git a/includes/classes/missions/GenerateReport.php b/includes/classes/missions/GenerateReport.php
index 89c9f36..c565c7c 100644
--- a/includes/classes/missions/GenerateReport.php
+++ b/includes/classes/missions/GenerateReport.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2012 Jan Kröpke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,96 +18,97 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
-function GenerateReport($RESULT, $INFO)
+function GenerateReport($combatResult, $raportInfo)
{
- $des = array('att' => 0, 'def' => 0);
+ $Destroy = array('att' => 0, 'def' => 0);
$DATA = array();
- $DATA['mode'] = (int) $INFO['moon']['des'];
- $DATA['time'] = $INFO['fleet_start_time'];
- $DATA['start'] = array($INFO['fleet_start_galaxy'], $INFO['fleet_start_system'], $INFO['fleet_start_planet'], $INFO['fleet_start_type']);
- $DATA['koords'] = array($INFO['fleet_end_galaxy'], $INFO['fleet_end_system'], $INFO['fleet_end_planet'], $INFO['fleet_end_type']);
- $DATA['units'] = array($RESULT['lost']['att'], $RESULT['lost']['def']);
- $DATA['debris'] = array($RESULT['debree']['att'][0] + $RESULT['debree']['def'][0], $RESULT['debree']['att'][1] + $RESULT['debree']['def'][1]);
- $DATA['steal'] = array($INFO['steal']['metal'], $INFO['steal']['crystal'], $INFO['steal']['deuterium']);
- $DATA['result'] = $RESULT['won'];
+ $DATA['mode'] = (int) $raportInfo['moonDestroy'];
+ $DATA['time'] = $raportInfo['thisFleet']['fleet_start_time'];
+ $DATA['start'] = array($raportInfo['thisFleet']['fleet_start_galaxy'], $raportInfo['thisFleet']['fleet_start_system'], $raportInfo['thisFleet']['fleet_start_planet'], $raportInfo['thisFleet']['fleet_start_type']);
+ $DATA['koords'] = array($raportInfo['thisFleet']['fleet_end_galaxy'], $raportInfo['thisFleet']['fleet_end_system'], $raportInfo['thisFleet']['fleet_end_planet'], $raportInfo['thisFleet']['fleet_end_type']);
+ $DATA['units'] = array($combatResult['unitLost']['attacker'], $combatResult['unitLost']['defender']);
+ $DATA['debris'] = $raportInfo['debris'];
+ $DATA['steal'] = $raportInfo['stealResource'];
+ $DATA['result'] = $combatResult['won'];
$DATA['moon'] = array(
- $INFO['moon']['chance'],
- $INFO['moon']['name'],
- $INFO['moon']['desfail'],
- $INFO['moon']['chance2'],
- $INFO['moon']['fleetfail']
+ 'moonName' => $raportInfo['moonName'],
+ 'moonChance' => (int) $raportInfo['moonChance'],
+ 'moonDestroyChance' => (int) $raportInfo['moonDestroyChance'],
+ 'moonDestroySuccess' => (int) $raportInfo['moonDestroySuccess'],
+ 'fleetDestroyChance' => (int) $raportInfo['fleetDestroyChance'],
+ 'fleetDestroySuccess' => (int) $raportInfo['fleetDestroySuccess']
);
- $DATA['simu'] = isset($INFO['battlesim']) ? $INFO['battlesim'] : "";
-
+ if(isset($raportInfo['additionalInfo']))
+ {
+ $DATA['additionalInfo'] = $raportInfo['additionalInfo'];
+ }
+ else
+ {
+ $DATA['additionalInfo'] = "";
+ }
- foreach($RESULT['rw'][0]['attackers'] as $Player)
+ foreach($combatResult['rw'][0]['attackers'] as $player)
{
- $DATA['players'][$Player['user']['id']] = array(
- 'name' => $Player['user']['username'],
- 'koords' => array($Player['fleet']['fleet_start_galaxy'], $Player['fleet']['fleet_start_system'], $Player['fleet']['fleet_start_planet']),
- 'tech' => array($Player['techs'][0] * 100, $Player['techs'][1] * 100, $Player['techs'][2] * 100),
+ $DATA['players'][$player['player']['id']] = array(
+ 'name' => $player['player']['username'],
+ 'koords' => array($player['fleetDetail']['fleet_start_galaxy'], $player['fleetDetail']['fleet_start_system'], $player['fleetDetail']['fleet_start_planet'], $player['fleetDetail']['fleet_start_type']),
+ 'tech' => array($player['techs'][0] * 100, $player['techs'][1] * 100, $player['techs'][2] * 100),
);
}
- foreach($RESULT['rw'][0]['defenders'] as $FleetID => $Player)
+ foreach($combatResult['rw'][0]['defenders'] as $FleetID => $player)
{
- if($FleetID == 0) {
- $Koords = $DATA['koords'];
- } else {
- $Koords = array(
- $Player['fleet']['fleet_start_galaxy'],
- $Player['fleet']['fleet_start_system'],
- $Player['fleet']['fleet_start_planet']
- );
- }
-
- $DATA['players'][$Player['user']['id']] = array(
- 'name' => $Player['user']['username'],
- 'koords' => $Koords,
- 'tech' => array($Player['techs'][0] * 100, $Player['techs'][1] * 100, $Player['techs'][2] * 100),
+ $DATA['players'][$player['player']['id']] = array(
+ 'name' => $player['player']['username'],
+ 'koords' => array($player['fleetDetail']['fleet_start_galaxy'], $player['fleetDetail']['fleet_start_system'], $player['fleetDetail']['fleet_start_planet'], $player['fleetDetail']['fleet_start_type']),
+ 'tech' => array($player['techs'][0] * 100, $player['techs'][1] * 100, $player['techs'][2] * 100),
);
}
- foreach($RESULT['rw'] as $Round => $RoundInfo)
+ foreach($combatResult['rw'] as $Round => $RoundInfo)
{
- foreach($RoundInfo['attackers'] as $FleetID => $Player)
+ foreach($RoundInfo['attackers'] as $FleetID => $player)
{
- $DATA['rounds'][$Round]['attacker'][$Player['user']['id']] = array();
+ $playerData = array('userID' => $player['player']['id'], 'ships' => array());
- if(array_sum($Player['detail']) == 0) {
+ if(array_sum($player['unit']) == 0) {
+ $DATA['rounds'][$Round]['attacker'][] = $playerData;
$Destroy['att']++;
continue;
}
- foreach($Player['detail'] as $ShipID => $Amount)
+ foreach($player['unit'] as $ShipID => $Amount)
{
if ($Amount <= 0)
continue;
+
$ShipInfo = $RoundInfo['infoA'][$FleetID][$ShipID];
- $DATA['rounds'][$Round]['attacker'][$Player['user']['id']][$ShipID] = array(
+ $playerData['ships'][$ShipID] = array(
$Amount, $ShipInfo['att'], $ShipInfo['def'], $ShipInfo['shield']
);
}
+
+ $DATA['rounds'][$Round]['attacker'][] = $playerData;
}
- foreach($RoundInfo['defenders'] as $FleetID => $Player)
+ foreach($RoundInfo['defenders'] as $FleetID => $player)
{
- $DATA['rounds'][$Round]['defender'][$Player['user']['id']] = array();
- if(array_sum($Player['def']) == 0) {
+ $playerData = array('userID' => $player['player']['id'], 'ships' => array());
+ if(array_sum($player['unit']) == 0) {
+ $DATA['rounds'][$Round]['defender'][] = $playerData;
$Destroy['def']++;
continue;
}
- foreach($Player['def'] as $ShipID => $Amount)
+ foreach($player['unit'] as $ShipID => $Amount)
{
if ($Amount <= 0) {
$Destroy['def']++;
@@ -115,18 +116,21 @@ function GenerateReport($RESULT, $INFO)
}
$ShipInfo = $RoundInfo['infoD'][$FleetID][$ShipID];
- $DATA['rounds'][$Round]['defender'][$Player['user']['id']][$ShipID] = array(
+ $playerData['ships'][$ShipID] = array(
$Amount, $ShipInfo['att'], $ShipInfo['def'], $ShipInfo['shield']
);
}
+ $DATA['rounds'][$Round]['defender'][] = $playerData;
}
- if ($Round >= MAX_ATTACK_ROUNDS || $des['att'] == count($RoundInfo['attackers']) || $des['def'] == count($RoundInfo['defenders']))
+ if ($Round >= MAX_ATTACK_ROUNDS || $Destroy['att'] == count($RoundInfo['attackers']) || $Destroy['def'] == count($RoundInfo['defenders']))
break;
-
- $DATA['rounds'][$Round]['info'] = array($RoundInfo['attack'], $RoundInfo['attackShield'], $RoundInfo['defense'], $RoundInfo['defShield']);
+
+ if(isset($RoundInfo['attack'], $RoundInfo['attackShield'], $RoundInfo['defense'], $RoundInfo['defShield']))
+ $DATA['rounds'][$Round]['info'] = array($RoundInfo['attack'], $RoundInfo['attackShield'], $RoundInfo['defense'], $RoundInfo['defShield']);
+ else
+ $DATA['rounds'][$Round]['info'] = array(NULL, NULL, NULL, NULL);
}
return $DATA;
}
-
-?>
\ No newline at end of file
+
\ No newline at end of file
diff --git a/includes/classes/missions/MissionCaseACS.php b/includes/classes/missions/MissionCaseACS.php
index d6e9d9c..e19d110 100644
--- a/includes/classes/missions/MissionCaseACS.php
+++ b/includes/classes/missions/MissionCaseACS.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2012 Jan Kröpke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,13 +18,12 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
class MissionCaseACS extends MissionFunctions
@@ -37,6 +36,8 @@ function __construct($Fleet)
function TargetEvent()
{
+ $this->setState(FLEET_RETURN);
+ $this->SaveFleet();
return;
}
@@ -47,14 +48,11 @@ function EndStayEvent()
function ReturnEvent()
{
- global $LANG;
- $LNG = $LANG->GetUserLang($this->_fleet['fleet_owner']);
-
- $Message = sprintf($LNG['sys_fleet_won'], $TargetName, GetTargetAdressLink($this->_fleet, ''), pretty_number($this->_fleet['fleet_resource_metal']), $LNG['Metal'], pretty_number($this->_fleet['fleet_resource_crystal']), $LNG['Crystal'], pretty_number($this->_fleet['fleet_resource_deuterium']), $LNG['Deuterium'] );
+ $LNG = $this->getLanguage(NULL, $this->_fleet['fleet_owner']);
+ $TargetName = $GLOBALS['DATABASE']->getFirstCell("SELECT name FROM ".PLANETS." WHERE id = ".$this->_fleet['fleet_start_id'].";");
+ $Message = sprintf($LNG['sys_fleet_won'], $TargetName, GetTargetAdressLink($this->_fleet, ''), pretty_number($this->_fleet['fleet_resource_metal']), $LNG['tech'][901], pretty_number($this->_fleet['fleet_resource_crystal']), $LNG['tech'][902], pretty_number($this->_fleet['fleet_resource_deuterium']), $LNG['tech'][903] );
SendSimpleMessage($this->_fleet['fleet_owner'], 0, $this->_fleet['fleet_end_time'], 3, $LNG['sys_mess_tower'], $LNG['sys_mess_fleetback'], $Message);
$this->RestoreFleet();
}
}
-
-?>
\ No newline at end of file
diff --git a/includes/classes/missions/MissionCaseAttack.php b/includes/classes/missions/MissionCaseAttack.php
index 070aceb..b45dc22 100644
--- a/includes/classes/missions/MissionCaseAttack.php
+++ b/includes/classes/missions/MissionCaseAttack.php
@@ -2,7 +2,7 @@
/**
* 2Moons
- * Copyright (C) 2011 Slaver
+ * Copyright (C) 2012 Jan Kröpke
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,13 +18,12 @@
* along with this program. If not, see
- * @copyright 2009 Lucky (XGProyecto)
- * @copyright 2011 Slaver (Fork/2Moons)
+ * @author Jan Kröpke
+ * @copyright 2012 Jan Kröpke
* @license http://www.gnu.org/licenses/gpl.html GNU GPLv3 License
- * @version 1.6.1 (2011-11-19)
+ * @version 1.7.0 (2013-01-17)
* @info $Id$
- * @link http://code.google.com/p/2moons/
+ * @link http://2moons.cc/
*/
class MissionCaseAttack extends MissionFunctions
@@ -36,300 +35,463 @@ function __construct($Fleet)
function TargetEvent()
{
- global $pricelist, $resource, $reslist, $db, $LANG;
+ global $resource, $reslist;
- $targetPlanet = $db->uniquequery("SELECT * FROM ".PLANETS." WHERE `id` = '". $this->_fleet['fleet_end_id'] ."';");
- $targetUser = $db->uniquequery("SELECT * FROM ".USERS." WHERE id = '".$targetPlanet['id_owner']."';");
-
- require_once(ROOT_PATH.'includes/classes/class.PlanetRessUpdate.php');
-
- $targetUser['factor'] = getFactors($targetUser, 'basic', $this->_fleet['fleet_start_time']);
- $PlanetRess = new ResourceUpdate();
- list($targetUser, $targetPlanet) = $PlanetRess->CalcResource($targetUser, $targetPlanet, true, $this->_fleet['fleet_start_time']);
- $TargetUserID = $targetUser['id'];
- $attackFleets = array();
- $AttackerRow['id'] = array();
- $AttackerRow['name'] = array();
- $DefenderRow['id'] = array();
- $DefenderRow['name'] = array();
-
- if ($this->_fleet['fleet_group'] != 0)
+ $fleetAttack = array();
+ $fleetDefend = array();
+
+ $userAttack = array();
+ $userDefend = array();
+
+ $stealResource = array(
+ 901 => 0,
+ 902 => 0,
+ 903 => 0,
+ );
+
+ $debris = array();
+ $planetDebris = array();
+
+ $raportInfo = array();
+
+ $debrisRessource = array(901, 902);
+
+ $messageHTML = <<
+
+
+
+HTML;
+ //Minize HTML
+ $messageHTML = str_replace(array("\n", "\t", "\r"), "", $messageHTML);
+
+ $targetPlanet = $GLOBALS['DATABASE']->getFirstRow("SELECT * FROM ".PLANETS." WHERE id = '".$this->_fleet['fleet_end_id']."';");
+ $targetUser = $GLOBALS['DATABASE']->getFirstRow("SELECT * FROM ".USERS." WHERE id = '".$targetPlanet['id_owner']."';");
+
+ $targetUser['factor'] = getFactors($targetUser, 'basic', $this->_fleet['fleet_start_time']);
+ $planetUpdater = new ResourceUpdate();
+
+ list($targetUser, $targetPlanet) = $planetUpdater->CalcResource($targetUser, $targetPlanet, true, $this->_fleet['fleet_start_time']);
+
+ if($this->_fleet['fleet_group'] != 0)
{
- $db->query("DELETE FROM ".AKS." WHERE `id` = '".$this->_fleet['fleet_group']."';");
- $fleets = $db->query("SELECT * FROM ".FLEETS." WHERE fleet_group = '".$this->_fleet['fleet_group']."';");
- while ($fleet = $db->fetch_array($fleets))
+ $GLOBALS['DATABASE']->query("DELETE FROM ".AKS." WHERE id = '".$this->_fleet['fleet_group']."';");
+ $incomingFleetsResult = $GLOBALS['DATABASE']->query("SELECT * FROM ".FLEETS." WHERE fleet_group = '".$this->_fleet['fleet_group']."';");
+
+ while ($incomingFleetsRow = $GLOBALS['DATABASE']->fetch_array($incomingFleetsResult))
{
- $attackFleets[$fleet['fleet_id']]['fleet'] = $fleet;
- $attackFleets[$fleet['fleet_id']]['user'] = $db->uniquequery("SELECT `id`, `username`, `military_tech`, `defence_tech`, `shield_tech`, `rpg_amiral`, `dm_defensive`, `dm_attack` FROM ".USERS." WHERE `id` = '".$fleet['fleet_owner']."';");
- $attackFleets[$fleet['fleet_id']]['user']['factor'] = getFactors($attackFleets[$fleet['fleet_id']]['user'], 'attack', $this->_fleet['fleet_start_time']);
- $attackFleets[$fleet['fleet_id']]['detail'] = array();
- $temp = explode(';', $fleet['fleet_array']);
- foreach ($temp as $temp2)
- {
- $temp2 = explode(',', $temp2);
- if ($temp2[0] < 100) continue;
-
- if (!isset($attackFleets[$fleet['fleet_id']]['detail'][$temp2[0]]))
- $attackFleets[$fleet['fleet_id']]['detail'][$temp2[0]] = 0;
-
- $attackFleets[$fleet['fleet_id']]['detail'][$temp2[0]] += $temp2[1];
- }
- $AttackerRow['id'][] = $attackFleets[$fleet['fleet_id']]['user']['id'];
+ $incomingFleets[$incomingFleetsRow['fleet_id']] = $incomingFleetsRow;
}
+
+ $GLOBALS['DATABASE']->free_result($incomingFleetsResult);
}
else
{
- $attackFleets[$this->_fleet['fleet_id']]['fleet'] = $this->_fleet;
- $attackFleets[$this->_fleet['fleet_id']]['user'] = $db->uniquequery("SELECT `id`, `username`, `military_tech`, `defence_tech`, `shield_tech`, `rpg_amiral`, `dm_defensive`, `dm_attack` FROM ".USERS." WHERE id = '".$this->_fleet['fleet_owner']."';");
- $attackFleets[$this->_fleet['fleet_id']]['user']['factor'] = getFactors($attackFleets[$this->_fleet['fleet_id']]['user'], 'attack', $this->_fleet['fleet_start_time']);
- $attackFleets[$this->_fleet['fleet_id']]['detail'] = array();
- $temp = explode(';', $this->_fleet['fleet_array']);
- foreach ($temp as $temp2)
- {
- $temp2 = explode(',', $temp2);
- if ($temp2[0] < 100) continue;
-
- if (!isset($attackFleets[$this->_fleet['fleet_id']]['detail'][$temp2[0]]))
- $attackFleets[$this->_fleet['fleet_id']]['detail'][$temp2[0]] = 0;
-
- $attackFleets[$this->_fleet['fleet_id']]['detail'][$temp2[0]] += $temp2[1];
- }
- $AttackerRow['id'][] = $attackFleets[$this->_fleet['fleet_id']]['user']['id'];
+ $incomingFleets = array($this->_fleet['fleet_id'] => $this->_fleet);
}
-
- $defense = array();
-
- $def = $db->query("SELECT * FROM ".FLEETS." WHERE `fleet_mission` = '5' AND `fleet_end_id` = '".$this->_fleet['fleet_end_id']."' AND fleet_start_time <= '".TIMESTAMP."' AND fleet_end_stay >= '".TIMESTAMP."';");
- while ($defRow = $db->fetch_array($def))
+
+ foreach($incomingFleets as $fleetID => $fleetDetail)
{
- $defense[$defRow['fleet_id']]['user'] = $db->uniquequery("SELECT `id`, `username`, `military_tech`, `defence_tech`, `shield_tech`, `rpg_amiral`, `dm_defensive`, `dm_attack` FROM ".USERS." WHERE id = '".$defRow['fleet_owner']."';");
- $attackFleets[$this->_fleet['fleet_id']]['user']['factor'] = getFactors($defense[$defRow['fleet_id']]['user'], 'attack', $this->_fleet['fleet_start_time']);
- $defRowDef = explode(';', $defRow['fleet_array']);
- foreach ($defRowDef as $Element)
- {
- $Element = explode(',', $Element);
-
- if ($Element[0] < 100) continue;
-
- if (!isset($defense[$defRow['fleet_id']]['def'][$Element[0]]))
- $defense[$defRow['fleet_id']][$Element[0]] = 0;
-
- $defense[$defRow['fleet_id']]['def'][$Element[0]] += $Element[1];
- }
- $DefenderRow['id'][] = $defense[$defRow['fleet_id']]['user']['id'];
+ $fleetAttack[$fleetID]['fleetDetail'] = $fleetDetail;
+ $fleetAttack[$fleetID]['player'] = $GLOBALS['DATABASE']->getFirstRow("SELECT * FROM ".USERS." WHERE id = '".$fleetDetail['fleet_owner']."';");
+ $fleetAttack[$fleetID]['player']['factor'] = getFactors($fleetAttack[$fleetID]['player'], 'attack', $this->_fleet['fleet_start_time']);
+ $fleetAttack[$fleetID]['unit'] = fleetAmountToArray($fleetDetail['fleet_array']);
+
+ $userAttack[$fleetAttack[$fleetID]['player']['id']] = $fleetAttack[$fleetID]['player']['username'];
}
-
- $defense[0]['def'] = array();
- $defense[0]['user'] = $targetUser;
- $defense[0]['user']['factor'] = getFactors($defense[0]['user'], 'attack', $this->_fleet['fleet_start_time']);
- $DefenderRow['id'][] = $defense[0]['user']['id'];
+
+ $targetFleetsResult = $GLOBALS['DATABASE']->query("SELECT * FROM ".FLEETS." WHERE fleet_mission = '5' AND fleet_end_id = '".$this->_fleet['fleet_end_id']."' AND fleet_start_time <= '".TIMESTAMP."' AND fleet_end_stay >= '".TIMESTAMP."';");
+ while ($fleetDetail = $GLOBALS['DATABASE']->fetch_array($targetFleetsResult))
+ {
+ $fleetID = $fleetDetail['fleet_id'];
+
+ $fleetDefend[$fleetID]['fleetDetail'] = $fleetDetail;
+ $fleetDefend[$fleetID]['player'] = $GLOBALS['DATABASE']->getFirstRow("SELECT * FROM ".USERS." WHERE id = '".$fleetDetail['fleet_owner']."';");
+ $fleetDefend[$fleetID]['player']['factor'] = getFactors($fleetDefend[$fleetID]['player'], 'attack', $this->_fleet['fleet_start_time']);
+ $fleetDefend[$fleetID]['unit'] = fleetAmountToArray($fleetDetail['fleet_array']);
+
+ $userDefend[$fleetDefend[$fleetID]['player']['id']] = $fleetDefend[$fleetID]['player']['username'];
+ }
+
+ $GLOBALS['DATABASE']->free_result($targetFleetsResult);
+
+ $fleetDefend[0]['player'] = $targetUser;
+ $fleetDefend[0]['player']['factor'] = getFactors($fleetDefend[0]['player'], 'attack', $this->_fleet['fleet_start_time']);
+ $fleetDefend[0]['fleetDetail'] = array(
+ 'fleet_start_galaxy' => $targetPlanet['galaxy'],
+ 'fleet_start_system' => $targetPlanet['system'],
+ 'fleet_start_planet' => $targetPlanet['planet'],
+ 'fleet_start_type' => $targetPlanet['planet_type'],
+ );
- foreach(array_merge($reslist['fleet'], $reslist['defense']) as $ID)
+ $fleetDefend[0]['unit'] = array();
+
+ foreach(array_merge($reslist['fleet'], $reslist['defense']) as $elementID)
{
- if ($ID >= 500)
- continue;
+ if (empty($targetPlanet[$resource[$elementID]])) continue;
- $defense[0]['def'][$ID] = $targetPlanet[$resource[$ID]];
+ $fleetDefend[0]['unit'][$elementID] = $targetPlanet[$resource[$elementID]];
}
-
- $Attacker['id'] = array_unique($AttackerRow['id']);
- $Defender['id'] = array_unique($DefenderRow['id']);
+
+ $userDefend[$fleetDefend[0]['player']['id']] = $fleetDefend[0]['player']['username'];
require_once('calculateAttack.php');
- $result = calculateAttack($attackFleets, $defense, $GLOBALS['CONFIG'][$this->_fleet['fleet_universe']]['Fleet_Cdr'], $GLOBALS['CONFIG'][$this->_fleet['fleet_universe']]['Defs_Cdr']);
- $SQL = "";
-
- foreach ($attackFleets as $fleetID => $attacker)
+
+ $fleetIntoDebris = $GLOBALS['CONFIG'][$this->_fleet['fleet_universe']]['Fleet_Cdr'];
+ $defIntoDebris = $GLOBALS['CONFIG'][$this->_fleet['fleet_universe']]['Defs_Cdr'];
+
+ $combatResult = calculateAttack($fleetAttack, $fleetDefend, $fleetIntoDebris, $defIntoDebris);
+
+ $sqlQuery = "";
+
+ foreach ($fleetAttack as $fleetID => $fleetDetail)
{
$fleetArray = '';
$totalCount = 0;
- foreach ($attacker['detail'] as $element => $amount)
+
+ $fleetDetail['unit'] = array_filter($fleetDetail['unit']);
+ foreach ($fleetDetail['unit'] as $elementID => $amount)
{
- if ($amount)
- $fleetArray .= $element.','.floattostring($amount).';';
-
+ $fleetArray .= $elementID.','.floattostring($amount).';';
$totalCount += $amount;
}
- $SQL .= $totalCount <= 0 ? "DELETE FROM ".FLEETS." WHERE `fleet_id`= '".$fleetID."';UPDATE ".LOG_FLEETS." SET `fleet_state` = 1 WHERE `fleet_id`= '".$fleetID."';" : "UPDATE ".FLEETS." SET `fleet_mess` = '1', `fleet_array` = '".substr($fleetArray, 0, -1)."', `fleet_amount` = '".$totalCount."' WHERE `fleet_id` = '".$fleetID."';UPDATE ".LOG_FLEETS." SET `fleet_mess` = '1', `fleet_array` = '".substr($fleetArray, 0, -1)."', `fleet_amount` = '".$totalCount."', `fleet_state` = 1 WHERE `fleet_id` = '".$fleetID."';";
- }
-
- if ($result['won'] == "a")
- {
- require_once('calculateSteal.php');
- $steal = calculateSteal($attackFleets, $targetPlanet);
+ if($totalCount == 0)
+ {
+ if($this->_fleet['fleet_id'] == $fleetID)
+ {
+ $this->KillFleet();
+ }
+ else
+ {
+ $sqlQuery .= "DELETE FROM ".FLEETS." WHERE fleet_id = ".$fleetID.";";
+ $sqlQuery .= "DELETE FROM ".FLEETS_EVENT." WHERE fleetID = ".$fleetID.";";
+ }
+
+ $sqlQuery .= "UPDATE ".LOG_FLEETS." SET fleet_state = 2 WHERE fleet_id = '".$fleetID."';";
+ }
+ elseif($totalCount > 0)
+ {
+ $sqlQuery .= "UPDATE ".FLEETS." SET fleet_array = '".substr($fleetArray, 0, -1)."', fleet_amount = '".$totalCount."' WHERE fleet_id = '".$fleetID."';";
+ $sqlQuery .= "UPDATE ".LOG_FLEETS." SET fleet_array = '".substr($fleetArray, 0, -1)."', fleet_amount = '".$totalCount."', fleet_state = 1 WHERE fleet_id = '".$fleetID."';";
+ }
+ else
+ {
+ throw new Exception("Negative Fleet amount ....");
+ }
}
- foreach ($defense as $fleetID => $defender)
+ foreach ($fleetDefend as $fleetID => $fleetDetail)
{
- if ($fleetID != 0)
+ if($fleetID != 0)
{
$fleetArray = '';
$totalCount = 0;
-
- foreach ($defender['def'] as $element => $amount)
- {
- if ($amount)
- $fleetArray .= $element.','.floattostring($amount).';';
-
+
+ $fleetDetail['unit'] = array_filter($fleetDetail['unit']);
+
+ foreach ($fleetDetail['unit'] as $elementID => $amount)
+ {
+ $fleetArray .= $elementID.','.floattostring($amount).';';
$totalCount += $amount;
}
- $SQL .= $totalCount <= 0 ? "DELETE FROM ".FLEETS." WHERE `fleet_id`= '".$fleetID."';UPDATE ".LOG_FLEETS." SET `fleet_state` = 1 WHERE `fleet_id`= '".$fleetID."';" : "UPDATE ".FLEETS." SET `fleet_array` = '".substr($fleetArray, 0, -1)."', `fleet_amount` = '".$totalCount."' WHERE `fleet_id` = '".$fleetID."';UPDATE ".LOG_FLEETS." SET `fleet_array` = '".substr($fleetArray, 0, -1)."', `fleet_amount` = '".$totalCount."' , `fleet_state` = 1 WHERE `fleet_id` = '".$fleetID."';";
+ if($totalCount == 0)
+ {
+ $sqlQuery .= "DELETE FROM ".FLEETS." WHERE fleet_id = ".$fleetID.";";
+ $sqlQuery .= "DELETE FROM ".FLEETS_EVENT." WHERE fleetID = ".$fleetID.";";
+ $sqlQuery .= "UPDATE ".LOG_FLEETS." SET fleet_state = 2 WHERE fleet_id = '".$fleetID."';";
+ }
+ elseif($totalCount > 0)
+ {
+ $sqlQuery .= "UPDATE ".FLEETS." SET fleet_array = '".substr($fleetArray, 0, -1)."', fleet_amount = '".$totalCount."' WHERE fleet_id = '".$fleetID."';";
+ $sqlQuery .= "UPDATE ".LOG_FLEETS." SET fleet_array = '".substr($fleetArray, 0, -1)."', fleet_amount = '".$totalCount."', fleet_state = 1 WHERE fleet_id = '".$fleetID."';";
+ }
+ else
+ {
+ throw new Exception("Negative Fleet amount ....");
+ }
}
else
{
- $fleetArray = '';
- foreach ($defender['def'] as $element => $amount)
- {
- $fleetArray .= "`".$resource[$element]."` = '".floattostring($amount)."', ";
+ $fleetArray = array();
+ foreach ($fleetDetail['unit'] as $elementID => $amount)
+ {
+ $fleetArray[] = $resource[$elementID]." = ".$amount;
}
- $SQL .= "UPDATE ".PLANETS." SET ";
- $SQL .= $fleetArray;
- $SQL .= "`metal` = `metal` - '".$steal['metal']."', ";
- $SQL .= "`crystal` = `crystal` - '".$steal['crystal']."', ";
- $SQL .= "`deuterium` = `deuterium` - '".$steal['deuterium']."' ";
- $SQL .= "WHERE ";
- $SQL .= "`id` = '".$this->_fleet['fleet_end_id']."';";
+ if(!empty($fleetArray))
+ {
+ $sqlQuery .= "UPDATE ".PLANETS." SET ".implode(', ', $fleetArray)." WHERE id = '".$this->_fleet['fleet_end_id']."';";
+ }
}
}
- $db->multi_query($SQL);
+ $GLOBALS['DATABASE']->multi_query($sqlQuery);
+
+ if ($combatResult['won'] == "a")
+ {
+ require_once('calculateSteal.php');
+ $stealResource = calculateSteal($fleetAttack, $targetPlanet);
+ }
if($this->_fleet['fleet_end_type'] == 3)
- $targetPlanet = array_merge($targetPlanet, $db->uniquequery("SELECT `der_metal`, `der_crystal` FROM ".PLANETS." WHERE `id_luna` = '".$this->_fleet['fleet_end_id']."';"));
-
- $ShootMetal = $result['debree']['att'][0] + $result['debree']['def'][0];
- $ShootCrystal = $result['debree']['att'][1] + $result['debree']['def'][1];
- $FleetDebris = $ShootMetal + $ShootCrystal;
- $DerbisMetal = $targetPlanet['der_metal'] + $ShootMetal;
- $DerbisCrystal = $targetPlanet['der_crystal'] + $ShootCrystal;
- $MoonChance = min(round($FleetDebris / 100000 * $GLOBALS['CONFIG'][$this->_fleet['fleet_universe']]['moon_factor'], 0), $GLOBALS['CONFIG'][$this->_fleet['fleet_universe']]['moon_chance']);
- $UserChance = mt_rand(1, 100);
-
- $INFO = $this->_fleet;
- if ($targetPlanet['planet_type'] == 1 && $targetPlanet['id_luna'] == 0 && $MoonChance > 0 && $UserChance <= $MoonChance)
+ {
+ // Use planet debris, if attack on moons
+ $targetPlanet = array_merge(
+ $targetPlanet,
+ $GLOBALS['DATABASE']->getFirstRow("SELECT der_metal, der_crystal FROM ".PLANETS." WHERE id_luna = ".$this->_fleet['fleet_end_id'].";")
+ );
+ }
+
+ foreach($debrisRessource as $elementID)
+ {
+ $debris[$elementID] = $combatResult['debris']['attacker'][$elementID] + $combatResult['debris']['defender'][$elementID];
+ $planetDebris[$elementID] = $targetPlanet['der_'.$resource[$elementID]] + $debris[$elementID];
+ }
+
+ $debrisTotal = array_sum($debris);
+
+ $moonFactor = $GLOBALS['CONFIG'][$this->_fleet['fleet_universe']]['moon_factor'];
+ $maxMoonChance = $GLOBALS['CONFIG'][$this->_fleet['fleet_universe']]['moon_chance'];
+
+ if($targetPlanet['id_luna'] == 0 && $targetPlanet['planet_type'] == 1)
+ {
+ $chanceCreateMoon = round($debrisTotal / 100000 * $moonFactor);
+ $chanceCreateMoon = min($chanceCreateMoon, $maxMoonChance);
+ }
+ else
+ {
+ $chanceCreateMoon = 0;
+ }
+
+ $raportInfo = array(
+ 'thisFleet' => $this->_fleet,
+ 'debris' => $debris,
+ 'stealResource' => $stealResource,
+ 'moonChance' => $chanceCreateMoon,
+ 'moonDestroy' => false,
+ 'moonName' => null,
+ 'moonDestroyChance' => null,
+ 'moonDestroySuccess' => null,
+ 'fleetDestroyChance' => null,
+ 'fleetDestroySuccess' => null,
+ );
+
+ $randChance = mt_rand(1, 100);
+ if ($randChance <= $chanceCreateMoon)
{
require_once(ROOT_PATH.'includes/functions/CreateOneMoonRecord.php');
- $INFO['moon']['name'] = CreateOneMoonRecord($this->_fleet['fleet_end_galaxy'], $this->_fleet['fleet_end_system'], $this->_fleet['fleet_end_planet'], $this->_fleet['fleet_universe'], $TargetUserID, $this->_fleet['fleet_start_time'], '', $MoonChance);
- $INFO['end_galaxy'] = $this->_fleet['fleet_end_galaxy'];
- $INFO['end_system'] = $this->_fleet['fleet_end_system'];
- $INFO['end_planet'] = $this->_fleet['fleet_end_planet'];
- if($GLOBALS['CONFIG'][$this->_fleet['fleet_universe']]['debris_moon'] == 1) {
- $DerbisMetal = 0;
- $DerbisCrystal = 0;
+ $LNG = $this->getLanguage($targetUser['lang']);
+ $raportInfo['moonName'] = $LNG['type_planet'][3];
+
+ CreateOneMoonRecord(
+ $this->_fleet['fleet_end_galaxy'],
+ $this->_fleet['fleet_end_system'],
+ $this->_fleet['fleet_end_planet'],
+ $this->_fleet['fleet_universe'],
+ $targetUser['id'],
+ $raportInfo['moonName'],
+ $chanceCreateMoon,
+ $this->_fleet['fleet_start_time']
+ );
+
+ if($GLOBALS['CONFIG'][$this->_fleet['fleet_universe']]['debris_moon'] == 1)
+ {
+ foreach($debrisRessource as $elementID)
+ {
+ $planetDebris[$elementID] = 0;
+ }
}
}
-
- $INFO['steal'] = $steal;
- $INFO['moon']['des'] = 0;
- $INFO['moon']['chance'] = $MoonChance;
- $INFO['moon']['desfail'] = false;
- $INFO['moon']['chance2'] = false;
- $INFO['moon']['fleetfail'] = false;
+
require_once('GenerateReport.php');
- $raport = GenerateReport($result, $INFO);
-
- $Won = 0;
- $Lose = 0;
- $Draw = 0;
+ $raportData = GenerateReport($combatResult, $raportInfo);
- switch($result['won'])
+ switch($combatResult['won'])
{
case "a":
- $Won = 1;
- $ColorAtt = "green";
- $ColorDef = "red";
+ $attackStatus = 'wons';
+ $defendStatus = 'loos';
+ $attackClass = 'raportWin';
+ $defendClass = 'raportLose';
break;
case "w":
- $Draw = 1;
- $ColorAtt = "orange";
- $ColorDef = "orange";
+ $attackStatus = 'draws';
+ $defendStatus = 'draws';
+ $attackClass = 'raportDraw';
+ $defendClass = 'raportDraw';
break;
case "r":
- $Lose = 1;
- $ColorAtt = "red";
- $ColorDef = "green";
+ $attackStatus = 'loos';
+ $defendStatus = 'wons';
+ $attackClass = 'raportLose';
+ $defendClass = 'raportWin';
break;
}
+ $raportID = md5(uniqid('', true).TIMESTAMP);
- $SQL = "INSERT INTO ".RW." SET ";
- $SQL .= "`raport` = '".serialize($raport)."', ";
- $SQL .= "`time` = '".$this->_fleet['fleet_start_time']."';";
- $db->query($SQL);
-
- $WhereAtt = "";
- $WhereDef = "";
-
- $rid = $db->GetInsertID();
- $SQL = "";
+ $sqlQuery = "INSERT INTO ".RW." SET
+ rid = '".$raportID."',
+ raport = '".serialize($raportData)."',
+ time = '".$this->_fleet['fleet_start_time']."',
+ attacker = '".implode(',', array_keys($userAttack))."',
+ defender = '".implode(',', array_keys($userDefend))."';";
+ $GLOBALS['DATABASE']->query($sqlQuery);
- foreach ($Attacker['id'] as $AttackersID)
+ $sqlQuery = "";
+ foreach($userAttack as $userID => $userName)
{
- if(empty($AttackersID))
- continue;
-
- $LNG = $LANG->GetUserLang($AttackersID);
- $MessageAtt = sprintf('| '; - echo 'Error:'; - echo ' | '; - echo '
|---|
| Message: '.$exception->getMessage().' '; - echo 'File: '.$exception->getFile().' '; - echo 'Line: '.$exception->getLine().' '; - echo 'URL: '.PROTOCOL.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'].(!empty($_SERVER['QUERY_STRING']) ? '?'.$_SERVER['QUERY_STRING']: '').' '; - echo 'PHP-Version: '.PHP_VERSION.' '; - echo 'PHP-API: '.php_sapi_name().' '; - echo '2Moons Version: '.$CONF['VERSION'].' '; - echo 'Debug Backtrace: '.makebr(str_replace($_SERVER['DOCUMENT_ROOT'], '.', htmlspecialchars($exception->getTraceAsString()))).''; - echo ' |
| '.$errorType[$errno].' | +
|---|
|
+ Message: '.$exception->getMessage().' + File: '.$exception->getFile().' + Line: '.$exception->getLine().' + URL: '.PROTOCOL.HTTP_HOST.$_SERVER['REQUEST_URI'].' + PHP-Version: '.PHP_VERSION.' + PHP-API: '.php_sapi_name().' + MySQL-Cleint-Version: '.mysqli_get_client_info().' + 2Moons Version: '.$VERSION.' + Debug Backtrace: '.makebr(htmlspecialchars($exception->getTraceAsString())).' + |
+
\r\n", $connected['errors'])); + } + + $selected = $tsAdmin->selectServer($CONF['ts_tcpport'], 'port', true); + if(!$selected['success']) + { + throw new Exception('Teamspeak-Error: '.implode("
\r\n", $selected['errors'])); + } + + $loggedIn = $tsAdmin->login($CONF['ts_login'], $CONF['ts_password']); + if(!$loggedIn['success']) + { + throw new Exception('Teamspeak-Error: '.implode("
\r\n", $loggedIn['errors'])); + } + + $serverInfo = $tsAdmin->serverInfo(); + if(!$serverInfo['success']) + { + throw new Exception('Teamspeak-Error: '.implode("
\r\n", $serverInfo['errors'])); + } + + $teamspeakData = array( + 'password' => $serverInfo['data']['virtualserver_password'], + 'current' => $serverInfo['data']['virtualserver_clientsonline'] - 1, + 'maxuser' => $serverInfo['data']['virtualserver_maxclients'], + ); + + $tsAdmin->logout(); + break; + } + + return $teamspeakData; + } +} \ No newline at end of file diff --git a/includes/classes/cache/builder/VarsBuildCache.class.php b/includes/classes/cache/builder/VarsBuildCache.class.php new file mode 100644 index 0000000..a3d0570 --- /dev/null +++ b/includes/classes/cache/builder/VarsBuildCache.class.php @@ -0,0 +1,176 @@ +. + * + * @package 2Moons + * @author Jan Kröpke
Query Code: ".$resource); - } else { - return "SQL Error: ".$this->error; - } + throw new Exception("SQL Error: ".$this->error."
Query Code: ".$resource); } return false; } - /** - * Purpose a query on selected database. - * - * @param string The SQL query - * - * @return resource Results of the query - */ + + public function getFirstRow($resource) + { + return $this->uniquequery($resource); + } public function uniquequery($resource) { @@ -124,6 +103,10 @@ public function uniquequery($resource) * @return resource Results of the query */ + public function getFirstCell($resource) + { + return $this->countquery($resource); + } public function countquery($resource) { $result = $this->query($resource); @@ -162,6 +145,11 @@ public function fetchquery($resource, $encode = array()) * * @return array The data of a row */ + public function fetchArray($result) + { + return $result->fetch_array(MYSQLI_ASSOC); + } + public function fetch_array($result) { return $result->fetch_array(MYSQLI_ASSOC); @@ -186,10 +174,15 @@ public function fetch_num($result) * * @return integer The total row number */ - public function num_rows($query) + public function numRows($query) { return $query->num_rows; } + + public function affectedRows() + { + return $this->affected_rows; + } /** * Returns the total row numbers of a query. @@ -211,6 +204,11 @@ public function GetInsertID() * @return string Returns the escaped string, or false on error. */ + public function escape($string, $flag = false) + { + return $this->sql_escape($string, $flag); + } + public function sql_escape($string, $flag = false) { return ($flag === false) ? parent::escape_string($string): addcslashes(parent::escape_string($string), '%_'); @@ -273,11 +271,7 @@ public function multi_query($resource) if ($this->errno) { - if($this->exception == true) { - throw new Exception("SQL Error: ".$this->error."
Query Code: ".$resource); - } else { - return "SQL Error: ".$this->error; - } + throw new Exception("SQL Error: ".$this->error."
Query Code: ".$resource); } } @@ -286,5 +280,3 @@ public function get_sql() return $this->queryCount; } } - -?> \ No newline at end of file diff --git a/includes/classes/class.FleetFunctions.php b/includes/classes/class.FleetFunctions.php index 259affc..c6af3db 100644 --- a/includes/classes/class.FleetFunctions.php +++ b/includes/classes/class.FleetFunctions.php @@ -2,7 +2,7 @@ /** * 2Moons - * Copyright (C) 2011 Slaver + * Copyright (C) 2012 Jan Kröpke * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,17 +18,18 @@ * along with this program. If not, see
". (($CurrentFleet['fleet_mess'] == 1) ? "R" : "A" ); - $Bloc['Fleet'] = $this->CreateFleetPopupedFleetLink ( $CurrentFleet, $LNG['tech'][200], '' ); - $Bloc['St_Owner'] = "[". $CurrentFleet['fleet_owner'] ."]
". $FleetOwner['username']; - $Bloc['St_Posit'] = "[".$CurrentFleet['fleet_start_galaxy'] .":". $CurrentFleet['fleet_start_system'] .":". $CurrentFleet['fleet_start_planet'] ."]
". ( ($CurrentFleet['fleet_start_type'] == 1) ? "[P]": (($CurrentFleet['fleet_start_type'] == 2) ? "D" : "L" )) .""; - $Bloc['St_Time'] = tz_date($CurrentFleet['fleet_start_time']); - if (is_array($TargetOwner)) - $Bloc['En_Owner'] = "[". $CurrentFleet['fleet_target_owner'] ."]
". $TargetOwner['username']; - else - $Bloc['En_Owner'] = ""; - - $Bloc['En_Posit'] = "[".$CurrentFleet['fleet_end_galaxy'] .":". $CurrentFleet['fleet_end_system'] .":". $CurrentFleet['fleet_end_planet'] ."]
". ( ($CurrentFleet['fleet_end_type'] == 1) ? "[P]": (($CurrentFleet['fleet_end_type'] == 2) ? "D" : "L" )) .""; - - if ($CurrentFleet['fleet_mission'] == 5) - { - if ($CurrentFleet['fleet_mess'] == 2) - $Bloc['Wa_Time'] = tz_date($CurrentFleet['fleet_end_stay']); - elseif ($CurrentFleet['fleet_mess'] == 1) - $Bloc['Wa_Time'] = $LNG['cff_back']; - else - $Bloc['Wa_Time'] = $LNG['cff_to_destination']; - } - else - { - $Bloc['Wa_Time'] = ""; - } - - $Bloc['En_Time'] = tz_date($CurrentFleet['fleet_end_time']); - $Bloc['lock'] = $CurrentFleet['fleet_busy'] == 0 ? "".$LNG['ff_lock']."" : "".$LNG['ff_unlock'].""; - - $Table[] = $Bloc; + if($this->IsPhalanx) { + $SQLWhere = "(fleet_start_id = ".$this->PlanetID." AND fleet_mission != 4) OR (fleet_end_id = ".$this->PlanetID." AND fleet_mess IN (0, 2))"; + } elseif(!empty($acsID)) { + $SQLWhere = "fleet_group = ".$acsID; + } elseif($this->missions) { + $SQLWhere = "(fleet_owner = ". $this->UserID ." OR fleet_target_owner = ". $this->UserID .") AND fleet_mission IN (". $this->missions .")"; + } else { + $SQLWhere = "fleet_owner = ".$this->UserID." OR (fleet_target_owner = ".$this->UserID." AND fleet_mission != 8)"; } - return $Table; + return $GLOBALS['DATABASE']->query("SELECT DISTINCT fleet.*, ownuser.username as own_username, targetuser.username as target_username, ownplanet.name as own_planetname, targetplanet.name as target_planetname + FROM ".FLEETS." fleet + LEFT JOIN ".USERS." ownuser ON (ownuser.id = fleet.fleet_owner) + LEFT JOIN ".USERS." targetuser ON (targetuser.id = fleet.fleet_target_owner) + LEFT JOIN ".PLANETS." ownplanet ON (ownplanet.id = fleet.fleet_start_id) + LEFT JOIN ".PLANETS." targetplanet ON (targetplanet.id = fleet.fleet_end_id) + WHERE ".$SQLWhere.";"); } - - private function CreateFleetPopupedMissionLink($FleetRow, $Texte, $FleetType) + + function renderTable() { - global $LNG; - - $FleetTotalC = $FleetRow['fleet_resource_metal'] + $FleetRow['fleet_resource_crystal'] + $FleetRow['fleet_resource_deuterium'] + $FleetRow['fleet_resource_darkmatter']; - if ($FleetTotalC <> 0) + $fleetResult = $this->getFleets(); + $ACSDone = array(); + $FleetData = array(); + + while($fleetRow = $GLOBALS['DATABASE']->fetch_array($fleetResult)) { - $FRessource = '
| '.$LNG['Metal'].' | '. pretty_number($FleetRow['fleet_resource_metal']).' |
| '.$LNG['Crystal'].' | '. pretty_number($FleetRow['fleet_resource_crystal']).' |
| '.$LNG['Deuterium'].' | '. pretty_number($FleetRow['fleet_resource_deuterium']).' |
| '.$LNG['Darkmatter'].' | '. pretty_number($FleetRow['fleet_resource_darkmatter']).' |
'; - $Time = $Return[2]; - } - $db->free_result($AKSFleets); + $textForBlind = $LNG['tech'][900].': '; + $textForBlind .= floattostring($fleetRow['fleet_resource_metal']).' '.$LNG['tech'][901]; + $textForBlind .= '; '.floattostring($fleetRow['fleet_resource_crystal']).' '.$LNG['tech'][902]; + $textForBlind .= '; '.floattostring($fleetRow['fleet_resource_deuterium']).' '.$LNG['tech'][903]; + if($fleetRow['fleet_resource_darkmatter'] > 0) + $textForBlind .= '; '.floattostring($fleetRow['fleet_resource_darkmatter']).' '.$LNG['tech'][921]; + + $FRessource = '
| '.$LNG['tech'][901].' | '. pretty_number($fleetRow['fleet_resource_metal']).' |
| '.$LNG['tech'][902].' | '. pretty_number($fleetRow['fleet_resource_crystal']).' |
| '.$LNG['tech'][903].' | '. pretty_number($fleetRow['fleet_resource_deuterium']).' |
| '.$LNG['tech'][921].' | '. pretty_number($fleetRow['fleet_resource_darkmatter']).' |
'); - } - - function GetPlayerCardLink($Data) - { - return ''.$Data['username'].''; - } - - function BuildRecordCache() - { - $Elements = array_merge($GLOBALS['reslist']['build'], $GLOBALS['reslist']['tech'], $GLOBALS['reslist']['fleet'], $GLOBALS['reslist']['defense']); - $PHP = "maxinfos as $Uni => $Records) { - $PHP .= "\t".$Uni." => array(\n"; - foreach($Elements as $ElementID) { - $PHP .= "\t\t".$ElementID." => array('username' => '".(isset($Records[$ElementID]['username']) ? $Records[$ElementID]['username'] : '')."', 'maxlvl' => '".(isset($Records[$ElementID]['maxlvl']) ? pretty_number($Records[$ElementID]['maxlvl']) : '0')."'),\n"; - } - $PHP .= "\t),\n"; - } - $PHP .= "\n);\n?>"; - file_put_contents(ROOT_PATH.self::$File, $PHP); - } - - function GetRecords($Uni) - { - if(!file_exists(ROOT_PATH.self::$File)) - return array(); - - require(ROOT_PATH.self::$File); - return $RecordsArray[$Uni]; - } -} - -?> \ No newline at end of file diff --git a/includes/classes/class.Session.php b/includes/classes/class.Session.php index bc696f3..287a0ca 100644 --- a/includes/classes/class.Session.php +++ b/includes/classes/class.Session.php @@ -2,7 +2,7 @@ /** * 2Moons - * Copyright (C) 2011 Slaver + * Copyright (C) 2012 Jan * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,46 +18,93 @@ * along with this program. If not, see
' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "
\n"; - } - } - $this->ErrorInfo = $msg; - } - - /** - * Returns the proper RFC 822 formatted date. - * @access public - * @return string - * @static - */ - public static function RFCDate() { - $tz = date('Z'); - $tzs = ($tz < 0) ? '-' : '+'; - $tz = abs($tz); - $tz = (int)($tz/3600)*100 + ($tz%3600)/60; - $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz); - - return $result; - } - - /** - * Returns the server hostname or 'localhost.localdomain' if unknown. - * @access private - * @return string - */ - private function ServerHostname() { - if (!empty($this->Hostname)) { - $result = $this->Hostname; - } elseif (isset($_SERVER['SERVER_NAME'])) { - $result = $_SERVER['SERVER_NAME']; - } else { - $result = 'localhost.localdomain'; - } - - return $result; - } - - /** - * Returns a message in the appropriate language. - * @access private - * @return string - */ - private function Lang($key) { - if(count($this->language) < 1) { - $this->SetLanguage('en'); // set the default language - } - - if(isset($this->language[$key])) { - return $this->language[$key]; - } else { - return 'Language string failed to load: ' . $key; - } - } - - /** - * Returns true if an error occurred. - * @access public - * @return bool - */ - public function IsError() { - return ($this->error_count > 0); - } - - /** - * Changes every end of line from CR or LF to CRLF. - * @access private - * @return string - */ - private function FixEOL($str) { - $str = str_replace("\r\n", "\n", $str); - $str = str_replace("\r", "\n", $str); - $str = str_replace("\n", $this->LE, $str); - return $str; - } - - /** - * Adds a custom header. - * @access public - * @return void - */ - public function AddCustomHeader($custom_header) { - $this->CustomHeader[] = explode(':', $custom_header, 2); - } - - /** - * Evaluates the message and returns modifications for inline images and backgrounds - * @access public - * @return $message - */ - public function MsgHTML($message, $basedir = '') { - preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images); - if(isset($images[2])) { - foreach($images[2] as $i => $url) { - // do not change urls for absolute images (thanks to corvuscorax) - if (!preg_match('#^[A-z]+://#',$url)) { - $filename = basename($url); - $directory = dirname($url); - ($directory == '.')?$directory='':''; - $cid = 'cid:' . md5($filename); - $ext = pathinfo($filename, PATHINFO_EXTENSION); - $mimeType = self::_mime_types($ext); - if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; } - if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; } - if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) { - $message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message); - } - } - } - } - $this->IsHTML(true); - $this->Body = $message; - $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message))); - if (!empty($textMsg) && empty($this->AltBody)) { - $this->AltBody = html_entity_decode($textMsg); - } - if (empty($this->AltBody)) { - $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n"; - } - } - - /** - * Gets the MIME type of the embedded or inline image - * @param string File extension - * @access public - * @return string MIME type of ext - * @static - */ - public static function _mime_types($ext = '') { - $mimes = array( - 'hqx' => 'application/mac-binhex40', - 'cpt' => 'application/mac-compactpro', - 'doc' => 'application/msword', - 'bin' => 'application/macbinary', - 'dms' => 'application/octet-stream', - 'lha' => 'application/octet-stream', - 'lzh' => 'application/octet-stream', - 'exe' => 'application/octet-stream', - 'class' => 'application/octet-stream', - 'psd' => 'application/octet-stream', - 'so' => 'application/octet-stream', - 'sea' => 'application/octet-stream', - 'dll' => 'application/octet-stream', - 'oda' => 'application/oda', - 'pdf' => 'application/pdf', - 'ai' => 'application/postscript', - 'eps' => 'application/postscript', - 'ps' => 'application/postscript', - 'smi' => 'application/smil', - 'smil' => 'application/smil', - 'mif' => 'application/vnd.mif', - 'xls' => 'application/vnd.ms-excel', - 'ppt' => 'application/vnd.ms-powerpoint', - 'wbxml' => 'application/vnd.wap.wbxml', - 'wmlc' => 'application/vnd.wap.wmlc', - 'dcr' => 'application/x-director', - 'dir' => 'application/x-director', - 'dxr' => 'application/x-director', - 'dvi' => 'application/x-dvi', - 'gtar' => 'application/x-gtar', - 'php' => 'application/x-httpd-php', - 'php4' => 'application/x-httpd-php', - 'php3' => 'application/x-httpd-php', - 'phtml' => 'application/x-httpd-php', - 'phps' => 'application/x-httpd-php-source', - 'js' => 'application/x-javascript', - 'swf' => 'application/x-shockwave-flash', - 'sit' => 'application/x-stuffit', - 'tar' => 'application/x-tar', - 'tgz' => 'application/x-tar', - 'xhtml' => 'application/xhtml+xml', - 'xht' => 'application/xhtml+xml', - 'zip' => 'application/zip', - 'mid' => 'audio/midi', - 'midi' => 'audio/midi', - 'mpga' => 'audio/mpeg', - 'mp2' => 'audio/mpeg', - 'mp3' => 'audio/mpeg', - 'aif' => 'audio/x-aiff', - 'aiff' => 'audio/x-aiff', - 'aifc' => 'audio/x-aiff', - 'ram' => 'audio/x-pn-realaudio', - 'rm' => 'audio/x-pn-realaudio', - 'rpm' => 'audio/x-pn-realaudio-plugin', - 'ra' => 'audio/x-realaudio', - 'rv' => 'video/vnd.rn-realvideo', - 'wav' => 'audio/x-wav', - 'bmp' => 'image/bmp', - 'gif' => 'image/gif', - 'jpeg' => 'image/jpeg', - 'jpg' => 'image/jpeg', - 'jpe' => 'image/jpeg', - 'png' => 'image/png', - 'tiff' => 'image/tiff', - 'tif' => 'image/tiff', - 'css' => 'text/css', - 'html' => 'text/html', - 'htm' => 'text/html', - 'shtml' => 'text/html', - 'txt' => 'text/plain', - 'text' => 'text/plain', - 'log' => 'text/plain', - 'rtx' => 'text/richtext', - 'rtf' => 'text/rtf', - 'xml' => 'text/xml', - 'xsl' => 'text/xml', - 'mpeg' => 'video/mpeg', - 'mpg' => 'video/mpeg', - 'mpe' => 'video/mpeg', - 'qt' => 'video/quicktime', - 'mov' => 'video/quicktime', - 'avi' => 'video/x-msvideo', - 'movie' => 'video/x-sgi-movie', - 'doc' => 'application/msword', - 'word' => 'application/msword', - 'xl' => 'application/excel', - 'eml' => 'message/rfc822' - ); - return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)]; - } - - /** - * Set (or reset) Class Objects (variables) - * - * Usage Example: - * $page->set('X-Priority', '3'); - * - * @access public - * @param string $name Parameter Name - * @param mixed $value Parameter Value - * NOTE: will not work with arrays, there are no arrays to set/reset - * @todo Should this not be using __set() magic function? - */ - public function set($name, $value = '') { - try { - if (isset($this->$name) ) { - $this->$name = $value; - } else { - throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL); - } - } catch (Exception $e) { - $this->SetError($e->getMessage()); - if ($e->getCode() == self::STOP_CRITICAL) { - return false; - } - } - return true; - } - - /** - * Strips newlines to prevent header injection. - * @access public - * @param string $str String - * @return string - */ - public function SecureHeader($str) { - $str = str_replace("\r", '', $str); - $str = str_replace("\n", '', $str); - return trim($str); - } - - /** - * Set the private key file and password to sign the message. - * - * @access public - * @param string $key_filename Parameter File Name - * @param string $key_pass Password for private key - */ - public function Sign($cert_filename, $key_filename, $key_pass) { - $this->sign_cert_file = $cert_filename; - $this->sign_key_file = $key_filename; - $this->sign_key_pass = $key_pass; - } - - /** - * Set the private key file and password to sign the message. - * - * @access public - * @param string $key_filename Parameter File Name - * @param string $key_pass Password for private key - */ - public function DKIM_QP($txt) { - $tmp=""; - $line=""; - for ($i=0;$i\n"; - return $errorMsg; - } -} -?> \ No newline at end of file diff --git a/includes/classes/class.smtp.php b/includes/classes/class.smtp.php deleted file mode 100644 index 47c012f..0000000 --- a/includes/classes/class.smtp.php +++ /dev/null @@ -1,814 +0,0 @@ -smtp_conn = 0; - $this->error = null; - $this->helo_rply = null; - - $this->do_debug = 0; - } - - ///////////////////////////////////////////////// - // CONNECTION FUNCTIONS - ///////////////////////////////////////////////// - - /** - * Connect to the server specified on the port specified. - * If the port is not specified use the default SMTP_PORT. - * If tval is specified then a connection will try and be - * established with the server for that number of seconds. - * If tval is not specified the default is 30 seconds to - * try on the connection. - * - * SMTP CODE SUCCESS: 220 - * SMTP CODE FAILURE: 421 - * @access public - * @return bool - */ - public function Connect($host, $port = 0, $tval = 30) { - // set the error val to null so there is no confusion - $this->error = null; - - // make sure we are __not__ connected - if($this->connected()) { - // already connected, generate error - $this->error = array("error" => "Already connected to a server"); - return false; - } - - if(empty($port)) { - $port = $this->SMTP_PORT; - } - - // connect to the smtp server - $this->smtp_conn = @fsockopen($host, // the host of the server - $port, // the port to use - $errno, // error number if any - $errstr, // error message if any - $tval); // give up after ? secs - // verify we connected properly - if(empty($this->smtp_conn)) { - $this->error = array("error" => "Failed to connect to server", - "errno" => $errno, - "errstr" => $errstr); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)" . $this->CRLF . '
'; - } - return false; - } - - // SMTP server can take longer to respond, give longer timeout for first read - // Windows does not have support for this timeout function - if(substr(PHP_OS, 0, 3) != "WIN") - socket_set_timeout($this->smtp_conn, $tval, 0); - - // get any announcement - $announce = $this->get_lines(); - - if($this->do_debug >= 2) { - echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '
'; - } - - return true; - } - - /** - * Initiate a TLS communication with the server. - * - * SMTP CODE 220 Ready to start TLS - * SMTP CODE 501 Syntax error (no parameters allowed) - * SMTP CODE 454 TLS not available due to temporary reason - * @access public - * @return bool success - */ - public function StartTLS() { - $this->error = null; # to avoid confusion - - if(!$this->connected()) { - $this->error = array("error" => "Called StartTLS() without being connected"); - return false; - } - - fputs($this->smtp_conn,"STARTTLS" . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($this->do_debug >= 2) { - echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '
'; - } - - if($code != 220) { - $this->error = - array("error" => "STARTTLS not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - - // Begin encrypted connection - if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) { - return false; - } - - return true; - } - - /** - * Performs SMTP authentication. Must be run after running the - * Hello() method. Returns true if successfully authenticated. - * @access public - * @return bool - */ - public function Authenticate($USERname, $password) { - // Start authentication - fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($code != 334) { - $this->error = - array("error" => "AUTH not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - - // Send encoded username - fputs($this->smtp_conn, base64_encode($USERname) . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($code != 334) { - $this->error = - array("error" => "Username not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - - // Send encoded password - fputs($this->smtp_conn, base64_encode($password) . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($code != 235) { - $this->error = - array("error" => "Password not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - - return true; - } - - /** - * Returns true if connected to a server otherwise false - * @access public - * @return bool - */ - public function Connected() { - if(!empty($this->smtp_conn)) { - $sock_status = socket_get_status($this->smtp_conn); - if($sock_status["eof"]) { - // the socket is valid but we are not connected - if($this->do_debug >= 1) { - echo "SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected"; - } - $this->Close(); - return false; - } - return true; // everything looks good - } - return false; - } - - /** - * Closes the socket and cleans up the state of the class. - * It is not considered good to use this function without - * first trying to use QUIT. - * @access public - * @return void - */ - public function Close() { - $this->error = null; // so there is no confusion - $this->helo_rply = null; - if(!empty($this->smtp_conn)) { - // close the connection and cleanup - fclose($this->smtp_conn); - $this->smtp_conn = 0; - } - } - - ///////////////////////////////////////////////// - // SMTP COMMANDS - ///////////////////////////////////////////////// - - /** - * Issues a data command and sends the msg_data to the server - * finializing the mail transaction. $msg_data is the message - * that is to be send with the headers. Each header needs to be - * on a single line followed by a
'; - } - - if($code != 354) { - $this->error = - array("error" => "DATA command not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - - /* the server is ready to accept data! - * according to rfc 821 we should not send more than 1000 - * including the CRLF - * characters on a single line so we will break the data up - * into lines by \r and/or \n then if needed we will break - * each of those into smaller lines to fit within the limit. - * in addition we will be looking for lines that start with - * a period '.' and append and additional period '.' to that - * line. NOTE: this does not count towards limit. - */ - - // normalize the line breaks so we know the explode works - $msg_data = str_replace("\r\n","\n",$msg_data); - $msg_data = str_replace("\r","\n",$msg_data); - $lines = explode("\n",$msg_data); - - /* we need to find a good way to determine is headers are - * in the msg_data or if it is a straight msg body - * currently I am assuming rfc 822 definitions of msg headers - * and if the first field of the first line (':' sperated) - * does not contain a space then it _should_ be a header - * and we can process all lines before a blank "" line as - * headers. - */ - - $field = substr($lines[0],0,strpos($lines[0],":")); - $in_headers = false; - if(!empty($field) && !strstr($field," ")) { - $in_headers = true; - } - - $max_line_length = 998; // used below; set here for ease in change - - while(list(,$line) = @each($lines)) { - $lines_out = null; - if($line == "" && $in_headers) { - $in_headers = false; - } - // ok we need to break this line up into several smaller lines - while(strlen($line) > $max_line_length) { - $pos = strrpos(substr($line,0,$max_line_length)," "); - - // Patch to fix DOS attack - if(!$pos) { - $pos = $max_line_length - 1; - $lines_out[] = substr($line,0,$pos); - $line = substr($line,$pos); - } else { - $lines_out[] = substr($line,0,$pos); - $line = substr($line,$pos + 1); - } - - /* if processing headers add a LWSP-char to the front of new line - * rfc 822 on long msg headers - */ - if($in_headers) { - $line = "\t" . $line; - } - } - $lines_out[] = $line; - - // send the lines to the server - while(list(,$line_out) = @each($lines_out)) { - if(strlen($line_out) > 0) - { - if(substr($line_out, 0, 1) == ".") { - $line_out = "." . $line_out; - } - } - fputs($this->smtp_conn,$line_out . $this->CRLF); - } - } - - // message data has been sent - fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($this->do_debug >= 2) { - echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '
'; - } - - if($code != 250) { - $this->error = - array("error" => "DATA not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - return true; - } - - /** - * Sends the HELO command to the smtp server. - * This makes sure that we and the server are in - * the same known state. - * - * Implements from rfc 821: HELO
'; - } - - if($code != 250) { - $this->error = - array("error" => $hello . " not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - - $this->helo_rply = $rply; - - return true; - } - - /** - * Starts a mail transaction from the email address specified in - * $from. Returns true if successful or false otherwise. If True - * the mail transaction is started and then one or more Recipient - * commands may be called followed by a Data command. - * - * Implements rfc 821: MAIL
'; - } - - if($code != 250) { - $this->error = - array("error" => "MAIL not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - return true; - } - - /** - * Sends the quit command to the server and then closes the socket - * if there is no error or the $close_on_error argument is true. - * - * Implements from rfc 821: QUIT
'; - } - - $rval = true; - $e = null; - - $code = substr($byemsg,0,3); - if($code != 221) { - // use e as a tmp var cause Close will overwrite $this->error - $e = array("error" => "SMTP server rejected quit command", - "smtp_code" => $code, - "smtp_rply" => substr($byemsg,4)); - $rval = false; - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF . '
'; - } - } - - if(empty($e) || $close_on_error) { - $this->Close(); - } - - return $rval; - } - - /** - * Sends the command RCPT to the SMTP server with the TO: argument of $to. - * Returns true if the recipient was accepted false if it was rejected. - * - * Implements from rfc 821: RCPT
'; - } - - if($code != 250 && $code != 251) { - $this->error = - array("error" => "RCPT not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - return true; - } - - /** - * Sends the RSET command to abort and transaction that is - * currently in progress. Returns true if successful false - * otherwise. - * - * Implements rfc 821: RSET
'; - } - - if($code != 250) { - $this->error = - array("error" => "RSET failed", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - - return true; - } - - /** - * Starts a mail transaction from the email address specified in - * $from. Returns true if successful or false otherwise. If True - * the mail transaction is started and then one or more Recipient - * commands may be called followed by a Data command. This command - * will send the message to the users terminal if they are logged - * in and send them an email. - * - * Implements rfc 821: SAML
'; - } - - if($code != 250) { - $this->error = - array("error" => "SAML not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '
'; - } - return false; - } - return true; - } - - /** - * This is an optional command for SMTP that this class does not - * support. This method is here to make the RFC821 Definition - * complete for this class and __may__ be implimented in the future - * - * Implements from rfc 821: TURN
'; - } - return false; - } - - /** - * Get the current error - * @access public - * @return array - */ - public function getError() { - return $this->error; - } - - ///////////////////////////////////////////////// - // INTERNAL FUNCTIONS - ///////////////////////////////////////////////// - - /** - * Read in as many lines as possible - * either before eof or socket timeout occurs on the operation. - * With SMTP we can tell if we have more lines to read if the - * 4th character is '-' symbol. If it is a space then we don't - * need to read anything else. - * @access private - * @return string - */ - private function get_lines() { - $data = ""; - while($str = @fgets($this->smtp_conn,515)) { - if($this->do_debug >= 4) { - echo "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF . '
'; - echo "SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF . '
'; - } - $data .= $str; - if($this->do_debug >= 4) { - echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '
'; - } - // if 4th character is a space, we are done reading, break the loop - if(substr($str,3,1) == " ") { break; } - } - return $data; - } - -} - -?> \ No newline at end of file diff --git a/includes/classes/class.statbuilder.php b/includes/classes/class.statbuilder.php index 62775f6..21723c8 100644 --- a/includes/classes/class.statbuilder.php +++ b/includes/classes/class.statbuilder.php @@ -2,7 +2,7 @@ /** * 2Moons - * Copyright (C) 2011 Slaver + * Copyright (C) 2012 Jan Kröpke * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,97 +18,60 @@ * along with this program. If not, see
| %s %s (%s) | +|
| %s | %s: %s %s: %s | +
| %s | %s: %s %s: %s %s: %s | +
| %s | %s: %s %s: %s | +
%s: %s %s: %s
%s %s:%s %s:%s %s:%s
%s %s:%s %s:%s
', $rid, $ColorAtt, $LNG['sys_mess_attack_report'], sprintf($LNG['sys_adress_planet'], $this->_fleet['fleet_end_galaxy'], $this->_fleet['fleet_end_system'], $this->_fleet['fleet_end_planet']), $ColorAtt, $LNG['sys_perte_attaquant'], pretty_number($result['lost']['att']), $ColorDef, $LNG['sys_perte_defenseur'], pretty_number($result['lost']['def']), $LNG['sys_gain'], $LNG['Metal'], pretty_number($steal['metal']), $LNG['Crystal'], pretty_number($steal['crystal']), $LNG['Deuterium'], pretty_number($steal['deuterium']), $LNG['sys_debris'], $LNG['Metal'], pretty_number($result['debree']['att'][0]+$result['debree']['def'][0]), $LNG['Crystal'], pretty_number($result['debree']['att'][1]+$result['debree']['def'][1])); - SendSimpleMessage($AttackersID, 0, $this->_fleet['fleet_start_time'], 3, $LNG['sys_mess_tower'], $LNG['sys_mess_attack_report'], $MessageAtt); - $SQL .= "INSERT INTO ".TOPKB_USERS." SET "; - $SQL .= "`rid` = ".$rid.", "; - $SQL .= "`role` = 1, "; - $SQL .= "`uid` = ".$AttackersID.";"; - $WhereAtt .= "`id` = '".$AttackersID."' OR "; + $LNG = $this->getLanguage(NULL, $userID); + + $message = sprintf($messageHTML, + $raportID, + $attackClass, + $LNG['sys_mess_attack_report'], + sprintf( + $LNG['sys_adress_planet'], + $this->_fleet['fleet_end_galaxy'], + $this->_fleet['fleet_end_system'], + $this->_fleet['fleet_end_planet'] + ), + $LNG['type_planet_short'][$this->_fleet['fleet_end_type']], + $LNG['sys_lost'], + $attackClass, + $LNG['sys_attack_attacker_pos'], + pretty_number($combatResult['unitLost']['attacker']), + $defendClass, + $LNG['sys_attack_defender_pos'], + pretty_number($combatResult['unitLost']['defender']), + $LNG['sys_gain'], + $LNG['tech'][901], + pretty_number($stealResource[901]), + $LNG['tech'][902], + pretty_number($stealResource[902]), + $LNG['tech'][903], + pretty_number($stealResource[903]), + $LNG['sys_debris'], + $LNG['tech'][901], + pretty_number($debris[901]), + $LNG['tech'][902], + pretty_number($debris[902]) + ); + + SendSimpleMessage($userID, 0, $this->_fleet['fleet_start_time'], 3, $LNG['sys_mess_tower'], $LNG['sys_mess_attack_report'], $message); + + $sqlQuery .= "INSERT INTO ".TOPKB_USERS." SET "; + $sqlQuery .= "rid = '".$raportID."', "; + $sqlQuery .= "role = 1, "; + $sqlQuery .= "username = '".$GLOBALS['DATABASE']->escape($userName)."', "; + $sqlQuery .= "uid = ".$userID.";"; } - - foreach ($Defender['id'] as $DefenderID) + + + foreach($userDefend as $userID => $userName) { - if(empty($DefenderID)) - continue; + $LNG = $this->getLanguage(NULL, $userID); + + $message = sprintf($messageHTML, + $raportID, + $defendClass, + $LNG['sys_mess_attack_report'], + sprintf( + $LNG['sys_adress_planet'], + $this->_fleet['fleet_end_galaxy'], + $this->_fleet['fleet_end_system'], + $this->_fleet['fleet_end_planet'] + ), + $LNG['type_planet_short'][$this->_fleet['fleet_end_type']], + $LNG['sys_lost'], + $defendClass, + $LNG['sys_attack_attacker_pos'], + pretty_number($combatResult['unitLost']['attacker']), + $attackClass, + $LNG['sys_attack_defender_pos'], + pretty_number($combatResult['unitLost']['defender']), + $LNG['sys_gain'], + $LNG['tech'][901], + pretty_number($stealResource[901]), + $LNG['tech'][902], + pretty_number($stealResource[902]), + $LNG['tech'][903], + pretty_number($stealResource[903]), + $LNG['sys_debris'], + $LNG['tech'][901], + pretty_number($debris[901]), + $LNG['tech'][902], + pretty_number($debris[902]) + ); - $LNG = $LANG->GetUserLang($DefenderID); - $MessageDef = sprintf('
%s: %s %s: %s
%s %s:%s %s:%s %s:%s
%s %s:%s %s:%s
', $rid, $ColorDef, $LNG['sys_mess_attack_report'], sprintf($LNG['sys_adress_planet'], $this->_fleet['fleet_end_galaxy'], $this->_fleet['fleet_end_system'], $this->_fleet['fleet_end_planet']), $ColorDef, $LNG['sys_perte_attaquant'], pretty_number($result['lost']['att']), $ColorAtt, $LNG['sys_perte_defenseur'], pretty_number($result['lost']['def']), $LNG['sys_gain'], $LNG['Metal'], pretty_number($steal['metal']), $LNG['Crystal'], pretty_number($steal['crystal']), $LNG['Deuterium'], pretty_number($steal['deuterium']), $LNG['sys_debris'], $LNG['Metal'], pretty_number($result['debree']['att'][0]+$result['debree']['def'][0]), $LNG['Crystal'], pretty_number($result['debree']['att'][1]+$result['debree']['def'][1])); - SendSimpleMessage($DefenderID, 0, $this->_fleet['fleet_start_time'], 3, $LNG['sys_mess_tower'], $LNG['sys_mess_attack_report'], $MessageDef); - $SQL .= "INSERT INTO ".TOPKB_USERS." SET "; - $SQL .= "`rid` = ".$rid.", "; - $SQL .= "`role` = 2, "; - $SQL .= "`uid` = ".$DefenderID.";"; - $WhereDef .= "`id` = '".$DefenderID."' OR "; + SendSimpleMessage($userID, 0, $this->_fleet['fleet_start_time'], 3, $LNG['sys_mess_tower'], $LNG['sys_mess_attack_report'], $message); + + $sqlQuery .= "INSERT INTO ".TOPKB_USERS." SET "; + $sqlQuery .= "rid = '".$raportID."', "; + $sqlQuery .= "role = 2, "; + $sqlQuery .= "username = '".$GLOBALS['DATABASE']->escape($userName)."', "; + $sqlQuery .= "uid = ".$userID.";"; + } + + if($this->_fleet['fleet_end_type'] == 3) + { + $debrisType = 'id_luna'; } + else + { + $debrisType = 'id'; + } + + $sqlQuery .= "UPDATE ".PLANETS." SET + der_metal = ".$planetDebris[901].", + der_crystal = ".$planetDebris[902]." + WHERE + ".$debrisType." = ".$this->_fleet['fleet_end_id']."; + UPDATE ".PLANETS." SET + metal = metal - ".$stealResource[901].", + crystal = crystal - ".$stealResource[902].", + deuterium = deuterium - ".$stealResource[903]." + WHERE + id = ".$this->_fleet['fleet_end_id']."; + INSERT INTO ".TOPKB." SET + units = ".($combatResult['unitLost']['attacker'] + $combatResult['unitLost']['defender']).", + rid = '".$raportID."', + time = ".$this->_fleet['fleet_start_time'].", + universe = ".$this->_fleet['fleet_universe'].", + result = '".$combatResult['won'] ."'; + UPDATE ".USERS." SET + ".$attackStatus." = ".$attackStatus." + 1, + kbmetal = kbmetal + ".$debris[901].", + kbcrystal = kbcrystal + ".$debris[902].", + lostunits = lostunits + ".$combatResult['unitLost']['attacker'].", + desunits = desunits + ".$combatResult['unitLost']['defender']." + WHERE + id IN (".implode(',', array_keys($userAttack))."); + UPDATE ".USERS." SET + ".$defendStatus." = ".$defendStatus." + 1, + kbmetal = kbmetal + ".$debris[901].", + kbcrystal = kbcrystal + ".$debris[902].", + lostunits = lostunits + ".$combatResult['unitLost']['attacker'].", + desunits = desunits + ".$combatResult['unitLost']['defender']." + WHERE + id IN (".implode(',', array_keys($userDefend)).");"; + + $GLOBALS['DATABASE']->multi_query($sqlQuery); - $WhereCol = $this->_fleet['fleet_end_type'] == 3 ? "id_luna" : "id"; - $SQL .= "UPDATE ".PLANETS." SET "; - $SQL .= "`der_metal` = ".$DerbisMetal.", "; - $SQL .= "`der_crystal` = ".$DerbisCrystal." "; - $SQL .= "WHERE "; - $SQL .= "`".$WhereCol."` = ".$this->_fleet['fleet_end_id'].";"; - $SQL .= "INSERT INTO ".TOPKB." SET "; - $SQL .= "`units` = ".($result['lost']['att'] + $result['lost']['def']).", "; - $SQL .= "`rid` = ".$rid.", "; - $SQL .= "`time` = ".$this->_fleet['fleet_start_time'].", "; - $SQL .= "`universe` = ".$this->_fleet['fleet_universe'].", "; - $SQL .= "`result` = '".$result['won'] ."';"; - $SQL .= "UPDATE ".USERS." SET "; - $SQL .= "`wons` = wons + ".$Won.", "; - $SQL .= "`loos` = loos + ".$Lose.", "; - $SQL .= "`draws` = draws + ".$Draw.", "; - $SQL .= "`kbmetal` = kbmetal + ".$ShootMetal.", "; - $SQL .= "`kbcrystal` = kbcrystal + ".$ShootCrystal.", "; - $SQL .= "`lostunits` = lostunits + ".$result['lost']['att'].", "; - $SQL .= "`desunits` = desunits + ".$result['lost']['def']." "; - $SQL .= "WHERE "; - $SQL .= substr($WhereAtt, 0, -4).";"; - $SQL .= "UPDATE ".USERS." SET "; - $SQL .= "`wons` = wons + ". $Lose .", "; - $SQL .= "`loos` = loos + ". $Won .", "; - $SQL .= "`draws` = draws + ". $Draw .", "; - $SQL .= "`kbmetal` = kbmetal + ".$ShootMetal.", "; - $SQL .= "`kbcrystal` = kbcrystal + ".$ShootCrystal.", "; - $SQL .= "`lostunits` = lostunits + ".$result['lost']['def'].", "; - $SQL .= "`desunits` = desunits + ".$result['lost']['att']." "; - $SQL .= "WHERE "; - $SQL .= substr($WhereDef, 0, -4).";"; - $db->multi_query($SQL); + $this->setState(FLEET_RETURN); + $this->SaveFleet(); } function EndStayEvent() @@ -339,14 +501,13 @@ function EndStayEvent() function ReturnEvent() { - global $LANG; - $LNG = $LANG->GetUserLang($this->_fleet['fleet_owner']); - - $Message = sprintf( $LNG['sys_fleet_won'], $TargetName, GetTargetAdressLink($this->_fleet, ''), pretty_number($this->_fleet['fleet_resource_metal']), $LNG['Metal'], pretty_number($this->_fleet['fleet_resource_crystal']), $LNG['Crystal'], pretty_number($this->_fleet['fleet_resource_deuterium']), $LNG['Deuterium']); + $LNG = $this->getLanguage(NULL, $this->_fleet['fleet_owner']); + $TargetName = $GLOBALS['DATABASE']->getFirstCell("SELECT name FROM ".PLANETS." WHERE id = ".$this->_fleet['fleet_start_id'].";"); + $Message = sprintf( $LNG['sys_fleet_won'], $TargetName, GetTargetAdressLink($this->_fleet, ''), pretty_number($this->_fleet['fleet_resource_metal']), $LNG['tech'][901], pretty_number($this->_fleet['fleet_resource_crystal']), $LNG['tech'][902], pretty_number($this->_fleet['fleet_resource_deuterium']), $LNG['tech'][903]); + SendSimpleMessage($this->_fleet['fleet_owner'], 0, $this->_fleet['fleet_end_time'], 3, $LNG['sys_mess_tower'], $LNG['sys_mess_fleetback'], $Message); $this->RestoreFleet(); } } - -?> \ No newline at end of file + \ No newline at end of file diff --git a/includes/classes/missions/MissionCaseColonisation.php b/includes/classes/missions/MissionCaseColonisation.php index 6521758..52b62c0 100644 --- a/includes/classes/missions/MissionCaseColonisation.php +++ b/includes/classes/missions/MissionCaseColonisation.php @@ -2,7 +2,7 @@ /** * 2Moons - * Copyright (C) 2011 Slaver + * Copyright (C) 2012 Jan Kröpke * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,13 +18,12 @@ * along with this program. If not, see
| %s %s (%s) | +|
| %s | %s: %s %s: %s | +
| %s | %s: %s %s: %s %s: %s | +
| %s | %s: %s %s: %s | +
{$new_creator_title_u}
{$new_creator_title_u}
