From ec7e40e1aa493ad376742bbe0d3505d74dc5445d Mon Sep 17 00:00:00 2001 From: Gregory PLANCHAT Date: Tue, 4 Oct 2011 19:57:00 +0200 Subject: [PATCH] Refactored to 2 namespaces: Wootook & Legacies Signed-off-by: Gregory PLANCHAT --- add_declare.php | 10 +- admin/ElementQueueFixer.php | 10 +- admin/QueryExecute.php | 10 +- admin/ShowFlyingFleets.php | 10 +- admin/XNovaResetUnivers.php | 14 +- admin/activeplanet.php | 10 +- admin/add_fleet.php | 10 +- admin/add_money.php | 10 +- admin/add_moon.php | 10 +- admin/autounban.php | 10 +- admin/banned.php | 10 +- admin/changelog.php | 10 +- admin/chat.php | 10 +- admin/credit.php | 10 +- admin/declare_list.php | 10 +- admin/deletuser.php | 10 +- admin/errors.php | 10 +- admin/leftmenu.php | 14 +- admin/mass_message.php | 8 +- admin/md5changepass.php | 10 +- admin/md5enc.php | 10 +- admin/messagelist.php | 10 +- admin/messall.php | 10 +- admin/moonlist.php | 10 +- admin/multi.php | 10 +- admin/overview.php | 10 +- admin/paneladmina.php | 10 +- admin/planetlist.php | 12 +- admin/settings.php | 10 +- admin/statbuilder.php | 10 +- admin/statfunctions.php | 8 +- admin/unbanned.php | 10 +- admin/userlist.php | 10 +- admin/variables.php | 10 +- ainfo.php | 10 +- alliance.php | 16 +- annonce.php | 10 +- annonce2.php | 10 +- common.php => application/bootstrap.php | 32 +- .../code/community/.placeholder | 0 .../code/core/Legacies/Empire.php | 16 +- .../Empire/Block/Planet/ResearchLab.php | 76 ++++ .../Empire/Block/Planet/ResearchLab/Item.php | 39 +- .../Empire/Block/Planet/ResearchLab/Queue.php | 48 +++ .../Block/Planet/ResearchLab/Queue/Item.php | 38 +- .../Legacies/Empire/Block/Planet/Shipyard.php | 45 +- .../Empire/Block/Planet/Shipyard/Item.php | 38 +- .../Empire/Block/Planet/Shipyard/Queue.php | 49 +++ .../code/core/Legacies/Empire/Exception.php | 37 ++ .../Model/Planet/Building/CristalMine.php | 46 ++ .../Planet/Building/DeuteriumSynthetiser.php | 46 ++ .../Model/Planet/Building/FusionReactor.php | 46 ++ .../Model/Planet/Building/MetalMine.php | 47 ++ .../Model/Planet/Building/NaniteFactory.php | 52 +++ .../Model/Planet/Building/ResearchLab.php | 30 +- .../Planet/Building/ResearchLab/Builder.php | 53 ++- .../Planet/Building/ResearchLab/Item.php | 39 ++ .../Model/Planet/Building/RoboticFactory.php | 52 +++ .../Empire/Model/Planet/Building/Shipyard.php | 32 +- .../Planet/Building/Shipyard/Builder.php | 58 ++- .../Model/Planet/Building/Shipyard/Item.php | 40 ++ .../Model/Planet/Building/SolarPlant.php | 40 ++ .../Model/Planet/Ship/LargeTransport.php | 53 +++ .../Model/Planet/Ship/LightTransport.php | 61 +++ .../Model/Planet/Ship/SolarSatellite.php | 66 +++ .../Empire/Model/Planet/Ship/Supernova.php | 50 ++- application/code/core/Legacies/Exception.php | 37 ++ .../code/core/Legacies/Officers/Exception.php | 37 ++ .../core/Legacies/Officers/Model/Observer.php | 70 +++ application/code/core/Legacies/Oficers.php | 40 ++ .../code/core/Wootook.php | 84 +++- .../code/core/Wootook}/Core/Block/Concat.php | 4 +- .../core/Wootook/Core/Block/Deprecated.php | 10 + .../core/Wootook/Core/Block/Html/Form.php | 11 + .../core/Wootook}/Core/Block/Html/Head.php | 8 +- .../Wootook}/Core/Block/Html/Navigation.php | 8 +- .../Core/Block/Html/Navigation/Link.php | 4 +- .../Core/Block/Html/Navigation/Node.php | 4 +- .../core/Wootook}/Core/Block/Html/Page.php | 4 +- .../code/core/Wootook/Core/Block/Template.php | 36 ++ .../code/core/Wootook}/Core/Block/Text.php | 4 +- .../code/core/Wootook}/Core/Collection.php | 16 +- .../core/Wootook}/Core/Controller/Action.php | 8 +- .../Wootook}/Core/Controller/Request/Http.php | 20 +- .../Core/Controller/Response/Http.php | 30 +- .../code/core/Wootook}/Core/Email.php | 4 +- .../code/core/Wootook}/Core/Entity.php | 18 +- .../core/Wootook}/Core/Entity/SubTable.php | 18 +- .../core/Wootook}/Core/EntityInterface.php | 2 +- .../code/core/Wootook}/Core/ErrorProfiler.php | 35 +- application/code/core/Wootook/Core/Event.php | 6 + .../code/core/Wootook/Core/Event/Break.php | 7 + .../code/core/Wootook/Core/Exception.php | 3 + .../Core/Exception/DataAccessException.php | 6 + .../core/Wootook/Core/Exception/Exception.php | 7 + .../Core/Exception/RuntimeException.php | 7 + .../code/core/Wootook}/Core/Layout.php | 175 +++++++- .../code/core/Wootook}/Core/Model.php | 34 +- .../code/core/Wootook}/Core/Model/Config.php | 12 +- .../Wootook/Core/Model/Config/Abstract.php | 52 +++ .../core/Wootook/Core/Model/Config/Events.php | 21 +- .../Wootook/Core/Model/Config/Modules.php | 47 ++ .../code/core/Wootook}/Core/Model/Session.php | 6 +- .../core/Wootook}/Core/Model/Translator.php | 2 +- .../Wootook/Core/Plugin/LoaderAbstract.php | 76 ++++ .../Core/Setup/Updater/ScriptQueue.php | 16 +- .../code/core/Wootook}/Core/Singleton.php | 2 +- .../code/core/Wootook}/Core/Time.php | 2 +- .../code/core/Wootook}/Core/View.php | 72 +++- .../Core/install/mysql5/install-2011.1.0.php | 6 +- .../install/mysql5/uninstall-2011.1.0.php | 2 +- .../code/core/Wootook}/Database.php | 6 +- .../core/Wootook/Empire/Block/Overview.php | 7 + .../Empire/Block/Overview/DestroyPlanet.php | 7 + .../Empire/Block/Overview/RenamePlanet.php | 7 + .../Block/Planet/Builder/ItemAbstract.php | 10 +- .../Planet/Builder/Queue/ItemAbstract.php | 6 +- .../Block/Planet/Builder/QueueAbstract.php | 12 +- .../Empire/Block/Planet/BuilderAbstract.php | 4 +- .../Empire/Block/Planet/Buildings.php | 12 +- .../Empire/Block/Planet/Buildings/Item.php | 6 +- .../Empire/Block/Planet/Buildings/Queue.php | 4 +- .../Block/Planet/Buildings/Queue/Item.php | 6 +- .../core/Wootook/Empire/Block/PlanetList.php | 7 + .../core/Wootook}/Empire/Block/Topnav.php | 12 +- .../code/core/Wootook}/Empire/Exception.php | 0 .../Wootook/Empire/Exception/Exception.php | 7 + .../Empire/Exception/RuntimeException.php | 7 + .../Wootook/Empire/Model/Builder/Break.php | 7 + .../Wootook}/Empire/Model/Builder/Item.php | 4 +- .../Wootook}/Empire/Model/BuilderAbstract.php | 22 +- .../code/core/Wootook/Empire/Model/Fleet.php | 155 +++++++ .../Wootook}/Empire/Model/Galaxy/Position.php | 4 +- .../Wootook}/Empire/Model/Game/Combat.php | 12 +- .../Wootook/Empire/Model/Game/FieldsAlias.php | 47 ++ .../Wootook}/Empire/Model/Game/Prices.php | 12 +- .../Wootook}/Empire/Model/Game/Production.php | 12 +- .../Empire/Model/Game/Requirements.php | 47 ++ .../Wootook}/Empire/Model/Game/Resources.php | 12 +- .../core/Wootook}/Empire/Model/Game/Types.php | 12 +- .../core/Wootook}/Empire/Model/Planet.php | 163 ++++--- .../Wootook}/Empire/Model/Planet/Builder.php | 34 +- .../Empire/Model/Planet/Builder/Item.php | 6 + .../Empire/Model/Planet/BuildingInterface.php | 5 + .../Wootook/Empire/Model/Planet/Exception.php | 3 + .../Empire/Model/Planet/PluginLoader.php | 29 ++ .../Planet/ResourceProductionInterface.php | 2 +- .../Empire/Model/Planet/ShipAbstract.php | 27 ++ .../Empire/Model/Planet/ShipInterface.php | 11 + .../code/core/Wootook}/Empire/Model/User.php | 117 ++--- .../Wootook}/Empire/Model/User/Message.php | 4 +- application/code/core/Wootook/Exception.php | 3 + .../code/core/Wootook}/Object.php | 2 +- .../code/libraries/Math.php | 35 +- .../code/libraries/Math/Bcmath.php | 34 ++ application/code/libraries/Math/Native.php | 97 +++++ .../code/local/.placeholder | 0 application/code/local/ga.js | 27 ++ .../code/test/Legacies/Core/LayoutTest.php | 41 ++ .../Legacies/Empire/Model/BuilderTest.php | 2 +- .../code/test}/Legacies/ObjectTest.php | 10 +- .../code/test}/LegaciesTest.php | 42 +- .../code/test}/bootstrap.php | 0 .../design/base/default}/layouts/empire.php | 16 +- .../design/base/default}/layouts/page.php | 0 .../scripts/deprecated/add_declare.tpl | 0 .../deprecated/admin/activeplanet_body.tpl | 0 .../scripts/deprecated/admin/add_money.tpl | 0 .../scripts/deprecated/admin/add_moon.tpl | 0 .../deprecated/admin/admin_panel_asw1.tpl | 0 .../deprecated/admin/admin_panel_asw2.tpl | 0 .../deprecated/admin/admin_panel_frm1.tpl | 0 .../deprecated/admin/admin_panel_frm2.tpl | 0 .../deprecated/admin/admin_panel_frm3.tpl | 0 .../deprecated/admin/admin_panel_frm4.tpl | 0 .../deprecated/admin/admin_panel_main.tpl | 0 .../scripts/deprecated/admin/banadni.tpl | 0 .../scripts/deprecated/admin/banned.tpl | 0 .../scripts/deprecated/admin/changepass.tpl | 0 .../scripts/deprecated/admin/chat_body.tpl | 0 .../scripts/deprecated/admin/credit_body.tpl | 0 .../deprecated/admin/declarelist_body.tpl | 0 .../deprecated/admin/declarelist_rows.tpl | 0 .../scripts/deprecated/admin/deletuser.tpl | 0 .../scripts/deprecated/admin/errors_body.tpl | 0 .../scripts/deprecated/admin/exec_query.tpl | 0 .../scripts/deprecated/admin/fleet_body.tpl | 0 .../scripts/deprecated/admin/fleet_rows.tpl | 0 .../scripts/deprecated/admin/left_menu.tpl | 0 .../scripts/deprecated/admin/md5enc.tpl | 0 .../scripts/deprecated/admin/message_body.tpl | 0 .../deprecated/admin/messagelist_body.tpl | 0 .../admin/messagelist_table_rows.tpl | 0 .../scripts/deprecated/admin/messall_body.tpl | 0 .../deprecated/admin/moonlist_body.tpl | 0 .../scripts/deprecated/admin/multi_body.tpl | 0 .../scripts/deprecated/admin/multi_rows.tpl | 0 .../scripts/deprecated/admin/options_body.tpl | 0 .../deprecated/admin/overview_body.tpl | 0 .../deprecated/admin/overview_rows.tpl | 0 .../deprecated/admin/planetlist_body.tpl | 0 .../scripts/deprecated/admin/reset_body.tpl | 0 .../deprecated/admin/simple_header.tpl | 0 .../scripts/deprecated/admin/unbanned.tpl | 0 .../deprecated/admin/userlist_body.tpl | 0 .../deprecated/admin/userlist_rows.tpl | 0 .../deprecated/admin/variables_body.tpl | 0 .../deprecated/admin/variables_rows.tpl | 0 .../default}/scripts/deprecated/agreement.tpl | 0 .../scripts/deprecated/alliance_admin.tpl | 0 .../deprecated/alliance_admin_laws.tpl | 0 .../deprecated/alliance_admin_laws_feet.tpl | 0 .../deprecated/alliance_admin_laws_head.tpl | 0 .../deprecated/alliance_admin_laws_row.tpl | 0 .../alliance_admin_members_function.tpl | 0 .../deprecated/alliance_admin_members_row.tpl | 0 .../alliance_admin_members_row_edit.tpl | 0 .../alliance_admin_members_table.tpl | 0 .../deprecated/alliance_admin_rename.tpl | 0 .../deprecated/alliance_admin_rename1.tpl | 0 .../deprecated/alliance_admin_rename2.tpl | 0 .../alliance_admin_request_form.tpl | 0 .../deprecated/alliance_admin_request_row.tpl | 0 .../alliance_admin_request_table.tpl | 0 .../scripts/deprecated/alliance_ainfo.tpl | 0 .../deprecated/alliance_apply_waitform.tpl | 0 .../scripts/deprecated/alliance_applyform.tpl | 0 .../scripts/deprecated/alliance_circular.tpl | 0 .../deprecated/alliance_circular_form.tpl | 0 .../deprecated/alliance_defaultmenu.tpl | 0 .../scripts/deprecated/alliance_frontpage.tpl | 0 .../scripts/deprecated/alliance_make.tpl | 0 .../scripts/deprecated/alliance_makeform.tpl | 0 .../deprecated/alliance_memberslist_row.tpl | 0 .../deprecated/alliance_memberslist_table.tpl | 0 .../deprecated/alliance_searchform.tpl | 0 .../deprecated/alliance_searchresult_row.tpl | 0 .../alliance_searchresult_table.tpl | 0 .../scripts/deprecated/banned_body.tpl | 0 .../scripts/deprecated/buildings_builds.tpl | 0 .../buildings_builds_queue_script.tpl | 0 .../deprecated/buildings_builds_row.tpl | 0 .../deprecated/buildings_builds_script.tpl | 0 .../scripts/deprecated/buildings_defense.tpl | 0 .../scripts/deprecated/buildings_fleet.tpl | 0 .../scripts/deprecated/buildings_research.tpl | 0 .../deprecated/buildings_research_row.tpl | 0 .../deprecated/buildings_research_script.tpl | 0 .../scripts/deprecated/buildings_script.tpl | 0 .../scripts/deprecated/changelog_body.tpl | 0 .../scripts/deprecated/changelog_table.tpl | 0 .../default}/scripts/deprecated/chat_body.tpl | 0 .../scripts/deprecated/contact_body.tpl | 0 .../scripts/deprecated/contact_body_rows.tpl | 0 .../scripts/deprecated/credit_body.tpl | 0 .../scripts/deprecated/galaxy_body.tpl | 53 +-- .../scripts/deprecated/galaxy_row.tpl | 0 .../scripts/deprecated/galaxy_row_action.tpl | 0 .../scripts/deprecated/galaxy_row_ally.tpl | 0 .../scripts/deprecated/galaxy_row_debris.tpl | 0 .../scripts/deprecated/galaxy_row_luna.tpl | 0 .../scripts/deprecated/galaxy_row_planet.tpl | 0 .../scripts/deprecated/galaxy_row_user.tpl | 0 .../scripts/deprecated/gate_fleet_rows.tpl | 0 .../scripts/deprecated/gate_fleet_table.tpl | 0 .../scripts/deprecated/imperium_row.tpl | 0 .../scripts/deprecated/imperium_row2.tpl | 0 .../scripts/deprecated/imperium_table.tpl | 0 .../deprecated/info_buildings_defense.tpl | 0 .../deprecated/info_buildings_destroy.tpl | 0 .../deprecated/info_buildings_fleet.tpl | 0 .../deprecated/info_buildings_general.tpl | 0 .../deprecated/info_buildings_table.tpl | 0 .../deprecated/info_officiers_general.tpl | 0 .../scripts/deprecated/install/ins_acc.tpl | 0 .../deprecated/install/ins_acc_done.tpl | 0 .../scripts/deprecated/install/ins_body.tpl | 0 .../scripts/deprecated/install/ins_form.tpl | 0 .../deprecated/install/ins_form_done.tpl | 0 .../deprecated/install/ins_goto_done.tpl | 0 .../deprecated/install/ins_goto_form.tpl | 0 .../deprecated/install/ins_goto_intro.tpl | 0 .../scripts/deprecated/install/ins_intro.tpl | 0 .../default}/scripts/deprecated/left_menu.tpl | 0 .../scripts/deprecated/lostpassword.tpl | 0 .../scripts/deprecated/marchand_cristal.tpl | 0 .../scripts/deprecated/marchand_deuterium.tpl | 0 .../scripts/deprecated/marchand_main.tpl | 0 .../scripts/deprecated/marchand_metal.tpl | 0 .../scripts/deprecated/message_body.tpl | 0 .../scripts/deprecated/messages_pm_form.tpl | 0 .../deprecated/messages_pm_form_bb.tpl | 0 .../default}/scripts/deprecated/multi.tpl | 0 .../scripts/deprecated/notes_body.tpl | 0 .../scripts/deprecated/notes_body_entry.tpl | 0 .../scripts/deprecated/notes_form.tpl | 0 .../scripts/deprecated/officier_body.tpl | 0 .../scripts/deprecated/officier_rows.tpl | 0 .../scripts/deprecated/options_admadd.tpl | 0 .../scripts/deprecated/options_body.tpl | 0 .../scripts/deprecated/options_body_vmode.tpl | 0 .../scripts/deprecated/overall_footer.tpl | 0 .../scripts/deprecated/overview_body.tpl | 0 .../deprecated/overview_deleteplanet.tpl | 0 .../deprecated/overview_fleet_event.tpl | 0 .../deprecated/overview_renameplanet.tpl | 0 .../scripts/deprecated/phalanx_body.tpl | 0 .../scripts/deprecated/records_body.tpl | 0 .../deprecated/records_section_header.tpl | 0 .../deprecated/records_section_rows.tpl | 0 .../scripts/deprecated/registry_form.tpl | 0 .../default}/scripts/deprecated/resources.tpl | 0 .../scripts/deprecated/resources_row.tpl | 2 + .../scripts/deprecated/rules_body.tpl | 0 .../scripts/deprecated/search_ally_row.tpl | 0 .../scripts/deprecated/search_ally_table.tpl | 0 .../scripts/deprecated/search_body.tpl | 0 .../scripts/deprecated/search_user_row.tpl | 0 .../scripts/deprecated/search_user_table.tpl | 0 .../scripts/deprecated/serv_infos.tpl | 0 .../scripts/deprecated/simple_footer.tpl | 0 .../scripts/deprecated/simple_header.tpl | 0 .../scripts/deprecated/stat_alliancetable.tpl | 0 .../deprecated/stat_alliancetable_header.tpl | 0 .../default}/scripts/deprecated/stat_body.tpl | 0 .../scripts/deprecated/stat_playertable.tpl | 0 .../deprecated/stat_playertable_header.tpl | 0 .../scripts/deprecated/statjoueur.tpl | 0 .../scripts/deprecated/techtree_body.tpl | 0 .../scripts/deprecated/techtree_details.tpl | 0 .../scripts/deprecated/techtree_head.tpl | 0 .../scripts/deprecated/techtree_row.tpl | 0 .../default}/scripts/deprecated/teleport.tpl | 0 .../scripts/deprecated/tradingscrapmetal.tpl | 0 .../deprecated/tradingscrapmetal_n.tpl | 0 .../scripts/deprecated/usr_banned.tpl | 0 .../default}/scripts/deprecated/usuw_body.tpl | 0 .../default}/scripts/deprecated/zglos.tpl | 0 .../scripts/empire/overview/fleet/item.phtml | 21 + .../empire/overview/form/destroy-planet.phtml | 0 .../empire/overview/form/rename-planet.phtml | 0 .../scripts/empire/overview/messages.phtml | 0 .../empire/overview/planet/list/item.phtml | 0 .../scripts/empire/overview/planet/view.phtml | 0 .../scripts/empire/planet/buildings.phtml | 0 .../empire/planet/buildings/item.phtml | 0 .../empire/planet/buildings/queue.phtml | 0 .../empire/planet/buildings/queue/item.phtml | 0 .../scripts/empire/planet/research-lab.phtml | 0 .../empire/planet/research-lab/item.phtml | 0 .../empire/planet/research-lab/queue.phtml | 0 .../planet/research-lab/queue/item.phtml | 0 .../scripts/empire/planet/shipyard.phtml | 0 .../scripts/empire/planet/shipyard/item.phtml | 0 .../empire/planet/shipyard/queue.phtml | 0 .../empire/planet/shipyard/queue.phtml~HEAD | 0 .../empire/planet/shipyard/queue.phtml~HEAD_0 | 1 + .../planet/shipyard/queue.phtml~development | 1 + .../scripts/empire/resources/default.phtml | 0 .../scripts/empire/resources/energy.phtml | 0 .../base/default}/scripts/empire/topnav.phtml | 0 .../base/default}/scripts/page/1column.phtml | 0 .../default}/scripts/page/2columns-left.phtml | 0 .../scripts/page/2columns-right.phtml | 0 .../base/default}/scripts/page/3columns.phtml | 0 .../default}/scripts/page/html/head.phtml | 0 .../default}/scripts/page/html/message.phtml | 0 .../scripts/page/html/navigation.phtml | 0 .../scripts/page/html/navigation/link.phtml | 0 .../scripts/page/html/navigation/node.phtml | 0 .../base/default}/scripts/user/login.phtml | 0 .../default}/scripts/user/registration.phtml | 0 .../gamedata/legacies/default}/combat.php | 0 .../gamedata/legacies/default}/events.php | 6 +- .../legacies/default}/fields-alias.php | 0 .../gamedata/legacies/default/modules.php | 9 + .../gamedata/legacies/default}/prices.php | 0 .../gamedata/legacies/default/production.php | 71 +++ .../legacies/default}/requirements.php | 0 .../gamedata/legacies/default}/resources.php | 22 +- .../gamedata/legacies/default}/types.php | 0 .../locale/en_US/Legacies_User.csv | 0 .../locale/fr_FR/Legacies_User.csv | 0 .../locale/fr_FR/Legacies_User.txt | 0 .../scripts/legacies/client.js | 4 +- .../scripts/sizzle.js | 0 .../test/UpdatePlanet.php | 10 +- .../test/bootstrap.php | 2 +- application/test/registration.php | 43 ++ banned.php | 10 +- buddy.php | 10 +- buildings.php | 38 +- calc.php | 8 +- changelog.php | 10 +- chat.php | 12 +- chat_add.php | 12 +- chat_msg.php | 14 +- config.php.default | 7 + contact.php | 10 +- fleet.php | 25 +- fleetback.php | 2 +- fleetshortcut.php | 10 +- floten1.php | 43 +- floten2.php | 24 +- floten3.php | 47 +- flotenajax.php | 10 +- frames.php | 14 +- galaxy.php | 11 +- imperium.php | 12 +- includes/CombatEngine.php | 10 +- includes/aks.php | 8 +- .../core/Legacies/Core/Block/Html/Form.php | 11 - .../core/Legacies/Core/Block/Template.php | 6 - .../code/core/Legacies/Core/Event.php | 6 - .../code/core/Legacies/Core/Event/Break.php | 7 - .../code/core/Legacies/Core/Exception.php | 3 - .../core/Legacies/Core/Model/Exception.php | 7 - .../core/Legacies/Empire/Block/Overview.php | 7 - .../Empire/Block/Overview/DestroyPlanet.php | 7 - .../Empire/Block/Overview/RenamePlanet.php | 7 - .../Empire/Block/Planet/ResearchLab.php | 42 -- .../Empire/Block/Planet/ResearchLab/Queue.php | 15 - .../Empire/Block/Planet/Shipyard/Queue.php | 15 - .../core/Legacies/Empire/Block/PlanetList.php | 7 - .../Legacies/Empire/Model/Builder/Break.php | 7 - .../code/core/Legacies/Empire/Model/Fleet.php | 79 ---- .../Legacies/Empire/Model/Game/Abstract.php | 36 -- .../Empire/Model/Game/Requirements.php | 49 --- .../Empire/Model/Planet/Builder/Item.php | 6 - .../Model/Planet/Building/CristalMine.php | 13 - .../Planet/Building/DeuteriumSynthetiser.php | 13 - .../Model/Planet/Building/FusionReactor.php | 13 - .../Model/Planet/Building/MetalMine.php | 13 - .../Model/Planet/Building/NaniteFactory.php | 19 - .../Planet/Building/ResearchLab/Item.php | 6 - .../Model/Planet/Building/RoboticFactory.php | 19 - .../Model/Planet/Building/Shipyard/Item.php | 6 - .../Model/Planet/Building/SolarPlant.php | 12 - .../Empire/Model/Planet/BuildingInterface.php | 5 - .../Empire/Model/Planet/Exception.php | 3 - .../Model/Planet/Ship/LargeTransport.php | 19 - .../Model/Planet/Ship/LightTransport.php | 27 -- .../Model/Planet/Ship/SolarSatellite.php | 33 -- .../Empire/Model/Planet/ShipAbstract.php | 27 -- .../Empire/Model/Planet/ShipInterface.php | 11 - .../code/core/Legacies/Exception.php | 3 - .../core/Legacies/Officers/Model/Observer.php | 37 -- .../code/libraries/Math/Native.php | 63 --- .../design/scripts/empire/resources.phtml | 5 - includes/ataki.php | 8 +- includes/constants.php | 10 +- includes/data/production.php | 113 ----- includes/databaseinfos.php | 14 +- includes/debug.class.php | 8 +- includes/deprecated.php | 277 +++++++----- includes/functions.php | 8 +- includes/functions/BBcodeFunction.php | 8 +- includes/functions/BuildFleetEventTable.php | 8 +- includes/functions/BuildFlyingFleetTable.php | 8 +- includes/functions/CheckInputStrings.php | 8 +- includes/functions/CreateOneMoonRecord.php | 8 +- includes/functions/CreateOnePlanetRecord.php | 8 +- includes/functions/DeleteSelectedUser.php | 8 +- includes/functions/ElementBuildListBox.php | 8 +- includes/functions/FlyingFleetHandler.php | 10 +- includes/functions/GalaxyCheckFunctions.php | 8 +- includes/functions/GalaxyLegendPopup.php | 8 +- includes/functions/GalaxyRowActions.php | 8 +- includes/functions/GalaxyRowAlly.php | 8 +- includes/functions/GalaxyRowDebris.php | 8 +- includes/functions/GalaxyRowMoon.php | 8 +- includes/functions/GalaxyRowPlanet.php | 8 +- includes/functions/GalaxyRowPlanetName.php | 8 +- includes/functions/GalaxyRowPos.php | 8 +- includes/functions/GalaxyRowUser.php | 8 +- .../functions/GetMaxConstructibleElements.php | 8 +- includes/functions/GetMissileRange.php | 8 +- includes/functions/GetPhalanxRange.php | 8 +- includes/functions/GetRestPrice.php | 8 +- includes/functions/InsertGalaxyScripts.php | 8 +- .../InsertJavaScriptChronoApplet.php | 8 +- includes/functions/IsElementBuyable.php | 8 +- includes/functions/IsOfficierAccessible.php | 8 +- .../functions/IsTechnologieAccessible.php | 8 +- includes/functions/IsVacationMode.php | 8 +- includes/functions/MessageForm.php | 8 +- includes/functions/MipCombatEngine.php | 8 +- includes/functions/MissionCaseAttack.php | 32 +- .../functions/MissionCaseColonisation.php | 8 +- includes/functions/MissionCaseDestruction.php | 8 +- includes/functions/MissionCaseExpedition.php | 8 +- includes/functions/MissionCaseRecycling.php | 8 +- includes/functions/MissionCaseSpy.php | 12 +- includes/functions/MissionCaseStay.php | 8 +- includes/functions/MissionCaseStayAlly.php | 8 +- includes/functions/MissionCaseTransport.php | 8 +- includes/functions/PlanetResourceUpdate.php | 10 +- .../functions/ResetThisFuckingCheater.php | 8 +- includes/functions/RestoreFleetToPlanet.php | 8 +- includes/functions/RevisionTime.php | 8 +- includes/functions/SendNewPassword.php | 10 +- includes/functions/SendSimpleMessage.php | 8 +- includes/functions/ShowGalaxyFooter.php | 8 +- includes/functions/ShowGalaxyMISelector.php | 8 +- includes/functions/ShowGalaxyRows.php | 8 +- includes/functions/ShowGalaxySelector.php | 8 +- includes/functions/ShowGalaxyTitles.php | 8 +- includes/functions/SortUserPlanets.php | 8 +- includes/functions/SpyTarget.php | 8 +- includes/functions/StoreGoodsToPlanet.php | 8 +- .../UpdatePlanetBatimentQueueList.php | 8 +- includes/migrateinfo.php | 14 +- includes/raketenangriff.php | 8 +- includes/strings.php | 8 +- includes/todofleetcontrol.php | 8 +- includes/unlocalised.php | 8 +- includes/vars.php | 20 +- index.php | 8 +- infos.php | 10 +- install/index.php | 8 +- jumpgate.php | 10 +- language/en/admin.mo | 4 +- language/en/admin/Queries.mo | 4 +- language/en/admin/add_fleet.mo | 4 +- language/en/admin/addmoon.mo | 4 +- language/en/admin/adminpanel.mo | 4 +- language/en/admin/changepass.mo | 4 +- language/en/admin/fleets.mo | 4 +- language/en/admin/md5enc.mo | 4 +- language/en/admin/messagelist.mo | 4 +- language/en/admin/multi.mo | 4 +- language/en/admin/settings.mo | 4 +- language/en/admin/statconfig.mo | 4 +- language/en/alliance.mo | 4 +- language/en/banned.mo | 4 +- language/en/buddy.mo | 4 +- language/en/buildings.mo | 4 +- language/en/changelog.mo | 4 +- language/en/chat.mo | 4 +- language/en/contact.mo | 4 +- language/en/cookies.mo | 4 +- language/en/credit.mo | 4 +- language/en/fleet.mo | 4 +- language/en/galaxy.mo | 4 +- language/en/imperium.mo | 4 +- language/en/index.mo | 4 +- language/en/infos.mo | 4 +- language/en/install/install.mo | 4 +- language/en/lang_info.cfg | 4 +- language/en/leftmenu.mo | 4 +- language/en/login.mo | 4 +- language/en/logout.mo | 4 +- language/en/lostpassword.mo | 4 +- language/en/marchand.mo | 4 +- language/en/messages.mo | 4 +- language/en/news.mo | 4 +- language/en/notes.mo | 4 +- language/en/officier.mo | 4 +- language/en/options.mo | 4 +- language/en/overview.mo | 4 +- language/en/phalanx.mo | 4 +- language/en/player.mo | 4 +- language/en/records.mo | 4 +- language/en/reg.mo | 4 +- language/en/resources.mo | 4 +- language/en/rules.mo | 4 +- language/en/search.mo | 4 +- language/en/stat.mo | 4 +- language/en/system.mo | 4 +- language/en/tech.mo | 4 +- language/en/tradingscrapmetal.mo | 4 +- language/fr/admin.mo | 4 +- language/fr/admin/Queries.mo | 4 +- language/fr/admin/add_fleet.mo | 4 +- language/fr/admin/addmoon.mo | 4 +- language/fr/admin/adminpanel.mo | 4 +- language/fr/admin/changepass.mo | 4 +- language/fr/admin/fleets.mo | 4 +- language/fr/admin/md5enc.mo | 4 +- language/fr/admin/messagelist.mo | 4 +- language/fr/admin/multi.mo | 4 +- language/fr/admin/settings.mo | 4 +- language/fr/admin/statconfig.mo | 4 +- language/fr/alliance.mo | 4 +- language/fr/banned.mo | 4 +- language/fr/buddy.mo | 4 +- language/fr/buildings.mo | 4 +- language/fr/changelog.mo | 4 +- language/fr/chat.mo | 4 +- language/fr/contact.mo | 4 +- language/fr/cookies.mo | 4 +- language/fr/credit.mo | 4 +- language/fr/fleet.mo | 4 +- language/fr/galaxy.mo | 4 +- language/fr/imperium.mo | 4 +- language/fr/index.mo | 4 +- language/fr/infos.mo | 4 +- language/fr/install/install.mo | 4 +- language/fr/lang_info.cfg | 4 +- language/fr/leftmenu.mo | 4 +- language/fr/login.mo | 4 +- language/fr/logout.mo | 4 +- language/fr/lostpassword.mo | 4 +- language/fr/marchand.mo | 4 +- language/fr/messages.mo | 4 +- language/fr/news.mo | 4 +- language/fr/notes.mo | 4 +- language/fr/officier.mo | 4 +- language/fr/options.mo | 4 +- language/fr/overview.mo | 4 +- language/fr/phalanx.mo | 4 +- language/fr/player.mo | 4 +- language/fr/records.mo | 4 +- language/fr/reg.mo | 4 +- language/fr/resources.mo | 4 +- language/fr/rules.mo | 4 +- language/fr/search.mo | 4 +- language/fr/stat.mo | 4 +- language/fr/system.mo | 4 +- language/fr/tech.mo | 4 +- language/fr/tradingscrapmetal.mo | 4 +- language/it/admin.mo | 4 +- language/it/admin/Queries.mo | 4 +- language/it/admin/add_fleet.mo | 4 +- language/it/admin/addmoon.mo | 4 +- language/it/admin/adminpanel.mo | 4 +- language/it/admin/changepass.mo | 4 +- language/it/admin/fleets.mo | 4 +- language/it/admin/md5enc.mo | 4 +- language/it/admin/messagelist.mo | 4 +- language/it/admin/multi.mo | 4 +- language/it/admin/settings.mo | 4 +- language/it/admin/statconfig.mo | 4 +- language/it/alliance.mo | 4 +- language/it/banned.mo | 4 +- language/it/buddy.mo | 4 +- language/it/buildings.mo | 4 +- language/it/changelog.mo | 4 +- language/it/chat.mo | 4 +- language/it/contact.mo | 4 +- language/it/cookies.mo | 4 +- language/it/credit.mo | 4 +- language/it/fleet.mo | 4 +- language/it/galaxy.mo | 4 +- language/it/imperium.mo | 4 +- language/it/index.mo | 4 +- language/it/infos.mo | 4 +- language/it/install/admin.mo | 4 +- language/it/install/alliance.mo | 4 +- language/it/install/banned.mo | 4 +- language/it/install/buddy.mo | 4 +- language/it/install/buildings.mo | 4 +- language/it/install/changelog.mo | 4 +- language/it/install/chat.mo | 4 +- language/it/install/contact.mo | 4 +- language/it/install/cookies.mo | 4 +- language/it/install/credit.mo | 4 +- language/it/install/fleet.mo | 4 +- language/it/install/galaxy.mo | 4 +- language/it/install/imperium.mo | 4 +- language/it/install/index.mo | 4 +- language/it/install/infos.mo | 4 +- language/it/install/install.mo | 4 +- language/it/install/lang_info.cfg | 4 +- language/it/install/leftmenu.mo | 4 +- language/it/install/login.mo | 4 +- language/it/install/logout.mo | 4 +- language/it/install/lostpassword.mo | 4 +- language/it/install/marchand.mo | 4 +- language/it/install/messages.mo | 4 +- language/it/install/news.mo | 4 +- language/it/install/notes.mo | 4 +- language/it/install/officier.mo | 4 +- language/it/install/options.mo | 4 +- language/it/install/overview.mo | 4 +- language/it/install/phalanx.mo | 4 +- language/it/install/player.mo | 4 +- language/it/install/records.mo | 4 +- language/it/install/reg.mo | 4 +- language/it/install/resources.mo | 4 +- language/it/install/rules.mo | 4 +- language/it/install/search.mo | 4 +- language/it/install/stat.mo | 4 +- language/it/install/system.mo | 4 +- language/it/install/tech.mo | 4 +- language/it/install/tradingscrapmetal.mo | 4 +- language/it/lang_info.cfg | 4 +- language/it/leftmenu.mo | 4 +- language/it/login.mo | 4 +- language/it/logout.mo | 4 +- language/it/lostpassword.mo | 4 +- language/it/marchand.mo | 4 +- language/it/messages.mo | 4 +- language/it/news.mo | 4 +- language/it/notes.mo | 4 +- language/it/officier.mo | 4 +- language/it/options.mo | 4 +- language/it/overview.mo | 4 +- language/it/phalanx.mo | 4 +- language/it/player.mo | 4 +- language/it/records.mo | 4 +- language/it/reg.mo | 4 +- language/it/resources.mo | 4 +- language/it/rules.mo | 4 +- language/it/search.mo | 4 +- language/it/settings.mo | 4 +- language/it/stat.mo | 4 +- language/it/system.mo | 4 +- language/it/tech.mo | 4 +- language/it/tradingscrapmetal.mo | 4 +- leftmenu.php | 14 +- login.php | 26 +- logout.php | 10 +- lostpassword.php | 14 +- marchand.php | 10 +- messages.php | 10 +- mipattack.php | 10 +- multi.php | 12 +- neusuw.php | 10 +- notes.php | 10 +- officier.php | 12 +- options.php | 10 +- overview.php | 64 +-- phalanx.php | 10 +- quickfleet.php | 10 +- rak.php | 8 +- raketenangriff.php | 10 +- records.php | 10 +- reg.php | 12 +- resources.php | 403 +++++++++--------- rules.php | 10 +- rw.php | 10 +- scripts/createbanner.php | 10 +- search.php | 10 +- .../default/css/deprecated/about.css | 4 +- .../default/css/deprecated/default.css | 0 .../default/css/deprecated/formate.css | 0 .../default/css/deprecated/styles.css | 4 +- skin/{ => base}/default/css/legacies.css | 0 skin/base/default/graphics/background.jpg | Bin 0 -> 260445 bytes skin/base/default/graphics/favicon-128.png | Bin 0 -> 15787 bytes skin/base/default/graphics/favicon-32.png | Bin 0 -> 2175 bytes .../default/graphics/gebaeude/1.gif | Bin .../default/graphics/gebaeude/106.gif | Bin .../default/graphics/gebaeude/108.gif | Bin .../default/graphics/gebaeude/109.gif | Bin .../default/graphics/gebaeude/110.gif | Bin .../default/graphics/gebaeude/111.gif | Bin .../default/graphics/gebaeude/113.gif | Bin .../default/graphics/gebaeude/114.gif | Bin .../default/graphics/gebaeude/115.gif | Bin .../default/graphics/gebaeude/117.gif | Bin .../default/graphics/gebaeude/118.gif | Bin .../default/graphics/gebaeude/12.gif | Bin .../default/graphics/gebaeude/120.gif | Bin .../default/graphics/gebaeude/121.gif | Bin .../default/graphics/gebaeude/122.gif | Bin .../default/graphics/gebaeude/123.gif | Bin .../default/graphics/gebaeude/124.gif | Bin .../default/graphics/gebaeude/14.gif | Bin .../default/graphics/gebaeude/15.gif | Bin .../default/graphics/gebaeude/199.gif | Bin .../default/graphics/gebaeude/2.gif | Bin .../default/graphics/gebaeude/202.gif | Bin .../default/graphics/gebaeude/203.gif | Bin .../default/graphics/gebaeude/204.gif | Bin .../default/graphics/gebaeude/205.gif | Bin .../default/graphics/gebaeude/206.gif | Bin .../default/graphics/gebaeude/206.jpg | Bin .../default/graphics/gebaeude/207.gif | Bin .../default/graphics/gebaeude/208.gif | Bin .../default/graphics/gebaeude/209.gif | Bin .../default/graphics/gebaeude/21.gif | Bin .../default/graphics/gebaeude/210.gif | Bin .../default/graphics/gebaeude/211.gif | Bin .../default/graphics/gebaeude/212.gif | Bin .../default/graphics/gebaeude/213.gif | Bin .../default/graphics/gebaeude/214.gif | Bin .../default/graphics/gebaeude/215.gif | Bin .../default/graphics/gebaeude/216.gif | Bin .../default/graphics/gebaeude/21_a.gif | Bin .../default/graphics/gebaeude/22.gif | Bin .../default/graphics/gebaeude/23.gif | Bin .../default/graphics/gebaeude/24.gif | Bin .../default/graphics/gebaeude/3.gif | Bin .../default/graphics/gebaeude/31.gif | Bin .../default/graphics/gebaeude/33.gif | Bin .../default/graphics/gebaeude/34.gif | Bin .../default/graphics/gebaeude/4.gif | Bin .../default/graphics/gebaeude/401.gif | Bin .../default/graphics/gebaeude/402.gif | Bin .../default/graphics/gebaeude/403.gif | Bin .../default/graphics/gebaeude/404.gif | Bin .../default/graphics/gebaeude/405.gif | Bin .../default/graphics/gebaeude/406.gif | Bin .../default/graphics/gebaeude/407.gif | Bin .../default/graphics/gebaeude/408.gif | Bin .../default/graphics/gebaeude/41.gif | Bin .../default/graphics/gebaeude/42.gif | Bin .../default/graphics/gebaeude/43.gif | Bin .../default/graphics/gebaeude/44.gif | Bin .../default/graphics/gebaeude/501.gif | Bin .../default/graphics/gebaeude/502.gif | Bin .../default/graphics/gebaeude/503.gif | Bin .../default/graphics/gebaeude/ionen.gif.1 | Bin .../default/graphics/gfx/info-help.jpg | Bin .../default/graphics/gfx/user-menu.jpg | Bin .../default/graphics/images/abort.gif | Bin .../default/graphics/images/bann.png | Bin .../default/graphics/images/banned.png | Bin .../default/graphics/images/deuterium.gif | Bin .../default/graphics/images/energie.gif | Bin .../default/graphics/images/false.png | Bin .../default/graphics/images/female.gif | Bin .../graphics/images/icon_latest_reply.gif | Bin .../default/graphics/images/kristall.gif | Bin .../graphics/images/loadingAnimation.gif | Bin .../default/graphics/images/male.gif | Bin .../default/graphics/images/message.gif | Bin .../default/graphics/images/metall.gif | Bin .../default/graphics/images/officiers/601.jpg | Bin .../default/graphics/images/officiers/602.jpg | Bin .../default/graphics/images/officiers/603.jpg | Bin .../default/graphics/images/officiers/604.jpg | Bin .../default/graphics/images/officiers/605.jpg | Bin .../default/graphics/images/officiers/606.jpg | Bin .../default/graphics/images/officiers/607.jpg | Bin .../default/graphics/images/officiers/608.jpg | Bin .../default/graphics/images/officiers/609.jpg | Bin .../default/graphics/images/officiers/610.jpg | Bin .../default/graphics/images/officiers/611.jpg | Bin .../default/graphics/images/officiers/612.jpg | Bin .../default/graphics/images/officiers/613.jpg | Bin .../default/graphics/images/officiers/614.jpg | Bin .../default/graphics/images/officiers/615.jpg | Bin .../default/graphics/images/progress.gif | Bin .../default/graphics/images/progressbar.gif | Bin .../{ => base}/default/graphics/images/r1.png | Bin .../{ => base}/default/graphics/images/r2.png | Bin .../{ => base}/default/graphics/images/r3.png | Bin .../{ => base}/default/graphics/images/r4.png | Bin .../{ => base}/default/graphics/images/r5.png | Bin .../{ => base}/default/graphics/images/r6.png | Bin .../{ => base}/default/graphics/images/r7.png | Bin .../{ => base}/default/graphics/images/r8.png | Bin .../{ => base}/default/graphics/images/r9.png | Bin .../graphics/images/smileys/confused.png | Bin .../default/graphics/images/smileys/cry.png | Bin .../default/graphics/images/smileys/dizzy.png | Bin .../default/graphics/images/smileys/happy.png | Bin .../default/graphics/images/smileys/lol.png | Bin .../graphics/images/smileys/neutral.png | Bin .../default/graphics/images/smileys/omg.png | Bin .../default/graphics/images/smileys/sad.png | Bin .../default/graphics/images/smileys/shit.png | Bin .../default/graphics/images/smileys/smile.png | Bin .../graphics/images/smileys/tongue.png | Bin .../default/graphics/images/smileys/wink.png | Bin .../default/graphics/images/tlo.jpg | Bin .../default/graphics/images/true.png | Bin .../default/graphics/images/xnova.png | Bin skin/{ => base}/default/graphics/img/b.gif | Bin .../default/graphics/img/background1.jpg | Bin .../default/graphics/img/background2.jpg | Bin skin/{ => base}/default/graphics/img/bg1.gif | Bin skin/{ => base}/default/graphics/img/e.gif | Bin skin/{ => base}/default/graphics/img/link.gif | Bin skin/{ => base}/default/graphics/img/m.gif | Bin skin/{ => base}/default/graphics/img/p.png | Bin skin/{ => base}/default/graphics/img/p1z1.png | Bin skin/{ => base}/default/graphics/img/p2z2.png | Bin skin/{ => base}/default/graphics/img/p3z2.png | Bin skin/{ => base}/default/graphics/img/r.gif | Bin skin/{ => base}/default/graphics/img/s.gif | Bin .../default/graphics/img/starz2.png | Bin .../{ => base}/default/graphics/pic/abort.gif | Bin .../default/graphics/pic/appwiz.gif | Bin skin/{ => base}/default/graphics/pic/key.gif | Bin .../default/graphics/planeten/debris.jpg | Bin .../graphics/planeten/dschjungelplanet01.jpg | Bin .../graphics/planeten/dschjungelplanet02.jpg | Bin .../graphics/planeten/dschjungelplanet03.jpg | Bin .../graphics/planeten/dschjungelplanet04.jpg | Bin .../graphics/planeten/dschjungelplanet05.jpg | Bin .../graphics/planeten/dschjungelplanet06.jpg | Bin .../graphics/planeten/dschjungelplanet07.jpg | Bin .../graphics/planeten/dschjungelplanet08.jpg | Bin .../graphics/planeten/dschjungelplanet09.jpg | Bin .../graphics/planeten/dschjungelplanet10.jpg | Bin .../default/graphics/planeten/eisplanet01.jpg | Bin .../default/graphics/planeten/eisplanet02.jpg | Bin .../default/graphics/planeten/eisplanet03.jpg | Bin .../default/graphics/planeten/eisplanet04.jpg | Bin .../default/graphics/planeten/eisplanet05.jpg | Bin .../default/graphics/planeten/eisplanet06.jpg | Bin .../default/graphics/planeten/eisplanet07.jpg | Bin .../default/graphics/planeten/eisplanet08.jpg | Bin .../default/graphics/planeten/eisplanet09.jpg | Bin .../default/graphics/planeten/eisplanet10.jpg | Bin .../default/graphics/planeten/gasplanet01.jpg | Bin .../default/graphics/planeten/gasplanet02.jpg | Bin .../default/graphics/planeten/gasplanet03.jpg | Bin .../default/graphics/planeten/gasplanet04.jpg | Bin .../default/graphics/planeten/gasplanet05.jpg | Bin .../default/graphics/planeten/gasplanet06.jpg | Bin .../default/graphics/planeten/gasplanet07.jpg | Bin .../default/graphics/planeten/gasplanet08.jpg | Bin .../default/graphics/planeten/mond.jpg | Bin .../graphics/planeten/normaltempplanet01.jpg | Bin .../graphics/planeten/normaltempplanet02.jpg | Bin .../graphics/planeten/normaltempplanet03.jpg | Bin .../graphics/planeten/normaltempplanet04.jpg | Bin .../graphics/planeten/normaltempplanet05.jpg | Bin .../graphics/planeten/normaltempplanet06.jpg | Bin .../graphics/planeten/normaltempplanet07.jpg | Bin .../graphics/planeten/normaltempplanet08.jpg | Bin .../planeten/small/s_dschjungelplanet01.jpg | Bin .../planeten/small/s_dschjungelplanet02.jpg | Bin .../planeten/small/s_dschjungelplanet03.jpg | Bin .../planeten/small/s_dschjungelplanet04.jpg | Bin .../planeten/small/s_dschjungelplanet05.jpg | Bin .../planeten/small/s_dschjungelplanet06.jpg | Bin .../planeten/small/s_dschjungelplanet07.jpg | Bin .../planeten/small/s_dschjungelplanet08.jpg | Bin .../planeten/small/s_dschjungelplanet09.jpg | Bin .../planeten/small/s_dschjungelplanet10.jpg | Bin .../graphics/planeten/small/s_eisplanet01.jpg | Bin .../graphics/planeten/small/s_eisplanet02.jpg | Bin .../graphics/planeten/small/s_eisplanet03.jpg | Bin .../graphics/planeten/small/s_eisplanet04.jpg | Bin .../graphics/planeten/small/s_eisplanet05.jpg | Bin .../graphics/planeten/small/s_eisplanet06.jpg | Bin .../graphics/planeten/small/s_eisplanet07.jpg | Bin .../graphics/planeten/small/s_eisplanet08.jpg | Bin .../graphics/planeten/small/s_eisplanet09.jpg | Bin .../graphics/planeten/small/s_eisplanet10.jpg | Bin .../graphics/planeten/small/s_gasplanet01.jpg | Bin .../graphics/planeten/small/s_gasplanet02.jpg | Bin .../graphics/planeten/small/s_gasplanet03.jpg | Bin .../graphics/planeten/small/s_gasplanet04.jpg | Bin .../graphics/planeten/small/s_gasplanet05.jpg | Bin .../graphics/planeten/small/s_gasplanet06.jpg | Bin .../graphics/planeten/small/s_gasplanet07.jpg | Bin .../graphics/planeten/small/s_gasplanet08.jpg | Bin .../graphics/planeten/small/s_mond.jpg | Bin .../planeten/small/s_normaltempplanet01.jpg | Bin .../planeten/small/s_normaltempplanet02.jpg | Bin .../planeten/small/s_normaltempplanet03.jpg | Bin .../planeten/small/s_normaltempplanet04.jpg | Bin .../planeten/small/s_normaltempplanet05.jpg | Bin .../planeten/small/s_normaltempplanet06.jpg | Bin .../planeten/small/s_normaltempplanet07.jpg | Bin .../planeten/small/s_normaltempplanet08.jpg | Bin .../planeten/small/s_trockenplanet01.jpg | Bin .../planeten/small/s_trockenplanet02.jpg | Bin .../planeten/small/s_trockenplanet03.jpg | Bin .../planeten/small/s_trockenplanet04.jpg | Bin .../planeten/small/s_trockenplanet05.jpg | Bin .../planeten/small/s_trockenplanet06.jpg | Bin .../planeten/small/s_trockenplanet07.jpg | Bin .../planeten/small/s_trockenplanet08.jpg | Bin .../planeten/small/s_trockenplanet09.jpg | Bin .../planeten/small/s_trockenplanet10.jpg | Bin .../planeten/small/s_wasserplanet01.jpg | Bin .../planeten/small/s_wasserplanet02.jpg | Bin .../planeten/small/s_wasserplanet03.jpg | Bin .../planeten/small/s_wasserplanet04.jpg | Bin .../planeten/small/s_wasserplanet05.jpg | Bin .../planeten/small/s_wasserplanet06.jpg | Bin .../planeten/small/s_wasserplanet07.jpg | Bin .../planeten/small/s_wasserplanet08.jpg | Bin .../planeten/small/s_wasserplanet09.jpg | Bin .../planeten/small/s_wuestenplanet01.jpg | Bin .../planeten/small/s_wuestenplanet02.jpg | Bin .../planeten/small/s_wuestenplanet03.jpg | Bin .../planeten/small/s_wuestenplanet04.jpg | Bin .../graphics/planeten/trockenplanet01.jpg | Bin .../graphics/planeten/trockenplanet02.jpg | Bin .../graphics/planeten/trockenplanet03.jpg | Bin .../graphics/planeten/trockenplanet04.jpg | Bin .../graphics/planeten/trockenplanet05.jpg | Bin .../graphics/planeten/trockenplanet06.jpg | Bin .../graphics/planeten/trockenplanet07.jpg | Bin .../graphics/planeten/trockenplanet08.jpg | Bin .../graphics/planeten/trockenplanet09.jpg | Bin .../graphics/planeten/trockenplanet10.jpg | Bin .../graphics/planeten/wasserplanet01.jpg | Bin .../graphics/planeten/wasserplanet02.jpg | Bin .../graphics/planeten/wasserplanet03.jpg | Bin .../graphics/planeten/wasserplanet04.jpg | Bin .../graphics/planeten/wasserplanet05.jpg | Bin .../graphics/planeten/wasserplanet06.jpg | Bin .../graphics/planeten/wasserplanet07.jpg | Bin .../graphics/planeten/wasserplanet08.jpg | Bin .../graphics/planeten/wasserplanet09.jpg | Bin .../graphics/planeten/wuestenplanet01.jpg | Bin .../graphics/planeten/wuestenplanet02.jpg | Bin .../graphics/planeten/wuestenplanet03.jpg | Bin .../graphics/planeten/wuestenplanet04.jpg | Bin db/mysql.php => skin/base/default/js/fleet.js | 54 +-- stat.php | 10 +- techdetails.php | 10 +- techtree.php | 12 +- verband.php | 10 +- 1004 files changed, 4776 insertions(+), 2939 deletions(-) rename common.php => application/bootstrap.php (82%) rename {includes/application => application}/code/community/.placeholder (100%) rename {includes/application => application}/code/core/Legacies/Empire.php (92%) create mode 100644 application/code/core/Legacies/Empire/Block/Planet/ResearchLab.php rename {includes/application => application}/code/core/Legacies/Empire/Block/Planet/ResearchLab/Item.php (54%) create mode 100644 application/code/core/Legacies/Empire/Block/Planet/ResearchLab/Queue.php rename {includes/application => application}/code/core/Legacies/Empire/Block/Planet/ResearchLab/Queue/Item.php (57%) rename {includes/application => application}/code/core/Legacies/Empire/Block/Planet/Shipyard.php (51%) rename {includes/application => application}/code/core/Legacies/Empire/Block/Planet/Shipyard/Item.php (50%) create mode 100644 application/code/core/Legacies/Empire/Block/Planet/Shipyard/Queue.php create mode 100644 application/code/core/Legacies/Empire/Exception.php create mode 100644 application/code/core/Legacies/Empire/Model/Planet/Building/CristalMine.php create mode 100644 application/code/core/Legacies/Empire/Model/Planet/Building/DeuteriumSynthetiser.php create mode 100644 application/code/core/Legacies/Empire/Model/Planet/Building/FusionReactor.php create mode 100644 application/code/core/Legacies/Empire/Model/Planet/Building/MetalMine.php create mode 100644 application/code/core/Legacies/Empire/Model/Planet/Building/NaniteFactory.php rename {includes/application => application}/code/core/Legacies/Empire/Model/Planet/Building/ResearchLab.php (88%) rename {includes/application => application}/code/core/Legacies/Empire/Model/Planet/Building/ResearchLab/Builder.php (79%) create mode 100644 application/code/core/Legacies/Empire/Model/Planet/Building/ResearchLab/Item.php create mode 100644 application/code/core/Legacies/Empire/Model/Planet/Building/RoboticFactory.php rename {includes/application => application}/code/core/Legacies/Empire/Model/Planet/Building/Shipyard.php (87%) rename {includes/application => application}/code/core/Legacies/Empire/Model/Planet/Building/Shipyard/Builder.php (82%) create mode 100644 application/code/core/Legacies/Empire/Model/Planet/Building/Shipyard/Item.php create mode 100644 application/code/core/Legacies/Empire/Model/Planet/Building/SolarPlant.php create mode 100644 application/code/core/Legacies/Empire/Model/Planet/Ship/LargeTransport.php create mode 100644 application/code/core/Legacies/Empire/Model/Planet/Ship/LightTransport.php create mode 100644 application/code/core/Legacies/Empire/Model/Planet/Ship/SolarSatellite.php rename {includes/application => application}/code/core/Legacies/Empire/Model/Planet/Ship/Supernova.php (50%) create mode 100644 application/code/core/Legacies/Exception.php create mode 100644 application/code/core/Legacies/Officers/Exception.php create mode 100644 application/code/core/Legacies/Officers/Model/Observer.php create mode 100644 application/code/core/Legacies/Oficers.php rename includes/application/code/core/Legacies.php => application/code/core/Wootook.php (70%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Block/Concat.php (75%) create mode 100644 application/code/core/Wootook/Core/Block/Deprecated.php create mode 100644 application/code/core/Wootook/Core/Block/Html/Form.php rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Block/Html/Head.php (95%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Block/Html/Navigation.php (85%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Block/Html/Navigation/Link.php (96%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Block/Html/Navigation/Node.php (80%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Block/Html/Page.php (77%) create mode 100644 application/code/core/Wootook/Core/Block/Template.php rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Block/Text.php (86%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Collection.php (95%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Controller/Action.php (80%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Controller/Request/Http.php (81%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Controller/Response/Http.php (76%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Email.php (85%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Entity.php (87%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Entity/SubTable.php (86%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/EntityInterface.php (85%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/ErrorProfiler.php (87%) create mode 100644 application/code/core/Wootook/Core/Event.php create mode 100644 application/code/core/Wootook/Core/Event/Break.php create mode 100644 application/code/core/Wootook/Core/Exception.php create mode 100644 application/code/core/Wootook/Core/Exception/DataAccessException.php create mode 100644 application/code/core/Wootook/Core/Exception/Exception.php create mode 100644 application/code/core/Wootook/Core/Exception/RuntimeException.php rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Layout.php (58%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Model.php (68%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Model/Config.php (87%) create mode 100644 application/code/core/Wootook/Core/Model/Config/Abstract.php rename includes/application/code/core/Legacies/Empire/Model/Game/FieldsAlias.php => application/code/core/Wootook/Core/Model/Config/Events.php (58%) create mode 100644 application/code/core/Wootook/Core/Model/Config/Modules.php rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Model/Session.php (97%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Model/Translator.php (96%) create mode 100644 application/code/core/Wootook/Core/Plugin/LoaderAbstract.php rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Setup/Updater/ScriptQueue.php (95%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Singleton.php (60%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/Time.php (89%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/View.php (73%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/install/mysql5/install-2011.1.0.php (99%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Core/install/mysql5/uninstall-2011.1.0.php (99%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Database.php (90%) create mode 100644 application/code/core/Wootook/Empire/Block/Overview.php create mode 100644 application/code/core/Wootook/Empire/Block/Overview/DestroyPlanet.php create mode 100644 application/code/core/Wootook/Empire/Block/Overview/RenamePlanet.php rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Block/Planet/Builder/ItemAbstract.php (89%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Block/Planet/Builder/Queue/ItemAbstract.php (57%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Block/Planet/Builder/QueueAbstract.php (82%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Block/Planet/BuilderAbstract.php (91%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Block/Planet/Buildings.php (70%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Block/Planet/Buildings/Item.php (89%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Block/Planet/Buildings/Queue.php (63%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Block/Planet/Buildings/Queue/Item.php (89%) create mode 100644 application/code/core/Wootook/Empire/Block/PlanetList.php rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Block/Topnav.php (57%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Exception.php (100%) create mode 100644 application/code/core/Wootook/Empire/Exception/Exception.php create mode 100644 application/code/core/Wootook/Empire/Exception/RuntimeException.php create mode 100644 application/code/core/Wootook/Empire/Model/Builder/Break.php rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Model/Builder/Item.php (76%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Model/BuilderAbstract.php (88%) create mode 100644 application/code/core/Wootook/Empire/Model/Fleet.php rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Model/Galaxy/Position.php (88%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Model/Game/Combat.php (66%) create mode 100644 application/code/core/Wootook/Empire/Model/Game/FieldsAlias.php rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Model/Game/Prices.php (66%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Model/Game/Production.php (65%) create mode 100644 application/code/core/Wootook/Empire/Model/Game/Requirements.php rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Model/Game/Resources.php (66%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Model/Game/Types.php (72%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Model/Planet.php (83%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Model/Planet/Builder.php (87%) create mode 100644 application/code/core/Wootook/Empire/Model/Planet/Builder/Item.php create mode 100644 application/code/core/Wootook/Empire/Model/Planet/BuildingInterface.php create mode 100644 application/code/core/Wootook/Empire/Model/Planet/Exception.php create mode 100644 application/code/core/Wootook/Empire/Model/Planet/PluginLoader.php rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Model/Planet/ResourceProductionInterface.php (57%) create mode 100644 application/code/core/Wootook/Empire/Model/Planet/ShipAbstract.php create mode 100644 application/code/core/Wootook/Empire/Model/Planet/ShipInterface.php rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Model/User.php (78%) rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Empire/Model/User/Message.php (75%) create mode 100644 application/code/core/Wootook/Exception.php rename {includes/application/code/core/Legacies => application/code/core/Wootook}/Object.php (98%) rename {includes/application => application}/code/libraries/Math.php (69%) rename {includes/application => application}/code/libraries/Math/Bcmath.php (71%) create mode 100644 application/code/libraries/Math/Native.php rename {includes/application => application}/code/local/.placeholder (100%) create mode 100644 application/code/local/ga.js create mode 100644 application/code/test/Legacies/Core/LayoutTest.php rename {includes/application/code/core/Test => application/code/test}/Legacies/Empire/Model/BuilderTest.php (99%) rename {includes/application/code/core/Test => application/code/test}/Legacies/ObjectTest.php (95%) rename {includes/application/code/core/Test => application/code/test}/LegaciesTest.php (59%) rename {includes/application/code/core/Test => application/code/test}/bootstrap.php (100%) rename {includes/application/design => application/design/base/default}/layouts/empire.php (94%) rename {includes/application/design => application/design/base/default}/layouts/page.php (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/add_declare.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/activeplanet_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/add_money.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/add_moon.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/admin_panel_asw1.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/admin_panel_asw2.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/admin_panel_frm1.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/admin_panel_frm2.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/admin_panel_frm3.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/admin_panel_frm4.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/admin_panel_main.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/banadni.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/banned.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/changepass.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/chat_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/credit_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/declarelist_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/declarelist_rows.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/deletuser.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/errors_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/exec_query.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/fleet_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/fleet_rows.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/left_menu.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/md5enc.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/message_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/messagelist_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/messagelist_table_rows.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/messall_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/moonlist_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/multi_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/multi_rows.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/options_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/overview_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/overview_rows.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/planetlist_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/reset_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/simple_header.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/unbanned.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/userlist_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/userlist_rows.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/variables_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/admin/variables_rows.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/agreement.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_admin.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_admin_laws.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_admin_laws_feet.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_admin_laws_head.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_admin_laws_row.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_admin_members_function.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_admin_members_row.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_admin_members_row_edit.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_admin_members_table.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_admin_rename.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_admin_rename1.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_admin_rename2.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_admin_request_form.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_admin_request_row.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_admin_request_table.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_ainfo.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_apply_waitform.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_applyform.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_circular.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_circular_form.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_defaultmenu.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_frontpage.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_make.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_makeform.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_memberslist_row.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_memberslist_table.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_searchform.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_searchresult_row.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/alliance_searchresult_table.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/banned_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/buildings_builds.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/buildings_builds_queue_script.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/buildings_builds_row.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/buildings_builds_script.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/buildings_defense.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/buildings_fleet.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/buildings_research.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/buildings_research_row.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/buildings_research_script.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/buildings_script.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/changelog_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/changelog_table.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/chat_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/contact_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/contact_body_rows.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/credit_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/galaxy_body.tpl (94%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/galaxy_row.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/galaxy_row_action.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/galaxy_row_ally.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/galaxy_row_debris.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/galaxy_row_luna.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/galaxy_row_planet.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/galaxy_row_user.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/gate_fleet_rows.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/gate_fleet_table.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/imperium_row.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/imperium_row2.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/imperium_table.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/info_buildings_defense.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/info_buildings_destroy.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/info_buildings_fleet.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/info_buildings_general.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/info_buildings_table.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/info_officiers_general.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/install/ins_acc.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/install/ins_acc_done.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/install/ins_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/install/ins_form.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/install/ins_form_done.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/install/ins_goto_done.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/install/ins_goto_form.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/install/ins_goto_intro.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/install/ins_intro.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/left_menu.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/lostpassword.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/marchand_cristal.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/marchand_deuterium.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/marchand_main.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/marchand_metal.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/message_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/messages_pm_form.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/messages_pm_form_bb.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/multi.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/notes_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/notes_body_entry.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/notes_form.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/officier_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/officier_rows.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/options_admadd.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/options_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/options_body_vmode.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/overall_footer.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/overview_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/overview_deleteplanet.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/overview_fleet_event.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/overview_renameplanet.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/phalanx_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/records_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/records_section_header.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/records_section_rows.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/registry_form.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/resources.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/resources_row.tpl (90%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/rules_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/search_ally_row.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/search_ally_table.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/search_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/search_user_row.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/search_user_table.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/serv_infos.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/simple_footer.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/simple_header.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/stat_alliancetable.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/stat_alliancetable_header.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/stat_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/stat_playertable.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/stat_playertable_header.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/statjoueur.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/techtree_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/techtree_details.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/techtree_head.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/techtree_row.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/teleport.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/tradingscrapmetal.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/tradingscrapmetal_n.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/usr_banned.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/usuw_body.tpl (100%) rename {includes/application/design => application/design/base/default}/scripts/deprecated/zglos.tpl (100%) create mode 100644 application/design/base/default/scripts/empire/overview/fleet/item.phtml rename {includes/application/design => application/design/base/default}/scripts/empire/overview/form/destroy-planet.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/overview/form/rename-planet.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/overview/messages.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/overview/planet/list/item.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/overview/planet/view.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/planet/buildings.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/planet/buildings/item.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/planet/buildings/queue.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/planet/buildings/queue/item.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/planet/research-lab.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/planet/research-lab/item.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/planet/research-lab/queue.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/planet/research-lab/queue/item.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/planet/shipyard.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/planet/shipyard/item.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/planet/shipyard/queue.phtml (100%) rename includes/application/design/scripts/empire/overview/fleet/item.phtml => application/design/base/default/scripts/empire/planet/shipyard/queue.phtml~HEAD (100%) create mode 100644 application/design/base/default/scripts/empire/planet/shipyard/queue.phtml~HEAD_0 create mode 100644 application/design/base/default/scripts/empire/planet/shipyard/queue.phtml~development rename {includes/application/design => application/design/base/default}/scripts/empire/resources/default.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/resources/energy.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/empire/topnav.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/page/1column.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/page/2columns-left.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/page/2columns-right.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/page/3columns.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/page/html/head.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/page/html/message.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/page/html/navigation.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/page/html/navigation/link.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/page/html/navigation/node.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/user/login.phtml (100%) rename {includes/application/design => application/design/base/default}/scripts/user/registration.phtml (100%) rename {includes/data => application/gamedata/legacies/default}/combat.php (100%) rename {includes/data => application/gamedata/legacies/default}/events.php (85%) rename {includes/data => application/gamedata/legacies/default}/fields-alias.php (100%) create mode 100644 application/gamedata/legacies/default/modules.php rename {includes/data => application/gamedata/legacies/default}/prices.php (100%) create mode 100644 application/gamedata/legacies/default/production.php rename {includes/data => application/gamedata/legacies/default}/requirements.php (100%) rename {includes/data => application/gamedata/legacies/default}/resources.php (70%) rename {includes/data => application/gamedata/legacies/default}/types.php (100%) rename {includes/application => application}/locale/en_US/Legacies_User.csv (100%) rename {includes/application => application}/locale/fr_FR/Legacies_User.csv (100%) rename {includes/application => application}/locale/fr_FR/Legacies_User.txt (100%) rename {includes/application => application}/scripts/legacies/client.js (99%) rename {includes/application => application}/scripts/sizzle.js (100%) rename {includes/application => application}/test/UpdatePlanet.php (95%) rename {includes/application => application}/test/bootstrap.php (96%) create mode 100644 application/test/registration.php delete mode 100644 includes/application/code/core/Legacies/Core/Block/Html/Form.php delete mode 100644 includes/application/code/core/Legacies/Core/Block/Template.php delete mode 100644 includes/application/code/core/Legacies/Core/Event.php delete mode 100644 includes/application/code/core/Legacies/Core/Event/Break.php delete mode 100644 includes/application/code/core/Legacies/Core/Exception.php delete mode 100644 includes/application/code/core/Legacies/Core/Model/Exception.php delete mode 100644 includes/application/code/core/Legacies/Empire/Block/Overview.php delete mode 100644 includes/application/code/core/Legacies/Empire/Block/Overview/DestroyPlanet.php delete mode 100644 includes/application/code/core/Legacies/Empire/Block/Overview/RenamePlanet.php delete mode 100644 includes/application/code/core/Legacies/Empire/Block/Planet/ResearchLab.php delete mode 100644 includes/application/code/core/Legacies/Empire/Block/Planet/ResearchLab/Queue.php delete mode 100644 includes/application/code/core/Legacies/Empire/Block/Planet/Shipyard/Queue.php delete mode 100644 includes/application/code/core/Legacies/Empire/Block/PlanetList.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Builder/Break.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Fleet.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Game/Abstract.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Game/Requirements.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/Builder/Item.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/Building/CristalMine.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/Building/DeuteriumSynthetiser.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/Building/FusionReactor.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/Building/MetalMine.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/Building/NaniteFactory.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/Building/ResearchLab/Item.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/Building/RoboticFactory.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/Building/Shipyard/Item.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/Building/SolarPlant.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/BuildingInterface.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/Exception.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/Ship/LargeTransport.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/Ship/LightTransport.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/Ship/SolarSatellite.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/ShipAbstract.php delete mode 100644 includes/application/code/core/Legacies/Empire/Model/Planet/ShipInterface.php delete mode 100644 includes/application/code/core/Legacies/Exception.php delete mode 100644 includes/application/code/core/Legacies/Officers/Model/Observer.php delete mode 100644 includes/application/code/libraries/Math/Native.php delete mode 100644 includes/application/design/scripts/empire/resources.phtml delete mode 100644 includes/data/production.php rename skin/{ => base}/default/css/deprecated/about.css (96%) rename skin/{ => base}/default/css/deprecated/default.css (100%) rename skin/{ => base}/default/css/deprecated/formate.css (100%) rename skin/{ => base}/default/css/deprecated/styles.css (99%) rename skin/{ => base}/default/css/legacies.css (100%) create mode 100644 skin/base/default/graphics/background.jpg create mode 100644 skin/base/default/graphics/favicon-128.png create mode 100644 skin/base/default/graphics/favicon-32.png rename skin/{ => base}/default/graphics/gebaeude/1.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/106.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/108.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/109.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/110.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/111.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/113.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/114.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/115.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/117.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/118.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/12.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/120.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/121.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/122.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/123.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/124.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/14.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/15.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/199.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/2.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/202.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/203.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/204.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/205.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/206.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/206.jpg (100%) rename skin/{ => base}/default/graphics/gebaeude/207.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/208.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/209.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/21.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/210.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/211.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/212.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/213.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/214.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/215.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/216.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/21_a.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/22.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/23.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/24.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/3.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/31.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/33.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/34.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/4.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/401.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/402.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/403.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/404.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/405.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/406.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/407.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/408.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/41.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/42.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/43.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/44.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/501.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/502.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/503.gif (100%) rename skin/{ => base}/default/graphics/gebaeude/ionen.gif.1 (100%) rename skin/{ => base}/default/graphics/gfx/info-help.jpg (100%) rename skin/{ => base}/default/graphics/gfx/user-menu.jpg (100%) rename skin/{ => base}/default/graphics/images/abort.gif (100%) rename skin/{ => base}/default/graphics/images/bann.png (100%) rename skin/{ => base}/default/graphics/images/banned.png (100%) rename skin/{ => base}/default/graphics/images/deuterium.gif (100%) rename skin/{ => base}/default/graphics/images/energie.gif (100%) rename skin/{ => base}/default/graphics/images/false.png (100%) rename skin/{ => base}/default/graphics/images/female.gif (100%) rename skin/{ => base}/default/graphics/images/icon_latest_reply.gif (100%) rename skin/{ => base}/default/graphics/images/kristall.gif (100%) rename skin/{ => base}/default/graphics/images/loadingAnimation.gif (100%) rename skin/{ => base}/default/graphics/images/male.gif (100%) rename skin/{ => base}/default/graphics/images/message.gif (100%) rename skin/{ => base}/default/graphics/images/metall.gif (100%) rename skin/{ => base}/default/graphics/images/officiers/601.jpg (100%) rename skin/{ => base}/default/graphics/images/officiers/602.jpg (100%) rename skin/{ => base}/default/graphics/images/officiers/603.jpg (100%) rename skin/{ => base}/default/graphics/images/officiers/604.jpg (100%) rename skin/{ => base}/default/graphics/images/officiers/605.jpg (100%) rename skin/{ => base}/default/graphics/images/officiers/606.jpg (100%) rename skin/{ => base}/default/graphics/images/officiers/607.jpg (100%) rename skin/{ => base}/default/graphics/images/officiers/608.jpg (100%) rename skin/{ => base}/default/graphics/images/officiers/609.jpg (100%) rename skin/{ => base}/default/graphics/images/officiers/610.jpg (100%) rename skin/{ => base}/default/graphics/images/officiers/611.jpg (100%) rename skin/{ => base}/default/graphics/images/officiers/612.jpg (100%) rename skin/{ => base}/default/graphics/images/officiers/613.jpg (100%) rename skin/{ => base}/default/graphics/images/officiers/614.jpg (100%) rename skin/{ => base}/default/graphics/images/officiers/615.jpg (100%) rename skin/{ => base}/default/graphics/images/progress.gif (100%) rename skin/{ => base}/default/graphics/images/progressbar.gif (100%) rename skin/{ => base}/default/graphics/images/r1.png (100%) rename skin/{ => base}/default/graphics/images/r2.png (100%) rename skin/{ => base}/default/graphics/images/r3.png (100%) rename skin/{ => base}/default/graphics/images/r4.png (100%) rename skin/{ => base}/default/graphics/images/r5.png (100%) rename skin/{ => base}/default/graphics/images/r6.png (100%) rename skin/{ => base}/default/graphics/images/r7.png (100%) rename skin/{ => base}/default/graphics/images/r8.png (100%) rename skin/{ => base}/default/graphics/images/r9.png (100%) rename skin/{ => base}/default/graphics/images/smileys/confused.png (100%) rename skin/{ => base}/default/graphics/images/smileys/cry.png (100%) rename skin/{ => base}/default/graphics/images/smileys/dizzy.png (100%) rename skin/{ => base}/default/graphics/images/smileys/happy.png (100%) rename skin/{ => base}/default/graphics/images/smileys/lol.png (100%) rename skin/{ => base}/default/graphics/images/smileys/neutral.png (100%) rename skin/{ => base}/default/graphics/images/smileys/omg.png (100%) rename skin/{ => base}/default/graphics/images/smileys/sad.png (100%) rename skin/{ => base}/default/graphics/images/smileys/shit.png (100%) rename skin/{ => base}/default/graphics/images/smileys/smile.png (100%) rename skin/{ => base}/default/graphics/images/smileys/tongue.png (100%) rename skin/{ => base}/default/graphics/images/smileys/wink.png (100%) rename skin/{ => base}/default/graphics/images/tlo.jpg (100%) rename skin/{ => base}/default/graphics/images/true.png (100%) rename skin/{ => base}/default/graphics/images/xnova.png (100%) rename skin/{ => base}/default/graphics/img/b.gif (100%) rename skin/{ => base}/default/graphics/img/background1.jpg (100%) rename skin/{ => base}/default/graphics/img/background2.jpg (100%) rename skin/{ => base}/default/graphics/img/bg1.gif (100%) rename skin/{ => base}/default/graphics/img/e.gif (100%) rename skin/{ => base}/default/graphics/img/link.gif (100%) rename skin/{ => base}/default/graphics/img/m.gif (100%) rename skin/{ => base}/default/graphics/img/p.png (100%) rename skin/{ => base}/default/graphics/img/p1z1.png (100%) rename skin/{ => base}/default/graphics/img/p2z2.png (100%) rename skin/{ => base}/default/graphics/img/p3z2.png (100%) rename skin/{ => base}/default/graphics/img/r.gif (100%) rename skin/{ => base}/default/graphics/img/s.gif (100%) rename skin/{ => base}/default/graphics/img/starz2.png (100%) rename skin/{ => base}/default/graphics/pic/abort.gif (100%) rename skin/{ => base}/default/graphics/pic/appwiz.gif (100%) rename skin/{ => base}/default/graphics/pic/key.gif (100%) rename skin/{ => base}/default/graphics/planeten/debris.jpg (100%) rename skin/{ => base}/default/graphics/planeten/dschjungelplanet01.jpg (100%) rename skin/{ => base}/default/graphics/planeten/dschjungelplanet02.jpg (100%) rename skin/{ => base}/default/graphics/planeten/dschjungelplanet03.jpg (100%) rename skin/{ => base}/default/graphics/planeten/dschjungelplanet04.jpg (100%) rename skin/{ => base}/default/graphics/planeten/dschjungelplanet05.jpg (100%) rename skin/{ => base}/default/graphics/planeten/dschjungelplanet06.jpg (100%) rename skin/{ => base}/default/graphics/planeten/dschjungelplanet07.jpg (100%) rename skin/{ => base}/default/graphics/planeten/dschjungelplanet08.jpg (100%) rename skin/{ => base}/default/graphics/planeten/dschjungelplanet09.jpg (100%) rename skin/{ => base}/default/graphics/planeten/dschjungelplanet10.jpg (100%) rename skin/{ => base}/default/graphics/planeten/eisplanet01.jpg (100%) rename skin/{ => base}/default/graphics/planeten/eisplanet02.jpg (100%) rename skin/{ => base}/default/graphics/planeten/eisplanet03.jpg (100%) rename skin/{ => base}/default/graphics/planeten/eisplanet04.jpg (100%) rename skin/{ => base}/default/graphics/planeten/eisplanet05.jpg (100%) rename skin/{ => base}/default/graphics/planeten/eisplanet06.jpg (100%) rename skin/{ => base}/default/graphics/planeten/eisplanet07.jpg (100%) rename skin/{ => base}/default/graphics/planeten/eisplanet08.jpg (100%) rename skin/{ => base}/default/graphics/planeten/eisplanet09.jpg (100%) rename skin/{ => base}/default/graphics/planeten/eisplanet10.jpg (100%) rename skin/{ => base}/default/graphics/planeten/gasplanet01.jpg (100%) rename skin/{ => base}/default/graphics/planeten/gasplanet02.jpg (100%) rename skin/{ => base}/default/graphics/planeten/gasplanet03.jpg (100%) rename skin/{ => base}/default/graphics/planeten/gasplanet04.jpg (100%) rename skin/{ => base}/default/graphics/planeten/gasplanet05.jpg (100%) rename skin/{ => base}/default/graphics/planeten/gasplanet06.jpg (100%) rename skin/{ => base}/default/graphics/planeten/gasplanet07.jpg (100%) rename skin/{ => base}/default/graphics/planeten/gasplanet08.jpg (100%) rename skin/{ => base}/default/graphics/planeten/mond.jpg (100%) rename skin/{ => base}/default/graphics/planeten/normaltempplanet01.jpg (100%) rename skin/{ => base}/default/graphics/planeten/normaltempplanet02.jpg (100%) rename skin/{ => base}/default/graphics/planeten/normaltempplanet03.jpg (100%) rename skin/{ => base}/default/graphics/planeten/normaltempplanet04.jpg (100%) rename skin/{ => base}/default/graphics/planeten/normaltempplanet05.jpg (100%) rename skin/{ => base}/default/graphics/planeten/normaltempplanet06.jpg (100%) rename skin/{ => base}/default/graphics/planeten/normaltempplanet07.jpg (100%) rename skin/{ => base}/default/graphics/planeten/normaltempplanet08.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_dschjungelplanet01.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_dschjungelplanet02.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_dschjungelplanet03.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_dschjungelplanet04.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_dschjungelplanet05.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_dschjungelplanet06.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_dschjungelplanet07.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_dschjungelplanet08.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_dschjungelplanet09.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_dschjungelplanet10.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_eisplanet01.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_eisplanet02.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_eisplanet03.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_eisplanet04.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_eisplanet05.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_eisplanet06.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_eisplanet07.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_eisplanet08.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_eisplanet09.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_eisplanet10.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_gasplanet01.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_gasplanet02.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_gasplanet03.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_gasplanet04.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_gasplanet05.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_gasplanet06.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_gasplanet07.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_gasplanet08.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_mond.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_normaltempplanet01.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_normaltempplanet02.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_normaltempplanet03.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_normaltempplanet04.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_normaltempplanet05.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_normaltempplanet06.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_normaltempplanet07.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_normaltempplanet08.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_trockenplanet01.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_trockenplanet02.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_trockenplanet03.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_trockenplanet04.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_trockenplanet05.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_trockenplanet06.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_trockenplanet07.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_trockenplanet08.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_trockenplanet09.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_trockenplanet10.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_wasserplanet01.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_wasserplanet02.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_wasserplanet03.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_wasserplanet04.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_wasserplanet05.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_wasserplanet06.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_wasserplanet07.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_wasserplanet08.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_wasserplanet09.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_wuestenplanet01.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_wuestenplanet02.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_wuestenplanet03.jpg (100%) rename skin/{ => base}/default/graphics/planeten/small/s_wuestenplanet04.jpg (100%) rename skin/{ => base}/default/graphics/planeten/trockenplanet01.jpg (100%) rename skin/{ => base}/default/graphics/planeten/trockenplanet02.jpg (100%) rename skin/{ => base}/default/graphics/planeten/trockenplanet03.jpg (100%) rename skin/{ => base}/default/graphics/planeten/trockenplanet04.jpg (100%) rename skin/{ => base}/default/graphics/planeten/trockenplanet05.jpg (100%) rename skin/{ => base}/default/graphics/planeten/trockenplanet06.jpg (100%) rename skin/{ => base}/default/graphics/planeten/trockenplanet07.jpg (100%) rename skin/{ => base}/default/graphics/planeten/trockenplanet08.jpg (100%) rename skin/{ => base}/default/graphics/planeten/trockenplanet09.jpg (100%) rename skin/{ => base}/default/graphics/planeten/trockenplanet10.jpg (100%) rename skin/{ => base}/default/graphics/planeten/wasserplanet01.jpg (100%) rename skin/{ => base}/default/graphics/planeten/wasserplanet02.jpg (100%) rename skin/{ => base}/default/graphics/planeten/wasserplanet03.jpg (100%) rename skin/{ => base}/default/graphics/planeten/wasserplanet04.jpg (100%) rename skin/{ => base}/default/graphics/planeten/wasserplanet05.jpg (100%) rename skin/{ => base}/default/graphics/planeten/wasserplanet06.jpg (100%) rename skin/{ => base}/default/graphics/planeten/wasserplanet07.jpg (100%) rename skin/{ => base}/default/graphics/planeten/wasserplanet08.jpg (100%) rename skin/{ => base}/default/graphics/planeten/wasserplanet09.jpg (100%) rename skin/{ => base}/default/graphics/planeten/wuestenplanet01.jpg (100%) rename skin/{ => base}/default/graphics/planeten/wuestenplanet02.jpg (100%) rename skin/{ => base}/default/graphics/planeten/wuestenplanet03.jpg (100%) rename skin/{ => base}/default/graphics/planeten/wuestenplanet04.jpg (100%) rename db/mysql.php => skin/base/default/js/fleet.js (56%) diff --git a/add_declare.php b/add_declare.php index c1cc82e..29a0909 100644 --- a/add_declare.php +++ b/add_declare.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,13 +24,13 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); -require_once dirname(__FILE__) .'/common.php'; +require_once dirname(__FILE__) .'/application/bootstrap.php'; includeLang('admin'); diff --git a/admin/ElementQueueFixer.php b/admin/ElementQueueFixer.php index b6bdd95..542b7f9 100644 --- a/admin/ElementQueueFixer.php +++ b/admin/ElementQueueFixer.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR, LEVEL_MODERATOR))) { includeLang('admin'); diff --git a/admin/QueryExecute.php b/admin/QueryExecute.php index d3291de..6ec9889 100644 --- a/admin/QueryExecute.php +++ b/admin/QueryExecute.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN))) { includeLang('admin/Queries'); diff --git a/admin/ShowFlyingFleets.php b/admin/ShowFlyingFleets.php index 3ba7222..89f1eb1 100644 --- a/admin/ShowFlyingFleets.php +++ b/admin/ShowFlyingFleets.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR, LEVEL_MODERATOR))) { includeLang('admin/fleets'); diff --git a/admin/XNovaResetUnivers.php b/admin/XNovaResetUnivers.php index a9aad1e..e8d1026 100644 --- a/admin/XNovaResetUnivers.php +++ b/admin/XNovaResetUnivers.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,18 +24,18 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; includeLang('admin'); -function XNovaResetUnivers ( $CurrentUser ) { +function WootookResetUnivers ( $CurrentUser ) { global $lang; if (in_array($CurrentUser['authlevel'], array(LEVEL_ADMIN))) { @@ -129,7 +129,7 @@ function XNovaResetUnivers ( $CurrentUser ) { $parse = $lang; if ($mode == 'reset') { - XNovaResetUnivers ( $user ); + WootookResetUnivers ( $user ); } else { $Page = parsetemplate($PageTpl, $parse); display ($Page, $lang['Reset'], false, '', true); diff --git a/admin/activeplanet.php b/admin/activeplanet.php index 26b2603..e8bf1b5 100644 --- a/admin/activeplanet.php +++ b/admin/activeplanet.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR))) { includeLang('admin'); diff --git a/admin/add_fleet.php b/admin/add_fleet.php index a0e741c..96d8a21 100644 --- a/admin/add_fleet.php +++ b/admin/add_fleet.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if ($user['authlevel'] >= 1) { includeLang('admin/add_fleet'); diff --git a/admin/add_money.php b/admin/add_money.php index 62fda5a..142acd7 100644 --- a/admin/add_money.php +++ b/admin/add_money.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR))) { includeLang('admin'); diff --git a/admin/add_moon.php b/admin/add_moon.php index 4cfb1bd..6607d27 100644 --- a/admin/add_moon.php +++ b/admin/add_moon.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR))) { includeLang('admin/addmoon'); diff --git a/admin/autounban.php b/admin/autounban.php index 8564464..c5afbe6 100644 --- a/admin/autounban.php +++ b/admin/autounban.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN))) { $lang['PHP_SELF'] = 'options.'.PHPEXT; diff --git a/admin/banned.php b/admin/banned.php index c0c00dd..f053aa8 100644 --- a/admin/banned.php +++ b/admin/banned.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR, LEVEL_MODERATOR))) { includeLang('admin'); diff --git a/admin/changelog.php b/admin/changelog.php index 945f2f4..5b63eaa 100644 --- a/admin/changelog.php +++ b/admin/changelog.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; includeLang('changelog'); $template = gettemplate('changelog_table'); diff --git a/admin/chat.php b/admin/chat.php index ed1a0b6..3618898 100644 --- a/admin/chat.php +++ b/admin/chat.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; includeLang('admin'); $parse = $lang; diff --git a/admin/credit.php b/admin/credit.php index 19487d5..bccba11 100644 --- a/admin/credit.php +++ b/admin/credit.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; includeLang('credit'); $parse = $lang; diff --git a/admin/declare_list.php b/admin/declare_list.php index facedf0..961bf04 100644 --- a/admin/declare_list.php +++ b/admin/declare_list.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR))) { includeLang('admin'); diff --git a/admin/deletuser.php b/admin/deletuser.php index c2fd953..70b9966 100644 --- a/admin/deletuser.php +++ b/admin/deletuser.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($CurrentUser['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR))) { $PageTpl = gettemplate( "admin/deletuser" ); diff --git a/admin/errors.php b/admin/errors.php index 117d3f8..c57083c 100644 --- a/admin/errors.php +++ b/admin/errors.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; includeLang('admin'); $parse = $lang; diff --git a/admin/leftmenu.php b/admin/leftmenu.php index 722e61b..180034a 100644 --- a/admin/leftmenu.php +++ b/admin/leftmenu.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; includeLang('leftmenu'); @@ -39,8 +39,8 @@ includeLang('leftmenu'); $parse = $lang; $parse['mf'] = "Hauptframe"; $parse['dpath'] = $dpath; - $parse['XNovaRelease'] = VERSION; - $parse['servername'] = XNova; + $parse['WootookRelease'] = VERSION; + $parse['servername'] = Wootook; $Page = parsetemplate(gettemplate('admin/left_menu'), $parse); display( $Page, "", false, '', true); } else { diff --git a/admin/mass_message.php b/admin/mass_message.php index a928720..43998cf 100644 --- a/admin/mass_message.php +++ b/admin/mass_message.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,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. * */ diff --git a/admin/md5changepass.php b/admin/md5changepass.php index d68554e..46c43d5 100644 --- a/admin/md5changepass.php +++ b/admin/md5changepass.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR, LEVEL_MODERATOR))) { includeLang('admin/changepass'); diff --git a/admin/md5enc.php b/admin/md5enc.php index 8450091..b4a96b7 100644 --- a/admin/md5enc.php +++ b/admin/md5enc.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR, LEVEL_MODERATOR))) { includeLang('admin/md5enc'); diff --git a/admin/messagelist.php b/admin/messagelist.php index e2cea50..49c207c 100644 --- a/admin/messagelist.php +++ b/admin/messagelist.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR))) { includeLang('admin/messagelist'); diff --git a/admin/messall.php b/admin/messall.php index 4792ed8..fb7b834 100644 --- a/admin/messall.php +++ b/admin/messall.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR, LEVEL_MODERATOR))) { if ($_POST && $mode == "change") { diff --git a/admin/moonlist.php b/admin/moonlist.php index 8862d07..645d086 100644 --- a/admin/moonlist.php +++ b/admin/moonlist.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR))) { includeLang('overview'); diff --git a/admin/multi.php b/admin/multi.php index 5eda1a9..e174971 100644 --- a/admin/multi.php +++ b/admin/multi.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR, LEVEL_MODERATOR))) { includeLang('admin/multi'); diff --git a/admin/overview.php b/admin/overview.php index 396eba6..1a7c5d3 100644 --- a/admin/overview.php +++ b/admin/overview.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR, LEVEL_MODERATOR))) { includeLang('admin'); diff --git a/admin/paneladmina.php b/admin/paneladmina.php index 459411c..f4097b7 100644 --- a/admin/paneladmina.php +++ b/admin/paneladmina.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,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. * */ @@ -32,7 +32,7 @@ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR, LEVEL_MODERATOR))) { diff --git a/admin/planetlist.php b/admin/planetlist.php index 27213b0..0d3eacc 100644 --- a/admin/planetlist.php +++ b/admin/planetlist.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR))) { @@ -59,5 +59,5 @@ require_once dirname(dirname(__FILE__)) .'/common.php'; message($lang['sys_noalloaw'], $lang['sys_noaccess']); } -// Created by e-Zobar. All rights reversed (C) XNova Team 2008 +// Created by e-Zobar. All rights reversed (C) Wootook Team 2008 ?> \ No newline at end of file diff --git a/admin/settings.php b/admin/settings.php index 06accee..5466aa1 100644 --- a/admin/settings.php +++ b/admin/settings.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; function DisplayGameSettingsPage ( $CurrentUser ) { diff --git a/admin/statbuilder.php b/admin/statbuilder.php index 4784fee..7f02140 100644 --- a/admin/statbuilder.php +++ b/admin/statbuilder.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,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. * */ @@ -32,7 +32,7 @@ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; include(ROOT_PATH . 'admin/statfunctions.' . PHPEXT); diff --git a/admin/statfunctions.php b/admin/statfunctions.php index 30e2d7c..36cfe93 100644 --- a/admin/statfunctions.php +++ b/admin/statfunctions.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,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. * */ diff --git a/admin/unbanned.php b/admin/unbanned.php index c7f30ba..cfc9027 100644 --- a/admin/unbanned.php +++ b/admin/unbanned.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR))) { diff --git a/admin/userlist.php b/admin/userlist.php index 62b1fea..ecb19df 100644 --- a/admin/userlist.php +++ b/admin/userlist.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR))) { includeLang('admin'); diff --git a/admin/variables.php b/admin/variables.php index b76406e..527af4c 100644 --- a/admin/variables.php +++ b/admin/variables.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,14 +24,14 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); define('IN_ADMIN', true); -require_once dirname(dirname(__FILE__)) .'/common.php'; +require_once dirname(dirname(__FILE__)) .'/application/bootstrap.php'; if (in_array($user['authlevel'], array(LEVEL_ADMIN, LEVEL_OPERATOR, LEVEL_MODERATOR))) { diff --git a/ainfo.php b/ainfo.php index a1ae4f2..4f12f4f 100644 --- a/ainfo.php +++ b/ainfo.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,13 +24,13 @@ * --> 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. * */ define('INSIDE' , true); define('INSTALL' , false); -require_once dirname(__FILE__) .'/common.php'; +require_once dirname(__FILE__) .'/application/bootstrap.php'; $dpath = (!$userrow["dpath"]) ? DEFAULT_SKINPATH : $userrow["dpath"]; diff --git a/alliance.php b/alliance.php index b3b716f..3c90d3c 100644 --- a/alliance.php +++ b/alliance.php @@ -1,11 +1,11 @@ + * Copyright (c) 2009-Present, Wootook Support Team * All rights reserved. * * This program is free software: you can redistribute it and/or modify @@ -24,16 +24,16 @@ * --> 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. * */ define('INSTALL' , false); define('INSIDE' , true); -require_once dirname(__FILE__) .'/common.php'; +require_once dirname(__FILE__) .'/application/bootstrap.php'; -$user = Legacies_Empire_Model_User::getSingleton(); -$db = Legacies_Database::getSingleton(); +$user = Wootook_Empire_Model_User::getSingleton(); +$db = Wootook_Database::getSingleton(); if(!$user->getId()){ echo ' diff --git a/includes/application/code/core/Legacies/Core/Block/Html/Navigation.php b/application/code/core/Wootook/Core/Block/Html/Navigation.php similarity index 85% rename from includes/application/code/core/Legacies/Core/Block/Html/Navigation.php rename to application/code/core/Wootook/Core/Block/Html/Navigation.php index 36cfe24..3959f6d 100644 --- a/includes/application/code/core/Legacies/Core/Block/Html/Navigation.php +++ b/application/code/core/Wootook/Core/Block/Html/Navigation.php @@ -1,7 +1,7 @@ createBlock('core/html.navigation.node', $this->getNameInLayout() . '.' . $name); } - if ($child instanceof Legacies_Core_Block_Html_Navigation_Link) { - throw new RuntimeException('Node is a link. Could not append a child node to a link node.'); + if ($child instanceof Wootook_Core_Block_Html_Navigation_Link) { + throw new Wootook_Core_Exception_RuntimeException('Node is a link. Could not append a child node to a link node.'); } if (count($explodedPath) == 0) { diff --git a/includes/application/code/core/Legacies/Core/Block/Html/Navigation/Link.php b/application/code/core/Wootook/Core/Block/Html/Navigation/Link.php similarity index 96% rename from includes/application/code/core/Legacies/Core/Block/Html/Navigation/Link.php rename to application/code/core/Wootook/Core/Block/Html/Navigation/Link.php index f70e493..cd288e4 100644 --- a/includes/application/code/core/Legacies/Core/Block/Html/Navigation/Link.php +++ b/application/code/core/Wootook/Core/Block/Html/Navigation/Link.php @@ -1,7 +1,7 @@ getScriptPath()}/%s/%s/scripts/{$file}"; + if (($layout = $this->getLayout()) !== null) { + $package = $this->getLayout()->getPackage(); + $theme = $this->getLayout()->getTheme(); + + if ($package !== Wootook_Core_Layout::DEFAULT_PACKAGE) { + if ($theme !== Wootook_Core_Layout::DEFAULT_THEME) { + $path = sprintf($pattern, $package, $theme); + if (Wootook::fileExists($path)) { + return $path; + } + } + + $path = sprintf($pattern, $package, Wootook_Core_Layout::DEFAULT_THEME); + if (Wootook::fileExists($path)) { + return $path; + } + } + } + + $path = sprintf($pattern, Wootook_Core_Layout::DEFAULT_PACKAGE, Wootook_Core_Layout::DEFAULT_THEME); + if (Wootook::fileExists($path)) { + return $path; + } + + trigger_error("Template '{$file}' could not be found.", E_USER_ERROR); + return null; + } +} \ No newline at end of file diff --git a/includes/application/code/core/Legacies/Core/Block/Text.php b/application/code/core/Wootook/Core/Block/Text.php similarity index 86% rename from includes/application/code/core/Legacies/Core/Block/Text.php rename to application/code/core/Wootook/Core/Block/Text.php index 6890ac2..129df11 100644 --- a/includes/application/code/core/Legacies/Core/Block/Text.php +++ b/application/code/core/Wootook/Core/Block/Text.php @@ -1,7 +1,7 @@ quote($data); @@ -105,7 +105,7 @@ class Legacies_Core_Collection static $database = null; if ($database === null) { - $database = Legacies_Database::getSingleton(); + $database = Wootook_Database::getSingleton(); } if (is_array($table)) { @@ -160,7 +160,7 @@ class Legacies_Core_Collection protected function _prepareSql() { if (empty($this->_union)) { - $database = Legacies_Database::getSingleton(); + $database = Wootook_Database::getSingleton(); $fields = array(); foreach ($this->_columns as $field) { @@ -254,7 +254,7 @@ SQL_EOF; { $sql = $this->_prepareSql(); - $database = Legacies_Database::getSingleton(); + $database = Wootook_Database::getSingleton(); $statement = $database->prepare($sql); $args = func_get_args(); @@ -301,7 +301,7 @@ SQL_EOF; $sql = $clone->_prepareSql(); - $database = Legacies_Database::getSingleton(); + $database = Wootook_Database::getSingleton(); $statement = $database->prepare($sql); $args = func_get_args(); diff --git a/includes/application/code/core/Legacies/Core/Controller/Action.php b/application/code/core/Wootook/Core/Controller/Action.php similarity index 80% rename from includes/application/code/core/Legacies/Core/Controller/Action.php rename to application/code/core/Wootook/Core/Controller/Action.php index 4bf9f30..58aa8ec 100644 --- a/includes/application/code/core/Legacies/Core/Controller/Action.php +++ b/application/code/core/Wootook/Core/Controller/Action.php @@ -1,6 +1,6 @@ getResponse() - ->setRawHeader('HTTP/1.1 302 Found') - ->setHeader('Location', $url) - ->setIsRedirect(true) - ; + $this->getResponse()->setRedirect($url); return $this; } diff --git a/includes/application/code/core/Legacies/Core/Controller/Request/Http.php b/application/code/core/Wootook/Core/Controller/Request/Http.php similarity index 81% rename from includes/application/code/core/Legacies/Core/Controller/Request/Http.php rename to application/code/core/Wootook/Core/Controller/Request/Http.php index bf9a879..611294f 100644 --- a/includes/application/code/core/Legacies/Core/Controller/Request/Http.php +++ b/application/code/core/Wootook/Core/Controller/Request/Http.php @@ -1,7 +1,7 @@ getServer('REQUEST_METHOD')) == 'POST') { + return true; + } + return false; + } + + public function isGet() + { + if (strtoupper($this->getServer('REQUEST_METHOD')) == 'GET') { + return true; + } + return false; + } } \ No newline at end of file diff --git a/includes/application/code/core/Legacies/Core/Controller/Response/Http.php b/application/code/core/Wootook/Core/Controller/Response/Http.php similarity index 76% rename from includes/application/code/core/Legacies/Core/Controller/Response/Http.php rename to application/code/core/Wootook/Core/Controller/Response/Http.php index 6d289ad..d463fa5 100644 --- a/includes/application/code/core/Legacies/Core/Controller/Response/Http.php +++ b/application/code/core/Wootook/Core/Controller/Response/Http.php @@ -1,8 +1,20 @@ 'Moved Permanently', + REDIRECT_FOUND => 'Found', + REDIRECT_SEE_OTHER => 'See Other', + REDIRECT_TEMPORARY => 'Temporary Redirect' + ); + public function __construct() { parent::__construct(array()); @@ -129,4 +141,18 @@ class Legacies_Core_Controller_Response_Http setcookie($name, $value, time() + $lifetime, $path, $domain); return $this; } + + public function setRedirect($url, $code = self::REDIRECT_FOUND) + { + if (!in_array($code, self::$_redirectCodes)) { + $code = self::REDIRECT_FOUND; + } + + $statusText = self::$_redirectCodes[$code]; + $this->setRawHeader("HTTP/1.1 {$code} {$statusText}") + ->setHeader('Location', $url) + ->setIsRedirect(true); + + return $this; + } } \ No newline at end of file diff --git a/includes/application/code/core/Legacies/Core/Email.php b/application/code/core/Wootook/Core/Email.php similarity index 85% rename from includes/application/code/core/Legacies/Core/Email.php rename to application/code/core/Wootook/Core/Email.php index 8241c60..0dfcba4 100644 --- a/includes/application/code/core/Legacies/Core/Email.php +++ b/application/code/core/Wootook/Core/Email.php @@ -1,6 +1,6 @@ setHeader($name, $value); } - $this->addHeader('X-Mailer', 'PHP/' . PHP_VERSION . ' Legacies/' . VERSION); + $this->addHeader('X-Mailer', 'PHP/' . PHP_VERSION . ' Wootook/' . VERSION); $this->addHeader('Content-Transfer-Encoding', '7bit'); $this->addHeader('Content-Type', 'text/plain; charset=utf-8'); diff --git a/includes/application/code/core/Legacies/Core/Entity.php b/application/code/core/Wootook/Core/Entity.php similarity index 87% rename from includes/application/code/core/Legacies/Core/Entity.php rename to application/code/core/Wootook/Core/Entity.php index 2378c75..9c736ee 100644 --- a/includes/application/code/core/Legacies/Core/Entity.php +++ b/application/code/core/Wootook/Core/Entity.php @@ -1,14 +1,12 @@ _idFieldName = $fieldName; @@ -50,7 +48,7 @@ abstract class Legacies_Core_Entity $id = func_get_arg(0); $idFieldName = self::getIdFieldName(); - $database = Legacies_Database::getSingleton(); + $database = Wootook_Database::getSingleton(); $sql =<<getTable(self::getTableName())} @@ -64,7 +62,7 @@ SQL_EOF; $datas = $statement->fetch(PDO::FETCH_ASSOC); if (!is_array($datas) || empty($datas)) { - throw new Legacies_Core_Model_Exception('Could not load data: this id could not be found.'); + throw new Wootook_Core_Exception_DataAccessException('Could not load data: this id could not be found.'); } unset($datas[self::getIdFieldName()]); @@ -91,7 +89,7 @@ SQL_EOF; $idFieldName = self::getIdFieldName(); $values[$idFieldName] = $this->getId(); - $database = Legacies_Database::getSingleton(); + $database = Wootook_Database::getSingleton(); $sql =<<getTable(self::getTableName())} SET {$fieldsImploded} @@ -115,7 +113,7 @@ SQL_EOF; } $tokensImploded = implode(', ', $tokens); - $database = Legacies_Database::getSingleton(); + $database = Wootook_Database::getSingleton(); $sql =<<getTable(self::getTableName())} ($fieldsImploded) VALUES ({$tokensImploded}) @@ -142,7 +140,7 @@ SQL_EOF; $fieldsImploded = implod(', ', $fields); $idFieldName = self::getIdFieldName(); - $database = Legacies_Database::getSingleton(); + $database = Wootook_Database::getSingleton(); $sql =<<getTable(self::getTableName())} WHERE {$idFieldName}=:{$idFieldName} diff --git a/includes/application/code/core/Legacies/Core/Entity/SubTable.php b/application/code/core/Wootook/Core/Entity/SubTable.php similarity index 86% rename from includes/application/code/core/Legacies/Core/Entity/SubTable.php rename to application/code/core/Wootook/Core/Entity/SubTable.php index 550acb6..470b89c 100644 --- a/includes/application/code/core/Legacies/Core/Entity/SubTable.php +++ b/application/code/core/Wootook/Core/Entity/SubTable.php @@ -2,12 +2,12 @@ /** * - * @uses Legacies_Object + * @uses Wootook_Object * @uses Legacies_Empire - * @uses Legacies_Empire_User + * @uses Wootook_Empire_Model_User */ -abstract class Legacies_Core_Entity_SubTable - extends Legacies_Core_Model +abstract class Wootook_Core_Entity_SubTable + extends Wootook_Core_Model { private $_isLoaded = false; protected $_tableName = null; @@ -32,7 +32,7 @@ abstract class Legacies_Core_Entity_SubTable $idFields = '(' . implode(') AND (', $idFields) . ')'; $fields = implode(', ', $fields); - $database = Legacies_Database::getSingleton(); + $database = Wootook_Database::getSingleton(); $sql =<<getTable(self::getTableName())} SET {$fields} @@ -51,7 +51,7 @@ SQL_EOF; } $tokens = implode(', ', $tokens); - $database = Legacies_Database::getSingleton(); + $database = Wootook_Database::getSingleton(); $sql =<<getTable(self::getTableName())} ($fields) VALUES ({$tokens}) @@ -66,7 +66,7 @@ SQL_EOF; protected function _load() { $idValues = func_get_arg(0); - $database = Legacies_Database::getSingleton(); + $database = Wootook_Database::getSingleton(); $idFields = array(); foreach ($this->_idFieldNames as $field) { @@ -84,7 +84,7 @@ SQL_EOF; $datas = $statement->fetch(PDO::FETCH_ASSOC); if (!is_array($datas) || empty($datas)) { - throw new Legacies_Core_Model_Exception('Could not load data: this id combination could not be found.'); + throw new Wootook_Core_Exception_DataAccessException('Could not load data: this id combination could not be found.'); } $this->_data = $datas; @@ -95,7 +95,7 @@ SQL_EOF; protected function _delete() { - $database = Legacies_Database::getSingleton(); + $database = Wootook_Database::getSingleton(); $idFields = array(); $idValues = array(); diff --git a/includes/application/code/core/Legacies/Core/EntityInterface.php b/application/code/core/Wootook/Core/EntityInterface.php similarity index 85% rename from includes/application/code/core/Legacies/Core/EntityInterface.php rename to application/code/core/Wootook/Core/EntityInterface.php index cc4e0ee..9843e61 100644 --- a/includes/application/code/core/Legacies/Core/EntityInterface.php +++ b/application/code/core/Wootook/Core/EntityInterface.php @@ -1,6 +1,6 @@ _exceptions[] = $exception; } - protected function _renderError($error) + protected function _renderError($id, $error) { $types = array( 0x0001 => 'E_ERROR', @@ -113,6 +122,7 @@ class Legacies_Core_ErrorProfiler $microsec = (int) ($error['time'][0] * 1000000); return <<'; echo '

Debug profiler

'; if (count($this->_errors) <= 0 && count($this->_warnings) <= 0 && @@ -133,20 +144,22 @@ ERROR_EOF; } else { echo '
';
             foreach ($this->_errors as $error) {
-                echo $this->_renderError($error);
+                echo $this->_renderError(++$index, $error);
             }
             foreach ($this->_warnings as $error) {
-                echo $this->_renderError($error);
+                echo $this->_renderError(++$index, $error);
             }
             foreach ($this->_notices as $error) {
-                echo $this->_renderError($error);
+                echo $this->_renderError(++$index, $error);
             }
             foreach ($this->_otherErrors as $errorList) {
                 foreach ($errorList as $error) {
-                    echo $this->_renderError($error);
+                    echo $this->_renderError(++$index, $error);
                 }
             }
             foreach ($this->_exceptions as $exception) {
+                $index++;
+                echo "Message #{$index}". PHP_EOL;
                 echo $exception->getMessage() . PHP_EOL;
                 echo $exception->getTraceAsString();
             }
@@ -176,4 +189,14 @@ ERROR_EOF;
             register_shutdown_function(array(self::getSingleton(), 'shutdownManager'));
         }
     }
+
+    public static function sleep()
+    {
+        self::$_listen = false;
+    }
+
+    public static function wakeup()
+    {
+        self::$_listen = true;
+    }
 }
diff --git a/application/code/core/Wootook/Core/Event.php b/application/code/core/Wootook/Core/Event.php
new file mode 100644
index 0000000..42d5c92
--- /dev/null
+++ b/application/code/core/Wootook/Core/Event.php
@@ -0,0 +1,6 @@
+ array(
+            'Wootook_Core_Block_' => 'Wootook/core/Block'
+            )
+        );
+
     public function _init()
     {
-        $path = APPLICATION_PATH . 'design/layouts/';
+        $modules = Wootook_Core_Model_Config_Modules::getSingleton();
+
+        foreach ($modules['block'] as $module => $moduleNamespaces) {
+            foreach ($moduleNamespaces as $namespace => $path) {
+                $this->registerBlockNamespace($module, $namespace, $path);
+            }
+        }
+
         $config = include ROOT_PATH . 'config.php';
-        $fileList = $config['global']['layout'];
+        $fileList = array();
+        if (isset($config['global'])) {
+            if (isset($config['global']['layout'])) {
+                $fileList = $config['global']['layout'];
+            }
+            if (isset($config['global']['package'])) {
+                $this->setPackage($config['global']['package']);
+            }
+            if (isset($config['global']['theme'])) {
+                $this->setTheme($config['global']['theme']);
+            }
+        }
 
         foreach ($fileList as $layoutFile) {
-            foreach (include $path . $layoutFile as $layoutId => $layoutConfig) {
+            foreach (include $this->_getLayoutPath($layoutFile) as $layoutId => $layoutConfig) {
                 if ($this->hasData($layoutId)) {
                     $declared = $this->getData($layoutId);
 
@@ -30,7 +60,7 @@ class Legacies_Core_Layout
         return $this;
     }
 
-    public function _load()
+    protected function _load()
     {
         $layoutId = func_get_arg(0);
 
@@ -70,10 +100,14 @@ class Legacies_Core_Layout
         }
         unset($layoutConfigs, $layoutConfig['update']);
 
-        $type = $layoutConfig['type'];
-        $name = isset($layoutConfig['name']) ? $layoutConfig['name'] : 'root';
+        if (isset($layoutConfig['type'])) {
+            $type = $layoutConfig['type'];
+            $name = isset($layoutConfig['name']) ? $layoutConfig['name'] : 'root';
 
-        $this->_view = $this->_createBlock($type, $name, $layoutConfig);
+            $this->_view = $this->_createBlock($type, $name, $layoutConfig);
+        } else if (!isset($this->_view)) {
+            return $this;
+        }
 
         foreach ($layoutUpdates as $block => $updates) {
             if (!isset($this->_blocks[$block])) {
@@ -110,11 +144,11 @@ class Legacies_Core_Layout
         }
     }
 
-    public function _save()
+    protected function _save()
     {
     }
 
-    public function _delete()
+    protected function _delete()
     {
     }
 
@@ -128,12 +162,58 @@ class Legacies_Core_Layout
         $module = substr($type, 0, $offset);
         $block  = substr($type, $offset + 1);
 
+        /*
         $module = str_replace(' ', '', ucwords(str_replace('-', ' ', $module)));
         $module = str_replace(' ', '_', ucwords(str_replace('.', ' ', $module)));
+        */
         $block = str_replace(' ', '', ucwords(str_replace('-', ' ', $block)));
         $block = str_replace(' ', '_', ucwords(str_replace('.', ' ', $block)));
 
-        return 'Legacies_' . $module . '_Block_' . $block;
+        if (isset($this->_namespaces[$module])) {
+            foreach ($this->_namespaces[$module] as $namespace => $path) {
+                $className = $namespace . $block;
+                $fileName = $path . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $block) . '.php';
+
+                Wootook_Core_ErrorProfiler::sleep();
+                if (!($fp = @fopen($fileName, 'r', true))) {
+                    Wootook_Core_ErrorProfiler::wakeup();
+                    continue;
+                }
+                Wootook_Core_ErrorProfiler::wakeup();
+                fclose($fp);
+
+                if (!class_exists($className, true)) {
+                    continue;
+                }
+
+                return $className;
+            }
+        }
+
+        trigger_error(Wootook::__('Class type "%s" could not be resolved.', $type), E_USER_INFO);
+        return null;
+    }
+
+    public function registerBlockNamespace($module, $namespace, $path = null)
+    {
+        if ($path === null) {
+            $path = str_replace('_', DIRECTORY_SEPARATOR, $namespace);
+        }
+        if (!isset($this->_namespaces[$module])) {
+            $this->_namespaces[$module] = array();
+        }
+        $this->_namespaces[$module][$namespace] = $path;
+
+        return $this;
+    }
+
+    public function unregisterBlockNamespace($module, $namespace)
+    {
+        if (isset($this->_namespaces[$module]) && isset($this->_namespaces[$module][$namespace])) {
+            unset($this->_namespaces[$module][$namespace]);
+        }
+
+        return $this;
     }
 
     public function createBlock($type, $name, $config = array())
@@ -149,6 +229,10 @@ class Legacies_Core_Layout
     {
         $className = $this->_resolveBlockClassType($type);
 
+        if ($className === null) {
+            return null;
+        }
+
         $children = array();
         if (isset($config['children'])) {
             $children = $config['children'];
@@ -177,13 +261,13 @@ class Legacies_Core_Layout
                 }
 
                 if (!isset($config['type'])) {
-                    $instance->$alias = new Legacies_Core_View($config);
+                    $instance->$alias = new Wootook_Core_View($config);
                 } else {
                     $instance->$alias = $this->_createBlock($config['type'], $name, $config);
                 }
             }
         } catch (ReflectionException $e) {
-            var_dump($e);
+            trigger_error($e->getMessage(), E_USER_INFO);
             return null;
         }
 
@@ -221,19 +305,50 @@ class Legacies_Core_Layout
                         $callParamaters[$paramterPosition] = $parameter->getDefaultValue();
                     //} else if (!$parameter->isOptionnal()) {
                     } else if ($paramterPosition <= $requiredParameterCount) {
-                        throw new RuntimeException();
+                        throw new Wootook_Core_Exception_RuntimeException();
                     }
                 }
 
                 $reflectionMethod->invokeArgs($block, $callParamaters);
             } catch (ReflectionException $e) {
+                trigger_error($e->getMessage(), E_USER_INFO);
                 continue;
             } catch (RuntimeException $e) {
+                trigger_error($e->getMessage(), E_USER_WARNING);
                 continue;
             }
         }
     }
 
+    public function getPackage()
+    {
+        return $this->_package;
+    }
+
+    public function setPackage($package)
+    {
+        $this->_package = $package;
+
+        return $this;
+    }
+
+    public function getTheme()
+    {
+        return $this->_theme;
+    }
+
+    public function setTheme($theme)
+    {
+        $this->_theme = $theme;
+
+        return $this;
+    }
+
+    public function getScriptPath()
+    {
+        return APPLICATION_PATH . DIRECTORY_SEPARATOR . 'design';
+    }
+
     public function getBlock($code)
     {
         if (isset($this->_blocks[$code])) {
@@ -244,11 +359,41 @@ class Legacies_Core_Layout
 
     public function render()
     {
+        $scriptPath = $this->getScriptPath();
         foreach ($this->_blocks as $block) {
+            if ($block instanceof Wootook_Core_Block_Template) {
+                $block->setScriptPath($scriptPath);
+            }
             $block->beforeToHtml();
         }
         unset($block);
 
         return $this->_view->render();
     }
+
+    protected function _getLayoutPath($file)
+    {
+        $package = $this->getPackage();
+        $theme = $this->getTheme();
+        $pattern = "{$this->getScriptPath()}/%s/%s/layouts/{$file}";
+
+        $path = sprintf($pattern, $package, $theme);
+        if (Wootook::fileExists($path)) {
+            return $path;
+        }
+
+        $path = sprintf($pattern, $package, self::DEFAULT_THEME);
+        if (Wootook::fileExists($path)) {
+            return $path;
+        }
+
+        $path = sprintf($pattern, self::DEFAULT_PACKAGE, self::DEFAULT_THEME);
+        if (Wootook::fileExists($path)) {
+            return $path;
+        }
+
+        trigger_error(Legacies::__("Layout file '%s' does not exist.", $file), E_USER_INFO);
+
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/includes/application/code/core/Legacies/Core/Model.php b/application/code/core/Wootook/Core/Model.php
similarity index 68%
rename from includes/application/code/core/Legacies/Core/Model.php
rename to application/code/core/Wootook/Core/Model.php
index 06f7bab..087f511 100644
--- a/includes/application/code/core/Legacies/Core/Model.php
+++ b/application/code/core/Wootook/Core/Model.php
@@ -1,7 +1,7 @@
 _setOriginalData($this->_data);
         } catch (PDOException $e) {
-            throw new Legacies_Core_Model_Exception('Could not save data: ' . $e->getMessage(), 0);
+            throw new Wootook_Core_Exception_DataAccessException('Could not save data: ' . $e->getMessage(), 0);
         }
         return $this;
     }
@@ -41,10 +41,10 @@ abstract class Legacies_Core_Model
 
     protected function _beforeSave()
     {
-        Legacies::dispatchEvent('model.before-save', array('model' => $this));
+        Wootook::dispatchEvent('model.before-save', array('model' => $this));
 
         if ($this->_eventPrefix !== null && $this->_eventObject !== null) {
-            Legacies::dispatchEvent($this->_eventPrefix . '.before-save', array($this->_eventObject => $this));
+            Wootook::dispatchEvent($this->_eventPrefix . '.before-save', array($this->_eventObject => $this));
         }
 
         return $this;
@@ -52,10 +52,10 @@ abstract class Legacies_Core_Model
 
     protected function _afterSave()
     {
-        Legacies::dispatchEvent('model.after-save', array('model' => $this));
+        Wootook::dispatchEvent('model.after-save', array('model' => $this));
 
         if ($this->_eventPrefix !== null && $this->_eventObject !== null) {
-            Legacies::dispatchEvent($this->_eventPrefix . '.after-save', array($this->_eventObject => $this));
+            Wootook::dispatchEvent($this->_eventPrefix . '.after-save', array($this->_eventObject => $this));
         }
 
         return $this;
@@ -70,7 +70,7 @@ abstract class Legacies_Core_Model
             call_user_func_array(array($this, '_afterLoad'), $params);
             $this->_setOriginalData($this->_data);
         } catch (PDOException $e) {
-            throw new Legacies_Core_Model_Exception('Could not load data: ' . $e->getMessage(), 0);
+            throw new Wootook_Core_Exception_DataAccessException('Could not load data: ' . $e->getMessage(), 0);
         }
         return $this;
     }
@@ -79,10 +79,10 @@ abstract class Legacies_Core_Model
 
     protected function _beforeLoad()
     {
-        Legacies::dispatchEvent('model.before-load', array('model' => $this));
+        Wootook::dispatchEvent('model.before-load', array('model' => $this));
 
         if ($this->_eventPrefix !== null && $this->_eventObject !== null) {
-            Legacies::dispatchEvent($this->_eventPrefix . '.before-load', array($this->_eventObject => $this));
+            Wootook::dispatchEvent($this->_eventPrefix . '.before-load', array($this->_eventObject => $this));
         }
 
         return $this;
@@ -90,10 +90,10 @@ abstract class Legacies_Core_Model
 
     protected function _afterLoad()
     {
-        Legacies::dispatchEvent('model.after-load', array('model' => $this));
+        Wootook::dispatchEvent('model.after-load', array('model' => $this));
 
         if ($this->_eventPrefix !== null && $this->_eventObject !== null) {
-            Legacies::dispatchEvent($this->_eventPrefix . '.after-load', array($this->_eventObject => $this));
+            Wootook::dispatchEvent($this->_eventPrefix . '.after-load', array($this->_eventObject => $this));
         }
 
         return $this;
@@ -107,7 +107,7 @@ abstract class Legacies_Core_Model
             call_user_func_array(array($this, '_delete'), $params);
             call_user_func_array(array($this, '_afterDelete'), $params);
         } catch (PDOException $e) {
-            throw new Legacies_Core_Model_Exception('Could not delete entity: ' . $e->getMessage(), 0);
+            throw new Wootook_Core_Exception_DataAccessException('Could not delete entity: ' . $e->getMessage(), 0);
         }
         return $this;
     }
@@ -116,10 +116,10 @@ abstract class Legacies_Core_Model
 
     protected function _beforeDelete()
     {
-        Legacies::dispatchEvent('model.before-delete', array('model' => $this));
+        Wootook::dispatchEvent('model.before-delete', array('model' => $this));
 
         if ($this->_eventPrefix !== null && $this->_eventObject !== null) {
-            Legacies::dispatchEvent($this->_eventPrefix . '.before-delete', array($this->_eventObject => $this));
+            Wootook::dispatchEvent($this->_eventPrefix . '.before-delete', array($this->_eventObject => $this));
         }
 
         return $this;
@@ -127,10 +127,10 @@ abstract class Legacies_Core_Model
 
     protected function _afterDelete()
     {
-        Legacies::dispatchEvent('model.after-delete', array('model' => $this));
+        Wootook::dispatchEvent('model.after-delete', array('model' => $this));
 
         if ($this->_eventPrefix !== null && $this->_eventObject !== null) {
-            Legacies::dispatchEvent($this->_eventPrefix . '.after-delete', array($this->_eventObject => $this));
+            Wootook::dispatchEvent($this->_eventPrefix . '.after-delete', array($this->_eventObject => $this));
         }
 
         return $this;
diff --git a/includes/application/code/core/Legacies/Core/Model/Config.php b/application/code/core/Wootook/Core/Model/Config.php
similarity index 87%
rename from includes/application/code/core/Legacies/Core/Model/Config.php
rename to application/code/core/Wootook/Core/Model/Config.php
index 6f365e3..26dda47 100644
--- a/includes/application/code/core/Legacies/Core/Model/Config.php
+++ b/application/code/core/Wootook/Core/Model/Config.php
@@ -4,12 +4,12 @@
  *
  * Enter description here ...
  *
- * @uses Legacies_Object
+ * @uses Wootook_Object
  * @uses Legacies_Empire
  */
-class Legacies_Core_Model_Config
-    extends Legacies_Core_Model
-    implements Legacies_Core_Singleton
+class Wootook_Core_Model_Config
+    extends Wootook_Core_Model
+    implements Wootook_Core_Singleton
 {
     private static $_singleton = null;
 
@@ -31,7 +31,7 @@ class Legacies_Core_Model_Config
 
     protected function _load()
     {
-        $database = Legacies_Database::getSingleton();
+        $database = Wootook_Database::getSingleton();
 
         $sql =<< $fieldName) {
+            $this->setData($elementId, $fieldName);
+        }
+
+        return $this;
+    }
+
+    public function count()
+    {
+        return count($this->_data);
+    }
+
+    public function current()
+    {
+        return current($this->_data);
+    }
+
+    public function next()
+    {
+        return next($this->_data);
+    }
+
+    public function key()
+    {
+        return key($this->_data);
+    }
+
+    public function valid()
+    {
+        return $this->current() !== false;
+    }
+
+    public function rewind()
+    {
+        reset($this->_data);
+    }
+}
\ No newline at end of file
diff --git a/includes/application/code/core/Legacies/Empire/Model/Game/FieldsAlias.php b/application/code/core/Wootook/Core/Model/Config/Events.php
similarity index 58%
rename from includes/application/code/core/Legacies/Empire/Model/Game/FieldsAlias.php
rename to application/code/core/Wootook/Core/Model/Config/Events.php
index fcdd2a2..1ab794b 100644
--- a/includes/application/code/core/Legacies/Empire/Model/Game/FieldsAlias.php
+++ b/application/code/core/Wootook/Core/Model/Config/Events.php
@@ -4,12 +4,12 @@
  *
  * Enter description here ...
  *
- * @uses Legacies_Object
+ * @uses Wootook_Object
  * @uses Legacies_Empire
  */
-class Legacies_Empire_Model_Game_FieldsAlias
-    extends Legacies_Empire_Model_Game_Abstract
-    implements Legacies_Core_Singleton
+class Wootook_Core_Model_Config_Events
+    extends Wootook_Core_Model_Config_Abstract
+    implements Wootook_Core_Singleton
 {
     private static $_singleton = null;
 
@@ -21,11 +21,18 @@ class Legacies_Empire_Model_Game_FieldsAlias
         return self::$_singleton;
     }
 
+    public static function registerEvents()
+    {
+        foreach (self::getSingleton() as $event => $listenerList) {
+            foreach ($listenerList as $listener) {
+                Wootook::registerListener($event, $listener);
+            }
+        }
+    }
+
     protected function _init()
     {
-        foreach (include ROOT_PATH . 'includes/data/fields-alias.php' as $elementId => $fieldName) {
-            $this->setData($elementId, $fieldName);
-        }
+        $this->_initData('events');
         return $this;
     }
 
diff --git a/application/code/core/Wootook/Core/Model/Config/Modules.php b/application/code/core/Wootook/Core/Model/Config/Modules.php
new file mode 100644
index 0000000..8ad43f6
--- /dev/null
+++ b/application/code/core/Wootook/Core/Model/Config/Modules.php
@@ -0,0 +1,47 @@
+_initData('modules');
+        return $this;
+    }
+
+    protected function _load()
+    {
+        // NOP
+        return $this;
+    }
+
+    protected function _save()
+    {
+        // NOP
+        return $this;
+    }
+
+    protected function _delete()
+    {
+        // NOP
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/includes/application/code/core/Legacies/Core/Model/Session.php b/application/code/core/Wootook/Core/Model/Session.php
similarity index 97%
rename from includes/application/code/core/Legacies/Core/Model/Session.php
rename to application/code/core/Wootook/Core/Model/Session.php
index f95aaaa..5199542 100644
--- a/includes/application/code/core/Legacies/Core/Model/Session.php
+++ b/application/code/core/Wootook/Core/Model/Session.php
@@ -4,11 +4,11 @@
  *
  * Enter description here ...
  *
- * @uses Legacies_Object
+ * @uses Wootook_Object
  * @uses Legacies_Empire
  */
-class Legacies_Core_Model_Session
-    extends Legacies_Object
+class Wootook_Core_Model_Session
+    extends Wootook_Object
 {
     const CRIT    = 0x80;
     const ERROR   = 0x40;
diff --git a/includes/application/code/core/Legacies/Core/Model/Translator.php b/application/code/core/Wootook/Core/Model/Translator.php
similarity index 96%
rename from includes/application/code/core/Legacies/Core/Model/Translator.php
rename to application/code/core/Wootook/Core/Model/Translator.php
index bcbb892..6d81883 100644
--- a/includes/application/code/core/Legacies/Core/Model/Translator.php
+++ b/application/code/core/Wootook/Core/Model/Translator.php
@@ -1,6 +1,6 @@
 _pluginInstances[$pluginName])) {
+            return $this->_pluginInstances[$pluginName];
+        }
+
+        foreach ($this->_namespaces as $namespace => $path) {
+            $className = $namespace . ucfirst($pluginName);
+            $fileName = $path . DIRECTORY_SEPARATOR . ucfirst($pluginName) . '.php';
+
+            if (!file_exists($fileName)) {
+                continue;
+            }
+
+            if (!class_exists($className, true)) {
+                continue;
+            }
+
+            return $this->_load($className, $useSingleton);
+        }
+
+        return $this;
+    }
+
+    public function registerNamespace($namespace, $path = null)
+    {
+        if ($path === null) {
+            $path = str_replace('_', DIRECTORY_SEPARATOR, $namespace);
+        }
+        $this->_namespaces[$namespace] = $path;
+
+        return $this;
+    }
+
+    public function unregisterNamespace($namespace)
+    {
+        if (isset($this->_namespaces[$namespace])) {
+            unset($this->_namespaces[$namespace]);
+        }
+
+        return $this;
+    }
+
+    abstract protected function _load($className);
+
+    public function getPlugin($pluginName)
+    {
+        return $this->load($pluginName);
+    }
+
+    public function setPlugin($pluginName, $pluginInstance)
+    {
+        $this->_pluginInstances[$pluginName] = $pluginInstance;
+
+        return $this;
+    }
+
+    public function hasPlugin($pluginName)
+    {
+        return isset($this->_pluginInstances[$pluginName]);
+    }
+
+    public function unsetPlugin($pluginName)
+    {
+        unset($this->_pluginInstances[$pluginName]);
+
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/includes/application/code/core/Legacies/Core/Setup/Updater/ScriptQueue.php b/application/code/core/Wootook/Core/Setup/Updater/ScriptQueue.php
similarity index 95%
rename from includes/application/code/core/Legacies/Core/Setup/Updater/ScriptQueue.php
rename to application/code/core/Wootook/Core/Setup/Updater/ScriptQueue.php
index a17096f..ff6e309 100644
--- a/includes/application/code/core/Legacies/Core/Setup/Updater/ScriptQueue.php
+++ b/application/code/core/Wootook/Core/Setup/Updater/ScriptQueue.php
@@ -1,6 +1,6 @@
 install|upgrade|uninstall|downgrade)-(?[0-9]+\.[0-9]+\.[0-9]+)(?:\.(?[a-z]+)(?[0-9]+))?(?:-(?[0-9]+\.[0-9]+\.[0-9]+)(?:\.(?[a-z]+)(?[0-9]+))?)?$%';
@@ -80,7 +80,7 @@ class Legacies_Core_Setup_Model_Updater_ScriptQueue
                     if ($fromVersion['level'] < $toVersion['level']) {
                         $this->_upgradeToVersion($fromVersion, $toVersion);
                     } else {
-//                        throw new RuntimeException("Version already installed.");
+//                        throw new Wootook_Core_Exception_RuntimeException("Version already installed.");
                     }
                 } else {
                     $this->_upgradeToVersion($fromVersion, $toVersion);
@@ -92,7 +92,7 @@ class Legacies_Core_Setup_Model_Updater_ScriptQueue
                     if ($fromVersion['level'] < $toVersion['level']) {
                         $this->_upgradeToVersion($fromVersion, $toVersion);
                     } else {
-//                        throw new RuntimeException("Version already installed.");
+//                        throw new Wootook_Core_Exception_RuntimeException("Version already installed.");
                     }
                 } else {
                     $this->_upgradeToVersion($fromVersion, $toVersion);
@@ -104,13 +104,13 @@ class Legacies_Core_Setup_Model_Updater_ScriptQueue
                     if ($fromVersion['level'] < $toVersion['level']) {
                         $this->_upgradeToVersion($fromVersion, $toVersion);
                     } else {
-//                        throw new RuntimeException("Version already installed.");
+//                        throw new Wootook_Core_Exception_RuntimeException("Version already installed.");
                     }
                 } else {
                     $this->_upgradeToVersion($fromVersion, $toVersion);
                 }
             } else {
-                throw new RuntimeException("Invalid version stage.");
+                throw new Wootook_Core_Exception_RuntimeException("Invalid version stage.");
             }
             break;
         }
@@ -150,7 +150,7 @@ class Legacies_Core_Setup_Model_Updater_ScriptQueue
         } else if (isset($this->_installVersions[$highestVersion][self::STAGE_ALPHA])) {
             $stage = self::STAGE_ALPHA;
         } else {
-            throw new RuntimeException("Invalid version stage.");
+            throw new Wootook_Core_Exception_RuntimeException("Invalid version stage.");
         }
 
         $levelList = array_keys($this->_installVersions[$highestVersion][$stage]);
@@ -175,7 +175,7 @@ class Legacies_Core_Setup_Model_Updater_ScriptQueue
 
     protected function _downgradeToVersion($fromVersion, $toVersion)
     {
-        throw new RuntimeException("Downgrade isn't yet implemented.");
+        throw new Wootook_Core_Exception_RuntimeException("Downgrade isn't yet implemented.");
     }
 
     protected function _upgradeToVersion($fromVersion, $toVersion)
@@ -232,7 +232,7 @@ class Legacies_Core_Setup_Model_Updater_ScriptQueue
 
                 $level = max(array_keys($versionPointer[$highestVersion][$stage]));
             } else {
-                throw new RuntimeException("Invalid version value.");
+                throw new Wootook_Core_Exception_RuntimeException("Invalid version value.");
             }
 
             $currentVersion = array(
diff --git a/includes/application/code/core/Legacies/Core/Singleton.php b/application/code/core/Wootook/Core/Singleton.php
similarity index 60%
rename from includes/application/code/core/Legacies/Core/Singleton.php
rename to application/code/core/Wootook/Core/Singleton.php
index c90e01f..be1d3dc 100644
--- a/includes/application/code/core/Legacies/Core/Singleton.php
+++ b/application/code/core/Wootook/Core/Singleton.php
@@ -1,6 +1,6 @@
 _prepareRender();
 
-        $path = APPLICATION_PATH . DIRECTORY_SEPARATOR . 'design' . DIRECTORY_SEPARATOR . 'scripts';
+        $templatePath = $this->_getTemplatePath($file);
+        if ($templatePath !== null) {
+            ob_start();
+            include $this->_getTemplatePath($file);
+            $contents = ob_get_contents();
+            ob_end_clean();
 
-        ob_start();
-        include $path . DIRECTORY_SEPARATOR . $file;
-        $contents = ob_get_contents();
-        ob_end_clean();
+            return $contents;
+        }
+        return '';
+    }
 
-        return $contents;
+    protected function _getTemplatePath($file)
+    {
+        return $this->getScriptPath() . DIRECTORY_SEPARATOR . $file;
     }
 
     public function render()
@@ -112,23 +121,28 @@ class Legacies_Core_View
 
     public function getUrl($uri, Array $params = array())
     {
-        return Legacies::getUrl($uri, $params);
+        return Wootook::getUrl($uri, $params);
     }
 
-    public function getSkinUrl($uri)
+    public function getSkinUrl($uri, Array $params = array())
     {
-        static $baseUrl = null;
-        if ($baseUrl === null) {
-            $user = Legacies_Empire_Model_User::getSingleton();
-            if ($user !== null && $user->getId()) {
-                $baseUrl = $user->getSkinPath();
-            }
-            if ($baseUrl == '') {
-                $baseUrl = DEFAULT_SKINPATH;
-            }
+        $package = $this->getLayout()->getPackage();
+        if (empty($package)) {
+            $package = Wootook_Core_Layout::DEFAULT_PACKAGE;
         }
 
-        return $this->getUrl($baseUrl . $uri);
+        $user = Wootook_Empire_Model_User::getSingleton();
+        if ($user !== null && $user->getId()) {
+            $theme = $user->getSkinPath();
+        }
+        if (empty($theme)) {
+            $theme = $this->getLayout()->getTheme();
+        }
+        if (empty($theme)) {
+            $theme = Wootook_Core_Layout::DEFAULT_THEME;
+        }
+
+        return Wootook::getSkinUrl($package, $theme, $uri, $params);
     }
 
     public function setPartial($name, $content)
@@ -197,7 +211,7 @@ class Legacies_Core_View
 
     /**
      *
-     * @return Legacies_Core_Layout
+     * @return Wootook_Core_Layout
      */
     public function getLayout()
     {
@@ -223,4 +237,16 @@ class Legacies_Core_View
     {
         return $this->_nameInLayout;
     }
+
+    public function setScriptPath($scriptPath)
+    {
+        $this->_scriptPath = $scriptPath;
+
+        return $this;
+    }
+
+    public function getScriptPath()
+    {
+        return $this->_scriptPath;
+    }
 }
\ No newline at end of file
diff --git a/includes/application/code/core/Legacies/Core/install/mysql5/install-2011.1.0.php b/application/code/core/Wootook/Core/install/mysql5/install-2011.1.0.php
similarity index 99%
rename from includes/application/code/core/Legacies/Core/install/mysql5/install-2011.1.0.php
rename to application/code/core/Wootook/Core/install/mysql5/install-2011.1.0.php
index 03253cd..51a956e 100644
--- a/includes/application/code/core/Legacies/Core/install/mysql5/install-2011.1.0.php
+++ b/application/code/core/Wootook/Core/install/mysql5/install-2011.1.0.php
@@ -1,6 +1,6 @@
 getTableName('legacies/config')} (`config_name`, `config_val
     ('Defs_Cdr', '30'),
     ('initial_fields', '5000'),
     ('COOKIE_NAME', 'xnova-legacies'),
-    ('game_name', 'XNova:Legacies'),
+    ('game_name', 'Wootook:Legacies'),
     ('game_disable', '1'),
     ('close_reason', 'Le jeu est clos pour le moment!'),
     ('metal_basic_income', '20'),
@@ -219,7 +219,7 @@ INSERT INTO {$this->getTableName('legacies/config')} (`config_name`, `config_val
     ('noobprotectionmulti', '5'),
     ('forum_url', 'http://board.xnova-ng.org/'),
     ('OverviewNewsFrame', '1'),
-    ('OverviewNewsTEXT', 'Bienvenue sur le nouveau serveur XNova Legacies'),
+    ('OverviewNewsTEXT', 'Bienvenue sur le nouveau serveur Wootook Legacies'),
     ('OverviewExternChat', '0'),
     ('OverviewExternChatCmd', ''),
     ('OverviewBanner', '0'),
diff --git a/includes/application/code/core/Legacies/Core/install/mysql5/uninstall-2011.1.0.php b/application/code/core/Wootook/Core/install/mysql5/uninstall-2011.1.0.php
similarity index 99%
rename from includes/application/code/core/Legacies/Core/install/mysql5/uninstall-2011.1.0.php
rename to application/code/core/Wootook/Core/install/mysql5/uninstall-2011.1.0.php
index 73bca1b..74ec834 100644
--- a/includes/application/code/core/Legacies/Core/install/mysql5/uninstall-2011.1.0.php
+++ b/application/code/core/Wootook/Core/install/mysql5/uninstall-2011.1.0.php
@@ -1,6 +1,6 @@
  self::$options
                 ));
 
@@ -33,7 +33,7 @@ class Legacies_Database
 
             self::$_singleton = new self("mysql:dbname={$database};host={$hostname};port={$port}", $username, $password, self::$options);
 
-            Legacies::dispatchEvent('database.init', array(
+            Wootook::dispatchEvent('database.init', array(
                 'handler' => self::$_singleton
                 ));
         }
diff --git a/application/code/core/Wootook/Empire/Block/Overview.php b/application/code/core/Wootook/Empire/Block/Overview.php
new file mode 100644
index 0000000..c09ec87
--- /dev/null
+++ b/application/code/core/Wootook/Empire/Block/Overview.php
@@ -0,0 +1,7 @@
+_user = $user;
 
@@ -17,13 +17,13 @@ abstract class Legacies_Empire_Block_Planet_Builder_ItemAbstract
     public function getUser()
     {
         if ($this->_user === null) {
-            $this->_user = Legacies_Empire_Model_User::getSingleton();
+            $this->_user = Wootook_Empire_Model_User::getSingleton();
         }
 
         return $this->_user;
     }
 
-    public function setPlanet(Legacies_Empire_Model_Planet $planet)
+    public function setPlanet(Wootook_Empire_Model_Planet $planet)
     {
         $this->_planet = $planet;
 
diff --git a/includes/application/code/core/Legacies/Empire/Block/Planet/Builder/Queue/ItemAbstract.php b/application/code/core/Wootook/Empire/Block/Planet/Builder/Queue/ItemAbstract.php
similarity index 57%
rename from includes/application/code/core/Legacies/Empire/Block/Planet/Builder/Queue/ItemAbstract.php
rename to application/code/core/Wootook/Empire/Block/Planet/Builder/Queue/ItemAbstract.php
index 9a9b122..962783a 100644
--- a/includes/application/code/core/Legacies/Empire/Block/Planet/Builder/Queue/ItemAbstract.php
+++ b/application/code/core/Wootook/Empire/Block/Planet/Builder/Queue/ItemAbstract.php
@@ -1,13 +1,13 @@
 _item = $item;
         $this->setItemId($item->getData($this->_itemIdField));
diff --git a/includes/application/code/core/Legacies/Empire/Block/Planet/Builder/QueueAbstract.php b/application/code/core/Wootook/Empire/Block/Planet/Builder/QueueAbstract.php
similarity index 82%
rename from includes/application/code/core/Legacies/Empire/Block/Planet/Builder/QueueAbstract.php
rename to application/code/core/Wootook/Empire/Block/Planet/Builder/QueueAbstract.php
index 5a785b3..d6122d3 100644
--- a/includes/application/code/core/Legacies/Empire/Block/Planet/Builder/QueueAbstract.php
+++ b/application/code/core/Wootook/Empire/Block/Planet/Builder/QueueAbstract.php
@@ -1,14 +1,14 @@
 _user = $user;
 
@@ -18,13 +18,13 @@ abstract class Legacies_Empire_Block_Planet_Builder_QueueAbstract
     public function getUser()
     {
         if ($this->_user === null) {
-            $this->_user = Legacies_Empire_Model_User::getSingleton();
+            $this->_user = Wootook_Empire_Model_User::getSingleton();
         }
 
         return $this->_user;
     }
 
-    public function setPlanet(Legacies_Empire_Model_Planet $planet)
+    public function setPlanet(Wootook_Empire_Model_Planet $planet)
     {
         $this->_planet = $planet;
 
@@ -64,7 +64,7 @@ abstract class Legacies_Empire_Block_Planet_Builder_QueueAbstract
         return $this->_itemBlockType;
     }
 
-    public function getItemBlock(Legacies_Empire_Model_Builder_Item $item)
+    public function getItemBlock(Wootook_Empire_Model_Builder_Item $item)
     {
         $index = $item->getIndex();
         $blockName = "item({$index})";
diff --git a/includes/application/code/core/Legacies/Empire/Block/Planet/BuilderAbstract.php b/application/code/core/Wootook/Empire/Block/Planet/BuilderAbstract.php
similarity index 91%
rename from includes/application/code/core/Legacies/Empire/Block/Planet/BuilderAbstract.php
rename to application/code/core/Wootook/Empire/Block/Planet/BuilderAbstract.php
index 7f469ab..9cc98f2 100644
--- a/includes/application/code/core/Legacies/Empire/Block/Planet/BuilderAbstract.php
+++ b/application/code/core/Wootook/Empire/Block/Planet/BuilderAbstract.php
@@ -1,7 +1,7 @@
 _planet = $planet;
 
@@ -15,7 +15,7 @@ class Legacies_Empire_Block_Planet_Buildings
     public function getPlanet()
     {
         if ($this->_planet === null) {
-            $this->_planet = Legacies_Empire_Model_User::getSingleton()
+            $this->_planet = Wootook_Empire_Model_User::getSingleton()
                 ->getCurrentPlanet()
             ;
         }
@@ -24,13 +24,13 @@ class Legacies_Empire_Block_Planet_Buildings
 
     public function _initChildBlocks()
     {
-        $types = Legacies_Empire_Model_Game_Types::getSingleton();
+        $types = Wootook_Empire_Model_Game_Types::getSingleton();
         $type = Legacies_Empire::TYPE_BUILDING_PLANET;
         if ($this->getPlanet()->isMoon()) {
             $type = Legacies_Empire::TYPE_BUILDING_MOON;
         }
 
-        /** @var Legacies_Core_Block_Concat $parentBlock */
+        /** @var Wootook_Core_Block_Concat $parentBlock */
         $parentBlock = $this->getLayout()->getBlock('item-list.items');
         foreach ($types->getData($type) as $itemId) {
             if (!$this->getPlanet()->checkAvailability($itemId)) {
diff --git a/includes/application/code/core/Legacies/Empire/Block/Planet/Buildings/Item.php b/application/code/core/Wootook/Empire/Block/Planet/Buildings/Item.php
similarity index 89%
rename from includes/application/code/core/Legacies/Empire/Block/Planet/Buildings/Item.php
rename to application/code/core/Wootook/Empire/Block/Planet/Buildings/Item.php
index a1c63a4..b24a819 100644
--- a/includes/application/code/core/Legacies/Empire/Block/Planet/Buildings/Item.php
+++ b/application/code/core/Wootook/Empire/Block/Planet/Buildings/Item.php
@@ -1,7 +1,7 @@
  $resourceValue) {
-            $resourceConfig[$resourceId] = new Legacies_Object(array(
+            $resourceConfig[$resourceId] = new Wootook_Object(array(
                 'resource_id'  => $resourceId,
                 'value'        => $resourceValue
                 ));
diff --git a/includes/application/code/core/Legacies/Empire/Block/Planet/Buildings/Queue.php b/application/code/core/Wootook/Empire/Block/Planet/Buildings/Queue.php
similarity index 63%
rename from includes/application/code/core/Legacies/Empire/Block/Planet/Buildings/Queue.php
rename to application/code/core/Wootook/Empire/Block/Planet/Buildings/Queue.php
index 2eff182..b1c3f55 100644
--- a/includes/application/code/core/Legacies/Empire/Block/Planet/Buildings/Queue.php
+++ b/application/code/core/Wootook/Empire/Block/Planet/Buildings/Queue.php
@@ -1,7 +1,7 @@
  $resourceValue) {
-            $resourceConfig[$resourceId] = new Legacies_Object(array(
+            $resourceConfig[$resourceId] = new Wootook_Object(array(
                 'resource_id'  => $resourceId,
                 'value'        => $resourceValue
                 ));
diff --git a/application/code/core/Wootook/Empire/Block/PlanetList.php b/application/code/core/Wootook/Empire/Block/PlanetList.php
new file mode 100644
index 0000000..4d1decf
--- /dev/null
+++ b/application/code/core/Wootook/Empire/Block/PlanetList.php
@@ -0,0 +1,7 @@
+_currentPlanet = $currentPlanet;
         $this->_currentUser = $currentUser;
@@ -134,8 +134,8 @@ abstract class Legacies_Empire_Model_BuilderAbstract
      */
     public function checkAvailability($typeId)
     {
-        $types = Legacies_Empire_Model_Game_Types::getSingleton();
-        $requirements = Legacies_Empire_Model_Game_Requirements::getSingleton();
+        $types = Wootook_Empire_Model_Game_Types::getSingleton();
+        $requirements = Wootook_Empire_Model_Game_Requirements::getSingleton();
 
         if (!isset($requirements[$typeId]) || empty($requirements[$typeId])) {
             return true;
@@ -210,14 +210,14 @@ abstract class Legacies_Empire_Model_BuilderAbstract
         return $this->_currentUser;
     }
 
-    public function setCurrentPlanet(Legacies_Empire_Model_Planet $planet)
+    public function setCurrentPlanet(Wootook_Empire_Model_Planet $planet)
     {
         $this->_currentPlanet = $planet;
 
         return $this;
     }
 
-    public function setCurrentUser(Legacies_Empire_Model_User $user)
+    public function setCurrentUser(Wootook_Empire_Model_User $user)
     {
         $this->_currentUser = $user;
 
diff --git a/application/code/core/Wootook/Empire/Model/Fleet.php b/application/code/core/Wootook/Empire/Model/Fleet.php
new file mode 100644
index 0000000..1ce2b7d
--- /dev/null
+++ b/application/code/core/Wootook/Empire/Model/Fleet.php
@@ -0,0 +1,155 @@
+setIdFieldName('fleet_id');
+        $this->setTableName('fleets');
+    }
+
+    public static function planetListener($eventData)
+    {
+    }
+
+    public function isOwnedBy(Wootook_Empire_Model_User $user)
+    {
+        if ($this->getData('fleet_owner') == $user->getId()) {
+            return true;
+        }
+        return false;
+    }
+
+    public function getOwner()
+    {
+        if ($id = $this->getData('fleet_owner')) {
+            return Wootook_Empire_Model_User::factory($id);
+        }
+        return null;
+    }
+
+    public function isMission($missionType)
+    {
+        if ($this->getData('fleet_mission') == $missionType) {
+            return true;
+        }
+        return false;
+    }
+
+    public function getRowClass(Wootook_Empire_Model_User $user = null)
+    {
+        if ($this->isMission(Legacies_Empire::ID_MISSION_ATTACK) || $this->isMission(Legacies_Empire::ID_MISSION_GROUP_ATTACK)) {
+            if ($user !== null && $this->isOwnedBy($user)) {
+                return 'attack';
+            } else {
+                return 'ownattack';
+            }
+        } else if ($this->isMission(Legacies_Empire::ID_MISSION_TRANSPORT)) {
+            return 'transport';
+        } else if ($this->isMission(Legacies_Empire::ID_MISSION_STATION) || $this->isMission(Legacies_Empire::ID_MISSION_STATION_ALLY)) {
+            return 'station';
+        } else if ($this->isMission(Legacies_Empire::ID_MISSION_SETTLE_COLONY)) {
+            return 'settle';
+        } else if ($this->isMission(Legacies_Empire::ID_MISSION_RECYCLE)) {
+            return 'recycle';
+        } else if ($this->isMission(Legacies_Empire::ID_MISSION_DESTROY)) {
+            return 'destroy';
+        } else if ($this->isMission(Legacies_Empire::ID_MISSION_MISSILES)) {
+            return 'missiles';
+        } else if ($this->isMission(Legacies_Empire::ID_MISSION_EXPEDITION)) {
+            return 'expedition';
+        }
+    }
+
+    public function getMissionLabel()
+    {
+        if ($this->isMission(Legacies_Empire::ID_MISSION_ATTACK) || $this->isMission(Legacies_Empire::ID_MISSION_GROUP_ATTACK)) {
+            return Wootook::__('Attack');
+        } else if ($this->isMission(Legacies_Empire::ID_MISSION_TRANSPORT)) {
+            return Wootook::__('Transport');
+        } else if ($this->isMission(Legacies_Empire::ID_MISSION_STATION) || $this->isMission(Legacies_Empire::ID_MISSION_STATION_ALLY)) {
+            return Wootook::__('Station');
+        } else if ($this->isMission(Legacies_Empire::ID_MISSION_SETTLE_COLONY)) {
+            return Wootook::__('Settle');
+        } else if ($this->isMission(Legacies_Empire::ID_MISSION_RECYCLE)) {
+            return Wootook::__('Recycle');
+        } else if ($this->isMission(Legacies_Empire::ID_MISSION_DESTROY)) {
+            return Wootook::__('Destroy');
+        } else if ($this->isMission(Legacies_Empire::ID_MISSION_MISSILES)) {
+            return Wootook::__('Missiles Launch');
+        } else if ($this->isMission(Legacies_Empire::ID_MISSION_EXPEDITION)) {
+            return Wootook::__('Expedition');
+        }
+        return Legacies::__('Unknown');
+    }
+
+    public function getStartTime()
+    {
+        return $this->getData('fleet_start_time');
+    }
+
+    public function getActionTime()
+    {
+        return $this->getData('fleet_end_stay');
+    }
+
+    public function getArrivalTime()
+    {
+        if ($this->isMission(Legacies_Empire::ID_MISSION_STATION) || $this->isMission(Legacies_Empire::ID_MISSION_STATION_ALLY)) {
+            return $this->getActionTime();
+        }
+        return $this->getData('fleet_end_time');
+    }
+
+    public function getOriginPlanet()
+    {
+        $coords = array(
+            'galaxy'   => $this->getData('fleet_start_galaxy'),
+            'system'   => $this->getData('fleet_start_system'),
+            'position' => $this->getData('fleet_start_planet')
+            );
+        $type = $this->getData('fleet_start_type');
+
+        return Wootook_Empire_Model_Planet::factoryFromCoords($coords, $type);
+    }
+
+    public function getDestinationPlanet()
+    {
+        $coords = array(
+            'galaxy'   => $this->getData('fleet_end_galaxy'),
+            'system'   => $this->getData('fleet_end_system'),
+            'position' => $this->getData('fleet_end_planet')
+            );
+        $type = $this->getData('fleet_end_type');
+
+        return Wootook_Empire_Model_Planet::factoryFromCoords($coords, $type);
+    }
+}
\ No newline at end of file
diff --git a/includes/application/code/core/Legacies/Empire/Model/Galaxy/Position.php b/application/code/core/Wootook/Empire/Model/Galaxy/Position.php
similarity index 88%
rename from includes/application/code/core/Legacies/Empire/Model/Galaxy/Position.php
rename to application/code/core/Wootook/Empire/Model/Galaxy/Position.php
index a7e4a97..2989b1a 100644
--- a/includes/application/code/core/Legacies/Empire/Model/Galaxy/Position.php
+++ b/application/code/core/Wootook/Empire/Model/Galaxy/Position.php
@@ -1,7 +1,7 @@
  $fieldName) {
-            $this->setData($elementId, $fieldName);
-        }
+        $this->_initData('combat');
         return $this;
     }
 
diff --git a/application/code/core/Wootook/Empire/Model/Game/FieldsAlias.php b/application/code/core/Wootook/Empire/Model/Game/FieldsAlias.php
new file mode 100644
index 0000000..9a4ab2b
--- /dev/null
+++ b/application/code/core/Wootook/Empire/Model/Game/FieldsAlias.php
@@ -0,0 +1,47 @@
+_initData('fields-alias');
+        return $this;
+    }
+
+    protected function _load()
+    {
+        // NOP
+        return $this;
+    }
+
+    protected function _save()
+    {
+        // NOP
+        return $this;
+    }
+
+    protected function _delete()
+    {
+        // NOP
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/includes/application/code/core/Legacies/Empire/Model/Game/Prices.php b/application/code/core/Wootook/Empire/Model/Game/Prices.php
similarity index 66%
rename from includes/application/code/core/Legacies/Empire/Model/Game/Prices.php
rename to application/code/core/Wootook/Empire/Model/Game/Prices.php
index a2b0c20..9133d34 100644
--- a/includes/application/code/core/Legacies/Empire/Model/Game/Prices.php
+++ b/application/code/core/Wootook/Empire/Model/Game/Prices.php
@@ -4,12 +4,12 @@
  *
  * Enter description here ...
  *
- * @uses Legacies_Object
+ * @uses Wootook_Object
  * @uses Legacies_Empire
  */
-class Legacies_Empire_Model_Game_Prices
-    extends Legacies_Empire_Model_Game_Abstract
-    implements Legacies_Core_Singleton
+class Wootook_Empire_Model_Game_Prices
+    extends Wootook_Core_Model_Config_Abstract
+    implements Wootook_Core_Singleton
 {
     private static $_singleton = null;
 
@@ -23,9 +23,7 @@ class Legacies_Empire_Model_Game_Prices
 
     protected function _init()
     {
-        foreach (include ROOT_PATH . 'includes/data/prices.php' as $elementId => $fieldName) {
-            $this->setData($elementId, $fieldName);
-        }
+        $this->_initData('prices');
         return $this;
     }
 
diff --git a/includes/application/code/core/Legacies/Empire/Model/Game/Production.php b/application/code/core/Wootook/Empire/Model/Game/Production.php
similarity index 65%
rename from includes/application/code/core/Legacies/Empire/Model/Game/Production.php
rename to application/code/core/Wootook/Empire/Model/Game/Production.php
index 38eb98f..60ab21c 100644
--- a/includes/application/code/core/Legacies/Empire/Model/Game/Production.php
+++ b/application/code/core/Wootook/Empire/Model/Game/Production.php
@@ -4,12 +4,12 @@
  *
  * Enter description here ...
  *
- * @uses Legacies_Object
+ * @uses Wootook_Object
  * @uses Legacies_Empire
  */
-class Legacies_Empire_Model_Game_Production
-    extends Legacies_Empire_Model_Game_Abstract
-    implements Legacies_Core_Singleton
+class Wootook_Empire_Model_Game_Production
+    extends Wootook_Core_Model_Config_Abstract
+    implements Wootook_Core_Singleton
 {
     private static $_singleton = null;
 
@@ -23,9 +23,7 @@ class Legacies_Empire_Model_Game_Production
 
     protected function _init()
     {
-        foreach (include ROOT_PATH . 'includes/data/production.php' as $elementId => $fieldName) {
-            $this->setData($elementId, $fieldName);
-        }
+        $this->_initData('production');
         return $this;
     }
 
diff --git a/application/code/core/Wootook/Empire/Model/Game/Requirements.php b/application/code/core/Wootook/Empire/Model/Game/Requirements.php
new file mode 100644
index 0000000..9f09689
--- /dev/null
+++ b/application/code/core/Wootook/Empire/Model/Game/Requirements.php
@@ -0,0 +1,47 @@
+_initData('requirements');
+        return $this;
+    }
+
+    protected function _load()
+    {
+        // NOP
+        return $this;
+    }
+
+    protected function _save()
+    {
+        // NOP
+        return $this;
+    }
+
+    protected function _delete()
+    {
+        // NOP
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/includes/application/code/core/Legacies/Empire/Model/Game/Resources.php b/application/code/core/Wootook/Empire/Model/Game/Resources.php
similarity index 66%
rename from includes/application/code/core/Legacies/Empire/Model/Game/Resources.php
rename to application/code/core/Wootook/Empire/Model/Game/Resources.php
index ec3cab5..c825f74 100644
--- a/includes/application/code/core/Legacies/Empire/Model/Game/Resources.php
+++ b/application/code/core/Wootook/Empire/Model/Game/Resources.php
@@ -4,12 +4,12 @@
  *
  * Enter description here ...
  *
- * @uses Legacies_Object
+ * @uses Wootook_Object
  * @uses Legacies_Empire
  */
-class Legacies_Empire_Model_Game_Resources
-    extends Legacies_Empire_Model_Game_Abstract
-    implements Legacies_Core_Singleton
+class Wootook_Empire_Model_Game_Resources
+    extends Wootook_Core_Model_Config_Abstract
+    implements Wootook_Core_Singleton
 {
     private static $_singleton = null;
 
@@ -23,9 +23,7 @@ class Legacies_Empire_Model_Game_Resources
 
     protected function _init()
     {
-        foreach (include ROOT_PATH . 'includes/data/resources.php' as $elementId => $fieldName) {
-            $this->setData($elementId, $fieldName);
-        }
+        $this->_initData('resources');
         return $this;
     }
 
diff --git a/includes/application/code/core/Legacies/Empire/Model/Game/Types.php b/application/code/core/Wootook/Empire/Model/Game/Types.php
similarity index 72%
rename from includes/application/code/core/Legacies/Empire/Model/Game/Types.php
rename to application/code/core/Wootook/Empire/Model/Game/Types.php
index feed33c..291c964 100644
--- a/includes/application/code/core/Legacies/Empire/Model/Game/Types.php
+++ b/application/code/core/Wootook/Empire/Model/Game/Types.php
@@ -4,12 +4,12 @@
  *
  * Enter description here ...
  *
- * @uses Legacies_Object
+ * @uses Wootook_Object
  * @uses Legacies_Empire
  */
-class Legacies_Empire_Model_Game_Types
-    extends Legacies_Empire_Model_Game_Abstract
-    implements Legacies_Core_Singleton
+class Wootook_Empire_Model_Game_Types
+    extends Wootook_Core_Model_Config_Abstract
+    implements Wootook_Core_Singleton
 {
     private static $_singleton = null;
 
@@ -23,9 +23,7 @@ class Legacies_Empire_Model_Game_Types
 
     protected function _init()
     {
-        foreach (include ROOT_PATH . 'includes/data/types.php' as $elementId => $fieldName) {
-            $this->setData($elementId, $fieldName);
-        }
+        $this->_initData('types');
         return $this;
     }
 
diff --git a/includes/application/code/core/Legacies/Empire/Model/Planet.php b/application/code/core/Wootook/Empire/Model/Planet.php
similarity index 83%
rename from includes/application/code/core/Legacies/Empire/Model/Planet.php
rename to application/code/core/Wootook/Empire/Model/Planet.php
index 186dd44..c013667 100644
--- a/includes/application/code/core/Legacies/Empire/Model/Planet.php
+++ b/application/code/core/Wootook/Empire/Model/Planet.php
@@ -2,12 +2,12 @@
 
 /**
  *
- * @uses Legacies_Object
+ * @uses Wootook_Object
  * @uses Legacies_Empire
  * @uses Legacies_Empire_User
  */
-class Legacies_Empire_Model_Planet
-    extends Legacies_Core_Entity
+class Wootook_Empire_Model_Planet
+    extends Wootook_Core_Entity
 {
     const TYPE_PLANET = 1;
     const TYPE_DEBRIS = 2;
@@ -17,17 +17,17 @@ class Legacies_Empire_Model_Planet
     protected $_eventObject = 'planet';
 
     /**
-     * @var Legacies_Empire_Model_User
+     * @var Wootook_Empire_Model_User
      */
     protected $_user = null;
 
     /**
-     * @var Legacies_Empire_Model_Planet
+     * @var Wootook_Empire_Model_Planet
      */
     protected $_moon = null;
 
     /**
-     * @var Legacies_Empire_Model_Planet_Builder
+     * @var Wootook_Empire_Model_Planet_Builder
      */
     protected $_builder = null;
 
@@ -48,6 +48,8 @@ class Legacies_Empire_Model_Planet
 
     protected static $_productionInstances = array();
 
+    protected $_pluginLoader = null;
+
     public static function factory($id)
     {
         if ($id === null) {
@@ -93,8 +95,8 @@ class Legacies_Empire_Model_Planet
             $coords['type'] = $type;
         }
 
-        $database = Legacies_Database::getSingleton();
-        $collection = new Legacies_Core_Collection('planets');
+        $database = Wootook_Database::getSingleton();
+        $collection = new Wootook_Core_Collection('planets');
         $collection
             ->column('id')
             ->where('galaxy=:galaxy')
@@ -120,6 +122,37 @@ class Legacies_Empire_Model_Planet
         $this->_idFieldName = 'id';
     }
 
+    public function __call($method, $params)
+    {
+        $prefix = substr($method, 0, 3);
+        $plugin = substr($method, 3);
+
+        if ($this->_pluginLoader === null) {
+            $this->_pluginLoader = new Wootook_Empire_Model_Planet_PluginLoader($this, $this->getUser());
+        }
+
+        switch ($prefix) {
+        case 'get':
+            $this->_pluginLoader->getPlugin($plugin);
+            break;
+
+        case 'set':
+            $this->_pluginLoader->setPlugin($plugin, $params[0]);
+            break;
+
+        case 'uns':
+            $this->_pluginLoader->unsetPlugin($plugin);
+            break;
+
+        case 'has':
+            $this->_pluginLoader->hasPlugin($plugin);
+            break;
+            break;
+        }
+
+        throw new InvalidMethodCall(Wootook::__('Undefined method %s::%s.', get_class($this), $method));
+    }
+
     public function getLastUpdate()
     {
         return $this->getData('last_update');
@@ -142,7 +175,7 @@ class Legacies_Empire_Model_Planet
 
     public function getGalaxyData()
     {
-        $entity = new Legacies_Empire_Model_Galaxy_Position();
+        $entity = new Wootook_Empire_Model_Galaxy_Position();
         $entity->load(array('id_planet' => $this->getId()));
 
         return $entity;
@@ -151,15 +184,12 @@ class Legacies_Empire_Model_Planet
     public function updateStorages($time = null)
     {
         Math::setPrecision(50);
-        $resources = Legacies_Empire_Model_Game_Resources::getSingleton();
+        $resources = Wootook_Empire_Model_Game_Resources::getSingleton();
         foreach ($resources->getAllDatas() as $resource => $resourceData) {
             if (!isset($resourceData['storage_field']) || $resourceData['storage_field'] === null) {
                 continue;
             }
 
-            //$officerEnhancement = (.5 * $this->getUser()->getData('rpg_stockeur')) + 1;
-            $officerEnhancement = 1;
-
             if ($this->getElement($resourceData['storage'])) {
                 $storageEnhancementFactor = Math::floor(Math::pow(1.6, $this->getElement($resourceData['storage'])));
                 $storageEnhancement = Math::mul(BASE_STORAGE_SIZE / 2, $storageEnhancementFactor);
@@ -167,9 +197,18 @@ class Legacies_Empire_Model_Planet
                 $storageEnhancement = 0;
             }
 
-            $value = Math::mul(MAX_OVERFLOW, Math::mul($officerEnhancement, Math::add(BASE_STORAGE_SIZE, $storageEnhancement)));
+            $storageSize = Math::add(BASE_STORAGE_SIZE, $storageEnhancement);
 
-            $this->setData($resourceData['storage_field'], Math::floor($value));
+            $event = Wootook::dispatchEvent($this->_eventPrefix . 'update-storage.resource', array(
+                'resource_id'     => $resource,
+                'resource_data'   => $resourceData,
+                'default_size'    => $storageSize,
+                'calculated_size' => $storageSize
+                ));
+
+            $calculatedSize = $event->getData('calculated_size');
+
+            $this->setData($resourceData['storage_field'], Math::floor($calculatedSize));
         }
         Math::setPrecision();
 
@@ -178,7 +217,7 @@ class Legacies_Empire_Model_Planet
 
     public function updateBuildingFields()
     {
-        $types = Legacies_Empire_Model_Game_Types::getSingleton();
+        $types = Wootook_Empire_Model_Game_Types::getSingleton();
 
         if ($this->isPlanet()) {
             $filter = Legacies_Empire::TYPE_BUILDING_PLANET;
@@ -200,12 +239,12 @@ class Legacies_Empire_Model_Planet
 
     public function updateResourceProduction($time = null)
     {
-        $types = Legacies_Empire_Model_Game_Types::getSingleton();
-        $resources = Legacies_Empire_Model_Game_Resources::getSingleton();
-        $production = Legacies_Empire_Model_Game_Production::getSingleton();
+        $types = Wootook_Empire_Model_Game_Types::getSingleton();
+        $resources = Wootook_Empire_Model_Game_Resources::getSingleton();
+        $production = Wootook_Empire_Model_Game_Production::getSingleton();
 
         if ($time === null) {
-            $time = Legacies::now();
+            $time = Wootook::now();
         }
 
         if (!$this->isPlanet()) {
@@ -298,7 +337,7 @@ class Legacies_Empire_Model_Planet
         }
 
         // Dispatch 'planet.update-production.before' event
-        Legacies::dispatchEvent($this->_eventPrefix . '.update-production.before', array(
+        Wootook::dispatchEvent($this->_eventPrefix . '.update-production.before', array(
             $this->_eventObject => $this,
             'user'              => $this->getUser(),
             'productions'       => $actualProduction
@@ -314,7 +353,7 @@ class Legacies_Empire_Model_Planet
         }
 
         // Dispatch 'planet.update-production.after' event
-        Legacies::dispatchEvent($this->_eventPrefix . '.update-production.after', array(
+        Wootook::dispatchEvent($this->_eventPrefix . '.update-production.after', array(
             $this->_eventObject => $this,
             'user'              => $this->getUser()
             ));
@@ -324,10 +363,10 @@ class Legacies_Empire_Model_Planet
 
     public function updateResources($time = null)
     {
-        $resources = Legacies_Empire_Model_Game_Resources::getSingleton();
+        $resources = Wootook_Empire_Model_Game_Resources::getSingleton();
 
         if ($time === null) {
-            $time = Legacies::now();
+            $time = Wootook::now();
         }
 
         $timeDiff = ($time - $this->getLastUpdate()) / 3600;
@@ -347,7 +386,7 @@ class Legacies_Empire_Model_Planet
 
     public static function getProductionElementInstance($buildingId)
     {
-        $production = Legacies_Empire_Model_Game_Production::getSingleton();
+        $production = Wootook_Empire_Model_Game_Production::getSingleton();
 
         if (!isset(self::$_productionInstances[$buildingId])) {
             if (!isset($production[$buildingId])) {
@@ -363,7 +402,7 @@ class Legacies_Empire_Model_Planet
 
     public function getFleetCollection($time = null)
     {
-        $firstCollection = new Legacies_Core_Collection(array('fleet' => 'fleets'));
+        $firstCollection = new Wootook_Core_Collection(array('fleet' => 'fleets'));
         $firstCollection
             ->column('*')
             ->where('fleet.fleet_start_galaxy = :galaxy')
@@ -371,7 +410,7 @@ class Legacies_Empire_Model_Planet
             ->where('fleet.fleet_start_planet = :position')
             ->where('fleet.fleet_start_type   = :planet_type')
         ;
-        $backCollection = new Legacies_Core_Collection(array('fleet' => 'fleets'));
+        $backCollection = new Wootook_Core_Collection(array('fleet' => 'fleets'));
         $backCollection
             ->column('*')
             ->where('fleet.fleet_end_galaxy = :galaxy')
@@ -393,9 +432,9 @@ class Legacies_Empire_Model_Planet
             $backCollection->where('fleet_end_time <= :now');
         }
 
-        $collection = new Legacies_Core_Collection();
+        $collection = new Wootook_Core_Collection();
         $collection
-            ->setEntityClassName('Legacies_Empire_Model_Fleet')
+            ->setEntityClassName('Wootook_Empire_Model_Fleet')
             ->union($firstCollection)
             ->union($backCollection)
             ->load($options)
@@ -412,12 +451,12 @@ class Legacies_Empire_Model_Planet
     public function getUser()
     {
         if ($this->_user === null && $this->getUserId()) {
-            $this->_user = Legacies_Empire_Model_User::factory($this->getUserId());
+            $this->_user = Wootook_Empire_Model_User::factory($this->getUserId());
         }
         return $this->_user;
     }
 
-    public function setUser(Legacies_Empire_Model_User $user)
+    public function setUser(Wootook_Empire_Model_User $user)
     {
         $this->_user = $user;
 
@@ -479,7 +518,7 @@ class Legacies_Empire_Model_Planet
 
         if ($this->_moon === null) {
             if ($statement === null) {
-                $statement = new Legacies_Core_Collection(array('planet' => 'planets'), get_class($this));
+                $statement = new Wootook_Core_Collection(array('planet' => 'planets'), get_class($this));
                 $statement
                     ->where('galaxy=:galaxy')
                     ->where('system=:system')
@@ -585,16 +624,16 @@ class Legacies_Empire_Model_Planet
         }
 
         if ($this->isDestroyed()) {
-            throw new Legacies_Empire_Model_Planet_Exception(Legacies::__('Planet is already destroyed.'));
+            throw new Wootook_Empire_Model_Planet_Exception(Wootook::__('Planet is already destroyed.'));
         }
 
         if ($this->getFleetCollection()->count() > 0) {
-            throw new Legacies_Empire_Model_Planet_Exception(Legacies::__("Could not delete planet until fleets aten't retuned."));
+            throw new Wootook_Empire_Model_Planet_Exception(Wootook::__("Could not delete planet until fleets aten't retuned."));
         }
 
         $user = $this->getUser();
         if ($user->getHomePlanet()->getId() == $this->getId()) {
-            throw new Legacies_Empire_Model_Planet_Exception(Legacies::__("You can't destroy your home planet."));
+            throw new Wootook_Empire_Model_Planet_Exception(Wootook::__("You can't destroy your home planet."));
         }
 
         if ($user->getCurrentPlanet()->getId() == $this->getId()) {
@@ -619,32 +658,32 @@ class Legacies_Empire_Model_Planet
 
     public function getElement($elementId)
     {
-        $fields = Legacies_Empire_Model_Game_FieldsAlias::getSingleton();
+        $fields = Wootook_Empire_Model_Game_FieldsAlias::getSingleton();
 
         return $this->getData($fields[$elementId]);
     }
 
     public function setElement($elementId, $level)
     {
-        $fields = Legacies_Empire_Model_Game_FieldsAlias::getSingleton();
+        $fields = Wootook_Empire_Model_Game_FieldsAlias::getSingleton();
 
         return $this->setData($fields[$elementId], $level);
     }
 
     public function hasElement($elementId, $levelRequired = 0)
     {
-        $fields = Legacies_Empire_Model_Game_FieldsAlias::getSingleton();
+        $fields = Wootook_Empire_Model_Game_FieldsAlias::getSingleton();
 
         return $this->hasData($fields[$elementId]) && Math::comp($this->getElement($elementId), $levelRequired) > 0;
     }
 
     public function appendBuildingQueue($buildingId, $destroy = false, $time = null)
     {
-        $types = Legacies_Empire_Model_Game_Types::getSingleton();
-        $prices = Legacies_Empire_Model_Game_Prices::getSingleton();
+        $types = Wootook_Empire_Model_Game_Types::getSingleton();
+        $prices = Wootook_Empire_Model_Game_Prices::getSingleton();
 
         if ($time === null) {
-            $time = Legacies::now();
+            $time = Wootook::now();
         }
 
         if (!$types->is($buildingId, Legacies_Empire::TYPE_BUILDING)) {
@@ -656,7 +695,7 @@ class Legacies_Empire_Model_Planet
         }
 
         // Dispatch 'planet.building.append-queue.before' event
-        Legacies::dispatchEvent($this->_eventPrefix . '.building.append-queue.before', array(
+        Wootook::dispatchEvent($this->_eventPrefix . '.building.append-queue.before', array(
             'bulding_id'        => $buildingId,
             'level'             => $this->getElement($buildingId),
             $this->_eventObject => $this,
@@ -673,7 +712,7 @@ class Legacies_Empire_Model_Planet
         $this->getBuildingQueue()->appendQueue($buildingId, $level, $time);
 
         // Dispatch 'planet.shipyard.append-queue.after' event
-        Legacies::dispatchEvent($this->_eventPrefix . '.building.append-queue.after', array(
+        Wootook::dispatchEvent($this->_eventPrefix . '.building.append-queue.after', array(
             'bulding_id'        => $buildingId,
             'level'             => $this->getElement($buildingId),
             $this->_eventObject => $this,
@@ -687,11 +726,11 @@ class Legacies_Empire_Model_Planet
     public function updateBuildingQueue($time = null)
     {
         if ($time === null) {
-            $time = Legacies::now();
+            $time = Wootook::now();
         }
 
         // Dispatch event
-        Legacies::dispatchEvent($this->_eventPrefix . '.update-queue.before', array(
+        Wootook::dispatchEvent($this->_eventPrefix . '.update-queue.before', array(
             'time'              => &$time,
             $this->_eventObject => $this->_currentPlanet,
             'user'              => $this->_currentUser
@@ -700,7 +739,7 @@ class Legacies_Empire_Model_Planet
         $this->getBuildingQueue()->updateQueue($time);
 
         // Dispatch event
-        Legacies::dispatchEvent($this->_eventPrefix . '.update-queue.after', array(
+        Wootook::dispatchEvent($this->_eventPrefix . '.update-queue.after', array(
             'time'              => $time,
             'shipyard'          => $this,
             $this->_eventObject => $this->_currentPlanet,
@@ -725,12 +764,12 @@ class Legacies_Empire_Model_Planet
 
     /**
      *
-     * @return Legacies_Empire_Model_Planet_Builder
+     * @return Wootook_Empire_Model_Planet_Builder
      */
     public function getBuildingQueue()
     {
         if ($this->_builder === null) {
-            $this->_builder = new Legacies_Empire_Model_Planet_Builder($this, $this->getUser());
+            $this->_builder = new Wootook_Empire_Model_Planet_Builder($this, $this->getUser());
         }
         return $this->_builder;
     }
@@ -738,14 +777,14 @@ class Legacies_Empire_Model_Planet
     /**
      *
      * Enter description here ...
-     * @return Legacies_Empire_Model_Planet
+     * @return Wootook_Empire_Model_Planet
      */
     public function dequeueBuilding()
     {
         $this->getBuildingQueue()->rewind();
         $item = $this->getBuildingQueue()->current();
 
-        $this->getBuildingQueue()->dequeueFirstItem(Legacies::now());
+        $this->getBuildingQueue()->dequeueFirstItem(Wootook::now());
 
         return $this;
     }
@@ -753,7 +792,7 @@ class Legacies_Empire_Model_Planet
     /**
      *
      * Enter description here ...
-     * @return Legacies_Empire_Model_Planet
+     * @return Wootook_Empire_Model_Planet
      */
     public function dequeueItem($itemId)
     {
@@ -775,7 +814,7 @@ class Legacies_Empire_Model_Planet
 
         try {
             // Dispatch event. Throw an exception to break the avaliability.
-            Legacies::dispatchEvent($this->_eventPrefix . '.check-availability', array(
+            Wootook::dispatchEvent($this->_eventPrefix . '.check-availability', array(
                 'ship_id'           => $buildingId,
                 'shipyard'          => $this,
                 $this->_eventObject => $this->_currentPlanet,
@@ -815,7 +854,7 @@ class Legacies_Empire_Model_Planet
         if (isset($eventData['user'])) {
             $user = $eventData['user'];
 
-            if ($user === null || !$user instanceof Legacies_Empire_Model_User || !$user->getId()) {
+            if ($user === null || !$user instanceof Wootook_Empire_Model_User || !$user->getId()) {
                 return;
             }
 
@@ -831,7 +870,7 @@ class Legacies_Empire_Model_Planet
                 throw new Exception('No more planet to colonize!'); // Oops, no more free place
             }
 
-            $collection = new Legacies_Core_Collection(array('planet' => 'planets'));
+            $collection = new Wootook_Core_Collection(array('planet' => 'planets'));
             $collection
                 ->column(array('position' => 'planet.planet'))
                 ->where('planet.planet_type=1')
@@ -852,11 +891,11 @@ class Legacies_Empire_Model_Planet
             $key = array_rand($positions, 1);
             $finalPosition = $positions[$key];
 
-            $config = Legacies_Core_Model_Config::getSingleton();
+            $config = Wootook_Core_Model_Config::getSingleton();
             $planet = new self();
             $planet
                 ->setData('id_owner', $user->getId())
-                ->setData('name', Legacies::getRequest()->getParam('planet'))
+                ->setData('name', Wootook::getRequest()->getParam('planet'))
                 ->setData('galaxy', $systemInfo->getData('galaxy'))
                 ->setData('system', $systemInfo->getData('system'))
                 ->setData('planet', $finalPosition)
@@ -877,7 +916,7 @@ class Legacies_Empire_Model_Planet
                 ->setData('planet', $planet->getPosition())
             ;
 
-            Legacies::dispatchEvent('planet.init', array(
+            Wootook::dispatchEvent('planet.init', array(
                 'planet' => $planet,
                 'user'   => $user
                 ));
@@ -888,7 +927,7 @@ class Legacies_Empire_Model_Planet
 
     public static function searchMostFreeSystems($galaxyList = null, $systemList = null)
     {
-        $collection = new Legacies_Core_Collection(array('galaxy' => 'galaxy'));
+        $collection = new Wootook_Core_Collection(array('galaxy' => 'galaxy'));
         $collection
             ->column(array(
                 'galaxy' => 'galaxy.galaxy',
@@ -899,7 +938,7 @@ class Legacies_Empire_Model_Planet
             ->group('galaxy.system')
         ;
 
-        $config = Legacies_Core_Model_Config::getSingleton();
+        $config = Wootook_Core_Model_Config::getSingleton();
 
         if ($galaxyList === null && $config->hasData('user/registration/galaxy_list')) {
             $galaxyList = explode(',', $config->getData('user/registration/galaxy_list'));
@@ -951,7 +990,7 @@ class Legacies_Empire_Model_Planet
                 $time = time();
             }
 
-            if ($planet === null || !$planet instanceof Legacies_Empire_Model_Planet) {
+            if ($planet === null || !$planet instanceof Wootook_Empire_Model_Planet) {
                 return;
             }
 
@@ -964,7 +1003,7 @@ class Legacies_Empire_Model_Planet
 
     public function getResourceAmount($resourceType)
     {
-        $resources = Legacies_Empire_Model_Game_Resources::getSingleton();
+        $resources = Wootook_Empire_Model_Game_Resources::getSingleton();
 
         $resourceConfig = $resources->getData($resourceType);
         if ($resourceConfig === null) {
@@ -975,7 +1014,7 @@ class Legacies_Empire_Model_Planet
 
     public function getResourceCap($resourceType)
     {
-        $resources = Legacies_Empire_Model_Game_Resources::getSingleton();
+        $resources = Wootook_Empire_Model_Game_Resources::getSingleton();
 
         $resourceConfig = $resources->getData($resourceType);
         if ($resourceConfig === null) {
diff --git a/includes/application/code/core/Legacies/Empire/Model/Planet/Builder.php b/application/code/core/Wootook/Empire/Model/Planet/Builder.php
similarity index 87%
rename from includes/application/code/core/Legacies/Empire/Model/Planet/Builder.php
rename to application/code/core/Wootook/Empire/Model/Planet/Builder.php
index c7ac505..d696c8c 100644
--- a/includes/application/code/core/Legacies/Empire/Model/Planet/Builder.php
+++ b/application/code/core/Wootook/Empire/Model/Planet/Builder.php
@@ -1,7 +1,7 @@
  $buildingId,
             'level'       => $level,
             'created_at'  => $createdAt,
@@ -56,7 +56,7 @@ class Legacies_Empire_Model_Planet_Builder
      */
     public function checkAvailability($buildingId)
     {
-        $types = Legacies_Empire_Model_Game_Types::getSingleton();
+        $types = Wootook_Empire_Model_Game_Types::getSingleton();
 
         if ($types->is($buildingId, Legacies_Empire::TYPE_BUILDING)) {
             return true;
@@ -67,8 +67,8 @@ class Legacies_Empire_Model_Planet_Builder
 
     public function getBuildingTime($buildingId, $level)
     {
-        $prices = Legacies_Empire_Model_Game_Prices::getSingleton();
-        $gameConfig = Legacies_Core_Model_Config::getSingleton();
+        $prices = Wootook_Empire_Model_Game_Prices::getSingleton();
+        $gameConfig = Wootook_Core_Model_Config::getSingleton();
 
         Math::setPrecision(50);
         $firstLevelTime = $prices[$buildingId][Legacies_Empire::BASE_BUILDING_TIME];
@@ -80,7 +80,7 @@ class Legacies_Empire_Model_Planet_Builder
 
         Math::setPrecision();
 
-        $event = Legacies::dispatchEvent('planet.building.building-time', array(
+        $event = Wootook::dispatchEvent('planet.building.building-time', array(
             'time'        => $baseTime,
             'base_time'   => $baseTime,
             'planet'      => $this->_currentPlanet,
@@ -94,8 +94,8 @@ class Legacies_Empire_Model_Planet_Builder
 
     public function getResourcesNeeded($buildingId, $level)
     {
-        $prices = Legacies_Empire_Model_Game_Prices::getSingleton();
-        $resources = Legacies_Empire_Model_Game_Resources::getSingleton();
+        $prices = Wootook_Empire_Model_Game_Prices::getSingleton();
+        $resources = Wootook_Empire_Model_Game_Resources::getSingleton();
 
         if (!isset($prices[$buildingId])) {
             return array();
@@ -117,11 +117,11 @@ class Legacies_Empire_Model_Planet_Builder
     /**
      * Update the contruction queue.
      *
-     * @return Legacies_Empire_Model_Planet_Building_Shipyard
+     * @return Wootook_Empire_Model_Planet_Building_Shipyard
      */
     public function updateQueue($time)
     {
-        $fields = Legacies_Empire_Model_Game_FieldsAlias::getSingleton();
+        $fields = Wootook_Empire_Model_Game_FieldsAlias::getSingleton();
 
         $startingTime = $this->_currentPlanet->getData('b_building');
 
@@ -147,7 +147,7 @@ class Legacies_Empire_Model_Planet_Builder
 
                 $this->dequeue($element);
 
-                Legacies::dispatchEvent('planet.building.level-update', array(
+                Wootook::dispatchEvent('planet.building.level-update', array(
                     'time'        => $time - $elapsedTime,
                     'planet'      => $this->_currentPlanet,
                     'user'        => $this->_currentUser,
@@ -174,12 +174,12 @@ class Legacies_Empire_Model_Planet_Builder
      *
      * @param int $buildingId
      * @param int|string $level
-     * @return Legacies_Empire_Model_Planet_Building_Shipyard
+     * @return Wootook_Empire_Model_Planet_Building_Shipyard
      */
     public function appendQueue($buildingId, $level, $time)
     {
-        $types = Legacies_Empire_Model_Game_Types::getSingleton();
-        $resources = Legacies_Empire_Model_Game_Resources::getSingleton();
+        $types = Wootook_Empire_Model_Game_Types::getSingleton();
+        $resources = Wootook_Empire_Model_Game_Resources::getSingleton();
 
         if (!Math::isPositive($level)) {
             return $this;
@@ -221,7 +221,7 @@ class Legacies_Empire_Model_Planet_Builder
      * Dequeues the first item to build to the construction list and removes all
      * its successors of the same type.
      *
-     * @return Legacies_Empire_Model_Planet_Builder
+     * @return Wootook_Empire_Model_Planet_Builder
      */
     public function dequeueFirstItem()
     {
@@ -236,7 +236,7 @@ class Legacies_Empire_Model_Planet_Builder
      * successors of the same type.
      *
      * @param string $itemId
-     * @return Legacies_Empire_Model_Planet_Builder
+     * @return Wootook_Empire_Model_Planet_Builder
      */
     public function dequeueItem($itemId)
     {
diff --git a/application/code/core/Wootook/Empire/Model/Planet/Builder/Item.php b/application/code/core/Wootook/Empire/Model/Planet/Builder/Item.php
new file mode 100644
index 0000000..2e40fd2
--- /dev/null
+++ b/application/code/core/Wootook/Empire/Model/Planet/Builder/Item.php
@@ -0,0 +1,6 @@
+_currentUser = $currentUser;
+        $this->_currentPlanet = $currentPlanet;
+    }
+
+    protected function _load($className, $useSingleton)
+    {
+        $reflection = new ClassReflection($className);
+        if ($useSingleton && $reflection->implementsInterface('Wootook_Core_Singleton')) {
+            $method = $reflection->getMethod('getSingleton');
+            $method->invoke();
+        }
+
+        try {
+            return $reflection->invoke($this->_currentPlanet, $this->_currentUser);
+        } catch (ReflectionException $e) {
+            return null;
+        }
+    }
+}
diff --git a/includes/application/code/core/Legacies/Empire/Model/Planet/ResourceProductionInterface.php b/application/code/core/Wootook/Empire/Model/Planet/ResourceProductionInterface.php
similarity index 57%
rename from includes/application/code/core/Legacies/Empire/Model/Planet/ResourceProductionInterface.php
rename to application/code/core/Wootook/Empire/Model/Planet/ResourceProductionInterface.php
index 312ea22..371fb09 100644
--- a/includes/application/code/core/Legacies/Empire/Model/Planet/ResourceProductionInterface.php
+++ b/application/code/core/Wootook/Empire/Model/Planet/ResourceProductionInterface.php
@@ -1,6 +1,6 @@
 getElement(Legacies_Empire::ID_RESEARCH_COMBUSTION_DRIVE));
+    }
+
+    public function getActualSpeed(Wootook_Empire_Model_User $user)
+    {
+        return $this->getBaseSpeed($user) * $this->getSpeedMultiplier($user);
+    }
+
+    public function getActualConsumption(Wootook_Empire_Model_User $user, $speed)
+    {
+        return $this->getBaseConsumption($user) * ($speed / 100) * $this->getSpeedMultiplier($user);
+    }
+}
\ No newline at end of file
diff --git a/application/code/core/Wootook/Empire/Model/Planet/ShipInterface.php b/application/code/core/Wootook/Empire/Model/Planet/ShipInterface.php
new file mode 100644
index 0000000..81c54cc
--- /dev/null
+++ b/application/code/core/Wootook/Empire/Model/Planet/ShipInterface.php
@@ -0,0 +1,11 @@
+getData('username');
+    }
+
     public static function getSingleton()
     {
         if (self::$_singleton === null) {
-            $session = Legacies::getSession(self::SESSION_KEY);
+            $session = Wootook::getSession(self::SESSION_KEY);
             if ($session->hasData('user_id')) {
                 $id = intval($session->getData('user_id'));
-            } else if (Legacies::getRequest() !== null && ($cookie = Legacies::getRequest()->getCookie(self::$_cookieName)) !== null) {
+            } else if (Wootook::getRequest() !== null && ($cookie = Wootook::getRequest()->getCookie(self::$_cookieName)) !== null) {
                 $cookieData = unserialize(stripslashes($cookie));
                 if (is_array($cookieData)) {
-                    $collection = new Legacies_Core_Collection(array('user' => 'users'));
+                    $collection = new Wootook_Core_Collection(array('user' => 'users'));
                     $cookieData = array(
                         'id' => (isset($cookieData['id']) ? intval($cookieData['id']) : 0),
                         'key' => (isset($cookieData['key']) ? $collection->quote($cookieData['key']) : null)
@@ -89,7 +94,7 @@ class Legacies_Empire_Model_User
 
             try {
                 self::$_singleton = self::factory($id);
-            } catch (Legacies_Core_Model_Exception $e) {
+            } catch (Wootook_Core_Exception_DataAccessException $e) {
                 $session->addError('Session error.');
                 return null;
             }
@@ -127,16 +132,16 @@ class Legacies_Empire_Model_User
 
     public function logout()
     {
-        Legacies::getResponse()->unsetCookie(self::$_cookieName);
-        Legacies_Core_Model_Session::destroy();
+        Wootook::getResponse()->unsetCookie(self::$_cookieName);
+        Wootook_Core_Model_Session::destroy();
     }
 
     public static function login($username, $password, $remember = false)
     {
-        $session = Legacies::getSession(self::SESSION_KEY);
+        $session = Wootook::getSession(self::SESSION_KEY);
 
         try {
-            $collection = new Legacies_Core_Collection(array('user' => 'users'));
+            $collection = new Wootook_Core_Collection(array('user' => 'users'));
 
             $passwordHash = md5($password);
             $collection
@@ -151,8 +156,8 @@ class Legacies_Empire_Model_User
                     'username' => $username
                     ))
             ;
-        } catch (Legacies_Core_Model_Exception $e) {
-            Legacies_Core_ErrorProfiler::getSingleton()->exceptionManager($e);
+        } catch (Wootook_Core_Exception_DataAccessException $e) {
+            Wootook_Core_ErrorProfiler::getSingleton()->exceptionManager($e);
             $session->addError('No such user.');
             return null;
         }
@@ -177,8 +182,8 @@ class Legacies_Empire_Model_User
                 }
             }
 
-            if (isset($_POST["rememberme"]) && Legacies::getRequest() !== null) {
-                Legacies::$response->setCookie(self::$_cookieName, array('id' => $login['id'], 'key' => $login['login_rememberme']), self::COOKIE_LIFETIME);
+            if (isset($_POST["rememberme"]) && Wootook::getRequest() !== null) {
+                Wootook::$response->setCookie(self::$_cookieName, array('id' => $login['id'], 'key' => $login['login_rememberme']), self::COOKIE_LIFETIME);
             }
 
             self::$_singleton = self::factory($login['id']);
@@ -196,15 +201,15 @@ class Legacies_Empire_Model_User
     public static function register($username, $email, $password)
     {
         try {
-            $request = Legacies::getRequest();
+            $request = Wootook::getRequest();
             $user = new self(array(
                 'username' => $username,
                 'password' => md5($password),
                 'email'    => $email,
                 'email_2'  => $email,
 
-                'register_time' => Legacies::now(),
-                'onlinetime'    => Legacies::now(),
+                'register_time' => Wootook::now(),
+                'onlinetime'    => Wootook::now(),
                 'ip_at_reg'     => $request->getServer('REMOTE_ADDR'),
                 'user_lastip'   => $request->getServer('REMOTE_ADDR'),
                 'user_agent'    => $request->getServer('HTTP_USER_AGENT')
@@ -212,12 +217,12 @@ class Legacies_Empire_Model_User
 
             $user->save();
 
-            Legacies::dispatchEvent('user.init', array(
+            Wootook::dispatchEvent('user.init', array(
                 'user' => $user
                 ));
 
             $user->save();
-        } catch (Legacies_Core_Model_Exception $e) {
+        } catch (Wootook_Core_Exception_DataAccessException $e) {
             echo $e->getTraceAsString();
             $session->addError($e->getMessage());
             return null;
@@ -229,11 +234,11 @@ class Legacies_Empire_Model_User
     /**
      *
      * Enter description here ...
-     * @param int|Legacies_Empire_Model_Planet $planet
+     * @param int|Wootook_Empire_Model_Planet $planet
      */
     public function updateCurrentPlanet($planet)
     {
-        if (!$planet instanceof Legacies_Empire_Model_Planet) {
+        if (!$planet instanceof Wootook_Empire_Model_Planet) {
             $planetCollection = $this->_preparePlanetCollection()->where('id=:id');
 
             $planetCollection->load(array(
@@ -260,9 +265,9 @@ class Legacies_Empire_Model_User
     /**
      *
      * Enter description here ...
-     * @param Legacies_Empire_Model_Planet $planet
+     * @param Wootook_Empire_Model_Planet $planet
      */
-    public function setHomePlanet(Legacies_Empire_Model_Planet $planet)
+    public function setHomePlanet(Wootook_Empire_Model_Planet $planet)
     {
         if ($planet->getUserId() != $this->getId() || $planet->isDestroyed()) {
             return $this;
@@ -277,9 +282,9 @@ class Legacies_Empire_Model_User
     /**
      *
      * Enter description here ...
-     * @param Legacies_Empire_Model_Planet $planet
+     * @param Wootook_Empire_Model_Planet $planet
      */
-    public function setCurrentPlanet(Legacies_Empire_Model_Planet $planet)
+    public function setCurrentPlanet(Wootook_Empire_Model_Planet $planet)
     {
         if ($planet->getUserId() != $this->getId() || $planet->isDestroyed()) {
             return $this;
@@ -294,7 +299,7 @@ class Legacies_Empire_Model_User
     /**
      *
      * Enter description here ...
-     * @return Legacies_Empire_Model_Planet
+     * @return Wootook_Empire_Model_Planet
      */
     public function getHomePlanet()
     {
@@ -304,7 +309,7 @@ class Legacies_Empire_Model_User
                 return null;
             }
 
-            $planet = Legacies_Empire_Model_Planet::factory($planetId);
+            $planet = Wootook_Empire_Model_Planet::factory($planetId);
 
             if ($planet->getUserId() != $this->getId() || $planet->isDestroyed()) {
                 return null;
@@ -319,7 +324,7 @@ class Legacies_Empire_Model_User
     /**
      *
      * Enter description here ...
-     * @return Legacies_Empire_Model_Planet
+     * @return Wootook_Empire_Model_Planet
      */
     public function getCurrentPlanet()
     {
@@ -333,7 +338,7 @@ class Legacies_Empire_Model_User
                 return $this->_currentPlanet;
             }
 
-            $planet = Legacies_Empire_Model_Planet::factory($planetId);
+            $planet = Wootook_Empire_Model_Planet::factory($planetId);
 
             if ($planet->getUserId() != $this->getId() || $planet->isDestroyed()) {
                 $this->_currentPlanet = $this->getHomePlanet();
@@ -350,7 +355,7 @@ class Legacies_Empire_Model_User
 
     protected function _preparePlanetCollection()
     {
-        $planetCollection = new Legacies_Core_Collection(array('planet' => 'planets'), 'Legacies_Empire_Model_Planet');
+        $planetCollection = new Wootook_Core_Collection(array('planet' => 'planets'), 'Wootook_Empire_Model_Planet');
         $planetCollection->where('id_owner=:user');
 
         $order = ($this->getData('planet_sort_order') == 1) ? 'DESC' : 'ASC';
@@ -388,23 +393,31 @@ class Legacies_Empire_Model_User
         return $planetCollection;
     }
 
+    protected function _prepareFleetCollection()
+    {
+        $collection = new Wootook_Core_Collection(array('fleet' => 'fleets'));
+        $collection
+            ->setEntityClassName('Wootook_Empire_Model_Fleet')
+            ->where('fleet_owner <= :user_id')
+        ;
+        return $collection;
+    }
+
     public function getFleets()
     {
-        $collection = new Legacies_Core_Collection(array('fleet' => 'fleets'));
-        $collection
-            ->setEntityClassName('Legacies_Empire_Model_Fleet')
-            ->where('fleet_owner <= :user_id')
-            ->load(array('user_id' => $this->getId()))
-        ;
+        return $this->_prepareFleetCollection()->load(array('user_id' => $this->getId()));
+    }
 
-        return $collection;
+    public function getFleetCount()
+    {
+        return $this->_prepareFleetCollection()->getSize(array('user_id' => $this->getId()));
     }
 
     public function getVisibleFleets()
     {
 
-        $user = Legacies_Empire_Model_User::getSingleton();
-        $firstCollection = new Legacies_Core_Collection(array('fleet' => 'fleets'));
+        $user = Wootook_Empire_Model_User::getSingleton();
+        $firstCollection = new Wootook_Core_Collection(array('fleet' => 'fleets'));
         $firstCollection
 //            ->column('*')
             ->column('fleet.fleet_start_galaxy', 'galaxy')
@@ -413,7 +426,7 @@ class Legacies_Empire_Model_User
             ->column('fleet.fleet_start_type',   'planet_type')
             ->where('fleet_end_time <= :now')
         ;
-        $backCollection = new Legacies_Core_Collection(array('fleet' => 'fleets'));
+        $backCollection = new Wootook_Core_Collection(array('fleet' => 'fleets'));
         $backCollection
 //            ->column('*')
             ->column('fleet.fleet_end_galaxy', 'galaxy')
@@ -422,9 +435,9 @@ class Legacies_Empire_Model_User
             ->column('fleet.fleet_end_type',   'planet_type')
             ->where('fleet_end_time <= :now')
         ;
-        $collection = new Legacies_Core_Collection();
+        $collection = new Wootook_Core_Collection();
         $collection
-            ->setEntityClassName('Legacies_Empire_Model_Fleet')
+            ->setEntityClassName('Wootook_Empire_Model_Fleet')
             ->union($firstCollection)
             ->union($backCollection)
             ->load(array('now' => time()));
@@ -434,21 +447,21 @@ class Legacies_Empire_Model_User
 
     public function getElement($elementId)
     {
-        $fields = Legacies_Empire_Model_Game_FieldsAlias::getSingleton();
+        $fields = Wootook_Empire_Model_Game_FieldsAlias::getSingleton();
 
         return $this->getData($fields[$elementId]);
     }
 
     public function setElement($elementId, $level)
     {
-        $fields = Legacies_Empire_Model_Game_FieldsAlias::getSingleton();
+        $fields = Wootook_Empire_Model_Game_FieldsAlias::getSingleton();
 
         return $this->setData($fields[$elementId], $level);
     }
 
     public function hasElement($elementId, $levelRequired = 0)
     {
-        $fields = Legacies_Empire_Model_Game_FieldsAlias::getSingleton();
+        $fields = Wootook_Empire_Model_Game_FieldsAlias::getSingleton();
 
         return $this->hasData($fields[$elementId]) && Math::comp($this->getElement($elementId), $levelRequired) > 0;
     }
@@ -478,12 +491,12 @@ class Legacies_Empire_Model_User
 
     public function getFleetCollection($time = null)
     {
-        $firstCollection = new Legacies_Core_Collection(array('fleet' => 'fleets'));
+        $firstCollection = new Wootook_Core_Collection(array('fleet' => 'fleets'));
         $firstCollection
             ->column('*')
             ->where('fleet.fleet_owner = :user')
         ;
-        $backCollection = new Legacies_Core_Collection(array('fleet' => 'fleets'));
+        $backCollection = new Wootook_Core_Collection(array('fleet' => 'fleets'));
         $backCollection
             ->column('*')
             ->where('fleet.fleet_target_owner = :user')
@@ -499,9 +512,9 @@ class Legacies_Empire_Model_User
             $backCollection->where('fleet_end_time <= :now');
         }
 
-        $collection = new Legacies_Core_Collection();
+        $collection = new Wootook_Core_Collection();
         $collection
-            ->setEntityClassName('Legacies_Empire_Model_Fleet')
+            ->setEntityClassName('Wootook_Empire_Model_Fleet')
             ->union($firstCollection)
             ->union($backCollection)
             ->load($options)
@@ -512,7 +525,7 @@ class Legacies_Empire_Model_User
 
     public function getNewMessagesCount()
     {
-        $messageCollection = new Legacies_Core_Collection('messages');
+        $messageCollection = new Wootook_Core_Collection('messages');
         $messageCollection->where('message_owner=:user');
         $messageCollection->where('message_read_at<=0');
 
diff --git a/includes/application/code/core/Legacies/Empire/Model/User/Message.php b/application/code/core/Wootook/Empire/Model/User/Message.php
similarity index 75%
rename from includes/application/code/core/Legacies/Empire/Model/User/Message.php
rename to application/code/core/Wootook/Empire/Model/User/Message.php
index f3ea9a4..80241ef 100644
--- a/includes/application/code/core/Legacies/Empire/Model/User/Message.php
+++ b/application/code/core/Wootook/Empire/Model/User/Message.php
@@ -1,7 +1,7 @@
 
+ * 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 .
+ *
+ *                                --> 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
+ *
+ */
 class Math
 {
     const DEFAULT_PRECISTION = 0;
diff --git a/includes/application/code/libraries/Math/Bcmath.php b/application/code/libraries/Math/Bcmath.php
similarity index 71%
rename from includes/application/code/libraries/Math/Bcmath.php
rename to application/code/libraries/Math/Bcmath.php
index 8c4c592..bbf9b45 100644
--- a/includes/application/code/libraries/Math/Bcmath.php
+++ b/application/code/libraries/Math/Bcmath.php
@@ -1,4 +1,38 @@
 
+ * 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 .
+ *
+ *                                --> 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
+ *
+ */
 
 class Math_Bcmath
 {
diff --git a/application/code/libraries/Math/Native.php b/application/code/libraries/Math/Native.php
new file mode 100644
index 0000000..300d8e7
--- /dev/null
+++ b/application/code/libraries/Math/Native.php
@@ -0,0 +1,97 @@
+
+ * 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 .
+ *
+ *                                --> 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
+ *
+ */
+
+class Math_Native
+{
+    public function setPrecision($precision)
+    {
+    }
+
+    public function add($a, $b)
+    {
+        return $a + $b;
+    }
+
+    public function mul($a, $b)
+    {
+        return $a * $b;
+    }
+
+    public function sub($a, $b)
+    {
+        return $a - $b;
+    }
+
+    public function div($a, $b)
+    {
+        return $a / $b;
+    }
+
+    public function mod($a, $b)
+    {
+        return $a % $b;
+    }
+
+    public function pow($a, $b)
+    {
+        return pow($a, $b);
+    }
+
+    public function comp($a, $b)
+    {
+        return ($a > $b) ? 1 : (($a < $b) ? -1 : 0);
+    }
+
+    public function ceil($x)
+    {
+        return ceil($x);
+    }
+
+    public function floor($x)
+    {
+        return floor($x);
+    }
+
+    public function round($range = 0)
+    {
+        return round($x, $range);
+    }
+
+    public function render($a)
+    {
+        return number_format($a, 0, ',', '.');
+    }
+}
\ No newline at end of file
diff --git a/includes/application/code/local/.placeholder b/application/code/local/.placeholder
similarity index 100%
rename from includes/application/code/local/.placeholder
rename to application/code/local/.placeholder
diff --git a/application/code/local/ga.js b/application/code/local/ga.js
new file mode 100644
index 0000000..9b28dfa
--- /dev/null
+++ b/application/code/local/ga.js
@@ -0,0 +1,27 @@
+var _gaq = _gaq || [];
+
+(function()){
+  var trackErrorThroughEvent = function(exception, f) {
+    _gaq.push(['_trackEvent',
+      'JS ERROR: '+ (f || 'native') + ' (nav:'+ navigator.userAgent +') Exception: '+ (exception.name || 'Error'),
+      exception.message || exception,
+      ' url: '+document.location.href+' referer: '+ document.referrer
+      ]);
+    };
+
+  var outLink = function(link){
+    var _gA = link.href.split('/');
+    var _gS = link.href.split('#');
+
+    var _gT = '/out-link/' + _gA[2] + '/?d=' + _gS[0];
+        _gaq.push(['_trackPageview',_gT]);
+        _gaq.push(function() {
+            try {
+                setTimeout('window.open(_gat._getTrackerByName()._getLinkerUrl(\'' + lien.href + '\',false),\'_blank\')', 100);
+            } catch(err) {
+                window.open(lien.href, '_blank');   /* préserve le fonctionnement du lien href en cas de pb */
+                trackErrorThroughEvent(err,'lienSortant : '+lien.href );
+            }
+        });
+    }
+})();
\ No newline at end of file
diff --git a/application/code/test/Legacies/Core/LayoutTest.php b/application/code/test/Legacies/Core/LayoutTest.php
new file mode 100644
index 0000000..1e2a2fd
--- /dev/null
+++ b/application/code/test/Legacies/Core/LayoutTest.php
@@ -0,0 +1,41 @@
+markTestIncomplete();
+        /*
+        $layoutDir = vfsStreamWrapper::getContent('');
+        vfsStream::addStructure(array());
+
+        $this->_object = new Legacies_Core_Layout();
+        */
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
+
+    public function testEmpty()
+    {
+
+    }
+}
diff --git a/includes/application/code/core/Test/Legacies/Empire/Model/BuilderTest.php b/application/code/test/Legacies/Empire/Model/BuilderTest.php
similarity index 99%
rename from includes/application/code/core/Test/Legacies/Empire/Model/BuilderTest.php
rename to application/code/test/Legacies/Empire/Model/BuilderTest.php
index 46e436c..45b7013 100644
--- a/includes/application/code/core/Test/Legacies/Empire/Model/BuilderTest.php
+++ b/application/code/test/Legacies/Empire/Model/BuilderTest.php
@@ -1,7 +1,7 @@
 _object = new Legacies_Object();
+        $this->_object = new Wootook_Object();
     }
 
     /**
@@ -109,7 +109,7 @@ class Test_Legacies_ObjectTest extends PHPUnit_Framework_TestCase
         $expected = array(
             'test'     => 'legacies',
             'testing'  => false,
-            'legacies' => 'Legacies_Object'
+            'legacies' => 'Wootook_Object'
             );
 
         $this->_object->addData($expected);
diff --git a/includes/application/code/core/Test/LegaciesTest.php b/application/code/test/LegaciesTest.php
similarity index 59%
rename from includes/application/code/core/Test/LegaciesTest.php
rename to application/code/test/LegaciesTest.php
index 678da8b..d230e54 100644
--- a/includes/application/code/core/Test/LegaciesTest.php
+++ b/application/code/test/LegaciesTest.php
@@ -5,7 +5,7 @@ class Test_LegaciesTest
 {
     protected function tearDown()
     {
-        Legacies::clearAllListeners();
+        Wootook::clearAllListeners();
     }
 
     public function nonStaticListener($observer)
@@ -20,9 +20,9 @@ class Test_LegaciesTest
 
     public function testRegisteringNonStaticEvent()
     {
-        Legacies::registerListener('testing', array($this, 'nonStaticListener'));
+        Wootook::registerListener('testing', array($this, 'nonStaticListener'));
 
-        $observer = Legacies::dispatchEvent('testing', array('success' => false));
+        $observer = Wootook::dispatchEvent('testing', array('success' => false));
 
         $this->assertInstanceOf('Legacies_Core_Event', $observer);
         $this->assertTrue($observer->getData('success'));
@@ -30,9 +30,9 @@ class Test_LegaciesTest
 
     public function testRegisteringStaticEvent()
     {
-        Legacies::registerListener('testing', array(get_class($this), 'staticListener'));
+        Wootook::registerListener('testing', array(get_class($this), 'staticListener'));
 
-        $observer = Legacies::dispatchEvent('testing', array('success' => false));
+        $observer = Wootook::dispatchEvent('testing', array('success' => false));
 
         $this->assertInstanceOf('Legacies_Core_Event', $observer);
         $this->assertTrue($observer->getData('success'));
@@ -40,7 +40,7 @@ class Test_LegaciesTest
 
     public function testDispatchNonExistingEvent()
     {
-        $observer = Legacies::dispatchEvent('testing', array('success' => true));
+        $observer = Wootook::dispatchEvent('testing', array('success' => true));
 
         $this->assertInstanceOf('Legacies_Core_Event', $observer);
         $this->assertTrue($observer->getData('success'));
@@ -51,11 +51,11 @@ class Test_LegaciesTest
      */
     public function testUnregisteringNonStaticEvent()
     {
-        Legacies::registerListener('testing', array($this, 'nonStaticListener'));
+        Wootook::registerListener('testing', array($this, 'nonStaticListener'));
 
-        Legacies::clearEventListeners('testing');
+        Wootook::clearEventListeners('testing');
 
-        $observer = Legacies::dispatchEvent('testing', array('success' => false));
+        $observer = Wootook::dispatchEvent('testing', array('success' => false));
 
         $this->assertInstanceOf('Legacies_Core_Event', $observer);
         $this->assertFalse($observer->getData('success'));
@@ -66,11 +66,11 @@ class Test_LegaciesTest
      */
     public function testUnregisteringStaticEvent()
     {
-        Legacies::registerListener('testing', array(get_class($this), 'staticListener'));
+        Wootook::registerListener('testing', array(get_class($this), 'staticListener'));
 
-        Legacies::clearEventListeners('testing');
+        Wootook::clearEventListeners('testing');
 
-        $observer = Legacies::dispatchEvent('testing', array('success' => false));
+        $observer = Wootook::dispatchEvent('testing', array('success' => false));
 
         $this->assertInstanceOf('Legacies_Core_Event', $observer);
         $this->assertFalse($observer->getData('success'));
@@ -79,31 +79,31 @@ class Test_LegaciesTest
     public function testGetSession()
     {
         $this->markTestSkipped('Sessions could not be tested in CLI.');
-        $this->assertInstanceOf('Legacies_Core_Model_Session', Legacies::getSession('test'));
+        $this->assertInstanceOf('Legacies_Core_Model_Session', Wootook::getSession('test'));
     }
 
     public function testGetTranslator()
     {
-        $this->assertInstanceOf('Legacies_Core_Model_Translator', Legacies::getTranslator('test'));
+        $this->assertInstanceOf('Legacies_Core_Model_Translator', Wootook::getTranslator('test'));
 
-        $this->assertInstanceOf('Legacies_Core_Model_Translator', Legacies::getTranslator());
+        $this->assertInstanceOf('Legacies_Core_Model_Translator', Wootook::getTranslator());
     }
 
     public function testTranslate()
     {
-        $this->assertEquals('My testing message!', Legacies::translate('test', 'My %s message!', array('testing')));
+        $this->assertEquals('My testing message!', Wootook::translate('test', 'My %s message!', array('testing')));
     }
 
     public function testTranslateGettextStyle()
     {
-        $this->assertEquals('My testing message!', Legacies::__('My %s message!', 'testing'));
+        $this->assertEquals('My testing message!', Wootook::__('My %s message!', 'testing'));
     }
 
     public function testSetDefaultLocale()
     {
-        Legacies::setDefaultLocale('test');
+        Wootook::setDefaultLocale('test');
 
-        $this->assertAttributeEquals('test', '_defaultLocale', 'Legacies');
+        $this->assertAttributeEquals('test', '_defaultLocale', 'Beyond');
     }
 
     /**
@@ -112,8 +112,8 @@ class Test_LegaciesTest
      */
     public function testGetDefaultLocale()
     {
-        Legacies::setDefaultLocale('test');
+        Wootook::setDefaultLocale('test');
 
-        $this->assertEquals('test', Legacies::getDefaultLocale());
+        $this->assertEquals('test', Wootook::getDefaultLocale());
     }
 }
diff --git a/includes/application/code/core/Test/bootstrap.php b/application/code/test/bootstrap.php
similarity index 100%
rename from includes/application/code/core/Test/bootstrap.php
rename to application/code/test/bootstrap.php
diff --git a/includes/application/design/layouts/empire.php b/application/design/base/default/layouts/empire.php
similarity index 94%
rename from includes/application/design/layouts/empire.php
rename to application/design/base/default/layouts/empire.php
index 10ad3d5..f1aaab7 100644
--- a/includes/application/design/layouts/empire.php
+++ b/application/design/base/default/layouts/empire.php
@@ -182,7 +182,7 @@
                         'template' => 'empire/topnav.phtml',
                         ),
                     'item-list' => array(
-                        'type'     => 'empire/planet.shipyard',
+                        'type'     => 'legacies_empire/planet.shipyard',
                         'template' => 'empire/planet/shipyard.phtml',
                         'children' => array(
                             'item-list.items' => array(
@@ -199,13 +199,13 @@
                             array(
                                 'method' => 'setItemBlockType',
                                 'params' => array(
-                                    'blockType' => 'empire/planet.shipyard.item'
+                                    'blockType' => 'legacies_empire/planet.shipyard.item'
                                     )
                                 ),
                             )
                         ),
                     'queue' => array(
-                        'type' => 'empire/planet.shipyard.queue',
+                        'type' => 'legacies_empire/planet.shipyard.queue',
                         'template' => 'empire/planet/shipyard/queue.phtml',
                         'actions' => array(
                             array(
@@ -217,7 +217,7 @@
                             array(
                                 'method' => 'setItemBlockType',
                                 'params' => array(
-                                    'blockType' => 'empire/planet.shipyard.queue.item'
+                                    'blockType' => 'legacies_empire/planet.shipyard.queue.item'
                                     )
                                 )
                             )
@@ -253,7 +253,7 @@
                         'template' => 'empire/topnav.phtml',
                         ),
                     'item-list' => array(
-                        'type'     => 'empire/planet.research-lab',
+                        'type'     => 'legacies_empire/planet.research-lab',
                         'template' => 'empire/planet/research-lab.phtml',
                         'children' => array(
                             'item-list.items' => array(
@@ -270,13 +270,13 @@
                             array(
                                 'method' => 'setItemBlockType',
                                 'params' => array(
-                                    'blockType' => 'empire/planet.research-lab.item'
+                                    'blockType' => 'legacies_empire/planet.research-lab.item'
                                     )
                                 ),
                             )
                         ),
                     'queue' => array(
-                        'type' => 'empire/planet.research-lab.queue',
+                        'type' => 'legacies_empire/planet.research-lab.queue',
                         'template' => 'empire/planet/research-lab/queue.phtml',
                         'actions' => array(
                             array(
@@ -288,7 +288,7 @@
                             array(
                                 'method' => 'setItemBlockType',
                                 'params' => array(
-                                    'blockType' => 'empire/planet.research-lab.queue.item'
+                                    'blockType' => 'legacies_empire/planet.research-lab.queue.item'
                                     )
                                 )
                             )
diff --git a/includes/application/design/layouts/page.php b/application/design/base/default/layouts/page.php
similarity index 100%
rename from includes/application/design/layouts/page.php
rename to application/design/base/default/layouts/page.php
diff --git a/includes/application/design/scripts/deprecated/add_declare.tpl b/application/design/base/default/scripts/deprecated/add_declare.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/add_declare.tpl
rename to application/design/base/default/scripts/deprecated/add_declare.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/activeplanet_body.tpl b/application/design/base/default/scripts/deprecated/admin/activeplanet_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/activeplanet_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/activeplanet_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/add_money.tpl b/application/design/base/default/scripts/deprecated/admin/add_money.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/add_money.tpl
rename to application/design/base/default/scripts/deprecated/admin/add_money.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/add_moon.tpl b/application/design/base/default/scripts/deprecated/admin/add_moon.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/add_moon.tpl
rename to application/design/base/default/scripts/deprecated/admin/add_moon.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/admin_panel_asw1.tpl b/application/design/base/default/scripts/deprecated/admin/admin_panel_asw1.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/admin_panel_asw1.tpl
rename to application/design/base/default/scripts/deprecated/admin/admin_panel_asw1.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/admin_panel_asw2.tpl b/application/design/base/default/scripts/deprecated/admin/admin_panel_asw2.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/admin_panel_asw2.tpl
rename to application/design/base/default/scripts/deprecated/admin/admin_panel_asw2.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/admin_panel_frm1.tpl b/application/design/base/default/scripts/deprecated/admin/admin_panel_frm1.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/admin_panel_frm1.tpl
rename to application/design/base/default/scripts/deprecated/admin/admin_panel_frm1.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/admin_panel_frm2.tpl b/application/design/base/default/scripts/deprecated/admin/admin_panel_frm2.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/admin_panel_frm2.tpl
rename to application/design/base/default/scripts/deprecated/admin/admin_panel_frm2.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/admin_panel_frm3.tpl b/application/design/base/default/scripts/deprecated/admin/admin_panel_frm3.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/admin_panel_frm3.tpl
rename to application/design/base/default/scripts/deprecated/admin/admin_panel_frm3.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/admin_panel_frm4.tpl b/application/design/base/default/scripts/deprecated/admin/admin_panel_frm4.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/admin_panel_frm4.tpl
rename to application/design/base/default/scripts/deprecated/admin/admin_panel_frm4.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/admin_panel_main.tpl b/application/design/base/default/scripts/deprecated/admin/admin_panel_main.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/admin_panel_main.tpl
rename to application/design/base/default/scripts/deprecated/admin/admin_panel_main.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/banadni.tpl b/application/design/base/default/scripts/deprecated/admin/banadni.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/banadni.tpl
rename to application/design/base/default/scripts/deprecated/admin/banadni.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/banned.tpl b/application/design/base/default/scripts/deprecated/admin/banned.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/banned.tpl
rename to application/design/base/default/scripts/deprecated/admin/banned.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/changepass.tpl b/application/design/base/default/scripts/deprecated/admin/changepass.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/changepass.tpl
rename to application/design/base/default/scripts/deprecated/admin/changepass.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/chat_body.tpl b/application/design/base/default/scripts/deprecated/admin/chat_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/chat_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/chat_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/credit_body.tpl b/application/design/base/default/scripts/deprecated/admin/credit_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/credit_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/credit_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/declarelist_body.tpl b/application/design/base/default/scripts/deprecated/admin/declarelist_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/declarelist_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/declarelist_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/declarelist_rows.tpl b/application/design/base/default/scripts/deprecated/admin/declarelist_rows.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/declarelist_rows.tpl
rename to application/design/base/default/scripts/deprecated/admin/declarelist_rows.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/deletuser.tpl b/application/design/base/default/scripts/deprecated/admin/deletuser.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/deletuser.tpl
rename to application/design/base/default/scripts/deprecated/admin/deletuser.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/errors_body.tpl b/application/design/base/default/scripts/deprecated/admin/errors_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/errors_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/errors_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/exec_query.tpl b/application/design/base/default/scripts/deprecated/admin/exec_query.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/exec_query.tpl
rename to application/design/base/default/scripts/deprecated/admin/exec_query.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/fleet_body.tpl b/application/design/base/default/scripts/deprecated/admin/fleet_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/fleet_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/fleet_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/fleet_rows.tpl b/application/design/base/default/scripts/deprecated/admin/fleet_rows.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/fleet_rows.tpl
rename to application/design/base/default/scripts/deprecated/admin/fleet_rows.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/left_menu.tpl b/application/design/base/default/scripts/deprecated/admin/left_menu.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/left_menu.tpl
rename to application/design/base/default/scripts/deprecated/admin/left_menu.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/md5enc.tpl b/application/design/base/default/scripts/deprecated/admin/md5enc.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/md5enc.tpl
rename to application/design/base/default/scripts/deprecated/admin/md5enc.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/message_body.tpl b/application/design/base/default/scripts/deprecated/admin/message_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/message_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/message_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/messagelist_body.tpl b/application/design/base/default/scripts/deprecated/admin/messagelist_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/messagelist_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/messagelist_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/messagelist_table_rows.tpl b/application/design/base/default/scripts/deprecated/admin/messagelist_table_rows.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/messagelist_table_rows.tpl
rename to application/design/base/default/scripts/deprecated/admin/messagelist_table_rows.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/messall_body.tpl b/application/design/base/default/scripts/deprecated/admin/messall_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/messall_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/messall_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/moonlist_body.tpl b/application/design/base/default/scripts/deprecated/admin/moonlist_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/moonlist_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/moonlist_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/multi_body.tpl b/application/design/base/default/scripts/deprecated/admin/multi_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/multi_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/multi_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/multi_rows.tpl b/application/design/base/default/scripts/deprecated/admin/multi_rows.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/multi_rows.tpl
rename to application/design/base/default/scripts/deprecated/admin/multi_rows.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/options_body.tpl b/application/design/base/default/scripts/deprecated/admin/options_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/options_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/options_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/overview_body.tpl b/application/design/base/default/scripts/deprecated/admin/overview_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/overview_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/overview_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/overview_rows.tpl b/application/design/base/default/scripts/deprecated/admin/overview_rows.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/overview_rows.tpl
rename to application/design/base/default/scripts/deprecated/admin/overview_rows.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/planetlist_body.tpl b/application/design/base/default/scripts/deprecated/admin/planetlist_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/planetlist_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/planetlist_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/reset_body.tpl b/application/design/base/default/scripts/deprecated/admin/reset_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/reset_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/reset_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/simple_header.tpl b/application/design/base/default/scripts/deprecated/admin/simple_header.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/simple_header.tpl
rename to application/design/base/default/scripts/deprecated/admin/simple_header.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/unbanned.tpl b/application/design/base/default/scripts/deprecated/admin/unbanned.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/unbanned.tpl
rename to application/design/base/default/scripts/deprecated/admin/unbanned.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/userlist_body.tpl b/application/design/base/default/scripts/deprecated/admin/userlist_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/userlist_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/userlist_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/userlist_rows.tpl b/application/design/base/default/scripts/deprecated/admin/userlist_rows.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/userlist_rows.tpl
rename to application/design/base/default/scripts/deprecated/admin/userlist_rows.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/variables_body.tpl b/application/design/base/default/scripts/deprecated/admin/variables_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/variables_body.tpl
rename to application/design/base/default/scripts/deprecated/admin/variables_body.tpl
diff --git a/includes/application/design/scripts/deprecated/admin/variables_rows.tpl b/application/design/base/default/scripts/deprecated/admin/variables_rows.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/admin/variables_rows.tpl
rename to application/design/base/default/scripts/deprecated/admin/variables_rows.tpl
diff --git a/includes/application/design/scripts/deprecated/agreement.tpl b/application/design/base/default/scripts/deprecated/agreement.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/agreement.tpl
rename to application/design/base/default/scripts/deprecated/agreement.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_admin.tpl b/application/design/base/default/scripts/deprecated/alliance_admin.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_admin.tpl
rename to application/design/base/default/scripts/deprecated/alliance_admin.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_admin_laws.tpl b/application/design/base/default/scripts/deprecated/alliance_admin_laws.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_admin_laws.tpl
rename to application/design/base/default/scripts/deprecated/alliance_admin_laws.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_admin_laws_feet.tpl b/application/design/base/default/scripts/deprecated/alliance_admin_laws_feet.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_admin_laws_feet.tpl
rename to application/design/base/default/scripts/deprecated/alliance_admin_laws_feet.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_admin_laws_head.tpl b/application/design/base/default/scripts/deprecated/alliance_admin_laws_head.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_admin_laws_head.tpl
rename to application/design/base/default/scripts/deprecated/alliance_admin_laws_head.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_admin_laws_row.tpl b/application/design/base/default/scripts/deprecated/alliance_admin_laws_row.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_admin_laws_row.tpl
rename to application/design/base/default/scripts/deprecated/alliance_admin_laws_row.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_admin_members_function.tpl b/application/design/base/default/scripts/deprecated/alliance_admin_members_function.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_admin_members_function.tpl
rename to application/design/base/default/scripts/deprecated/alliance_admin_members_function.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_admin_members_row.tpl b/application/design/base/default/scripts/deprecated/alliance_admin_members_row.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_admin_members_row.tpl
rename to application/design/base/default/scripts/deprecated/alliance_admin_members_row.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_admin_members_row_edit.tpl b/application/design/base/default/scripts/deprecated/alliance_admin_members_row_edit.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_admin_members_row_edit.tpl
rename to application/design/base/default/scripts/deprecated/alliance_admin_members_row_edit.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_admin_members_table.tpl b/application/design/base/default/scripts/deprecated/alliance_admin_members_table.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_admin_members_table.tpl
rename to application/design/base/default/scripts/deprecated/alliance_admin_members_table.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_admin_rename.tpl b/application/design/base/default/scripts/deprecated/alliance_admin_rename.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_admin_rename.tpl
rename to application/design/base/default/scripts/deprecated/alliance_admin_rename.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_admin_rename1.tpl b/application/design/base/default/scripts/deprecated/alliance_admin_rename1.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_admin_rename1.tpl
rename to application/design/base/default/scripts/deprecated/alliance_admin_rename1.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_admin_rename2.tpl b/application/design/base/default/scripts/deprecated/alliance_admin_rename2.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_admin_rename2.tpl
rename to application/design/base/default/scripts/deprecated/alliance_admin_rename2.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_admin_request_form.tpl b/application/design/base/default/scripts/deprecated/alliance_admin_request_form.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_admin_request_form.tpl
rename to application/design/base/default/scripts/deprecated/alliance_admin_request_form.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_admin_request_row.tpl b/application/design/base/default/scripts/deprecated/alliance_admin_request_row.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_admin_request_row.tpl
rename to application/design/base/default/scripts/deprecated/alliance_admin_request_row.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_admin_request_table.tpl b/application/design/base/default/scripts/deprecated/alliance_admin_request_table.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_admin_request_table.tpl
rename to application/design/base/default/scripts/deprecated/alliance_admin_request_table.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_ainfo.tpl b/application/design/base/default/scripts/deprecated/alliance_ainfo.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_ainfo.tpl
rename to application/design/base/default/scripts/deprecated/alliance_ainfo.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_apply_waitform.tpl b/application/design/base/default/scripts/deprecated/alliance_apply_waitform.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_apply_waitform.tpl
rename to application/design/base/default/scripts/deprecated/alliance_apply_waitform.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_applyform.tpl b/application/design/base/default/scripts/deprecated/alliance_applyform.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_applyform.tpl
rename to application/design/base/default/scripts/deprecated/alliance_applyform.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_circular.tpl b/application/design/base/default/scripts/deprecated/alliance_circular.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_circular.tpl
rename to application/design/base/default/scripts/deprecated/alliance_circular.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_circular_form.tpl b/application/design/base/default/scripts/deprecated/alliance_circular_form.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_circular_form.tpl
rename to application/design/base/default/scripts/deprecated/alliance_circular_form.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_defaultmenu.tpl b/application/design/base/default/scripts/deprecated/alliance_defaultmenu.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_defaultmenu.tpl
rename to application/design/base/default/scripts/deprecated/alliance_defaultmenu.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_frontpage.tpl b/application/design/base/default/scripts/deprecated/alliance_frontpage.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_frontpage.tpl
rename to application/design/base/default/scripts/deprecated/alliance_frontpage.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_make.tpl b/application/design/base/default/scripts/deprecated/alliance_make.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_make.tpl
rename to application/design/base/default/scripts/deprecated/alliance_make.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_makeform.tpl b/application/design/base/default/scripts/deprecated/alliance_makeform.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_makeform.tpl
rename to application/design/base/default/scripts/deprecated/alliance_makeform.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_memberslist_row.tpl b/application/design/base/default/scripts/deprecated/alliance_memberslist_row.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_memberslist_row.tpl
rename to application/design/base/default/scripts/deprecated/alliance_memberslist_row.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_memberslist_table.tpl b/application/design/base/default/scripts/deprecated/alliance_memberslist_table.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_memberslist_table.tpl
rename to application/design/base/default/scripts/deprecated/alliance_memberslist_table.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_searchform.tpl b/application/design/base/default/scripts/deprecated/alliance_searchform.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_searchform.tpl
rename to application/design/base/default/scripts/deprecated/alliance_searchform.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_searchresult_row.tpl b/application/design/base/default/scripts/deprecated/alliance_searchresult_row.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_searchresult_row.tpl
rename to application/design/base/default/scripts/deprecated/alliance_searchresult_row.tpl
diff --git a/includes/application/design/scripts/deprecated/alliance_searchresult_table.tpl b/application/design/base/default/scripts/deprecated/alliance_searchresult_table.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/alliance_searchresult_table.tpl
rename to application/design/base/default/scripts/deprecated/alliance_searchresult_table.tpl
diff --git a/includes/application/design/scripts/deprecated/banned_body.tpl b/application/design/base/default/scripts/deprecated/banned_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/banned_body.tpl
rename to application/design/base/default/scripts/deprecated/banned_body.tpl
diff --git a/includes/application/design/scripts/deprecated/buildings_builds.tpl b/application/design/base/default/scripts/deprecated/buildings_builds.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/buildings_builds.tpl
rename to application/design/base/default/scripts/deprecated/buildings_builds.tpl
diff --git a/includes/application/design/scripts/deprecated/buildings_builds_queue_script.tpl b/application/design/base/default/scripts/deprecated/buildings_builds_queue_script.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/buildings_builds_queue_script.tpl
rename to application/design/base/default/scripts/deprecated/buildings_builds_queue_script.tpl
diff --git a/includes/application/design/scripts/deprecated/buildings_builds_row.tpl b/application/design/base/default/scripts/deprecated/buildings_builds_row.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/buildings_builds_row.tpl
rename to application/design/base/default/scripts/deprecated/buildings_builds_row.tpl
diff --git a/includes/application/design/scripts/deprecated/buildings_builds_script.tpl b/application/design/base/default/scripts/deprecated/buildings_builds_script.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/buildings_builds_script.tpl
rename to application/design/base/default/scripts/deprecated/buildings_builds_script.tpl
diff --git a/includes/application/design/scripts/deprecated/buildings_defense.tpl b/application/design/base/default/scripts/deprecated/buildings_defense.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/buildings_defense.tpl
rename to application/design/base/default/scripts/deprecated/buildings_defense.tpl
diff --git a/includes/application/design/scripts/deprecated/buildings_fleet.tpl b/application/design/base/default/scripts/deprecated/buildings_fleet.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/buildings_fleet.tpl
rename to application/design/base/default/scripts/deprecated/buildings_fleet.tpl
diff --git a/includes/application/design/scripts/deprecated/buildings_research.tpl b/application/design/base/default/scripts/deprecated/buildings_research.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/buildings_research.tpl
rename to application/design/base/default/scripts/deprecated/buildings_research.tpl
diff --git a/includes/application/design/scripts/deprecated/buildings_research_row.tpl b/application/design/base/default/scripts/deprecated/buildings_research_row.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/buildings_research_row.tpl
rename to application/design/base/default/scripts/deprecated/buildings_research_row.tpl
diff --git a/includes/application/design/scripts/deprecated/buildings_research_script.tpl b/application/design/base/default/scripts/deprecated/buildings_research_script.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/buildings_research_script.tpl
rename to application/design/base/default/scripts/deprecated/buildings_research_script.tpl
diff --git a/includes/application/design/scripts/deprecated/buildings_script.tpl b/application/design/base/default/scripts/deprecated/buildings_script.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/buildings_script.tpl
rename to application/design/base/default/scripts/deprecated/buildings_script.tpl
diff --git a/includes/application/design/scripts/deprecated/changelog_body.tpl b/application/design/base/default/scripts/deprecated/changelog_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/changelog_body.tpl
rename to application/design/base/default/scripts/deprecated/changelog_body.tpl
diff --git a/includes/application/design/scripts/deprecated/changelog_table.tpl b/application/design/base/default/scripts/deprecated/changelog_table.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/changelog_table.tpl
rename to application/design/base/default/scripts/deprecated/changelog_table.tpl
diff --git a/includes/application/design/scripts/deprecated/chat_body.tpl b/application/design/base/default/scripts/deprecated/chat_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/chat_body.tpl
rename to application/design/base/default/scripts/deprecated/chat_body.tpl
diff --git a/includes/application/design/scripts/deprecated/contact_body.tpl b/application/design/base/default/scripts/deprecated/contact_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/contact_body.tpl
rename to application/design/base/default/scripts/deprecated/contact_body.tpl
diff --git a/includes/application/design/scripts/deprecated/contact_body_rows.tpl b/application/design/base/default/scripts/deprecated/contact_body_rows.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/contact_body_rows.tpl
rename to application/design/base/default/scripts/deprecated/contact_body_rows.tpl
diff --git a/includes/application/design/scripts/deprecated/credit_body.tpl b/application/design/base/default/scripts/deprecated/credit_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/credit_body.tpl
rename to application/design/base/default/scripts/deprecated/credit_body.tpl
diff --git a/includes/application/design/scripts/deprecated/galaxy_body.tpl b/application/design/base/default/scripts/deprecated/galaxy_body.tpl
similarity index 94%
rename from includes/application/design/scripts/deprecated/galaxy_body.tpl
rename to application/design/base/default/scripts/deprecated/galaxy_body.tpl
index dfb452b..0d7e0d7 100644
--- a/includes/application/design/scripts/deprecated/galaxy_body.tpl
+++ b/application/design/base/default/scripts/deprecated/galaxy_body.tpl
@@ -1,4 +1,6 @@
-
-
+
 
 
 
-
 


 

 
 

 
- 
+

   

     
       
@@ -276,4 +277,4 @@ function setShips(ship, count) {
 
 
 
-
+
diff --git a/includes/application/design/scripts/deprecated/galaxy_row.tpl b/application/design/base/default/scripts/deprecated/galaxy_row.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/galaxy_row.tpl
rename to application/design/base/default/scripts/deprecated/galaxy_row.tpl
diff --git a/includes/application/design/scripts/deprecated/galaxy_row_action.tpl b/application/design/base/default/scripts/deprecated/galaxy_row_action.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/galaxy_row_action.tpl
rename to application/design/base/default/scripts/deprecated/galaxy_row_action.tpl
diff --git a/includes/application/design/scripts/deprecated/galaxy_row_ally.tpl b/application/design/base/default/scripts/deprecated/galaxy_row_ally.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/galaxy_row_ally.tpl
rename to application/design/base/default/scripts/deprecated/galaxy_row_ally.tpl
diff --git a/includes/application/design/scripts/deprecated/galaxy_row_debris.tpl b/application/design/base/default/scripts/deprecated/galaxy_row_debris.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/galaxy_row_debris.tpl
rename to application/design/base/default/scripts/deprecated/galaxy_row_debris.tpl
diff --git a/includes/application/design/scripts/deprecated/galaxy_row_luna.tpl b/application/design/base/default/scripts/deprecated/galaxy_row_luna.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/galaxy_row_luna.tpl
rename to application/design/base/default/scripts/deprecated/galaxy_row_luna.tpl
diff --git a/includes/application/design/scripts/deprecated/galaxy_row_planet.tpl b/application/design/base/default/scripts/deprecated/galaxy_row_planet.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/galaxy_row_planet.tpl
rename to application/design/base/default/scripts/deprecated/galaxy_row_planet.tpl
diff --git a/includes/application/design/scripts/deprecated/galaxy_row_user.tpl b/application/design/base/default/scripts/deprecated/galaxy_row_user.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/galaxy_row_user.tpl
rename to application/design/base/default/scripts/deprecated/galaxy_row_user.tpl
diff --git a/includes/application/design/scripts/deprecated/gate_fleet_rows.tpl b/application/design/base/default/scripts/deprecated/gate_fleet_rows.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/gate_fleet_rows.tpl
rename to application/design/base/default/scripts/deprecated/gate_fleet_rows.tpl
diff --git a/includes/application/design/scripts/deprecated/gate_fleet_table.tpl b/application/design/base/default/scripts/deprecated/gate_fleet_table.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/gate_fleet_table.tpl
rename to application/design/base/default/scripts/deprecated/gate_fleet_table.tpl
diff --git a/includes/application/design/scripts/deprecated/imperium_row.tpl b/application/design/base/default/scripts/deprecated/imperium_row.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/imperium_row.tpl
rename to application/design/base/default/scripts/deprecated/imperium_row.tpl
diff --git a/includes/application/design/scripts/deprecated/imperium_row2.tpl b/application/design/base/default/scripts/deprecated/imperium_row2.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/imperium_row2.tpl
rename to application/design/base/default/scripts/deprecated/imperium_row2.tpl
diff --git a/includes/application/design/scripts/deprecated/imperium_table.tpl b/application/design/base/default/scripts/deprecated/imperium_table.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/imperium_table.tpl
rename to application/design/base/default/scripts/deprecated/imperium_table.tpl
diff --git a/includes/application/design/scripts/deprecated/info_buildings_defense.tpl b/application/design/base/default/scripts/deprecated/info_buildings_defense.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/info_buildings_defense.tpl
rename to application/design/base/default/scripts/deprecated/info_buildings_defense.tpl
diff --git a/includes/application/design/scripts/deprecated/info_buildings_destroy.tpl b/application/design/base/default/scripts/deprecated/info_buildings_destroy.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/info_buildings_destroy.tpl
rename to application/design/base/default/scripts/deprecated/info_buildings_destroy.tpl
diff --git a/includes/application/design/scripts/deprecated/info_buildings_fleet.tpl b/application/design/base/default/scripts/deprecated/info_buildings_fleet.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/info_buildings_fleet.tpl
rename to application/design/base/default/scripts/deprecated/info_buildings_fleet.tpl
diff --git a/includes/application/design/scripts/deprecated/info_buildings_general.tpl b/application/design/base/default/scripts/deprecated/info_buildings_general.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/info_buildings_general.tpl
rename to application/design/base/default/scripts/deprecated/info_buildings_general.tpl
diff --git a/includes/application/design/scripts/deprecated/info_buildings_table.tpl b/application/design/base/default/scripts/deprecated/info_buildings_table.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/info_buildings_table.tpl
rename to application/design/base/default/scripts/deprecated/info_buildings_table.tpl
diff --git a/includes/application/design/scripts/deprecated/info_officiers_general.tpl b/application/design/base/default/scripts/deprecated/info_officiers_general.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/info_officiers_general.tpl
rename to application/design/base/default/scripts/deprecated/info_officiers_general.tpl
diff --git a/includes/application/design/scripts/deprecated/install/ins_acc.tpl b/application/design/base/default/scripts/deprecated/install/ins_acc.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/install/ins_acc.tpl
rename to application/design/base/default/scripts/deprecated/install/ins_acc.tpl
diff --git a/includes/application/design/scripts/deprecated/install/ins_acc_done.tpl b/application/design/base/default/scripts/deprecated/install/ins_acc_done.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/install/ins_acc_done.tpl
rename to application/design/base/default/scripts/deprecated/install/ins_acc_done.tpl
diff --git a/includes/application/design/scripts/deprecated/install/ins_body.tpl b/application/design/base/default/scripts/deprecated/install/ins_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/install/ins_body.tpl
rename to application/design/base/default/scripts/deprecated/install/ins_body.tpl
diff --git a/includes/application/design/scripts/deprecated/install/ins_form.tpl b/application/design/base/default/scripts/deprecated/install/ins_form.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/install/ins_form.tpl
rename to application/design/base/default/scripts/deprecated/install/ins_form.tpl
diff --git a/includes/application/design/scripts/deprecated/install/ins_form_done.tpl b/application/design/base/default/scripts/deprecated/install/ins_form_done.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/install/ins_form_done.tpl
rename to application/design/base/default/scripts/deprecated/install/ins_form_done.tpl
diff --git a/includes/application/design/scripts/deprecated/install/ins_goto_done.tpl b/application/design/base/default/scripts/deprecated/install/ins_goto_done.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/install/ins_goto_done.tpl
rename to application/design/base/default/scripts/deprecated/install/ins_goto_done.tpl
diff --git a/includes/application/design/scripts/deprecated/install/ins_goto_form.tpl b/application/design/base/default/scripts/deprecated/install/ins_goto_form.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/install/ins_goto_form.tpl
rename to application/design/base/default/scripts/deprecated/install/ins_goto_form.tpl
diff --git a/includes/application/design/scripts/deprecated/install/ins_goto_intro.tpl b/application/design/base/default/scripts/deprecated/install/ins_goto_intro.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/install/ins_goto_intro.tpl
rename to application/design/base/default/scripts/deprecated/install/ins_goto_intro.tpl
diff --git a/includes/application/design/scripts/deprecated/install/ins_intro.tpl b/application/design/base/default/scripts/deprecated/install/ins_intro.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/install/ins_intro.tpl
rename to application/design/base/default/scripts/deprecated/install/ins_intro.tpl
diff --git a/includes/application/design/scripts/deprecated/left_menu.tpl b/application/design/base/default/scripts/deprecated/left_menu.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/left_menu.tpl
rename to application/design/base/default/scripts/deprecated/left_menu.tpl
diff --git a/includes/application/design/scripts/deprecated/lostpassword.tpl b/application/design/base/default/scripts/deprecated/lostpassword.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/lostpassword.tpl
rename to application/design/base/default/scripts/deprecated/lostpassword.tpl
diff --git a/includes/application/design/scripts/deprecated/marchand_cristal.tpl b/application/design/base/default/scripts/deprecated/marchand_cristal.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/marchand_cristal.tpl
rename to application/design/base/default/scripts/deprecated/marchand_cristal.tpl
diff --git a/includes/application/design/scripts/deprecated/marchand_deuterium.tpl b/application/design/base/default/scripts/deprecated/marchand_deuterium.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/marchand_deuterium.tpl
rename to application/design/base/default/scripts/deprecated/marchand_deuterium.tpl
diff --git a/includes/application/design/scripts/deprecated/marchand_main.tpl b/application/design/base/default/scripts/deprecated/marchand_main.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/marchand_main.tpl
rename to application/design/base/default/scripts/deprecated/marchand_main.tpl
diff --git a/includes/application/design/scripts/deprecated/marchand_metal.tpl b/application/design/base/default/scripts/deprecated/marchand_metal.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/marchand_metal.tpl
rename to application/design/base/default/scripts/deprecated/marchand_metal.tpl
diff --git a/includes/application/design/scripts/deprecated/message_body.tpl b/application/design/base/default/scripts/deprecated/message_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/message_body.tpl
rename to application/design/base/default/scripts/deprecated/message_body.tpl
diff --git a/includes/application/design/scripts/deprecated/messages_pm_form.tpl b/application/design/base/default/scripts/deprecated/messages_pm_form.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/messages_pm_form.tpl
rename to application/design/base/default/scripts/deprecated/messages_pm_form.tpl
diff --git a/includes/application/design/scripts/deprecated/messages_pm_form_bb.tpl b/application/design/base/default/scripts/deprecated/messages_pm_form_bb.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/messages_pm_form_bb.tpl
rename to application/design/base/default/scripts/deprecated/messages_pm_form_bb.tpl
diff --git a/includes/application/design/scripts/deprecated/multi.tpl b/application/design/base/default/scripts/deprecated/multi.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/multi.tpl
rename to application/design/base/default/scripts/deprecated/multi.tpl
diff --git a/includes/application/design/scripts/deprecated/notes_body.tpl b/application/design/base/default/scripts/deprecated/notes_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/notes_body.tpl
rename to application/design/base/default/scripts/deprecated/notes_body.tpl
diff --git a/includes/application/design/scripts/deprecated/notes_body_entry.tpl b/application/design/base/default/scripts/deprecated/notes_body_entry.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/notes_body_entry.tpl
rename to application/design/base/default/scripts/deprecated/notes_body_entry.tpl
diff --git a/includes/application/design/scripts/deprecated/notes_form.tpl b/application/design/base/default/scripts/deprecated/notes_form.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/notes_form.tpl
rename to application/design/base/default/scripts/deprecated/notes_form.tpl
diff --git a/includes/application/design/scripts/deprecated/officier_body.tpl b/application/design/base/default/scripts/deprecated/officier_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/officier_body.tpl
rename to application/design/base/default/scripts/deprecated/officier_body.tpl
diff --git a/includes/application/design/scripts/deprecated/officier_rows.tpl b/application/design/base/default/scripts/deprecated/officier_rows.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/officier_rows.tpl
rename to application/design/base/default/scripts/deprecated/officier_rows.tpl
diff --git a/includes/application/design/scripts/deprecated/options_admadd.tpl b/application/design/base/default/scripts/deprecated/options_admadd.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/options_admadd.tpl
rename to application/design/base/default/scripts/deprecated/options_admadd.tpl
diff --git a/includes/application/design/scripts/deprecated/options_body.tpl b/application/design/base/default/scripts/deprecated/options_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/options_body.tpl
rename to application/design/base/default/scripts/deprecated/options_body.tpl
diff --git a/includes/application/design/scripts/deprecated/options_body_vmode.tpl b/application/design/base/default/scripts/deprecated/options_body_vmode.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/options_body_vmode.tpl
rename to application/design/base/default/scripts/deprecated/options_body_vmode.tpl
diff --git a/includes/application/design/scripts/deprecated/overall_footer.tpl b/application/design/base/default/scripts/deprecated/overall_footer.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/overall_footer.tpl
rename to application/design/base/default/scripts/deprecated/overall_footer.tpl
diff --git a/includes/application/design/scripts/deprecated/overview_body.tpl b/application/design/base/default/scripts/deprecated/overview_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/overview_body.tpl
rename to application/design/base/default/scripts/deprecated/overview_body.tpl
diff --git a/includes/application/design/scripts/deprecated/overview_deleteplanet.tpl b/application/design/base/default/scripts/deprecated/overview_deleteplanet.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/overview_deleteplanet.tpl
rename to application/design/base/default/scripts/deprecated/overview_deleteplanet.tpl
diff --git a/includes/application/design/scripts/deprecated/overview_fleet_event.tpl b/application/design/base/default/scripts/deprecated/overview_fleet_event.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/overview_fleet_event.tpl
rename to application/design/base/default/scripts/deprecated/overview_fleet_event.tpl
diff --git a/includes/application/design/scripts/deprecated/overview_renameplanet.tpl b/application/design/base/default/scripts/deprecated/overview_renameplanet.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/overview_renameplanet.tpl
rename to application/design/base/default/scripts/deprecated/overview_renameplanet.tpl
diff --git a/includes/application/design/scripts/deprecated/phalanx_body.tpl b/application/design/base/default/scripts/deprecated/phalanx_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/phalanx_body.tpl
rename to application/design/base/default/scripts/deprecated/phalanx_body.tpl
diff --git a/includes/application/design/scripts/deprecated/records_body.tpl b/application/design/base/default/scripts/deprecated/records_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/records_body.tpl
rename to application/design/base/default/scripts/deprecated/records_body.tpl
diff --git a/includes/application/design/scripts/deprecated/records_section_header.tpl b/application/design/base/default/scripts/deprecated/records_section_header.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/records_section_header.tpl
rename to application/design/base/default/scripts/deprecated/records_section_header.tpl
diff --git a/includes/application/design/scripts/deprecated/records_section_rows.tpl b/application/design/base/default/scripts/deprecated/records_section_rows.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/records_section_rows.tpl
rename to application/design/base/default/scripts/deprecated/records_section_rows.tpl
diff --git a/includes/application/design/scripts/deprecated/registry_form.tpl b/application/design/base/default/scripts/deprecated/registry_form.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/registry_form.tpl
rename to application/design/base/default/scripts/deprecated/registry_form.tpl
diff --git a/includes/application/design/scripts/deprecated/resources.tpl b/application/design/base/default/scripts/deprecated/resources.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/resources.tpl
rename to application/design/base/default/scripts/deprecated/resources.tpl
diff --git a/includes/application/design/scripts/deprecated/resources_row.tpl b/application/design/base/default/scripts/deprecated/resources_row.tpl
similarity index 90%
rename from includes/application/design/scripts/deprecated/resources_row.tpl
rename to application/design/base/default/scripts/deprecated/resources_row.tpl
index 6c9ce84..5592d79 100644
--- a/includes/application/design/scripts/deprecated/resources_row.tpl
+++ b/application/design/base/default/scripts/deprecated/resources_row.tpl
@@ -5,8 +5,10 @@
 	
\ No newline at end of file
diff --git a/includes/application/design/scripts/deprecated/rules_body.tpl b/application/design/base/default/scripts/deprecated/rules_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/rules_body.tpl
rename to application/design/base/default/scripts/deprecated/rules_body.tpl
diff --git a/includes/application/design/scripts/deprecated/search_ally_row.tpl b/application/design/base/default/scripts/deprecated/search_ally_row.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/search_ally_row.tpl
rename to application/design/base/default/scripts/deprecated/search_ally_row.tpl
diff --git a/includes/application/design/scripts/deprecated/search_ally_table.tpl b/application/design/base/default/scripts/deprecated/search_ally_table.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/search_ally_table.tpl
rename to application/design/base/default/scripts/deprecated/search_ally_table.tpl
diff --git a/includes/application/design/scripts/deprecated/search_body.tpl b/application/design/base/default/scripts/deprecated/search_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/search_body.tpl
rename to application/design/base/default/scripts/deprecated/search_body.tpl
diff --git a/includes/application/design/scripts/deprecated/search_user_row.tpl b/application/design/base/default/scripts/deprecated/search_user_row.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/search_user_row.tpl
rename to application/design/base/default/scripts/deprecated/search_user_row.tpl
diff --git a/includes/application/design/scripts/deprecated/search_user_table.tpl b/application/design/base/default/scripts/deprecated/search_user_table.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/search_user_table.tpl
rename to application/design/base/default/scripts/deprecated/search_user_table.tpl
diff --git a/includes/application/design/scripts/deprecated/serv_infos.tpl b/application/design/base/default/scripts/deprecated/serv_infos.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/serv_infos.tpl
rename to application/design/base/default/scripts/deprecated/serv_infos.tpl
diff --git a/includes/application/design/scripts/deprecated/simple_footer.tpl b/application/design/base/default/scripts/deprecated/simple_footer.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/simple_footer.tpl
rename to application/design/base/default/scripts/deprecated/simple_footer.tpl
diff --git a/includes/application/design/scripts/deprecated/simple_header.tpl b/application/design/base/default/scripts/deprecated/simple_header.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/simple_header.tpl
rename to application/design/base/default/scripts/deprecated/simple_header.tpl
diff --git a/includes/application/design/scripts/deprecated/stat_alliancetable.tpl b/application/design/base/default/scripts/deprecated/stat_alliancetable.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/stat_alliancetable.tpl
rename to application/design/base/default/scripts/deprecated/stat_alliancetable.tpl
diff --git a/includes/application/design/scripts/deprecated/stat_alliancetable_header.tpl b/application/design/base/default/scripts/deprecated/stat_alliancetable_header.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/stat_alliancetable_header.tpl
rename to application/design/base/default/scripts/deprecated/stat_alliancetable_header.tpl
diff --git a/includes/application/design/scripts/deprecated/stat_body.tpl b/application/design/base/default/scripts/deprecated/stat_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/stat_body.tpl
rename to application/design/base/default/scripts/deprecated/stat_body.tpl
diff --git a/includes/application/design/scripts/deprecated/stat_playertable.tpl b/application/design/base/default/scripts/deprecated/stat_playertable.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/stat_playertable.tpl
rename to application/design/base/default/scripts/deprecated/stat_playertable.tpl
diff --git a/includes/application/design/scripts/deprecated/stat_playertable_header.tpl b/application/design/base/default/scripts/deprecated/stat_playertable_header.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/stat_playertable_header.tpl
rename to application/design/base/default/scripts/deprecated/stat_playertable_header.tpl
diff --git a/includes/application/design/scripts/deprecated/statjoueur.tpl b/application/design/base/default/scripts/deprecated/statjoueur.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/statjoueur.tpl
rename to application/design/base/default/scripts/deprecated/statjoueur.tpl
diff --git a/includes/application/design/scripts/deprecated/techtree_body.tpl b/application/design/base/default/scripts/deprecated/techtree_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/techtree_body.tpl
rename to application/design/base/default/scripts/deprecated/techtree_body.tpl
diff --git a/includes/application/design/scripts/deprecated/techtree_details.tpl b/application/design/base/default/scripts/deprecated/techtree_details.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/techtree_details.tpl
rename to application/design/base/default/scripts/deprecated/techtree_details.tpl
diff --git a/includes/application/design/scripts/deprecated/techtree_head.tpl b/application/design/base/default/scripts/deprecated/techtree_head.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/techtree_head.tpl
rename to application/design/base/default/scripts/deprecated/techtree_head.tpl
diff --git a/includes/application/design/scripts/deprecated/techtree_row.tpl b/application/design/base/default/scripts/deprecated/techtree_row.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/techtree_row.tpl
rename to application/design/base/default/scripts/deprecated/techtree_row.tpl
diff --git a/includes/application/design/scripts/deprecated/teleport.tpl b/application/design/base/default/scripts/deprecated/teleport.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/teleport.tpl
rename to application/design/base/default/scripts/deprecated/teleport.tpl
diff --git a/includes/application/design/scripts/deprecated/tradingscrapmetal.tpl b/application/design/base/default/scripts/deprecated/tradingscrapmetal.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/tradingscrapmetal.tpl
rename to application/design/base/default/scripts/deprecated/tradingscrapmetal.tpl
diff --git a/includes/application/design/scripts/deprecated/tradingscrapmetal_n.tpl b/application/design/base/default/scripts/deprecated/tradingscrapmetal_n.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/tradingscrapmetal_n.tpl
rename to application/design/base/default/scripts/deprecated/tradingscrapmetal_n.tpl
diff --git a/includes/application/design/scripts/deprecated/usr_banned.tpl b/application/design/base/default/scripts/deprecated/usr_banned.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/usr_banned.tpl
rename to application/design/base/default/scripts/deprecated/usr_banned.tpl
diff --git a/includes/application/design/scripts/deprecated/usuw_body.tpl b/application/design/base/default/scripts/deprecated/usuw_body.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/usuw_body.tpl
rename to application/design/base/default/scripts/deprecated/usuw_body.tpl
diff --git a/includes/application/design/scripts/deprecated/zglos.tpl b/application/design/base/default/scripts/deprecated/zglos.tpl
similarity index 100%
rename from includes/application/design/scripts/deprecated/zglos.tpl
rename to application/design/base/default/scripts/deprecated/zglos.tpl
diff --git a/application/design/base/default/scripts/empire/overview/fleet/item.phtml b/application/design/base/default/scripts/empire/overview/fleet/item.phtml
new file mode 100644
index 0000000..f01fb8e
--- /dev/null
+++ b/application/design/base/default/scripts/empire/overview/fleet/item.phtml
@@ -0,0 +1,21 @@
+getData('fleet')?>
+getData('user')?>
+
+	getData('fleet_javai')?>
+	
+	
+	getData('fleet_javas')?>
+
\ No newline at end of file
diff --git a/includes/application/design/scripts/empire/overview/form/destroy-planet.phtml b/application/design/base/default/scripts/empire/overview/form/destroy-planet.phtml
similarity index 100%
rename from includes/application/design/scripts/empire/overview/form/destroy-planet.phtml
rename to application/design/base/default/scripts/empire/overview/form/destroy-planet.phtml
diff --git a/includes/application/design/scripts/empire/overview/form/rename-planet.phtml b/application/design/base/default/scripts/empire/overview/form/rename-planet.phtml
similarity index 100%
rename from includes/application/design/scripts/empire/overview/form/rename-planet.phtml
rename to application/design/base/default/scripts/empire/overview/form/rename-planet.phtml
diff --git a/includes/application/design/scripts/empire/overview/messages.phtml b/application/design/base/default/scripts/empire/overview/messages.phtml
similarity index 100%
rename from includes/application/design/scripts/empire/overview/messages.phtml
rename to application/design/base/default/scripts/empire/overview/messages.phtml
diff --git a/includes/application/design/scripts/empire/overview/planet/list/item.phtml b/application/design/base/default/scripts/empire/overview/planet/list/item.phtml
similarity index 100%
rename from includes/application/design/scripts/empire/overview/planet/list/item.phtml
rename to application/design/base/default/scripts/empire/overview/planet/list/item.phtml
diff --git a/includes/application/design/scripts/empire/overview/planet/view.phtml b/application/design/base/default/scripts/empire/overview/planet/view.phtml
similarity index 100%
rename from includes/application/design/scripts/empire/overview/planet/view.phtml
rename to application/design/base/default/scripts/empire/overview/planet/view.phtml
diff --git a/includes/application/design/scripts/empire/planet/buildings.phtml b/application/design/base/default/scripts/empire/planet/buildings.phtml
similarity index 100%
rename from includes/application/design/scripts/empire/planet/buildings.phtml
rename to application/design/base/default/scripts/empire/planet/buildings.phtml
diff --git a/includes/application/design/scripts/empire/planet/buildings/item.phtml b/application/design/base/default/scripts/empire/planet/buildings/item.phtml
similarity index 100%
rename from includes/application/design/scripts/empire/planet/buildings/item.phtml
rename to application/design/base/default/scripts/empire/planet/buildings/item.phtml
diff --git a/includes/application/design/scripts/empire/planet/buildings/queue.phtml b/application/design/base/default/scripts/empire/planet/buildings/queue.phtml
similarity index 100%
rename from includes/application/design/scripts/empire/planet/buildings/queue.phtml
rename to application/design/base/default/scripts/empire/planet/buildings/queue.phtml
diff --git a/includes/application/design/scripts/empire/planet/buildings/queue/item.phtml b/application/design/base/default/scripts/empire/planet/buildings/queue/item.phtml
similarity index 100%
rename from includes/application/design/scripts/empire/planet/buildings/queue/item.phtml
rename to application/design/base/default/scripts/empire/planet/buildings/queue/item.phtml
diff --git a/includes/application/design/scripts/empire/planet/research-lab.phtml b/application/design/base/default/scripts/empire/planet/research-lab.phtml
similarity index 100%
rename from includes/application/design/scripts/empire/planet/research-lab.phtml
rename to application/design/base/default/scripts/empire/planet/research-lab.phtml
diff --git a/includes/application/design/scripts/empire/planet/research-lab/item.phtml b/application/design/base/default/scripts/empire/planet/research-lab/item.phtml
similarity index 100%
rename from includes/application/design/scripts/empire/planet/research-lab/item.phtml
rename to application/design/base/default/scripts/empire/planet/research-lab/item.phtml
diff --git a/includes/application/design/scripts/empire/planet/research-lab/queue.phtml b/application/design/base/default/scripts/empire/planet/research-lab/queue.phtml
similarity index 100%
rename from includes/application/design/scripts/empire/planet/research-lab/queue.phtml
rename to application/design/base/default/scripts/empire/planet/research-lab/queue.phtml
diff --git a/includes/application/design/scripts/empire/planet/research-lab/queue/item.phtml b/application/design/base/default/scripts/empire/planet/research-lab/queue/item.phtml
similarity index 100%
rename from includes/application/design/scripts/empire/planet/research-lab/queue/item.phtml
rename to application/design/base/default/scripts/empire/planet/research-lab/queue/item.phtml
diff --git a/includes/application/design/scripts/empire/planet/shipyard.phtml b/application/design/base/default/scripts/empire/planet/shipyard.phtml
similarity index 100%
rename from includes/application/design/scripts/empire/planet/shipyard.phtml
rename to application/design/base/default/scripts/empire/planet/shipyard.phtml
diff --git a/includes/application/design/scripts/empire/planet/shipyard/item.phtml b/application/design/base/default/scripts/empire/planet/shipyard/item.phtml
similarity index 100%
rename from includes/application/design/scripts/empire/planet/shipyard/item.phtml
rename to application/design/base/default/scripts/empire/planet/shipyard/item.phtml
diff --git a/includes/application/design/scripts/empire/planet/shipyard/queue.phtml b/application/design/base/default/scripts/empire/planet/shipyard/queue.phtml
similarity index 100%
rename from includes/application/design/scripts/empire/planet/shipyard/queue.phtml
rename to application/design/base/default/scripts/empire/planet/shipyard/queue.phtml
diff --git a/includes/application/design/scripts/empire/overview/fleet/item.phtml b/application/design/base/default/scripts/empire/planet/shipyard/queue.phtml~HEAD
similarity index 100%
rename from includes/application/design/scripts/empire/overview/fleet/item.phtml
rename to application/design/base/default/scripts/empire/planet/shipyard/queue.phtml~HEAD
diff --git a/application/design/base/default/scripts/empire/planet/shipyard/queue.phtml~HEAD_0 b/application/design/base/default/scripts/empire/planet/shipyard/queue.phtml~HEAD_0
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/application/design/base/default/scripts/empire/planet/shipyard/queue.phtml~HEAD_0
@@ -0,0 +1 @@
+ array(),
     'register.failure' => array(),
     'register.success' => array(
-        array('Legacies_Empire_Model_Planet', 'registrationListener')
+        array('Wootook_Empire_Model_Planet', 'registrationListener')
         ),
     'planet.update' => array(
-        array('Legacies_Empire_Model_Planet', 'planetUpdateListener'),
+        array('Wootook_Empire_Model_Planet', 'planetUpdateListener'),
         array('Legacies_Empire_Model_Planet_Building_Shipyard', 'planetUpdateListener')
         ),
     'user.init' => array(
-        array('Legacies_Empire_Model_Planet', 'registrationListener')
+        array('Wootook_Empire_Model_Planet', 'registrationListener')
         ),
     'planet.init' => array(
         array('Legacies_Empire_Model_Galaxy_Position', 'initPlanetListerner')
diff --git a/includes/data/fields-alias.php b/application/gamedata/legacies/default/fields-alias.php
similarity index 100%
rename from includes/data/fields-alias.php
rename to application/gamedata/legacies/default/fields-alias.php
diff --git a/application/gamedata/legacies/default/modules.php b/application/gamedata/legacies/default/modules.php
new file mode 100644
index 0000000..5a2bd48
--- /dev/null
+++ b/application/gamedata/legacies/default/modules.php
@@ -0,0 +1,9 @@
+ array(
+        'core'              => array('Wootook_Core_Block_' => 'Wootook/Core/Block'),
+        'empire'            => array('Wootook_Empire_Block_' => 'Wootook/Empire/Block'),
+        'legacies_core'     => array('Legacies_Core_Block_' => 'Legacies/Core/Block'),
+        'legacies_empire'   => array('Legacies_Empire_Block_' => 'Legacies/Empire/Block'),
+        'legacies_officers' => array('Legacies_Officers_Block_' => 'Legacies/Officers/Block')
+        )
+    );
\ No newline at end of file
diff --git a/includes/data/prices.php b/application/gamedata/legacies/default/prices.php
similarity index 100%
rename from includes/data/prices.php
rename to application/gamedata/legacies/default/prices.php
diff --git a/application/gamedata/legacies/default/production.php b/application/gamedata/legacies/default/production.php
new file mode 100644
index 0000000..125faa4
--- /dev/null
+++ b/application/gamedata/legacies/default/production.php
@@ -0,0 +1,71 @@
+ array(
+        Legacies_Empire::RESOURCE_METAL      => 40,
+        Legacies_Empire::RESOURCE_CRISTAL    => 10,
+        Legacies_Empire::RESOURCE_DEUTERIUM  => 0,
+        Legacies_Empire::RESOURCE_ENERGY     => 0,
+        Legacies_Empire::RESOURCE_MULTIPLIER => 1.5,
+        Legacies_Empire::RESOURCE_CLASS      => 'Legacies_Empire_Model_Planet_Building_MetalMine'
+        ),
+
+    Legacies_Empire::ID_BUILDING_CRISTAL_MINE => array(
+        Legacies_Empire::RESOURCE_METAL      => 30,
+        Legacies_Empire::RESOURCE_CRISTAL    => 15,
+        Legacies_Empire::RESOURCE_DEUTERIUM  => 0,
+        Legacies_Empire::RESOURCE_ENERGY     => 0,
+        Legacies_Empire::RESOURCE_MULTIPLIER => 1.6,
+        Legacies_Empire::RESOURCE_CLASS      => 'Legacies_Empire_Model_Planet_Building_CristalMine'
+        ),
+
+    Legacies_Empire::ID_BUILDING_DEUTERIUM_SYNTHETISER => array(
+        Legacies_Empire::RESOURCE_METAL      => 150,
+        Legacies_Empire::RESOURCE_CRISTAL    => 50,
+        Legacies_Empire::RESOURCE_DEUTERIUM  => 0,
+        Legacies_Empire::RESOURCE_ENERGY     => 0,
+        Legacies_Empire::RESOURCE_MULTIPLIER => 1.5,
+        Legacies_Empire::RESOURCE_CLASS      => 'Legacies_Empire_Model_Planet_Building_DeuteriumSynthetiser'
+        ),
+
+    Legacies_Empire::ID_BUILDING_SOLAR_PLANT => array(
+        Legacies_Empire::RESOURCE_METAL      => 50,
+        Legacies_Empire::RESOURCE_CRISTAL    => 20,
+        Legacies_Empire::RESOURCE_DEUTERIUM  => 0,
+        Legacies_Empire::RESOURCE_ENERGY     => 0,
+        Legacies_Empire::RESOURCE_MULTIPLIER => 1.5,
+        Legacies_Empire::RESOURCE_CLASS      => 'Legacies_Empire_Model_Planet_Building_SolarPlant'
+        ),
+
+    Legacies_Empire::ID_BUILDING_FUSION_REACTOR => array(
+        Legacies_Empire::RESOURCE_METAL      => 500,
+        Legacies_Empire::RESOURCE_CRISTAL    => 200,
+        Legacies_Empire::RESOURCE_DEUTERIUM  => 100,
+        Legacies_Empire::RESOURCE_ENERGY     => 0,
+        Legacies_Empire::RESOURCE_MULTIPLIER => 1.8,
+        Legacies_Empire::RESOURCE_CLASS      => 'Legacies_Empire_Model_Planet_Building_FusionReactor'
+        ),
+// }}}
+
+//
+// Ships production
+// {{{
+    Legacies_Empire::ID_SHIP_SOLAR_SATELLITE => array(
+        Legacies_Empire::RESOURCE_METAL      => 0,
+        Legacies_Empire::RESOURCE_CRISTAL    => 2000,
+        Legacies_Empire::RESOURCE_DEUTERIUM  => 500,
+        Legacies_Empire::RESOURCE_ENERGY     => 0,
+        Legacies_Empire::RESOURCE_MULTIPLIER => 0.5,
+        Legacies_Empire::RESOURCE_CLASS      => 'Legacies_Empire_Model_Planet_Ship_SolarSatellite'
+        ),
+    Legacies_Empire::ID_SHIP_SUPERNOVA => array(
+        Legacies_Empire::RESOURCE_METAL      => 0,
+        Legacies_Empire::RESOURCE_CRISTAL    => 2000,
+        Legacies_Empire::RESOURCE_DEUTERIUM  => 500,
+        Legacies_Empire::RESOURCE_ENERGY     => 0,
+        Legacies_Empire::RESOURCE_MULTIPLIER => 0.5,
+        Legacies_Empire::RESOURCE_CLASS      => 'Legacies_Empire_Model_Planet_Ship_Supernova'
+        )
+// }}}
+    );
diff --git a/includes/data/requirements.php b/application/gamedata/legacies/default/requirements.php
similarity index 100%
rename from includes/data/requirements.php
rename to application/gamedata/legacies/default/requirements.php
diff --git a/includes/data/resources.php b/application/gamedata/legacies/default/resources.php
similarity index 70%
rename from includes/data/resources.php
rename to application/gamedata/legacies/default/resources.php
index 4bea873..0faa545 100644
--- a/includes/data/resources.php
+++ b/application/gamedata/legacies/default/resources.php
@@ -1,9 +1,9 @@
  array(
-        'template' => 'empire/resources/default.phtml',
-        'renderer' => 'Legacies_Empire_Block_Resource_Default',
+//        'template' => 'empire/resources/default.phtml',
+//        'renderer' => 'legacies_empire/resource_default',
 
-        'field'            => Legacies_Empire::RESOURCE_METAL,
+        'field'            => 'metal',
         'production_field' => 'metal_perhour',
         'storage_field'    => 'metal_max',
         'production'       => array(
@@ -12,10 +12,10 @@
         'storage'          => Legacies_Empire::ID_BUILDING_METAL_STORAGE
         ),
     Legacies_Empire::RESOURCE_CRISTAL   => array(
-        'template' => 'empire/resources/default.phtml',
-        'renderer' => 'Legacies_Empire_Block_Resource_Default',
+//        'template' => 'empire/resources/default.phtml',
+//        'renderer' => 'legacies_empire/resource_default',
 
-        'field'            => Legacies_Empire::RESOURCE_CRISTAL,
+        'field'            => 'cristal',
         'production_field' => 'cristal_perhour',
         'storage_field'    => 'cristal_max',
         'production'       => array(
@@ -24,10 +24,10 @@
         'storage'          => Legacies_Empire::ID_BUILDING_CRISTAL_STORAGE
         ),
     Legacies_Empire::RESOURCE_DEUTERIUM => array(
-        'template' => 'empire/resources/default.phtml',
-        'renderer' => 'Legacies_Empire_Block_Resource_Default',
+//        'template' => 'empire/resources/default.phtml',
+//        'renderer' => 'legacies_empire/resource_default',
 
-        'field'            => Legacies_Empire::RESOURCE_DEUTERIUM,
+        'field'            => 'deuterium',
         'production_field' => 'deuterium_perhour',
         'storage_field'    => 'deuterium_max',
         'production'       => array(
@@ -36,8 +36,8 @@
         'storage'          => Legacies_Empire::ID_BUILDING_DEUTERIUM_TANK
         ),
     Legacies_Empire::RESOURCE_ENERGY => array(
-        'template' => 'empire/resources/energy.phtml',
-        'renderer' => 'Legacies_Empire_Block_Resource_Default',
+//        'template' => 'empire/resources/energy.phtml',
+//        'renderer' => 'legacies_empire/resource_energy',
 
         'field'            => 'energy_used',
         'production_field' => 'energy_max',
diff --git a/includes/data/types.php b/application/gamedata/legacies/default/types.php
similarity index 100%
rename from includes/data/types.php
rename to application/gamedata/legacies/default/types.php
diff --git a/includes/application/locale/en_US/Legacies_User.csv b/application/locale/en_US/Legacies_User.csv
similarity index 100%
rename from includes/application/locale/en_US/Legacies_User.csv
rename to application/locale/en_US/Legacies_User.csv
diff --git a/includes/application/locale/fr_FR/Legacies_User.csv b/application/locale/fr_FR/Legacies_User.csv
similarity index 100%
rename from includes/application/locale/fr_FR/Legacies_User.csv
rename to application/locale/fr_FR/Legacies_User.csv
diff --git a/includes/application/locale/fr_FR/Legacies_User.txt b/application/locale/fr_FR/Legacies_User.txt
similarity index 100%
rename from includes/application/locale/fr_FR/Legacies_User.txt
rename to application/locale/fr_FR/Legacies_User.txt
diff --git a/includes/application/scripts/legacies/client.js b/application/scripts/legacies/client.js
similarity index 99%
rename from includes/application/scripts/legacies/client.js
rename to application/scripts/legacies/client.js
index f4b6bd0..203285c 100644
--- a/includes/application/scripts/legacies/client.js
+++ b/application/scripts/legacies/client.js
@@ -1,8 +1,8 @@
 /**
- * This file is part of XNova:Legacies
+ * This file is part of Wootook
  *
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
- * @see http://www.xnova-ng.org/
+* @see http://www.wootook.com/
  *
  * Copyright (c) 2009-Present, XNova Support Team 
  * All rights reserved.
diff --git a/includes/application/scripts/sizzle.js b/application/scripts/sizzle.js
similarity index 100%
rename from includes/application/scripts/sizzle.js
rename to application/scripts/sizzle.js
diff --git a/includes/application/test/UpdatePlanet.php b/application/test/UpdatePlanet.php
similarity index 95%
rename from includes/application/test/UpdatePlanet.php
rename to application/test/UpdatePlanet.php
index 9cdec3f..f91e5af 100644
--- a/includes/application/test/UpdatePlanet.php
+++ b/application/test/UpdatePlanet.php
@@ -117,7 +117,7 @@ $data = $planet->getAllDatas();
 var_dump(array_diff($planet->getAllDatas(), $data));
 $data = $planet->getAllDatas();
 
-Legacies::dispatchEvent('planet.update', array(
+Wootook::dispatchEvent('planet.update', array(
     'planet' => $planet,
     'time'   => 5400
     ));
@@ -125,7 +125,7 @@ Legacies::dispatchEvent('planet.update', array(
 var_dump(array_diff($planet->getAllDatas(), $data));
 $data = $planet->getAllDatas();
 
-Legacies::dispatchEvent('planet.update', array(
+Wootook::dispatchEvent('planet.update', array(
     'planet' => $planet,
     'time'   => (3600 * 20)
     ));
@@ -135,7 +135,7 @@ $planet->appendBuildingQueue(Legacies_Empire::ID_BUILDING_CRISTAL_MINE, false, 3
 var_dump(array_diff($planet->getAllDatas(), $data));
 $data = $planet->getAllDatas();
 
-Legacies::dispatchEvent('planet.update', array(
+Wootook::dispatchEvent('planet.update', array(
     'planet' => $planet,
     'time'   => (3600 * 30)
     ));
@@ -143,7 +143,7 @@ Legacies::dispatchEvent('planet.update', array(
 var_dump(array_diff($planet->getAllDatas(), $data));
 $data = $planet->getAllDatas();
 
-Legacies::dispatchEvent('planet.update', array(
+Wootook::dispatchEvent('planet.update', array(
     'planet' => $planet,
     'time'   => (3600 * 5000)
     ));
@@ -154,7 +154,7 @@ $data = $planet->getAllDatas();
 $planet->appendBuildingQueue(Legacies_Empire::ID_BUILDING_CRISTAL_MINE, false, 0);
 $planet->appendBuildingQueue(Legacies_Empire::ID_BUILDING_SOLAR_PLANT, false, 0);
 
-Legacies::dispatchEvent('planet.update', array(
+Wootook::dispatchEvent('planet.update', array(
     'planet' => $planet,
     'time'   => (3600 * 10000)
     ));
diff --git a/includes/application/test/bootstrap.php b/application/test/bootstrap.php
similarity index 96%
rename from includes/application/test/bootstrap.php
rename to application/test/bootstrap.php
index 4171bf9..3eb5410 100644
--- a/includes/application/test/bootstrap.php
+++ b/application/test/bootstrap.php
@@ -39,7 +39,7 @@ if (0 === filesize(ROOT_PATH . 'config.php')) {
 
 foreach (include ROOT_PATH . 'includes/data/events.php' as $event => $listenerList) {
     foreach ($listenerList as $listener) {
-        Legacies::registerListener($event, $listener);
+        Wootook::registerListener($event, $listener);
     }
 }
 
diff --git a/application/test/registration.php b/application/test/registration.php
new file mode 100644
index 0000000..e02fbe7
--- /dev/null
+++ b/application/test/registration.php
@@ -0,0 +1,43 @@
+ array(),
+    'system' => array(),
+    );
+*/
+for ($i = 0; $i < 10000; $i++) {
+    $collection = Legacies_Empire_Model_Planet::searchMostFreeSystems();
+    $collection->limit(1)->load();
+    $systemInfo = $collection->current();
+
+    //var_dump($systemInfo->getallDatas());
+    echo $systemInfo->getData('galaxy') . ';' . $systemInfo->getData('system') . PHP_EOL;
+/*
+    $galaxy = $systemInfo->getData('galaxy');
+    if (!isset($datas['galaxy'][$galaxy])) {
+        $datas['galaxy'][$galaxy] = 1;
+    } else {
+        $datas['galaxy'][$galaxy]++;
+    }
+
+    $system = $systemInfo->getData('system');
+    if (!isset($datas['system'][$system])) {
+        $datas['system'][$system] = 1;
+    } else {
+        $datas['system'][$system]++;
+    }
+*/
+}
+/*
+asort($datas['galaxy'], SORT_NUMERIC);
+asort($datas['system'], SORT_NUMERIC);
+
+var_dump($datas);
+*/
\ No newline at end of file
diff --git a/banned.php b/banned.php
index 147493b..53c3b94 100644
--- a/banned.php
+++ b/banned.php
@@ -1,11 +1,11 @@
 
+ * Copyright (c) 2009-Present, Wootook Support Team 
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,13 +24,13 @@
  *                                --> 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.
  *
  */
 
 define('INSIDE' , true);
 define('INSTALL' , false);
-require_once dirname(__FILE__) .'/common.php';
+require_once dirname(__FILE__) .'/application/bootstrap.php';
 
 
 includeLang('banned');
diff --git a/buddy.php b/buddy.php
index eb6cb8d..a59aca3 100644
--- a/buddy.php
+++ b/buddy.php
@@ -1,11 +1,11 @@
 
+ * Copyright (c) 2009-Present, Wootook Support Team 
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,13 +24,13 @@
  *                                --> 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.
  *
  */
 
 define('INSIDE' , true);
 define('INSTALL' , false);
-require_once dirname(__FILE__) .'/common.php';
+require_once dirname(__FILE__) .'/application/bootstrap.php';
 
 	includeLang('buddy');
 
diff --git a/buildings.php b/buildings.php
index 195e250..babc392 100644
--- a/buildings.php
+++ b/buildings.php
@@ -1,11 +1,11 @@
 
+ * Copyright (c) 2009-Present, Wootook Support Team 
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,29 +24,29 @@
  *                                --> 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.
  *
  */
 
 define('INSIDE' , true);
 define('INSTALL' , false);
-require_once dirname(__FILE__) .'/common.php';
+require_once dirname(__FILE__) .'/application/bootstrap.php';
 
 includeLang('buildings');
 
-$user = Legacies_Empire_Model_User::getSingleton();
+$user = Wootook_Empire_Model_User::getSingleton();
 $planet = $user->getCurrentPlanet();
 $mode = isset($_GET['mode']) ? $_GET['mode'] : null;
 
 switch ($mode) {
 case 'fleet':
     if ($planet->getElement(Legacies_Empire::ID_BUILDING_SHIPYARD) < 1) {
-        $layout = new Legacies_Core_Layout();
+        $layout = new Wootook_Core_Layout();
         $layout->load('message');
 
         $block = $layout->getBlock('message');
-        $block['title'] = Legacies::__('Shipyard is required');
-        $block['message'] = Legacies::__('In order to build ships you will need to build a shipyard building.');
+        $block['title'] = Wootook::__('Shipyard is required');
+        $block['message'] = Wootook::__('In order to build ships you will need to build a shipyard building.');
 
         $layout->render();
         break;
@@ -64,7 +64,7 @@ case 'fleet':
         $planet->save();
     }
 
-    $layout = new Legacies_Core_Layout();
+    $layout = new Wootook_Core_Layout();
     $layout->load('planet.shipyard');
 
     echo $layout->render();
@@ -72,12 +72,12 @@ case 'fleet':
 
 case 'research':
     if ($planet->getElement(Legacies_Empire::ID_BUILDING_RESEARCH_LAB) < 1) {
-        $layout = new Legacies_Core_Layout();
+        $layout = new Wootook_Core_Layout();
         $layout->load('message');
 
         $block = $layout->getBlock('message');
-        $block['title'] = Legacies::__('Research lab is required');
-        $block['title'] = Legacies::__('In order to do technological researches, you will need to build a research lab building.');
+        $block['title'] = Wootook::__('Research lab is required');
+        $block['title'] = Wootook::__('In order to do technological researches, you will need to build a research lab building.');
 
         $layout->render();
         break;
@@ -92,7 +92,7 @@ case 'research':
         $planet->save();
     }
 
-    $layout = new Legacies_Core_Layout();
+    $layout = new Wootook_Core_Layout();
     $layout->load('planet.research-lab');
 
     echo $layout->render();
@@ -100,12 +100,12 @@ case 'research':
 
 case 'defense':
     if ($planet->getElement(Legacies_Empire::ID_BUILDING_SHIPYARD) < 1) {
-        $layout = new Legacies_Core_Layout();
+        $layout = new Wootook_Core_Layout();
         $layout->load('message');
 
         $block = $layout->getBlock('message');
-        $block['title'] = Legacies::__('Shipyard is required');
-        $block['title'] = Legacies::__('In order to build ships you will need to build a shipyard building.');
+        $block['title'] = Wootook::__('Shipyard is required');
+        $block['title'] = Wootook::__('In order to build ships you will need to build a shipyard building.');
 
         $layout->render();
         break;
@@ -123,7 +123,7 @@ case 'defense':
         $planet->save();
     }
 
-    $layout = new Legacies_Core_Layout();
+    $layout = new Wootook_Core_Layout();
     $layout->load('planet.defense');
 
     /** @var Legacies_Empire_Block_Planet_Shipyard $block */
@@ -143,7 +143,7 @@ default:
         $planet->save();
     }
 
-    $layout = new Legacies_Core_Layout();
+    $layout = new Wootook_Core_Layout();
     $layout->load('planet.buildings');
     echo $layout->render();
     break;
diff --git a/calc.php b/calc.php
index 2abcb2a..13c5db8 100644
--- a/calc.php
+++ b/calc.php
@@ -1,11 +1,11 @@
 
+ * Copyright (c) 2009-Present, Wootook Support Team 
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +24,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.
  *
  */
 
diff --git a/changelog.php b/changelog.php
index fb99527..00df85d 100644
--- a/changelog.php
+++ b/changelog.php
@@ -1,11 +1,11 @@
 
+ * Copyright (c) 2009-Present, Wootook Support Team 
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,13 +24,13 @@
  *                                --> 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.
  *
  */
 
 define('INSIDE' , true);
 define('INSTALL' , false);
-require_once dirname(__FILE__) .'/common.php';
+require_once dirname(__FILE__) .'/application/bootstrap.php';
 includeLang('changelog');
 
 $template = gettemplate('changelog_table');
diff --git a/chat.php b/chat.php
index 76d4f06..16254dd 100644
--- a/chat.php
+++ b/chat.php
@@ -1,11 +1,11 @@
 
+ * Copyright (c) 2009-Present, Wootook Support Team 
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,13 +24,13 @@
  *                                --> 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.
  *
  */
 
 define('INSIDE' , true);
 define('INSTALL' , false);
-require_once dirname(__FILE__) .'/common.php';
+require_once dirname(__FILE__) .'/application/bootstrap.php';
 
 	includeLang('chat');
 	$BodyTPL = gettemplate('chat_body');
@@ -41,5 +41,5 @@ require_once dirname(__FILE__) .'/common.php';
 	$page = parsetemplate($BodyTPL, $parse);
 	display($page, $lang['Chat'], false);
 
-// Shoutbox by e-Zobar - Copyright XNova Team 2008
+// Shoutbox by e-Zobar - Copyright Wootook Team 2008
 ?>
\ No newline at end of file
diff --git a/chat_add.php b/chat_add.php
index a6faba3..f3f8c13 100644
--- a/chat_add.php
+++ b/chat_add.php
@@ -1,11 +1,11 @@
 
+ * Copyright (c) 2009-Present, Wootook Support Team 
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,13 +24,13 @@
  *                                --> 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.
  *
  */
 
 define('INSIDE' , true);
 define('INSTALL' , false);
-require_once dirname(__FILE__) .'/common.php';
+require_once dirname(__FILE__) .'/application/bootstrap.php';
 
 	// On récupère les informations du message et de l'envoyeur
 	if (isset($_POST["msg"]) && isset($user['username'])) {
@@ -49,5 +49,5 @@ require_once dirname(__FILE__) .'/common.php';
 	   $query = doquery("INSERT INTO {{table}}(user, message, timestamp) VALUES ('".$nick."', '".$msg."', '".time()."')", "chat");
 	}
 
-// Shoutbox by e-Zobar - Copyright XNova Team 2008
+// Shoutbox by e-Zobar - Copyright Wootook Team 2008
 ?>
\ No newline at end of file
diff --git a/chat_msg.php b/chat_msg.php
index ea05b05..acb1bfa 100644
--- a/chat_msg.php
+++ b/chat_msg.php
@@ -1,11 +1,11 @@
 
+ * Copyright (c) 2009-Present, Wootook Support Team 
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,13 +24,13 @@
  *                                --> 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.
  *
  */
 
 define('INSIDE' , true);
 define('INSTALL' , false);
-require_once dirname(__FILE__) .'/common.php';
+require_once dirname(__FILE__) .'/application/bootstrap.php';
 
 // On efface les anciens messages
 $timemoment=time();
@@ -62,12 +62,12 @@ while($v=mysql_fetch_object($query)){
 	$msg=preg_replace("#:\(#isU","\":(\"",$msg);
 	$msg=preg_replace("#;\)#isU","\";)\"",$msg);
 	$msg=preg_replace("#:s#isU","\":s\"",$msg);
-	$msg=preg_replace("#xnova#","XNova",$msg);
+	$msg=preg_replace("#xnova#","Wootook",$msg);
 
 	// Affichage du message
 	$msg="
".$nick." > ".$msg."
";
 	print stripslashes($msg);
 }
 
-// Shoutbox by e-Zobar - Copyright XNova Team 2008
+// Shoutbox by e-Zobar - Copyright Wootook Team 2008
 ?>
\ No newline at end of file
diff --git a/config.php.default b/config.php.default
index 85e7c1c..782d3d5 100644
--- a/config.php.default
+++ b/config.php.default
@@ -1,5 +1,12 @@
  array(
+        'storyline' => array(
+            'universe' => 'legacies',
+            'episode'  => 'default',
+            ),
+        'web' => array(
+            'base_url' => 'http://testing.xnova-legacies.org/'
+            ),
         'date' => array(
             'timezone' => 'Europe/Paris'
             ),
diff --git a/contact.php b/contact.php
index 83e76c1..17fc8bf 100644
--- a/contact.php
+++ b/contact.php
@@ -1,11 +1,11 @@
 
+ * Copyright (c) 2009-Present, Wootook Support Team 
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,14 +24,14 @@
  *                                --> 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.
  *
  */
 
 define('INSIDE' , true);
 define('INSTALL' , false);
 define('DISABLE_IDENTITY_CHECK', true);
-require_once dirname(__FILE__) .'/common.php';
+require_once dirname(__FILE__) .'/application/bootstrap.php';
 
 	includeLang('contact');
 
diff --git a/fleet.php b/fleet.php
index 652261d..abc968d 100644
--- a/fleet.php
+++ b/fleet.php
@@ -1,11 +1,11 @@
 
+ * Copyright (c) 2009-Present, Wootook Support Team 
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,18 +24,13 @@
  *                                --> 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.
  *
  */
 
 define('INSIDE' , true);
 define('INSTALL' , false);
-require_once dirname(__FILE__) .'/common.php';
-
-$maxfleet = doquery("SELECT 1 FROM {{table}} WHERE `fleet_owner` = '".$user['id']."';", 'fleets');
-
-$MaxFlyingFleets = $maxfleet->rowCount();
-$maxfleet->closeCursor();
+require_once dirname(__FILE__) .'/application/bootstrap.php';
 
 //Compteur de flotte en expéditions et nombre d'expédition maximum
 $maxExpedition = $user->getElement(Legacies_Empire::ID_RESEARCH_EXPEDITION_TECHNOLOGY);
@@ -73,9 +68,11 @@ $position      = isset($_GET['planet']) ? intval($_GET['planet']) : 0;
 $planetType    = isset($_GET['planettype']) ? intval($_GET['planettype']) : 0;
 $targetMission = isset($_GET['target_mission']) ? intval($_GET['target_mission']) : 0;
 
-$user = Legacies_Empire_Model_User::getSingleton();
+$user = Wootook_Empire_Model_User::getSingleton();
 $planet = $user->getCurrentPlanet();
 
+$MaxFlyingFleets = $user->getFleetCount();
+
 if ($galaxy <= 0 || $galaxy > MAX_GALAXY_IN_WORLD) {
     $galaxy = $planet['galaxy'];
 }
@@ -87,9 +84,9 @@ if ($position <= 0 || $position > MAX_PLANET_IN_SYSTEM) {
 }
 
 $allowedPlanetTypes = array(
-    Legacies_Empire_Model_Planet::TYPE_PLANET,
-    Legacies_Empire_Model_Planet::TYPE_DEBRIS,
-    Legacies_Empire_Model_Planet::TYPE_MOON
+    Wootook_Empire_Model_Planet::TYPE_PLANET,
+    Wootook_Empire_Model_Planet::TYPE_DEBRIS,
+    Wootook_Empire_Model_Planet::TYPE_MOON
     );
 
 if (!in_array($planetType, $allowedPlanetTypes)) {
diff --git a/fleetback.php b/fleetback.php
index d8cc82e..d82571b 100644
--- a/fleetback.php
+++ b/fleetback.php
@@ -13,7 +13,7 @@ Last revision: 13/07/11
 
 define('INSIDE' , true);
 define('INSTALL' , false);
-require_once dirname(__FILE__) .'/common.php';
+require_once dirname(__FILE__) .'/application/bootstrap.php';
 	includeLang('fleet');
 
 	$BoxTitle   = $lang['fl_error'];
diff --git a/fleetshortcut.php b/fleetshortcut.php
index 84927cd..538c8ae 100644
--- a/fleetshortcut.php
+++ b/fleetshortcut.php
@@ -1,11 +1,11 @@
 
+ * Copyright (c) 2009-Present, Wootook Support Team 
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,13 +24,13 @@
  *                                --> 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.
  *
  */
 
 define('INSIDE' , true);
 define('INSTALL' , false);
-require_once dirname(__FILE__) .'/common.php';
+require_once dirname(__FILE__) .'/application/bootstrap.php';
 
 
 $mode = $_GET['mode'];
diff --git a/floten1.php b/floten1.php
index 1b693cf..42bb9c7 100644
--- a/floten1.php
+++ b/floten1.php
@@ -1,11 +1,11 @@
 
+ * Copyright (c) 2009-Present, Wootook Support Team 
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,28 +24,29 @@
  *                                --> 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.
  *
  */
 
 define('INSIDE' , true);
 define('INSTALL' , false);
-require_once dirname(__FILE__) .'/common.php';
+require_once dirname(__FILE__) .'/application/bootstrap.php';
 includeLang('fleet');
 
-$speed = array(10 => 100,
-    9 => 90,
-    8 => 80,
-    7 => 70,
-    6 => 60,
-    5 => 50,
-    4 => 40,
-    3 => 30,
-    2 => 20,
-    1 => 10,
+$speed = array(
+    10 => 100,
+    9  => 90,
+    8  => 80,
+    7  => 70,
+    6  => 60,
+    5  => 50,
+    4  => 40,
+    3  => 30,
+    2  => 20,
+    1  => 10,
     );
 
-$user = Legacies_Empire_Model_User::getSingleton();
+$user = Wootook_Empire_Model_User::getSingleton();
 $planetrow = $user->getCurrentPlanet();
 
 $g = isset($_POST['galaxy']) ? intval($_POST['galaxy']) : 0;
@@ -63,16 +64,16 @@ if ($p <= 0 || $p > MAX_PLANET_IN_SYSTEM) {
     $p = $planetrow['planet'];
 }
 $allowedPlanetTypes = array(
-    Legacies_Empire_Model_Planet::TYPE_PLANET,
-    Legacies_Empire_Model_Planet::TYPE_DEBRIS,
-    Legacies_Empire_Model_Planet::TYPE_MOON
+    Wootook_Empire_Model_Planet::TYPE_PLANET,
+    Wootook_Empire_Model_Planet::TYPE_DEBRIS,
+    Wootook_Empire_Model_Planet::TYPE_MOON
     );
 
 if (!in_array($t, $allowedPlanetTypes)) {
     $t = $planet['planet_type'];
 }
 
-$session = Legacies::getSession('fleet');
+$session = Wootook::getSession('fleet');
 $session->clearData();
 $FleetHiddenBlock  = "";
 
@@ -127,7 +128,7 @@ if (empty($fleetArray)) {
 $speedFactor = GetGameSpeedFactor();
 $session['speedallsmin'] = $speedallsmin;
 
-$scriptPath = Legacies::getUrl('scripts/flotten.js');
+$scriptPath = Wootook::getUrl('scripts/flotten.js');
 $page .= "";
 $page .= "
 
getData('deuterium_type')?>
 	getData('energy_type')?>
 	
+		getData('option') != ''):?>
 		
+		
 	
 

+		
-

+		getArrivalTime()?>
+			
+		isOwnedBy($user) || $fleet->isMission(Legacies_Empire::ID_MISSION_TRANSPORT) || $fleet->isMission(Legacies_Empire::ID_MISSION_STATION) || $fleet->isMission(Legacies_Empire::ID_MISSION_STATION_ALLY)):?>
+		__('An hostile fleet sent by %1$s, coming from %2$s, reaches your planet %3$d. It has been sent with the mission: %4$d', $fleet->getOwner()->getUsername(), $fleet->getOriginPlanet()->getName(), $fleet->getDestinationPlanet()->getName(), $fleet->getMissionLabel())?>
+		isOwnedBy($user) || $fleet->isMission(Legacies_Empire::ID_MISSION_ATTACK) || $fleet->isMission(Legacies_Empire::ID_MISSION_GROUP_ATTACK) || $fleet->isMission(Legacies_Empire::ID_MISSION_DESTROY) || $fleet->isMission(Legacies_Empire::ID_MISSION_MISSILES) || $fleet->isMission(Legacies_Empire::ID_MISSION_SPY)):?>
+		__('Your hostile fleet, sent from %1$s, reaches %2$d\'s planet %3$d. It has been sent with the mission: %4$d', $fleet->getOriginPlanet()->getName(), $fleet->getDestinationPlanet()->getUser()->getUsername(), $fleet->getDestinationPlanet()->getName(), $fleet->getMissionLabel())?>
+		isOwnedBy($user)):?>
+		__('Your peaceful fleet, sent from %2$s, reaches the planet %3$d. It has been sent with the mission: %4$d', $fleet->getOwner()->getUsername(), $fleet->getOriginPlanet()->getName(), $fleet->getDestinationPlanet()->getName(), $fleet->getMissionLabel())?>
+		
+		__('A peaceful fleet sent by %1$s, coming from %2$s, reaches your planet %3$d. It has been sent with the mission: %4$d', $fleet->getOwner()->getUsername(), $fleet->getOriginPlanet()->getName(), $fleet->getDestinationPlanet()->getName(), $fleet->getMissionLabel())?>
+		
+