Updated install

Added Form manager
Added session messages display

Signed-off-by: Gregory PLANCHAT <g.planchat@gmail.com>

alliance.php

@@ -671,7 +671,6 @@ elseif ($user->getData('ally_id') != 0 && $user->getData('ally_request') == 0) {
             foreach($ally_ranks as $a => $b) {
                 if ($ally['ally_owner'] == $user->getId()) {
                     $lang['id'] = $a;
-                    $lang['delete'] = "<a href=\"alliance.php?mode=admin&edit=rights&d={$a}\"><img src=\"../pic/abort.gif\" alt=\"{$lang['Delete_range']}\" border=0></a>";
                     $lang['r0'] = $b['name'];
                     $lang['a'] = $a;
                     $lang['r1'] = "<input type=checkbox name=\"u{$a}r0\"" . (($b['delete'] == 1)?' checked="checked"':'') . ">"; //{$b[1]}
@@ -688,7 +687,6 @@ elseif ($user->getData('ally_id') != 0 && $user->getData('ally_request') == 0) {
                 } else {
                     $lang['id'] = $a;
                     $lang['r0'] = $b['name'];
-                    $lang['delete'] = "<a href=\"alliance.php?mode=admin&edit=rights&d={$a}\"><img src=\"./pic/abort.gif\" alt=\"{$lang['Delete_range']}\" border=0></a>";
                     $lang['a'] = $a;
                     $lang['r1'] = "<b>-</b>";
                     $lang['r2'] = "<input type=checkbox name=\"u{$a}r1\"" . (($b['kick'] == 1)?' checked="checked"':'') . ">";

application/bootstrap.php

@@ -72,6 +72,8 @@ function __autoload($class) {
     include_once str_replace('_', '/', $class) . '.php';
 }
 
+include ROOT_PATH . 'includes/constants.php';
+
 Wootook_Core_Time::init();
 Wootook_Core_ErrorProfiler::register();
 Wootook_Core_Model_Config_Events::registerEvents();
@@ -89,7 +91,6 @@ define('DEFAULT_LANG', 'fr');
 include(ROOT_PATH . 'includes/debug.class.'.PHPEXT);
 $debug = new Debug();
 
-include(ROOT_PATH . 'includes/constants.' . PHPEXT);
 include(ROOT_PATH . 'includes/functions.' . PHPEXT);
 include(ROOT_PATH . 'includes/unlocalised.' . PHPEXT);
 include(ROOT_PATH . 'includes/todofleetcontrol.' . PHPEXT);

application/code/core/Wootook.php

@@ -315,12 +315,12 @@ class Wootook
         return $config;
     }
 
-    public static function setConfig($path = null, $value)
+    public static function setConfig($path, $value)
     {
         self::_loadConfig();
 
         if ($path === null || !is_string($path)) {
-            return self::$_config;
+            return self::$_config = $value;
         }
         $config = &self::$_config;
         foreach (explode('/', $path) as $chunk) {
@@ -334,6 +334,12 @@ class Wootook
         return true;
     }
 
+    public static function writeConfig(Array $config)
+    {
+        file_put_contents(ROOT_PATH . DIRECTORY_SEPARATOR . 'config.php',
+            '<' . '?p' . 'hp ' . var_export($config, true) . ';');
+    }
+
     public static function getBaseUrl()
     {
         return self::getConfig('global/web/base_url');

application/code/core/Wootook/Core/Block/Html/Navigation.php

@@ -17,7 +17,8 @@ class Wootook_Core_Block_Html_Navigation
                     ),
                 'label'   => $label,
                 'title'   => $title,
-                'classes' => $classes
+                'classes' => $classes,
+                'attributes' => $attributes
                 ));
         $parent->setPartial($baseName, $child);
 

application/code/core/Wootook/Core/EntityInterface.php

@@ -1,5 +1,39 @@
 <?php
+/**
+ * This file is part of Wootook
+ *
+ * @license http://www.gnu.org/licenses/agpl-3.0.txt
+ * @see http://www.wootook.com/
+ *
+ * Copyright (c) 2011-Present, Grégory PLANCHAT <g.planchat@gmail.com>
+ * All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *                                --> 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 Wootook.
+ *
+ */
 
+/**
+ *
+ * Enter description here ...
+ * @author Greg
+ *
+ */
 interface Wootook_Core_EntityInterface
 {
     public function getId();

application/code/core/Wootook/Core/ErrorProfiler.php

@@ -14,6 +14,8 @@ class Wootook_Core_ErrorProfiler
 
     private static $_listen = true;
 
+    private $_mute = false;
+
     public static function getSingleton()
     {
         if (self::$_singleton === null) {
@@ -134,6 +136,10 @@ ERROR_EOF;
 
     public function shutdownManager()
     {
+        if ($this->_mute === true) {
+            return;
+        }
+
         $index = 0;
         echo '<div style="background:#FFF;border:1px solid #F00;color:#000;padding:10px;margin:20px;text-align:left;">';
         echo '<h1>Debug profiler</h1>';
@@ -173,6 +179,8 @@ ERROR_EOF;
         set_error_handler(array(self::getSingleton(), 'errorManager'));
         set_exception_handler(array(self::getSingleton(), 'exceptionManager'));
 
+        self::getSingleton()->_mute = false;
+
         if (self::$_isTraceRegistered === false && defined('DEBUG')) {
             self::$_isTraceRegistered = true;
             register_shutdown_function(array(self::getSingleton(), 'shutdownManager'));
@@ -184,8 +192,10 @@ ERROR_EOF;
         restore_error_handler();
         restore_exception_handler();
 
-        if ((self::$_isTraceRegistered && defined('DEBUG')) || $force) {
+        self::getSingleton()->_mute = true;
-            self::$_isTraceRegistered = false;
+
+        if ((self::$_isTraceRegistered === false && defined('DEBUG')) || $force) {
+            self::$_isTraceRegistered = true;
             register_shutdown_function(array(self::getSingleton(), 'shutdownManager'));
         }
     }

application/code/core/Wootook/Core/Form.php

@@ -59,8 +59,11 @@ class Wootook_Core_Form
     public function validate()
     {
         foreach ($this->_fields as $field) {
-            $field->validate();
+            if (!$field->validate()) {
+                return false;
+            }
         }
+        return true;
     }
 
     /**

application/code/core/Wootook/Core/Layout.php

@@ -424,7 +424,7 @@ class Wootook_Core_Layout
      *
      * @return Wootook_Core_Block_Messages
      */
-    public function getMessagesblock()
+    public function getMessagesBlock()
     {
         return $this->_messageBlock;
     }

application/code/core/Wootook/Core/Model/Session.php

@@ -128,19 +128,26 @@ class Wootook_Core_Model_Session
         return $this->addMessage(vsprintf($message, $args), self::DEBUG);
     }
 
+    public function initFormKey()
+    {
+        $key = $this->getData('form_key');
+        $this->setData('form_key', uniqid());
+
+        return $key;
+    }
+
     public function getFormKey($reset = true)
     {
         if (!$this->getData('form_key')) {
-            $this->setData('form_key', uniqid());
+            $this->initFormKey();
             return $this->getData('form_key');
         }
 
-        $key = $this->getData('form_key');
+        if ($reset === true) {
-        if ($reset !== true) {
+            $this->initFormKey();
-            $this->setData('form_key', uniqid());
         }
 
-        return $key;
+        return $this->getData('form_key');
     }
 
     public function setFormData(Array $data = array())

application/code/core/Wootook/Core/Setup/Updater.php

@@ -0,0 +1,106 @@
+<?php
+
+class Wootook_Core_Setup_Updater
+{
+    protected $_setupConnection = null;
+
+    /**
+     *
+     * Enter description here ...
+     * @param unknown_type $connection
+     * @return Wootook_Core_Setup_Updater
+     */
+    public function setSetupConnection($connection)
+    {
+        if (is_string($connection)) {
+            $this->_setupConnection = Wootook_Database::getConnection($connection);
+        } else {
+            $this->_setupConnection = $connection;
+        }
+
+        return $this;
+    }
+
+    /**
+     *
+     * Enter description here ...
+     * @return Wootook_Database
+     */
+    public function getSetupConnection()
+    {
+        if ($this->_setupConnection === null) {
+            return Wootook_Database::getSingleton();
+        }
+        return $this->_setupConnection;
+    }
+
+    public function getTable($tableName)
+    {
+        $this->getSetupConnection()->getTable($tableName);
+    }
+
+    public function grant($tableName, $connectionName, $perms = null)
+    {
+        $hostname = Wootook::getConfig("global/database/{$connectionName}/params/hostname");
+        $username = Wootook::getConfig("global/database/{$connectionName}/params/username");
+        $database = Wootook::getConfig("global/database/{$connectionName}/params/database");
+        $password = Wootook::getConfig("global/database/{$connectionName}/params/password");
+
+        if ($perms === null) {
+            $perms = 'ALL PRIVILEGES';
+        } else if (is_array($perms)) {
+            $perms = implode(' ', $perms);
+        }
+
+        $sql =<<<SQL_EOF
+GRANT {$perms}
+ON {$database}.{$this->getTable($tableName)}
+TO '{$username}@{$hostname}' IDENTIFIED BY '$password'
+SQL_EOF;
+
+        $this->getSetupConnection()->query($sql);
+
+        return $this;
+    }
+
+    public function revoke($tableName, $connectionName, $perms = null)
+    {
+        $hostname = Wootook::getConfig("global/database/{$connectionName}/params/hostname");
+        $username = Wootook::getConfig("global/database/{$connectionName}/params/username");
+        $database = Wootook::getConfig("global/database/{$connectionName}/params/database");
+        $password = Wootook::getConfig("global/database/{$connectionName}/params/password");
+
+        if ($perms === null) {
+            $perms = 'ALL PRIVILEGES';
+        } else if (is_array($perms)) {
+            $perms = implode(' ', $perms);
+        }
+
+        $sql =<<<SQL_EOF
+REVOKE {$perms}
+ON {$database}.{$this->getTable($tableName)}
+FROM '{$username}@{$hostname}'
+SQL_EOF;
+
+        $this->getSetupConnection()->query($sql);
+
+        return $this;
+    }
+
+    public function run($script)
+    {
+        include $script;
+    }
+
+    public function getConfig($path = null)
+    {
+        return Wootook::getConfig($path);
+    }
+
+    public function getGameConfig($path)
+    {
+        $config = Wootook_Core_Model_Config::getSingleton();
+
+        return $config->getData($path);
+    }
+}

application/code/core/Wootook/Core/View.php

@@ -56,11 +56,16 @@ class Wootook_Core_View
         }
     }
 
-    protected function escape($unescaped)
+    public function escape($unescaped)
     {
         return htmlspecialchars($unescaped, ENT_QUOTES, 'UTF-8');
     }
 
+    public function escapeJs($unescaped)
+    {
+        return addslashes($unescaped);
+    }
+
     public function __($message, $_ = null)
     {
         $args = func_get_args();

application/code/core/Wootook/Core/install/mysql5/install-1.5.0.php

@@ -2,45 +2,33 @@
 /**
  * This file is part of Wootook
  *
- * @license Modified BSD
+ * @license http://www.gnu.org/licenses/agpl-3.0.txt
- * @see https://github.com/gplanchat/one.platform
+ * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-2010, Grégory PLANCHAT <g.planchat at gmail.com>
+ * Copyright (c) 2011-Present, Grégory PLANCHAT <g.planchat@gmail.com>
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without modification,
+ * This program is free software: you can redistribute it and/or modify
- * are permitted provided that the following conditions are met:
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *     - Redistributions of source code must retain the above copyright notice,
+ * This program is distributed in the hope that it will be useful,
- *       this list of conditions and the following disclaimer.
+ * 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.
  *
- *     - Redistributions in binary form must reproduce the above copyright notice,
+ * You should have received a copy of the GNU Affero General Public License
- *       this list of conditions and the following disclaimer in the documentation
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *       and/or other materials provided with the distribution.
- *
- *     - Neither the name of Grégory PLANCHAT nor the names of its
- *       contributors may be used to endorse or promote products derived from this
- *       software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *                                --> 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 One.Platform.
+ * documentation for further information about customizing Wootook.
  *
  */
 
-$this->setSetupConnection('legacies_setup');
+$this->setSetupConnection('core_setup');
 
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/aks')} (
@@ -59,12 +47,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/aks', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/aks', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/aks', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/alliance')} (
     `id`                    BIGINT UNSIGNED     NOT NULL    AUTO_INCREMENT,
@@ -88,12 +70,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/alliance', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/alliance', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/alliance', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/annonce')} (
     `id`                    SMALLINT UNSIGNED   NOT NULL    AUTO_INCREMENT,
@@ -112,12 +88,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/annonce', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/annonce', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/annonce', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/banned')} (
     `id`                    BIGINT UNSIGNED     NOT NULL    AUTO_INCREMENT,
@@ -134,12 +104,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/banned', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/banned', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/banned', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/buddy')} (
     `id`                    BIGINT UNSIGNED     NOT NULL    AUTO_INCREMENT,
@@ -153,12 +117,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/buddy', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/buddy', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/buddy', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/chat')} (
     `messageid`             BIGINT UNSIGNED     NOT NULL    AUTO_INCREMENT,
@@ -171,12 +129,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/chat', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/chat', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/chat', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/config')} (
     `config_name`           VARCHAR(64)         NOT NULL,
@@ -187,12 +139,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/config', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/config', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/config', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 INSERT INTO {$this->getTableName('legacies/config')} (`config_name`, `config_value`) VALUES
     ('game_speed', '2500'),
@@ -206,7 +152,7 @@ INSERT INTO {$this->getTableName('legacies/config')} (`config_name`, `config_val
     ('game_disable', '1'),
     ('close_reason', 'Le jeu est clos pour le moment!'),
     ('metal_basic_income', '20'),
-    ('crystal_basic_income', '10'),
+    ('cristal_basic_income', '10'),
     ('deuterium_basic_income', '0'),
     ('energy_basic_income', '0'),
     ('BuildLabWhileRun', '0'),
@@ -259,12 +205,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/declared', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/declared', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/declared', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/errors')} (
     `error_id`              BIGINT UNSIGNED     NOT NULL    AUTO_INCREMENT,
@@ -278,12 +218,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/errors', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/errors', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/errors', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/fleets')} (
     `fleet_id`                  BIGINT UNSIGNED     NOT NULL    AUTO_INCREMENT,
@@ -316,12 +250,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/fleets', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/fleets', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/fleets', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/galaxy')} (
     `galaxy`                TINYINT UNSIGNED    NOT NULL,
@@ -341,12 +269,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/galaxy', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/galaxy', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/galaxy', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/iraks')} (
     `id`                    BIGINT UNSIGNED         NOT NULL    AUTO_INCREMENT,
@@ -367,12 +289,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/iraks', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/iraks', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/iraks', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/lunas')} (
     `id`                    BIGINT UNSIGNED         NOT NULL    AUTO_INCREMENT,
@@ -393,12 +309,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/lunas', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/lunas', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/lunas', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/messages')} (
     `message_id`            BIGINT UNSIGNED         NOT NULL    AUTO_INCREMENT,
@@ -415,12 +325,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/messages', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/messages', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/messages', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/multi')} (
     `id`                    BIGINT UNSIGNED         NOT NULL    AUTO_INCREMENT,
@@ -433,12 +337,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/multi', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/multi', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/multi', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/notes')} (
     `id`                    BIGINT UNSIGNED         NOT NULL    AUTO_INCREMENT,
@@ -453,12 +351,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/notes', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/notes', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/notes', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/planets')} (
     `id`                            BIGINT UNSIGNED         NOT NULL    AUTO_INCREMENT,
@@ -489,16 +381,16 @@ CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/planets')} (
     `metal`                         DECIMAL(65,0)           NOT NULL    DEFAULT 0,
     `metal_perhour`                 DECIMAL(65,0)           NOT NULL    DEFAULT 0,
     `metal_max`                     DECIMAL(65,0)           NOT NULL    DEFAULT 0,
-    `crystal`                       DECIMAL(65,0)           NOT NULL    DEFAULT 0,
+    `cristal`                       DECIMAL(65,0)           NOT NULL    DEFAULT 0,
-    `crystal_perhour`               DECIMAL(65,0)           NOT NULL    DEFAULT 0,
+    `cristal_perhour`               DECIMAL(65,0)           NOT NULL    DEFAULT 0,
-    `crystal_max`                   DECIMAL(65,0)           NOT NULL    DEFAULT 0,
+    `cristal_max`                   DECIMAL(65,0)           NOT NULL    DEFAULT 0,
     `deuterium`                     DECIMAL(65,0)           NOT NULL    DEFAULT 0,
     `deuterium_perhour`             DECIMAL(65,0)           NOT NULL    DEFAULT 0,
     `deuterium_max`                 DECIMAL(65,0)           NOT NULL    DEFAULT 0,
     `energy_used`                   DECIMAL(65,0)           NOT NULL    DEFAULT 0,
     `energy_max`                    DECIMAL(65,0)           NOT NULL    DEFAULT 0,
     `metal_mine`                    SMALLINT UNSIGNED       NOT NULL    DEFAULT 0,
-    `crystal_mine`                  SMALLINT UNSIGNED       NOT NULL    DEFAULT 0,
+    `cristal_mine`                  SMALLINT UNSIGNED       NOT NULL    DEFAULT 0,
     `deuterium_sintetizer`          SMALLINT UNSIGNED       NOT NULL    DEFAULT 0,
     `solar_plant`                   SMALLINT UNSIGNED       NOT NULL    DEFAULT 0,
     `fusion_plant`                  SMALLINT UNSIGNED       NOT NULL    DEFAULT 0,
@@ -506,7 +398,7 @@ CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/planets')} (
     `nano_factory`                  SMALLINT UNSIGNED       NOT NULL    DEFAULT 0,
     `hangar`                        SMALLINT UNSIGNED       NOT NULL    DEFAULT 0,
     `metal_store`                   SMALLINT UNSIGNED       NOT NULL    DEFAULT 0,
-    `crystal_store`                 SMALLINT UNSIGNED       NOT NULL    DEFAULT 0,
+    `cristal_store`                 SMALLINT UNSIGNED       NOT NULL    DEFAULT 0,
     `deuterium_store`               SMALLINT UNSIGNED       NOT NULL    DEFAULT 0,
     `laboratory`                    SMALLINT UNSIGNED       NOT NULL    DEFAULT 0,
     `terraformer`                   SMALLINT UNSIGNED       NOT NULL    DEFAULT 0,
@@ -540,7 +432,7 @@ CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/planets')} (
     `interceptor_misil`             SMALLINT                NOT NULL    DEFAULT 0,
     `interplanetary_misil`          SMALLINT                NOT NULL    DEFAULT 0,
     `metal_mine_porcent`            TINYINT                 NOT NULL    DEFAULT 10,
-    `crystal_mine_porcent`          TINYINT                 NOT NULL    DEFAULT 10,
+    `cristal_mine_porcent`          TINYINT                 NOT NULL    DEFAULT 10,
     `deuterium_sintetizer_porcent`  TINYINT                 NOT NULL    DEFAULT 10,
     `solar_plant_porcent`           TINYINT                 NOT NULL    DEFAULT 10,
     `fusion_plant_porcent`          TINYINT                 NOT NULL    DEFAULT 10,
@@ -552,12 +444,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/planets', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/planets', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/planets', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/rw')} (
     `id_owner1`             BIGINT UNSIGNED         NOT NULL,
@@ -574,12 +460,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/rw', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/rw', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/rw', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/statpoints')} (
     `id_owner`              BIGINT UNSIGNED         NOT NULL,
@@ -617,12 +497,6 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/statpoints', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/statpoints', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/statpoints', 'legacies_setup')
-;
-
 $sql = <<<SQL_EOF
 CREATE TABLE IF NOT EXISTS {$this->getTableName('legacies/users')} (
     `id`                        BIGINT UNSIGNED         NOT NULL    AUTO_INCREMENT,
@@ -736,57 +610,3 @@ SQL_EOF;
 
 $this->query($sql);
 
-$this
-    ->grant('legacies/users', 'legacies_read',  array('SELECT'))
-    ->grant('legacies/users', 'legacies_write', array('SELECT', 'CREATE', 'UPDATE', 'DELETE'))
-    ->grant('legacies/users', 'legacies_setup')
-;
-
-$sql = <<<SQL_EOF
-INSERT INTO {$this->getTableName('legacies/alliance')} (
-    `id`, `ally_name`, `ally_tag`, `ally_owner`, `ally_register_time`, `ally_description`,
-    `ally_web`, `ally_text`, `ally_image`, `ally_request`, `ally_request_waiting`,
-    `ally_request_notallow`, `ally_owner_range`, `ally_ranks`, `ally_members`
-    )
-    VALUES
-    ('1', 'Admin', 'Admin', 1, NOW(), 'Administrator alliance', 'http://www.xnova-ng.org/',
-    '', '', '', '', '', '', '', '')
-SQL_EOF;
-
-$this->query($sql);
-
-$sql = <<<SQL_EOF
-INSERT INTO {$this->getTableName('legacies/users')} (
-    `id`, `username`, `password`, `email`, `email_2`, `lang`, `authlevel`, `sex`,
-    `avatar`, `sign`, `id_planet`, `galaxy`, `system`, `planet`, `current_planet`,
-    `user_lastip`, `ip_at_reg`, `user_agent`, `current_page`, `register_time`,
-    `onlinetime`, `dpath`, `design`, `noipcheck`, `planet_sort`, `planet_sort_order`,
-    `spio_anz`, `settings_tooltiptime`, `settings_fleetactions`, `settings_allylogo`,
-    `settings_esp`, `settings_wri`, `settings_bud`, `settings_mis`, `settings_rep`,
-    `urlaubs_modus`, `urlaubs_until`, `db_deaktjava`, `new_message`, `fleet_shortcut`,
-    `b_tech_planet`, `spy_tech`, `computer_tech`, `military_tech`, `defence_tech`,
-    `shield_tech`, `energy_tech`, `hyperspace_tech`, `combustion_tech`,
-    `impulse_motor_tech`, `hyperspace_motor_tech`, `laser_tech`, `ionic_tech`,
-    `buster_tech`, `intergalactic_tech`, `expedition_tech`, `graviton_tech`,
-    `ally_id`, `ally_name`, `ally_request`, `ally_request_text`, `ally_register_time`,
-    `ally_rank_id`, `current_luna`, `kolorminus`, `kolorplus`, `kolorpoziom`,
-    `rpg_geologue`, `rpg_amiral`, `rpg_ingenieur`, `rpg_technocrate`, `rpg_espion`,
-    `rpg_constructeur`, `rpg_scientifique`, `rpg_commandant`, `rpg_points`, `rpg_stockeur`,
-    `rpg_defenseur`, `rpg_destructeur`, `rpg_general`, `rpg_bunker`, `rpg_raideur`,
-    `rpg_empereur`, `lvl_minier`, `lvl_raid`, `xpraid`, `xpminier`, `raids`,
-    `p_infligees`, `mnl_alliance`, `mnl_joueur`, `mnl_attaque`, `mnl_spy`,
-    `mnl_exploit`, `mnl_transport`, `mnl_expedition`, `mnl_general`, `mnl_buildlist`,
-    `bana`, `multi_validated`, `banaday`, `raids1`, `raidswin`, `raidsloose`
-    )
-    VALUES
-    ('1', 'Admin', '', '', '', 'fr', '3', NULL, '', '', '1', '1', '1', '1',
-    '1', '127.0.0.1', '', '', '', '1254743313', '1269391977', '', '1', '1', '0',
-    '0', '1', '5', '0', '0', '1', '1', '1', '1', '0', '0', '0', '0', '0', '', '0',
-    '16', '20', '11', '11', '11', '12', '10', '14', '10', '9', '0', '0', '0', '0',
-    '0', '1', 1, 'Admin', '0', '', NOW(), '0', '0', 'red', '#00FF00', 'yellow', '20',
-    '20', '10', '10', '0', '3', '3', '0', '27', '2', '2', '0', '0', '0', '0', '0',
-    '98', '1', '0', '1133583738', '0', '0', '0', '0', '0', '0', '0', '0', '0',
-    '0', '0', '0', '0', '0', '0', '0', '0')
-SQL_EOF;
-
-$this->query($sql);

application/code/core/Wootook/Database.php

@@ -3,9 +3,12 @@
 class Wootook_Database
     extends PDO
 {
-    protected static $_singleton = null;
+    const DEFAULT_CONNECTION_NAME = 'default';
 
-    protected static $_prefix = null;
+    protected static $_connections = array();
+    protected static $_connectionAliases = array();
+
+    protected $_tablePrefix = null;
 
     public static $options = array(
         PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
@@ -13,39 +16,80 @@ class Wootook_Database
 
     public static function getSingleton()
     {
-        if (self::$_singleton === null) {
+        return self::getConnection(self::DEFAULT_CONNECTION_NAME);
-            $config = include ROOT_PATH . 'config.php';
+    }
-            $hostname = $config['global']['database']['options']['hostname'];
-            $username = $config['global']['database']['options']['username'];
-            $password = $config['global']['database']['options']['password'];
-            $database = $config['global']['database']['options']['database'];
-            $port = 3306;
 
-            if (isset($config['global']['database']['options']['port'])) {
+    public static function getConnection($connectionName)
-                $port = $config['global']['database']['options']['port'];
+    {
+        if (empty($connectionName) || $connectionName === null) {
+            return null;
+        }
+
+        if (!isset(self::$_connections[$connectionName])) {
+            if (isset(self::$_connectionAliases[$connectionName])) {
+                return self::$_connectionAliases[$connectionName];
             }
 
-            $event = Wootook::dispatchEvent('database.prepare-options', array(
+            if ($alias = Wootook::getConfig("global/database/{$connectionName}/use")) {
-                'options' => self::$options
+                self::$_connectionAliases[$connectionName] = self::getConnection($alias);
-                ));
+            }
 
-            self::$options = $event->getData('options');
+            self::$_connections[$connectionName] = self::_initConnection($connectionName);
-
-            self::$_singleton = new self("mysql:dbname={$database};host={$hostname};port={$port}", $username, $password, self::$options);
-
-            Wootook::dispatchEvent('database.init', array(
-                'handler' => self::$_singleton
-                ));
         }
-        return self::$_singleton;
+
+        return self::$_connections[$connectionName];
+    }
+
+    private static function _initConnection($connectionName)
+    {
+        $hostname = Wootook::getConfig("global/database/{$connectionName}/params/hostname");
+        $username = Wootook::getConfig("global/database/{$connectionName}/params/username");
+        $password = Wootook::getConfig("global/database/{$connectionName}/params/password");
+        $database = Wootook::getConfig("global/database/{$connectionName}/params/database");
+
+        if (empty($hostname) || empty($username) || empty($database)) {
+            return null;
+        }
+
+        if (!($port = Wootook::getConfig("global/database/{$connectionName}/params/port")) || !is_numeric($port)) {
+            $port = 3306;
+        }
+
+        $event = Wootook::dispatchEvent('database.prepare-options', array(
+            'name'    => $connectionName,
+            'options' => array_merge(self::$options, Wootook::getConfig("global/database/{$connectionName}/options"))
+            ));
+
+        $options = $event->getData('options');
+
+        $connection = new self("mysql:dbname={$database};host={$hostname};port={$port}", $username, $password, $options);
+
+        if (($prefix = Wootook::getConfig("global/database/{$connectionName}/table_prefix")) !== null) {
+            $connection->setTablePrefix($prefix);
+        }
+
+        Wootook::dispatchEvent('database.init', array(
+            'name'    => $connectionName,
+            'handler' => $connection
+            ));
+
+        return $connection;
+    }
+
+    public function setTablePrefix($prefix)
+    {
+        $this->_tablePrefix = $prefix;
+
+        return $this;
+    }
+
+    public function getTablePrefix()
+    {
+        return $this->_tablePrefix;
     }
 
     public function getTable($name)
     {
-        if (self::$_prefix === null) {
+        return $this->getTablePrefix() . $name;
-            $config = include ROOT_PATH . 'config.php';
-            self::$_prefix = $config['global']['database']['table_prefix'];
-        }
-        return self::$_prefix . $name;
     }
 }

application/code/core/Wootook/Empire/Model/Planet.php

@@ -429,7 +429,7 @@ class Wootook_Empire_Model_Planet
         ;
 
         $options = array(
-            'galaxy'      => $this->getSystem(),
+            'galaxy'      => $this->getGalaxy(),
             'system'      => $this->getSystem(),
             'position'    => $this->getPosition(),
             'planet_type' => $this->getType()

application/code/test/WootookTest.php

@@ -1,6 +1,6 @@
 <?php
 
-class Test_LegaciesTest
+class Test_WootookTest
     extends PHPUnit_Framework_TestCase
 {
     protected function tearDown()

application/design/base/default/layouts/page.php

@@ -84,17 +84,7 @@
                 ),
             'header' => array(
                 'type' => 'core/template',
-                'template' => 'page/html/header.phtml',
+                'template' => 'page/html/header.phtml'
-                'children' => array(
-                    'menu' => array(
-                        'type'     => 'core/html.navigation',
-                        'template' => 'page/html/navigation.phtml',
-                        ),
-                    'planet-list' => array(
-                        'type'     => 'empire/planet-list',
-                        'template' => 'empire/planet-list.phtml',
-                        )
-                    )
                 ),
             'footer' => array(
                 'type' => 'core/template',

application/design/base/default/scripts/deprecated/alliance_admin_laws.tpl

@@ -8,63 +8,64 @@
 
 <br>
 
-<form action="alliance.php?mode=admin&edit=rights&add=name" method=POST>
+<form action="<?php echo $this->getUrl('alliance.php', array('mode' => 'admin', 'edit' => 'rights', 'add' => 'name'))?>" method="POST">
 <table width=519>
-	<tr>
+  <tr>
-	  <td class=c colspan=2><?php echo $this->getData('Range_make')?></td>
+    <td class="c" colspan="2"><?php echo $this->getData('Range_make')?></td>
-	</tr>
+  </tr>
-	<tr>
+  <tr>
-	  <th><?php echo $this->getData('Range_name')?></th>
+    <th><?php echo $this->getData('Range_name')?></th>
-	  <th><input type=text name="newrangname" size=20 maxlength=30></th>
+    <th><input type="text" name="newrangname" size="20" maxlength="30"></th>
-	</tr>
+  </tr>
-	<tr>
+  <tr>
-	  <th colspan=2><input type=submit value="<?php echo $this->getData('Make')?>"></th>
+    <th colspan="2"><input type="submit" value="<?php echo $this->getData('Make')?>"></th>
-	</tr>
+  </tr>
-</form>
 </table>
+</form>
 
-<form action="alliance.php?mode=admin&edit=rights" method=POST>
+<form action="<?php echo $this->getUrl('alliance.php', array('mode' => 'admin', 'edit' => 'rights'))?>" method="POST">
-<table width=519>
+  <table width="519">
-	<tr>
+    <tr>
-	  <td class=c colspan=2><?php echo $this->getData('Law_leyends')?></td>
+      <td class="c" colspan="2"><?php echo $this->getData('Law_leyends')?></td>
-	</tr>
+    </tr>
-	<tr>
+    <tr>
-	  <th><img src=images/r1.png></th>
+      <th><img src="<?php echo $this->getSkinUrl('graphics/images/r1.png')?>"></th>
-	  <th><?php echo $this->getData('Alliance_dissolve')?></th>
+      <th><?php echo $this->getData('Alliance_dissolve')?></th>
-	</tr>
+    </tr>
-	<tr>
+    <tr>
-	  <th><img src=images/r2.png></th>
+      <th><img src="<?php echo $this->getSkinUrl('graphics/images/r2.png')?>"></th>
-	  <th><?php echo $this->getData('Expel_users')?></th>
+      <th><?php echo $this->getData('Expel_users')?></th>
-	</tr>
+    </tr>
-	<tr>
+    <tr>
-	  <th><img src=images/r3.png></th>
+      <th><img src="<?php echo $this->getSkinUrl('graphics/images/r3.png')?>"></th>
-	  <th><?php echo $this->getData('See_the_requests')?></th>
+      <th><?php echo $this->getData('See_the_requests')?></th>
-	</tr>
+    </tr>
-	<tr>
+    <tr>
-	  <th><img src=images/r4.png></th>
+      <th><img src="<?php echo $this->getSkinUrl('graphics/images/r4.png')?>"></th>
-	  <th><?php echo $this->getData('See_the_list_members')?></th>
+      <th><?php echo $this->getData('See_the_list_members')?></th>
-	</tr>
+    </tr>
-	<tr>
+    <tr>
-	  <th><img src=images/r5.png></th>
+      <th><img src="<?php echo $this->getSkinUrl('graphics/images/r5.png')?>"></th>
-	  <th><?php echo $this->getData('Check_the_requests')?></th>
+      <th><?php echo $this->getData('Check_the_requests')?></th>
-	</tr>
+    </tr>
-	<tr>
+    <tr>
-	  <th><img src=images/r6.png></th>
+      <th><img src="<?php echo $this->getSkinUrl('graphics/images/r6.png')?>"></th>
-	  <th><?php echo $this->getData('Alliance_admin')?></th>
+      <th><?php echo $this->getData('Alliance_admin')?></th>
-	</tr>
+    </tr>
-	<tr>
+    <tr>
-	  <th><img src=images/r7.png></th>
+      <th><img src="<?php echo $this->getSkinUrl('graphics/images/r7.png')?>"></th>
-	  <th><?php echo $this->getData('See_the_online_list_member')?></th>
+      <th><?php echo $this->getData('See_the_online_list_member')?></th>
-	</tr>
+    </tr>
-	<tr>
+    <tr>
-	  <th><img src=images/r8.png></th><th><?php echo $this->getData('Make_a_circular_message')?></th>
+      <th><img src="<?php echo $this->getSkinUrl('graphics/images/r8.png')?>"></th>
-	</tr>
+      <th><?php echo $this->getData('Make_a_circular_message')?></th>
-	<tr>
+    </tr>
-	  <th><img src=images/r9.png></th><th><?php echo $this->getData('Left_hand_text')?></th>
+    <tr>
-	</tr>
+      <th><img src="<?php echo $this->getSkinUrl('graphics/images/r9.png')?>"></th>
-	<tr>
+      <th><?php echo $this->getData('Left_hand_text')?></th>
-	  <td class="c" colspan="2"><a href="alliance.php?mode=admin&edit=ally"><?php echo $this->getData('Return_to_overview')?></a></td>
+    </tr>
-	</tr>
+    <tr>
+      <td class="c" colspan="2"><a href="alliance.php?mode=admin&edit=ally"><?php echo $this->getData('Return_to_overview')?></a></td>
+    </tr>
+  </table>
 </form>
-</table>
-	

application/design/base/default/scripts/deprecated/alliance_admin_laws_head.tpl

@@ -3,13 +3,13 @@
 	<tr>
 	  <th></th>
 	  <th><?php echo $this->getData('Range_name')?></th>
-	  <th><img src=images/r1.png></th>
+	  <th><img src="<?php echo $this->getSkinUrl('graphics/images/r1.png')?>"></th>
-	  <th><img src=images/r2.png></th>
+	  <th><img src="<?php echo $this->getSkinUrl('graphics/images/r2.png')?>"></th>
-	  <th><img src=images/r3.png></th>
+	  <th><img src="<?php echo $this->getSkinUrl('graphics/images/r3.png')?>"></th>
-	  <th><img src=images/r4.png></th>
+	  <th><img src="<?php echo $this->getSkinUrl('graphics/images/r4.png')?>"></th>
-	  <th><img src=images/r5.png></th>
+	  <th><img src="<?php echo $this->getSkinUrl('graphics/images/r5.png')?>"></th>
-	  <th><img src=images/r6.png></th>
+	  <th><img src="<?php echo $this->getSkinUrl('graphics/images/r6.png')?>"></th>
-	  <th><img src=images/r7.png></th>
+	  <th><img src="<?php echo $this->getSkinUrl('graphics/images/r7.png')?>"></th>
-	  <th><img src=images/r8.png></th>
+	  <th><img src="<?php echo $this->getSkinUrl('graphics/images/r8.png')?>"></th>
-	  <th><img src=images/r9.png></th>
+	  <th><img src="<?php echo $this->getSkinUrl('graphics/images/r9.png')?>"></th>
 	</tr>

application/design/base/default/scripts/deprecated/alliance_admin_laws_row.tpl

@@ -1,16 +1,21 @@
-<br>
+<tr>
-	<tr>
+  <th>
-	  <th><?php echo $this->getData('delete')?></th>
+    <?php if ($this->getData('a') > 0):?>
-	  <th>&nbsp;<?php echo $this->getData('r0')?>&nbsp;</th>
+    <a href="<?php echo $this->getUrl('alliance.php', array('mode' => 'admin', 'edit' => 'rights', 'd' => $this->getData('a')))?>">
-	  <input type="hidden" name="id[]" value="<?php echo $this->getData('a')?>">
+      <img src="<?php echo $this->getSkinUrl('graphics/pic/abort.gif')?>" alt="<?php echo $this->__('Remove rank')?>" border="0" />
-	  <th><?php echo $this->getData('r1')?></th>
+    </a>
-	  <th><?php echo $this->getData('r2')?></th>
+    <?php endif?>
-	  <th><?php echo $this->getData('r3')?></th>
+    <input type="hidden" name="id[]" value="<?php echo $this->getData('a')?>">
-	  <th><?php echo $this->getData('r4')?></th>
+  </th>
-	  <th><?php echo $this->getData('r5')?></th>
+  <th><?php echo $this->getData('r0')?></th>
-	  <th><?php echo $this->getData('r6')?></th>
+  <th><?php echo $this->getData('r1')?></th>
-	  <th><?php echo $this->getData('r7')?></th>
+  <th><?php echo $this->getData('r2')?></th>
-	  <th><?php echo $this->getData('r8')?></th>
+  <th><?php echo $this->getData('r3')?></th>
-	  <th><?php echo $this->getData('r9')?></th>
+  <th><?php echo $this->getData('r4')?></th>
-	  </tr>
+  <th><?php echo $this->getData('r5')?></th>
-	<tr>
+  <th><?php echo $this->getData('r6')?></th>
+  <th><?php echo $this->getData('r7')?></th>
+  <th><?php echo $this->getData('r8')?></th>
+  <th><?php echo $this->getData('r9')?></th>
+  </tr>
+<tr>

application/design/install/default/layouts/install.php

@@ -80,5 +80,80 @@
                     )
                 )
             )
+        ),
+
+    'install.step.database' => array(
+        'update' => 'install',
+        'reference' => array(
+            'content' => array(
+                'children' => array(
+                    'overview' => array(
+                        'type' => 'core/template',
+                        'template' => 'step/database.phtml'
+                        ),
+                    )
+                ),
+            'status' => array(
+                'actions' => array(
+                    array(
+                        'method' => 'setData',
+                        'params' => array(
+                            'key'   => 'step',
+                            'value' => 'database'
+                            )
+                        )
+                    )
+                )
+            )
+        ),
+
+    'install.step.universe' => array(
+        'update' => 'install',
+        'reference' => array(
+            'content' => array(
+                'children' => array(
+                    'overview' => array(
+                        'type' => 'core/template',
+                        'template' => 'step/universe.phtml'
+                        ),
+                    )
+                ),
+            'status' => array(
+                'actions' => array(
+                    array(
+                        'method' => 'setData',
+                        'params' => array(
+                            'key'   => 'step',
+                            'value' => 'universe'
+                            )
+                        )
+                    )
+                )
+            )
+        ),
+
+    'install.step.profile' => array(
+        'update' => 'install',
+        'reference' => array(
+            'content' => array(
+                'children' => array(
+                    'overview' => array(
+                        'type' => 'core/template',
+                        'template' => 'step/profile.phtml'
+                        ),
+                    )
+                ),
+            'status' => array(
+                'actions' => array(
+                    array(
+                        'method' => 'setData',
+                        'params' => array(
+                            'key'   => 'step',
+                            'value' => 'profile'
+                            )
+                        )
+                    )
+                )
+            )
         )
     );

application/design/install/default/scripts/step/system.phtml

@@ -4,10 +4,474 @@
   <h2><?php echo $this->__('System Config')?></h2>
   <?php echo $this->getLayout()->getMessagesblock()->renderGroupedHtml()?>
   <form method="post" action="?mode=install&step=1">
+    <input type="hidden" id="form_key" name="__formkey" value="<?php echo $session->getFormKey()?>" />
     <p>
       <label for="system:url_path"><?php echo $this->__('Base URL path for the game:')?></label>
       <input type="text" id="system:url_path" name="url_path" value="<?php echo $session->getFormData('url_path', Wootook::getBaseUrl())?>" />
     </p>
+    <p>
+      <label for="system:timezone"><?php echo $this->__('Game timezone:')?></label>
+      <select name="timezone" id="system:timezone">
+        <optgroup label="<?php echo $this->__('Africa')?>">
+          <option value="Africa/Abidjan">Abidjan</option>
+          <option value="Africa/Accra">Accra</option>
+          <option value="Africa/Addis_Ababa">Addis Ababa</option>
+          <option value="Africa/Algiers">Algiers</option>
+          <option value="Africa/Asmara">Asmara</option>
+          <option value="Africa/Asmera">Asmera</option>
+          <option value="Africa/Bamako">Bamako</option>
+          <option value="Africa/Bangui">Bangui</option>
+          <option value="Africa/Banjul">Banjul</option>
+          <option value="Africa/Bissau">Bissau</option>
+          <option value="Africa/Blantyre">Blantyre</option>
+          <option value="Africa/Brazzaville">Brazzaville</option>
+          <option value="Africa/Bujumbura">Bujumbura</option>
+          <option value="Africa/Cairo">Cairo</option>
+          <option value="Africa/Casablanca">Casablanca</option>
+          <option value="Africa/Ceuta">Ceuta</option>
+          <option value="Africa/Conakry">Conakry</option>
+          <option value="Africa/Dakar">Dakar</option>
+          <option value="Africa/Dar_es_Salaam">Dar es Salaam</option>
+          <option value="Africa/Djibouti">Djibouti</option>
+          <option value="Africa/Douala">Douala</option>
+          <option value="Africa/El_Aaiun">El Aaiun</option>
+          <option value="Africa/Freetown">Freetown</option>
+          <option value="Africa/Gaborone">Gaborone</option>
+          <option value="Africa/Harare">Harare</option>
+          <option value="Africa/Johannesburg">Johannesburg</option>
+          <option value="Africa/Juba">Juba</option>
+          <option value="Africa/Kampala">Kampala</option>
+          <option value="Africa/Khartoum">Khartoum</option>
+          <option value="Africa/Kigali">Kigali</option>
+          <option value="Africa/Kinshasa">Kinshasa</option>
+          <option value="Africa/Lagos">Lagos</option>
+          <option value="Africa/Libreville">Libreville</option>
+          <option value="Africa/Lome">Lome</option>
+          <option value="Africa/Luanda">Luanda</option>
+          <option value="Africa/Lubumbashi">Lubumbashi</option>
+          <option value="Africa/Lusaka">Lusaka</option>
+          <option value="Africa/Malabo">Malabo</option>
+          <option value="Africa/Maputo">Maputo</option>
+          <option value="Africa/Maseru">Maseru</option>
+          <option value="Africa/Mbabane">Mbabane</option>
+          <option value="Africa/Mogadishu">Mogadishu</option>
+          <option value="Africa/Monrovia">Monrovia</option>
+          <option value="Africa/Nairobi">Nairobi</option>
+          <option value="Africa/Ndjamena">Ndjamena</option>
+          <option value="Africa/Niamey">Niamey</option>
+          <option value="Africa/Nouakchott">Nouakchott</option>
+          <option value="Africa/Ouagadougou">Ouagadougou</option>
+          <option value="Africa/Porto-Novo">Porto-Novo</option>
+          <option value="Africa/Sao_Tome">Sao_Tome</option>
+          <option value="Africa/Timbuktu">Timbuktu</option>
+          <option value="Africa/Tripoli">Tripoli</option>
+          <option value="Africa/Tunis">Tunis</option>
+          <option value="Africa/Windhoek">Windhoek</option>
+        </optgroup>
+        <optgroup label="<?php echo $this->__('America')?>">
+          <option value="America/Adak">Adak</option>
+          <option value="America/Anchorage">Anchorage</option>
+          <option value="America/Anguilla">Anguilla</option>
+          <option value="America/Antigua">Antigua</option>
+          <option value="America/Araguaina">Araguaina</option>
+          <option value="America/Argentina/Buenos_Aires">Buenos Aires (Argentina)</option>
+          <option value="America/Argentina/Catamarca">Catamarca (Argentina)</option>
+          <option value="America/Argentina/ComodRivadavia">ComodRivadavia (Argentina)</option>
+          <option value="America/Argentina/Cordoba">Cordoba (Argentina)</option>
+          <option value="America/Argentina/Jujuy">Jujuy (Argentina)</option>
+          <option value="America/Argentina/La_Rioja">La Rioja (Argentina)</option>
+          <option value="America/Argentina/Mendoza">Mendoza (Argentina)</option>
+          <option value="America/Argentina/Rio_Gallegos">Rio Gallegos (Argentina)</option>
+          <option value="America/Argentina/Salta">Salta (Argentina)</option>
+          <option value="America/Argentina/San_Juan">San Juan (Argentina)</option>
+          <option value="America/Argentina/San_Luis">San Luis (Argentina)</option>
+          <option value="America/Argentina/Tucuman">Tucuman (Argentina)</option>
+          <option value="America/Argentina/Ushuaia">Ushuaia (Argentina)</option>
+          <option value="America/Aruba">Aruba</option>
+          <option value="America/Asuncion">Asuncion</option>
+          <option value="America/Atikokan">Atikokan</option>
+          <option value="America/Atka">Atka</option>
+          <option value="America/Bahia">Bahia</option>
+          <option value="America/Bahia_Banderas">Bahia Banderas</option>
+          <option value="America/Barbados">Barbados</option>
+          <option value="America/Belem">Belem</option>
+          <option value="America/Belize">Belize</option>
+          <option value="America/Blanc-Sablon">Blanc-Sablon</option>
+          <option value="America/Boa_Vista">Boa Vista</option>
+          <option value="America/Bogota">Bogota</option>
+          <option value="America/Boise">Boise</option>
+          <option value="America/Buenos_Aires">Buenos Aires</option>
+          <option value="America/Cambridge_Bay">Cambridge Bay</option>
+          <option value="America/Campo_Grande">Campo Grande</option>
+          <option value="America/Cancun">Cancun</option>
+          <option value="America/Caracas">Caracas</option>
+          <option value="America/Catamarca">Catamarca</option>
+          <option value="America/Cayenne">Cayenne</option>
+          <option value="America/Cayman">Cayman</option>
+          <option value="America/Chicago">Chicago</option>
+          <option value="America/Chihuahua">Chihuahua</option>
+          <option value="America/Coral_Harbour">Coral Harbour</option>
+          <option value="America/Cordoba">Cordoba</option>
+          <option value="America/Costa_Rica">Costa Rica</option>
+          <option value="America/Cuiaba">Cuiaba</option>
+          <option value="America/Curacao">Curacao</option>
+          <option value="America/Danmarkshavn">Danmarkshavn</option>
+          <option value="America/Dawson">Dawson</option>
+          <option value="America/Dawson_Creek">Dawson Creek</option>
+          <option value="America/Denver">Denver</option>
+          <option value="America/Detroit">Detroit</option>
+          <option value="America/Dominica">Dominica</option>
+          <option value="America/Edmonton">Edmonton</option>
+          <option value="America/Eirunepe">Eirunepe</option>
+          <option value="America/El_Salvador">El Salvador</option>
+          <option value="America/Ensenada">Ensenada</option>
+          <option value="America/Fort_Wayne">Fort Wayne</option>
+          <option value="America/Fortaleza">Fortaleza</option>
+          <option value="America/Glace_Bay">Glace Bay</option>
+          <option value="America/Godthab">Godthab</option>
+          <option value="America/Goose_Bay">Goose Bay</option>
+          <option value="America/Grand_Turk">Grand Turk</option>
+          <option value="America/Grenada">Grenada</option>
+          <option value="America/Guadeloupe">Guadeloupe</option>
+          <option value="America/Guatemala">Guatemala</option>
+          <option value="America/Guayaquil">Guayaquil</option>
+          <option value="America/Guyana">Guyana</option>
+          <option value="America/Halifax">Halifax</option>
+          <option value="America/Havana">Havana</option>
+          <option value="America/Hermosillo">Hermosillo</option>
+          <option value="America/Indiana/Indianapolis">Indianapolis, IN</option>
+          <option value="America/Indiana/Knox">Knox, IN</option>
+          <option value="America/Indiana/Marengo">Marengo, IN</option>
+          <option value="America/Indiana/Petersburg">Petersburg, IN</option>
+          <option value="America/Indiana/Tell_City">Tell City, IN</option>
+          <option value="America/Indiana/Vevay">Vevay, IN</option>
+          <option value="America/Indiana/Vincennes">Vincennes, IN</option>
+          <option value="America/Indiana/Winamac">Winamac, IN</option>
+          <option value="America/Indianapolis">Indianapolis</option>
+          <option value="America/Inuvik">Inuvik</option>
+          <option value="America/Iqaluit">Iqaluit</option>
+          <option value="America/Jamaica">Jamaica</option>
+          <option value="America/Jujuy">Jujuy</option>
+          <option value="America/Juneau">Juneau</option>
+          <option value="America/Kentucky/Louisville">Louisville, KY</option>
+          <option value="America/Kentucky/Monticello">Monticello, KY</option>
+          <option value="America/Knox_IN">Knox, IN</option>
+          <option value="America/Kralendijk">Kralendijk</option>
+          <option value="America/La_Paz">La Paz</option>
+          <option value="America/Lima">Lima</option>
+          <option value="America/Los_Angeles">Los Angeles</option>
+          <option value="America/Louisville">Louisville</option>
+          <option value="America/Lower_Princes">Lower Princes</option>
+          <option value="America/Maceio">Maceio</option>
+          <option value="America/Managua">Managua</option>
+          <option value="America/Manaus">Manaus</option>
+          <option value="America/Marigot">Marigot</option>
+          <option value="America/Martinique">Martinique</option>
+          <option value="America/Matamoros">Matamoros</option>
+          <option value="America/Mazatlan">Mazatlan</option>
+          <option value="America/Mendoza">Mendoza</option>
+          <option value="America/Menominee">Menominee</option>
+          <option value="America/Merida">Merida</option>
+          <option value="America/Metlakatla">Metlakatla</option>
+          <option value="America/Mexico_City">Mexico City</option>
+          <option value="America/Miquelon">Miquelon</option>
+          <option value="America/Moncton">Moncton</option>
+          <option value="America/Monterrey">Monterrey</option>
+          <option value="America/Montevideo">Montevideo</option>
+          <option value="America/Montreal">Montreal</option>
+          <option value="America/Montserrat">Montserrat</option>
+          <option value="America/Nassau">Nassau</option>
+          <option value="America/New_York">New York</option>
+          <option value="America/Nipigon">Nipigon</option>
+          <option value="America/Nome">Nome</option>
+          <option value="America/Noronha">Noronha</option>
+          <option value="America/North_Dakota/Beulah">Beulah, ND</option>
+          <option value="America/North_Dakota/Center">North Dakota (Center)</option>
+          <option value="America/North_Dakota/New_Salem">New Salem, ND</option>
+          <option value="America/Ojinaga">Ojinaga</option>
+          <option value="America/Panama">Panama</option>
+          <option value="America/Pangnirtung">Pangnirtung</option>
+          <option value="America/Paramaribo">Paramaribo</option>
+          <option value="America/Phoenix">Phoenix</option>
+          <option value="America/Port-au-Prince">Port-au-Prince</option>
+          <option value="America/Port_of_Spain">Port of Spain</option>
+          <option value="America/Porto_Acre">Porto Acre</option>
+          <option value="America/Porto_Velho">Porto Velho</option>
+          <option value="America/Puerto_Rico">Puerto Rico</option>
+          <option value="America/Rainy_River">Rainy River</option>
+          <option value="America/Rankin_Inlet">Rankin Inlet</option>
+          <option value="America/Recife">Recife</option>
+          <option value="America/Regina">Regina</option>
+          <option value="America/Resolute">Resolute</option>
+          <option value="America/Rio_Branco">Rio Branco</option>
+          <option value="America/Rosario">Rosario</option>
+          <option value="America/Santa_Isabel">Santa Isabel</option>
+          <option value="America/Santarem">Santarem</option>
+          <option value="America/Santiago">Santiago</option>
+          <option value="America/Santo_Domingo">Santo Domingo</option>
+          <option value="America/Sao_Paulo">Sao_Paulo</option>
+          <option value="America/Scoresbysund">Scoresbysund</option>
+          <option value="America/Shiprock">Shiprock</option>
+          <option value="America/Sitka">Sitka</option>
+          <option value="America/St_Barthelemy">St Barthelemy</option>
+          <option value="America/St_Johns">St Johns</option>
+          <option value="America/St_Kitts">St Kitts</option>
+          <option value="America/St_Lucia">St Lucia</option>
+          <option value="America/St_Thomas">St Thomas</option>
+          <option value="America/St_Vincent">St Vincent</option>
+          <option value="America/Swift_Current">Swift Current</option>
+          <option value="America/Tegucigalpa">Tegucigalpa</option>
+          <option value="America/Thule">Thule</option>
+          <option value="America/Thunder_Bay">Thunder Bay</option>
+          <option value="America/Tijuana">Tijuana</option>
+          <option value="America/Toronto">Toronto</option>
+          <option value="America/Tortola">Tortola</option>
+          <option value="America/Vancouver">Vancouver</option>
+          <option value="America/Virgin">Virgin</option>
+          <option value="America/Whitehorse">Whitehorse</option>
+          <option value="America/Winnipeg">Winnipeg</option>
+          <option value="America/Yakutat">Yakutat</option>
+          <option value="America/Yellowknife">Yellowknife</option>
+        </optgroup>
+        <optgroup label="<?php echo $this->__('Atlantic')?>">
+          <option value="Atlantic/Azores">Azores</option>
+          <option value="Atlantic/Bermuda">Bermuda</option>
+          <option value="Atlantic/Canary">Canary</option>
+          <option value="Atlantic/Cape_Verde">Cape Verde</option>
+          <option value="Atlantic/Faeroe">Faeroe</option>
+          <option value="Atlantic/Faroe">Faroe</option>
+          <option value="Atlantic/Jan_Mayen">Jan Mayen</option>
+          <option value="Atlantic/Madeira">Madeira</option>
+          <option value="Atlantic/Reykjavik">Reykjavik</option>
+          <option value="Atlantic/South_Georgia">South Georgia</option>
+          <option value="Atlantic/St_Helena">St Helena</option>
+          <option value="Atlantic/Stanley">Stanley</option>
+        </optgroup>
+        <optgroup label="<?php echo $this->__('Asia')?>">
+          <option value="Asia/Aden">Aden</option>
+          <option value="Asia/Almaty">Almaty</option>
+          <option value="Asia/Amman">Amman</option>
+          <option value="Asia/Anadyr">Anadyr</option>
+          <option value="Asia/Aqtau">Aqtau</option>
+          <option value="Asia/Aqtobe">Aqtobe</option>
+          <option value="Asia/Ashgabat">Ashgabat</option>
+          <option value="Asia/Ashkhabad">Ashkhabad</option>
+          <option value="Asia/Baghdad">Baghdad</option>
+          <option value="Asia/Bahrain">Bahrain</option>
+          <option value="Asia/Baku">Baku</option>
+          <option value="Asia/Bangkok">Bangkok</option>
+          <option value="Asia/Beirut">Beirut</option>
+          <option value="Asia/Bishkek">Bishkek</option>
+          <option value="Asia/Brunei">Brunei</option>
+          <option value="Asia/Calcutta">Calcutta</option>
+          <option value="Asia/Choibalsan">Choibalsan</option>
+          <option value="Asia/Chongqing">Chongqing</option>
+          <option value="Asia/Chungking">Chungking</option>
+          <option value="Asia/Colombo">Colombo</option>
+          <option value="Asia/Dacca">Dacca</option>
+          <option value="Asia/Damascus">Damascus</option>
+          <option value="Asia/Dhaka">Dhaka</option>
+          <option value="Asia/Dili">Dili</option>
+          <option value="Asia/Dubai">Dubai</option>
+          <option value="Asia/Dushanbe">Dushanbe</option>
+          <option value="Asia/Gaza">Gaza</option>
+          <option value="Asia/Harbin">Harbin</option>
+          <option value="Asia/Hebron">Hebron</option>
+          <option value="Asia/Ho_Chi_Minh">Ho Chi Minh</option>
+          <option value="Asia/Hong_Kong">Hong Kong</option>
+          <option value="Asia/Hovd">Hovd</option>
+          <option value="Asia/Irkutsk">Irkutsk</option>
+          <option value="Asia/Istanbul">Istanbul</option>
+          <option value="Asia/Jakarta">Jakarta</option>
+          <option value="Asia/Jayapura">Jayapura</option>
+          <option value="Asia/Jerusalem">Jerusalem</option>
+          <option value="Asia/Kabul">Kabul</option>
+          <option value="Asia/Kamchatka">Kamchatka</option>
+          <option value="Asia/Karachi">Karachi</option>
+          <option value="Asia/Kashgar">Kashgar</option>
+          <option value="Asia/Kathmandu">Kathmandu</option>
+          <option value="Asia/Katmandu">Katmandu</option>
+          <option value="Asia/Kolkata">Kolkata</option>
+          <option value="Asia/Krasnoyarsk">Krasnoyarsk</option>
+          <option value="Asia/Kuala_Lumpur">Kuala Lumpur</option>
+          <option value="Asia/Kuching">Kuching</option>
+          <option value="Asia/Kuwait">Kuwait</option>
+          <option value="Asia/Macao">Macao</option>
+          <option value="Asia/Macau">Macau</option>
+          <option value="Asia/Magadan">Magadan</option>
+          <option value="Asia/Makassar">Makassar</option>
+          <option value="Asia/Manila">Manila</option>
+          <option value="Asia/Muscat">Muscat</option>
+          <option value="Asia/Nicosia">Nicosia</option>
+          <option value="Asia/Novokuznetsk">Novokuznetsk</option>
+          <option value="Asia/Novosibirsk">Novosibirsk</option>
+          <option value="Asia/Omsk">Omsk</option>
+          <option value="Asia/Oral">Oral</option>
+          <option value="Asia/Phnom_Penh">Phnom Penh</option>
+          <option value="Asia/Pontianak">Pontianak</option>
+          <option value="Asia/Pyongyang">Pyongyang</option>
+          <option value="Asia/Qatar">Qatar</option>
+          <option value="Asia/Qyzylorda">Qyzylorda</option>
+          <option value="Asia/Rangoon">Rangoon</option>
+          <option value="Asia/Riyadh">Riyadh</option>
+          <option value="Asia/Saigon">Saigon</option>
+          <option value="Asia/Sakhalin">Sakhalin</option>
+          <option value="Asia/Samarkand">Samarkand</option>
+          <option value="Asia/Seoul">Seoul</option>
+          <option value="Asia/Shanghai">Shanghai</option>
+          <option value="Asia/Singapore">Singapore</option>
+          <option value="Asia/Taipei">Taipei</option>
+          <option value="Asia/Tashkent">Tashkent</option>
+          <option value="Asia/Tbilisi">Tbilisi</option>
+          <option value="Asia/Tehran">Tehran</option>
+          <option value="Asia/Tel_Aviv">Tel Aviv</option>
+          <option value="Asia/Thimbu">Thimbu</option>
+          <option value="Asia/Thimphu">Thimphu</option>
+          <option value="Asia/Tokyo">Tokyo</option>
+          <option value="Asia/Ujung_Pandang">Ujung Pandang</option>
+          <option value="Asia/Ulaanbaatar">Ulaanbaatar</option>
+          <option value="Asia/Ulan_Bator">Ulan Bator</option>
+          <option value="Asia/Urumqi">Urumqi</option>
+          <option value="Asia/Vientiane">Vientiane</option>
+          <option value="Asia/Vladivostok">Vladivostok</option>
+          <option value="Asia/Yakutsk">Yakutsk</option>
+          <option value="Asia/Yekaterinburg">Yekaterinburg</option>
+          <option value="Asia/Yerevan">Yerevan</option>
+          <option value="Indian/Antananarivo">Antananarivo</option>
+          <option value="Indian/Chagos">Chagos</option>
+          <option value="Indian/Christmas">Christmas</option>
+          <option value="Indian/Cocos">Cocos</option>
+          <option value="Indian/Comoro">Comoro</option>
+          <option value="Indian/Kerguelen">Kerguelen</option>
+          <option value="Indian/Mahe">Mahe</option>
+          <option value="Indian/Maldives">Maldives</option>
+          <option value="Indian/Mauritius">Mauritius</option>
+          <option value="Indian/Mayotte">Mayotte</option>
+          <option value="Indian/Reunion">Reunion</option>
+        </optgroup>
+        <optgroup label="<?php echo $this->__('Europe')?>">
+          <option value="Europe/Paris" selected="selected">Paris</option>
+          <option value="Europe/Amsterdam">Amsterdam</option>
+          <option value="Europe/Andorra">Andorra</option>
+          <option value="Europe/Athens">Athens</option>
+          <option value="Europe/Belfast">Belfast</option>
+          <option value="Europe/Belgrade">Belgrade</option>
+          <option value="Europe/Berlin">Berlin</option>
+          <option value="Europe/Bratislava">Bratislava</option>
+          <option value="Europe/Brussels">Brussels</option>
+          <option value="Europe/Bucharest">Bucharest</option>
+          <option value="Europe/Budapest">Budapest</option>
+          <option value="Europe/Chisinau">Chisinau</option>
+          <option value="Europe/Copenhagen">Copenhagen</option>
+          <option value="Europe/Dublin">Dublin</option>
+          <option value="Europe/Gibraltar">Gibraltar</option>
+          <option value="Europe/Guernsey">Guernsey</option>
+          <option value="Europe/Helsinki">Helsinki</option>
+          <option value="Europe/Isle_of_Man">Isle of Man</option>
+          <option value="Europe/Istanbul">Istanbul</option>
+          <option value="Europe/Jersey">Jersey</option>
+          <option value="Europe/Kaliningrad">Kaliningrad</option>
+          <option value="Europe/Kiev">Kiev</option>
+          <option value="Europe/Lisbon">Lisbon</option>
+          <option value="Europe/Ljubljana">Ljubljana</option>
+          <option value="Europe/London">London</option>
+          <option value="Europe/Luxembourg">Luxembourg</option>
+          <option value="Europe/Madrid">Madrid</option>
+          <option value="Europe/Malta">Malta</option>
+          <option value="Europe/Mariehamn">Mariehamn</option>
+          <option value="Europe/Minsk">Minsk</option>
+          <option value="Europe/Monaco">Monaco</option>
+          <option value="Europe/Moscow">Moscow</option>
+          <option value="Europe/Nicosia">Nicosia</option>
+          <option value="Europe/Oslo">Oslo</option>
+          <option value="Europe/Podgorica">Podgorica</option>
+          <option value="Europe/Prague">Prague</option>
+          <option value="Europe/Riga">Riga</option>
+          <option value="Europe/Rome">Rome</option>
+          <option value="Europe/Samara">Paris</option>
+          <option value="Europe/San_Marino">San Marino</option>
+          <option value="Europe/Sarajevo">Sarajevo</option>
+          <option value="Europe/Simferopol">Simferopol</option>
+          <option value="Europe/Skopje">Skopje</option>
+          <option value="Europe/Sofia">Sofia</option>
+          <option value="Europe/Stockholm">Stockholm</option>
+          <option value="Europe/Tallinn">Tallinn</option>
+          <option value="Europe/Tirane">Tirane</option>
+          <option value="Europe/Tiraspol">Tiraspol</option>
+          <option value="Europe/Uzhgorod">Uzhgorod</option>
+          <option value="Europe/Vaduz">Vaduz</option>
+          <option value="Europe/Vatican">Vatican</option>
+          <option value="Europe/Vienna">Vienna</option>
+          <option value="Europe/Vilnius">Vilnius</option>
+          <option value="Europe/Volgograd">Volgograd</option>
+          <option value="Europe/Warsaw">Warsaw</option>
+          <option value="Europe/Zagreb">Zagreb</option>
+          <option value="Europe/Zaporozhye">Zaporozhye</option>
+          <option value="Europe/Zurich">Zurich</option>
+        </optgroup>
+        <optgroup label="<?php echo $this->__('Pacific')?>">
+          <option value="Australia/Adelaide">Adelaide (Australia)</option>
+          <option value="Australia/Brisbane">Brisbane (Australia)</option>
+          <option value="Australia/Broken_Hill">Broken_Hill (Australia)</option>
+          <option value="Australia/Canberra">Canberra (Australia)</option>
+          <option value="Australia/Currie">Currie (Australia)</option>
+          <option value="Australia/Darwin">Darwin (Australia)</option>
+          <option value="Australia/Eucla">Eucla (Australia)</option>
+          <option value="Australia/Hobart">Hobart (Australia)</option>
+          <option value="Australia/Lindeman">Lindeman (Australia)</option>
+          <option value="Australia/Lord_Howe">Lord Howe (Australia)</option>
+          <option value="Australia/Melbourne">Melbourne (Australia)</option>
+          <option value="Australia/Perth">Perth (Australia)</option>
+          <option value="Australia/Queensland">Queensland (Australia)</option>
+          <option value="Australia/Sydney">Sydney (Australia)</option>
+          <option value="Australia/Tasmania">Tasmania (Australia)</option>
+          <option value="Australia/Victoria">Victoria (Australia)</option>
+          <option value="Australia/Yancowinna">Yancowinna (Australia)</option>
+          <option value="Pacific/Apia">Apia</option>
+          <option value="Pacific/Auckland">Auckland</option>
+          <option value="Pacific/Chatham">Chatham</option>
+          <option value="Pacific/Chuuk">Chuuk</option>
+          <option value="Pacific/Easter">Easter</option>
+          <option value="Pacific/Efate">Efate</option>
+          <option value="Pacific/Enderbury">Enderbury</option>
+          <option value="Pacific/Fakaofo">Fakaofo</option>
+          <option value="Pacific/Fiji">Fiji</option>
+          <option value="Pacific/Funafuti">Funafuti</option>
+          <option value="Pacific/Galapagos">Galapagos</option>
+          <option value="Pacific/Gambier">Gambier</option>
+          <option value="Pacific/Guadalcanal">Guadalcanal</option>
+          <option value="Pacific/Guam">Guam</option>
+          <option value="Pacific/Honolulu">Honolulu</option>
+          <option value="Pacific/Johnston">Johnston</option>
+          <option value="Pacific/Kiritimati">Kiritimati</option>
+          <option value="Pacific/Kosrae">Kosrae</option>
+          <option value="Pacific/Kwajalein">Kwajalein</option>
+          <option value="Pacific/Majuro">Majuro</option>
+          <option value="Pacific/Marquesas">Marquesas</option>
+          <option value="Pacific/Midway">Midway</option>
+          <option value="Pacific/Nauru">Nauru</option>
+          <option value="Pacific/Niue">Niue</option>
+          <option value="Pacific/Norfolk">Norfolk</option>
+          <option value="Pacific/Noumea">Noumea</option>
+          <option value="Pacific/Pago_Pago">Pago Pago</option>
+          <option value="Pacific/Palau">Palau</option>
+          <option value="Pacific/Pitcairn">Pitcairn</option>
+          <option value="Pacific/Pohnpei">Pohnpei</option>
+          <option value="Pacific/Ponape">Ponape</option>
+          <option value="Pacific/Port_Moresby">Port Moresby</option>
+          <option value="Pacific/Rarotonga">Rarotonga</option>
+          <option value="Pacific/Saipan">Saipan</option>
+          <option value="Pacific/Samoa">Samoa</option>
+          <option value="Pacific/Tahiti">Tahiti</option>
+          <option value="Pacific/Tarawa">Tarawa</option>
+          <option value="Pacific/Tongatapu">Tongatapu</option>
+          <option value="Pacific/Truk">Truk</option>
+          <option value="Pacific/Wake">Wake</option>
+          <option value="Pacific/Wallis">Wallis</option>
+          <option value="Pacific/Yap">Yap</option>
+        </optgroup>
+      </select>
+    </p>
     <p><input type="submit" value="<?php echo $this->__('Next step')?>" /></p>
   </form>
 </div>

config.php.default

@@ -11,14 +11,27 @@
             'timezone' => 'Europe/Paris'
             ),
         'database' => array(
-            'engine' => 'mysql',
+            'default' => array(
-            'options' => array(
+                'engine' => 'mysql',
-                'hostname' => 'localhost',
+                'options' => array(
-                'username' => 'root',
+                    ),
-                'password' => '',
+                'params' => array(
-                'database' => 'db_xnova'
+                     'hostname' => 'localhost',
+                     'username' => 'root',
+                     'password' => '',
+                     'database' => 'db_wootook'
+                     ),
+                'table_prefix' => 'wtk_',
+                 ),
+            'core_setup' => array(
+                'use' => 'default'
+                ),
+            'core_read' => array(
+                'use' => 'default'
+                ),
+            'core_write' => array(
+                'use' => 'default'
                 ),
-            'table_prefix' => 'game_',
             ),
         'layout' => array(
             'page'   => 'page.php',
@@ -30,6 +43,9 @@
             'fr_FR' => 'fr_FR',
             'en'    => 'en_US',
             'en_US' => 'en_US'
+            'es'    => 'es_SP',
+            'es_SP' => 'es_SP',
+            'es_AR' => 'es_AR'
             )
         )
     );

includes/constants.php

@@ -30,12 +30,14 @@
 
 defined('E_USER_DEPRECATED') || define('E_USER_DEPRECATED', E_USER_WARNING); // Defined in PHP 5.3 core
 
-define('ADMINEMAIL', "moderation@wootook.org");
+define('ADMINEMAIL', "no-reply@wootook.org");
 
 // Definition du monde connu !
-define('MAX_GALAXY_IN_WORLD', 3);
+defined('MAX_GALAXY_IN_WORLD')  || define('MAX_GALAXY_IN_WORLD', Wootook::getConfig('default/engine/universe/galaxies'));
-define('MAX_SYSTEM_IN_GALAXY', 100);
+defined('MAX_SYSTEM_IN_GALAXY') || define('MAX_SYSTEM_IN_GALAXY', Wootook::getConfig('default/engine/universe/systems'));
-define('MAX_PLANET_IN_SYSTEM', 50);
+defined('MAX_PLANET_IN_SYSTEM') || define('MAX_PLANET_IN_SYSTEM', Wootook::getConfig('default/engine/universe/positions'));
+
+defined('BCNUMBERS') || define('BCNUMBERS', Wootook::getConfig('default/engine/core/use_large_numbers'));
 
 /**
  * User level constants
@@ -49,7 +51,7 @@ define('LEVEL_PLAYER', 0);
  * }}}
  */
 
-define('ALLOW_SPY_DRONE_ATTACKS', true);
+define('ALLOW_SPY_DRONE_ATTACKS', Wootook::getConfig('default/engine/combat/allow_spy_drone_attacks'));
 
 // Nombre de colones pour les rapports d'espionnage
 define('SPY_REPORT_ROW', 2);

includes/functions/MissionCaseAttack.php

@@ -40,425 +40,412 @@ function MissionCaseAttack($FleetRow)
     $resource = Wootook_Empire_Model_Game_FieldsAlias::getSingleton();
     $CombatCaps = Wootook_Empire_Model_Game_Combat::getSingleton();
 
-    if ($FleetRow['fleet_start_time'] <= time()) {
+    if ($FleetRow['fleet_mess'] == 0 && $FleetRow['fleet_start_time'] <= time()) {
-        if ($FleetRow['fleet_mess'] == 0) {
+
-            if (!isset($CombatCaps[Legacies_Empire::ID_SHIP_LIGHT_TRANSPORT]['sd'])) {
-                message("<font color=\"red\">" . $lang['sys_no_vars'] . "</font>", $lang['sys_error'], "fleet.php", 2);
-            }
 // refactored parts
 // {{{
-            $planetCollection = new Wootook_Core_Collection(array('planet' => 'planets'), 'Wootook_Empire_Model_Planet');
+        $targetPlanet = Wootook_Empire_Model_Planet::factoryFromCoords(array(
-            $planetCollection
+            'galaxy' => $FleetRow['fleet_end_galaxy'],
-                ->where('galaxy=:galaxy')
+            'system' => $FleetRow['fleet_end_system'],
-                ->where('system=:system')
+            'planet' => $FleetRow['fleet_end_planet'],
-                ->where('planet=:planet')
+            'type'   => $FleetRow['fleet_end_type']
-                ->where('planet_type=:type')
+            ));
-                ->limit(1)
-                ->load(array(
-                    'galaxy' => $FleetRow['fleet_end_galaxy'],
-                    'system' => $FleetRow['fleet_end_system'],
-                    'planet' => $FleetRow['fleet_end_planet'],
-                    'type'   => $FleetRow['fleet_end_type']
-                    ))
-            ;
-            $TargetPlanet = $planetCollection->current();
 
-            /*
+        /*
-             * Update planet resources and constructions
+         * Update planet resources and constructions
-             */
+         */
-            Wootook::dispatchEvent('planet.update', array(
+        Wootook::dispatchEvent('planet.update', array(
-                'planet' => $TargetPlanet
+            'planet' => $targetPlanet
-                ));
+            ));
-            $TargetPlanet->save();
+        $targetPlanet->save();
 
-            $TargetUser = $TargetPlanet->getUser();
+        $TargetUser = $targetPlanet->getUser();
-            $CurrentUser = Wootook_Empire_Model_User::factory($FleetRow['fleet_owner']);
+        $CurrentUser = Wootook_Empire_Model_User::factory($FleetRow['fleet_owner']);
 
-            $TargetUserID = $TargetUser->getId();
+        $TargetUserID = $TargetUser->getId();
-            $CurrentUserID = $CurrentUser->getId();
+        $CurrentUserID = $CurrentUser->getId();
 
-            $TargetTechno = array(
+        $TargetTechno = array(
-                'military_tech' => $TargetUser->getData('military_tech'),
+            'military_tech' => $TargetUser->getData('military_tech'),
-                'defence_tech'  => $TargetUser->getData('defence_tech'),
+            'defence_tech'  => $TargetUser->getData('defence_tech'),
-                'shield_tech'   => $TargetUser->getData('shield_tech')
+            'shield_tech'   => $TargetUser->getData('shield_tech')
-                );
+            );
 
-            $CurrentTechno = array(
+        $CurrentTechno = array(
-                'military_tech' => $CurrentUser->getData('military_tech'),
+            'military_tech' => $CurrentUser->getData('military_tech'),
-                'defence_tech'  => $CurrentUser->getData('defence_tech'),
+            'defence_tech'  => $CurrentUser->getData('defence_tech'),
-                'shield_tech'   => $CurrentUser->getData('shield_tech')
+            'shield_tech'   => $CurrentUser->getData('shield_tech')
-                );
+            );
 // }}}
-            for ($SetItem = 200; $SetItem < 500; $SetItem++) {
+        for ($SetItem = 200; $SetItem < 500; $SetItem++) {
-                if ($TargetPlanet[$resource[$SetItem]] > 0) {
+            if ($targetPlanet[$resource[$SetItem]] > 0) {
-                    $TargetSet[$SetItem]['count'] = $TargetPlanet[$resource[$SetItem]];
+                $TargetSet[$SetItem]['count'] = $targetPlanet[$resource[$SetItem]];
+            }
+        }
+
+        $TheFleet = explode(";", $FleetRow['fleet_array']);
+        foreach($TheFleet as $a => $b) {
+            if ($b != '') {
+                $a = explode(",", $b);
+                $CurrentSet[$a[0]]['count'] = $a[1];
+            }
+        }
+
+        include_once($xnova_root_path . 'includes/ataki.' . PHPEXT);
+        // Calcul de la duree de traitement (initialisation)
+        $mtime = microtime();
+        $mtime = explode(" ", $mtime);
+        $mtime = $mtime[1] + $mtime[0];
+        $starttime = $mtime;
+
+        $walka = walka($CurrentSet, $TargetSet, $CurrentTechno, $TargetTechno);
+        // Calcul de la duree de traitement (calcul)
+        $mtime = microtime();
+        $mtime = explode(" ", $mtime);
+        $mtime = $mtime[1] + $mtime[0];
+        $endtime = $mtime;
+        $totaltime = ($endtime - $starttime);
+        // Ce qu'il reste de l'attaquant
+        $CurrentSet = $walka["atakujacy"];
+        // Ce qu'il reste de l'attaqué
+        $TargetSet = $walka["wrog"];
+        // Le resultat de la bataille
+        $FleetResult = $walka["wygrana"];
+        // Rapport long (rapport de bataille detaillé)
+        $dane_do_rw = $walka["dane_do_rw"];
+        // Rapport court (cdr + unitées perdues)
+        $zlom = $walka["zlom"];
+
+        $FleetArray = "";
+        $FleetAmount = 0;
+        $FleetStorage = 0;
+        foreach ($CurrentSet as $Ship => $Count) {
+            $FleetStorage += $pricelist[$Ship]["capacity"] * $Count['count'];
+            $FleetArray .= $Ship . "," . $Count['count'] . ";";
+            $FleetAmount += $Count['count'];
+        }
+        // Au cas ou le p'tit rigolo qu'a envoyé la flotte y avait mis des ressources ...
+        $FleetStorage -= $FleetRow["fleet_resource_metal"];
+        $FleetStorage -= $FleetRow["fleet_resource_crystal"];
+        $FleetStorage -= $FleetRow["fleet_resource_deuterium"];
+
+        $targetPlanetUpd = "";
+        if (!is_null($TargetSet)) {
+            foreach($TargetSet as $Ship => $Count) {
+                $targetPlanetUpd .= "`" . $resource[$Ship] . "` = '" . $Count['count'] . "', ";
+            }
+        }
+        // Determination des ressources pillées
+        $Mining['metal'] = 0;
+        $Mining['crystal'] = 0;
+        $Mining['deuter'] = 0;
+        if ($FleetResult == "a") {
+            if ($FleetStorage > 0) {
+                $metal = $targetPlanet['metal'] / 2;
+                $crystal = $targetPlanet['crystal'] / 2;
+                $deuter = $targetPlanet["deuterium"] / 2;
+                if (($metal) > $FleetStorage / 3) {
+                    $Mining['metal'] = $FleetStorage / 3;
+                    $FleetStorage = $FleetStorage - $Mining['metal'];
+                } else {
+                    $Mining['metal'] = $metal;
+                    $FleetStorage = $FleetStorage - $Mining['metal'];
+                }
+
+                if (($crystal) > $FleetStorage / 2) {
+                    $Mining['crystal'] = $FleetStorage / 2;
+                    $FleetStorage = $FleetStorage - $Mining['crystal'];
+                } else {
+                    $Mining['crystal'] = $crystal;
+                    $FleetStorage = $FleetStorage - $Mining['crystal'];
+                }
+
+                if (($deuter) > $FleetStorage) {
+                    $Mining['deuter'] = $FleetStorage;
+                    $FleetStorage = $FleetStorage - $Mining['deuter'];
+                } else {
+                    $Mining['deuter'] = $deuter;
+                    $FleetStorage = $FleetStorage - $Mining['deuter'];
                 }
             }
+        }
+        $Mining['metal'] = round($Mining['metal']);
+        $Mining['crystal'] = round($Mining['crystal']);
+        $Mining['deuter'] = round($Mining['deuter']);
+        // Mise a jour de l'enregistrement de la planete attaquée
+        $QryUpdateTarget = "UPDATE {{table}} SET ";
+        $QryUpdateTarget .= $targetPlanetUpd;
+        $QryUpdateTarget .= "`metal` = `metal` - '" . $Mining['metal'] . "', ";
+        $QryUpdateTarget .= "`crystal` = `crystal` - '" . $Mining['crystal'] . "', ";
+        $QryUpdateTarget .= "`deuterium` = `deuterium` - '" . $Mining['deuter'] . "' ";
+        $QryUpdateTarget .= "WHERE ";
+        $QryUpdateTarget .= "`galaxy` = '" . $FleetRow['fleet_end_galaxy'] . "' AND ";
+        $QryUpdateTarget .= "`system` = '" . $FleetRow['fleet_end_system'] . "' AND ";
+        $QryUpdateTarget .= "`planet` = '" . $FleetRow['fleet_end_planet'] . "' AND ";
+        $QryUpdateTarget .= "`planet_type` = '" . $FleetRow['fleet_end_type'] . "' ";
+        $QryUpdateTarget .= "LIMIT 1;";
+        doquery($QryUpdateTarget , 'planets');
+        // Mise a jour du champ de ruine devant la planete attaquée
+        $QryUpdateGalaxy = "UPDATE {{table}} SET ";
+        $QryUpdateGalaxy .= "`metal` = `metal` + '" . $zlom['metal'] . "', ";
+        $QryUpdateGalaxy .= "`crystal` = `crystal` + '" . $zlom['crystal'] . "' ";
+        $QryUpdateGalaxy .= "WHERE ";
+        $QryUpdateGalaxy .= "`galaxy` = '" . $FleetRow['fleet_end_galaxy'] . "' AND ";
+        $QryUpdateGalaxy .= "`system` = '" . $FleetRow['fleet_end_system'] . "' AND ";
+        $QryUpdateGalaxy .= "`planet` = '" . $FleetRow['fleet_end_planet'] . "' ";
+        $QryUpdateGalaxy .= "LIMIT 1;";
+        doquery($QryUpdateGalaxy , 'galaxy');
+        // Là on va discuter le bout de gras pour voir s'il y a moyen d'avoir une Lune !
+        $FleetDebris = $zlom['metal'] + $zlom['crystal'];
+        $StrAttackerUnits = sprintf ($lang['sys_attacker_lostunits'], pretty_number ($zlom["atakujacy"]));
+        $StrDefenderUnits = sprintf ($lang['sys_defender_lostunits'], pretty_number ($zlom["wrog"]));
+        $StrRuins = sprintf ($lang['sys_gcdrunits'], pretty_number ($zlom["metal"]), $lang['Metal'], pretty_number ($zlom['crystal']), $lang['Crystal']);
+        $DebrisField = $StrAttackerUnits . "<br />" . $StrDefenderUnits . "<br />" . $StrRuins;
+        $MoonChance = $FleetDebris / 100000;
+        if ($FleetDebris > 2000000) {
+            $MoonChance = 20;
+        }
+        if ($FleetDebris < 100000) {
+            $UserChance = 0;
+            $ChanceMoon = "";
+        } elseif ($FleetDebris >= 100000) {
+            $UserChance = mt_rand(1, 100);
+            $ChanceMoon = sprintf ($lang['sys_moonproba'], $MoonChance);
+        }
 
-            $TheFleet = explode(";", $FleetRow['fleet_array']);
+        if (($UserChance > 0) and ($UserChance <= $MoonChance) and $galenemyrow['id_luna'] == 0) {
-            foreach($TheFleet as $a => $b) {
+            $targetPlanetName = CreateOneMoonRecord ($FleetRow['fleet_end_galaxy'], $FleetRow['fleet_end_system'], $FleetRow['fleet_end_planet'], $TargetUserID, $FleetRow['fleet_start_time'], '', $MoonChance);
+            $GottenMoon = sprintf ($lang['sys_moonbuilt'], $targetPlanetName, $FleetRow['fleet_end_galaxy'], $FleetRow['fleet_end_system'], $FleetRow['fleet_end_planet']);
+        } elseif ($UserChance = 0 or $UserChance > $MoonChance) {
+            $GottenMoon = "";
+        }
+
+        $AttackDate = date("r", $FleetRow["fleet_start_time"]);
+        $title = sprintf ($lang['sys_attack_title'], $AttackDate);
+        $raport = "<center><table><tr><td>" . $title . "<br />";
+        $zniszczony = false;
+        $a_zestrzelona = 0;
+        $AttackTechon['A'] = $CurrentTechno["military_tech"] * 10;
+        $AttackTechon['B'] = $CurrentTechno["defence_tech"] * 10;
+        $AttackTechon['C'] = $CurrentTechno["shield_tech"] * 10;
+        $AttackerData = sprintf ($lang['sys_attack_attacker_pos'], $CurrentUser["username"], $FleetRow['fleet_start_galaxy'], $FleetRow['fleet_start_system'], $FleetRow['fleet_start_planet']);
+        $AttackerTech = sprintf ($lang['sys_attack_techologies'], $AttackTechon['A'], $AttackTechon['B'], $AttackTechon['C']);
+
+        $DefendTechon['A'] = $TargetTechno["military_tech"] * 10;
+        $DefendTechon['B'] = $TargetTechno["defence_tech"] * 10;
+        $DefendTechon['C'] = $TargetTechno["shield_tech"] * 10;
+        $DefenderData = sprintf ($lang['sys_attack_defender_pos'], $TargetUser["username"], $FleetRow['fleet_end_galaxy'], $FleetRow['fleet_end_system'], $FleetRow['fleet_end_planet']);
+        $DefenderTech = sprintf ($lang['sys_attack_techologies'], $DefendTechon['A'], $DefendTechon['B'], $DefendTechon['C']);
+
+        foreach ($dane_do_rw as $a => $b) {
+            $raport .= "<table border=1 width=100%><tr><th><br /><center>" . $AttackerData . "<br />" . $AttackerTech . "<table border=1>";
+            if ($b["atakujacy"]['count'] > 0) {
+                $raport1 = "<tr><th>" . $lang['sys_ship_type'] . "</th>";
+                $raport2 = "<tr><th>" . $lang['sys_ship_count'] . "</th>";
+                $raport3 = "<tr><th>" . $lang['sys_ship_weapon'] . "</th>";
+                $raport4 = "<tr><th>" . $lang['sys_ship_shield'] . "</th>";
+                $raport5 = "<tr><th>" . $lang['sys_ship_armour'] . "</th>";
+                foreach ($b["atakujacy"] as $Ship => $Data) {
+                    if (is_numeric($Ship)) {
+                        if ($Data['count'] > 0) {
+                            $raport1 .= "<th>" . $lang["tech_rc"][$Ship] . "</th>";
+                            $raport2 .= "<th>" . pretty_number ($Data['count']) . "</th>";
+                            $raport3 .= "<th>" . pretty_number (round($Data["atak"] / $Data['count'])) . "</th>";
+                            $raport4 .= "<th>" . pretty_number (round($Data["tarcza"] / $Data['count'])) . "</th>";
+                            $raport5 .= "<th>" . pretty_number (round($Data["obrona"] / $Data['count'])) . "</th>";
+                        }
+                    }
+                }
+                $raport1 .= "</tr>";
+                $raport2 .= "</tr>";
+                $raport3 .= "</tr>";
+                $raport4 .= "</tr>";
+                $raport5 .= "</tr>";
+                $raport .= $raport1 . $raport2 . $raport3 . $raport4 . $raport5;
+            } else {
+                if ($a == 2) {
+                    $a_zestrzelona = 1;
+                }
+                $zniszczony = true;
+                $raport .= "<br />" . $lang['sys_destroyed'];
+            }
+
+            $raport .= "</table></center></th></tr></table>";
+            $raport .= "<table border=1 width=100%><tr><th><br /><center>" . $DefenderData . "<br />" . $DefenderTech . "<table border=1>";
+            if ($b["wrog"]['count'] > 0) {
+                $raport1 = "<tr><th>" . $lang['sys_ship_type'] . "</th>";
+                $raport2 = "<tr><th>" . $lang['sys_ship_count'] . "</th>";
+                $raport3 = "<tr><th>" . $lang['sys_ship_weapon'] . "</th>";
+                $raport4 = "<tr><th>" . $lang['sys_ship_shield'] . "</th>";
+                $raport5 = "<tr><th>" . $lang['sys_ship_armour'] . "</th>";
+                foreach ($b["wrog"] as $Ship => $Data) {
+                    if (is_numeric($Ship)) {
+                        if ($Data['count'] > 0) {
+                            $raport1 .= "<th>" . $lang["tech_rc"][$Ship] . "</th>";
+                            $raport2 .= "<th>" . pretty_number ($Data['count']) . "</th>";
+                            $raport3 .= "<th>" . pretty_number (round($Data["atak"] / $Data['count'])) . "</th>";
+                            $raport4 .= "<th>" . pretty_number (round($Data["tarcza"] / $Data['count'])) . "</th>";
+                            $raport5 .= "<th>" . pretty_number (round($Data["obrona"] / $Data['count'])) . "</th>";
+                        }
+                    }
+                }
+                $raport1 .= "</tr>";
+                $raport2 .= "</tr>";
+                $raport3 .= "</tr>";
+                $raport4 .= "</tr>";
+                $raport5 .= "</tr>";
+                $raport .= $raport1 . $raport2 . $raport3 . $raport4 . $raport5;
+            } else {
+                $zniszczony = true;
+                $raport .= "<br />" . $lang['sys_destroyed'];
+            }
+            $raport .= "</table></center></th></tr></table>";
+
+            if (($zniszczony == false) and !($a == 8)) {
+                $AttackWaveStat = sprintf ($lang['sys_attack_attack_wave'], pretty_number (floor($b["atakujacy"]["atak"])), pretty_number (floor($b["wrog"]["tarcza"])));
+                $DefendWavaStat = sprintf ($lang['sys_attack_defend_wave'], pretty_number (floor($b["wrog"]["atak"])), pretty_number (floor($b["atakujacy"]["tarcza"])));
+                $raport .= "<br /><center>" . $AttackWaveStat . "<br />" . $DefendWavaStat . "</center>";
+            }
+        }
+        switch ($FleetResult) {
+            case "a":
+                $Pillage = sprintf ($lang['sys_stealed_ressources'], pretty_number ($Mining['metal']), $lang['metal'], pretty_number ($Mining['crystal']), $lang['crystal'], pretty_number ($Mining['deuter']), $lang['Deuterium']);
+                $raport .= $lang['sys_attacker_won'] . "<br />" . $Pillage . "<br />";
+                $raport .= $DebrisField . "<br />";
+                $raport .= $ChanceMoon . "<br />";
+                $raport .= $GottenMoon . "<br />";
+                break;
+            case "r":
+                $raport .= $lang['sys_both_won'] . "<br />";
+                $raport .= $DebrisField . "<br />";
+                $raport .= $ChanceMoon . "<br />";
+                $raport .= $GottenMoon . "<br />";
+                break;
+            case "w":
+                $raport .= $lang['sys_defender_won'] . "<br />";
+                $raport .= $DebrisField . "<br />";
+                $raport .= $ChanceMoon . "<br />";
+                $raport .= $GottenMoon . "<br />";
+                doquery("DELETE FROM {{table}} WHERE `fleet_id` = '" . $FleetRow["fleet_id"] . "';", 'fleets');
+                break;
+            default:
+                break;
+        }
+        $SimMessage = sprintf ($lang['sys_rapport_build_time'], $totaltime);
+        $raport .= $SimMessage . "</table>";
+
+        $rid = md5($raport);
+        $QryInsertRapport = "INSERT INTO {{table}} SET ";
+        $QryInsertRapport .= "`time` = UNIX_TIMESTAMP(), ";
+        $QryInsertRapport .= "`id_owner1` = '" . $FleetRow['fleet_owner'] . "', ";
+        $QryInsertRapport .= "`id_owner2` = '" . $TargetUserID . "', ";
+        $QryInsertRapport .= "`rid` = '" . $rid . "', ";
+        $QryInsertRapport .= "`a_zestrzelona` = '" . $a_zestrzelona . "', ";
+        $QryInsertRapport .= "`raport` = '" . addslashes ($raport) . "';";
+        doquery($QryInsertRapport , 'rw');
+        // Colorisation du résumé de rapport pour l'attaquant
+        $raport = "<a href # OnClick=\"f( 'rw.php?raport=" . $rid . "', '');\" >";
+        $raport .= "<center>";
+        if ($FleetResult == "a") {
+            $raport .= "<font color=\"green\">";
+        } elseif ($FleetResult == "r") {
+            $raport .= "<font color=\"orange\">";
+        } elseif ($FleetResult == "w") {
+            $raport .= "<font color=\"red\">";
+        }
+        $raport .= $lang['sys_mess_attack_report'] . " [" . $FleetRow['fleet_end_galaxy'] . ":" . $FleetRow['fleet_end_system'] . ":" . $FleetRow['fleet_end_planet'] . "] </font></a><br /><br />";
+        $raport .= "<font color=\"red\">" . $lang['sys_perte_attaquant'] . ": " . pretty_number ($zlom["atakujacy"]) . "</font>";
+        $raport .= "<font color=\"green\">   " . $lang['sys_perte_defenseur'] . ":" . pretty_number ($zlom["wrog"]) . "</font><br />" ;
+        $raport .= $lang['sys_gain'] . " " . $lang['Metal'] . ":<font color=\"#adaead\">" . pretty_number ($Mining['metal']) . "</font>   " . $lang['Crystal'] . ":<font color=\"#ef51ef\">" . pretty_number ($Mining['crystal']) . "</font>   " . $lang['Deuterium'] . ":<font color=\"#f77542\">" . pretty_number ($Mining['deuter']) . "</font><br />";
+        $raport .= $lang['sys_debris'] . " " . $lang['Metal'] . ":<font color=\"#adaead\">" . pretty_number ($zlom['metal']) . "</font>   " . $lang['Crystal'] . ":<font color=\"#ef51ef\">" . pretty_number ($zlom['crystal']) . "</font><br /></center>";
+
+        $Mining['metal'] = $Mining['metal'] + $FleetRow["fleet_resource_metal"];
+        $Mining['crystal'] = $Mining['crystal'] + $FleetRow["fleet_resource_crystal"];
+        $Mining['deuter'] = $Mining['deuter'] + $FleetRow["fleet_resource_deuterium"];
+
+        $QryUpdateFleet = "UPDATE {{table}} SET ";
+        $QryUpdateFleet .= "`fleet_amount` = '" . $FleetAmount . "', ";
+        $QryUpdateFleet .= "`fleet_array` = '" . $FleetArray . "', ";
+        $QryUpdateFleet .= "`fleet_mess` = '1', ";
+        $QryUpdateFleet .= "`fleet_resource_metal` = '" . $Mining['metal'] . "', ";
+        $QryUpdateFleet .= "`fleet_resource_crystal` = '" . $Mining['crystal'] . "', ";
+        $QryUpdateFleet .= "`fleet_resource_deuterium` = '" . $Mining['deuter'] . "' ";
+        $QryUpdateFleet .= "WHERE fleet_id = '" . $FleetRow['fleet_id'] . "' ";
+        $QryUpdateFleet .= "LIMIT 1 ;";
+        doquery($QryUpdateFleet , 'fleets');
+
+        SendSimpleMessage ($CurrentUserID, '', $FleetRow['fleet_start_time'], 3, $lang['sys_mess_tower'], $lang['sys_mess_attack_report'], $raport);
+        // Ajout du petit point raideur
+        $AddPoint = $CurrentUser['xpraid'] + 1;
+
+        $QryUpdateOfficier = "UPDATE {{table}} SET ";
+        $QryUpdateOfficier .= "`xpraid` = '" . $AddPoint . "' ";
+        $QryUpdateOfficier .= "WHERE id = '" . $CurrentUserID . "' ";
+        $QryUpdateOfficier .= "LIMIT 1 ;";
+        doquery($QryUpdateOfficier, 'users');
+        // Ajout d'un point au compteur de raids
+        $RaidsTotal = $CurrentUser['raids'] + 1;
+        if ($FleetResult == "a") {
+            $RaidsWin = $CurrentUser['raidswin'] + 1;
+            $QryUpdateRaidsCompteur = "UPDATE {{table}} SET ";
+            $QryUpdateRaidsCompteur .= "`raidswin` ='" . $RaidsWin . "', ";
+            $QryUpdateRaidsCompteur .= "`raids` ='" . $RaidsTotal . "' ";
+            $QryUpdateRaidsCompteur .= "WHERE id = '" . $CurrentUserID . "' ";
+            $QryUpdateRaidsCompteur .= "LIMIT 1 ;";
+            doquery($QryUpdateRaidsCompteur, 'users');
+        } elseif ($FleetResult == "r" || $FleetResult == "w") {
+            $RaidsLoose = $CurrentUser['raidsloose'] + 1;
+            $QryUpdateRaidsCompteur = "UPDATE {{table}} SET ";
+            $QryUpdateRaidsCompteur .= "`raidswin` ='" . $RaidsLoose . "', ";
+            $QryUpdateRaidsCompteur .= "`raids` ='" . $RaidsTotal . "' ";
+            $QryUpdateRaidsCompteur .= "WHERE id = '" . $CurrentUserID . "' ";
+            $QryUpdateRaidsCompteur .= "LIMIT 1 ;";
+            doquery($QryUpdateRaidsCompteur, 'users');
+        }
+        // Colorisation du résumé de rapport pour l'attaquant
+        $raport2 = "<a href # OnClick=\"f( 'rw.php?raport=" . $rid . "', '');\" >";
+        $raport2 .= "<center>";
+        if ($FleetResult == "a") {
+            $raport2 .= "<font color=\"green\">";
+        } elseif ($FleetResult == "r") {
+            $raport2 .= "<font color=\"orange\">";
+        } elseif ($FleetResult == "w") {
+            $raport2 .= "<font color=\"red\">";
+        }
+        $raport2 .= $lang['sys_mess_attack_report'] . " [" . $FleetRow['fleet_end_galaxy'] . ":" . $FleetRow['fleet_end_system'] . ":" . $FleetRow['fleet_end_planet'] . "] </font></a><br /><br />";
+
+        SendSimpleMessage ($TargetUserID, '', $FleetRow['fleet_start_time'], 3, $lang['sys_mess_tower'], $lang['sys_mess_attack_report'], $raport2);
+    }
+// Retour de flotte (s'il en reste)
+    $fquery = "";
+    if ($FleetRow['fleet_end_time'] <= time()) {
+        if (!is_null($CurrentSet)) {
+            foreach($CurrentSet as $Ship => $Count) {
+                $fquery .= "`" . $resource[$Ship] . "` = `" . $resource[$Ship] . "` + '" . $Count['count'] . "', ";
+            }
+        } else {
+            $fleet = explode(";", $FleetRow['fleet_array']);
+            foreach($fleet as $a => $b) {
                 if ($b != '') {
                     $a = explode(",", $b);
-                    $CurrentSet[$a[0]]['count'] = $a[1];
+                    $fquery .= "{$resource[$a[0]]}={$resource[$a[0]]} + {$a[1]}, \n";
                 }
             }
-
-            include_once($xnova_root_path . 'includes/ataki.' . PHPEXT);
-            // Calcul de la duree de traitement (initialisation)
-            $mtime = microtime();
-            $mtime = explode(" ", $mtime);
-            $mtime = $mtime[1] + $mtime[0];
-            $starttime = $mtime;
-
-            $walka = walka($CurrentSet, $TargetSet, $CurrentTechno, $TargetTechno);
-            // Calcul de la duree de traitement (calcul)
-            $mtime = microtime();
-            $mtime = explode(" ", $mtime);
-            $mtime = $mtime[1] + $mtime[0];
-            $endtime = $mtime;
-            $totaltime = ($endtime - $starttime);
-            // Ce qu'il reste de l'attaquant
-            $CurrentSet = $walka["atakujacy"];
-            // Ce qu'il reste de l'attaqué
-            $TargetSet = $walka["wrog"];
-            // Le resultat de la bataille
-            $FleetResult = $walka["wygrana"];
-            // Rapport long (rapport de bataille detaillé)
-            $dane_do_rw = $walka["dane_do_rw"];
-            // Rapport court (cdr + unitées perdues)
-            $zlom = $walka["zlom"];
-
-            $FleetArray = "";
-            $FleetAmount = 0;
-            $FleetStorage = 0;
-            foreach ($CurrentSet as $Ship => $Count) {
-                $FleetStorage += $pricelist[$Ship]["capacity"] * $Count['count'];
-                $FleetArray .= $Ship . "," . $Count['count'] . ";";
-                $FleetAmount += $Count['count'];
-            }
-            // Au cas ou le p'tit rigolo qu'a envoyé la flotte y avait mis des ressources ...
-            $FleetStorage -= $FleetRow["fleet_resource_metal"];
-            $FleetStorage -= $FleetRow["fleet_resource_crystal"];
-            $FleetStorage -= $FleetRow["fleet_resource_deuterium"];
-
-            $TargetPlanetUpd = "";
-            if (!is_null($TargetSet)) {
-                foreach($TargetSet as $Ship => $Count) {
-                    $TargetPlanetUpd .= "`" . $resource[$Ship] . "` = '" . $Count['count'] . "', ";
-                }
-            }
-            // Determination des ressources pillées
-            $Mining['metal'] = 0;
-            $Mining['crystal'] = 0;
-            $Mining['deuter'] = 0;
-            if ($FleetResult == "a") {
-                if ($FleetStorage > 0) {
-                    $metal = $TargetPlanet['metal'] / 2;
-                    $crystal = $TargetPlanet['crystal'] / 2;
-                    $deuter = $TargetPlanet["deuterium"] / 2;
-                    if (($metal) > $FleetStorage / 3) {
-                        $Mining['metal'] = $FleetStorage / 3;
-                        $FleetStorage = $FleetStorage - $Mining['metal'];
-                    } else {
-                        $Mining['metal'] = $metal;
-                        $FleetStorage = $FleetStorage - $Mining['metal'];
-                    }
-
-                    if (($crystal) > $FleetStorage / 2) {
-                        $Mining['crystal'] = $FleetStorage / 2;
-                        $FleetStorage = $FleetStorage - $Mining['crystal'];
-                    } else {
-                        $Mining['crystal'] = $crystal;
-                        $FleetStorage = $FleetStorage - $Mining['crystal'];
-                    }
-
-                    if (($deuter) > $FleetStorage) {
-                        $Mining['deuter'] = $FleetStorage;
-                        $FleetStorage = $FleetStorage - $Mining['deuter'];
-                    } else {
-                        $Mining['deuter'] = $deuter;
-                        $FleetStorage = $FleetStorage - $Mining['deuter'];
-                    }
-                }
-            }
-            $Mining['metal'] = round($Mining['metal']);
-            $Mining['crystal'] = round($Mining['crystal']);
-            $Mining['deuter'] = round($Mining['deuter']);
-            // Mise a jour de l'enregistrement de la planete attaquée
-            $QryUpdateTarget = "UPDATE {{table}} SET ";
-            $QryUpdateTarget .= $TargetPlanetUpd;
-            $QryUpdateTarget .= "`metal` = `metal` - '" . $Mining['metal'] . "', ";
-            $QryUpdateTarget .= "`crystal` = `crystal` - '" . $Mining['crystal'] . "', ";
-            $QryUpdateTarget .= "`deuterium` = `deuterium` - '" . $Mining['deuter'] . "' ";
-            $QryUpdateTarget .= "WHERE ";
-            $QryUpdateTarget .= "`galaxy` = '" . $FleetRow['fleet_end_galaxy'] . "' AND ";
-            $QryUpdateTarget .= "`system` = '" . $FleetRow['fleet_end_system'] . "' AND ";
-            $QryUpdateTarget .= "`planet` = '" . $FleetRow['fleet_end_planet'] . "' AND ";
-            $QryUpdateTarget .= "`planet_type` = '" . $FleetRow['fleet_end_type'] . "' ";
-            $QryUpdateTarget .= "LIMIT 1;";
-            doquery($QryUpdateTarget , 'planets');
-            // Mise a jour du champ de ruine devant la planete attaquée
-            $QryUpdateGalaxy = "UPDATE {{table}} SET ";
-            $QryUpdateGalaxy .= "`metal` = `metal` + '" . $zlom['metal'] . "', ";
-            $QryUpdateGalaxy .= "`crystal` = `crystal` + '" . $zlom['crystal'] . "' ";
-            $QryUpdateGalaxy .= "WHERE ";
-            $QryUpdateGalaxy .= "`galaxy` = '" . $FleetRow['fleet_end_galaxy'] . "' AND ";
-            $QryUpdateGalaxy .= "`system` = '" . $FleetRow['fleet_end_system'] . "' AND ";
-            $QryUpdateGalaxy .= "`planet` = '" . $FleetRow['fleet_end_planet'] . "' ";
-            $QryUpdateGalaxy .= "LIMIT 1;";
-            doquery($QryUpdateGalaxy , 'galaxy');
-            // Là on va discuter le bout de gras pour voir s'il y a moyen d'avoir une Lune !
-            $FleetDebris = $zlom['metal'] + $zlom['crystal'];
-            $StrAttackerUnits = sprintf ($lang['sys_attacker_lostunits'], pretty_number ($zlom["atakujacy"]));
-            $StrDefenderUnits = sprintf ($lang['sys_defender_lostunits'], pretty_number ($zlom["wrog"]));
-            $StrRuins = sprintf ($lang['sys_gcdrunits'], pretty_number ($zlom["metal"]), $lang['Metal'], pretty_number ($zlom['crystal']), $lang['Crystal']);
-            $DebrisField = $StrAttackerUnits . "<br />" . $StrDefenderUnits . "<br />" . $StrRuins;
-            $MoonChance = $FleetDebris / 100000;
-            if ($FleetDebris > 2000000) {
-                $MoonChance = 20;
-            }
-            if ($FleetDebris < 100000) {
-                $UserChance = 0;
-                $ChanceMoon = "";
-            } elseif ($FleetDebris >= 100000) {
-                $UserChance = mt_rand(1, 100);
-                $ChanceMoon = sprintf ($lang['sys_moonproba'], $MoonChance);
-            }
-
-            if (($UserChance > 0) and ($UserChance <= $MoonChance) and $galenemyrow['id_luna'] == 0) {
-                $TargetPlanetName = CreateOneMoonRecord ($FleetRow['fleet_end_galaxy'], $FleetRow['fleet_end_system'], $FleetRow['fleet_end_planet'], $TargetUserID, $FleetRow['fleet_start_time'], '', $MoonChance);
-                $GottenMoon = sprintf ($lang['sys_moonbuilt'], $TargetPlanetName, $FleetRow['fleet_end_galaxy'], $FleetRow['fleet_end_system'], $FleetRow['fleet_end_planet']);
-            } elseif ($UserChance = 0 or $UserChance > $MoonChance) {
-                $GottenMoon = "";
-            }
-
-            $AttackDate = date("r", $FleetRow["fleet_start_time"]);
-            $title = sprintf ($lang['sys_attack_title'], $AttackDate);
-            $raport = "<center><table><tr><td>" . $title . "<br />";
-            $zniszczony = false;
-            $a_zestrzelona = 0;
-            $AttackTechon['A'] = $CurrentTechno["military_tech"] * 10;
-            $AttackTechon['B'] = $CurrentTechno["defence_tech"] * 10;
-            $AttackTechon['C'] = $CurrentTechno["shield_tech"] * 10;
-            $AttackerData = sprintf ($lang['sys_attack_attacker_pos'], $CurrentUser["username"], $FleetRow['fleet_start_galaxy'], $FleetRow['fleet_start_system'], $FleetRow['fleet_start_planet']);
-            $AttackerTech = sprintf ($lang['sys_attack_techologies'], $AttackTechon['A'], $AttackTechon['B'], $AttackTechon['C']);
-
-            $DefendTechon['A'] = $TargetTechno["military_tech"] * 10;
-            $DefendTechon['B'] = $TargetTechno["defence_tech"] * 10;
-            $DefendTechon['C'] = $TargetTechno["shield_tech"] * 10;
-            $DefenderData = sprintf ($lang['sys_attack_defender_pos'], $TargetUser["username"], $FleetRow['fleet_end_galaxy'], $FleetRow['fleet_end_system'], $FleetRow['fleet_end_planet']);
-            $DefenderTech = sprintf ($lang['sys_attack_techologies'], $DefendTechon['A'], $DefendTechon['B'], $DefendTechon['C']);
-
-            foreach ($dane_do_rw as $a => $b) {
-                $raport .= "<table border=1 width=100%><tr><th><br /><center>" . $AttackerData . "<br />" . $AttackerTech . "<table border=1>";
-                if ($b["atakujacy"]['count'] > 0) {
-                    $raport1 = "<tr><th>" . $lang['sys_ship_type'] . "</th>";
-                    $raport2 = "<tr><th>" . $lang['sys_ship_count'] . "</th>";
-                    $raport3 = "<tr><th>" . $lang['sys_ship_weapon'] . "</th>";
-                    $raport4 = "<tr><th>" . $lang['sys_ship_shield'] . "</th>";
-                    $raport5 = "<tr><th>" . $lang['sys_ship_armour'] . "</th>";
-                    foreach ($b["atakujacy"] as $Ship => $Data) {
-                        if (is_numeric($Ship)) {
-                            if ($Data['count'] > 0) {
-                                $raport1 .= "<th>" . $lang["tech_rc"][$Ship] . "</th>";
-                                $raport2 .= "<th>" . pretty_number ($Data['count']) . "</th>";
-                                $raport3 .= "<th>" . pretty_number (round($Data["atak"] / $Data['count'])) . "</th>";
-                                $raport4 .= "<th>" . pretty_number (round($Data["tarcza"] / $Data['count'])) . "</th>";
-                                $raport5 .= "<th>" . pretty_number (round($Data["obrona"] / $Data['count'])) . "</th>";
-                            }
-                        }
-                    }
-                    $raport1 .= "</tr>";
-                    $raport2 .= "</tr>";
-                    $raport3 .= "</tr>";
-                    $raport4 .= "</tr>";
-                    $raport5 .= "</tr>";
-                    $raport .= $raport1 . $raport2 . $raport3 . $raport4 . $raport5;
-                } else {
-                    if ($a == 2) {
-                        $a_zestrzelona = 1;
-                    }
-                    $zniszczony = true;
-                    $raport .= "<br />" . $lang['sys_destroyed'];
-                }
-
-                $raport .= "</table></center></th></tr></table>";
-                $raport .= "<table border=1 width=100%><tr><th><br /><center>" . $DefenderData . "<br />" . $DefenderTech . "<table border=1>";
-                if ($b["wrog"]['count'] > 0) {
-                    $raport1 = "<tr><th>" . $lang['sys_ship_type'] . "</th>";
-                    $raport2 = "<tr><th>" . $lang['sys_ship_count'] . "</th>";
-                    $raport3 = "<tr><th>" . $lang['sys_ship_weapon'] . "</th>";
-                    $raport4 = "<tr><th>" . $lang['sys_ship_shield'] . "</th>";
-                    $raport5 = "<tr><th>" . $lang['sys_ship_armour'] . "</th>";
-                    foreach ($b["wrog"] as $Ship => $Data) {
-                        if (is_numeric($Ship)) {
-                            if ($Data['count'] > 0) {
-                                $raport1 .= "<th>" . $lang["tech_rc"][$Ship] . "</th>";
-                                $raport2 .= "<th>" . pretty_number ($Data['count']) . "</th>";
-                                $raport3 .= "<th>" . pretty_number (round($Data["atak"] / $Data['count'])) . "</th>";
-                                $raport4 .= "<th>" . pretty_number (round($Data["tarcza"] / $Data['count'])) . "</th>";
-                                $raport5 .= "<th>" . pretty_number (round($Data["obrona"] / $Data['count'])) . "</th>";
-                            }
-                        }
-                    }
-                    $raport1 .= "</tr>";
-                    $raport2 .= "</tr>";
-                    $raport3 .= "</tr>";
-                    $raport4 .= "</tr>";
-                    $raport5 .= "</tr>";
-                    $raport .= $raport1 . $raport2 . $raport3 . $raport4 . $raport5;
-                } else {
-                    $zniszczony = true;
-                    $raport .= "<br />" . $lang['sys_destroyed'];
-                }
-                $raport .= "</table></center></th></tr></table>";
-
-                if (($zniszczony == false) and !($a == 8)) {
-                    $AttackWaveStat = sprintf ($lang['sys_attack_attack_wave'], pretty_number (floor($b["atakujacy"]["atak"])), pretty_number (floor($b["wrog"]["tarcza"])));
-                    $DefendWavaStat = sprintf ($lang['sys_attack_defend_wave'], pretty_number (floor($b["wrog"]["atak"])), pretty_number (floor($b["atakujacy"]["tarcza"])));
-                    $raport .= "<br /><center>" . $AttackWaveStat . "<br />" . $DefendWavaStat . "</center>";
-                }
-            }
-            switch ($FleetResult) {
-                case "a":
-                    $Pillage = sprintf ($lang['sys_stealed_ressources'], pretty_number ($Mining['metal']), $lang['metal'], pretty_number ($Mining['crystal']), $lang['crystal'], pretty_number ($Mining['deuter']), $lang['Deuterium']);
-                    $raport .= $lang['sys_attacker_won'] . "<br />" . $Pillage . "<br />";
-                    $raport .= $DebrisField . "<br />";
-                    $raport .= $ChanceMoon . "<br />";
-                    $raport .= $GottenMoon . "<br />";
-                    break;
-                case "r":
-                    $raport .= $lang['sys_both_won'] . "<br />";
-                    $raport .= $DebrisField . "<br />";
-                    $raport .= $ChanceMoon . "<br />";
-                    $raport .= $GottenMoon . "<br />";
-                    break;
-                case "w":
-                    $raport .= $lang['sys_defender_won'] . "<br />";
-                    $raport .= $DebrisField . "<br />";
-                    $raport .= $ChanceMoon . "<br />";
-                    $raport .= $GottenMoon . "<br />";
-                    doquery("DELETE FROM {{table}} WHERE `fleet_id` = '" . $FleetRow["fleet_id"] . "';", 'fleets');
-                    break;
-                default:
-                    break;
-            }
-            $SimMessage = sprintf ($lang['sys_rapport_build_time'], $totaltime);
-            $raport .= $SimMessage . "</table>";
-
-            $rid = md5($raport);
-            $QryInsertRapport = "INSERT INTO {{table}} SET ";
-            $QryInsertRapport .= "`time` = UNIX_TIMESTAMP(), ";
-            $QryInsertRapport .= "`id_owner1` = '" . $FleetRow['fleet_owner'] . "', ";
-            $QryInsertRapport .= "`id_owner2` = '" . $TargetUserID . "', ";
-            $QryInsertRapport .= "`rid` = '" . $rid . "', ";
-            $QryInsertRapport .= "`a_zestrzelona` = '" . $a_zestrzelona . "', ";
-            $QryInsertRapport .= "`raport` = '" . addslashes ($raport) . "';";
-            doquery($QryInsertRapport , 'rw');
-            // Colorisation du résumé de rapport pour l'attaquant
-            $raport = "<a href # OnClick=\"f( 'rw.php?raport=" . $rid . "', '');\" >";
-            $raport .= "<center>";
-            if ($FleetResult == "a") {
-                $raport .= "<font color=\"green\">";
-            } elseif ($FleetResult == "r") {
-                $raport .= "<font color=\"orange\">";
-            } elseif ($FleetResult == "w") {
-                $raport .= "<font color=\"red\">";
-            }
-            $raport .= $lang['sys_mess_attack_report'] . " [" . $FleetRow['fleet_end_galaxy'] . ":" . $FleetRow['fleet_end_system'] . ":" . $FleetRow['fleet_end_planet'] . "] </font></a><br /><br />";
-            $raport .= "<font color=\"red\">" . $lang['sys_perte_attaquant'] . ": " . pretty_number ($zlom["atakujacy"]) . "</font>";
-            $raport .= "<font color=\"green\">   " . $lang['sys_perte_defenseur'] . ":" . pretty_number ($zlom["wrog"]) . "</font><br />" ;
-            $raport .= $lang['sys_gain'] . " " . $lang['Metal'] . ":<font color=\"#adaead\">" . pretty_number ($Mining['metal']) . "</font>   " . $lang['Crystal'] . ":<font color=\"#ef51ef\">" . pretty_number ($Mining['crystal']) . "</font>   " . $lang['Deuterium'] . ":<font color=\"#f77542\">" . pretty_number ($Mining['deuter']) . "</font><br />";
-            $raport .= $lang['sys_debris'] . " " . $lang['Metal'] . ":<font color=\"#adaead\">" . pretty_number ($zlom['metal']) . "</font>   " . $lang['Crystal'] . ":<font color=\"#ef51ef\">" . pretty_number ($zlom['crystal']) . "</font><br /></center>";
-
-            $Mining['metal'] = $Mining['metal'] + $FleetRow["fleet_resource_metal"];
-            $Mining['crystal'] = $Mining['crystal'] + $FleetRow["fleet_resource_crystal"];
-            $Mining['deuter'] = $Mining['deuter'] + $FleetRow["fleet_resource_deuterium"];
-
-            $QryUpdateFleet = "UPDATE {{table}} SET ";
-            $QryUpdateFleet .= "`fleet_amount` = '" . $FleetAmount . "', ";
-            $QryUpdateFleet .= "`fleet_array` = '" . $FleetArray . "', ";
-            $QryUpdateFleet .= "`fleet_mess` = '1', ";
-            $QryUpdateFleet .= "`fleet_resource_metal` = '" . $Mining['metal'] . "', ";
-            $QryUpdateFleet .= "`fleet_resource_crystal` = '" . $Mining['crystal'] . "', ";
-            $QryUpdateFleet .= "`fleet_resource_deuterium` = '" . $Mining['deuter'] . "' ";
-            $QryUpdateFleet .= "WHERE fleet_id = '" . $FleetRow['fleet_id'] . "' ";
-            $QryUpdateFleet .= "LIMIT 1 ;";
-            doquery($QryUpdateFleet , 'fleets');
-
-            SendSimpleMessage ($CurrentUserID, '', $FleetRow['fleet_start_time'], 3, $lang['sys_mess_tower'], $lang['sys_mess_attack_report'], $raport);
-            // Ajout du petit point raideur
-            $AddPoint = $CurrentUser['xpraid'] + 1;
-
-            $QryUpdateOfficier = "UPDATE {{table}} SET ";
-            $QryUpdateOfficier .= "`xpraid` = '" . $AddPoint . "' ";
-            $QryUpdateOfficier .= "WHERE id = '" . $CurrentUserID . "' ";
-            $QryUpdateOfficier .= "LIMIT 1 ;";
-            doquery($QryUpdateOfficier, 'users');
-            // Ajout d'un point au compteur de raids
-            $RaidsTotal = $CurrentUser['raids'] + 1;
-            if ($FleetResult == "a") {
-                $RaidsWin = $CurrentUser['raidswin'] + 1;
-                $QryUpdateRaidsCompteur = "UPDATE {{table}} SET ";
-                $QryUpdateRaidsCompteur .= "`raidswin` ='" . $RaidsWin . "', ";
-                $QryUpdateRaidsCompteur .= "`raids` ='" . $RaidsTotal . "' ";
-                $QryUpdateRaidsCompteur .= "WHERE id = '" . $CurrentUserID . "' ";
-                $QryUpdateRaidsCompteur .= "LIMIT 1 ;";
-                doquery($QryUpdateRaidsCompteur, 'users');
-            } elseif ($FleetResult == "r" || $FleetResult == "w") {
-                $RaidsLoose = $CurrentUser['raidsloose'] + 1;
-                $QryUpdateRaidsCompteur = "UPDATE {{table}} SET ";
-                $QryUpdateRaidsCompteur .= "`raidswin` ='" . $RaidsLoose . "', ";
-                $QryUpdateRaidsCompteur .= "`raids` ='" . $RaidsTotal . "' ";
-                $QryUpdateRaidsCompteur .= "WHERE id = '" . $CurrentUserID . "' ";
-                $QryUpdateRaidsCompteur .= "LIMIT 1 ;";
-                doquery($QryUpdateRaidsCompteur, 'users');
-            }
-            // Colorisation du résumé de rapport pour l'attaquant
-            $raport2 = "<a href # OnClick=\"f( 'rw.php?raport=" . $rid . "', '');\" >";
-            $raport2 .= "<center>";
-            if ($FleetResult == "a") {
-                $raport2 .= "<font color=\"green\">";
-            } elseif ($FleetResult == "r") {
-                $raport2 .= "<font color=\"orange\">";
-            } elseif ($FleetResult == "w") {
-                $raport2 .= "<font color=\"red\">";
-            }
-            $raport2 .= $lang['sys_mess_attack_report'] . " [" . $FleetRow['fleet_end_galaxy'] . ":" . $FleetRow['fleet_end_system'] . ":" . $FleetRow['fleet_end_planet'] . "] </font></a><br /><br />";
-
-            SendSimpleMessage ($TargetUserID, '', $FleetRow['fleet_start_time'], 3, $lang['sys_mess_tower'], $lang['sys_mess_attack_report'], $raport2);
         }
-        // Retour de flotte (s'il en reste)
-        $fquery = "";
-        if ($FleetRow['fleet_end_time'] <= time()) {
-            if (!is_null($CurrentSet)) {
-                foreach($CurrentSet as $Ship => $Count) {
-                    $fquery .= "`" . $resource[$Ship] . "` = `" . $resource[$Ship] . "` + '" . $Count['count'] . "', ";
-                }
-            } else {
-                $fleet = explode(";", $FleetRow['fleet_array']);
-                foreach($fleet as $a => $b) {
-                    if ($b != '') {
-                        $a = explode(",", $b);
-                        $fquery .= "{$resource[$a[0]]}={$resource[$a[0]]} + {$a[1]}, \n";
-                    }
-                }
-            }
 
-            doquery ("DELETE FROM {{table}} WHERE `fleet_id` = " . $FleetRow["fleet_id"], 'fleets');
+        doquery ("DELETE FROM {{table}} WHERE `fleet_id` = " . $FleetRow["fleet_id"], 'fleets');
-            if (!($FleetResult == "w")) {
+        if (!($FleetResult == "w")) {
-                $QryUpdatePlanet = "UPDATE {{table}} SET ";
+            $QryUpdatePlanet = "UPDATE {{table}} SET ";
-                $QryUpdatePlanet .= $fquery;
+            $QryUpdatePlanet .= $fquery;
-                $QryUpdatePlanet .= "`metal` = `metal` + " . $FleetRow['fleet_resource_metal'] . ", ";
+            $QryUpdatePlanet .= "`metal` = `metal` + " . $FleetRow['fleet_resource_metal'] . ", ";
-                $QryUpdatePlanet .= "`crystal` = `crystal` + " . $FleetRow['fleet_resource_crystal'] . ", ";
+            $QryUpdatePlanet .= "`crystal` = `crystal` + " . $FleetRow['fleet_resource_crystal'] . ", ";
-                $QryUpdatePlanet .= "`deuterium` = `deuterium` + " . $FleetRow['fleet_resource_deuterium'] . " ";
+            $QryUpdatePlanet .= "`deuterium` = `deuterium` + " . $FleetRow['fleet_resource_deuterium'] . " ";
-                $QryUpdatePlanet .= "WHERE ";
+            $QryUpdatePlanet .= "WHERE ";
-                $QryUpdatePlanet .= "`galaxy` = " . $FleetRow['fleet_start_galaxy'] . " AND ";
+            $QryUpdatePlanet .= "`galaxy` = " . $FleetRow['fleet_start_galaxy'] . " AND ";
-                $QryUpdatePlanet .= "`system` = " . $FleetRow['fleet_start_system'] . " AND ";
+            $QryUpdatePlanet .= "`system` = " . $FleetRow['fleet_start_system'] . " AND ";
-                $QryUpdatePlanet .= "`planet` = " . $FleetRow['fleet_start_planet'] . " AND ";
+            $QryUpdatePlanet .= "`planet` = " . $FleetRow['fleet_start_planet'] . " AND ";
-                $QryUpdatePlanet .= "`planet_type` = " . $FleetRow['fleet_start_type'] . " LIMIT 1 ;";
+            $QryUpdatePlanet .= "`planet_type` = " . $FleetRow['fleet_start_type'] . " LIMIT 1 ;";
-                doquery($QryUpdatePlanet, 'planets');
+            doquery($QryUpdatePlanet, 'planets');
-            }
         }
     }
 }

install/index.php

@@ -34,8 +34,8 @@ define('IN_INSTALL', true);
 
 define('STEP_SYSTEM',   1);
 define('STEP_DATABASE', 2);
-define('STEP_PROFILE',  3);
+define('STEP_UNIVERSE', 3);
-define('STEP_UNIVERSE', 4);
+define('STEP_PROFILE',  4);
 define('STEP_CONFIG',   5);
 
 require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php';
@@ -80,8 +80,7 @@ case 'intro':
     break;
 
 case 'install':
-    $session->addError('Test %s', 'Hello world!');
+    if ($step > $session->getData('step')) {
-    if ($step != $session->getData('step')) {
         $session->setData('step', 0);
         $response->setRedirect("?mode=intro", Wootook_Core_Controller_Response_Http::REDIRECT_TEMPORARY);
         $response->sendHeaders();
@@ -92,26 +91,52 @@ case 'install':
     case STEP_SYSTEM:
         if ($request->isPost()) {
             $form = new Wootook_Core_Form($session, array(
-                'url_path' => 'text'
+                'url_path'      => 'text',
+                'timezone'      => 'text'
                 ));
-            $form->addField('url_path');
             $form->setRequest($request);
             $form->populate();
 
             if (!$form->validate()) {
-                $session->setData('step', $step);
+                $session->setData('step', STEP_SYSTEM);
                 $session->setFormData($form->getData());
-                var_dump($session);
+                $response->setRedirect(Wootook::getUrl('install/index.php', array('mode' => 'install', 'step' => STEP_SYSTEM)));
-                $response->setRedirect("?mode=install&step={$step}");
                 $response->sendHeaders();
                 exit(0);
             }
 
             $layout->getMessagesblock()->prepareMessages('install');
-            $session->setBaseUrl($request->getPost('url_path'));
 
-            $session->setStep(STEP_DATABASE);
+            $config = array(
-            $response->setRedirect("?mode=install&step={$nextStep}");
+                'global' => array(
+                    'storyline' => array(
+                        'universe' => 'legacies',
+                        'episode'  => 'default',
+                        ),
+                    'web' => array(
+                        'base_url' => $request->getPost('url_path')
+                        ),
+                    'date' => array(
+                        'timezone' => $request->getPost('timezone')
+                        ),
+                    'layout' => array(
+                        'page'   => 'page.php',
+                        'admin'  => 'admin.php',
+                        'empire' => 'empire.php'
+                        ),
+                    'locales' => array(
+                        'fr'    => 'fr_FR',
+                        'fr_FR' => 'fr_FR',
+                        'en'    => 'en_US',
+                        'en_US' => 'en_US'
+                        )
+                    ),
+                );
+
+            Wootook::writeConfig($config);
+
+            $session->setData('step', STEP_DATABASE);
+            $response->setRedirect(Wootook::getUrl('install/index.php', array('mode' => 'install', 'step' => STEP_DATABASE)));
             $response->sendHeaders();
             exit(0);
         }
@@ -133,43 +158,209 @@ case 'install':
             $form->populate();
 
             if (!$form->validate()) {
-                $session->setData('step', $step);
+                $session->setData('step', STEP_DATABASE);
-                $session->setFormData($request->getPost());
+                $session->setFormData($request->getData());
-                $response->setRedirect("?mode=install&step={$step}");
+                $response->setRedirect(Wootook::getUrl('install/index.php', array('mode' => 'install', 'step' => STEP_DATABASE)));
                 $response->sendHeaders();
                 exit(0);
             }
 
+            if ($request->getPost('test')) {
+                $data = array(
+                    'status'  => 'pending',
+                    'message' => ''
+                    );
+
+                try {
+                    $hostname = $request->getPost('host');
+                    $username = $request->getPost('user');
+                    $password = $request->getPost('password');
+                    $database = $request->getPost('dbname');
+                    $port = $request->getPost('port');
+
+                    $connection = new Wootook_Database("mysql:dbname={$database};host={$hostname};port={$port}", $username, $password);
+                    $data['status'] = 'success';
+                } catch (PDOException $e) {
+                    $data['status'] = 'error';
+                    $data['message'] = $e->getMessage();
+                }
+
+                Wootook_Core_ErrorProfiler::unregister(true);
+                $response->setHeader('Content-Type', 'application/json');
+                $response->setBody(json_encode($data));
+
+                $response->sendHeaders();
+                echo $response->sendBody();
+                exit(0);
+            }
+
             $layout->getMessagesblock()->prepareMessages('install');
-            $session->setStep(STEP_PROFILE);
+
-            $response->setRedirect("?mode=install&step={$nextStep}");
+            $config = Wootook::getConfig();
+            $config['database'] = array(
+                'core_setup' => array(
+                    'engine' => 'mysql',
+                    'options' => array(
+                        ),
+                    'params' => array(
+                        'hostname' => $request->getPost('host'),
+                        'username' => $request->getPost('user'),
+                        'password' => $request->getPost('password'),
+                        'database' => $request->getPost('dbname'),
+                        'port'     => $request->getPost('port')
+                        ),
+                    'table_prefix' => $request->getPost('prefix'),
+                    ),
+                'core_read' => array(
+                    'engine' => 'mysql',
+                    'options' => array(
+                        ),
+                    'params' => array(
+                        'hostname' => $request->getPost('host'),
+                        'username' => $request->getPost('user'),
+                        'password' => $request->getPost('password'),
+                        'database' => $request->getPost('dbname'),
+                        'port'     => $request->getPost('port')
+                        ),
+                    'table_prefix' => $request->getPost('prefix'),
+                    ),
+                'core_write' => array(
+                    'engine' => 'mysql',
+                    'options' => array(
+                        ),
+                    'params' => array(
+                        'hostname' => $request->getPost('host'),
+                        'username' => $request->getPost('user'),
+                        'password' => $request->getPost('password'),
+                        'database' => $request->getPost('dbname'),
+                        'port'     => $request->getPost('port')
+                        ),
+                    'table_prefix' => $request->getPost('prefix'),
+                    ),
+                );
+
+            Wootook::writeConfig($config);
+
+            $session->setData('step', STEP_UNIVERSE);
+            $response->setRedirect(Wootook::getUrl('install/index.php', array('mode' => 'install', 'step' => STEP_UNIVERSE)));
             $response->sendHeaders();
             exit(0);
         }
 
-        $layout->load('install.database');
+        $layout->load('install.step.database');
-        break;
-
-    case STEP_PROFILE:
-        if (empty($_POST)) {
-            $session->setData('step', $step);
-            $response->setRedirect("?mode=install&step={$nextStep}");
-            $response->sendHeaders();
-            exit(0);
-        }
-
-        $layout->load('install.profile');
         break;
 
     case STEP_UNIVERSE:
-        if (empty($_POST)) {
+        if ($request->isPost()) {
-            $session->setData('step', $step);
+            $form = new Wootook_Core_Form($session, array(
-            $response->setRedirect("?mode=install&step={$nextStep}");
+                'galaxies'  => 'text',
+                'systems'   => 'text',
+                'positions' => 'text',
+
+                'allow_spy_drone_attacks' => 'text',
+                'use_large_numbers'       => 'text'
+                ));
+            $form->setRequest($request);
+            $form->populate();
+
+            if (!$form->validate()) {
+                $session->setData('step', STEP_UNIVERSE);
+                $session->setFormData($request->getData());
+                $response->setRedirect(Wootook::getUrl('install/index.php', array('mode' => 'install', 'step' => STEP_PROFILE)));
+                $response->sendHeaders();
+                exit(0);
+            }
+
+            $config = Wootook::getConfig();
+            $config['default'] = array(
+                'engine' => array(
+                    'core' => array(
+                        'use_large_numbers' => (bool) $request->getPost('use_large_numbers')
+                        ),
+                    'universe' => array(
+                        'galaxies'  => $request->getPost('galaxies'),
+                        'systems'   => $request->getPost('systems'),
+                        'positions' => $request->getPost('positions')
+                        ),
+                    'combat' => array(
+                        'allow_spy_drone_attacks' => (bool) $request->getPost('allow_spy_drone_attacks')
+                        )
+                    ),
+                );
+
+            Wootook::writeConfig($config);
+
+            $scriptPath = APPLICATION_PATH . 'code' . DIRECTORY_SEPARATOR . 'core'
+                . 'Wootook' . DIRECTORY_SEPARATOR . 'Core' . DIRECTORY_SEPARATOR
+                . 'install' . DIRECTORY_SEPARATOR . 'mysql5';
+            $queue = new Wootook_Core_Setup_Model_Updater_ScriptQueue($scriptPath);
+
+            try {
+                $updater = new Wootook_Core_Setup_Model_Updater();
+                foreach ($queue as $installScript) {
+                    $updater->run($installScript);
+                }
+            } catch (Exception $e) {
+                $session->addSuccess(Wootook::__('An error occured durong game data initialization.'));
+                $session->setData('step', STEP_SYSTEM);
+                $response->setRedirect(Wootook::getUrl('install/index.php', array('mode' => 'install', 'step' => STEP_SYSTEM)));
+                $response->sendHeaders();
+                exit(0);
+            }
+
+            $session->addSuccess(Wootook::__('Game data successfully initialized.'));
+        }
+
+        $layout->load('install.step.universe');
+        break;
+
+    case STEP_PROFILE:
+        if ($request->isPost()) {
+            $form = new Wootook_Core_Form($session, array(
+                'username'         => 'text',
+                'email'            => 'text',
+                'email_confirm'    => 'text',
+                'password'         => 'text',
+                'password_confirm' => 'text',
+                ));
+            $form->setRequest($request);
+            $form->populate();
+
+            if (!$form->validate()) {
+                $session->setData('step', STEP_PROFILE);
+                $session->setFormData($request->getData());
+                $response->setRedirect(Wootook::getUrl('install/index.php', array('mode' => 'install', 'step' => STEP_PROFILE)));
+                $response->sendHeaders();
+                exit(0);
+            }
+
+            if ($request->getPost('password') != $request->getPost('password_confirm')) {
+                $session->setData('step', STEP_PROFILE);
+                $session->setFormData($request->getData());
+                $session->addError(Wootook::__('Passwords does not match.'));
+                $response->setRedirect(Wootook::getUrl('install/index.php', array('mode' => 'install', 'step' => STEP_PROFILE)));
+                $response->sendHeaders();
+                exit(0);
+            }
+
+            if ($request->getPost('email') != $request->getPost('email_confirm')) {
+                $session->setData('step', STEP_PROFILE);
+                $session->setFormData($request->getData());
+                $session->addError(Wootook::__('e-mails does not match.'));
+                $response->setRedirect(Wootook::getUrl('install/index.php', array('mode' => 'install', 'step' => STEP_PROFILE)));
+                $response->sendHeaders();
+                exit(0);
+            }
+
+            Wootook_Empire_Model_User::register($request->getPost('username'), $request->getPost('email'), $request->getPost('password'));
+
+            $session->setData('step', STEP_UNIVERSE);
+            $response->setRedirect(Wootook::getUrl('install/index.php', array('mode' => 'install', 'step' => STEP_UNIVERSE)));
             $response->sendHeaders();
             exit(0);
         }
 
-        $layout->load('install.universe');
+        $layout->load('install.step.profile');
         break;
 
     case STEP_CONFIG:
@@ -367,96 +558,10 @@ EOF;
             $QryAddAdmGlx .= "`id_planet`         = '1'; ";
             doquery($QryAddAdmGlx, 'galaxy');
 
-            doquery("UPDATE {{table}} SET `config_value` = '1' WHERE `config_name` = 'LastSettedGalaxyPos';", 'config');
-            doquery("UPDATE {{table}} SET `config_value` = '1' WHERE `config_name` = 'LastSettedSystemPos';", 'config');
-            doquery("UPDATE {{table}} SET `config_value` = '1' WHERE `config_name` = 'LastSettedPlanetPos';", 'config');
-            doquery("UPDATE {{table}} SET `config_value` = `config_value` + '1' WHERE `config_name` = 'users_amount' LIMIT 1;", 'config');
-
             $subTpl = gettemplate ('install/ins_acc_done');
-            $bloc   = $lang;
+            $frame  = parsetemplate ( $subTpl, $lang );
-            $bloc['dpath']        = $dpath;
-            $frame  = parsetemplate ( $subTpl, $bloc );
         }
         break;
-
-    case 'goto':
-        if ($page == 1) {
-            $subTpl = gettemplate ('install/ins_goto_intro');
-            $bloc   = $lang;
-            $bloc['dpath']        = $dpath;
-            $frame  = parsetemplate ( $subTpl, $bloc );
-        } elseif ($page == 2) {
-            if ($_GET['error'] == 1) {
-            adminMessage ($lang['ins_error1'], $lang['ins_error']);
-            }
-            elseif ($_GET['error'] == 2) {
-            adminMessage ($lang['ins_error2'], $lang['ins_error']);
-            }
-
-            $subTpl = gettemplate ('install/ins_goto_form');
-            $bloc   = $lang;
-            $bloc['dpath']        = $dpath;
-            $frame  = parsetemplate ( $subTpl, $bloc );
-        } elseif ($page == 3) {
-            $host   = $_POST['host'];
-            $user   = $_POST['user'];
-            $pass   = $_POST['passwort'];
-            $prefix = $_POST['prefix'];
-            $db     = $_POST['db'];
-
-            if (!mysql_connect($host, $user, $pass)) {
-                header("Location: ?mode=goto&page=2&error=1");
-                exit();
-            }
-
-            if (!mysql_select_db($db)) {
-                header("Location: ?mode=goto&page=2&error=1");
-                exit();
-            }
-
-            $dz = fopen("../config.php", "w");
-            if (!$dz) {
-                header("Location: ?mode=ins&page=1&error=2");
-                exit();
-            }
-
-            $fileData =<<<EOF
-<?php return array(
-    'global' => array(
-        'database' => array(
-            'engine' => 'mysql',
-            'options' => array(
-                'hostname' => '{$host}',
-                'username' => '{$user}',
-                'password' => '{$pass}',
-                'database' => '{$db}'
-                ),
-            'table_prefix' => '{$prefix}',
-            )
-        )
-    );
-EOF;
-            fwrite($dz, $fileData);
-            fclose($dz);
-
-            foreach ($QryMigrate as $query) {
-                doquery($query, $prefix);
-            }
-
-            $subTpl = gettemplate('install/ins_goto_done');
-            $bloc   = $lang;
-            $bloc['dpath']        = $dpath;
-            $frame  = parsetemplate($subTpl, $bloc);
-         }
-         break;
-
-    case 'bye':
-            header("Location: ../");
-         break;
-
-    default:
-        header('Location: ?mode=intro');
-        die();
 }
 
 echo $layout->render();

language/en/admin.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/admin/Queries.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/admin/add_fleet.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/admin/addmoon.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/admin/adminpanel.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/admin/banned.mo

@@ -1,4 +1,35 @@
 <?php
+/**
+ * This file is part of Wootook
+ *
+ * @license http://www.gnu.org/licenses/gpl-3.0.txt
+* @see http://www.wootook.com/
+ *
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ *                                --> 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 Wootook.
+ *
+ */
+
+
 $lang['ip_ban_sys']     = 'IP banning system';
 $lang['nr']         		= 'Number';
 $lang['IP']         		= 'IP';

language/en/admin/changepass.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/admin/fleets.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/admin/md5enc.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/admin/messagelist.mo

@@ -3,9 +3,10 @@
  * This file is part of Wootook
  *
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
-* @see http://www.wootook.com/
+ * @see http://wootook.org/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/admin/multi.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/admin/server.mo

@@ -1,7 +1,36 @@
-<?
+<?php
+/**
+ * This file is part of Wootook
+ *
+ * @license http://www.gnu.org/licenses/gpl-3.0.txt
+* @see http://www.wootook.com/
+ *
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ *                                --> 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 Wootook.
+ *
+ */
+
 $lang['server_information'] = 'Server information';
 $lang['serverip'] = 'Server IP address';
 $lang['server_software'] ='Server software';
 $lang['server_system'] = ' Server operating system';
 $lang['php_version'] = 'PHP version';
-?>

language/en/admin/settings.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/admin/statconfig.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/alliance.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/announce.mo

@@ -1,4 +1,33 @@
 <?php
+/**
+ * This file is part of Wootook
+ *
+ * @license http://www.gnu.org/licenses/gpl-3.0.txt
+* @see http://www.wootook.com/
+ *
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ *                                --> 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 Wootook.
+ *
+ */
 
 $lang['add_announce']                = 'Add an trade';
 $lang['metal']                       = 'Metal';

language/en/banned.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/buddy.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/buildings.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/changelog.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/chat.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/contact.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/cookies.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/credit.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/fleet.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/galaxy.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/imperium.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/index.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/infos.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/install/install.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/lang_info.cfg

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/leftmenu.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/login.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/logout.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/lostpassword.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/marchand.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/messages.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/news.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/notes.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/officier.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/options.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/overview.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/phalanx.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/player.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/records.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/reg.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/resources.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/rules.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/search.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/stat.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/supp.mo

@@ -1,4 +1,34 @@
 <?php
+/**
+ * This file is part of Wootook
+ *
+ * @license http://www.gnu.org/licenses/gpl-3.0.txt
+* @see http://www.wootook.com/
+ *
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ *                                --> 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 Wootook.
+ *
+ */
+ 
 $lang['supp_header']  = "Suport";
 $lang['ticket_id'] 	= "#Ticket-ID";
 $lang['subject'] 	= "Subject";
@@ -19,4 +49,4 @@ $lang['supp_admin_system'] 	= "Support System Administration";
 $lang['close_ticket'] = "Close Ticket";
 $lang['player'] = "Player";
 $lang['input_text'] = "Send";
-?>
+

language/en/system.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/tech.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/en/tradingscrapmetal.mo

@@ -5,7 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2011-Present, Wootook Contributors <http://wootook.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
  *                                --> 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.
+ * documentation for further information about customizing Wootook.
  *
  */
 

language/fr/admin.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/admin/Queries.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/admin/add_fleet.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/admin/addmoon.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/admin/adminpanel.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/admin/changepass.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/admin/fleets.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/admin/md5enc.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/admin/messagelist.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/admin/multi.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/admin/settings.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/admin/statconfig.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/alliance.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/banned.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/buddy.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/buildings.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/changelog.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/chat.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/contact.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify

language/fr/cookies.mo

@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
 * @see http://www.wootook.com/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2011, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify