diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b74decb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/config.php
diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..5eb217c
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,2 @@
+SetEnv DEBUG On
+SetEnv DEPRECATION Off
\ No newline at end of file
diff --git a/buildings.php b/buildings.php
index d9f1a1c..b352d06 100644
--- a/buildings.php
+++ b/buildings.php
@@ -32,33 +32,32 @@ define('INSIDE' , true);
define('INSTALL' , false);
require_once dirname(__FILE__) .'/common.php';
- includeLang('buildings');
+includeLang('buildings');
- // Mise a jour de la liste de construction si necessaire
- UpdatePlanetBatimentQueueList ( $planetrow, $user );
- $IsWorking = HandleTechnologieBuild ( $planetrow, $user );
+$user = Legacies_Empire_Model_User::getSingleton();
+$planet = $user->getCurrentPlanet();
- switch ($_GET['mode']) {
- case 'fleet':
- // --------------------------------------------------------------------------------------------------
- FleetBuildingPage ( $planetrow, $user );
- break;
+switch ($_GET['mode']) {
+ case 'fleet':
+ // --------------------------------------------------------------------------------------------------
+ FleetBuildingPage($planet, $user);
+ break;
- case 'research':
- // --------------------------------------------------------------------------------------------------
- ResearchBuildingPage ( $planetrow, $user, $IsWorking['OnWork'], $IsWorking['WorkOn'] );
- break;
+ case 'research':
+ // --------------------------------------------------------------------------------------------------
+ ResearchBuildingPage($planet, $user, $IsWorking['OnWork'], $IsWorking['WorkOn'] );
+ break;
- case 'defense':
- // --------------------------------------------------------------------------------------------------
- DefensesBuildingPage ( $planetrow, $user );
- break;
+ case 'defense':
+ // --------------------------------------------------------------------------------------------------
+ DefensesBuildingPage($planet, $user);
+ break;
- default:
- // --------------------------------------------------------------------------------------------------
- BatimentBuildingPage ( $planetrow, $user );
- break;
- }
+ default:
+ // --------------------------------------------------------------------------------------------------
+ BatimentBuildingPage($planet, $user);
+ break;
+}
// -----------------------------------------------------------------------------------------------------------
// History version
diff --git a/common.php b/common.php
index 39454ad..7e91b9a 100644
--- a/common.php
+++ b/common.php
@@ -28,8 +28,25 @@
*
*/
-if (!defined('DEBUG') && in_array(strtolower(getenv('DEBUG')), array('1', 'on', 'true'))) {
+define('DEPRECATION', true);
+define('DEBUG', true);
+
+if (!defined('DEBUG') && ($env = getenv('DEBUG')) !== false && in_array(strtolower($env), array('1', 'on', 'true'))) {
define('DEBUG', true);
+} else if (!defined('DEBUG') && isset($_SERVER['DEBUG']) && in_array(strtolower($_SERVER['DEBUG']), array('1', 'on', 'true'))) {
+ define('DEBUG', true);
+}
+
+if (!defined('DEPRECATION') && ($env = getenv('DEPRECATION')) !== false && in_array(strtolower($env), array('1', 'on', 'true'))) {
+ define('DEPRECATION', true);
+} else if (!defined('DEPRECATION') && isset($_SERVER['DEPRECATION']) && in_array(strtolower($_SERVER['DEPRECATION']), array('1', 'on', 'true'))) {
+ define('DEPRECATION', true);
+}
+
+if (!defined('BCNUMBERS') && ($env = getenv('BCNUMBERS')) !== false && in_array(strtolower($env), array('1', 'on', 'true'))) {
+ define('BCNUMBERS', true);
+} else if (!defined('BCNUMBERS') && isset($_SERVER['BCNUMBERS']) && in_array(strtolower($_SERVER['BCNUMBERS']), array('1', 'on', 'true'))) {
+ define('BCNUMBERS', true);
}
if (!defined('DEBUG')) {
@@ -47,6 +64,7 @@ defined('PHPEXT') || define('PHPEXT', require 'extension.inc');
defined('VERSION') || define('VERSION', '2011.1');
set_include_path(implode(PATH_SEPARATOR, array(
+ APPLICATION_PATH . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR . 'libraries',
APPLICATION_PATH . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR . 'local',
APPLICATION_PATH . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR . 'community',
APPLICATION_PATH . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR . 'core',
@@ -57,7 +75,8 @@ function __autoload($class) {
include_once str_replace('_', '/', $class) . '.php';
}
-Legacies_Core_Error::register();
+Legacies_Core_Time::init();
+Legacies_Core_ErrorProfiler::register();
if (0 === filesize(ROOT_PATH . 'config.php')) {
header('Location: install/');
@@ -72,7 +91,6 @@ foreach (include ROOT_PATH . 'includes/data/events.php' as $event => $listenerLi
$lang = array();
-define('DEFAULT_SKINPATH', 'skins/xnova/');
define('TEMPLATE_DIR', realpath(ROOT_PATH . '/templates/'));
define('TEMPLATE_NAME', 'OpenGame');
define('DEFAULT_LANG', 'fr');
@@ -110,30 +128,17 @@ if (!defined('DISABLE_IDENTITY_CHECK')) {
includeLang('system');
includeLang('tech');
-include(ROOT_PATH . 'rak.php');
-
-$dpath = DEFAULT_SKINPATH;
if (($user !== null && $user->getId())) {
- $dpath = $user->getSkinPath();
-
- if (empty($dpath)) {
- $dpath = DEFAULT_SKINPATH;
- }
-
- if (defined('IN_ADMIN')) {
- $dpath = '../' . $dpath;
- }
-
if (isset($_GET['cp']) && !empty($_GET['cp'])) {
$user->updateCurrentPlanet((int) $_GET['cp']);
}
+ $planet = $user->getCurrentPlanet();
+
foreach ($user->getPlanetCollection() as $planet) {
FlyingFleetHandler($planet); // TODO: implement logic into a refactored model
}
- $planet = $user->getCurrentPlanet();
-
/*
* Update planet resources and constructions
*/
diff --git a/config.php.default b/config.php.default
new file mode 100644
index 0000000..85e7c1c
--- /dev/null
+++ b/config.php.default
@@ -0,0 +1,21 @@
+ array(
+ 'date' => array(
+ 'timezone' => 'Europe/Paris'
+ ),
+ 'database' => array(
+ 'engine' => 'mysql',
+ 'options' => array(
+ 'hostname' => 'localhost',
+ 'username' => 'root',
+ 'password' => '',
+ 'database' => 'db_xnova'
+ ),
+ 'table_prefix' => 'game_',
+ ),
+ 'layout' => array(
+ 'page' => 'page.php',
+ 'empire' => 'empire.php'
+ )
+ )
+ );
\ No newline at end of file
diff --git a/frames.php b/frames.php
index d7c97c3..367459c 100644
--- a/frames.php
+++ b/frames.php
@@ -1,64 +1,16 @@
-
- * All rights reserved.
- *
- * 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- * --> NOTICE <--
- * This file is part of the core development branch, changing its contents will
- * make you unable to use the automatic updates manager. Please refer to the
- * documentation for further information about customizing XNova.
- *
- */
-
-define('INSIDE' , true);
-define('INSTALL' , false);
-
-$XNova_Host = $_SERVER['HTTP_HOST'];
-$XNova_Script = $_SERVER['SCRIPT_NAME'];
-$Uri_Array = explode ('/', $XNova_Script);
-// On vire le script
-array_pop($Uri_Array);
-$XNova_URI = implode ('/', $Uri_Array);
-
-$XNovaRootURL = "http://". $XNova_Host ."/". $XNova_URI ."/";
-
-require_once dirname(__FILE__) .'/common.php';
-
-$page = "";
-$page .= "";
-$page .= "";
-$page .= "";
-$page .= "". $gameConfig['game_name'] ."";
-$page .= "";
-
-$page .= "";
- $page .= "";
-$page .= "