![](\"../images/true.png\")
";
- } else {
- $Bloc['state_vacancy'] = "![](\"../images/false.png\")
";
- }
-
- if ($TheUser['bana'] == 1) {
- $Bloc['is_banned'] = "![](\"../images/banned.png\")
";
- } else {
- $Bloc['is_banned'] = $lang['is_banned_lang'];
- }
- $Bloc['usr_planet_gal'] = $TheUser['galaxy'];
- $Bloc['usr_planet_sys'] = $TheUser['system'];
- $Bloc['usr_planet_pos'] = $TheUser['planet'];
-
-
- $parse['adm_ov_data_table'] .= parsetemplate( $RowsTPL, $Bloc );
- $Count++;
- }
-
- $parse['adm_ov_data_count'] = $Count;
- $Page = parsetemplate($PageTPL, $parse);
-
- display ( $Page, $lang['sys_overview'], false, '', true);
+ if ($_GET['cmd'] == 'sort') {
+ $TypeSort = $_GET['type'];
} else {
- AdminMessage ( $lang['sys_noalloaw'], $lang['sys_noaccess'] );
+ $TypeSort = "id";
}
-?>
+ $PageTPL = gettemplate('admin/overview_body');
+ $RowsTPL = gettemplate('admin/overview_rows');
+
+ $parse = $lang;
+ $parse['dpath'] = $dpath;
+ $parse['mf'] = $mf;
+ $parse['adm_ov_data_yourv'] = colorRed(VERSION);
+
+ $Last15Mins = doquery("SELECT * FROM {{table}} WHERE `onlinetime` >= '". (time() - 15 * 60) ."' ORDER BY `". $TypeSort ."` ASC;", 'users');
+ $Count = 0;
+ $Color = "lime";
+ while ($TheUser = $Last15Mins->fetch(PDO::FETCH_ASSOC) ) {
+ if ($PrevIP != "") {
+ if ($PrevIP == $TheUser['user_lastip']) {
+ $Color = "red";
+ } else {
+ $Color = "lime";
+ }
+ }
+
+ $UserPoints = doquery("SELECT * FROM {{table}} WHERE `stat_type` = '1' AND `stat_code` = '1' AND `id_owner` = '" . $TheUser['id'] . "';", 'statpoints', true);
+ $Bloc['dpath'] = $dpath;
+ $Bloc['adm_ov_altpm'] = $lang['adm_ov_altpm'];
+ $Bloc['adm_ov_wrtpm'] = $lang['adm_ov_wrtpm'];
+ $Bloc['adm_ov_data_id'] = $TheUser['id'];
+ $Bloc['adm_ov_data_name'] = $TheUser['username'];
+ $Bloc['adm_ov_data_agen'] = $TheUser['user_agent'];
+ $Bloc['current_page'] = $TheUser['current_page'];
+ $Bloc['usr_s_id'] = $TheUser['id'];
+
+ $Bloc['adm_ov_data_clip'] = $Color;
+ $Bloc['adm_ov_data_adip'] = $TheUser['user_lastip'];
+ $Bloc['adm_ov_data_ally'] = $TheUser['ally_name'];
+ $Bloc['adm_ov_data_point'] = pretty_number ( $UserPoints['total_points'] );
+ $Bloc['adm_ov_data_activ'] = pretty_time ( time() - $TheUser['onlinetime'] );
+ $Bloc['adm_ov_data_pict'] = "m.gif";
+ $PrevIP = $TheUser['user_lastip'];
+
+ //Tweaks vue g�n�rale
+ $Bloc['usr_email'] = $TheUser['email'];
+ $Bloc['usr_xp_raid'] = $TheUser['xpraid'];
+ $Bloc['usr_xp_min'] = $TheUser['xpminier'];
+
+ if ($TheUser['urlaubs_modus'] == 1) {
+ $Bloc['state_vacancy'] = "";
+ } else {
+ $Bloc['state_vacancy'] = "";
+ }
+
+ if ($TheUser['bana'] == 1) {
+ $Bloc['is_banned'] = "";
+ } else {
+ $Bloc['is_banned'] = $lang['is_banned_lang'];
+ }
+ $Bloc['usr_planet_gal'] = $TheUser['galaxy'];
+ $Bloc['usr_planet_sys'] = $TheUser['system'];
+ $Bloc['usr_planet_pos'] = $TheUser['planet'];
+
+
+ $parse['adm_ov_data_table'] .= parsetemplate( $RowsTPL, $Bloc );
+ $Count++;
+ }
+
+ $parse['adm_ov_data_count'] = $Count;
+ $Page = parsetemplate($PageTPL, $parse);
+
+ display( $Page, $lang['sys_overview'], false, '', true);
+} else {
+ AdminMessage ( $lang['sys_noalloaw'], $lang['sys_noaccess'] );
+}
+
diff --git a/alliance.php b/alliance.php
index 7e00373..253527c 100644
--- a/alliance.php
+++ b/alliance.php
@@ -139,7 +139,7 @@ if ($user->getData('ally_id') == 0) {
/*
* Creation of the alliance
*/
- if ($yes == 1 && isset($request->isPost())) {
+ if ($yes == 1 && $request->isPost()) {
if ($request->getPost('atag') !== null) {
message($lang['have_not_tag'], $lang['make_alliance']);
diff --git a/application/bootstrap.php b/application/bootstrap.php
index e49c9b5..acacd9a 100644
--- a/application/bootstrap.php
+++ b/application/bootstrap.php
@@ -28,6 +28,12 @@
*
*/
+if (!defined('PHP_VERSION_ID')) {
+ $version = explode('.',PHP_VERSION);
+ define('PHP_VERSION_ID', (((int)$version[0]) * 10000 + ((int)$version[1]) * 100 + ((int)$version[2])));
+ unset($version);
+}
+
if (!defined('DEBUG') && ($env = getenv('DEBUG')) !== false && in_array(strtolower($env), array('1', 'on', 'true'))) {
define('DEBUG', true);
} else if (!defined('DEBUG') && isset($_SERVER['DEBUG']) && in_array(strtolower($_SERVER['DEBUG']), array('1', 'on', 'true'))) {
@@ -72,15 +78,28 @@ function __autoload($class) {
include_once str_replace('_', '/', $class) . '.php';
}
+if (defined('IN_ADMIN')) {
+ $website = new Wootook_Core_Model_Website();
+ $website->setId(0)->setData('code', 'admin');
+ Wootook::addWebsite($website);
+ Wootook::setDefaultWebsite($website);
+
+ $game = new Wootook_Core_Model_Game();
+ $game->setId(0)->setData('code', 'admin')->setData('website_id', $website->getId());
+ Wootook::addGame($game);
+ Wootook::setDefaultGame($game);
+}
+
include ROOT_PATH . 'includes/constants.php';
Wootook_Core_Time::init();
Wootook_Core_ErrorProfiler::register();
Wootook_Core_Model_Config_Events::registerEvents();
-if (!defined('IN_INSTALL') && 0 === filesize(ROOT_PATH . 'config.php')) {
+if (!defined('IN_INSTALL') && 0 === filesize(APPLICATION_PATH . 'config' . DIRECTORY_SEPARATOR . 'local.php')) {
header('HTTP/1.1 307 Temporary Redirect');
- header('Location: install/');
+ $url = Wootook::getUrl('install/');
+ header("Location: $url");
die();
}
@@ -98,53 +117,47 @@ include(ROOT_PATH . 'language/' . DEFAULT_LANG . '/lang_info.cfg');
include(ROOT_PATH . 'includes/vars.' . PHPEXT);
include(ROOT_PATH . 'includes/strings.' . PHPEXT);
-if (!defined('IN_INSTALL')) {
+$user = Wootook_Empire_Model_User::getSingleton();
- $cookieName = Wootook::getGameConfig('web/cookie/name');
- if ($cookieName !== null) {
- Wootook_Empire_Model_User::setCookieName($cookieName);
- }
- $user = Wootook_Empire_Model_User::getSingleton();
-
- if (!defined('DISABLE_IDENTITY_CHECK')) {
- if (($user === null || !$user->getId())) {
- header('Location: login.php');
- exit(0);
- }
-
- if (Wootook::getGameConfig('game/general/active') && $user !== null && !in_array($user->getData('authlevel'), array(LEVEL_ADMIN, LEVEL_MODERATOR, LEVEL_OPERATOR))) {
- $layout = new Wootook_Core_Layout();
- $layout->load('message');
-
- $block = $layout->getBlock('message');
- $block['title'] = Wootook::__('Game is disabled.');
- $block['message'] = Wootook::getGameConfig('game/general/closing-message');
-
- echo $layout->render();
- exit(0);
- }
+if (!defined('DISABLE_IDENTITY_CHECK')) {
+ if (($user === null || !$user->getId())) {
+ $url = Wootook::getUrl('login.php');
+ header("Location: $url");
+ exit(0);
}
- includeLang('system');
- includeLang('tech');
+ if (Wootook::getGameConfig('game/general/active') && $user !== null && !in_array($user->getData('authlevel'), array(LEVEL_ADMIN, LEVEL_MODERATOR, LEVEL_OPERATOR))) {
+ $layout = new Wootook_Core_Layout(Wootook_Core_Layout::DOMAIN_FRONTEND);
+ $layout->load('message');
- if (($user !== null && $user->getId())) {
- if (isset($_GET['cp']) && !empty($_GET['cp'])) {
- $user->updateCurrentPlanet((int) $_GET['cp']);
- }
+ $block = $layout->getBlock('message');
+ $block['title'] = Wootook::__('Game is disabled.');
+ $block['message'] = Wootook::getGameConfig('game/general/closing-message');
- $planet = $user->getCurrentPlanet();
-
- foreach ($user->getPlanetCollection() as $userPlanet) {
- FlyingFleetHandler($userPlanet); // TODO: implement logic into a refactored model
- }
-
- /*
- * Update planet resources and constructions
- */
- Wootook::dispatchEvent('planet.update', array(
- 'planet' => $planet
- ));
- $planet->save();
+ echo $layout->render();
+ exit(0);
}
+}
+
+includeLang('system');
+includeLang('tech');
+
+if (($user !== null && $user->getId())) {
+ if (isset($_GET['cp']) && !empty($_GET['cp'])) {
+ $user->updateCurrentPlanet((int) $_GET['cp']);
+ }
+
+ $planet = $user->getCurrentPlanet();
+
+ foreach ($user->getPlanetCollection() as $userPlanet) {
+ FlyingFleetHandler($userPlanet); // TODO: implement logic into a refactored model
+ }
+
+ /*
+ * Update planet resources and constructions
+ */
+ Wootook::dispatchEvent('planet.update', array(
+ 'planet' => $planet
+ ));
+ $planet->save();
}
\ No newline at end of file
diff --git a/application/code/core/Legacies/Empire/install/mysql5/install-1.5.0.php b/application/code/core/Legacies/Empire/install/mysql5/install-1.5.0.php
index d5d27d6..a25a89b 100644
--- a/application/code/core/Legacies/Empire/install/mysql5/install-1.5.0.php
+++ b/application/code/core/Legacies/Empire/install/mysql5/install-1.5.0.php
@@ -291,7 +291,7 @@ CREATE TABLE IF NOT EXISTS {$this->getTableName('planets')} (
`b_building_id` TEXT NOT NULL,
`b_tech` SMALLINT UNSIGNED NOT NULL,
`b_tech_id` SMALLINT UNSIGNED NOT NULL,
- `b_hangar` SMALLINT UNSIGNED NOT NULL,
+ `b_hangar` INT UNSIGNED NOT NULL,
`b_hangar_id` TEXT NOT NULL,
`b_hangar_plus` SMALLINT UNSIGNED NOT NULL,
`image` VARCHAR(50) NOT NULL DEFAULT 'normaltempplanet01',
diff --git a/application/code/core/Wootook.php b/application/code/core/Wootook.php
index 6703a42..9ae5e48 100644
--- a/application/code/core/Wootook.php
+++ b/application/code/core/Wootook.php
@@ -55,68 +55,73 @@ class Wootook
*
* @var Legacies_Core_Controller_Request_Http
*/
- protected static $_request = null;
+ private static $_request = null;
/**
* HTTP response management object
*
* @var Legacies_Core_Controller_Response
*/
- protected static $_response = null;
+ private static $_response = null;
/**
* The current timestamp
*
* @var int
*/
- protected static $_now = null;
+ private static $_now = null;
/**
* Default locale identifier
*
* @var string
*/
- protected static $_defaultLocale = 'fr_FR';
+ private static $_defaultLocale = 'fr_FR';
/**
*
* Enter description here ...
* @var Wootook_Core_Config_Adapter_Abstract
*/
- protected static $_config = null;
+ private static $_config = null;
/**
*
* Enter description here ...
* @var Wootook_Core_Config_Adapter_Abstract
*/
- protected static $_globalConfig = null;
+ private static $_globalConfig = null;
/**
*
* Enter description here ...
* @var array
*/
- protected static $_websiteConfigs = array();
+ private static $_websiteConfigs = array();
/**
*
* Enter description here ...
* @var array
*/
- protected static $_gameConfigs = array();
+ private static $_gameConfigs = array();
/**
*
* Enter description here ...
* @var array
*/
- protected static $_ignoreDatabaseConfig = false;
+ private static $_ignoreDatabaseConfig = false;
- protected static $_websitesById = array();
- protected static $_websitesByCode = array();
- protected static $_gamesById = array();
- protected static $_gamesByCode = array();
+ private static $_defaultWebsite = null;
+ private static $_defaultGame = null;
+
+ private static $_websitesById = array();
+ private static $_websitesByCode = array();
+ private static $_gamesById = array();
+ private static $_gamesByCode = array();
+
+ public static $isInstalled = true;
/**
* Registers an event listener to be called later in the application.
@@ -329,13 +334,25 @@ class Wootook
self::$_config = new Wootook_Core_Config_Adapter_Array();
try {
- if (!is_array($filename)) {
- if ($filename === null) {
- $filename = ROOT_PATH . 'config.php';
+ self::$_config->load(APPLICATION_PATH . 'config' . DIRECTORY_SEPARATOR . 'system.php');
+
+ if ($filename === null) {
+ $filename = APPLICATION_PATH . 'config' . DIRECTORY_SEPARATOR . 'local.php';
+ }
+
+ if (is_string($filename)) {
+ if (!self::$isInstalled) {
+ throw new Wootook_Core_Exception_DataAccessException();
}
- self::$_config->load($filename);
+ $localConfig = new Wootook_Core_Config_Adapter_Array($filename);
+ self::$_config->merge($localConfig);
+ } else if (is_array($filename)) {
+ $localConfig = new Wootook_Core_Config_Node($filename);
+ self::$_config->merge($localConfig);
+ } else if ($filename instanceof Wootook_Core_Config_Node) {
+ self::$_config->merge($filename);
} else {
- self::$_config->setData($filename);
+ throw new Wootook_Core_Exception_DataAccessException();
}
} catch (Wootook_Core_Exception_DataAccessException $e) {
self::$_globalConfig = new Wootook_Core_Config_Node(array(), self::$_config);
@@ -353,7 +370,7 @@ class Wootook
return self::$_config;
}
- protected static function _appendDatabaseConfig(Wootook_Core_Config_Node $config, $type = 'global', $model = null)
+ private static function _appendDatabaseConfig(Wootook_Core_Config_Node $config, $type = 'global', $model = null)
{
if (self::$_ignoreDatabaseConfig) {
return $config;
@@ -462,25 +479,67 @@ class Wootook
}
}
- public static function setWebsite($websiteId, $website)
+ public static function addWebsite(Wootook_Core_Model_Website $website)
{
+ $websiteId = $website->getId();
$websiteKey = $website->getData('code');
self::$_websitesById[$websiteId] = $website;
self::$_websitesByCode[$websiteKey] = $website;
}
- public static function setGame($gameId, $game)
+ public static function addGame(Wootook_Core_Model_Game $game)
{
+ $gameId = $game->getId();
$gameKey = $game->getData('code');
self::$_gamesById[$gameId] = $game;
self::$_gamesByCode[$gameKey] = $game;
}
- protected static function _initWebsiteConfig($websiteId)
+ public static function setDefaultWebsite(Wootook_Core_Model_Website $website)
+ {
+ self::$_defaultWebsite = $website;
+ }
+
+ public static function getDefaultWebsite()
+ {
+ if (self::$_defaultWebsite === null) {
+ self::$_defaultWebsite = new Wootook_Core_Model_Website();
+ self::$_defaultWebsite->setId(1)->setData('code', Wootook_Core_Model_Website::DEFAULT_CODE);
+ }
+ return self::$_defaultWebsite;
+ }
+
+ public static function getDefaultGame()
+ {
+ if (self::$_defaultGame === null) {
+ self::$_defaultGame = new Wootook_Core_Model_Game();
+ self::$_defaultGame->setId(1)->setData('code', Wootook_Core_Model_Game::DEFAULT_CODE);
+ }
+ return self::$_defaultGame;
+ }
+
+ public static function setDefaultGame(Wootook_Core_Model_Game $game)
+ {
+ self::$_defaultGame = $game;
+ }
+
+ private static function _initWebsiteConfig($websiteId)
{
if (self::$_config === null) {
self::loadConfig();
}
+ if (!self::$isInstalled) {
+ if (isset(self::$_config['default'])) {
+ self::$_websiteConfigs[Wootook_Core_Model_Website::DEFAULT_CODE] = clone self::$_config['default'];
+ } else {
+ self::$_websiteConfigs[Wootook_Core_Model_Website::DEFAULT_CODE] = new Wootook_Core_Config_Node(array(), self::$_config);
+ }
+ if (isset(self::$_config['install'])) {
+ self::$_websiteConfigs[Wootook_Core_Model_Website::DEFAULT_CODE]->merge(self::$_config['install']);
+ }
+
+ return self::$_websiteConfigs[Wootook_Core_Model_Website::DEFAULT_CODE];
+ }
try {
$website = self::getWebsite($websiteId);
@@ -493,8 +552,10 @@ class Wootook
if (!isset(self::$_websiteConfigs[$websiteKey])) {
self::$_websiteConfigs[$websiteKey] = clone self::$_config['default'];
- if (isset(self::$_config['frontend'])) {
+ if ($websiteId != 0 && isset(self::$_config['frontend'])) {
self::$_websiteConfigs[$websiteKey]->merge(self::$_config['frontend']);
+ } else if ($websiteId == 0 && isset(self::$_config['backend'])) {
+ self::$_websiteConfigs[$websiteKey]->merge(self::$_config['backend']);
}
$websiteConfig = self::$_config->getConfig("website/{$websiteKey}");
@@ -508,11 +569,23 @@ class Wootook
return self::$_websiteConfigs[$websiteKey];
}
- protected static function _initGameConfig($gameId)
+ private static function _initGameConfig($gameId)
{
if (self::$_config === null) {
self::loadConfig();
}
+ if (!self::$isInstalled) {
+ if (isset(self::$_config['default'])) {
+ self::$_gameConfigs[Wootook_Core_Model_Game::DEFAULT_CODE] = clone self::$_config['default'];
+ } else {
+ self::$_gameConfigs[Wootook_Core_Model_Game::DEFAULT_CODE] = new Wootook_Core_Config_Node(array(), self::$_config);
+ }
+ if (isset(self::$_config['install'])) {
+ self::$_gameConfigs[Wootook_Core_Model_Game::DEFAULT_CODE]->merge(self::$_config['install']);
+ }
+
+ return self::$_gameConfigs[Wootook_Core_Model_Game::DEFAULT_CODE];
+ }
try {
$game = self::getGame($gameId);
@@ -562,7 +635,8 @@ class Wootook
}
if ($websiteKey === null) {
- $websiteKey = Wootook_Core_Model_Website::DEFAULT_CODE;
+ //$websiteKey = Wootook_Core_Model_Website::DEFAULT_CODE;
+ $websiteKey = self::getDefaultWebsite()->getData('code');
}
$config = self::_initWebsiteConfig($websiteKey);
@@ -583,7 +657,8 @@ class Wootook
}
if ($gameKey === null) {
- $gameKey = Wootook_Core_Model_Game::DEFAULT_CODE;
+ //$gameKey = Wootook_Core_Model_Game::DEFAULT_CODE;
+ $gameKey = self::getDefaultGame()->getData('code');
}
$config = self::_initGameConfig($gameKey);
@@ -631,14 +706,28 @@ class Wootook
return true;
}
- public static function getBaseUrl()
+ public static function getBaseUrl($domain = 'base')
{
- return self::getConfig('web/base_url');
+ $urlConfig = self::getGameConfig('web/url');
+ if (!$urlConfig instanceof Wootook_Core_Config_Node) {
+ return null;
+ }
+ if (!is_string($domain) || !isset($urlConfig->$domain)) {
+ return $urlConfig->base;
+ }
+ return $urlConfig->$domain;
}
- public static function getSkinUrl($package, $theme, $uri, Array $params = array())
+ public static function getBasePath($domain = 'base')
{
- return self::getUrl("skin/{$package}/{$theme}/{$uri}", $params);
+ $pathConfig = self::getGameConfig('system/path');
+ if (!$pathConfig instanceof Wootook_Core_Config_Node) {
+ return null;
+ }
+ if (!is_string($domain) || !isset($pathConfig->$domain)) {
+ return $pathConfig->base;
+ }
+ return $pathConfig->$domain;
}
public static function getUrl($uri, Array $params = array())
diff --git a/application/code/core/Wootook/Admin/Controller/Front/Action.php b/application/code/core/Wootook/Admin/Controller/Front/Action.php
new file mode 100644
index 0000000..0e85ea2
--- /dev/null
+++ b/application/code/core/Wootook/Admin/Controller/Front/Action.php
@@ -0,0 +1,13 @@
+registerBlockNamespace('admin', 'Wootook_Admin_Block_', 'Wootook/Admin/Block');
+
+ return $layout;
+ }
+}
\ No newline at end of file
diff --git a/application/code/core/Wootook/Admin/controllers/IndexController.php b/application/code/core/Wootook/Admin/controllers/IndexController.php
new file mode 100644
index 0000000..dfb88e1
--- /dev/null
+++ b/application/code/core/Wootook/Admin/controllers/IndexController.php
@@ -0,0 +1,10 @@
+_forward('index', 'user');
+ }
+}
\ No newline at end of file
diff --git a/application/code/core/Wootook/Admin/controllers/UserController.php b/application/code/core/Wootook/Admin/controllers/UserController.php
new file mode 100644
index 0000000..a960525
--- /dev/null
+++ b/application/code/core/Wootook/Admin/controllers/UserController.php
@@ -0,0 +1,40 @@
+_forward('grid');
+ }
+
+ public function gridAction()
+ {
+ $this->loadLayout();
+ $this->renderLayout();
+ }
+
+ public function newAction()
+ {
+ }
+
+ public function editAction()
+ {
+ }
+
+ public function saveAction()
+ {
+ }
+
+ public function saveMassAction()
+ {
+ }
+
+ public function deleteAction()
+ {
+ }
+
+ public function deleteMassAction()
+ {
+ }
+}
\ No newline at end of file
diff --git a/application/code/core/Wootook/Core/Block/Html/Head.php b/application/code/core/Wootook/Core/Block/Html/Head.php
index e83f5aa..b8476a4 100644
--- a/application/code/core/Wootook/Core/Block/Html/Head.php
+++ b/application/code/core/Wootook/Core/Block/Html/Head.php
@@ -3,6 +3,7 @@
class Wootook_Core_Block_Html_Head
extends Wootook_Core_Block_Template
{
+ const TYPE_GLOBAL_CSS = 'global_css';
const TYPE_GLOBAL_JS = 'global_js';
const TYPE_SKIN_CSS = 'skin_css';
@@ -19,7 +20,7 @@ class Wootook_Core_Block_Html_Head
protected $_title = '';
protected $_titleDefaultConcat = self::TITLE_CONCAT_AFTER;
- protected $_titleSeparator = ' | ';
+ protected $_titleSeparator = ' ¤ ';
protected $_titleConcatTypes = array(
self::TITLE_CONCAT_AFTER,
@@ -85,37 +86,56 @@ class Wootook_Core_Block_Html_Head
return $this;
}
- public function addJs($script, $type = 'text/javascript', Array $options = array())
+ public function addJs($script, $type = 'text/javascript', Array $options = array(), $theme = null, $package = null)
{
$options['type'] = $type;
$options['path'] = $script;
+ $options['theme'] = $theme;
+ $options['package'] = $package;
$this->addItem(self::TYPE_GLOBAL_JS, $options);
return $this;
}
- public function addCss($stylesheet, $type = 'text/css', $condition = null, Array $options = array())
+ public function addCss($stylesheet, $type = 'text/css', $condition = null, Array $options = array(), $theme = null, $package = null)
{
$options['type'] = $type;
$options['path'] = $stylesheet;
$options['condition'] = $condition;
+ $options['theme'] = $theme;
+ $options['package'] = $package;
- $this->addItem(self::TYPE_SKIN_CSS, $options);
+ $this->addItem(self::TYPE_GLOBAL_CSS, $options);
return $this;
}
- public function addSkinJs($script, $type = 'text/javascript', Array $options = array())
+ public function addSkinJs($script, $type = 'text/javascript', Array $options = array(), $theme = null, $package = null)
{
$options['type'] = $type;
$options['path'] = $script;
+ $options['theme'] = $theme;
+ $options['package'] = $package;
$this->addItem(self::TYPE_SKIN_JS, $options);
return $this;
}
+ public function addSkinCss($stylesheet, $type = 'text/css', $condition = null, Array $options = array(), $theme = null, $package = null)
+ {
+ $options['type'] = $type;
+ $options['path'] = $stylesheet;
+ $options['condition'] = $condition;
+ $options['theme'] = $theme;
+ $options['package'] = $package;
+
+ $this->addItem(self::TYPE_SKIN_CSS, $options);
+
+ return $this;
+ }
+
public function addInlineJs($content, $type = 'text/javascript', Array $options = array())
{
$options['type'] = $type;
@@ -129,7 +149,6 @@ class Wootook_Core_Block_Html_Head
public function addInlineCss($content, $type = 'text/css', Array $options = array())
{
$options['type'] = $type;
- $options['path'] = $path;
$options['content'] = $content;
$this->addItem(self::TYPE_INLINE_CSS, $options);
@@ -138,6 +157,14 @@ class Wootook_Core_Block_Html_Head
}
public function getCss()
+ {
+ if (isset($this->_items[self::TYPE_GLOBAL_CSS])) {
+ return $this->_items[self::TYPE_GLOBAL_CSS];
+ }
+ return array();
+ }
+
+ public function getSkinCss()
{
if (isset($this->_items[self::TYPE_SKIN_CSS])) {
return $this->_items[self::TYPE_SKIN_CSS];
@@ -184,8 +211,35 @@ class Wootook_Core_Block_Html_Head
if (!isset($css['media'])) {
$css['media'] = 'all';
}
+ $url = $this->getUrl($css['path'], array());
$render .=<<Profiler was empty.
'; + echo 'Error profiler was empty.
'; } else { - echo ''; + echo ''; foreach ($this->_errors as $error) { - echo $this->_renderError(++$index, $error); + ++$index; + echo ''; } echo 'Message #' . $index . '
'; + echo ''; + echo $this->_renderError($index, $error); + echo ''; } foreach ($this->_warnings as $error) { - echo $this->_renderError(++$index, $error); + ++$index; + echo 'Message #' . $index . '
'; + echo ''; + echo $this->_renderError($index, $error); + echo ''; } foreach ($this->_notices as $error) { - echo $this->_renderError(++$index, $error); + ++$index; + echo 'Message #' . $index . '
'; + echo ''; + echo $this->_renderError($index, $error); + echo ''; } foreach ($this->_otherErrors as $errorList) { foreach ($errorList as $error) { - echo $this->_renderError(++$index, $error); + ++$index; + echo 'Message #' . $index . '
'; + echo ''; + echo $this->_renderError($index, $error); + echo ''; } } foreach ($this->_exceptions as $exception) { - $index++; - echo "Message #{$index}". PHP_EOL; + ++$index; + echo 'Message #' . $index . '
'; + echo ''; echo $exception->getMessage() . PHP_EOL; echo $exception->getTraceAsString() . PHP_EOL; - echo PHP_EOL; + echo ''; $child = 0; $current = $exception; while (($current = $current->getPrevious()) !== null) { $child++; - echo " Child level #{$child}". PHP_EOL; - echo " " . $current->getMessage() . PHP_EOL; + echo 'Message #' . $index . ', child level #' . $child . '
'; + echo ''; + echo $current->getMessage() . PHP_EOL; echo $current->getTraceAsString() . PHP_EOL; echo PHP_EOL; + echo ''; } echo PHP_EOL; } - echo ''; + echo '