_renderBacktrace($error['trace'])}
+
+ERROR_EOF;
+ }
+
+ protected function _renderBacktrace(Array $traces)
+ {
+ $output = '';
+ foreach (array_slice($traces, 1) as $key => $trace) {
+ if (preg_match('#^(include|require)(_once)?$#', $trace['function'])) {
+ $output .= sprintf("#%d %s(%s) called at [%s:%s]\n",
+ $key, $trace['function'], $trace['args'][0], $trace['file'], $trace['line']);
+ } else if (!isset($trace['file']) || !isset($trace['line'])) {
+ if (isset($trace['class'])) {
+ $output .= sprintf("#%d Internal function %s%s%s(%s)\n",
+ $key, $trace['class'], $trace['type'], $trace['function'], implode(', ', $this->_formatArgs($trace['args'])));
+ } else {
+ $output .= sprintf("#%d Internal function %s(%s)\n",
+ $key, $trace['function'], implode(', ', $this->_formatArgs($trace['args'])));
+ }
+ } else {
+ if (isset($trace['class'])) {
+ $output .= sprintf("#%d %s%s%s(%s) called at [%s:%s]\n",
+ $key, $trace['class'], $trace['type'], $trace['function'], implode(', ', $this->_formatArgs($trace['args'])), $trace['file'], $trace['line']);
+ } else {
+ $output .= sprintf("#%d %s(%s) called at [%s:%s]\n",
+ $key, $trace['function'], implode(', ', $this->_formatArgs($trace['args'])), $trace['file'], $trace['line']);
+ }
+ }
+ }
+ return $output . '';
+ }
+
+ private function _formatArgs($args)
+ {
+ $argumentList = array();
+ foreach ($args as $argument) {
+ if (is_object($argument)) {
+ $argumentList[] = get_class($argument);
+ } else if (is_array($argument)) {
+ $keys = array_keys($argument);
+ $values = $this->_formatArgs($argument);
+
+ $length = count($values);
+ $output = array();
+ for ($index = 0; $index < $length; $index++) {
+ $output[] = sprintf('[%s] => %s', $keys[$index], $values[$index]);
+ }
+
+ $argumentList[] = '[' . implode(', ', $output) . ']';
+ } else {
+ $argumentList[] = var_export($argument, true);
+ }
+ }
+
+ return $argumentList;
+ }
+
+ protected function _renderConfig(Wootook_Core_Config_Node $config, $level = 0)
+ {
+ $output = '';
+ foreach ($config as $key => $value) {
+ $output .= sprintf('- ', $level);
+ $output .= sprintf('%s', $key);
+ if ($value instanceof Wootook_Core_Config_Node) {
+ if (count($value) > 0) {
+ $output .= $this->_renderConfig($value, $level + 1);
+ } else {
+ $output .= 'Empty node';
+ }
+ } else {
+ $output .= '
' . htmlspecialchars(var_export($value, true), ENT_QUOTES, 'UTF-8') . '';
+ }
+ $output .= ' ';
+ }
+ $output .= '
';
+
+ return $output;
+ }
+
+ public function shutdownManager()
+ {
+ if ($this->_mute === true) {
+ return;
+ }
+
+ $index = 0;
+ echo '';
+ echo '
Debug profiler
';
+ echo '
';
+ echo '
';
+ echo '
Errors (' . count($this->_errors) . ')
';
+ echo '
';
+ foreach ($this->_errors as $error) {
+ ++$index;
+ echo '
Message #' . $index . '
';
+ echo '
';
+ echo $this->_renderError($index, $error);
+ echo '
';
+ }
+ echo '
';
+ echo '
Warnings (' . count($this->_warnings) . ')
';
+ echo '
';
+ foreach ($this->_warnings as $error) {
+ ++$index;
+ echo '
Message #' . $index . '
';
+ echo '
';
+ echo $this->_renderError($index, $error);
+ echo '
';
+ }
+ echo '
';
+ echo '
Notices (' . count($this->_notices) . ')
';
+ echo '
';
+ foreach ($this->_notices as $error) {
+ ++$index;
+ echo '
Message #' . $index . '
';
+ echo '
';
+ echo $this->_renderError($index, $error);
+ echo '
';
+ }
+ echo '
';
+ foreach ($this->_otherErrors as $errno => $errorList) {
+ echo '
Other error errno#' . $errno . ' (' . count($errorList) . ')
';
+ echo '
';
+ foreach ($errorList as $error) {
+ ++$index;
+ echo '
Message #' . $index . '
';
+ echo '
';
+ echo $this->_renderError($index, $error);
+ echo '
';
+ }
+ echo '
';
+ }
+ echo '
Exceptions (' . count($this->_exceptions) . ')
';
+ echo '
';
+ foreach ($this->_exceptions as $exception) {
+ ++$index;
+ echo '
Message #' . $index . '
';
+ echo '
';
+ echo $exception->getMessage() . PHP_EOL;
+ echo $exception->getTraceAsString() . PHP_EOL;
+ echo '
';
+
+ $child = 0;
+ $current = $exception;
+ while (($current = $current->getPrevious()) !== null) {
+ $child++;
+ echo '
Message #' . $index . ', child level #' . $child . '
';
+ echo '
';
+ echo $current->getMessage() . PHP_EOL;
+ echo $current->getTraceAsString() . PHP_EOL;
+ echo PHP_EOL;
+ echo '
';
+ }
+ echo '
';
+ }
+ echo '
Configuration profiler
';
+ echo 'Global configuration
';
+ echo '';
+ $config = clone Wootook::getConfig();
+ foreach ($config->getConfig('resource/database') as $node) {
+ if ($node->params) {
+ $node->params->reset();
+ }
+ }
+ echo $this->_renderConfig(Wootook::getConfig(), 0);
+ echo '
';
+ echo 'Website configuration
';
+ echo '';
+ echo $this->_renderConfig(Wootook::getWebsiteConfig());
+ echo '
';
+ echo 'Game configuration
';
+ echo '';
+ echo $this->_renderConfig(Wootook::getGameConfig());
+ echo '
';
+ echo '';
+ echo <<
+(function(){
+var sections = jQuery('.config-profiler');
+sections.each(function(){
+ var element = jQuery(this);
+ element.hide();
+ });
+
+jQuery('.config-profiler-link').click(function(e){
+ var rel = jQuery(this).attr('rel');
+ sections.each(function(){
+ var element = jQuery(this);
+ if (element.hasClass(rel) && !element.hasClass('opened')) {
+ element.slideDown(500, function(){element.addClass('opened');});
+ } else {
+ element.slideUp(500, function(){element.removeClass('opened');});
+ }
+ });
+ });
+})();
+
+JS_EOF;
+ }
+
+ public static function register()
+ {
+ set_error_handler(array(self::getSingleton(), 'errorManager'));
+ set_exception_handler(array(self::getSingleton(), 'exceptionManager'));
+
+ if (defined('DEBUG')) {
+ self::getSingleton()->_mute = false;
+ }
+
+ if (self::$_isTraceRegistered === false && defined('DEBUG')) {
+ self::$_isTraceRegistered = true;
+ register_shutdown_function(array(self::getSingleton(), 'shutdownManager'));
+ }
+ }
+
+ public static function unregister($force = false)
+ {
+ restore_error_handler();
+ restore_exception_handler();
+
+ self::getSingleton()->_mute = true;
+
+ if ((self::$_isTraceRegistered === false && defined('DEBUG')) || $force) {
+ self::$_isTraceRegistered = true;
+ register_shutdown_function(array(self::getSingleton(), 'shutdownManager'));
+ }
+ }
+
+ public function sleep()
+ {
+ $this->_listen = false;
+ }
+
+ public function wakeup()
+ {
+ $this->_listen = true;
+ }
+}
diff --git a/application/code/core/Legacies/Officers/Exception.php b/src/application/code/core/Wootook/Core/Event.php
similarity index 93%
rename from application/code/core/Legacies/Officers/Exception.php
rename to src/application/code/core/Wootook/Core/Event.php
index a389e3b..42b4de7 100644
--- a/application/code/core/Legacies/Officers/Exception.php
+++ b/src/application/code/core/Wootook/Core/Event.php
@@ -3,7 +3,7 @@
* This file is part of Wootook
*
* @license http://www.gnu.org/licenses/agpl-3.0.txt
- * @see http://www.wootook.com/
+ * @see http://wootook.org/
*
* Copyright (c) 2011-Present, Grégory PLANCHAT
* All rights reserved.
@@ -27,11 +27,14 @@
* documentation for further information about customizing Wootook.
*
*/
+
/**
*
* Enter description here ...
* @author Greg
*
*/
-
-interface Legacies_Officers_Exception {}
\ No newline at end of file
+class Wootook_Core_Event
+ extends Wootook_Object
+{
+}
\ No newline at end of file
diff --git a/application/code/core/Wootook/Core/Event/Break.php b/src/application/code/core/Wootook/Core/Event/Break.php
similarity index 100%
rename from application/code/core/Wootook/Core/Event/Break.php
rename to src/application/code/core/Wootook/Core/Event/Break.php
diff --git a/src/application/code/core/Wootook/Core/Exception.php b/src/application/code/core/Wootook/Core/Exception.php
new file mode 100644
index 0000000..7a9030d
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Exception.php
@@ -0,0 +1,37 @@
+
+ * 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
+ *
+ */
+interface Wootook_Core_Exception extends Wootook_Exception {}
\ No newline at end of file
diff --git a/application/code/core/Wootook/Core/Exception/DataAccessException.php b/src/application/code/core/Wootook/Core/Exception/DataAccessException.php
similarity index 100%
rename from application/code/core/Wootook/Core/Exception/DataAccessException.php
rename to src/application/code/core/Wootook/Core/Exception/DataAccessException.php
diff --git a/src/application/code/core/Wootook/Core/Exception/Database/AdapterError.php b/src/application/code/core/Wootook/Core/Exception/Database/AdapterError.php
new file mode 100644
index 0000000..a399398
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Exception/Database/AdapterError.php
@@ -0,0 +1,20 @@
+_adapter = $adapter;
+ }
+
+ public function getAdapter()
+ {
+ return $this->_adapter;
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/Exception/Database/Error.php b/src/application/code/core/Wootook/Core/Exception/Database/Error.php
new file mode 100644
index 0000000..6d485fa
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Exception/Database/Error.php
@@ -0,0 +1,5 @@
+_statement = $statement;
+ }
+
+ public function getStatement()
+ {
+ return $this->_statement;
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/Exception/Deprecated.php b/src/application/code/core/Wootook/Core/Exception/Deprecated.php
new file mode 100644
index 0000000..75cbf77
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Exception/Deprecated.php
@@ -0,0 +1,7 @@
+= 50300) {
+ parent::__construct($message, $code, $previous);
+ } else {
+ parent::__construct($message, $code);
+ $this->_previous = $previous;
+ }
+ }
+
+ public function __call($method, $params)
+ {
+ if (strtolower($method) == 'getprevious') {
+ return $this->_previous;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/Exception/GameError.php b/src/application/code/core/Wootook/Core/Exception/GameError.php
new file mode 100644
index 0000000..ab228a8
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Exception/GameError.php
@@ -0,0 +1,7 @@
+= 50300) {
+ parent::__construct($message, $code, $previous);
+ } else {
+ parent::__construct($message, $code);
+ $this->_previous = $previous;
+ }
+ }
+
+ public function __call($method, $params)
+ {
+ if (strtolower($method) == 'getprevious') {
+ return $this->_previous;
+ }
+ }
+
+ public function __toString()
+ {
+ return <<
+ * 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 Wootook_Core_Form
+{
+ protected $_elements = array();
+
+ protected $_request = null;
+
+ /**
+ *
+ * Element class loader
+ * @var Wootook_Core_Form_ElementLoader
+ */
+ protected $_elementLoader = null;
+
+ /**
+ *
+ * Validator class loader
+ * @var Wootook_Core_Form_ValidatorLoader
+ */
+ protected $_validatorLoader = null;
+
+ /**
+ *
+ * Enter description here ...
+ * @var Wootook_Core_Model_Session
+ */
+ protected $_session = null;
+
+ public function __construct(Wootook_Core_Model_Session $session, Array $elements = array())
+ {
+ $this->_session = $session;
+
+ $this->_elementLoader = new Wootook_Core_Form_ElementLoader($this, array(
+ 'Wootook_Core_Form_Element_' => 'Wootook/Core/Form/Element'
+ ));
+
+ $this->_validatorLoader = new Wootook_Core_Form_ValidatorLoader($this, array(
+ 'Wootook_Core_Form_Validator_' => 'Wootook/Core/Form/Validator'
+ ));
+
+ $this->addElement('__formkey', 'text', array('form_key' => 'formKey'));
+
+ foreach ($elements as $elementName => $elementConfig) {
+ if (is_string($elementConfig)) {
+ $this->addElement($elementName, $elementConfig);
+ } else if ($elementConfig instanceof Wootook_Core_Form_ElementAbstract) {
+ $this->addElement($elementName, $elementConfig);
+ } else {
+ if (isset($elementConfig['validators'])) {
+ $this->addElement($elementName, $elementConfig['type'], $elementConfig['validators']);
+ } else {
+ $this->addElement($elementName, $elementConfig['type']);
+ }
+ }
+ }
+ }
+
+ public function validate()
+ {
+ foreach ($this->_elements as $element) {
+ if (!$element->validate()) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ *
+ * Enter description here ...
+ * @param string $name
+ * @param string|Wootook_Core_Form_ElementAbstract $type
+ * @return Wootook_Core_Form
+ */
+ public function addElement($name, $type = 'text', Array $validators = array())
+ {
+ if ($type instanceof Wootook_Core_Form_ElementAbstract) {
+ $this->_elements[$name] = $type;
+ $this->_elements[$name]->setForm($this);
+ } else {
+ $element = $this->_elementLoader->load($type);
+
+ if ($element === null) {
+ Wootook_Core_ErrorProfiler::getSingleton()
+ ->addException(new Wootook_Core_Exception_RuntimeException(sprintf('Element %1$s (type: %2$s) could not be created.', $name, $type)));
+ return $this;
+ }
+ $element->setForm($this);
+ $this->_elements[$name] = $element;
+ }
+ $this->_elements[$name]->setName($name);
+
+ foreach ($validators as $validatorName => $validatorType) {
+ if ($validatorType instanceof Wootook_Core_Form_ElementAbstract) {
+ $this->_elements[$name]->addValidator($validatorType, $validatorName);
+ } else {
+ $validator = $this->_validatorLoader->load($validatorType);
+
+ if ($validator === null) {
+ Wootook_Core_ErrorProfiler::getSingleton()
+ ->addException(new Wootook_Core_Exception_RuntimeException(sprintf('Validator %1$s (type: %2$s) could not be created.', $validatorName, $validatorType)));
+ return $this;
+ }
+ $this->_elements[$name]->addValidator($validator, $validatorName);
+ }
+ }
+
+ return $this;
+ }
+
+ /**
+ *
+ * Enter description here ...
+ * @param string $name
+ * @return Wootook_Core_Form_ElementAbstract
+ */
+ public function getElement($name)
+ {
+ if (!isset($this->_elements[$name])) {
+ return null;
+ }
+
+ return $this->_elements[$name];
+ }
+
+ /**
+ *
+ * Enter description here ...
+ * @param string $name
+ * @return Wootook_Core_Model_Session
+ */
+ public function getSession()
+ {
+ return $this->_session;
+ }
+
+ public function setRequest(Wootook_Core_Mvc_Controller_Request_Http $request)
+ {
+ $this->_request = $request;
+
+ return $this;
+ }
+
+ /**
+ *
+ * Enter description here ...
+ * @return Wootook_Core_Mvc_Controller_Request_Http
+ */
+ public function getRequest()
+ {
+ return $this->_request;
+ }
+
+ public function getData()
+ {
+ $request = $this->getRequest();
+ if ($request === null) {
+ return array();
+ }
+ if ($request->isPost()) {
+ return $request->getAllPostData();
+ }
+ return $request->getAllQueryData();
+ }
+
+ public function populate(Array $datas = array())
+ {
+ $request = $this->getRequest();
+
+ foreach ($this->_elements as $elementName => $element) {
+ if (isset($datas[$elementName])) {
+ $element->populate($datas[$elementName]);
+ } else if ($request->isPost()) {
+ $element->populate($request->getPost($elementName));
+ } else {
+ $element->populate($request->getQuery($elementName));
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/Form/Element/Button.php b/src/application/code/core/Wootook/Core/Form/Element/Button.php
new file mode 100644
index 0000000..4e17721
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Form/Element/Button.php
@@ -0,0 +1,11 @@
+setForm($form);
+ }
+
+ $this->setName($name);
+ $this->setAllParams($params);
+ }
+
+ abstract public function getType();
+
+ public function validate()
+ {
+ $data = $this->getData();
+
+ foreach ($this->_validators as $validator) {
+ if (!$validator->validate($this, $data)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public function setName($name)
+ {
+ $this->_name = $name;
+
+ return $this;
+ }
+
+ public function getName()
+ {
+ return $this->_name;
+ }
+
+ public function setAllParams($params)
+ {
+ $this->_params = $params;
+
+ return $this;
+ }
+
+ public function getAllParams()
+ {
+ return $this->_params;
+ }
+
+ public function setParam($param, $value)
+ {
+ $this->_params[$param] = $value;
+
+ return $this;
+ }
+
+ public function getParam($param)
+ {
+ return $this->_params[$param];
+ }
+
+ public function hasParam($param)
+ {
+ return isset($this->_params[$param]);
+ }
+
+ public function unsetParam($param)
+ {
+ unset($this->_params[$param]);
+
+ return $this;
+ }
+
+ public function setForm(Wootook_Core_Form $form)
+ {
+ $this->_form = $form;
+
+ return $this;
+ }
+
+ public function getForm()
+ {
+ return $this->_form;
+ }
+
+ public function getData()
+ {
+ return $this->_value;
+ }
+
+ public function populate($value)
+ {
+ $this->_value = $value;
+
+ return $this;
+ }
+
+ public function addValidator(Wootook_Core_Form_ValidatorAbstract $validator, $name = null)
+ {
+ if ($name === null) {
+ $this->_validators = array();
+ $name = 'default';
+ }
+
+ $this->_validators[$name] = $validator;
+
+ return $this;
+ }
+
+ public function getValidator($name)
+ {
+ if (!isset($this->_validators[$name])) {
+ return null;
+ }
+
+ return $this->_validators[$name];
+ }
+
+ public function clearValidator($name)
+ {
+ if (isset($this->_validators[$name])) {
+ unset($this->_validators[$name]);
+ }
+
+ return $this;
+ }
+
+ public function clearAllValidators()
+ {
+ $this->_validators = array();
+
+ return $this;
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/Form/ElementLoader.php b/src/application/code/core/Wootook/Core/Form/ElementLoader.php
new file mode 100644
index 0000000..019f082
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Form/ElementLoader.php
@@ -0,0 +1,37 @@
+_form = $form;
+
+ foreach ($namespaces as $namespace => $path) {
+ if (is_int($namespace)) {
+ $this->registerNamespace($path);
+ } else {
+ $this->registerNamespace($namespace, $path);
+ }
+ }
+ }
+
+ protected function _load($className, $useSingleton, Array $constructorParams = array())
+ {
+ $reflection = new ReflectionClass($className);
+ if ($useSingleton && $reflection->implementsInterface('Wootook_Core_Singleton')) {
+ $method = $reflection->getMethod('getSingleton');
+ return $method->invoke(null);
+ }
+
+ try {
+ return $reflection->newInstance($this->_form);
+ } catch (ReflectionException $e) {
+ Wootook_Core_ErrorProfiler::getSingleton()
+ ->addException($e);
+ return null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/Form/Validator/Alnum.php b/src/application/code/core/Wootook/Core/Form/Validator/Alnum.php
new file mode 100644
index 0000000..cdacc4f
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Form/Validator/Alnum.php
@@ -0,0 +1,21 @@
+_validate($element, $data)) {
+ $this->_getSession($element)
+ ->addError('Field "%s" should only contain alphanumeric characters.', $element->getName());
+
+ return false;
+ }
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/Form/Validator/Alpha.php b/src/application/code/core/Wootook/Core/Form/Validator/Alpha.php
new file mode 100644
index 0000000..fb091ce
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Form/Validator/Alpha.php
@@ -0,0 +1,21 @@
+_validate($element, $data)) {
+ $this->_getSession($element)
+ ->addError('Field "%s" should only contain alphabetic characters.', $element->getName());
+
+ return false;
+ }
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/Form/Validator/Email.php b/src/application/code/core/Wootook/Core/Form/Validator/Email.php
new file mode 100644
index 0000000..3ec8e21
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Form/Validator/Email.php
@@ -0,0 +1,21 @@
+_validate($element, $data)) {
+ $this->_getSession($element)
+ ->addError('Field "%s" should contain an email.', $element->getName());
+
+ return false;
+ }
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/Form/Validator/FormKey.php b/src/application/code/core/Wootook/Core/Form/Validator/FormKey.php
new file mode 100644
index 0000000..11f49d0
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Form/Validator/FormKey.php
@@ -0,0 +1,20 @@
+getForm();
+ $session = $form->getSession();
+
+ if ($session->getFormKey(false) == $data) {
+ return true;
+ }
+
+ $this->_getSession($field)
+ ->addError('CSRF token failure.', $field->getName());
+
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/Form/Validator/Hex.php b/src/application/code/core/Wootook/Core/Form/Validator/Hex.php
new file mode 100644
index 0000000..cbb2913
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Form/Validator/Hex.php
@@ -0,0 +1,22 @@
+_validate($element, $data)) {
+ $this->_getSession($element)
+ ->addError('Field "%s" should only contain numeric characters.', $element->getName());
+
+ return false;
+ }
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/Form/Validator/Host.php b/src/application/code/core/Wootook/Core/Form/Validator/Host.php
new file mode 100644
index 0000000..4d1f7f5
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Form/Validator/Host.php
@@ -0,0 +1,21 @@
+_validate($element, $data)) {
+ $this->_getSession($element)
+ ->addError('Field "%s" should contain a host name.', $element->getName());
+
+ return false;
+ }
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/Form/Validator/Numeric.php b/src/application/code/core/Wootook/Core/Form/Validator/Numeric.php
new file mode 100644
index 0000000..35f275d
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Form/Validator/Numeric.php
@@ -0,0 +1,22 @@
+_validate($element, $data)) {
+ $this->_getSession($element)
+ ->addError('Field "%s" should only contain numeric characters.', $element->getName());
+
+ return false;
+ }
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/Form/Validator/Regex.php b/src/application/code/core/Wootook/Core/Form/Validator/Regex.php
new file mode 100644
index 0000000..172a787
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Form/Validator/Regex.php
@@ -0,0 +1,28 @@
+_expression = $expression;
+ }
+
+ public function validate(Wootook_Core_Form_ElementAbstract $element, $data)
+ {
+ if (!$this->_validate($element, $data)) {
+ $this->_getSession($element)
+ ->addError('Field "%s" does not match the validation pattern.', $element->getName());
+
+ return false;
+ }
+ return true;
+ }
+
+ protected function _validate(Wootook_Core_Form_ElementAbstract $element, $data)
+ {
+ return preg_match($this->_expression, $data);
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/Form/ValidatorAbstract.php b/src/application/code/core/Wootook/Core/Form/ValidatorAbstract.php
new file mode 100644
index 0000000..d3f6da2
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Form/ValidatorAbstract.php
@@ -0,0 +1,15 @@
+getForm();
+ if (!$form instanceof Wootook_Core_Form) {
+ return null;
+ }
+ return $element->getSession();
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/Form/ValidatorLoader.php b/src/application/code/core/Wootook/Core/Form/ValidatorLoader.php
new file mode 100644
index 0000000..123bd64
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Form/ValidatorLoader.php
@@ -0,0 +1,37 @@
+_form = $form;
+
+ foreach ($namespaces as $namespace => $path) {
+ if (is_int($namespace)) {
+ $this->registerNamespace($path);
+ } else {
+ $this->registerNamespace($namespace, $path);
+ }
+ }
+ }
+
+ protected function _load($className, $useSingleton, Array $constructorParams = array())
+ {
+ $reflection = new ReflectionClass($className);
+ if ($useSingleton && $reflection->implementsInterface('Wootook_Core_Singleton')) {
+ $method = $reflection->getMethod('getSingleton');
+ return $method->invoke(null);
+ }
+
+ try {
+ return $reflection->newInstance();
+ } catch (ReflectionException $e) {
+ Wootook_Core_ErrorProfiler::getSingleton()
+ ->addException($e);
+ return null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/application/code/core/Wootook/Core/Model/Config/Abstract.php b/src/application/code/core/Wootook/Core/Helper/Config/ConfigHandler.php
similarity index 56%
rename from application/code/core/Wootook/Core/Model/Config/Abstract.php
rename to src/application/code/core/Wootook/Core/Helper/Config/ConfigHandler.php
index 05227d1..7421bad 100644
--- a/application/code/core/Wootook/Core/Model/Config/Abstract.php
+++ b/src/application/code/core/Wootook/Core/Helper/Config/ConfigHandler.php
@@ -1,17 +1,24 @@
'default',
+ 'episode' => 'default'
+ );
+ } else {
+ $config = $config->toArray();
+ }
+
+ $path = 'gamedata' . DIRECTORY_SEPARATOR . $config['universe'] . DIRECTORY_SEPARATOR
+ . $config['episode'] . DIRECTORY_SEPARATOR . $filename . '.php';
foreach (include APPLICATION_PATH . $path as $elementId => $fieldName) {
$this->setData($elementId, $fieldName);
@@ -49,4 +56,4 @@ abstract class Wootook_Core_Model_Config_Abstract
{
reset($this->_data);
}
-}
\ No newline at end of file
+}
diff --git a/application/code/core/Wootook/Core/Model/Config/Events.php b/src/application/code/core/Wootook/Core/Helper/Config/Events.php
similarity index 91%
rename from application/code/core/Wootook/Core/Model/Config/Events.php
rename to src/application/code/core/Wootook/Core/Helper/Config/Events.php
index 1ab794b..30b0528 100644
--- a/application/code/core/Wootook/Core/Model/Config/Events.php
+++ b/src/application/code/core/Wootook/Core/Helper/Config/Events.php
@@ -7,8 +7,8 @@
* @uses Wootook_Object
* @uses Legacies_Empire
*/
-class Wootook_Core_Model_Config_Events
- extends Wootook_Core_Model_Config_Abstract
+class Wootook_Core_Helper_Config_Events
+ extends Wootook_Core_Helper_Config_ConfigHandler
implements Wootook_Core_Singleton
{
private static $_singleton = null;
diff --git a/application/code/core/Wootook/Core/Model/Config/Modules.php b/src/application/code/core/Wootook/Core/Helper/Config/Modules.php
similarity index 88%
rename from application/code/core/Wootook/Core/Model/Config/Modules.php
rename to src/application/code/core/Wootook/Core/Helper/Config/Modules.php
index 8ad43f6..17d1a46 100644
--- a/application/code/core/Wootook/Core/Model/Config/Modules.php
+++ b/src/application/code/core/Wootook/Core/Helper/Config/Modules.php
@@ -7,8 +7,8 @@
* @uses Wootook_Object
* @uses Legacies_Empire
*/
-class Wootook_Core_Model_Config_Modules
- extends Wootook_Core_Model_Config_Abstract
+class Wootook_Core_Helper_Config_Modules
+ extends Wootook_Core_Helper_Config_ConfigHandler
implements Wootook_Core_Singleton
{
private static $_singleton = null;
diff --git a/src/application/code/core/Wootook/Core/Model/Config.php b/src/application/code/core/Wootook/Core/Model/Config.php
new file mode 100644
index 0000000..5607ddf
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Model/Config.php
@@ -0,0 +1,61 @@
+_tableName = 'core_config';
+ $this->_idFieldNames = array('config_path', 'website_id', 'game_id');
+ }
+
+ public function setWebsiteId($websiteId)
+ {
+ return $this->setData('website_id', $websiteId);
+ }
+
+ public function getWebsiteId()
+ {
+ return $this->getData('website_id');
+ }
+
+ public function setGameId($gameId)
+ {
+ return $this->setData('game_id', $gameId);
+ }
+
+ public function getGameId()
+ {
+ return $this->getData('game_id');
+ }
+
+ public function setPath($path)
+ {
+ return $this->setData('config_path', $path);
+ }
+
+ public function getPath()
+ {
+ return $this->getData('config_path');
+ }
+
+ public function setValue($value)
+ {
+ return $this->setData('config_value', $value);
+ }
+
+ public function getValue()
+ {
+ return $this->getData('config_value');
+ }
+}
diff --git a/src/application/code/core/Wootook/Core/Model/Game.php b/src/application/code/core/Wootook/Core/Model/Game.php
new file mode 100644
index 0000000..bc4c234
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Model/Game.php
@@ -0,0 +1,23 @@
+_tableName = 'core_game';
+ $this->_idFieldName = 'game_id';
+ }
+}
diff --git a/scripts/createbanner.php b/src/application/code/core/Wootook/Core/Model/Image/Png.php
similarity index 52%
rename from scripts/createbanner.php
rename to src/application/code/core/Wootook/Core/Model/Image/Png.php
index 80bf0d9..0b3f5f9 100644
--- a/scripts/createbanner.php
+++ b/src/application/code/core/Wootook/Core/Model/Image/Png.php
@@ -1,52 +1,4 @@
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.
- *
- */
-
-define('FONT_FILE', dirname(__FILE__) . '/resources/fonts/visitor/visitor.ttf');
-define('BACKGROUND_FILE', dirname(__FILE__) . '/resources/backgrounds/default.png');
-define('TIMEZONE', 'Europe/Paris');
-
-date_default_timezone_set(TIMEZONE);
-
-require_once dirname(dirname(__FILE__)) . '/db/mysql.php';
/**
*
@@ -54,7 +6,7 @@ require_once dirname(dirname(__FILE__)) . '/db/mysql.php';
* @author Greg
*
*/
-class Legacies_Block_Image_Png
+class Wootook_Core_Model_Image_Png
{
private $_format = NULL;
private $_mime = NULL;
@@ -239,69 +191,4 @@ class Legacies_Block_Image_Png
return $imageData;
}
-}
-
-if (isset($_GET['id'])) {
- $id = (int) $_GET['id'];
-} else {
- header('HTTP/1.1 412 Precondition Failed');
- die();
-}
-
-$textColor = array(
- Legacies_Block_Image_Png::COLOR_RED => 0xEF,
- Legacies_Block_Image_Png::COLOR_GREEN => 0xEF,
- Legacies_Block_Image_Png::COLOR_BLUE => 0xEF
- );
-
-$sql = << 'Wootook:Legacies',
- 'date' => date('d M Y')
- ),
- doquery($sql, '', true)
- );
-
-function number_format_custom($number)
-{
- return number_format($number, 0, ',', '.');
-}
-
-$image = new Legacies_Block_Image_Png();
-$image
- ->setBackground(BACKGROUND_FILE)
- ->addText($data['game_name'], 24, FONT_FILE, 5, 37, 0, $textColor)
- ->addText($data['username'], 24, FONT_FILE, 250, 37, 0, $textColor)
-
- ->addText('Batiments:',
- 14, FONT_FILE, 5, 50, 0, $textColor)
- ->addText(number_format_custom($data['build_points']), 14, FONT_FILE, 100, 50, 0, $textColor)
- ->addText('Flottes:', 14, FONT_FILE, 5, 70, 0, $textColor)
- ->addText(number_format_custom($data['fleet_points']), 14, FONT_FILE, 100, 70, 0, $textColor)
-
- ->addText('Technologies:', 14, FONT_FILE, 205, 50, 0, $textColor)
- ->addText(number_format_custom($data['tech_points']), 14, FONT_FILE, 320, 50, 0, $textColor)
- ->addText('Total:', 14, FONT_FILE, 205, 70, 0, $textColor)
- ->addText(number_format_custom($data['total_points']), 14, FONT_FILE, 320, 70, 0, $textColor)
-;
-
-foreach ($image->getHeaders() as $headerName => $headerValue) {
- header(sprintf('%s: %s', $headerName, $headerValue));
-}
-
-echo $image->render();
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/Model/Layout.php b/src/application/code/core/Wootook/Core/Model/Layout.php
new file mode 100644
index 0000000..d15057f
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Model/Layout.php
@@ -0,0 +1,632 @@
+
+ * 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.
+ *
+ */
+
+/**
+ * Page layout class utility.
+ * Builds page structures from flexible layout declaration files, written in a
+ * user-friendly XML format.
+ *
+ * @author Greg
+ * @since 1.5.0
+ * @package Wootook
+ * @subpackage Wootook_Core
+ * @category layout
+ */
+class Wootook_Core_Model_Layout
+ extends Wootook_Core_Mvc_Model_Model
+{
+ const DEFAULT_PACKAGE = 'base';
+ const DEFAULT_THEME = 'default';
+
+ const DOMAIN_FRONTEND = 'frontend';
+ const DOMAIN_BACKEND = 'backend';
+
+ /** @var array */
+ protected $_blocks = array();
+
+ /** @var Wootook_Core_Mvc_View_View */
+ protected $_messageBlock = null;
+
+ /** @var Wootook_Core_Mvc_View_View */
+ protected $_rootView = null;
+
+ /** @var string */
+ protected $_eventPrefix = 'layout';
+
+ /** @var string */
+ protected $_eventObject = 'layout';
+
+ /** @var string */
+ protected $_domain = self::DOMAIN_FRONTEND;
+
+ /** @var string */
+ protected $_package = self::DEFAULT_PACKAGE;
+
+ /** @var string */
+ protected $_theme = self::DEFAULT_THEME;
+
+ /** @var array */
+ protected $_namespaces = array(
+ 'core' => array(
+ 'Wootook_Core_Block_' => 'Wootook/Core/Block'
+ )
+ );
+
+ /**
+ * Page layout class utility.
+ *
+ * @param string $domain
+ * @param string $package
+ * @param string $theme
+ * @param array $data
+ */
+ public function __construct($domain = null, $package = null, $theme = null, Array $data = array())
+ {
+ if ($domain === null) {
+ if (Wootook::getDefaultWebsite()->getId() == 0) {
+ $this->_domain = self::DOMAIN_BACKEND;
+ } else {
+ $this->_domain = self::DOMAIN_FRONTEND;
+ }
+ } else {
+ $this->_domain = $domain;
+ }
+ if ($package !== null) {
+ $this->setPackage($package);
+ }
+ if ($theme !== null) {
+ $this->setTheme($theme);
+ }
+
+ parent::__construct($data);
+ }
+
+ public function _init()
+ {
+ $modules = Wootook_Core_Helper_Config_Modules::getSingleton();
+
+ foreach ($modules['block'] as $module => $moduleNamespaces) {
+ foreach ($moduleNamespaces as $namespace => $path) {
+ $this->registerBlockNamespace($module, $namespace, $path);
+ }
+ }
+
+ $fileList = Wootook::getGameConfig('layout');
+ if ($fileList instanceof Wootook_Core_Config_Node) {
+ $fileList = $fileList->toArray();
+ }
+ if (!is_array($fileList) || empty($fileList)) {
+ $fileList = array();
+ }
+ $this->_data = array();
+
+ $this->setPackage(Wootook::getWebsiteConfig('package'));
+ $this->setTheme(Wootook::getGameConfig('theme'));
+
+ $parser = new Wootook_Core_Model_Layout_Parser();
+ foreach ($fileList as $layoutFile) {
+ try {
+ if (preg_match('#\.php$#', $layoutFile)) {
+ $layoutData = include $this->_getLayoutPath($layoutFile);
+ } else {
+ $layoutData = $parser->parse($this->_getLayoutPath($layoutFile), $this->_getLayoutCachePath($layoutFile), 3600);
+ }
+ } catch (Wootook_Core_Exception_LayoutException $e) {
+ Wootook_Core_ErrorProfiler::getSingleton()->addException($e);
+ continue;
+ }
+
+ if (!is_array($layoutData)) {
+ continue;
+ }
+
+ foreach ($layoutData as $layoutId => $layoutConfig) {
+ if ($this->hasData($layoutId)) {
+ $declared = $this->getData($layoutId);
+
+ if (isset($declared['block']) && !isset($layoutConfig['block'])) {
+ $layoutConfig['block'] = $declared['block'];
+ }
+
+ if (isset($declared['reference'])) {
+ if (isset($layoutConfig['reference'])) {
+ $layoutConfig['reference'] = array_merge($declared['reference'], $layoutConfig['reference']);
+ } else {
+ $layoutConfig['reference'] = $declared['reference'];
+ }
+ }
+ }
+
+ $this->setData($layoutId, $layoutConfig);
+ }
+ }
+
+ $this->_messageBlock = $this->createBlock('core/messages', 'messages');
+
+ return $this;
+ }
+
+ protected function _getAllParents(&$layoutConfigs, $currentHandle)
+ {
+ foreach ($currentHandle as $parent) {
+ $currentLayout = $this->getData($parent);
+ $layoutConfigs[] = $currentLayout;
+
+ if (!isset($currentLayout['update'])) {
+ continue;
+ }
+ $this->_getAllParents($layoutConfigs, $currentLayout['update']);
+ }
+ }
+
+ protected function _load()
+ {
+ $layoutId = func_get_arg(0);
+
+ if (!$this->hasData($layoutId)) {
+ return $this;
+ }
+
+ $layoutConfigs = array($this->getData($layoutId));
+ if (isset($layoutConfigs[0]['update'])) {
+ $this->_getAllParents($layoutConfigs, $layoutConfigs[0]['update']);
+ }
+
+ $layoutUpdates = array();
+ $layoutConfig = array();
+ foreach (array_reverse($layoutConfigs) as $config) {
+ if (!is_array($config)) {
+ continue;
+ }
+ $layoutConfig = array_merge($layoutConfig, $config);
+
+ if (isset($layoutConfig['reference'])) {
+ foreach ($layoutConfig['reference'] as $name => $update) {
+ if (!isset($layoutUpdates[$name])) {
+ $layoutUpdates[$name] = array();
+ }
+ $layoutUpdates[$name][] = $update;
+ }
+ unset($layoutConfig['reference']);
+ }
+ }
+ unset($layoutConfigs, $layoutConfig['update']);
+
+ if (isset($layoutConfig['type'])) {
+ $type = $layoutConfig['type'];
+ $name = isset($layoutConfig['name']) ? $layoutConfig['name'] : 'root';
+
+ $this->_rootView = $this->_createBlock($type, $name, $layoutConfig);
+ } else if (!isset($this->_rootView)) {
+ return $this;
+ }
+
+ foreach ($layoutUpdates as $block => $updates) {
+ if (!isset($this->_blocks[$block])) {
+ continue;
+ }
+
+ $parent = $this->_blocks[$block];
+ foreach ($updates as $update) {
+ if (isset($update['children'])) {
+ foreach ($update['children'] as $childName => $childConfig) {
+ $type = $childConfig['type'];
+ $alias = isset($childConfig['alias']) ? $childConfig['alias'] : $childName;
+
+ $parent->$alias = $this->_createBlock($type, $childName, $childConfig);
+ }
+ }
+ }
+ }
+
+ foreach ($layoutUpdates as $block => $updates) {
+ if (!isset($this->_blocks[$block])) {
+ continue;
+ }
+
+ foreach ($updates as $update) {
+ if (isset($update['actions'])) {
+ $this->_callActions($this->_blocks[$block], $update['actions']);
+ }
+ }
+ }
+
+ Wootook::dispatchEvent($this->_eventPrefix . '.prepare.before', array(
+ $this->_eventObject => $this
+ ));
+
+ foreach ($this->_blocks as $block) {
+ $block->prepareLayout();
+ }
+
+ Wootook::dispatchEvent($this->_eventPrefix . '.prepare.after', array(
+ $this->_eventObject => $this
+ ));
+ }
+
+ protected function _save()
+ {
+ throw new Wootook_Core_Exception_LayoutException('Save not permitted for the layout manager.');
+ }
+
+ protected function _delete()
+ {
+ throw new Wootook_Core_Exception_LayoutException('Delete not permitted for the layout manager.');
+ }
+
+ protected function _resolveBlockClassType($type)
+ {
+ $offset = strpos($type, '/');
+ if ($offset === false) {
+ return null;
+ }
+
+ $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)));
+
+ 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::getSingleton()->sleep();
+ if (!($fp = @fopen($fileName, 'r', true))) {
+ Wootook_Core_ErrorProfiler::getSingleton()->wakeup();
+ continue;
+ }
+ Wootook_Core_ErrorProfiler::getSingleton()->wakeup();
+ fclose($fp);
+
+ if (!class_exists($className, true)) {
+ continue;
+ }
+
+ return $className;
+ }
+ }
+
+ Wootook_Core_ErrorProfiler::getSingleton()
+ ->addException(new Wootook_Core_Exception_LayoutException(sprintf('Class type "%s" could not be resolved.', $type)));
+ return null;
+ }
+
+ /**
+ * Register a new block namespage for use in the layout declaration files
+ *
+ * @since 1.5.0
+ * @param string $module
+ * @param string $namespace
+ * @param string|null $path
+ * @return Wootook_Core_Model_Layout
+ */
+ 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;
+ }
+
+ /**
+ * Unregister a previously declared block namespace
+ *
+ * @since 1.5.0
+ * @param string $module
+ * @param string $namespace
+ * @return Wootook_Core_Model_Layout
+ */
+ public function unregisterBlockNamespace($module, $namespace)
+ {
+ if (isset($this->_namespaces[$module]) && isset($this->_namespaces[$module][$namespace])) {
+ unset($this->_namespaces[$module][$namespace]);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Create a new block instance
+ *
+ * @param string $type
+ * @param string $name
+ * @param array $config
+ * @return Wootook_Core_Mvc_View_View
+ */
+ public function createBlock($type, $name, $config = array())
+ {
+ $instance = $this->_createBlock($type, $name, $config);
+
+ if ($instance === null) {
+ return null;
+ }
+ $instance->prepareLayout();
+
+ return $instance;
+ }
+
+ protected function _createBlock($type, $name, $config = array())
+ {
+ $className = $this->_resolveBlockClassType($type);
+
+ if ($className === null) {
+ return null;
+ }
+
+ $children = array();
+ if (isset($config['children'])) {
+ $children = $config['children'];
+ unset($config['children']);
+ }
+ $actions = array();
+ if (isset($config['actions'])) {
+ $actions = $config['actions'];
+ unset($config['actions']);
+ }
+
+ try {
+ $reflectionClass = new ReflectionClass($className);
+
+ $instance = $reflectionClass->newInstance($config);
+ $this->_blocks[$name] = $instance;
+ $instance->setNameInLayout($name);
+
+ $instance->setLayout($this);
+
+ foreach ($children as $name => $config) {
+ if (isset($config['alias'])) {
+ $alias = $config['alias'];
+ } else {
+ $alias = $name;
+ }
+
+ if (!isset($config['type'])) {
+ $instance->$alias = new Wootook_Core_Mvc_View_View($config);
+ } else {
+ $child = $this->_createBlock($config['type'], $name, $config);
+ if ($child !== null) {
+ $instance->$alias = $child;
+ }
+ }
+ }
+ } catch (ReflectionException $e) {
+ Wootook_Core_ErrorProfiler::getSingleton()
+ ->addException($e);
+ return null;
+ }
+
+ $this->_callActions($instance, $actions);
+
+ return $instance;
+ }
+
+ protected function _callActions($block, $actions)
+ {
+ $reflectionClass = new ReflectionClass($block);
+
+ foreach ($actions as $action) {
+ if (!isset($action['method'])) {
+ continue;
+ }
+ $method = $action['method'];
+
+ $params = array();
+ if (isset($action['params'])) {
+ $params = $action['params'];
+ }
+
+ try {
+ $reflectionMethod = $reflectionClass->getMethod($method);
+ $requiredParameterCount = $reflectionMethod->getNumberOfRequiredParameters();
+ $callParamaters = array();
+ foreach ($reflectionMethod->getParameters() as $parameter) {
+ $paramterName = strtolower(preg_replace('#([A-Z])#', '-\\1', $parameter->getName()));
+ $paramterPosition = $parameter->getPosition();
+
+ if (isset($params[$paramterName])) {
+ $callParamaters[$paramterPosition] = $params[$paramterName];
+ } else if ($parameter->isDefaultValueAvailable()) {
+ $callParamaters[$paramterPosition] = $parameter->getDefaultValue();
+ //} else if (!$parameter->isOptionnal()) {
+ } else if ($paramterPosition <= $requiredParameterCount) {
+ throw new Wootook_Core_Exception_LayoutException(Wootook::__('Method %s requires parameter %d ($%s) to be defined.',
+ $reflectionMethod->getName(), $paramterPosition + 1, $paramterName));
+ }
+ }
+
+ $reflectionMethod->invokeArgs($block, $callParamaters);
+ } catch (ReflectionException $e) {
+ Wootook_Core_ErrorProfiler::getSingleton()
+ ->addException($e);
+ continue;
+ } catch (RuntimeException $e) {
+ Wootook_Core_ErrorProfiler::getSingleton()
+ ->addException($e);
+ continue;
+ }
+ }
+ }
+
+ /**
+ * Get the current Layout domain (frontend or backend)
+ *
+ * @since 1.5.0
+ * @return string
+ */
+ public function getDomain()
+ {
+ return $this->_domain;
+ }
+
+ /**
+ * Set the current Layout domain (frontend or backend)
+ *
+ * @since 1.5.0
+ * @param string $domain
+ * @return Wootook_Core_Model_Layout
+ */
+ public function setDomain($domain)
+ {
+ $this->_domain = $domain;
+ $this->_init();
+
+ return $this;
+ }
+
+ public function getPackage()
+ {
+ if ($this->_package === null) {
+ $this->_package = self::DEFAULT_PACKAGE;
+ }
+ return $this->_package;
+ }
+
+ public function setPackage($package)
+ {
+ $this->_package = $package;
+
+ return $this;
+ }
+
+ public function getTheme()
+ {
+ if ($this->_theme === null) {
+ $this->_theme = self::DEFAULT_THEME;
+ }
+ return $this->_theme;
+ }
+
+ public function setTheme($theme)
+ {
+ $this->_theme = $theme;
+
+ return $this;
+ }
+
+ public function getScriptPath()
+ {
+ return Wootook::getBasePath('design') . DIRECTORY_SEPARATOR . $this->getDomain();
+ }
+
+ public function getAllBlocks()
+ {
+ return $this->_blocks;
+ }
+
+ public function getBlock($code)
+ {
+ if (isset($this->_blocks[$code])) {
+ return $this->_blocks[$code];
+ }
+ return null;
+ }
+
+ public function render()
+ {
+ if (!$this->_rootView instanceof Wootook_Core_Mvc_View_View) {
+ throw new Wootook_Core_Exception_LayoutException(Wootook::__('No root view declared.'));
+ }
+
+ $scriptPath = $this->getScriptPath();
+ foreach ($this->_blocks as $block) {
+ if ($block instanceof Wootook_Core_Block_Template) {
+ $block->setScriptPath($scriptPath);
+ }
+ $block->beforeToHtml();
+ }
+ unset($block);
+
+ return $this->_rootView->render();
+ }
+
+ protected function _getLayoutCachePath($file)
+ {
+ $package = $this->getPackage();
+ $theme = $this->getTheme();
+ $pattern = APPLICATION_PATH . "cache/" . __CLASS__ . "--{$this->getDomain()}-%s-%s-{$file}.cache";
+
+ if (empty($package)) {
+ $package = self::DEFAULT_PACKAGE;
+ }
+ if (empty($theme)) {
+ $theme = self::DEFAULT_THEME;
+ }
+
+ return sprintf($pattern, $package, $theme);
+ }
+
+ protected function _getLayoutPath($file)
+ {
+ $package = $this->getPackage();
+ $theme = $this->getTheme();
+ $pattern = "{$this->getScriptPath()}/%s/%s/layouts/{$file}";
+
+ if ($package !== null && $theme !== null) {
+ $path = sprintf($pattern, $package, $theme);
+ if (Wootook::fileExists($path)) {
+ return $path;
+ }
+ }
+
+ if ($package !== null) {
+ $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;
+ }
+
+ throw new Wootook_Core_Exception_LayoutException(sprintf("Layout file '%s' does not exist.", $file));
+ }
+
+ /**
+ *
+ * @return Wootook_Core_Block_Messages
+ */
+ public function getMessagesBlock()
+ {
+ return $this->_messageBlock;
+ }
+}
diff --git a/src/application/code/core/Wootook/Core/Model/Layout/Parser.php b/src/application/code/core/Wootook/Core/Model/Layout/Parser.php
new file mode 100644
index 0000000..1e07ae8
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Model/Layout/Parser.php
@@ -0,0 +1,165 @@
+ 0 && (time() - filemtime($cachePath) <= $cacheLifetime)) {
+ return include $cachePath;
+ }
+
+ $parsedData = $this->_parse($filename);
+
+ if ($cachePath !== null) {
+ $parsedData->save($cachePath);
+ }
+
+ return $parsedData->toArray();
+ }
+
+ protected function _parse($filename)
+ {
+ $layout = simplexml_load_file($filename);
+
+ if ($layout->getName() !== 'layout') {
+ return array();
+ }
+
+ $result = new Wootook_Core_Config_Adapter_Array();
+ foreach ($layout->handle as $handle) {
+ $name = (string) $handle['name'];
+ if (empty($name)) {
+ continue;
+ }
+
+ $handleNode = new Wootook_Core_Config_Node(array(), $result);
+ $result->$name = $handleNode;
+
+ if (isset($handle->update)) {
+ $updateListNode = new Wootook_Core_Config_Node(array(), $handleNode);
+ $handleNode->update = $updateListNode;
+
+ foreach ($handle->update as $update) {
+ if (isset($update['name'])) {
+ $updateListNode->__set(uniqid(), (string) $update['name']);
+ }
+ }
+ }
+
+ if (isset($handle->block)) {
+ $this->_parseBlock($handle->block[0], $handleNode);
+ }
+
+ if (isset($handle->reference)) {
+ $referenceListNode = new Wootook_Core_Config_Node(array(), $handleNode);
+ $handleNode->reference = $referenceListNode;
+
+ foreach ($handle->reference as $reference) {
+ $referenceName = (string) $reference['name'];
+ if (empty($referenceName)) {
+ continue;
+ }
+
+ $referenceNode = new Wootook_Core_Config_Node(array(), $referenceListNode);
+ $referenceListNode->$referenceName = $referenceNode;
+
+ $this->_parseBlockBody($reference, $referenceNode);
+ }
+ }
+ }
+
+ return $result;
+ }
+
+ protected function _parseBlock(SimpleXMLElement $handle, Wootook_Core_Config_Node $blockNode)
+ {
+ foreach ($handle->attributes() as $attributeName => $attributeValue) {
+ $blockNode->$attributeName = (string) $attributeValue;
+ }
+
+ $this->_parseBlockBody($handle, $blockNode);
+ }
+
+ protected function _parseBlockBody(SimpleXMLElement $handle, Wootook_Core_Config_Node $blockNode)
+ {
+ if (isset($handle->block)) {
+ $childrenNode = new Wootook_Core_Config_Node(array(), $blockNode);
+ $blockNode->children = $childrenNode;
+
+ foreach ($handle->block as $block) {
+ $blockName = (string) $block['name'];
+ if (empty($blockName)) {
+ continue;
+ }
+
+ $childNode = new Wootook_Core_Config_Node(array(), $childrenNode);
+ $childrenNode->$blockName = $childNode;
+
+ $this->_parseBlock($block, $childNode);
+ }
+ }
+
+ if (isset($handle->action)) {
+ $actionListNode = new Wootook_Core_Config_Node(array(), $blockNode);
+ $blockNode->actions = $actionListNode;
+
+ foreach ($handle->action as $action) {
+ $methodName = (string) $action['method'];
+ if (empty($methodName)) {
+ continue;
+ }
+
+ $actionNode = new Wootook_Core_Config_Node(array(
+ 'method' => $methodName,
+ 'params' => array()
+ ), $actionListNode);
+
+ $actionListNode[] = $actionNode;
+
+ if (isset($action->param)) {
+ $paramsNode = $actionNode->params;
+
+ foreach ($action->param as $param) {
+ $paramName = (string) $param['name'];
+ if (empty($paramName)) {
+ continue;
+ }
+
+ if (count($param)) {
+ if (isset($param->const) && isset($param->const['name']) && defined((string) $param->const['name'])) {
+ $paramsNode->$paramName = constant((string) $param->const['name']);
+ } else {
+ $paramArrayNode = new Wootook_Core_Config_Node(array(), $paramsNode);
+ $paramsNode->$paramName = $paramArrayNode;
+
+ $this->_parseArrayParam($param, $paramArrayNode);
+ }
+ } else {
+ $paramsNode->$paramName = (string) $param;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ protected function _parseArrayParam(SimpleXMLElement $element, Wootook_Core_Config_Node $parentNode)
+ {
+ foreach ($element->children() as $child) {
+ if (count($child)) {
+ $childNode = new Wootook_Core_Config_Node(array(), $parentNode);
+ $parentNode->{$child->getName()} = $childNode;
+
+ $this->_parseArrayParam($child, $childNode);
+ continue;
+ }
+
+ $parentNode->{$child->getName()} = (string) $child;
+ }
+ }
+}
diff --git a/src/application/code/core/Wootook/Core/Model/Session.php b/src/application/code/core/Wootook/Core/Model/Session.php
new file mode 100644
index 0000000..2306f03
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Model/Session.php
@@ -0,0 +1,226 @@
+ 'CRIT',
+ self::ERR => 'ERR',
+ self::WARN => 'WARN',
+ self::INFO => 'INFO',
+ self::DEBUG => 'DEBUG',
+ self::SUCCESS => 'SUCCESS'
+ );
+
+ protected $_messages = array();
+
+ const COOKIE_LIFETIME_CONFIG_KEY = 'web/session/time';
+ const COOKIE_DOMAIN_CONFIG_KEY = 'web/session/domain';
+ const COOKIE_PATH_CONFIG_KEY = 'web/session/path';
+
+ const IDENTIFIER_MESSAGES = 'messages';
+ const IDENTIFIER_DATA = 'data';
+
+ public static function factory($namespace)
+ {
+ $namespace = (string) $namespace;
+ if (!isset(self::$_instances[$namespace])) {
+ self::$_instances[$namespace] = new self($namespace);
+ }
+ return self::$_instances[$namespace];
+ }
+
+ public static function destroy()
+ {
+ session_destroy();
+ }
+
+ public function __construct($namespace)
+ {
+ if (session_id() == '') {
+ session_set_cookie_params($this->getCookieLifetime(), $this->getCookiePath(), $this->getCookieDomain(), false, true);
+
+ session_cache_limiter('private_no_expire');
+ session_cache_expire(15);
+
+ session_start();
+ session_regenerate_id(true);
+ }
+
+ if (!isset($_SESSION[$namespace])) {
+ $_SESSION[$namespace] = array(
+ self::IDENTIFIER_MESSAGES => array(),
+ self::IDENTIFIER_DATA => array()
+ );
+ }
+
+ if (!isset($_SESSION[$namespace][self::IDENTIFIER_MESSAGES]) || !is_array($_SESSION[$namespace][self::IDENTIFIER_MESSAGES])) {
+ $_SESSION[$namespace][self::IDENTIFIER_MESSAGES] = array();
+ }
+
+ $this->_data = &$_SESSION[$namespace][self::IDENTIFIER_DATA];
+ $this->_messages = &$_SESSION[$namespace][self::IDENTIFIER_MESSAGES];
+ }
+
+ public function getCookieLifetime()
+ {
+ $lifetime = Wootook::getWebsiteConfig(self::COOKIE_LIFETIME_CONFIG_KEY);
+ if (!is_numeric($lifetime) || $lifetime <= 0) {
+ return 900;
+ }
+
+ return $lifetime;
+ }
+
+ public function getCookieDomain()
+ {
+ $domain = Wootook::getWebsiteConfig(self::COOKIE_DOMAIN_CONFIG_KEY);
+ if ($domain === null) {
+ return $_SERVER['SERVER_NAME'];
+ }
+ return $domain;
+ }
+
+ public function getCookiePath()
+ {
+ $path = Wootook::getWebsiteConfig(self::COOKIE_PATH_CONFIG_KEY);
+ if ($path === null) {
+ return '/';
+ }
+ return $path;
+ }
+
+ public function getMessages($clear = true)
+ {
+ $messages = $this->_messages;
+ if ($clear == true) {
+ $this->_messages = array();
+ }
+ return $messages;
+ }
+
+ public function addMessage($message, $type = self::DEBUG)
+ {
+ if (!isset(self::$_levels[$type])) {
+ $type = self::DEBUG;
+ }
+
+ if (!isset($this->_messages)) {
+ $this->_messages = array();
+ }
+ if (!isset($this->_messages[self::$_levels[$type]])) {
+ $this->_messages[self::$_levels[$type]] = array();
+ }
+ $this->_messages[self::$_levels[$type]][] = $message;
+
+ return $this;
+ }
+
+ public function addCritical($message, $_ = null)
+ {
+ $args = func_get_args();
+ array_shift($args);
+
+ return $this->addMessage(vsprintf($message, $args), self::CRIT);
+ }
+
+ public function addError($message, $_ = null)
+ {
+ $args = func_get_args();
+ array_shift($args);
+
+ return $this->addMessage(vsprintf($message, $args), self::ERR);
+ }
+
+ public function addWarning($message, $_ = null)
+ {
+ $args = func_get_args();
+ array_shift($args);
+
+ return $this->addMessage(vsprintf($message, $args), self::WARN);
+ }
+
+ public function addSuccess($message, $_ = null)
+ {
+ $args = func_get_args();
+ array_shift($args);
+
+ return $this->addMessage(vsprintf($message, $args), self::SUCCESS);
+ }
+
+ public function addInfo($message, $_ = null)
+ {
+ $args = func_get_args();
+ array_shift($args);
+
+ return $this->addMessage(vsprintf($message, $args), self::INFO);
+ }
+
+ public function addDebug($message, $_ = null)
+ {
+ $args = func_get_args();
+ array_shift($args);
+
+ return $this->addMessage(vsprintf($message, $args), self::DEBUG);
+ }
+
+ public function initFormKey()
+ {
+ $key = $this->getData('form_key');
+ $this->setData('form_key', uniqid());
+
+ return $key;
+ }
+
+ public function getFormKey($reset = true)
+ {
+ if (!$this->getData('form_key')) {
+ $this->initFormKey();
+ return $this->getData('form_key');
+ }
+
+ if ($reset === true) {
+ $this->initFormKey();
+ }
+
+ return $this->getData('form_key');
+ }
+
+ public function setFormData(Array $data = array())
+ {
+ if (isset($data['__formkey'])) {
+ unset($data['__formkey']);
+ }
+
+ $this->setData('form_data', $data);
+
+ return $this;
+ }
+
+ public function getFormData($key = null, $default = null)
+ {
+ $data = $this->getData('form_data');
+ if ($key === null) {
+ return $data;
+ } else if (isset($data[$key])) {
+ return $data[$key];
+ }
+ return $default;
+ }
+}
diff --git a/application/code/core/Wootook/Core/Model/Translator.php b/src/application/code/core/Wootook/Core/Model/Translator.php
similarity index 100%
rename from application/code/core/Wootook/Core/Model/Translator.php
rename to src/application/code/core/Wootook/Core/Model/Translator.php
diff --git a/src/application/code/core/Wootook/Core/Model/Website.php b/src/application/code/core/Wootook/Core/Model/Website.php
new file mode 100644
index 0000000..018edac
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Model/Website.php
@@ -0,0 +1,23 @@
+_tableName = 'core_website';
+ $this->_idFieldName = 'website_id';
+ }
+}
diff --git a/src/application/code/core/Wootook/Core/Mvc/Controller/Action.php b/src/application/code/core/Wootook/Core/Mvc/Controller/Action.php
new file mode 100644
index 0000000..e6230ba
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Mvc/Controller/Action.php
@@ -0,0 +1,164 @@
+setRequest($request);
+ $this->setResponse($response);
+ }
+
+ public function init()
+ {
+ }
+
+ public function preDispatch()
+ {
+ }
+
+ public function postDispatch()
+ {
+ }
+
+ public function setRequest(Wootook_Core_Mvc_Controller_Request_Http $request)
+ {
+ $this->_request = $request;
+
+ return $this;
+ }
+
+ public function setResponse(Wootook_Core_Mvc_Controller_Response_Http $response)
+ {
+ $this->_response = $response;
+
+ return $this;
+ }
+
+ /**
+ *
+ * @return Wootook_Core_Mvc_Controller_Request_Http
+ */
+ public function getRequest()
+ {
+ return $this->_request;
+ }
+
+ /**
+ *
+ * @return Wootook_Core_Mvc_Controller_Response_Http
+ */
+ public function getResponse()
+ {
+ return $this->_response;
+ }
+
+ protected function _forward($action, $controller = null, $module = null)
+ {
+ $request = $this->getRequest();
+
+ $request->setActionName($action);
+ if ($controller !== null) {
+ $request->setControllerName($controller);
+ if ($module != null) {
+ $request->setModuleName($module);
+ }
+ }
+ $this->getResponse()->setIsDispatched(false);
+ }
+
+ protected function _redirect($uri, Array $params = array(), $code = Wootook_Core_Mvc_Controller_Response_Http::REDIRECT_FOUND)
+ {
+ $parts = explode('/', $uri);
+ $partsCount = count($parts);
+ if ($partsCount > 0 && $parts[0] == '*') {
+ $parts[0] = $this->getRequest()->getModuleName();
+ if ($partsCount > 1 && $parts[1] == '*') {
+ $parts[1] = $this->getRequest()->getControllerName();
+ if ($partsCount > 2 && $parts[2] == '*') {
+ $parts[2] = $this->getRequest()->getActionName();
+ }
+ }
+ }
+ $uri = implode('/', array_slice($parts, 0, 3));
+
+ $this->getResponse()
+ ->setRedirect(Wootook::getUrl($uri, $params), $code);
+
+ Wootook_Core_ErrorProfiler::unregister(true);
+
+ return $this;
+ }
+
+ protected function _redirectUrl($url, $code = Wootook_Core_Mvc_Controller_Response_Http::REDIRECT_FOUND)
+ {
+ $this->getResponse()->setRedirect($url, $code);
+
+ return $this;
+ }
+
+ protected function _buildLayoutHandle()
+ {
+ $request = $this->getRequest();
+
+ $module = $request->getModuleName();
+ $controller = $request->getControllerName();
+ $action = $request->getActionName();
+
+ return "{$module}.{$controller}.{$action}";
+ }
+
+ public function loadLayout($handle = null)
+ {
+ if ($this->_layout === null) {
+ $this->_layout = $this->_initLayout();
+ }
+
+ if ($handle === null) {
+ $handle = $this->_buildLayoutHandle();
+ }
+ $this->_layout->load($handle);
+
+ return $this;
+ }
+
+ protected function _initLayout()
+ {
+ return new Wootook_Core_Model_Layout(Wootook_Core_Model_Layout::DOMAIN_FRONTEND);
+ }
+
+ /**
+ *
+ * @return Wootook_Core_Model_Layout
+ */
+ public function getLayout()
+ {
+ return $this->_layout;
+ }
+
+ public function renderLayout()
+ {
+ try {
+ $content = $this->getLayout()->render();
+ } catch (Wootook_Core_Exception_LayoutException $e) {
+ Wootook_Core_ErrorProfiler::getSingleton()->addException($e);
+ return $this;
+ }
+ $this->getResponse()->setBody($content);
+
+ return $this;
+ }
+
+ protected function _prepareLayoutMessages($namespace)
+ {
+ $this->getLayout()
+ ->getMessagesBlock()
+ ->prepareMessages($namespace);
+
+ return $this;
+ }
+}
diff --git a/src/application/code/core/Wootook/Core/Mvc/Controller/Front.php b/src/application/code/core/Wootook/Core/Mvc/Controller/Front.php
new file mode 100644
index 0000000..6c6b20f
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Mvc/Controller/Front.php
@@ -0,0 +1,271 @@
+ array(
+ 'modules' => array(
+ 'core' => array(
+ 'class' => 'Wootook_Core_Controller_',
+ 'path' => 'Wootook/Core/Controller'
+ )
+ ),
+ 'defaults' => array(
+ 'module' => 'core',
+ 'controller' => 'error',
+ 'action' => 'no-route'
+ )
+ ),
+ self::ROUTE_DEFAULT => array(
+ 'modules' => array(
+ ),
+ 'defaults' => array(
+ 'module' => 'core',
+ 'controller' => 'index',
+ 'action' => 'index'
+ )
+ )
+ );
+
+ protected $_request = null;
+ protected $_response = null;
+
+ public function __construct(Wootook_Core_Mvc_Controller_Request_Request $request,
+ Wootook_Core_Mvc_Controller_Response_Response $response)
+ {
+ $this->_request = $request;
+ $this->_response = $response;
+ }
+
+ protected function _setNoRouteAction(&$route, &$moduleKey, &$controllerKey, &$actionKey)
+ {
+ $route = self::ROUTE_ERROR;
+ $moduleKey = $this->_routes[self::ROUTE_ERROR]['defaults']['module'];
+ $controllerKey = $this->_routes[self::ROUTE_ERROR]['defaults']['controller'];
+ $actionKey = $this->_routes[self::ROUTE_ERROR]['defaults']['action'];
+
+ return $this;
+ }
+
+ protected function _setDefaultRouteAction(&$route, &$moduleKey, &$controllerKey, &$actionKey)
+ {
+ $route = self::ROUTE_DEFAULT;
+ $moduleKey = $this->_routes[self::ROUTE_DEFAULT]['defaults']['module'];
+ $controllerKey = $this->_routes[self::ROUTE_DEFAULT]['defaults']['controller'];
+ $actionKey = $this->_routes[self::ROUTE_DEFAULT]['defaults']['action'];
+
+ return $this;
+ }
+
+ protected function _camelizeClass($string)
+ {
+ $string = strtolower($string);
+ $string = str_replace(' ', '_', ucwords(str_replace('.', ' ', $string)));
+ return str_replace(' ', '', ucwords(str_replace('-', ' ', $string)));
+ }
+
+ protected function _camelizePath($string)
+ {
+ $string = strtolower($string);
+ $string = str_replace(' ', DIRECTORY_SEPARATOR, ucwords(str_replace('.', ' ', $string)));
+ return str_replace(' ', '', ucwords(str_replace('-', ' ', $string)));
+ }
+
+ protected function _camelizeMethod($string)
+ {
+ return lcfirst(str_replace(' ', '', ucwords(str_replace('-', ' ', $string))));
+ }
+
+ protected function _getControllerClass($route, $module, $controllerKey)
+ {
+ if (!isset($this->_routes[$route])) {
+ return null;
+ }
+ if (!isset($this->_routes[$route]['modules'][$module])) {
+ return null;
+ }
+ $modulePrefix = $this->_routes[$route]['modules'][$module]['class'];
+ return $modulePrefix . $this->_camelizeClass($controllerKey) . 'Controller';
+ }
+
+ protected function _getControllerFilename($route, $module, $controllerKey)
+ {
+ if (!isset($this->_routes[$route])) {
+ return null;
+ }
+ if (!isset($this->_routes[$route]['modules'][$module])) {
+ return null;
+ }
+ $modulePath = $this->_routes[$route]['modules'][$module]['path'];
+
+ return $modulePath . DIRECTORY_SEPARATOR . $this->_camelizePath($controllerKey) . 'Controller.php';
+ }
+
+ protected function _getActionMethod($actionKey)
+ {
+ return $this->_camelizeMethod($actionKey) . 'Action';
+ }
+
+ protected function _forward($action, $controller = null, $module = null)
+ {
+ $this->_request->setActionName($action);
+ if ($controller !== null) {
+ $this->_request->setControllerName($controller);
+ if ($module != null) {
+ $this->_request->setModuleName($module);
+ }
+ }
+ $this->_response->setIsDispatched(false);
+ }
+
+ public function dispatch($route = null)
+ {
+ if ($route == null) {
+ $route = self::ROUTE_DEFAULT;
+ }
+
+ if (!isset($this->_routes[$route])) {
+ $route = self::ROUTE_DEFAULT;
+ }
+
+ $loop = 0;
+ while ($loop++ < 100) {
+ $moduleKey = $this->_request->getModuleName();
+ if (empty($moduleKey)) {
+ $this->_forward(
+ $this->_routes[$route]['defaults']['action'],
+ $this->_routes[$route]['defaults']['controller'],
+ $this->_routes[$route]['defaults']['module']
+ );
+ continue;
+ }
+
+ if (!isset($this->_routes[$route]['modules'][$moduleKey])) {
+ $this->_forward(
+ $this->_routes[self::ROUTE_ERROR]['defaults']['action'],
+ $this->_routes[self::ROUTE_ERROR]['defaults']['controller'],
+ $this->_routes[self::ROUTE_ERROR]['defaults']['module']
+ );
+ $route = self::ROUTE_ERROR;
+ continue;
+ }
+
+ $controllerKey = $this->_request->getControllerName();
+ if (empty($controllerKey)) {
+ $controllerKey = $this->_routes[$route]['defaults']['controller'];
+ }
+
+ $controllerClass = $this->_getControllerClass($route, $moduleKey, $controllerKey);
+ $controllerPath = $this->_getControllerFilename($route, $moduleKey, $controllerKey);
+
+ if (!class_exists($controllerClass, false) && Wootook::fileExists($controllerPath)) {
+ include_once $controllerPath;
+ }
+
+ if (!class_exists($controllerClass, false)) {
+ $this->_forward(
+ $this->_routes[self::ROUTE_ERROR]['defaults']['action'],
+ $this->_routes[self::ROUTE_ERROR]['defaults']['controller'],
+ $this->_routes[self::ROUTE_ERROR]['defaults']['module']
+ );
+ $route = self::ROUTE_ERROR;
+ continue;
+ }
+
+ $actionKey = $this->_request->getActionName();
+ if (empty($actionKey)) {
+ $actionKey = $this->_routes[$route]['defaults']['action'];
+ }
+
+ $actionMethod = $this->_getActionMethod($actionKey);
+ if (!method_exists($controllerClass, $actionMethod)) {
+ $this->_forward(
+ $this->_routes[self::ROUTE_ERROR]['defaults']['action'],
+ $this->_routes[self::ROUTE_ERROR]['defaults']['controller'],
+ $this->_routes[self::ROUTE_ERROR]['defaults']['module']
+ );
+ $route = self::ROUTE_ERROR;
+ continue;
+ }
+
+ $controller = new $controllerClass($this->_request, $this->_response);
+ $controller->init();
+
+ $this->_response->setIsDispatched();
+
+ $this->preDispatch();
+ $controller->preDispatch();
+ if (!$this->_response->isDispatched()) {
+ continue;
+ }
+ if ($this->_response->isRedirect()) {
+ break;
+ }
+
+ $controller->$actionMethod();
+
+ if (!$this->_response->isDispatched()) {
+ continue;
+ }
+
+ $controller->postDispatch();
+ $this->postDispatch();
+
+ if ($this->_response->isDispatched() || $this->_response->isRedirect()) {
+ break;
+ }
+ }
+
+ return $this;
+ }
+
+ public function send()
+ {
+ $this->_response->render();
+ }
+
+ public function addModule($frontName, $namespace, $path)
+ {
+ $this->_routes[self::ROUTE_DEFAULT]['modules'][$frontName] = array(
+ 'class' => $namespace,
+ 'path' => $path
+ );
+
+ return $this;
+ }
+
+ public function setDefaults($module, $controller, $action)
+ {
+ $this->_routes[self::ROUTE_DEFAULT]['defaults'] = array(
+ 'module' => $module,
+ 'controller' => $controller,
+ 'action' => $action
+ );
+
+ return $this;
+ }
+
+ public function preDispatch()
+ {
+ Wootook::dispatchEvent('core.mvc.controller.front.pre-dispatch', array(
+ 'request' => $this->_request,
+ 'response' => $this->_response
+ ));
+
+ return $this;
+ }
+
+ public function postDispatch()
+ {
+ Wootook::dispatchEvent('core.mvc.controller.front.post-dispatch', array(
+ 'request' => $this->_request,
+ 'response' => $this->_response
+ ));
+
+ return $this;
+ }
+}
diff --git a/src/application/code/core/Wootook/Core/Mvc/Controller/Request/Http.php b/src/application/code/core/Wootook/Core/Mvc/Controller/Request/Http.php
new file mode 100644
index 0000000..3780a37
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Mvc/Controller/Request/Http.php
@@ -0,0 +1,374 @@
+_baseUrl = Wootook::getBaseUrl('link');
+ if ($this->_baseUrl === null) {
+ $this->_baseUrl = 'http://' . $this->getServer('HTTP_HOST') . $this->getServer('REQUEST_URI');
+ }
+ $offset = strpos($this->_baseUrl, '/', 8);
+ if ($offset !== false) {
+ $baseUri = substr($this->_baseUrl, $offset); // Get the path from the DocumentRoot
+ } else {
+ $baseUri = '/';
+ }
+
+ $params = '';
+ if (($offset = strpos($this->getServer('REQUEST_URI'), $baseUri)) !== false) {
+ $queryParamsOffset = strpos($this->getServer('REQUEST_URI'), '?');
+ if ($queryParamsOffset !== false) {
+ $path = substr($this->getServer('REQUEST_URI'), $offset + strlen($baseUri), $queryParamsOffset - $offset - 1);
+ } else {
+ $path = substr($this->getServer('REQUEST_URI'), $offset + strlen($baseUri));
+ }
+
+ $moduleOffset = strpos($path, '/');
+ if ($moduleOffset !== false) {
+ $this->setModuleName(substr($path, 0, $moduleOffset));
+
+ $controllerOffset = strpos($path, '/', $moduleOffset + 1);
+ if ($controllerOffset !== false) {
+ $this->setControllerName(substr($path, $moduleOffset + 1, $controllerOffset - $moduleOffset - 1));
+
+ $actionOffset = strpos($path, '/', $controllerOffset + 1);
+ if ($actionOffset !== false) {
+ $this->setActionName(substr($path, $controllerOffset + 1, $actionOffset - $controllerOffset - 1));
+
+ $params = substr($path, $actionOffset);
+ } else if ($controllerOffset !== false) {
+ $this->setActionName(substr($path, $controllerOffset + 1));
+ }
+ } else if ($moduleOffset !== false) {
+ $this->setControllerName(substr($path, $moduleOffset + 1));
+ }
+ } else {
+ $this->setModuleName($path);
+ }
+ }
+
+ if (!empty($params)) {
+ $paramOffset = 0;
+ $valueOffset = 0;
+ while (true) {
+ $paramOffset = strpos($params, '/', $valueOffset + 1);
+ if ($paramOffset === false) {
+ break;
+ }
+ $paramKey = substr($params, $valueOffset + 1, $paramOffset - $valueOffset - 1);
+
+ $valueOffset = strpos($params, '/', $paramOffset + 1);
+ if ($valueOffset === false) {
+ $this->setParam($paramKey, substr($params, $paramOffset + 1));
+ break;
+ }
+ $this->setParam($paramKey, substr($params, $paramOffset + 1, $valueOffset - $paramOffset - 1));
+ }
+ }
+ }
+
+ public function init()
+ {
+ $this->_queryVars = $_GET;
+ $this->_postVars = $_POST;
+ $this->_cookieVars = $_COOKIE;
+ $this->_serverVars = $_SERVER;
+ $this->_postFiles = $_FILES;
+
+ $this->clearData();
+
+ $this->addData($this->_serverVars);
+ $this->addData($this->_cookieVars);
+ $this->addData($this->_queryVars);
+ $this->addData($this->_postVars);
+ }
+
+ public function setParam($key, $value)
+ {
+ return $this->setData($key, $value);
+ }
+
+ public function getParam($key, $default = null)
+ {
+ if ($this->hasData($key)) {
+ return $this->getData($key);
+ }
+ if ($this->hasPost($key)) {
+ return $this->getPost($key);
+ }
+ if ($this->hasQuery($key)) {
+ return $this->getQuery($key);
+ }
+ if ($this->hasCookie($key)) {
+ return $this->getCookie($key);
+ }
+
+ return $this->getServer($key, $default);
+ }
+
+ public function getQuery($key, $default = null)
+ {
+ if (!isset($this->_queryVars[$key])) {
+ return $default;
+ }
+ return $this->_queryVars[$key];
+ }
+
+ public function getAllQueryData()
+ {
+ return $this->_queryVars;
+ }
+
+ public function hasQuery($key)
+ {
+ return isset($this->_queryVars[$key]);
+ }
+
+ public function setQuery($key, $value)
+ {
+ $this->_queryVars[$key] = (string) $value;
+
+ return $this;
+ }
+
+ public function unsetQuery($key)
+ {
+ unset($this->_queryVars[$key]);
+
+ return $this;
+ }
+
+ public function getPost($key, $default = null)
+ {
+ if (!isset($this->_postVars[$key])) {
+ return $default;
+ }
+ return $this->_postVars[$key];
+ }
+
+ public function getAllPostData()
+ {
+ return $this->_postVars;
+ }
+
+ public function hasPost($key)
+ {
+ return isset($this->_postVars[$key]);
+ }
+
+ public function setPost($key, $value)
+ {
+ $this->_postVars[$key] = (string) $value;
+
+ return $this;
+ }
+
+ public function unsetPost($key)
+ {
+ unset($this->_postVars[$key]);
+
+ return $this;
+ }
+
+ public function getCookie($key, $default = null)
+ {
+ if (!isset($this->_cookieVars[$key])) {
+ return $default;
+ }
+ return unserialize(stripslashes($this->_cookieVars[$key]));
+ }
+
+ public function getRawCookie($key, $default = null)
+ {
+ if (!isset($this->_cookieVars[$key])) {
+ return $default;
+ }
+ return $this->_cookieVars[$key];
+ }
+
+ public function getAllCookieData()
+ {
+ $data = array();
+ foreach ($this->_cookieVars as $key => $value) {
+ $data[$key] = unserialize(stripslashes($value));
+ }
+ return $data;
+ }
+
+ public function getAllRawCookieData()
+ {
+ return $this->_cookieVars;
+ }
+
+ public function hasCookie($key)
+ {
+ return isset($this->_cookieVars[$key]);
+ }
+
+ public function setCookie($key, $value)
+ {
+ $this->_cookieVars[$key] = addslashes(serialize((string) $value));
+
+ return $this;
+ }
+
+ public function setRawCookie($key, $value)
+ {
+ $this->_cookieVars[$key] = (string) $value;
+
+ return $this;
+ }
+
+ public function unsetCookie($key)
+ {
+ unset($this->_cookieVars[$key]);
+
+ return $this;
+ }
+
+ public function getServer($key, $default = null)
+ {
+ if (!isset($this->_serverVars[$key])) {
+ return $default;
+ }
+ return $this->_serverVars[$key];
+ }
+
+ public function getAllServerData()
+ {
+ return $this->_serverVars;
+ }
+
+ public function getFile($key, $default = null)
+ {
+ if (!isset($this->_postFiles[$key])) {
+ return $default;
+ }
+ return $this->_postFiles[$key];
+ }
+
+ public function getAllFilesData()
+ {
+ return $this->_postFiles;
+ }
+
+ public function isPost()
+ {
+ if (strtoupper($this->getServer('REQUEST_METHOD')) == 'POST') {
+ return true;
+ }
+ return false;
+ }
+
+ public function isPut()
+ {
+ if (strtoupper($this->getServer('REQUEST_METHOD')) == 'PUT') {
+ return true;
+ }
+ return false;
+ }
+
+ public function isHead()
+ {
+ if (strtoupper($this->getServer('REQUEST_METHOD')) == 'HEAD') {
+ return true;
+ }
+ return false;
+ }
+
+ public function isGet()
+ {
+ if (strtoupper($this->getServer('REQUEST_METHOD')) == 'GET') {
+ return true;
+ }
+ return false;
+ }
+
+ public function getModuleKey()
+ {
+ return $this->_moduleKey;
+ }
+
+ public function setModuleKey($key)
+ {
+ $this->_moduleKey = $key;
+
+ return $this;
+ }
+
+ public function getModuleName()
+ {
+ return $this->getParam($this->getModuleKey());
+ }
+
+ public function setModuleName($name)
+ {
+ if ($name === null || is_string($name)) {
+ return $this->setParam($this->getModuleKey(), $name);
+ }
+ }
+
+ public function getControllerKey()
+ {
+ return $this->_controllerKey;
+ }
+
+ public function setControllerKey($key)
+ {
+ $this->_controllerKey = $key;
+
+ return $this;
+ }
+
+ public function getControllerName()
+ {
+ return $this->getParam($this->getControllerKey());
+ }
+
+ public function setControllerName($name)
+ {
+ if ($name === null || is_string($name)) {
+ return $this->setParam($this->getControllerKey(), $name);
+ }
+ }
+
+ public function getActionKey()
+ {
+ return $this->_actionKey;
+ }
+
+ public function setActionKey($key)
+ {
+ $this->_actionKey = $key;
+
+ return $this;
+ }
+
+ public function getActionName()
+ {
+ return $this->getParam($this->getActionKey());
+ }
+
+ public function setActionName($name)
+ {
+ if ($name === null || is_string($name)) {
+ return $this->setParam($this->getActionKey(), $name);
+ }
+ }
+}
diff --git a/src/application/code/core/Wootook/Core/Mvc/Controller/Request/Request.php b/src/application/code/core/Wootook/Core/Mvc/Controller/Request/Request.php
new file mode 100644
index 0000000..3a77073
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Mvc/Controller/Request/Request.php
@@ -0,0 +1,35 @@
+init();
+
+ parent::__construct($data);
+ }
+
+ public function setParam($key, $value)
+ {
+ return $this->setData($key, $value);
+ }
+
+ public function getParam($key, $default = null)
+ {
+ if ($this->hasData($key)) {
+ return $this->getData($key);
+ }
+ return $default;
+ }
+
+ abstract public function init();
+
+ abstract public function getModuleName();
+ abstract public function getControllerName();
+ abstract public function getActionName();
+
+ abstract public function setModuleName($name);
+ abstract public function setControllerName($name);
+ abstract public function setActionName($name);
+}
diff --git a/application/code/core/Wootook/Core/Controller/Response/Http.php b/src/application/code/core/Wootook/Core/Mvc/Controller/Response/Http.php
similarity index 73%
rename from application/code/core/Wootook/Core/Controller/Response/Http.php
rename to src/application/code/core/Wootook/Core/Mvc/Controller/Response/Http.php
index d463fa5..3025249 100644
--- a/application/code/core/Wootook/Core/Controller/Response/Http.php
+++ b/src/application/code/core/Wootook/Core/Mvc/Controller/Response/Http.php
@@ -1,24 +1,23 @@
'Moved Permanently',
- REDIRECT_FOUND => 'Found',
- REDIRECT_SEE_OTHER => 'See Other',
- REDIRECT_TEMPORARY => 'Temporary Redirect'
+ self::REDIRECT_MOVED_PERMANENTLY => 'Moved Permanently',
+ self::REDIRECT_FOUND => 'Found',
+ self::REDIRECT_SEE_OTHER => 'See Other',
+ self::REDIRECT_TEMPORARY => 'Temporary Redirect'
);
- public function __construct()
- {
- parent::__construct(array());
- }
+ protected $_returnCode = self::STATUS_OK;
public function setBody($data)
{
@@ -46,6 +45,9 @@ class Wootook_Core_Controller_Response_Http
public function sendBody()
{
+ if (!isset($this->_data['body']) || empty($this->_data['body'])) {
+ return '';
+ }
return implode('', $this->_data['body']);
}
@@ -81,7 +83,7 @@ class Wootook_Core_Controller_Response_Http
return $this;
}
- public function setRawHeader($name, $value)
+ public function setRawHeader($value)
{
if (!isset($this->_data['raw_headers']) || !is_array($this->_data['raw_headers'])) {
$this->clearRawHeaders();
@@ -108,22 +110,9 @@ class Wootook_Core_Controller_Response_Http
return $this;
}
- public function setIsRedirect($value = null)
+ public function isRedirect()
{
- if (is_bool($value)) {
- $this->_data['is_redirect'] = $value;
- }
- return $this->_data['is_redirect'];
- }
-
- public function setIsDispatched($dispatched = true)
- {
- return $this->setData('id_dispatched', $dispatched);
- }
-
- public function getIsDispatched()
- {
- return $this->getData('id_dispatched');
+ return $this->_returnCode >= 300 && $this->_returnCode < 400;
}
public function setCookie($name, $value, $lifetime = null, $path = null, $domain = null)
@@ -138,7 +127,10 @@ class Wootook_Core_Controller_Response_Http
public function setRawCookie($name, $value, $lifetime = null, $path = null, $domain = null)
{
- setcookie($name, $value, time() + $lifetime, $path, $domain);
+ $date = new Wootook_Core_DateTime();
+ $date->add($lifetime);
+
+ setcookie($name, $value, $date->getTimestamp(), $path, $domain);
return $this;
}
@@ -148,11 +140,22 @@ class Wootook_Core_Controller_Response_Http
$code = self::REDIRECT_FOUND;
}
+ $this->_returnCode = $code;
+
$statusText = self::$_redirectCodes[$code];
$this->setRawHeader("HTTP/1.1 {$code} {$statusText}")
- ->setHeader('Location', $url)
- ->setIsRedirect(true);
+ ->setHeader('Location', $url);
return $this;
}
-}
\ No newline at end of file
+
+ public function render($send = true)
+ {
+ if ($send) {
+ $this->sendHeaders();
+ echo $this->sendBody();
+ } else {
+ return $this->sendBody();
+ }
+ }
+}
diff --git a/src/application/code/core/Wootook/Core/Mvc/Controller/Response/Response.php b/src/application/code/core/Wootook/Core/Mvc/Controller/Response/Response.php
new file mode 100644
index 0000000..a36048a
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Mvc/Controller/Response/Response.php
@@ -0,0 +1,21 @@
+_isDispatched = $dispatched;
+
+ return $this;
+ }
+
+ public function isDispatched()
+ {
+ return $this->_isDispatched;
+ }
+
+ abstract public function render($send = true);
+}
diff --git a/src/application/code/core/Wootook/Core/Mvc/Model/Entity.php b/src/application/code/core/Wootook/Core/Mvc/Model/Entity.php
new file mode 100644
index 0000000..2c19005
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Mvc/Model/Entity.php
@@ -0,0 +1,142 @@
+_idFieldName = $fieldName;
+
+ return $this;
+ }
+
+ public function getIdFieldName()
+ {
+ return $this->_idFieldName;
+ }
+
+ public function setId($id)
+ {
+ $this->setData($this->getIdFieldName(), $id);
+
+ return $this;
+ }
+
+ public function getId()
+ {
+ return $this->getData($this->getIdFieldName());
+ }
+
+ protected function _load()
+ {
+ $id = func_get_arg(0);
+
+ if (func_num_args() >= 2) {
+ $idFieldName = func_get_arg(1);
+ } else {
+ $idFieldName = $this->getIdFieldName();
+ }
+
+ $database = $this->getReadConnection();
+ if ($database === null) {
+ throw new Wootook_Core_Exception_DataAccessException('Could not load data: no read connection configured.');
+ }
+
+ $select = $database->select()
+ ->from(array('main_table' => $database->getTable($this->getTableName())))
+ ->where($idFieldName, new Wootook_Core_Database_Sql_Placeholder_Param('id', $id))
+ ->limit(1);
+
+ $statement = $select->prepare();
+ $statement->execute(array(
+ 'id' => $id
+ ));
+
+ $datas = $statement->fetch(PDO::FETCH_ASSOC);
+ if (!is_array($datas) || empty($datas)) {
+ throw new Wootook_Core_Exception_DataAccessException('Could not load data: this id could not be found.');
+ }
+ $realId = $datas[$this->getIdFieldName()];
+ unset($datas[$this->getIdFieldName()]);
+
+ $this->_data = array();
+ $this->getDataMapper()->decode($this, $datas);
+ $this->setId($realId);
+
+ return $this;
+ }
+
+ protected function _save()
+ {
+ $adapter = $this->getWriteConnection();
+
+ if ($adapter === null) {
+ throw new Wootook_Core_Exception_DataAccessException('Could not save data: no write connection configured.');
+ }
+
+ if ($this->getId() !== null) {
+ $update = $adapter->update()
+ ->into($adapter->getTable($this->getTableName()))
+ ->where(new Wootook_Core_Database_Sql_Placeholder_Expression("{$adapter->quoteIdentifier($this->getIdFieldName())}=:id", array('id' => $this->getId())));
+
+ foreach ($this->getDataMapper()->encode($this, $this->getChangedDatas()) as $field => $value) {
+ $update->set($field, new Wootook_Core_Database_Sql_Placeholder_Param($field, $value));
+ }
+ try {
+ $statement = $update->prepare();
+ $statement->execute();
+ } catch (Wootook_Core_Exception_Database_AdapterError $e) {
+ throw new Wootook_Core_Exception_DataAccessException('Could not save data: ' . $e->getMessage(), null, $e);
+ } catch (Wootook_Core_Exception_Database_StatementError $e) {
+ throw new Wootook_Core_Exception_DataAccessException('Could not save data: ' . $e->getMessage(), null, $e);
+ }
+ } else {
+ $insert = $adapter->insert()
+ ->into($adapter->getTable($this->getTableName()));
+
+ foreach ($this->getDataMapper()->encode($this, $this->getAllDatas()) as $field => $value) {
+ $insert->set($field, new Wootook_Core_Database_Sql_Placeholder_Param($field, $value));
+ }
+ try {
+ $statement = $insert->prepare();
+ $statement->execute();
+
+ $id = $adapter->lastInsertId($adapter->getTable($this->getTableName()));
+ $this->setId($id);
+ } catch (Wootook_Core_Exception_Database_AdapterError $e) {
+ throw new Wootook_Core_Exception_DataAccessException('Could not save data: ' . $e->getMessage(), null, $e);
+ } catch (Wootook_Core_Exception_Database_StatementError $e) {
+ throw new Wootook_Core_Exception_DataAccessException('Could not save data: ' . $e->getMessage(), null, $e);
+ }
+ }
+
+ return $this;
+ }
+
+ protected function _delete()
+ {
+ $adapter = $this->getWriteConnection();
+ if ($adapter === null) {
+ throw new Wootook_Core_Exception_DataAccessException('Could not delete data: no write connection configured.');
+ }
+ $delete = $adapter
+ ->delete()
+ ->from($adapter->getTable($this->getTableName()))
+ ->where($this->getIdFieldName(), $this->getId())
+ ->limit(1);
+
+ try {
+ $statement = $adapter->prepare($delete);
+ $statement->execute();
+ } catch (Wootook_Core_Exception_Database_AdapterError $e) {
+ throw new Wootook_Core_Exception_DataAccessException('Could not delete data: ' . $e->getMessage(), null, $e);
+ } catch (Wootook_Core_Exception_Database_StatementError $e) {
+ throw new Wootook_Core_Exception_DataAccessException('Could not delete data: ' . $e->getMessage(), null, $e);
+ }
+
+ return $this;
+ }
+}
diff --git a/application/code/core/Wootook/Core/Entity/SubTable.php b/src/application/code/core/Wootook/Core/Mvc/Model/Entity/SubTable.php
similarity index 75%
rename from application/code/core/Wootook/Core/Entity/SubTable.php
rename to src/application/code/core/Wootook/Core/Mvc/Model/Entity/SubTable.php
index 470b89c..791d481 100644
--- a/application/code/core/Wootook/Core/Entity/SubTable.php
+++ b/src/application/code/core/Wootook/Core/Mvc/Model/Entity/SubTable.php
@@ -4,13 +4,12 @@
*
* @uses Wootook_Object
* @uses Legacies_Empire
- * @uses Wootook_Empire_Model_User
+ * @uses Wootook_Player_Model_Entity
*/
-abstract class Wootook_Core_Entity_SubTable
- extends Wootook_Core_Model
+abstract class Wootook_Core_Mvc_Model_Entity_SubTable
+ extends Wootook_Core_Database_Resource
{
private $_isLoaded = false;
- protected $_tableName = null;
protected $_idFieldNames = array();
protected $_eventPrefix = 'entity.sub-table';
@@ -32,7 +31,7 @@ abstract class Wootook_Core_Entity_SubTable
$idFields = '(' . implode(') AND (', $idFields) . ')';
$fields = implode(', ', $fields);
- $database = Wootook_Database::getSingleton();
+ $database = $this->getWriteConnection();
$sql =<<getTable(self::getTableName())}
SET {$fields}
@@ -51,7 +50,7 @@ SQL_EOF;
}
$tokens = implode(', ', $tokens);
- $database = Wootook_Database::getSingleton();
+ $database = $this->getWriteConnection();
$sql =<<getTable(self::getTableName())} ($fields)
VALUES ({$tokens})
@@ -66,20 +65,18 @@ SQL_EOF;
protected function _load()
{
$idValues = func_get_arg(0);
- $database = Wootook_Database::getSingleton();
+ $database = $this->getReadConnection();
+
+ $select = $database->select()
+ ->from(array('main_table' => $database->getTable($this->getTableName())))
+ ->limit(1);
$idFields = array();
foreach ($this->_idFieldNames as $field) {
- $idFields[] = "{$field}=:{$field}";
+ $select->where("{$database->quoteIdentifier($field)}=:{$field}");
}
- $idFields = '(' . implode(') AND (', $idFields) . ')';
- $sql =<<getTable(self::getTableName())}
- WHERE $idFields
- LIMIT 1
-SQL_EOF;
- $statement = $database->prepare($sql);
+ $statement = $database->prepare($select);
$statement->execute($idValues);
$datas = $statement->fetch(PDO::FETCH_ASSOC);
@@ -87,7 +84,9 @@ SQL_EOF;
throw new Wootook_Core_Exception_DataAccessException('Could not load data: this id combination could not be found.');
}
- $this->_data = $datas;
+ $this->_data = array();
+ $this->getDataMapper()->decode($this, $datas);
+
$this->_isLoaded = true;
return $this;
@@ -95,7 +94,7 @@ SQL_EOF;
protected function _delete()
{
- $database = Wootook_Database::getSingleton();
+ $database = $this->getWriteConnection();
$idFields = array();
$idValues = array();
@@ -118,16 +117,4 @@ SQL_EOF;
return $this;
}
-
- public function setTableName($tableName)
- {
- $this->_tableName = $tableName;
-
- return $this;
- }
-
- public function getTableName()
- {
- return $this->_tableName;
- }
-}
\ No newline at end of file
+}
diff --git a/src/application/code/core/Wootook/Core/Mvc/Model/EntityInterface.php b/src/application/code/core/Wootook/Core/Mvc/Model/EntityInterface.php
new file mode 100644
index 0000000..e512a5d
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Mvc/Model/EntityInterface.php
@@ -0,0 +1,47 @@
+
+ * 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
+ *
+ */
+interface Wootook_Core_Mvc_Model_EntityInterface
+{
+ public function getId();
+ public function setId($id);
+
+ public function getIdFieldName();
+ public function setIdFieldName($fieldName);
+
+ public function getTableName();
+ public function setTableName($tableName);
+}
diff --git a/application/code/core/Wootook/Core/Model.php b/src/application/code/core/Wootook/Core/Mvc/Model/Model.php
similarity index 71%
rename from application/code/core/Wootook/Core/Model.php
rename to src/application/code/core/Wootook/Core/Mvc/Model/Model.php
index 087f511..e91265f 100644
--- a/application/code/core/Wootook/Core/Model.php
+++ b/src/application/code/core/Wootook/Core/Mvc/Model/Model.php
@@ -1,6 +1,40 @@
+ * 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.
+ *
+ */
-abstract class Wootook_Core_Model
+/**
+ *
+ * Enter description here ...
+ * @author Greg
+ *
+ */
+abstract class Wootook_Core_Mvc_Model_Model
extends Wootook_Object
{
protected $_originalData = array();
@@ -13,14 +47,27 @@ abstract class Wootook_Core_Model
$this->_data = $data;
$this->_init();
- $this->_setOriginalData($this->_data);
+ $this->_setOriginalData();
}
abstract protected function _init();
- protected function _setOriginalData(Array $data)
+ protected function _setOriginalData()
{
- $this->_originalData = $data;
+ $this->_originalData = $this->_data;
+ }
+
+ public function getChangedDatas()
+ {
+ return array_diff_assoc($this->_data, $this->_originalData);
+ }
+
+ public function hasChangedDatas()
+ {
+ if (count($this->getChangedDatas()) > 0) {
+ return true;
+ }
+ return false;
}
final public function save()
@@ -70,7 +117,7 @@ abstract class Wootook_Core_Model
call_user_func_array(array($this, '_afterLoad'), $params);
$this->_setOriginalData($this->_data);
} catch (PDOException $e) {
- throw new Wootook_Core_Exception_DataAccessException('Could not load data: ' . $e->getMessage(), 0);
+ throw new Wootook_Core_Exception_DataAccessException('Could not load data: ' . $e->getMessage(), 0, $e);
}
return $this;
}
@@ -155,4 +202,4 @@ abstract class Wootook_Core_Model
{
return $this->hasData($key);
}
-}
\ No newline at end of file
+}
diff --git a/application/code/core/Wootook/Core/View.php b/src/application/code/core/Wootook/Core/Mvc/View/View.php
similarity index 56%
rename from application/code/core/Wootook/Core/View.php
rename to src/application/code/core/Wootook/Core/Mvc/View/View.php
index e7b0cc6..4847061 100644
--- a/application/code/core/Wootook/Core/View.php
+++ b/src/application/code/core/Wootook/Core/Mvc/View/View.php
@@ -1,6 +1,40 @@
+ * 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.
+ *
+ */
-class Wootook_Core_View
+/**
+ *
+ * Enter description here ...
+ * @author Greg
+ *
+ */
+class Wootook_Core_Mvc_View_View
extends Wootook_Object
{
protected $_template = null;
@@ -56,11 +90,27 @@ class Wootook_Core_View
}
}
- protected function escape($unescaped)
+ public function renderDateTime($dateTime, $format = null)
+ {
+ if ($format === null) {
+ $format = 'H:i:s';
+ }
+ if (!$dateTime instanceof Wootook_Core_DateTime) {
+ $dateTime = new Wootook_Core_DateTime($dateTime);
+ }
+ return $dateTime->toString($format);
+ }
+
+ public function escape($unescaped)
{
return htmlspecialchars($unescaped, ENT_QUOTES, 'UTF-8');
}
+ public function escapeJs($unescaped)
+ {
+ return addslashes($unescaped);
+ }
+
public function __($message, $_ = null)
{
$args = func_get_args();
@@ -93,6 +143,14 @@ class Wootook_Core_View
return '';
}
+ public function renderPartial($blockName)
+ {
+ if (($block = $this->getPartial($blockName)) !== null) {
+ return $block->render();
+ }
+ return null;
+ }
+
protected function _getTemplatePath($file)
{
return $this->getScriptPath() . DIRECTORY_SEPARATOR . $file;
@@ -124,25 +182,58 @@ class Wootook_Core_View
return Wootook::getUrl($uri, $params);
}
- public function getSkinUrl($uri, Array $params = array())
+ public function getStaticUrl($uri, Array $params = array())
{
- $package = $this->getLayout()->getPackage();
- if (empty($package)) {
- $package = Wootook_Core_Layout::DEFAULT_PACKAGE;
- }
+ return Wootook::getStaticUrl($uri, $params);
+ }
- $user = Wootook_Empire_Model_User::getSingleton();
- if ($user !== null && $user->getId()) {
- $theme = $user->getSkinPath();
+ public function getSkinUrl($uri, Array $params = array(), $theme = null, $package = null)
+ {
+ if (Wootook::$isInstalled) {
+ $player = Wootook_Player_Model_Session::getSingleton()->getPlayer();
+ if ($player !== null && $player->getId()) {
+ $theme = $player->getSkinPath();
+ }
}
- if (empty($theme)) {
+ if ($theme === null || empty($theme)) {
$theme = $this->getLayout()->getTheme();
}
- if (empty($theme)) {
- $theme = Wootook_Core_Layout::DEFAULT_THEME;
+ if ($theme === null || empty($theme)) {
+ $theme = Wootook_Core_Model_Layout::DEFAULT_THEME;
}
- return Wootook::getSkinUrl($package, $theme, $uri, $params);
+ if ($package === null || empty($package)) {
+ $package = $this->getLayout()->getPackage();
+ }
+ if ($package === null || empty($package)) {
+ $package = Wootook_Core_Model_Layout::DEFAULT_PACKAGE;
+ }
+ $domain = $this->getLayout()->getDomain();
+
+ $baseUrl = Wootook::getBaseUrl('skin');
+ $basePath = Wootook::getBasePath('skin');
+ $pathPattern = $basePath . "{$domain}/%s/%s/{$uri}";
+ $urlPattern = $baseUrl . "{$domain}/%s/%s/{$uri}";
+
+ if (count($params) > 0) {
+ $serializedParams = array();
+ foreach ($params as $paramKey => $paramValue) {
+ if ($paramValue) {
+ $serializedParams[] = "{$paramKey}={$paramValue}";
+ }
+ }
+
+ $urlPattern .= '?' . implode('&', $serializedParams);
+ }
+
+ if (Wootook::fileExists(sprintf($pathPattern, $package, $theme))) {
+ return sprintf($urlPattern, $package, $theme);
+ }
+ if (Wootook::fileExists(sprintf($pathPattern, $package, Wootook_Core_Model_Layout::DEFAULT_THEME))) {
+ return sprintf($urlPattern, $package, Wootook_Core_Model_Layout::DEFAULT_THEME);
+ }
+
+ return sprintf($urlPattern, Wootook_Core_Model_Layout::DEFAULT_PACKAGE, Wootook_Core_Model_Layout::DEFAULT_THEME);
}
public function setPartial($name, $content)
@@ -158,6 +249,9 @@ class Wootook_Core_View
public function getPartial($name)
{
+ if (!$this->hasPartial($name)) {
+ return null;
+ }
return $this->_partials[$name];
}
@@ -211,7 +305,7 @@ class Wootook_Core_View
/**
*
- * @return Wootook_Core_Layout
+ * @return Wootook_Core_Model_Layout
*/
public function getLayout()
{
@@ -249,4 +343,4 @@ class Wootook_Core_View
{
return $this->_scriptPath;
}
-}
\ No newline at end of file
+}
diff --git a/application/code/core/Wootook/Core/Plugin/LoaderAbstract.php b/src/application/code/core/Wootook/Core/PluginLoader/PluginLoader.php
similarity index 64%
rename from application/code/core/Wootook/Core/Plugin/LoaderAbstract.php
rename to src/application/code/core/Wootook/Core/PluginLoader/PluginLoader.php
index 211f572..eaaff7a 100644
--- a/application/code/core/Wootook/Core/Plugin/LoaderAbstract.php
+++ b/src/application/code/core/Wootook/Core/PluginLoader/PluginLoader.php
@@ -1,21 +1,25 @@
_pluginInstances[$pluginName])) {
return $this->_pluginInstances[$pluginName];
}
- foreach ($this->_namespaces as $namespace => $path) {
- $className = $namespace . ucfirst($pluginName);
- $fileName = $path . DIRECTORY_SEPARATOR . ucfirst($pluginName) . '.php';
+ $pluginName = str_replace(' ', '_', ucwords(str_replace('.', ' ', $pluginName)));
+ $pluginName = str_replace(' ', '', ucwords(str_replace('-', ' ', $pluginName)));
- if (!file_exists($fileName)) {
+ foreach ($this->_namespaces as $namespace => $path) {
+ $className = $namespace . $pluginName;
+ $fileName = $path . DIRECTORY_SEPARATOR .
+ str_replace('_', DIRECTORY_SEPARATOR, $pluginName) . '.php';
+
+ if (!Wootook::fileExists($fileName)) {
continue;
}
@@ -23,10 +27,10 @@ abstract class Wootook_Core_Plugin_LoaderAbstract
continue;
}
- return $this->_load($className, $useSingleton);
+ return $this->_load($className, $useSingleton, $constructorParams);
}
- return $this;
+ return null;
}
public function registerNamespace($namespace, $path = null)
@@ -48,7 +52,7 @@ abstract class Wootook_Core_Plugin_LoaderAbstract
return $this;
}
- abstract protected function _load($className);
+ abstract protected function _load($className, $useSingleton, Array $constructorParams = array());
public function getPlugin($pluginName)
{
diff --git a/src/application/code/core/Wootook/Core/Resource/EntityCollection.php b/src/application/code/core/Wootook/Core/Resource/EntityCollection.php
new file mode 100644
index 0000000..0f0d29b
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Resource/EntityCollection.php
@@ -0,0 +1,268 @@
+setReadConnection($connection);
+
+ $this->_construct();
+ }
+
+ abstract protected function _construct();
+
+ protected function _init($entityTable, $entityClass)
+ {
+ $this->_entityTable = $entityTable;
+ $this->_entityClass = $entityClass;
+ }
+
+ public function getSelect()
+ {
+ if ($this->_select === null) {
+ $this->_select = $this->getReadConnection()
+ ->select()
+ ->from(array('main_table' => $this->getReadConnection()->getTable($this->_entityTable)));
+
+ $this->_prepareSelect($this->_select);
+ }
+
+ return $this->_select;
+ }
+
+ public function _prepareSelect(Wootook_Core_Database_Sql_Select $select)
+ {
+ }
+
+ /**
+ *
+ * @return Wootook_Core_Database_Orm_DataMapper
+ */
+ public function getDataMapper()
+ {
+ if ($this->_dataMapper === null) {
+ $this->_dataMapper = new Wootook_Core_Database_Orm_DataMapper();
+ }
+ return $this->_dataMapper;
+ }
+
+ /**
+ * @return Wootook_Core_Database_Adapter_Adapter
+ */
+ public function getReadConnection()
+ {
+ return $this->_connection;
+ }
+
+ public function setReadConnection($connection)
+ {
+ if ($connection instanceof Wootook_Core_Database_Adapter_Pdo_Mysql) {
+ $this->_connection = $connection;
+ } else if (is_string($connection)) {
+ $this->_connection = Wootook_Core_Database_ConnectionManager::getSingleton()
+ ->getConnection($connection);
+ } else {
+ throw new Wootook_Core_Exception_RuntimeException(
+ 'First parameter should be either a database connection object or a string identifier.');
+ }
+
+ return $this;
+ }
+
+ final public function load()
+ {
+ $this->_beforeLoad();
+ $this->_load();
+ $this->_afterLoad();
+
+ return $this;
+ }
+
+ protected function _beforeLoad()
+ {
+ Wootook::dispatchEvent('resource.collection.before-load', array('model' => $this));
+
+ if ($this->_eventPrefix !== null && $this->_eventObject !== null) {
+ Wootook::dispatchEvent($this->_eventPrefix . '.before-load', array($this->_eventObject => $this));
+ }
+
+ return $this;
+ }
+
+ protected function _afterLoad()
+ {
+ Wootook::dispatchEvent('resource.collection.after-load', array('model' => $this));
+
+ if ($this->_eventPrefix !== null && $this->_eventObject !== null) {
+ Wootook::dispatchEvent($this->_eventPrefix . '.after-load', array($this->_eventObject => $this));
+ }
+
+ return $this;
+ }
+
+ protected function _load()
+ {
+ $select = clone $this->getSelect();
+
+ if ($this->_pageSize !== null) {
+ if ($this->_curPage !== null) {
+ $select->limit($this->_pageSize, ($this->_curPage - 1) * $this->_pageSize);
+ } else {
+ $select->limit($this->_pageSize);
+ }
+ }
+
+ $statement = $select->prepare();
+
+ $args = func_get_args();
+ $statement->execute(array_shift($args));
+
+ $this->_items = array();
+ if (func_num_args() > 1) {
+ $reflection = new ReflectionClass(array_shift($args));
+ } else {
+ $reflection = new ReflectionClass($this->_entityClass);
+ }
+
+ while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+ $item = $reflection->newInstanceArgs();
+ $item->getDataMapper()->decode($item, $row);
+
+ $this->_items[] = $item;
+ }
+
+ return $this;
+ }
+
+ public function getSize($maintainGrouping = array())
+ {
+ $clone = clone $this->_select;
+ $clone->reset(Wootook_Core_Database_Sql_Select::COLUMNS);
+ if (empty($maintainGrouping)) {
+ $clone->reset(Wootook_Core_Database_Sql_Select::GROUP);
+ } else {
+ $groupingFields = $clone->getPart(Wootook_Core_Database_Sql_Select::GROUP);
+ $clone->reset(Wootook_Core_Database_Sql_Select::GROUP);
+ foreach ($groupingFields as $field) {
+ if (in_array($field, $maintainGrouping)) {
+ $clone->group($field);
+ }
+ }
+ }
+ $clone->column(new Wootook_Core_Database_Sql_Placeholder_Expression('COUNT(*)'));
+
+ $database = $this->getReadConnection();
+ $statement = $database->prepare($clone);
+
+ $statement->execute();
+ $count = $statement->fetchColumn();
+ $statement->closeCursor();
+
+ return $count;
+ }
+
+ public function count()
+ {
+ return count($this->_items);
+ }
+
+ public function current()
+ {
+ return current($this->_items);
+ }
+
+ public function next()
+ {
+ next($this->_items);
+
+ return $this;
+ }
+
+ public function rewind()
+ {
+ reset($this->_items);
+
+ return $this;
+ }
+
+ public function key()
+ {
+ return key($this->_items);
+ }
+
+ public function valid()
+ {
+ return current($this->_items) !== false;
+ }
+
+ public function getFirstItem()
+ {
+ if (count($this->_items) > 0) {
+ return $this->_items[0];
+ }
+ return null;
+ }
+
+ public function getLastItem()
+ {
+ $size = count($this->_items);
+ if ($size > 0) {
+ return $this->_items[$size - 1];
+ }
+ return null;
+ }
+
+ public function addOrderBy($field, $type = 'ASC')
+ {
+ $this->getSelect()->order($field, $type);
+
+ return $this;
+ }
+
+ public function addFieldToFilter($field, $value = null)
+ {
+ $this->getSelect()->where($field, $value);
+
+ return $this;
+ }
+
+ public function setPage($curPage, $pageSize)
+ {
+ $this->setCurPage($curPage)->setPageSize($pageSize);
+
+ return $this;
+ }
+
+ public function setCurPage($curPage)
+ {
+ $this->_curPage = $curPage;
+
+ return $this;
+ }
+
+ public function setPageSize($pageSize)
+ {
+ $this->_pageSize = $pageSize;
+
+ return $this;
+ }
+}
diff --git a/src/application/code/core/Wootook/Core/Setup/Exception/RuntimeException.php b/src/application/code/core/Wootook/Core/Setup/Exception/RuntimeException.php
new file mode 100644
index 0000000..29a8002
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Setup/Exception/RuntimeException.php
@@ -0,0 +1,7 @@
+_setupConnection = Wootook_Core_Database_ConnectionManager::getSingleton()
+ ->getConnection($connection);
+ } else {
+ $this->_setupConnection = $connection;
+ }
+
+ return $this;
+ }
+
+ /**
+ *
+ * Enter description here ...
+ * @return Wootook_Core_Database_Adapter_Pdo_Mysql
+ */
+ public function getSetupConnection()
+ {
+ if ($this->_setupConnection === null) {
+ $this->setSetupConnection('default');
+ }
+ return $this->_setupConnection;
+ }
+
+ public function getTableName($tableName)
+ {
+ return $this->getSetupConnection()->getTable($tableName);
+ }
+
+ public function query($statement)
+ {
+ try {
+ if (!$this->getSetupConnection()->query($statement)) {
+ $info = $this->getSetupConnection()->errorInfo();
+ throw new Wootook_Core_Setup_Exception_RuntimeException(
+ Wootook::__('Query failed: SQLSTATE %s: %s.', $info[1], $info[2]));
+ }
+ } catch (PDOException $e) {
+ Wootook_Core_ErrorProfiler::getSingleton()->exceptionManager($e);
+ throw new Wootook_Core_Setup_Exception_RuntimeException($e->getMessage(), null, $e);
+ }
+ }
+
+ public function grant($tableName, $connectionName, $perms = null)
+ {
+ $hostname = Wootook::getConfig("database/{$connectionName}/params/hostname");
+ $username = Wootook::getConfig("database/{$connectionName}/params/username");
+ $database = Wootook::getConfig("database/{$connectionName}/params/database");
+ $password = Wootook::getConfig("database/{$connectionName}/params/password");
+
+ if ($perms === null) {
+ $perms = 'ALL PRIVILEGES';
+ } else if (is_array($perms)) {
+ $perms = implode(' ', $perms);
+ }
+
+ $sql =<<getTable($tableName)}
+TO '{$username}@{$hostname}' IDENTIFIED BY '$password'
+SQL_EOF;
+
+ $this->getSetupConnection()->query($sql);
+
+ return $this;
+ }
+
+ public function revoke($tableName, $connectionName, $perms = null)
+ {
+ $hostname = Wootook::getConfig("database/{$connectionName}/params/hostname");
+ $username = Wootook::getConfig("database/{$connectionName}/params/username");
+ $database = Wootook::getConfig("database/{$connectionName}/params/database");
+ $password = Wootook::getConfig("database/{$connectionName}/params/password");
+
+ if ($perms === null) {
+ $perms = 'ALL PRIVILEGES';
+ } else if (is_array($perms)) {
+ $perms = implode(' ', $perms);
+ }
+
+ $sql =<<getTable($tableName)}
+FROM '{$username}@{$hostname}'
+SQL_EOF;
+
+ $this->getSetupConnection()->query($sql);
+
+ return $this;
+ }
+
+ public function run($script)
+ {
+ include $script;
+ }
+
+ public function getConfig($path = null)
+ {
+ return Wootook::getConfig($path);
+ }
+
+ public function getWebsiteConfig($path = null, $websiteId = null)
+ {
+ return Wootook::getWebsiteConfig($path, $websiteId);
+ }
+
+ public function getGameConfig($path = null, $gameId = null)
+ {
+ return Wootook::getGameConfig($path, $gameId);
+ }
+}
diff --git a/application/code/core/Wootook/Core/Setup/Updater/ScriptQueue.php b/src/application/code/core/Wootook/Core/Setup/Updater/ScriptQueue.php
similarity index 89%
rename from application/code/core/Wootook/Core/Setup/Updater/ScriptQueue.php
rename to src/application/code/core/Wootook/Core/Setup/Updater/ScriptQueue.php
index ff6e309..e0ce1d5 100644
--- a/application/code/core/Wootook/Core/Setup/Updater/ScriptQueue.php
+++ b/src/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]+))?)?$%';
@@ -36,27 +36,35 @@ class Wootook_Core_Setup_Model_Updater_ScriptQueue
}
if ($fromVersion === null) {
- $fromVersion = '0.0.0';
+ $fromVersion = array(
+ 'version' => self::VERSION_NULL,
+ 'stage' => self::STAGE_STABLE,
+ 'level' => 0,
+ );
+ } else {
+ preg_match(self::PCRE_VERSION_PATTERN, $fromVersion, $matches);
+ $fromVersion = array(
+ 'version' => isset($matches['version']) ? $matches['version'] : self::VERSION_NULL,
+ 'stage' => isset($matches['stage']) && !empty($matches['stage']) ? $matches['stage'] : self::STAGE_STABLE,
+ 'level' => isset($matches['level']) && !empty($matches['level']) ? (int) $matches['level'] : 0,
+ );
}
if ($toVersion === null) {
- $toVersion = '0.0.0';
+ $toVersion = array(
+ 'version' => self::VERSION_NULL,
+ 'stage' => self::STAGE_STABLE,
+ 'level' => 0,
+ );
+ } else {
+ preg_match(self::PCRE_VERSION_PATTERN, $toVersion, $matches);
+ $toVersion = array(
+ 'version' => isset($matches['version']) ? $matches['version'] : self::VERSION_NULL,
+ 'stage' => isset($matches['stage']) && !empty($matches['stage']) ? $matches['stage'] : self::STAGE_STABLE,
+ 'level' => isset($matches['level']) && !empty($matches['level']) ? (int) $matches['level'] : 0,
+ );
}
- preg_match(self::PCRE_VERSION_PATTERN, $fromVersion, $matches);
- $fromVersion = array(
- 'version' => isset($matches['version']) ? $matches['version'] : self::VERSION_NULL,
- 'stage' => isset($matches['stage']) && !empty($matches['stage']) ? $matches['stage'] : self::STAGE_STABLE,
- 'level' => isset($matches['level']) && !empty($matches['level']) ? (int) $matches['level'] : 0,
- );
-
- preg_match(self::PCRE_VERSION_PATTERN, $toVersion, $matches);
- $toVersion = array(
- 'version' => isset($matches['version']) ? $matches['version'] : self::VERSION_NULL,
- 'stage' => isset($matches['stage']) && !empty($matches['stage']) ? $matches['stage'] : self::STAGE_STABLE,
- 'level' => isset($matches['level']) && !empty($matches['level']) ? (int) $matches['level'] : 0,
- );
-
switch (version_compare($toVersion['version'], $fromVersion['version'])) {
case 1:
$this->_upgradeToVersion($fromVersion, $toVersion);
@@ -110,7 +118,7 @@ class Wootook_Core_Setup_Model_Updater_ScriptQueue
$this->_upgradeToVersion($fromVersion, $toVersion);
}
} else {
- throw new Wootook_Core_Exception_RuntimeException("Invalid version stage.");
+ throw new Wootook_Core_Setup_Exception_VersionStageError("Invalid version stage.");
}
break;
}
@@ -123,6 +131,13 @@ class Wootook_Core_Setup_Model_Updater_ScriptQueue
return $this->_finalVersion;
}
+ public function getCurrentVersion()
+ {
+ $current = $this->current();
+
+ return $current['version'];
+ }
+
protected function _installHighestInstaller($currentVersion, $toVersion)
{
$highestVersion = self::VERSION_NULL;
@@ -143,14 +158,16 @@ class Wootook_Core_Setup_Model_Updater_ScriptQueue
return $version;
}
- if (isset($this->_installVersions[$highestVersion][self::STAGE_RC])) {
+ if (isset($this->_installVersions[$highestVersion][self::STAGE_STABLE])) {
+ $stage = self::STAGE_STABLE;
+ } else if (isset($this->_installVersions[$highestVersion][self::STAGE_RC])) {
$stage = self::STAGE_RC;
} else if (isset($this->_installVersions[$highestVersion][self::STAGE_BETA])) {
$stage = self::STAGE_BETA;
} else if (isset($this->_installVersions[$highestVersion][self::STAGE_ALPHA])) {
$stage = self::STAGE_ALPHA;
} else {
- throw new Wootook_Core_Exception_RuntimeException("Invalid version stage.");
+ throw new Wootook_Core_Setup_Exception_VersionStageError("Invalid version stage.");
}
$levelList = array_keys($this->_installVersions[$highestVersion][$stage]);
@@ -232,7 +249,7 @@ class Wootook_Core_Setup_Model_Updater_ScriptQueue
$level = max(array_keys($versionPointer[$highestVersion][$stage]));
} else {
- throw new Wootook_Core_Exception_RuntimeException("Invalid version value.");
+ throw new Wootook_Core_Setup_Exception_VersionValueError("Invalid version value.");
}
$currentVersion = array(
diff --git a/src/application/code/core/Wootook/Core/Singleton.php b/src/application/code/core/Wootook/Core/Singleton.php
new file mode 100644
index 0000000..c136e82
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/Singleton.php
@@ -0,0 +1,40 @@
+
+ * 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
+ *
+ */
+interface Wootook_Core_Singleton
+{
+ public static function getSingleton();
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/configs/module.php b/src/application/code/core/Wootook/Core/configs/module.php
new file mode 100644
index 0000000..9b01f6a
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/configs/module.php
@@ -0,0 +1,33 @@
+ array(
+ 'Wootook_Core' => array(
+ 'version' => '1.5.0'
+ )
+ ),
+ 'global' => array(
+ 'models' => array(
+ 'core' => array(
+ 'namespace' => 'Warner_Core_Model_',
+ 'connection' => array(
+ 'read' => 'core_read',
+ 'write' => 'core_write',
+ 'setup' => 'core_setup',
+ )
+ )
+ ),
+ 'blocks' => array(
+ 'core' => array(
+ 'namespace' => 'Warner_Core_Block_'
+ )
+ )
+ ),
+ 'frontend' => array(
+ 'routes' => array(
+ 'core' => array(
+ 'modules' => array(
+ 'core' => 'Wootook_Core'
+ )
+ )
+ )
+ )
+ );
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Core/install/mysql5/install-1.5.0.php b/src/application/code/core/Wootook/Core/install/mysql5/install-1.5.0.php
new file mode 100644
index 0000000..44fd985
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/install/mysql5/install-1.5.0.php
@@ -0,0 +1,208 @@
+
+ * 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.
+ *
+ */
+
+$this->setSetupConnection('core_setup');
+
+$sql = <<getTableName('core_website')} (
+ `website_id` TINYINT UNSIGNED NOT NULL,
+ `code` VARCHAR(64) NOT NULL,
+ `name` VARCHAR(255) NOT NULL,
+ `sort_order` TINYINT UNSIGNED NOT NULL,
+ `default_group_id` TINYINT UNSIGNED NOT NULL,
+ `is_default` BOOL NOT NULL,
+ `is_staging` BOOL NOT NULL,
+ `is_active` BOOL NOT NULL,
+ PRIMARY KEY (`website_id`),
+ UNIQUE (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+SQL_EOF;
+
+$this->query($sql);
+
+$sql = <<getTableName('core_game_group')} (
+ `group_id` TINYINT UNSIGNED NOT NULL,
+ `website_id` TINYINT UNSIGNED NOT NULL,
+ `code` VARCHAR(64) NOT NULL,
+ `name` VARCHAR(255) NOT NULL,
+ `sort_order` TINYINT UNSIGNED NOT NULL,
+ `is_default` BOOL NOT NULL,
+ PRIMARY KEY (`group_id`),
+ INDEX (`website_id`),
+ UNIQUE (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+SQL_EOF;
+
+$this->query($sql);
+
+$sql = <<getTableName('core_game')} (
+ `game_id` SMALLINT UNSIGNED NOT NULL,
+ `group_id` TINYINT UNSIGNED NOT NULL,
+ `website_id` TINYINT UNSIGNED NOT NULL,
+ `code` VARCHAR(64) NOT NULL,
+ `name` VARCHAR(255) NOT NULL,
+ `sort_order` TINYINT UNSIGNED NOT NULL,
+ `is_default` BOOL NOT NULL,
+ `is_staging` BOOL NOT NULL,
+ `is_active` BOOL NOT NULL,
+ PRIMARY KEY (`group_id`),
+ INDEX (`website_id`),
+ UNIQUE (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+SQL_EOF;
+
+$this->query($sql);
+
+$sql = <<getTableName('core_website')} (`website_id`, `code`, `name`, `sort_order`, `default_group_id`, `is_default`, `is_staging`, `is_active`)
+VALUES
+(0, "admin", "Administration", 0, 0, 0, 0, 1),
+(1, "default", "Default Website", 1, 1, 1, 0, 1);
+SQL_EOF;
+
+$this->query($sql);
+
+$sql = <<getTableName('core_game_group')} (`group_id`, `website_id`, `code`, `name`, `sort_order`, `is_default`)
+VALUES
+(0, 0, "admin", "Administration", 0, 0),
+(1, 1, "default", "Default Group", 1, 1);
+SQL_EOF;
+
+$this->query($sql);
+
+$sql = <<getTableName('core_game')} (`game_id`, `group_id`, `website_id`, `code`, `name`, `sort_order`, `is_default`, `is_staging`, `is_active`)
+VALUES
+(0, 0, 0, "admin", "Administration", 0, 0, 0, 1),
+(1, 1, 1, "default", "Default Game", 1, 1, 0, 1);
+SQL_EOF;
+
+$this->query($sql);
+
+$sql = <<getTableName('core_config')} (
+ `website_id` TINYINT UNSIGNED NOT NULL,
+ `game_id` TINYINT UNSIGNED NOT NULL,
+ `config_path` VARCHAR(64) NOT NULL,
+ `config_value` VARCHAR(255) NOT NULL,
+ PRIMARY KEY (`website_id`, `game_id`, `config_path`),
+ INDEX (`website_id`),
+ INDEX (`game_id`),
+ INDEX (`config_path`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+SQL_EOF;
+
+$this->query($sql);
+
+$sql = <<getTableName('core_config')} (`website_id`, `game_id`, `config_path`, `config_value`) VALUES
+ (1, 1, 'resources/base-income/metal', '20'),
+ (1, 1, 'resources/base-income/cristal', '10'),
+ (1, 1, 'resources/base-income/deuterium', '0'),
+ (1, 1, 'resources/base-income/energy', '0'),
+
+ (1, 1, 'planet/initial/fields', '163'),
+
+ (1, 1, 'resources/initial/metal', '500'),
+ (1, 1, 'resources/initial/cristal', '500'),
+ (1, 1, 'resources/initial/deuterium', '0'),
+ (1, 1, 'resources/initial/energy', '0'),
+
+ (1, 1, 'game/general/name', 'Wootook'),
+ (1, 1, 'game/general/boards-url', 'http://wootook.org/board/'),
+ (1, 1, 'game/general/extra-url-title', 'Wootook!'),
+ (1, 1, 'game/general/extra-url', 'http://wootook.org/'),
+ (1, 1, 'game/general/active', '1'),
+ (1, 1, 'game/general/closing-message', 'Le jeu est clos pour le moment.'),
+ (1, 1, 'game/general/locale', 'fr_FR'),
+
+ (1, 1, 'game/resource/multiplier', '1000'),
+ (1, 1, 'game/speed/general', '2500'),
+ (1, 1, 'game/speed/fleet', '2500'),
+
+ (1, 1, 'game/debris/metal-percent', '30'),
+ (1, 1, 'game/debris/cristal-percent', '30'),
+ (1, 1, 'game/debris/deuterium-percent', '0'),
+ (1, 1, 'game/debris/energy-percent', '0'),
+
+ (1, 1, 'game/debris/fleet', '1'),
+ (1, 1, 'game/debris/defense', '0'),
+
+ (1, 1, 'game/noob-protection/active', '0'),
+ (1, 1, 'game/noob-protection/points-cap', '5000'),
+ (1, 1, 'game/noob-protection/multiplier', '5'),
+
+-- (0, 0, 'web/cookie/name', '__wtk'),
+-- (0, 0, 'web/cookie/time', '2592000'),
+-- (0, 0, 'web/cookie/domain', ''),
+-- (0, 0, 'web/cookie/path', ''),
+
+ (1, 1, 'web/cookie/name', '__wtk_1_1'),
+
+-- (0, 0, 'web/session/time', '900'),
+-- (0, 0, 'web/session/domain', '.wootook.org'),
+-- (0, 0, 'web/session/path', '/'),
+
+ (0, 0, 'engine/options/bbcode', '1'),
+ (0, 0, 'engine/options/ga', '1'),
+ (0, 0, 'engine/options/announces', '0'),
+ (0, 0, 'engine/options/retailer', '0'),
+ (0, 0, 'engine/options/notes', '0'),
+ (0, 0, 'engine/options/chat', '0'),
+ (0, 0, 'engine/options/banner', '0'),
+ (0, 0, 'engine/options/vacation-min-time', '172800'),
+
+ (0, 0, 'game/news/active', '0'),
+ (0, 0, 'game/news/content', 'Bienvenue sur le nouveau serveur de jeu Wootook!'),
+
+ (0, 0, 'engine/ban/duration', '86400'),
+
+ (0, 0, 'engine/bot/active', '0'),
+ (0, 0, 'engine/bot/name', 'Woot'),
+ (0, 0, 'engine/bot/email', 'contact@wootook.org');
+SQL_EOF;
+
+$this->query($sql);
+
+$sql = <<getTableName('errors')} (
+ `error_id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+ `error_sender` VARCHAR(32) NOT NULL,
+ `error_time` TIMESTAMP NOT NULL,
+ `error_type` VARCHAR(32) NOT NULL DEFAULT 'unknown',
+ `error_text` TEXT,
+ PRIMARY KEY (`error_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+SQL_EOF;
+
+$this->query($sql);
diff --git a/src/application/code/core/Wootook/Core/install/mysql5/uninstall-1.5.0.php b/src/application/code/core/Wootook/Core/install/mysql5/uninstall-1.5.0.php
new file mode 100644
index 0000000..2b0aad2
--- /dev/null
+++ b/src/application/code/core/Wootook/Core/install/mysql5/uninstall-1.5.0.php
@@ -0,0 +1,73 @@
+
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * - Neither the name of Grégory PLANCHAT nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * --> NOTICE <--
+ * This file is part of the core development branch, changing its contents will
+ * make you unable to use the automatic updates manager. Please refer to the
+ * documentation for further information about customizing One.Platform.
+ *
+ */
+
+$this->setSetupConnection('core_setup');
+
+$sql = <<getTableName('core_website')};
+SQL_EOF;
+
+$this->query($sql);
+
+$sql = <<getTableName('core_game_group')};
+SQL_EOF;
+
+$this->query($sql);
+
+$sql = <<getTableName('core_game')};
+SQL_EOF;
+
+$this->query($sql);
+
+$sql = <<getTableName('core_config')};
+SQL_EOF;
+
+$this->query($sql);
+
+$sql = <<getTableName('errors')};
+SQL_EOF;
+
+$this->query($sql);
diff --git a/application/code/core/Wootook/Empire/Block/Overview/DestroyPlanet.php b/src/application/code/core/Wootook/Empire/Block/Overview/DestroyPlanet.php
similarity index 100%
rename from application/code/core/Wootook/Empire/Block/Overview/DestroyPlanet.php
rename to src/application/code/core/Wootook/Empire/Block/Overview/DestroyPlanet.php
diff --git a/src/application/code/core/Wootook/Empire/Block/Overview/Fleet/List.php b/src/application/code/core/Wootook/Empire/Block/Overview/Fleet/List.php
new file mode 100644
index 0000000..770fcbb
--- /dev/null
+++ b/src/application/code/core/Wootook/Empire/Block/Overview/Fleet/List.php
@@ -0,0 +1,77 @@
+_fleetCollection === null) {
+ $player = Wootook_Player_Model_Session::getSingleton()->getPlayer();
+ $this->_fleetCollection = $player->getVisibleFleets();
+ }
+ return $this->_fleetCollection;
+ }
+
+ public function setItemTemplate($template)
+ {
+ $this->_itemTemplate = $template;
+
+ return $this;
+ }
+
+ public function getItemTemplate()
+ {
+ return $this->_itemTemplate;
+ }
+
+ public function setItemBlockType($blockType)
+ {
+ $this->_itemBlockType = $blockType;
+
+ return $this;
+ }
+
+ public function getItemBlockType()
+ {
+ return $this->_itemBlockType;
+ }
+
+ public function getItemBlock($fleet)
+ {
+ $blockName = $this->getNameInLayout() . ".item({$fleet->getId()})";
+
+ return $this->getLayout()
+ ->createBlock($this->getItemBlockType(), $blockName)
+ ->setTemplate($this->getItemTemplate())
+ ->setFleetItem($fleet);
+ }
+
+ public function prepareLayout()
+ {
+ parent::prepareLayout();
+
+ $this->_initChildBlocks();
+
+ return $this;
+ }
+
+ public function _initChildBlocks()
+ {
+ $parentBlock = $this->getLayout()
+ ->createBlock('core/concat', $this->getNameInLayout() . '.item-list')
+ ;
+ $this->setPartial('item-list', $parentBlock);
+
+ foreach ($this->getFleetCollection()->load() as $fleet) {
+ $block = $this->getItemBlock($fleet);
+ $parentBlock->setPartial($block->getNameInLayout(), $block);
+ }
+
+ return $this;
+ }
+}
diff --git a/src/application/code/core/Wootook/Empire/Block/Overview/Fleet/List/Item.php b/src/application/code/core/Wootook/Empire/Block/Overview/Fleet/List/Item.php
new file mode 100644
index 0000000..cd1cffc
--- /dev/null
+++ b/src/application/code/core/Wootook/Empire/Block/Overview/Fleet/List/Item.php
@@ -0,0 +1,153 @@
+_currentPlayer == null) {
+ $this->_currentPlayer = Wootook_Player_Model_Session::getSingleton()->getPlayer();
+ }
+ return $this->_currentPlayer;
+ }
+
+ /**
+ * @return Wootook_Player_Resource_Entity_Collection
+ */
+ public function getFleetOwnerCollection()
+ {
+ if ($this->_ownerCollection == null) {
+ $this->_ownerCollection = $this->getFleetItem()->getOwnerCollection();
+ }
+ return $this->_ownerCollection;
+ }
+
+ /**
+ * @return Wootook_Player_Resource_Entity_Collection
+ */
+ public function getFleetOwnerUsernames()
+ {
+ $usernameList = array();
+ foreach ($this->getFleetOwnerCollection()->load() as $owner) {
+ $usernameList[] = $owner->getUsername();
+ }
+ return $usernameList;
+ }
+
+ public function setFleetItem(Wootook_Empire_Model_Fleet $fleetItem)
+ {
+ $this->_fleet = $fleetItem;
+
+ return $this;
+ }
+
+ /**
+ * @return Wootook_Empire_Model_Fleet
+ */
+ public function getFleetItem()
+ {
+ return $this->_fleet;
+ }
+
+ public function getStartTime()
+ {
+ return $this->getFleetItem()->getStartTime();
+ }
+
+ public function getActionTime()
+ {
+ return $this->getFleetItem()->getActionTime();
+ }
+
+ public function getArrivalTime()
+ {
+ return $this->getFleetItem()->getArrivalTime();
+ }
+
+ public function isOwner()
+ {
+ return $this->getFleetItem()->isOwnedBy($this->getPlayer());
+ }
+
+ public function getRowClass()
+ {
+ return $this->getFleetItem()->getRowClass($this->getPlayer());
+ }
+
+ public function getOriginPlanet()
+ {
+ return $this->getFleetItem()->getOriginPlanet();
+ }
+
+ public function getOriginPlayer()
+ {
+ return $this->getOriginPlanet()->getPlayer();
+ }
+
+ public function getOriginPlayerName()
+ {
+ $player = $this->getOriginPlanet()->getPlayer();
+
+ if ($player !== null) {
+ return $player->getUsername();
+ }
+ return null;
+ }
+
+ public function getOriginPlanetName()
+ {
+ return $this->getOriginPlanetName();
+ }
+
+ public function getOriginPlanetCoords()
+ {
+ return $this->getOriginPlanetCoords();
+ }
+
+ public function getDestinationPlanet()
+ {
+ return $this->getFleetItem()->getDestinationPlanet();
+ }
+
+ public function getDestinationPlayer()
+ {
+ return $this->getDestinationPlanet()->getPlayer();
+ }
+
+ public function getDestinationPlayerName()
+ {
+ $player = $this->getDestinationPlanet()->getPlayer();
+
+ if ($player !== null) {
+ return $player->getUsername();
+ }
+ return null;
+ }
+
+ public function getDestinationPlanetName()
+ {
+ return $this->getDestinationPlanetName();
+ }
+
+ public function getDestinationPlanetCoords()
+ {
+ return $this->getDestinationPlanetCoords();
+ }
+
+ public function getMissionLabel()
+ {
+ return $this->getFleetItem()->getMissionLabel();
+ }
+
+ public function isMission($type)
+ {
+ return $this->getFleetItem()->isMission($type);
+ }
+}
diff --git a/application/code/core/Wootook/Empire/Block/Overview/RenamePlanet.php b/src/application/code/core/Wootook/Empire/Block/Overview/RenamePlanet.php
similarity index 100%
rename from application/code/core/Wootook/Empire/Block/Overview/RenamePlanet.php
rename to src/application/code/core/Wootook/Empire/Block/Overview/RenamePlanet.php
diff --git a/application/code/core/Wootook/Empire/Block/Planet/Builder/ItemAbstract.php b/src/application/code/core/Wootook/Empire/Block/Planet/Builder/ItemAbstract.php
similarity index 52%
rename from application/code/core/Wootook/Empire/Block/Planet/Builder/ItemAbstract.php
rename to src/application/code/core/Wootook/Empire/Block/Planet/Builder/ItemAbstract.php
index b936a71..dfffacd 100644
--- a/application/code/core/Wootook/Empire/Block/Planet/Builder/ItemAbstract.php
+++ b/src/application/code/core/Wootook/Empire/Block/Planet/Builder/ItemAbstract.php
@@ -3,24 +3,31 @@
abstract class Wootook_Empire_Block_Planet_Builder_ItemAbstract
extends Wootook_Core_Block_Template
{
- protected $_user = null;
+ protected $_player = null;
protected $_planet = null;
protected $_itemId = null;
- public function setUser(Wootook_Empire_Model_User $user)
+ protected $_labels = null;
+
+ public function __construct()
{
- $this->_user = $user;
+ $this->_labels = Wootook_Empire_Helper_Config_Labels::getSingleton();
+ }
+
+ public function setPlayer(Wootook_Player_Model_Entity $player)
+ {
+ $this->_player = $player;
return $this;
}
- public function getUser()
+ public function getPlayer()
{
- if ($this->_user === null) {
- $this->_user = Wootook_Empire_Model_User::getSingleton();
+ if ($this->_player === null) {
+ $this->_player = Wootook_Player_Model_Session::getSingleton()->getPlayer();
}
- return $this->_user;
+ return $this->_player;
}
public function setPlanet(Wootook_Empire_Model_Planet $planet)
@@ -33,7 +40,7 @@ abstract class Wootook_Empire_Block_Planet_Builder_ItemAbstract
public function getPlanet()
{
if ($this->_planet === null) {
- $this->_planet = $this->getUser()->getCurrentPlanet();
+ $this->_planet = $this->getPlayer()->getCurrentPlanet();
}
return $this->_planet;
@@ -53,41 +60,27 @@ abstract class Wootook_Empire_Block_Planet_Builder_ItemAbstract
public function getItemInfoUrl()
{
- return $this->getUrl('infos.php', array('gid' => $this->getItemId()));
+ return $this->getStaticUrl('infos.php', array('gid' => $this->getItemId()));
+ }
+
+ public function getLabel($type)
+ {
+ return $this->_labels[$this->getItemId()][$type];
}
public function getItemImageUrl()
{
- // TODO : Upgrade theme
- return $this->getSkinUrl('graphics/gebaeude/' . $this->getItemId() . '.gif');
+ return $this->getStaticUrl($this->getLabel('image'));
}
public function getName()
{
- static $lang = null;
- if ($lang === null) {
- // FIXME: implement a cleaner way to get names
- $lang = includeLang('tech');
- }
-
- if (isset($lang['tech']) && isset($lang['tech'][$this->getItemId()])) {
- return $this->__($lang['tech'][$this->getItemId()]);
- }
- return '';
+ return $this->getLabel('name');
}
public function getDescription()
{
- static $lang = null;
- if ($lang === null) {
- // FIXME: implement a cleaner way to get names
- $lang = includeLang('tech');
- }
-
- if (isset($lang['res']) && isset($lang['res']['descriptions']) && isset($lang['res']['descriptions'][$this->getItemId()])) {
- return $this->__($lang['res']['descriptions'][$this->getItemId()]);
- }
- return '';
+ return $this->getLabel('description');
}
public function getResourceName($resourceId)
@@ -98,7 +91,7 @@ abstract class Wootook_Empire_Block_Planet_Builder_ItemAbstract
$lang = includeLang('imperium');
}
if ($resourceId == 'cristal') {
- $resourceId = 'crystal';
+ $resourceId = 'crystal'; // FIXME: backward compatibility
}
if (isset($lang[$resourceId])) {
@@ -115,4 +108,4 @@ abstract class Wootook_Empire_Block_Planet_Builder_ItemAbstract
abstract public function getResourcesNeeded($level);
abstract public function getBuildingTime($level);
-}
\ No newline at end of file
+}
diff --git a/application/code/core/Wootook/Empire/Block/Planet/Builder/Queue/ItemAbstract.php b/src/application/code/core/Wootook/Empire/Block/Planet/Builder/Queue/ItemAbstract.php
similarity index 100%
rename from application/code/core/Wootook/Empire/Block/Planet/Builder/Queue/ItemAbstract.php
rename to src/application/code/core/Wootook/Empire/Block/Planet/Builder/Queue/ItemAbstract.php
diff --git a/application/code/core/Wootook/Empire/Block/Planet/Builder/QueueAbstract.php b/src/application/code/core/Wootook/Empire/Block/Planet/Builder/QueueAbstract.php
similarity index 82%
rename from application/code/core/Wootook/Empire/Block/Planet/Builder/QueueAbstract.php
rename to src/application/code/core/Wootook/Empire/Block/Planet/Builder/QueueAbstract.php
index d6122d3..baf9c71 100644
--- a/application/code/core/Wootook/Empire/Block/Planet/Builder/QueueAbstract.php
+++ b/src/application/code/core/Wootook/Empire/Block/Planet/Builder/QueueAbstract.php
@@ -3,25 +3,25 @@
abstract class Wootook_Empire_Block_Planet_Builder_QueueAbstract
extends Wootook_Core_Block_Template
{
- protected $_user = null;
+ protected $_player = null;
protected $_planet = null;
protected $_itemTemplate = null;
protected $_itemBlock = null;
- public function setUser(Wootook_Empire_Model_User $user)
+ public function setPlayer(Wootook_Player_Model_Entity $player)
{
- $this->_user = $user;
+ $this->_player = $player;
return $this;
}
- public function getUser()
+ public function getPlayer()
{
- if ($this->_user === null) {
- $this->_user = Wootook_Empire_Model_User::getSingleton();
+ if ($this->_player === null) {
+ $this->_player = Wootook_Player_Model_Session::getSingleton()->getPlayer();
}
- return $this->_user;
+ return $this->_player;
}
public function setPlanet(Wootook_Empire_Model_Planet $planet)
@@ -34,7 +34,7 @@ abstract class Wootook_Empire_Block_Planet_Builder_QueueAbstract
public function getPlanet()
{
if ($this->_planet === null) {
- $this->_planet = $this->getUser()->getCurrentPlanet();
+ $this->_planet = $this->getPlayer()->getCurrentPlanet();
}
return $this->_planet;
diff --git a/application/code/core/Wootook/Empire/Block/Planet/BuilderAbstract.php b/src/application/code/core/Wootook/Empire/Block/Planet/BuilderAbstract.php
similarity index 100%
rename from application/code/core/Wootook/Empire/Block/Planet/BuilderAbstract.php
rename to src/application/code/core/Wootook/Empire/Block/Planet/BuilderAbstract.php
diff --git a/application/code/core/Wootook/Empire/Block/Planet/Buildings.php b/src/application/code/core/Wootook/Empire/Block/Planet/Buildings.php
similarity index 87%
rename from application/code/core/Wootook/Empire/Block/Planet/Buildings.php
rename to src/application/code/core/Wootook/Empire/Block/Planet/Buildings.php
index e777cdd..77d4a86 100644
--- a/application/code/core/Wootook/Empire/Block/Planet/Buildings.php
+++ b/src/application/code/core/Wootook/Empire/Block/Planet/Buildings.php
@@ -15,7 +15,7 @@ class Wootook_Empire_Block_Planet_Buildings
public function getPlanet()
{
if ($this->_planet === null) {
- $this->_planet = Wootook_Empire_Model_User::getSingleton()
+ $this->_planet = Wootook_Player_Model_Session::getSingleton()->getPlayer()
->getCurrentPlanet()
;
}
@@ -24,7 +24,7 @@ class Wootook_Empire_Block_Planet_Buildings
public function _initChildBlocks()
{
- $types = Wootook_Empire_Model_Game_Types::getSingleton();
+ $types = Wootook_Empire_Helper_Config_Types::getSingleton();
$type = Legacies_Empire::TYPE_BUILDING_PLANET;
if ($this->getPlanet()->isMoon()) {
$type = Legacies_Empire::TYPE_BUILDING_MOON;
diff --git a/application/code/core/Wootook/Empire/Block/Planet/Buildings/Item.php b/src/application/code/core/Wootook/Empire/Block/Planet/Buildings/Item.php
similarity index 78%
rename from application/code/core/Wootook/Empire/Block/Planet/Buildings/Item.php
rename to src/application/code/core/Wootook/Empire/Block/Planet/Buildings/Item.php
index b24a819..1c4a970 100644
--- a/application/code/core/Wootook/Empire/Block/Planet/Buildings/Item.php
+++ b/src/application/code/core/Wootook/Empire/Block/Planet/Buildings/Item.php
@@ -13,6 +13,22 @@ class Wootook_Empire_Block_Planet_Buildings_Item
return $this->getPlanet()->getResourcesNeeded($this->getItemId(), $level);
}
+ public function isBuildable($level = null)
+ {
+ if ($level === null) {
+ $level = $this->getNextLevel();
+ }
+ $resources = $this->getResourcesNeeded($level);
+
+ foreach ($resources as $resourceId => $resourceValue) {
+ $amount = $this->getPlanet()->getResourceAmount($resourceId);
+ if (Math::comp($amount, $resourceValue) < 0) {
+ return false;
+ }
+ }
+ return true;
+ }
+
public function getQueuedLevel()
{
return $this->getPlanet()->getBuildingLevelQueued($this->getItemId());
diff --git a/application/code/core/Wootook/Empire/Block/Planet/Buildings/Queue.php b/src/application/code/core/Wootook/Empire/Block/Planet/Buildings/Queue.php
similarity index 100%
rename from application/code/core/Wootook/Empire/Block/Planet/Buildings/Queue.php
rename to src/application/code/core/Wootook/Empire/Block/Planet/Buildings/Queue.php
diff --git a/application/code/core/Wootook/Empire/Block/Planet/Buildings/Queue/Item.php b/src/application/code/core/Wootook/Empire/Block/Planet/Buildings/Queue/Item.php
similarity index 55%
rename from application/code/core/Wootook/Empire/Block/Planet/Buildings/Queue/Item.php
rename to src/application/code/core/Wootook/Empire/Block/Planet/Buildings/Queue/Item.php
index e3721e3..6941b62 100644
--- a/application/code/core/Wootook/Empire/Block/Planet/Buildings/Queue/Item.php
+++ b/src/application/code/core/Wootook/Empire/Block/Planet/Buildings/Queue/Item.php
@@ -1,5 +1,39 @@
+ * 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 Wootook_Empire_Block_Planet_Buildings_Queue_Item
extends Wootook_Empire_Block_Planet_Builder_Queue_ItemAbstract
{
@@ -30,6 +64,14 @@ class Wootook_Empire_Block_Planet_Buildings_Queue_Item
return $this->getPlanet()->getBuildingTime($this->getItemId(), $level);
}
+ public function getBuildingRemainingTime()
+ {
+ $totalTime = $this->getPlanet()->getBuildingTime($this->getItemId(), $this->getItemQueuedLevel());
+ $item = $this->getItem();
+
+ return $item->getData('created_at') - $item->getData('updated_at') + $totalTime;
+ }
+
public function getResourcesConfigForLevel($level)
{
$resources = $this->getResourcesNeeded($level);
diff --git a/src/application/code/core/Wootook/Empire/Block/Planet/Overview.php b/src/application/code/core/Wootook/Empire/Block/Planet/Overview.php
new file mode 100644
index 0000000..f24f5dc
--- /dev/null
+++ b/src/application/code/core/Wootook/Empire/Block/Planet/Overview.php
@@ -0,0 +1,40 @@
+getPlayer();
+ }
+
+ /**
+ *
+ * @return Wootook_Empire_Model_Planet
+ */
+ public function getPlanet()
+ {
+ if ($this->_planet === null) {
+ $this->_planet = $this->getPlayer()->getCurrentPlanet();
+ }
+ return $this->_planet;
+ }
+
+ public function getPlanetName()
+ {
+ return $this->getPlanet()->getName();
+ }
+
+ public function getPlanetCoords()
+ {
+ return $this->getPlanet()->getCoords();
+ }
+
+ public function getPlanetImage()
+ {
+ return $this->getPlanet()->getImage();
+ }
+}
\ No newline at end of file
diff --git a/application/code/core/Wootook/Empire/Block/PlanetList.php b/src/application/code/core/Wootook/Empire/Block/PlanetList.php
similarity index 100%
rename from application/code/core/Wootook/Empire/Block/PlanetList.php
rename to src/application/code/core/Wootook/Empire/Block/PlanetList.php
diff --git a/src/application/code/core/Wootook/Empire/Block/Topnav.php b/src/application/code/core/Wootook/Empire/Block/Topnav.php
new file mode 100644
index 0000000..72a6d5b
--- /dev/null
+++ b/src/application/code/core/Wootook/Empire/Block/Topnav.php
@@ -0,0 +1,34 @@
+getPlayer();
+ }
+
+ /**
+ *
+ * @return Wootook_Empire_Model_Planet
+ */
+ public function getCurrentPlanet()
+ {
+ return $this->getCurrentPlayer()->getCurrentPlanet();
+ }
+
+ /**
+ *
+ * @return Wootook_Empire_Resource_Planet_Collection
+ */
+ public function getPlanetCollection()
+ {
+ return $this->getCurrentPlayer()
+ ->getPlanetCollection(array(Wootook_Empire_Model_Planet::TYPE_PLANET))
+ ->load();
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Empire/Controller/BuildingsController.php b/src/application/code/core/Wootook/Empire/Controller/BuildingsController.php
new file mode 100644
index 0000000..6a5234b
--- /dev/null
+++ b/src/application/code/core/Wootook/Empire/Controller/BuildingsController.php
@@ -0,0 +1,43 @@
+loadLayout('planet.buildings');
+ $this->renderLayout();
+ }
+
+ public function buildAction()
+ {
+ if (!is_numeric($buildingId = $this->getRequest()->getParam('id'))) {
+ $this->_redirect('*/*/view');
+ return;
+ }
+
+ $this->getCurrentPlanet()->appendBuildingQueue($buildingId);
+ $this->getCurrentPlanet()->save();
+
+ $this->_redirect('*/*/');
+ }
+
+ public function cancelAction()
+ {
+ if (!is_numeric($buildingId = $this->getRequest()->getParam('id'))) {
+ $this->_redirect('*/*/view');
+ return;
+ }
+
+ $this->getCurrentPlanet()->dequeueBuilding($buildingId);
+ $this->getCurrentPlanet()->save();
+
+ $this->_redirect('*/*/');
+ }
+}
diff --git a/src/application/code/core/Wootook/Empire/Exception.php b/src/application/code/core/Wootook/Empire/Exception.php
new file mode 100644
index 0000000..e2bd909
--- /dev/null
+++ b/src/application/code/core/Wootook/Empire/Exception.php
@@ -0,0 +1,3 @@
+= 50300) {
+ parent::__construct($message, $code, $previous);
+ } else {
+ parent::__construct($message, $code);
+ $this->_previous = $previous;
+ }
+ }
+
+ public function __call($method, $params)
+ {
+ if (strtolower($method) == 'getprevious') {
+ return $this->_previous;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Empire/Exception/Planet.php b/src/application/code/core/Wootook/Empire/Exception/Planet.php
new file mode 100644
index 0000000..36c2cf2
--- /dev/null
+++ b/src/application/code/core/Wootook/Empire/Exception/Planet.php
@@ -0,0 +1,7 @@
+= 50300) {
+ parent::__construct($message, $code, $previous);
+ } else {
+ parent::__construct($message, $code);
+ $this->_previous = $previous;
+ }
+ }
+
+ public function __call($method, $params)
+ {
+ if (strtolower($method) == 'getprevious') {
+ return $this->_previous;
+ }
+ }
+}
\ No newline at end of file
diff --git a/application/code/core/Wootook/Empire/Model/Game/Combat.php b/src/application/code/core/Wootook/Empire/Helper/Config/Combat.php
similarity index 88%
rename from application/code/core/Wootook/Empire/Model/Game/Combat.php
rename to src/application/code/core/Wootook/Empire/Helper/Config/Combat.php
index 48a9e1b..26a1bc8 100644
--- a/application/code/core/Wootook/Empire/Model/Game/Combat.php
+++ b/src/application/code/core/Wootook/Empire/Helper/Config/Combat.php
@@ -7,8 +7,8 @@
* @uses Wootook_Object
* @uses Legacies_Empire
*/
-class Wootook_Empire_Model_Game_Combat
- extends Wootook_Core_Model_Config_Abstract
+class Wootook_Empire_Helper_Config_Combat
+ extends Wootook_Core_Helper_Config_ConfigHandler
implements Wootook_Core_Singleton
{
private static $_singleton = null;
diff --git a/application/code/core/Wootook/Empire/Model/Game/FieldsAlias.php b/src/application/code/core/Wootook/Empire/Helper/Config/FieldsAlias.php
similarity index 87%
rename from application/code/core/Wootook/Empire/Model/Game/FieldsAlias.php
rename to src/application/code/core/Wootook/Empire/Helper/Config/FieldsAlias.php
index 9a4ab2b..101bc5f 100644
--- a/application/code/core/Wootook/Empire/Model/Game/FieldsAlias.php
+++ b/src/application/code/core/Wootook/Empire/Helper/Config/FieldsAlias.php
@@ -7,8 +7,8 @@
* @uses Wootook_Object
* @uses Legacies_Empire
*/
-class Wootook_Empire_Model_Game_FieldsAlias
- extends Wootook_Core_Model_Config_Abstract
+class Wootook_Empire_Helper_Config_FieldsAlias
+ extends Wootook_Core_Helper_Config_ConfigHandler
implements Wootook_Core_Singleton
{
private static $_singleton = null;
diff --git a/src/application/code/core/Wootook/Empire/Helper/Config/Labels.php b/src/application/code/core/Wootook/Empire/Helper/Config/Labels.php
new file mode 100644
index 0000000..94297a2
--- /dev/null
+++ b/src/application/code/core/Wootook/Empire/Helper/Config/Labels.php
@@ -0,0 +1,51 @@
+_initData("locale/{$locale}/labels");
+ return $this;
+ }
+
+ protected function _load()
+ {
+ // NOP
+ return $this;
+ }
+
+ protected function _save()
+ {
+ // NOP
+ return $this;
+ }
+
+ protected function _delete()
+ {
+ // NOP
+ return $this;
+ }
+}
diff --git a/application/code/core/Wootook/Empire/Model/Game/Prices.php b/src/application/code/core/Wootook/Empire/Helper/Config/Prices.php
similarity index 88%
rename from application/code/core/Wootook/Empire/Model/Game/Prices.php
rename to src/application/code/core/Wootook/Empire/Helper/Config/Prices.php
index 9133d34..1a328de 100644
--- a/application/code/core/Wootook/Empire/Model/Game/Prices.php
+++ b/src/application/code/core/Wootook/Empire/Helper/Config/Prices.php
@@ -7,8 +7,8 @@
* @uses Wootook_Object
* @uses Legacies_Empire
*/
-class Wootook_Empire_Model_Game_Prices
- extends Wootook_Core_Model_Config_Abstract
+class Wootook_Empire_Helper_Config_Prices
+ extends Wootook_Core_Helper_Config_ConfigHandler
implements Wootook_Core_Singleton
{
private static $_singleton = null;
diff --git a/application/code/core/Wootook/Empire/Model/Game/Production.php b/src/application/code/core/Wootook/Empire/Helper/Config/Production.php
similarity index 87%
rename from application/code/core/Wootook/Empire/Model/Game/Production.php
rename to src/application/code/core/Wootook/Empire/Helper/Config/Production.php
index 60ab21c..d4539fc 100644
--- a/application/code/core/Wootook/Empire/Model/Game/Production.php
+++ b/src/application/code/core/Wootook/Empire/Helper/Config/Production.php
@@ -7,8 +7,8 @@
* @uses Wootook_Object
* @uses Legacies_Empire
*/
-class Wootook_Empire_Model_Game_Production
- extends Wootook_Core_Model_Config_Abstract
+class Wootook_Empire_Helper_Config_Production
+ extends Wootook_Core_Helper_Config_ConfigHandler
implements Wootook_Core_Singleton
{
private static $_singleton = null;
diff --git a/application/code/core/Wootook/Empire/Model/Game/Requirements.php b/src/application/code/core/Wootook/Empire/Helper/Config/Requirements.php
similarity index 87%
rename from application/code/core/Wootook/Empire/Model/Game/Requirements.php
rename to src/application/code/core/Wootook/Empire/Helper/Config/Requirements.php
index 9f09689..04ea042 100644
--- a/application/code/core/Wootook/Empire/Model/Game/Requirements.php
+++ b/src/application/code/core/Wootook/Empire/Helper/Config/Requirements.php
@@ -7,8 +7,8 @@
* @uses Wootook_Object
* @uses Legacies_Empire
*/
-class Wootook_Empire_Model_Game_Requirements
- extends Wootook_Core_Model_Config_Abstract
+class Wootook_Empire_Helper_Config_Requirements
+ extends Wootook_Core_Helper_Config_ConfigHandler
implements Wootook_Core_Singleton
{
private static $_singleton = null;
diff --git a/application/code/core/Wootook/Empire/Model/Game/Resources.php b/src/application/code/core/Wootook/Empire/Helper/Config/Resources.php
similarity index 87%
rename from application/code/core/Wootook/Empire/Model/Game/Resources.php
rename to src/application/code/core/Wootook/Empire/Helper/Config/Resources.php
index c825f74..8ce2483 100644
--- a/application/code/core/Wootook/Empire/Model/Game/Resources.php
+++ b/src/application/code/core/Wootook/Empire/Helper/Config/Resources.php
@@ -7,8 +7,8 @@
* @uses Wootook_Object
* @uses Legacies_Empire
*/
-class Wootook_Empire_Model_Game_Resources
- extends Wootook_Core_Model_Config_Abstract
+class Wootook_Empire_Helper_Config_Resources
+ extends Wootook_Core_Helper_Config_ConfigHandler
implements Wootook_Core_Singleton
{
private static $_singleton = null;
diff --git a/application/code/core/Wootook/Empire/Model/Game/Types.php b/src/application/code/core/Wootook/Empire/Helper/Config/Types.php
similarity index 90%
rename from application/code/core/Wootook/Empire/Model/Game/Types.php
rename to src/application/code/core/Wootook/Empire/Helper/Config/Types.php
index 291c964..9ef029d 100644
--- a/application/code/core/Wootook/Empire/Model/Game/Types.php
+++ b/src/application/code/core/Wootook/Empire/Helper/Config/Types.php
@@ -7,8 +7,8 @@
* @uses Wootook_Object
* @uses Legacies_Empire
*/
-class Wootook_Empire_Model_Game_Types
- extends Wootook_Core_Model_Config_Abstract
+class Wootook_Empire_Helper_Config_Types
+ extends Wootook_Core_Helper_Config_ConfigHandler
implements Wootook_Core_Singleton
{
private static $_singleton = null;
diff --git a/application/code/core/Wootook/Empire/Model/Builder/Break.php b/src/application/code/core/Wootook/Empire/Model/Builder/Break.php
similarity index 100%
rename from application/code/core/Wootook/Empire/Model/Builder/Break.php
rename to src/application/code/core/Wootook/Empire/Model/Builder/Break.php
diff --git a/application/code/core/Wootook/Empire/Model/Builder/Item.php b/src/application/code/core/Wootook/Empire/Model/Builder/Item.php
similarity index 100%
rename from application/code/core/Wootook/Empire/Model/Builder/Item.php
rename to src/application/code/core/Wootook/Empire/Model/Builder/Item.php
diff --git a/application/code/core/Wootook/Empire/Model/BuilderAbstract.php b/src/application/code/core/Wootook/Empire/Model/BuilderAbstract.php
similarity index 83%
rename from application/code/core/Wootook/Empire/Model/BuilderAbstract.php
rename to src/application/code/core/Wootook/Empire/Model/BuilderAbstract.php
index ee3c32e..dc0899e 100644
--- a/application/code/core/Wootook/Empire/Model/BuilderAbstract.php
+++ b/src/application/code/core/Wootook/Empire/Model/BuilderAbstract.php
@@ -10,10 +10,10 @@ abstract class Wootook_Empire_Model_BuilderAbstract
protected $_currentPlanet = null;
/**
- * User instance
- * @var Wootook_Empire_Model_User
+ * Player instance
+ * @var Wootook_Player_Model_Entity
*/
- protected $_currentUser = null;
+ protected $_currentPlayer = null;
/**
* construction queue
@@ -30,12 +30,12 @@ abstract class Wootook_Empire_Model_BuilderAbstract
/**
*
* @param Wootook_Empire_Model_Planet $currentPlanet
- * @param Wootook_Empire_Model_User $currentUser
+ * @param Wootook_Player_Model_Entity $currentPlayer
*/
- public function __construct(Wootook_Empire_Model_Planet $currentPlanet, Wootook_Empire_Model_User $currentUser)
+ public function __construct(Wootook_Empire_Model_Planet $currentPlanet, Wootook_Player_Model_Entity $currentPlayer)
{
$this->_currentPlanet = $currentPlanet;
- $this->_currentUser = $currentUser;
+ $this->_currentPlayer = $currentPlayer;
$this->init();
}
@@ -46,6 +46,10 @@ abstract class Wootook_Empire_Model_BuilderAbstract
public function enqueue($params, $index = null)
{
+ if ($this->_currentPlayer->isVacation()) {
+ return $this;
+ }
+
$item = $this->_initItem($params);
if ($item === null) {
return $this;
@@ -94,7 +98,10 @@ abstract class Wootook_Empire_Model_BuilderAbstract
{
$this->clearQueue();
- $unserialized = @unserialize($serialized);
+ $unserialized = false;
+ if (!empty($serialized)) {
+ $unserialized = @unserialize($serialized);
+ }
if ($unserialized === false) {
$this->_queue = array();
return $this;
@@ -122,8 +129,8 @@ abstract class Wootook_Empire_Model_BuilderAbstract
$this->_queue = array();
}
- abstract public function updateQueue($time);
- abstract public function appendQueue($typeId, $qty, $time);
+ abstract public function updateQueue(Wootook_Core_DateTime $time);
+ abstract public function appendQueue($typeId, $qty, Wootook_Core_DateTime $time);
/**
* Check if an item type is actually buildable on the current
@@ -134,8 +141,8 @@ abstract class Wootook_Empire_Model_BuilderAbstract
*/
public function checkAvailability($typeId)
{
- $types = Wootook_Empire_Model_Game_Types::getSingleton();
- $requirements = Wootook_Empire_Model_Game_Requirements::getSingleton();
+ $types = Wootook_Empire_Helper_Config_Types::getSingleton();
+ $requirements = Wootook_Empire_Helper_Config_Requirements::getSingleton();
if (!isset($requirements[$typeId]) || empty($requirements[$typeId])) {
return true;
@@ -144,7 +151,7 @@ abstract class Wootook_Empire_Model_BuilderAbstract
foreach ($requirements[$typeId] as $requirement => $level) {
if ($types->is($requirement, Legacies_Empire::TYPE_BUILDING) && $this->_currentPlanet->hasElement($requirement, $level)) {
continue;
- } else if ($types->is($requirement, Legacies_Empire::TYPE_RESEARCH) && $this->_currentUser->hasElement($requirement, $level)) {
+ } else if ($types->is($requirement, Legacies_Empire::TYPE_RESEARCH) && $this->_currentPlayer->hasElement($requirement, $level)) {
continue;
} else if ($types->is($requirement, Legacies_Empire::TYPE_DEFENSE) && $this->_currentPlanet->hasElement($requirement, $level)) {
continue;
@@ -205,9 +212,9 @@ abstract class Wootook_Empire_Model_BuilderAbstract
return $this->_currentPlanet;
}
- public function getCurrentUser()
+ public function getCurrentPlayer()
{
- return $this->_currentUser;
+ return $this->_currentPlayer;
}
public function setCurrentPlanet(Wootook_Empire_Model_Planet $planet)
@@ -217,9 +224,9 @@ abstract class Wootook_Empire_Model_BuilderAbstract
return $this;
}
- public function setCurrentUser(Wootook_Empire_Model_User $user)
+ public function setCurrentPlayer(Wootook_Player_Model_Entity $player)
{
- $this->_currentUser = $user;
+ $this->_currentPlayer = $player;
return $this;
}
@@ -244,4 +251,4 @@ abstract class Wootook_Empire_Model_BuilderAbstract
}
return $resourceAmounts;
}
-}
\ No newline at end of file
+}
diff --git a/application/code/core/Wootook/Empire/Model/Fleet.php b/src/application/code/core/Wootook/Empire/Model/Fleet.php
similarity index 56%
rename from application/code/core/Wootook/Empire/Model/Fleet.php
rename to src/application/code/core/Wootook/Empire/Model/Fleet.php
index 1ce2b7d..e622226 100644
--- a/application/code/core/Wootook/Empire/Model/Fleet.php
+++ b/src/application/code/core/Wootook/Empire/Model/Fleet.php
@@ -7,7 +7,7 @@
* @uses Legacies_Empire
*/
class Wootook_Empire_Model_Fleet
- extends Wootook_Core_Entity
+ extends Wootook_Core_Mvc_Model_Entity
{
protected static $_instances = array();
@@ -34,24 +34,36 @@ class Wootook_Empire_Model_Fleet
{
$this->setIdFieldName('fleet_id');
$this->setTableName('fleets');
+
+ $this->getDataMapper()
+ ->addRule('fleet_start_time', 'date-time')
+ ->addRule('fleet_end_time', 'date-time')
+ ->addRule('fleet_end_stay', 'date-time')
+ ;
}
public static function planetListener($eventData)
{
}
- public function isOwnedBy(Wootook_Empire_Model_User $user)
+ public function isOwnedBy(Wootook_Player_Model_Entity $player)
{
- if ($this->getData('fleet_owner') == $user->getId()) {
+ if ($this->getData('fleet_owner') == $player->getId()) {
return true;
}
return false;
}
- public function getOwner()
+ /**
+ * @return null|Wootook_Player_Resource_Entity_Collection
+ */
+ public function getOwnerCollection()
{
if ($id = $this->getData('fleet_owner')) {
- return Wootook_Empire_Model_User::factory($id);
+ $ownerCollection = new Wootook_Player_Resource_Entity_Collection($this->getReadConnection());
+ $ownerCollection->addFieldToFilter('id', $id);
+
+ return $ownerCollection;
}
return null;
}
@@ -64,10 +76,10 @@ class Wootook_Empire_Model_Fleet
return false;
}
- public function getRowClass(Wootook_Empire_Model_User $user = null)
+ public function getRowClass(Wootook_Player_Model_Entity $player = null)
{
if ($this->isMission(Legacies_Empire::ID_MISSION_ATTACK) || $this->isMission(Legacies_Empire::ID_MISSION_GROUP_ATTACK)) {
- if ($user !== null && $this->isOwnedBy($user)) {
+ if ($player !== null && $this->isOwnedBy($player)) {
return 'attack';
} else {
return 'ownattack';
@@ -86,6 +98,8 @@ class Wootook_Empire_Model_Fleet
return 'missiles';
} else if ($this->isMission(Legacies_Empire::ID_MISSION_EXPEDITION)) {
return 'expedition';
+ } else if ($this->isMission(Legacies_Empire::ID_MISSION_ORE_MINING)) {
+ return 'ore-mining';
}
}
@@ -107,25 +121,34 @@ class Wootook_Empire_Model_Fleet
return Wootook::__('Missiles Launch');
} else if ($this->isMission(Legacies_Empire::ID_MISSION_EXPEDITION)) {
return Wootook::__('Expedition');
+ } else if ($this->isMission(Legacies_Empire::ID_MISSION_ORE_MINING)) {
+ return Wootook::__('Ore mining');
}
return Legacies::__('Unknown');
}
+ /**
+ * @return Wootook_Core_DateTime
+ */
public function getStartTime()
{
return $this->getData('fleet_start_time');
}
+ /**
+ * @return Wootook_Core_DateTime
+ */
+
public function getActionTime()
{
return $this->getData('fleet_end_stay');
}
+ /**
+ * @return Wootook_Core_DateTime
+ */
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');
}
@@ -141,15 +164,85 @@ class Wootook_Empire_Model_Fleet
return Wootook_Empire_Model_Planet::factoryFromCoords($coords, $type);
}
+ public function getOriginPlanetName()
+ {
+ if (!($planet = $this->getOriginPlanet()->getId())) {
+ return '';
+ }
+ return $planet->getName();
+ }
+
+ public function getOriginPlanetCoords()
+ {
+ if (!($planet = $this->getOriginPlanet()->getId())) {
+ return sprintf('%s:%s:%s', $this->getData('fleet_start_galaxy'), $this->getData('fleet_start_system'), $this->getData('fleet_start_planet'));
+ }
+ return $planet->getCoords();
+ }
+
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
+
+ public function getDestinationPlanetName()
+ {
+ if (!($planet = $this->getDestinationPlanet()->getId())) {
+ return '';
+ }
+ return $planet->getName();
+ }
+
+ public function getDestinationPlanetCoords()
+ {
+ if (!($planet = $this->getDestinationPlanet()->getId())) {
+ return sprintf('%s:%s:%s', $this->getData('fleet_end_galaxy'), $this->getData('fleet_end_system'), $this->getData('fleet_end_planet'));
+ }
+ return $planet->getCoords();
+ }
+
+ public function goBack()
+ {
+ $this->setData('fleet_mess', 1)->save();
+
+ return $this;
+ }
+
+ /**
+ * @param Wootook_Empire_Model_Planet $planet
+ * @return Wootook_Empire_Model_Fleet
+ */
+ public function dock(Wootook_Empire_Model_Planet $planet)
+ {
+ // Backward-compatible way to unserialize fleet ships listing
+ $serializedFleetArray = $this->getData('fleet_array');
+ foreach (explode(';', $serializedFleetArray) as $fleetShipData) {
+ if (empty($fleetShipData)) {
+ continue;
+ }
+ $fleetShipData = explode(',', $fleetShipData);
+ if (count($fleetShipData) != 2) {
+ continue;
+ }
+ $planet->setElement($fleetShipData[0], Math::add($planet->getElement($fleetShipData[0]), $fleetShipData[1]));
+ }
+
+ $planet
+ ->setData('metal', Math::add($planet->getData('metal'), $this->getData('fleet_resource_metal')))
+ ->setData('cristal', Math::add($planet->getData('cristal'), $this->getData('fleet_resource_crystal')))
+ ->setData('deuterium', Math::add($planet->getData('deuterium'), $this->getData('fleet_resource_deuterium')))
+ ->save();
+ ;
+
+ $this->delete();
+
+ return $this;
+ }
+}
diff --git a/src/application/code/core/Wootook/Empire/Model/Galaxy/Position.php b/src/application/code/core/Wootook/Empire/Model/Galaxy/Position.php
new file mode 100644
index 0000000..2ce4b24
--- /dev/null
+++ b/src/application/code/core/Wootook/Empire/Model/Galaxy/Position.php
@@ -0,0 +1,11 @@
+_tableName = 'galaxy';
+ $this->_idFieldNames = array('id_planet');
+ }
+}
diff --git a/application/code/core/Wootook/Empire/Model/Planet.php b/src/application/code/core/Wootook/Empire/Model/Planet.php
similarity index 63%
rename from application/code/core/Wootook/Empire/Model/Planet.php
rename to src/application/code/core/Wootook/Empire/Model/Planet.php
index c013667..980524f 100644
--- a/application/code/core/Wootook/Empire/Model/Planet.php
+++ b/src/application/code/core/Wootook/Empire/Model/Planet.php
@@ -4,10 +4,10 @@
*
* @uses Wootook_Object
* @uses Legacies_Empire
- * @uses Legacies_Empire_User
+ * @uses Wootook_Player_Model_Entity
*/
class Wootook_Empire_Model_Planet
- extends Wootook_Core_Entity
+ extends Wootook_Core_Mvc_Model_Entity
{
const TYPE_PLANET = 1;
const TYPE_DEBRIS = 2;
@@ -17,9 +17,9 @@ class Wootook_Empire_Model_Planet
protected $_eventObject = 'planet';
/**
- * @var Wootook_Empire_Model_User
+ * @var Wootook_Player_Model_Entity
*/
- protected $_user = null;
+ protected $_player = null;
/**
* @var Wootook_Empire_Model_Planet
@@ -27,7 +27,12 @@ class Wootook_Empire_Model_Planet
protected $_moon = null;
/**
- * @var Wootook_Empire_Model_Planet_Builder
+ * @var Wootook_Empire_Model_Planet
+ */
+ protected $_planet = null;
+
+ /**
+ * @var Wootook_Empire_Model_Planet_Builder_Builder
*/
protected $_builder = null;
@@ -48,6 +53,7 @@ class Wootook_Empire_Model_Planet
protected static $_productionInstances = array();
+ /** @var Wootook_Empire_Model_Planet_PluginLoader */
protected $_pluginLoader = null;
public static function factory($id)
@@ -95,31 +101,40 @@ class Wootook_Empire_Model_Planet
$coords['type'] = $type;
}
- $database = Wootook_Database::getSingleton();
- $collection = new Wootook_Core_Collection('planets');
- $collection
- ->column('id')
- ->where('galaxy=:galaxy')
- ->where('system=:system')
- ->where('planet=:position')
- ->where('planet_type=:type')
- ->limit(1)
- ->load($coords)
- ;
+ $adapter = Wootook_Core_Database_ConnectionManager::getSingleton()
+ ->getConnection('core_read');
+ $collection = new Wootook_Empire_Resource_Planet_Collection($adapter);
+ $collection->addCoordsToFilter($coords['galaxy'], $coords['system'], $coords['position'], $coords['type'])
+ ->setPage(1, 1)
+ ->load();
- $planetData = $collection->getFirstItem();
-
- if ($planetData === null || !$planetData->getData('id')) {
- return new self();
+ $planet = $collection->getFirstItem();
+ if ($planet !== null) {
+ return $planet;
}
- return self::factory($planetData->getData('id'));
+ return new self;
+ }
+
+ public function __construct(Array $data = array(), Wootook_Player_Model_Entity $player = null)
+ {
+ parent::__construct($data);
+
+ if ($player !== null) {
+ $this->setPlayer($player);
+ }
}
public function _init()
{
$this->_tableName = 'planets';
$this->_idFieldName = 'id';
+
+ $this->getDataMapper()
+ ->addRule('last_update', 'date-time')
+ ->addRule('b_building', 'date-time')
+ ->addRule('b_tech', 'date-time')
+ ->addRule('b_hangar', 'date-time');
}
public function __call($method, $params)
@@ -128,31 +143,33 @@ class Wootook_Empire_Model_Planet
$plugin = substr($method, 3);
if ($this->_pluginLoader === null) {
- $this->_pluginLoader = new Wootook_Empire_Model_Planet_PluginLoader($this, $this->getUser());
+ $this->_pluginLoader = new Wootook_Empire_Model_Planet_PluginLoader($this, $this->getPlayer());
}
switch ($prefix) {
case 'get':
- $this->_pluginLoader->getPlugin($plugin);
+ return $this->_pluginLoader->getPlugin($plugin);
break;
case 'set':
- $this->_pluginLoader->setPlugin($plugin, $params[0]);
+ return $this->_pluginLoader->setPlugin($plugin, $params[0]);
break;
case 'uns':
- $this->_pluginLoader->unsetPlugin($plugin);
+ return $this->_pluginLoader->unsetPlugin($plugin);
break;
case 'has':
- $this->_pluginLoader->hasPlugin($plugin);
- break;
+ return $this->_pluginLoader->hasPlugin($plugin);
break;
}
- throw new InvalidMethodCall(Wootook::__('Undefined method %s::%s.', get_class($this), $method));
+ throw new Wootook_Core_Exception_RuntimeException(Wootook::__('Undefined method %s::%s.', get_class($this), $method));
}
+ /**
+ * @return Wootook_Core_DateTime
+ */
public function getLastUpdate()
{
return $this->getData('last_update');
@@ -175,18 +192,22 @@ class Wootook_Empire_Model_Planet
public function getGalaxyData()
{
- $entity = new Wootook_Empire_Model_Galaxy_Position();
- $entity->load(array('id_planet' => $this->getId()));
+ if ($this->isPlanet()) {
+ $entity = new Wootook_Empire_Model_Galaxy_Position();
+ $entity->load(array('id_planet' => $this->getId()));
- return $entity;
+ return $entity;
+ }
+
+ return $this->getPlanet()->getGalaxyData();
}
- public function updateStorages($time = null)
+ public function updateStorages()
{
Math::setPrecision(50);
- $resources = Wootook_Empire_Model_Game_Resources::getSingleton();
+ $resources = Wootook_Empire_Helper_Config_Resources::getSingleton();
foreach ($resources->getAllDatas() as $resource => $resourceData) {
- if (!isset($resourceData['storage_field']) || $resourceData['storage_field'] === null) {
+ if (!isset($resourceData['storage']) || $resourceData['storage'] === null) {
continue;
}
@@ -217,7 +238,7 @@ class Wootook_Empire_Model_Planet
public function updateBuildingFields()
{
- $types = Wootook_Empire_Model_Game_Types::getSingleton();
+ $types = Wootook_Empire_Helper_Config_Types::getSingleton();
if ($this->isPlanet()) {
$filter = Legacies_Empire::TYPE_BUILDING_PLANET;
@@ -237,17 +258,21 @@ class Wootook_Empire_Model_Planet
return $this;
}
- public function updateResourceProduction($time = null)
+ public function updateResourceProduction()
{
- $types = Wootook_Empire_Model_Game_Types::getSingleton();
- $resources = Wootook_Empire_Model_Game_Resources::getSingleton();
- $production = Wootook_Empire_Model_Game_Production::getSingleton();
+ $types = Wootook_Empire_Helper_Config_Types::getSingleton();
+ $resources = Wootook_Empire_Helper_Config_Resources::getSingleton();
+ $production = Wootook_Empire_Helper_Config_Production::getSingleton();
- if ($time === null) {
- $time = Wootook::now();
+ if (!$this->isPlanet() || !$this->getPlayer()) {
+ return $this;
}
- if (!$this->isPlanet()) {
+ if ($this->getPlayer()->isVacation()) {
+ $resourceConfig = Wootook::getGameConfig('resource/base-income');
+ foreach ($resources->getAllDatas() as $resource => $resourceData) {
+ $this->setData($resourceData['production_field'], $resourceConfig[$resource]);
+ }
return $this;
}
@@ -270,7 +295,7 @@ class Wootook_Empire_Model_Planet
$ratio = $this->getData($ratioField);
$element = self::getProductionElementInstance($productionUnit);
- $productionRatios[$productionUnit] = $element->getProductionRatios($level, $ratio, $this, $this->getUser());
+ $productionRatios[$productionUnit] = $element->getProductionRatios($level, $ratio, $this, $this->getPlayer());
foreach ($productionRatios[$productionUnit] as $resourceId => $resourceProduction) {
$comp = Math::comp($resourceProduction, 0);
if ($comp < 0) {
@@ -339,7 +364,7 @@ class Wootook_Empire_Model_Planet
// Dispatch 'planet.update-production.before' event
Wootook::dispatchEvent($this->_eventPrefix . '.update-production.before', array(
$this->_eventObject => $this,
- 'user' => $this->getUser(),
+ 'player' => $this->getPlayer(),
'productions' => $actualProduction
));
@@ -355,27 +380,28 @@ class Wootook_Empire_Model_Planet
// Dispatch 'planet.update-production.after' event
Wootook::dispatchEvent($this->_eventPrefix . '.update-production.after', array(
$this->_eventObject => $this,
- 'user' => $this->getUser()
+ 'player' => $this->getPlayer()
));
return $this;
}
- public function updateResources($time = null)
+ public function updateResources(Wootook_Core_DateTime $time = null)
{
- $resources = Wootook_Empire_Model_Game_Resources::getSingleton();
+ $resources = Wootook_Empire_Helper_Config_Resources::getSingleton();
if ($time === null) {
- $time = Wootook::now();
+ $time = new Wootook_Core_DateTime();
}
- $timeDiff = ($time - $this->getLastUpdate()) / 3600;
+ $timeDiff = $time->diff($this->getLastUpdate());
+
foreach ($resources->getAllDatas() as $resourceId => $resourceConfig) {
if (!$resourceConfig['storage_field']) {
continue;
}
- $production = Math::mul($this->getData($resourceConfig['production_field']), $timeDiff);
+ $production = Math::mul($this->getData($resourceConfig['production_field']), $timeDiff / 3600);
$resourceValue = Math::add($this->getData($resourceConfig['field']), $production);
$this->setData($resourceConfig['field'], Math::min($resourceValue, $this->getData($resourceConfig['storage_field'])));
}
@@ -386,13 +412,13 @@ class Wootook_Empire_Model_Planet
public static function getProductionElementInstance($buildingId)
{
- $production = Wootook_Empire_Model_Game_Production::getSingleton();
+ $production = Wootook_Empire_Helper_Config_Production::getSingleton();
if (!isset(self::$_productionInstances[$buildingId])) {
if (!isset($production[$buildingId])) {
return null;
}
- $class = $production[$buildingId][Legacies_Empire::RESOURCE_CLASS];
+ $class = $production[$buildingId];
$reflection = new ReflectionClass($class);
self::$_productionInstances[$buildingId] = $reflection->newInstance();
}
@@ -402,93 +428,30 @@ class Wootook_Empire_Model_Planet
public function getFleetCollection($time = null)
{
- $firstCollection = new Wootook_Core_Collection(array('fleet' => 'fleets'));
- $firstCollection
- ->column('*')
- ->where('fleet.fleet_start_galaxy = :galaxy')
- ->where('fleet.fleet_start_system = :system')
- ->where('fleet.fleet_start_planet = :position')
- ->where('fleet.fleet_start_type = :planet_type')
- ;
- $backCollection = new Wootook_Core_Collection(array('fleet' => 'fleets'));
- $backCollection
- ->column('*')
- ->where('fleet.fleet_end_galaxy = :galaxy')
- ->where('fleet.fleet_end_system = :system')
- ->where('fleet.fleet_end_planet = :position')
- ->where('fleet.fleet_end_type = :planet_type')
- ;
-
- $options = array(
- 'galaxy' => $this->getSystem(),
- 'system' => $this->getSystem(),
- 'position' => $this->getPosition(),
- 'planet_type' => $this->getType()
- );
-
- if ($time !== null) {
- $options['now'] = $time;
- $firstCollection->where('fleet_start_time <= :now');
- $backCollection->where('fleet_end_time <= :now');
- }
-
- $collection = new Wootook_Core_Collection();
- $collection
- ->setEntityClassName('Wootook_Empire_Model_Fleet')
- ->union($firstCollection)
- ->union($backCollection)
- ->load($options)
- ;
+ $collection = new Wootook_Empire_Resource_Fleet_Collection($this->getReadConnection());
+ $collection->addPlanetToFilter($this, $time);
return $collection;
}
- public function getUserId()
+ public function getPlayerId()
{
return (int) $this->getData('id_owner');
}
- public function getUser()
+ public function getPlayer()
{
- if ($this->_user === null && $this->getUserId()) {
- $this->_user = Wootook_Empire_Model_User::factory($this->getUserId());
+ if ($this->_player === null && $this->getPlayerId()) {
+ $this->_player = new Wootook_Player_Model_Entity();
+ $this->_player->load($this->getPlayerId());
}
- return $this->_user;
+ return $this->_player;
}
- public function setUser(Wootook_Empire_Model_User $user)
+ public function setPlayer(Wootook_Player_Model_Entity $player)
{
- $this->_user = $user;
-
- return $this;
- }
-
- public function getShipyard()
- {
- if ($this->_shipyard === null) {
- $this->_shipyard = new Legacies_Empire_Model_Planet_Building_Shipyard($this, $this->getUser());
- }
- return $this->_shipyard;
- }
-
- public function setShipyard(Legacies_Empire_Model_Planet_Building_Shipyard $shipyard)
- {
- $this->_shipyard = $shipyard;
-
- return $this;
- }
-
- public function getResearchLab()
- {
- if ($this->_laboratory === null) {
- $this->_laboratory = new Legacies_Empire_Model_Planet_Building_ResearchLab($this, $this->getUser());
- }
- return $this->_laboratory;
- }
-
- public function setResearchLab(Legacies_Empire_Model_Planet_Building_ResearchLab $laboratory)
- {
- $this->_laboratory = $laboratory;
+ $this->_player = $player;
+ $this->setData('id_owner', $player->getId());
return $this;
}
@@ -510,31 +473,60 @@ class Wootook_Empire_Model_Planet
public function getMoon()
{
- static $statement = null;
-
if ($this->isMoon()) {
return null;
}
if ($this->_moon === null) {
- if ($statement === null) {
- $statement = new Wootook_Core_Collection(array('planet' => 'planets'), get_class($this));
- $statement
- ->where('galaxy=:galaxy')
- ->where('system=:system')
- ->where('planet=:position')
- ->where('planet_type=' . strval(self::TYPE_MOON))
- ;
+ $collection = new Wootook_Empire_Resource_Planet_Collection($this->getReadConnection());
+ $collection->addFieldToFilter('galaxy', $this->getGalaxy())
+ ->addFieldToFilter('system', $this->getGalaxy())
+ ->addFieldToFilter('planet', $this->getPosition())
+ ->addFieldToFilter('planet_type', self::TYPE_MOON)
+ ->load()
+ ;
+
+ $this->_moon = $collection->getFirstItem();
+
+ if ($this->_moon !== null && $this->_moon instanceof self) {
+ $this->_moon->setPlanet($this);
}
- $statement->load(array(
+ }
+ return $this->_moon;
+ }
+
+ public function setMoon(Wootook_Empire_Model_Planet $moon)
+ {
+ $this->_moon = $moon;
+
+ return $this;
+ }
+
+ public function getPlanet()
+ {
+ if ($this->isPlanet()) {
+ return null;
+ }
+
+ if ($this->_planet === null) {
+ $this->_planet = Wootook_Empire_Model_Planet::factoryFromCoords(array(
'galaxy' => $this->getGalaxy(),
'system' => $this->getSystem(),
'position' => $this->getPosition()
));
- $this->_moon = $statement->current();
+ if ($this->_planet !== null && $this->_planet instanceof self) {
+ $this->_planet->setMoon($this);
+ }
}
- return $this->_moon;
+ return $this->_planet;
+ }
+
+ public function setPlanet(Wootook_Empire_Model_Planet $planet)
+ {
+ $this->_planet = $planet;
+
+ return $this;
}
public function setGalaxy($galaxy)
@@ -614,7 +606,7 @@ class Wootook_Empire_Model_Planet
public function isDestroyed()
{
- return (bool) $this->getData('destruyed');
+ return (bool) ($this->getData('destruyed') > 0);
}
public function destroy()
@@ -624,23 +616,23 @@ class Wootook_Empire_Model_Planet
}
if ($this->isDestroyed()) {
- throw new Wootook_Empire_Model_Planet_Exception(Wootook::__('Planet is already destroyed.'));
+ throw new Wootook_Empire_Exception_Planet(Wootook::__('Planet is already destroyed.'));
}
if ($this->getFleetCollection()->count() > 0) {
- throw new Wootook_Empire_Model_Planet_Exception(Wootook::__("Could not delete planet until fleets aten't retuned."));
+ throw new Wootook_Empire_Exception_Planet(Wootook::__("Could not delete planet until fleets aten't retuned."));
}
- $user = $this->getUser();
- if ($user->getHomePlanet()->getId() == $this->getId()) {
- throw new Wootook_Empire_Model_Planet_Exception(Wootook::__("You can't destroy your home planet."));
+ $player = $this->getPlayer();
+ if ($player->getHomePlanet()->getId() == $this->getId()) {
+ throw new Wootook_Empire_Exception_Planet(Wootook::__("You can't destroy your home planet."));
}
- if ($user->getCurrentPlanet()->getId() == $this->getId()) {
- $homePlanet = $user->getHomePlanet();
+ if ($player->getCurrentPlanet()->getId() == $this->getId()) {
+ $homePlanet = $player->getHomePlanet();
if ($homePlanet !== null) {
- $user->updateCurrentPlanet($homePlanet);
+ $player->updateCurrentPlanet($homePlanet);
}
}
@@ -649,41 +641,49 @@ class Wootook_Empire_Model_Planet
}
$this
- ->setData('destruyed', true)
+ ->setData('destruyed', time() + 172800)
->setData('id_owner', 0)
->save();
return $this;
}
+ public function isErasable()
+ {
+ if ($this->isDestroyed() && $this->getData('destruyed') >= time()) {
+ return true;
+ }
+ return false;
+ }
+
public function getElement($elementId)
{
- $fields = Wootook_Empire_Model_Game_FieldsAlias::getSingleton();
+ $fields = Wootook_Empire_Helper_Config_FieldsAlias::getSingleton();
return $this->getData($fields[$elementId]);
}
public function setElement($elementId, $level)
{
- $fields = Wootook_Empire_Model_Game_FieldsAlias::getSingleton();
+ $fields = Wootook_Empire_Helper_Config_FieldsAlias::getSingleton();
return $this->setData($fields[$elementId], $level);
}
public function hasElement($elementId, $levelRequired = 0)
{
- $fields = Wootook_Empire_Model_Game_FieldsAlias::getSingleton();
+ $fields = Wootook_Empire_Helper_Config_FieldsAlias::getSingleton();
return $this->hasData($fields[$elementId]) && Math::comp($this->getElement($elementId), $levelRequired) > 0;
}
- public function appendBuildingQueue($buildingId, $destroy = false, $time = null)
+ public function appendBuildingQueue($buildingId, $destroy = false, Wootook_Core_DateTime $time = null)
{
- $types = Wootook_Empire_Model_Game_Types::getSingleton();
- $prices = Wootook_Empire_Model_Game_Prices::getSingleton();
+ $types = Wootook_Empire_Helper_Config_Types::getSingleton();
+ $prices = Wootook_Empire_Helper_Config_Prices::getSingleton();
if ($time === null) {
- $time = Wootook::now();
+ $time = new Wootook_Core_DateTime();
}
if (!$types->is($buildingId, Legacies_Empire::TYPE_BUILDING)) {
@@ -699,7 +699,7 @@ class Wootook_Empire_Model_Planet
'bulding_id' => $buildingId,
'level' => $this->getElement($buildingId),
$this->_eventObject => $this,
- 'user' => $this->getUser(),
+ 'player' => $this->getPlayer(),
'destroy' => $destroy
));
@@ -716,24 +716,24 @@ class Wootook_Empire_Model_Planet
'bulding_id' => $buildingId,
'level' => $this->getElement($buildingId),
$this->_eventObject => $this,
- 'user' => $this->getUser(),
+ 'player' => $this->getPlayer(),
'destroy' => $destroy
));
return $this;
}
- public function updateBuildingQueue($time = null)
+ public function updateBuildingQueue(Wootook_Core_DateTime $time = null)
{
if ($time === null) {
- $time = Wootook::now();
+ $time = new Wootook_Core_DateTime();
}
// Dispatch event
Wootook::dispatchEvent($this->_eventPrefix . '.update-queue.before', array(
'time' => &$time,
- $this->_eventObject => $this->_currentPlanet,
- 'user' => $this->_currentUser
+ $this->_eventObject => $this,
+ 'player' => $this->getPlayer()
));
$this->getBuildingQueue()->updateQueue($time);
@@ -741,9 +741,8 @@ class Wootook_Empire_Model_Planet
// Dispatch event
Wootook::dispatchEvent($this->_eventPrefix . '.update-queue.after', array(
'time' => $time,
- 'shipyard' => $this,
- $this->_eventObject => $this->_currentPlanet,
- 'user' => $this->_currentUser
+ $this->_eventObject => $this,
+ 'player' => $this->getPlayer()
));
return $this;
@@ -764,12 +763,12 @@ class Wootook_Empire_Model_Planet
/**
*
- * @return Wootook_Empire_Model_Planet_Builder
+ * @return Wootook_Empire_Model_Planet_Builder_Builder
*/
public function getBuildingQueue()
{
- if ($this->_builder === null) {
- $this->_builder = new Wootook_Empire_Model_Planet_Builder($this, $this->getUser());
+ if ($this->_builder === null && $this->getPlayer()) {
+ $this->_builder = new Wootook_Empire_Model_Planet_Builder_Builder($this, $this->getPlayer());
}
return $this->_builder;
}
@@ -784,7 +783,7 @@ class Wootook_Empire_Model_Planet
$this->getBuildingQueue()->rewind();
$item = $this->getBuildingQueue()->current();
- $this->getBuildingQueue()->dequeueFirstItem(Wootook::now());
+ $this->getBuildingQueue()->dequeueFirstItem(new Wootook_Core_DateTime());
return $this;
}
@@ -810,15 +809,17 @@ class Wootook_Empire_Model_Planet
*/
public function checkAvailability($buildingId)
{
- $this->getBuildingQueue()->checkAvailability($buildingId);
+ if (!$this->getBuildingQueue()->checkAvailability($buildingId)) {
+ return false;
+ }
try {
// Dispatch event. Throw an exception to break the avaliability.
Wootook::dispatchEvent($this->_eventPrefix . '.check-availability', array(
'ship_id' => $buildingId,
'shipyard' => $this,
- $this->_eventObject => $this->_currentPlanet,
- 'user' => $this->_currentUser
+ $this->_eventObject => $this,
+ 'player' => $this->getPlayer()
));
} catch (Exception $e) {
return false;
@@ -849,129 +850,53 @@ class Wootook_Empire_Model_Planet
return $this->getBuildingQueue()->getBuildingTime($buildingId, $level);
}
- public static function registrationListener($eventData)
- {
- if (isset($eventData['user'])) {
- $user = $eventData['user'];
-
- if ($user === null || !$user instanceof Wootook_Empire_Model_User || !$user->getId()) {
- return;
- }
-
- $collection = self::searchMostFreeSystems();
- $collection->limit(1)->load();
-
- if ($collection->count() == 0) {
- throw new Exception('No more planet to colonize!'); // Oops, no more free place
- }
-
- $systemInfo = $collection->current();
- if ($systemInfo->getData('count') >= MAX_PLANET_IN_SYSTEM) {
- throw new Exception('No more planet to colonize!'); // Oops, no more free place
- }
-
- $collection = new Wootook_Core_Collection(array('planet' => 'planets'));
- $collection
- ->column(array('position' => 'planet.planet'))
- ->where('planet.planet_type=1')
- ->where('planet.galaxy=:galaxy')
- ->where('planet.system=:system')
- ->load(array(
- 'galaxy' => $systemInfo->getData('galaxy'),
- 'system' => $systemInfo->getData('system'),
- ))
- ;
- $positions = range(1, MAX_PLANET_IN_SYSTEM);
- foreach ($collection as $planet) {
- $key = array_search($planet->getData('position'), $positions);
- if ($key !== false) {
- unset($positions[$key]);
- }
- }
- $key = array_rand($positions, 1);
- $finalPosition = $positions[$key];
-
- $config = Wootook_Core_Model_Config::getSingleton();
- $planet = new self();
- $planet
- ->setData('id_owner', $user->getId())
- ->setData('name', Wootook::getRequest()->getParam('planet'))
- ->setData('galaxy', $systemInfo->getData('galaxy'))
- ->setData('system', $systemInfo->getData('system'))
- ->setData('planet', $finalPosition)
- ->setData('planet_type', 1)
- ->setData('field_max', $config->getData('initial_fields'))
- ->setData('field_current', 0)
- ->setData('metal', 500) // TODO: use config
- ->setData('cristal', 500) // TODO: use config
- ;
-
- $planet->save();
-
- $user
- ->setData('id_planet', $planet->getId())
- ->setData('current_planet', $planet->getId())
- ->setData('galaxy', $planet->getGalaxy())
- ->setData('system', $planet->getSystem())
- ->setData('planet', $planet->getPosition())
- ;
-
- Wootook::dispatchEvent('planet.init', array(
- 'planet' => $planet,
- 'user' => $user
- ));
-
- $planet->save();
- }
- }
-
public static function searchMostFreeSystems($galaxyList = null, $systemList = null)
{
- $collection = new Wootook_Core_Collection(array('galaxy' => 'galaxy'));
- $collection
+ $adapter = Wootook_Core_Database_ConnectionManager::getSingleton()
+ ->getConnection('core_read');
+ $select = $adapter->select(array('galaxy' => $adapter->getTable('galaxy')));
+ $select
->column(array(
- 'galaxy' => 'galaxy.galaxy',
- 'system' => 'galaxy.system',
- 'count' => 'COUNT(*)'
+ 'galaxy' => 'galaxy',
+ 'system' => 'system',
+ 'count' => new Wootook_Core_Database_Sql_Placeholder_Expression('COUNT(*)')
))
->group('galaxy.galaxy')
->group('galaxy.system')
;
- $config = Wootook_Core_Model_Config::getSingleton();
-
- if ($galaxyList === null && $config->hasData('user/registration/galaxy_list')) {
- $galaxyList = explode(',', $config->getData('user/registration/galaxy_list'));
+ if ($galaxyList === null && Wootook::getGameConfig('user/registration/galaxy_list')) {
+ $galaxyList = explode(',', Wootook::getGameConfig('user/registration/galaxy_list'));
}
if ($galaxyList !== null) {
array_walk($galaxyList, array(__CLASS__, '_cleanItemRanges'));
- $collection->where('galaxy.galaxy IN(' . implode(', ', $galaxyList) . ')');
+ $select->where('galaxy', array(array(Wootook_Core_Database_Sql_Select::OPERATOR_IN => $galaxyList)));
}
- if ($systemList === null && $config->hasData('user/registration/system_list')) {
- $systemList = explode(',', $config->getData('user/registration/system_list'));
+ if ($systemList === null && Wootook::getGameConfig('user/registration/system_list')) {
+ $systemList = explode(',', Wootook::getGameConfig('user/registration/system_list'));
}
if ($systemList !== null) {
array_walk($systemList, array(__CLASS__, '_cleanItemRanges'));
- $collection->where('galaxy.system IN(' . implode(', ', $systemList) . ')');
+ $select->where('system', array(array(Wootook_Core_Database_Sql_Select::OPERATOR_IN => $systemList)));
}
$orders = array(
- "COUNT(*) / {$collection->quote(MAX_PLANET_IN_SYSTEM)}",
- "1 + ABS(galaxy.galaxy - CEIL({$collection->quote(MAX_GALAXY_IN_WORLD)} / 2))",
- "1 + 2 * ABS(galaxy.system - CEIL({$collection->quote(MAX_SYSTEM_IN_GALAXY)} / 2))",
+ "COUNT(*) / {$adapter->quote(Wootook::getGameConfig('engine/universe/positions'))}",
+ "1 + ABS(galaxy.galaxy - CEIL({$adapter->quote(Wootook::getGameConfig('engine/universe/galaxies'))} / 2))",
+ "1 + 2 * ABS(galaxy.system - CEIL({$adapter->quote(Wootook::getGameConfig('engine/universe/systems'))} / 2))",
"RAND() / 1000",
);
- $collection
- ->order('((' . implode(') * (', $orders) . '))', 'ASC')
- //->order("ABS(galaxy.system - CEIL({$collection->quote(MAX_SYSTEM_IN_GALAXY)} / 2))", 'ASC')
- //->order("ABS(galaxy.galaxy - CEIL({$collection->quote(MAX_GALAXY_IN_WORLD)} / 2))", 'ASC')
+ $select
+ ->order(new Wootook_Core_Database_Sql_Placeholder_Expression('((' . implode(') * (', $orders) . '))'), 'ASC')
+ //->order("ABS(galaxy.system - CEIL({$collection->quote(Wootook::getGameConfig('engine/universe/systems'))} / 2))", 'ASC')
+ //->order("ABS(galaxy.galaxy - CEIL({$collection->quote(Wootook::getGameConfig('engine/universe/galaxies'))} / 2))", 'ASC')
//->order("1.5 / COUNT(*)", 'ASC')
->order('RAND()', 'ASC');
- return $collection;
+ return $select;
}
private static function _cleanItemRanges(&$value, $index, $userdata = null)
@@ -979,6 +904,32 @@ class Wootook_Empire_Model_Planet
return intval($value);
}
+ public static function planetChangeListener($eventData)
+ {
+ if (!isset($eventData['request']) || !$eventData['request'] instanceof Wootook_Core_Mvc_Controller_Request_Http) {
+ return;
+ }
+
+ /** @var Wootook_Core_Mvc_Controller_Request_Http $request */
+ $request = $eventData['request'];
+ if (!($planetId = $request->getQuery('___planet'))) {
+ return;
+ }
+
+ $session = Wootook_Player_Model_Session::getSingleton();
+ if (!$session->isLoggedIn()) {
+ return;
+ }
+ $planet = new Wootook_Empire_Model_Planet();
+ $planet->load($planetId);
+ if (!$planet->getId()) {
+ return;
+ }
+
+ $player = $session->getPlayer();
+ $player->setCurrentPlanet($planet);
+ }
+
public static function planetUpdateListener($eventData)
{
if (isset($eventData['planet'])) {
@@ -987,7 +938,10 @@ class Wootook_Empire_Model_Planet
if (isset($eventData['time'])) {
$time = $eventData['time'];
} else {
- $time = time();
+ $time = new Wootook_Core_DateTime();
+ }
+ if (!$time instanceof Wootook_Core_DateTime) {
+ $time = new Wootook_Core_DateTime($time);
}
if ($planet === null || !$planet instanceof Wootook_Empire_Model_Planet) {
@@ -996,14 +950,17 @@ class Wootook_Empire_Model_Planet
$planet->updateBuildingQueue($time);
$planet->updateResources($time);
- $planet->getShipyard()->updateQueue($time);
+ $planet->getShipyard()->updateQueue($time); // FIXME : update all plugin queues
+ $planet->getResearchLab()->updateQueue($time); // FIXME : update all plugin queues
$planet->setLastUpdate($time);
+
+ $planet->getPlayer()->save();
}
}
public function getResourceAmount($resourceType)
{
- $resources = Wootook_Empire_Model_Game_Resources::getSingleton();
+ $resources = Wootook_Empire_Helper_Config_Resources::getSingleton();
$resourceConfig = $resources->getData($resourceType);
if ($resourceConfig === null) {
@@ -1014,7 +971,7 @@ class Wootook_Empire_Model_Planet
public function getResourceCap($resourceType)
{
- $resources = Wootook_Empire_Model_Game_Resources::getSingleton();
+ $resources = Wootook_Empire_Helper_Config_Resources::getSingleton();
$resourceConfig = $resources->getData($resourceType);
if ($resourceConfig === null) {
@@ -1034,4 +991,4 @@ class Wootook_Empire_Model_Planet
}
return false;
}
-}
\ No newline at end of file
+}
diff --git a/application/code/core/Wootook/Empire/Model/Planet/Builder.php b/src/application/code/core/Wootook/Empire/Model/Planet/Builder/Builder.php
similarity index 59%
rename from application/code/core/Wootook/Empire/Model/Planet/Builder.php
rename to src/application/code/core/Wootook/Empire/Model/Planet/Builder/Builder.php
index d696c8c..eddf545 100644
--- a/application/code/core/Wootook/Empire/Model/Planet/Builder.php
+++ b/src/application/code/core/Wootook/Empire/Model/Planet/Builder/Builder.php
@@ -1,11 +1,59 @@
+ * 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.
+ *
+ */
-class Wootook_Empire_Model_Planet_Builder
+/**
+ *
+ * Enter description here ...
+ * @author Greg
+ *
+ */
+class Wootook_Empire_Model_Planet_Builder_Builder
extends Wootook_Empire_Model_BuilderAbstract
{
+ const FIELD_SERIALIZED = 'b_building_id';
+
+ /**
+ * @var int
+ */
+ protected $_maxLength = 0;
+
+ /**
+ * @var float
+ */
+ protected $_speedEnhancement = null;
+
public function init()
{
- $this->_unserializeQueue($this->_currentPlanet->getData('b_building_id'));
+ $this->_unserializeQueue($this->_currentPlanet->getData(self::FIELD_SERIALIZED));
+
+ $this->_maxLength = Wootook::getGameConfig('engine/core/buildings_queue_size');
}
/**
@@ -21,7 +69,7 @@ class Wootook_Empire_Model_Planet_Builder
$level = $params['level'];
if (!isset($params['created_at'])) {
- $createdAt = time();
+ $createdAt = new Wootook_Core_DateTime();
} else {
$createdAt = $params['created_at'];
}
@@ -47,36 +95,60 @@ class Wootook_Empire_Model_Planet_Builder
));
}
+ public function getSpeedEnhancement()
+ {
+ if ($this->_speedEnhancement === null) {
+ $event = Wootook::dispatchEvent('planet.building.speed-enhancement', array(
+ 'player' => $this->_currentPlanet,
+ 'planet' => $this->_currentPlanet,
+ 'enhancement' => 1
+ ));
+
+ $this->_speedEnhancement = $event->getData('enhancement');
+ }
+
+ return $this->_speedEnhancement;
+ }
+
/**
* Check if a building is actually buildable on the current planet,
* depending on the technology and buildings requirements.
*
- * @param int $buildingId
+ * @param int|string $buildingId
* @return bool
*/
public function checkAvailability($buildingId)
{
- $types = Wootook_Empire_Model_Game_Types::getSingleton();
+ $types = Wootook_Empire_Helper_Config_Types::getSingleton();
- if ($types->is($buildingId, Legacies_Empire::TYPE_BUILDING)) {
- return true;
+ if (!$types->is($buildingId, Legacies_Empire::TYPE_BUILDING)) {
+ return false;
}
- return false;
+ return parent::checkAvailability($buildingId);
}
+ /**
+ * Returns the time needed to build $level of $buildingId
+ *
+ * @param int|string $buildingId
+ * @param int $level
+ */
public function getBuildingTime($buildingId, $level)
{
- $prices = Wootook_Empire_Model_Game_Prices::getSingleton();
- $gameConfig = Wootook_Core_Model_Config::getSingleton();
+ $prices = Wootook_Empire_Helper_Config_Prices::getSingleton();
Math::setPrecision(50);
$firstLevelTime = $prices[$buildingId][Legacies_Empire::BASE_BUILDING_TIME];
$partialLevelTime = Math::mul($firstLevelTime, Math::pow($prices[$buildingId][Legacies_Empire::RESOURCE_MULTIPLIER], $level));
$levelTime = Math::sub($partialLevelTime, $firstLevelTime);
- $speedFactor = $gameConfig->getData('game_speed');
- $baseTime = $levelTime / $speedFactor * 3600;
+ $speedFactor = Wootook::getGameConfig('game/speed/general');
+
+ if ($speedFactor == null) {
+ $speedFactor = 1;
+ }
+ $baseTime = Math::div($levelTime, 3600 / ($speedFactor * $this->getSpeedEnhancement()));
Math::setPrecision();
@@ -84,7 +156,7 @@ class Wootook_Empire_Model_Planet_Builder
'time' => $baseTime,
'base_time' => $baseTime,
'planet' => $this->_currentPlanet,
- 'user' => $this->_currentUser,
+ 'player' => $this->_currentPlayer,
'building_id' => $buildingId,
'level' => $level
));
@@ -92,10 +164,14 @@ class Wootook_Empire_Model_Planet_Builder
return $event->getData('time');
}
+ /**
+ * (non-PHPdoc)
+ * @see Legacies_Empire_Model_BuilderAbstract::getResourcesNeeded()
+ */
public function getResourcesNeeded($buildingId, $level)
{
- $prices = Wootook_Empire_Model_Game_Prices::getSingleton();
- $resources = Wootook_Empire_Model_Game_Resources::getSingleton();
+ $prices = Wootook_Empire_Helper_Config_Prices::getSingleton();
+ $resources = Wootook_Empire_Helper_Config_Resources::getSingleton();
if (!isset($prices[$buildingId])) {
return array();
@@ -117,54 +193,56 @@ class Wootook_Empire_Model_Planet_Builder
/**
* Update the contruction queue.
*
- * @return Wootook_Empire_Model_Planet_Building_Shipyard
+ * @return Wootook_Empire_Model_Planet_Builder_Builder
*/
- public function updateQueue($time)
+ public function updateQueue(Wootook_Core_DateTime $time)
{
- $fields = Wootook_Empire_Model_Game_FieldsAlias::getSingleton();
+ $fields = Wootook_Empire_Helper_Config_FieldsAlias::getSingleton();
- $startingTime = $this->_currentPlanet->getData('b_building');
+ $startingTime = clone $this->_currentPlanet->getData('b_building');
foreach ($this->getQueue() as $element) {
$elementTime = $element->getData('started_at');
if ($elementTime === null) {
- $element->setData('started_at', $startingTime);
- $elementTime = $startingTime;
+ $element->setData('started_at', $startingTime->getTimestamp());
+ $elementTime = $startingTime->getTimestamp();
}
$level = $element->getData('level');
$buildingId = $element->getData('building_id');
$buildTime = $this->getBuildingTime($buildingId, $level);
- $elapsedTime = $time - $elementTime;
+ $elapsedTime = $time->getTimestamp() - $elementTime;
if ($elapsedTime >= $buildTime) {
- $this->_currentPlanet->updateResources($time - $elapsedTime);
- $this->_currentPlanet->setElement($buildingId, $level);
- $this->_currentPlanet->updateResourceProduction($time - $elapsedTime);
- $this->_currentPlanet->updateStorages($time - $elapsedTime);
- $this->_currentPlanet->updateBuildingFields();
-
$this->dequeue($element);
+ $currentTime = clone $startingTime;
+ $currentTime->add($elapsedTime);
+
+ $this->_currentPlanet->updateResources($currentTime);
+ $this->_currentPlanet->setElement($buildingId, $level);
+ $this->_currentPlanet->updateStorages($currentTime);
+ $this->_currentPlanet->updateResourceProduction($currentTime);
+ $this->_currentPlanet->updateBuildingFields();
+
Wootook::dispatchEvent('planet.building.level-update', array(
- 'time' => $time - $elapsedTime,
+ 'time' => $currentTime,
'planet' => $this->_currentPlanet,
- 'user' => $this->_currentUser,
+ 'player' => $this->_currentPlayer,
'building_id' => $buildingId,
'level' => $level
));
- $startingTime = $elementTime + $buildTime;
+ $startingTime->set($elementTime + $buildTime);
continue;
}
- $element->setData('updated_at', $time);
break;
}
$this->_currentPlanet->setData('b_building_id', $this->serialize());
- $this->_currentPlanet->setData('b_building', $startingTime);
+ $this->_currentPlanet->setData('b_building', $startingTime->now());
return $this;
}
@@ -172,14 +250,17 @@ class Wootook_Empire_Model_Planet_Builder
/**
* Append items to build to the construction list
*
- * @param int $buildingId
- * @param int|string $level
- * @return Wootook_Empire_Model_Planet_Building_Shipyard
+ * @param int|string $buildingId
+ * @param int $level
+ * @return Wootook_Empire_Model_Planet_Builder_Builder
*/
- public function appendQueue($buildingId, $level, $time)
+ public function appendQueue($buildingId, $level, Wootook_Core_DateTime $time)
{
- $types = Wootook_Empire_Model_Game_Types::getSingleton();
- $resources = Wootook_Empire_Model_Game_Resources::getSingleton();
+ if ($this->_maxLength > 0 && $this->count() >= $this->_maxLength) {
+ return $this;
+ }
+
+ $types = Wootook_Empire_Helper_Config_Types::getSingleton();
if (!Math::isPositive($level)) {
return $this;
@@ -206,7 +287,7 @@ class Wootook_Empire_Model_Planet_Builder
$this->enqueue(array(
'building_id' => $buildingId,
'level' => $level,
- 'created_at' => $time
+ 'created_at' => $time->getTimestamp()
));
$this->_currentPlanet->setData('b_building_id', $this->serialize());
@@ -221,7 +302,7 @@ class Wootook_Empire_Model_Planet_Builder
* Dequeues the first item to build to the construction list and removes all
* its successors of the same type.
*
- * @return Wootook_Empire_Model_Planet_Builder
+ * @return Wootook_Empire_Model_Planet_Builder_Builder
*/
public function dequeueFirstItem()
{
@@ -236,7 +317,7 @@ class Wootook_Empire_Model_Planet_Builder
* successors of the same type.
*
* @param string $itemId
- * @return Wootook_Empire_Model_Planet_Builder
+ * @return Wootook_Empire_Model_Planet_Builder_Builder
*/
public function dequeueItem($itemId)
{
@@ -269,4 +350,4 @@ class Wootook_Empire_Model_Planet_Builder
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/application/code/core/Wootook/Empire/Model/Planet/Builder/Item.php b/src/application/code/core/Wootook/Empire/Model/Planet/Builder/Item.php
similarity index 100%
rename from application/code/core/Wootook/Empire/Model/Planet/Builder/Item.php
rename to src/application/code/core/Wootook/Empire/Model/Planet/Builder/Item.php
diff --git a/application/code/core/Wootook/Empire/Model/Planet/BuildingInterface.php b/src/application/code/core/Wootook/Empire/Model/Planet/BuildingInterface.php
similarity index 100%
rename from application/code/core/Wootook/Empire/Model/Planet/BuildingInterface.php
rename to src/application/code/core/Wootook/Empire/Model/Planet/BuildingInterface.php
diff --git a/src/application/code/core/Wootook/Empire/Model/Planet/PluginLoader.php b/src/application/code/core/Wootook/Empire/Model/Planet/PluginLoader.php
new file mode 100644
index 0000000..d3cc37b
--- /dev/null
+++ b/src/application/code/core/Wootook/Empire/Model/Planet/PluginLoader.php
@@ -0,0 +1,31 @@
+_currentPlayer = $currentPlayer;
+ $this->_currentPlanet = $currentPlanet;
+
+ $this->registerNamespace('Legacies_Empire_Model_Planet_Building_');
+ }
+
+ protected function _load($className, $useSingleton, Array $constructorParams = array())
+ {
+ $reflection = new ReflectionClass($className);
+ if ($useSingleton && $reflection->implementsInterface('Wootook_Core_Singleton')) {
+ $method = $reflection->getMethod('getSingleton');
+ $method->invoke();
+ }
+
+ try {
+ return $reflection->newInstance($this->_currentPlanet, $this->_currentPlayer);
+ } catch (ReflectionException $e) {
+ return null;
+ }
+ }
+}
diff --git a/src/application/code/core/Wootook/Empire/Model/Planet/QueueInterface.php b/src/application/code/core/Wootook/Empire/Model/Planet/QueueInterface.php
new file mode 100644
index 0000000..7bd2c42
--- /dev/null
+++ b/src/application/code/core/Wootook/Empire/Model/Planet/QueueInterface.php
@@ -0,0 +1,9 @@
+getElement(Legacies_Empire::ID_RESEARCH_COMBUSTION_DRIVE));
+ }
+
+ public function getActualSpeed(Wootook_Player_Model_Entity $player)
+ {
+ return $this->getBaseSpeed($player) * $this->getSpeedMultiplier($player);
+ }
+
+ public function getActualConsumption(Wootook_Player_Model_Entity $player, $speed)
+ {
+ return $this->getBaseConsumption($player) * ($speed / 100) * $this->getSpeedMultiplier($player);
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Empire/Model/Planet/ShipInterface.php b/src/application/code/core/Wootook/Empire/Model/Planet/ShipInterface.php
new file mode 100644
index 0000000..dc9863a
--- /dev/null
+++ b/src/application/code/core/Wootook/Empire/Model/Planet/ShipInterface.php
@@ -0,0 +1,11 @@
+_init('fleets', 'Wootook_Empire_Model_Fleet');
+ }
+
+ public function addPlanetToFilter(Wootook_Empire_Model_Planet $planet, $time = null)
+ {
+ if ($time === null) {
+ $time = new Wootook_Core_DateTime();
+ }
+ $this->addFieldToFilter(null, array(
+ array('and' => array(
+ array('eq' => array('field' => 'fleet_start_galaxy', 'value' => $planet->getGalaxy())),
+ array('eq' => array('field' => 'fleet_start_system', 'value' => $planet->getSystem())),
+ array('eq' => array('field' => 'fleet_start_planet', 'value' => $planet->getPosition())),
+ array('eq' => array('field' => 'fleet_start_type', 'value' => $planet->getType())),
+ //array('date' => array('field' => 'fleet_start_time', 'value' => array('to' => $time))),
+ )),
+ array('and' => array(
+ array('eq' => array('field' => 'fleet_end_galaxy', 'value' => $planet->getGalaxy())),
+ array('eq' => array('field' => 'fleet_end_system', 'value' => $planet->getSystem())),
+ array('eq' => array('field' => 'fleet_end_planet', 'value' => $planet->getPosition())),
+ array('eq' => array('field' => 'fleet_end_type', 'value' => $planet->getType())),
+ //array('date' => array('field' => 'fleet_end_time', 'value' => array('to' => $time))),
+ ))
+ ));
+
+ return $this;
+ }
+
+ public function addIsVisibleToFilter(Wootook_Player_Model_Entity $player, $time = null)
+ {
+ if ($time === null) {
+ $time = new Wootook_Core_DateTime();
+ }
+ $this->addFieldToFilter(null, array(
+ array('and' => array(
+ array('eq' => array('field' => 'fleet_owner', 'value' => $player->getId())),
+ array('date' => array('field' => 'fleet_start_time', 'value' => array('to' => $time))),
+ )),
+ array('and' => array(
+ array('eq' => array('field' => 'fleet_owner', 'value' => $player->getId())),
+ array('date' => array('field' => 'fleet_end_time', 'value' => array('to' => $time))),
+ ))
+ ));
+
+ return $this;
+ }
+}
diff --git a/src/application/code/core/Wootook/Empire/Resource/Planet/Collection.php b/src/application/code/core/Wootook/Empire/Resource/Planet/Collection.php
new file mode 100644
index 0000000..fc3e8ee
--- /dev/null
+++ b/src/application/code/core/Wootook/Empire/Resource/Planet/Collection.php
@@ -0,0 +1,64 @@
+_init('planets', 'Wootook_Empire_Model_Planet');
+ }
+
+ public function addPlayerToFilter(Wootook_Player_Model_Entity $player)
+ {
+ $this->addFieldToFilter('id_owner', $player->getId());
+
+ return $this;
+ }
+
+ public function addGalaxyToFilter($galaxy)
+ {
+ $this->addFieldToFilter('galaxy', $galaxy);
+
+ return $this;
+ }
+
+ public function addSystemToFilter($system)
+ {
+ $this->addFieldToFilter('system', $system);
+
+ return $this;
+ }
+
+ public function addPositionToFilter($position)
+ {
+ $this->addFieldToFilter('planet', $position);
+
+ return $this;
+ }
+
+ public function addTypeToFilter($type)
+ {
+ $this->addFieldToFilter('planet_type', $type);
+
+ return $this;
+ }
+
+ public function addCoordsToFilter($galaxy, $system = null, $position = null, $type = null)
+ {
+ $this->addGalaxyToFilter($galaxy);
+
+ if ($system !== null) {
+ $this->addSystemToFilter($system);
+
+ if ($position !== null) {
+ $this->addPositionToFilter($position);
+
+ if ($type !== null) {
+ $this->addTypeToFilter($type);
+ }
+ }
+ }
+
+ return $this;
+ }
+}
diff --git a/config.php b/src/application/code/core/Wootook/Empire/install/mysql5/.placeholder
similarity index 100%
rename from config.php
rename to src/application/code/core/Wootook/Empire/install/mysql5/.placeholder
diff --git a/application/code/core/Legacies/Oficers.php b/src/application/code/core/Wootook/Exception.php
similarity index 95%
rename from application/code/core/Legacies/Oficers.php
rename to src/application/code/core/Wootook/Exception.php
index 089b825..c3b339a 100644
--- a/application/code/core/Legacies/Oficers.php
+++ b/src/application/code/core/Wootook/Exception.php
@@ -3,7 +3,7 @@
* This file is part of Wootook
*
* @license http://www.gnu.org/licenses/agpl-3.0.txt
- * @see http://www.wootook.com/
+ * @see http://wootook.org/
*
* Copyright (c) 2011-Present, Grégory PLANCHAT
* All rights reserved.
@@ -27,14 +27,11 @@
* documentation for further information about customizing Wootook.
*
*/
+
/**
*
* Enter description here ...
* @author Greg
*
*/
-
-class Legacies_Officers
-{
-
-}
\ No newline at end of file
+interface Wootook_Exception {}
\ No newline at end of file
diff --git a/application/code/core/Wootook/Object.php b/src/application/code/core/Wootook/Object.php
similarity index 54%
rename from application/code/core/Wootook/Object.php
rename to src/application/code/core/Wootook/Object.php
index 2f214d3..d3271ee 100644
--- a/application/code/core/Wootook/Object.php
+++ b/src/application/code/core/Wootook/Object.php
@@ -1,5 +1,39 @@
+ * 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 Wootook_Object
implements ArrayAccess
{
@@ -79,4 +113,4 @@ class Wootook_Object
{
return $this->unsetData($offset);
}
-}
\ No newline at end of file
+}
diff --git a/application/code/core/Wootook/Empire/Block/Overview.php b/src/application/code/core/Wootook/Player/Block/Overview.php
similarity index 58%
rename from application/code/core/Wootook/Empire/Block/Overview.php
rename to src/application/code/core/Wootook/Player/Block/Overview.php
index c09ec87..bf689f0 100644
--- a/application/code/core/Wootook/Empire/Block/Overview.php
+++ b/src/application/code/core/Wootook/Player/Block/Overview.php
@@ -1,6 +1,6 @@
getSession()->isLoggedIn();
+ }
+
+ public function getPlayer()
+ {
+ return $this->getSession()->getPlayer();
+ }
+
+ public function getPlayerCount()
+ {
+ $collection = new Wootook_Player_Resource_Entity_Collection($this->getPlayer()->getReadConnection());
+ $collection->addAuthlevelToFilter(array(LEVEL_ADMIN), true);
+
+ return $collection->getSize();
+ }
+
+ public function getOnlinePlayerCount()
+ {
+ $collection = new Wootook_Player_Resource_Entity_Collection($this->getPlayer()->getReadConnection());
+ $collection->addAuthlevelToFilter(array(LEVEL_ADMIN), true);
+ $collection->addIsOnlineToFilter();
+
+ return $collection->getSize();
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Player/Controller/AccountController.php b/src/application/code/core/Wootook/Player/Controller/AccountController.php
new file mode 100644
index 0000000..824a20d
--- /dev/null
+++ b/src/application/code/core/Wootook/Player/Controller/AccountController.php
@@ -0,0 +1,235 @@
+
+ * 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 Wootook_Player_Controller_AccountController
+ extends Wootook_Core_Mvc_Controller_Action
+{
+ public function loginAction()
+ {
+ $session = new Wootook_Player_Model_Session();
+ if ($session->isLoggedIn()) {
+ $this->_redirect('*/overview');
+ return;
+ }
+
+ $this->loadLayout('player.login');
+ $this->_prepareLayoutMessages(Wootook_Player_Model_Entity::SESSION_KEY);
+ $this->renderLayout();
+ }
+
+ public function loginPostAction()
+ {
+ $request = $this->getRequest();
+
+ if (!$request->isPost()) {
+ $this->_redirect('*/*/login');
+ return;
+ }
+
+ if ($request->getPost('username') === null || $request->getPost('password') === null) {
+ $this->_redirect('*/*/login');
+ return;
+ }
+
+ $session = new Wootook_Player_Model_Session();
+ if ($session->isLoggedIn()) {
+ $this->_redirect('*/overview');
+ return;
+ }
+
+ $session->login($request->getPost('username'), $request->getPost('password'), (bool) $request->getPost('rememberme'));
+
+ if ($session->isLoggedIn()) {
+ $this->_redirect('*/overview');
+ return;
+ } else {
+ $this->_redirect('*/*/login');
+ return;
+ }
+ }
+
+ public function logoutAction()
+ {
+ $session = Wootook_Player_Model_Session::getSingleton();
+ if ($session->isLoggedIn()) {
+ $session->logout();
+ } else {
+ $this->_redirect('*/*/login');
+ return;
+ }
+
+ $this->_redirect('');
+ }
+
+ public function newAction()
+ {
+ $session = new Wootook_Player_Model_Session();
+ if ($session->isLoggedIn()) {
+ $this->_redirect('*/overview');
+ return;
+ }
+
+ $this->loadLayout('player.registration');
+ $this->_prepareLayoutMessages(Wootook_Player_Model_Entity::SESSION_KEY);
+ $this->renderLayout();
+ }
+
+ public function newPostAction()
+ {
+ $session = Wootook_Player_Model_Session::getSingleton();
+ if ($session->isLoggedIn()) {
+ $this->_redirect('*/overview');
+ return;
+ }
+
+ $request = $this->getRequest();
+
+ if ($request->getPost('password') != $request->getPost('password_confirm')) {
+ $session->addError(Wootook::__('Passwords does not match. Please check your input.'));
+ $this->_redirect('*/*/new');
+ return;
+ }
+
+ if ($request->getPost('email') != $request->getPost('email_confirm')) {
+ $session->addError(Wootook::__('Both emails does not match. Please check your input.'));
+ $this->_redirect('*/*/new');
+ return;
+ }
+
+ try {
+ $user = Wootook_Player_Model_Entity::register($request->getPost('username'), $request->getPost('email'), $request->getPost('password'));
+ } catch (Wootook_Empire_Exception_RuntimeException $e) {
+ $session->addError(Wootook::__('Could not create user: %s', $e->getMessage()));
+ $this->_redirect('*/*/new');
+ return;
+ }
+
+ if (!$user || !$user->getId()) {
+ $session->addError(Wootook::__('Could not create user. Please contact the game administrator for more information.'));
+ $this->_redirect('*/*/new');
+ return;
+ }
+
+ $session->setLoggedIn($user);
+ if ($request->getPost('planet_name') != '') {
+ $user->getHomePlanet()->setName($request->getPost('planet_name'))->save();
+ } else {
+ $user->getHomePlanet()->setName(Wootook::__('Planet'))->save();
+ }
+
+ $this->_redirect('*/overview');
+ }
+
+ public function lostPasswordAction()
+ {
+ $session = new Wootook_Player_Model_Session();
+ if ($session->isLoggedIn()) {
+ $this->_redirect('*/overview');
+ return;
+ }
+
+ $this->loadLayout('player.lost-password');
+ $this->_prepareLayoutMessages(Wootook_Player_Model_Entity::SESSION_KEY);
+ $this->renderLayout();
+ }
+
+ /**
+ * Send new password by mail
+ */
+ public function lostPasswordPostAction()
+ {
+ $session = new Wootook_Player_Model_Session();
+ if ($session->isLoggedIn()) {
+ $this->_redirect('*/overview');
+ return;
+ }
+
+ if (!$this->getRequest()->isPost()) {
+ $this->_redirect('*/*/lost-password');
+ return;
+ }
+
+ $email = $this->getRequest()->getPost('email');
+ $username = $this->getRequest()->getPost('username');
+
+ $player = new Wootook_Player_Model_Entity();
+ $player->loadByEmail($email);
+
+ if (!$player->getId() || strtolower($player->getUsername()) != strtolower(trim($username))) {
+ $session->addError(Wootook::__('The information you entered could not be found.'));
+ $this->_redirect('*/*/lost-password');
+ return;
+ }
+
+ $chars = array(
+ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P',
+ 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e',
+ 'f', 'g', 'h', 'j', 'k', 'm', 'n', 'p', 'q', 'r', 's', 't', 'u', 'v',
+ 'w', 'x', 'y', 'z', '2', '3', '4', '5', '6', '7', '8', '9'
+ );
+
+ shuffle($chars);
+ $passwordChars = array_slice($chars, 0, 10);
+ $newPassword = implode($passwordChars);
+
+ $player->setPassword($newPassword)->save();
+
+ try {
+ $mailer = new Wootook_Core_Email();
+ $mailer->send(
+ array($player->getEmail() => $player->getUsername()),
+ array('contact@wootook.org' => 'Wootook'),
+ Wootook::__('Your new password'),
+ Wootook::__('Your new password is %s', $newPassword));
+ } catch (Wootook_Core_Exception_RuntimeException $e) {
+ Wootook_Player_Model_Session::getSingleton()
+ ->addError($e->getMessage());
+
+ $this->_redirect('*/*/lost-password');
+ return;
+ }
+
+ $this->_redirect('*/*/login');
+ }
+
+ public function editAction()
+ {
+ }
+
+ public function optionsAction()
+ {
+ }
+}
diff --git a/src/application/code/core/Wootook/Player/Controller/OverviewController.php b/src/application/code/core/Wootook/Player/Controller/OverviewController.php
new file mode 100644
index 0000000..97db0cf
--- /dev/null
+++ b/src/application/code/core/Wootook/Player/Controller/OverviewController.php
@@ -0,0 +1,12 @@
+loadLayout('player.overview');
+ $this->_prepareLayoutMessages(Wootook_Player_Model_Entity::SESSION_KEY);
+ $this->renderLayout();
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Player/Exception.php b/src/application/code/core/Wootook/Player/Exception.php
new file mode 100644
index 0000000..6a51351
--- /dev/null
+++ b/src/application/code/core/Wootook/Player/Exception.php
@@ -0,0 +1,3 @@
+= 50300) {
+ parent::__construct($message, $code, $previous);
+ } else {
+ parent::__construct($message, $code);
+ $this->_previous = $previous;
+ }
+ }
+
+ public function __call($method, $params)
+ {
+ if (strtolower($method) == 'getprevious') {
+ return $this->_previous;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Player/Exception/RuntimeException.php b/src/application/code/core/Wootook/Player/Exception/RuntimeException.php
new file mode 100644
index 0000000..e270f3f
--- /dev/null
+++ b/src/application/code/core/Wootook/Player/Exception/RuntimeException.php
@@ -0,0 +1,25 @@
+= 50300) {
+ parent::__construct($message, $code, $previous);
+ } else {
+ parent::__construct($message, $code);
+ $this->_previous = $previous;
+ }
+ }
+
+ public function __call($method, $params)
+ {
+ if (strtolower($method) == 'getprevious') {
+ return $this->_previous;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/application/code/core/Wootook/Player/Exception/Session.php b/src/application/code/core/Wootook/Player/Exception/Session.php
new file mode 100644
index 0000000..b546e5d
--- /dev/null
+++ b/src/application/code/core/Wootook/Player/Exception/Session.php
@@ -0,0 +1,7 @@
+getData('username');
+ }
+
+ public function getEmail()
+ {
+ return $this->getData('email');
+ }
+
+ public function loadByEmail($email)
+ {
+ return $this->load($email, 'email');
+ }
+
+ public function setPassword($newPassword)
+ {
+ return $this->setData('password', $this->hash($newPassword));
+ }
+
+ public static function hash($password, $salt = null)
+ {
+ if ($salt === null) {
+ return call_user_func(self::$hashCallback, ($password));
+ }
+
+ return call_user_func(self::$hashCallback, ($password . $salt));
+ }
+
+ protected function _init()
+ {
+ $this->setIdFieldName('id');
+ $this->setTableName('users');
+
+ $this->getDataMapper()
+ ->addRule('onlinetime', 'date-time')
+ ->addRule('urlaubs_until', 'date-time')
+ ->addRule('register_time', 'date-time')
+ ;
+ }
+
+ public function updateActivity()
+ {
+ $this
+ ->setData('current_page', $_SERVER['REQUEST_URI'])
+ ->setData('user_lastip', $_SERVER['REMOTE_ADDR'])
+ ->setData('user_agent', $_SERVER['HTTP_USER_AGENT'])
+ ->setData('onlinetime', new Wootook_Core_DateTime())
+ ->save()
+ ;
+ return $this;
+ }
+
+ public static function register($username, $email, $password)
+ {
+ try {
+ $request = Wootook::getRequest();
+ $player = new self(array(
+ 'username' => $username,
+ 'password' => md5($password),
+ 'email' => $email,
+ 'email_2' => $email,
+
+ 'register_time' => new Wootook_Core_DateTime(),
+ 'onlinetime' => new Wootook_Core_DateTime(),
+ 'ip_at_reg' => $request->getServer('REMOTE_ADDR'),
+ 'user_lastip' => $request->getServer('REMOTE_ADDR'),
+ 'user_agent' => $request->getServer('HTTP_USER_AGENT')
+ ));
+
+ //$player->getWriteConnection()->beginTransaction();
+
+ $player->save();
+
+ $select = Wootook_Empire_Model_Planet::searchMostFreeSystems();
+ $select->limit(1);
+
+ try {
+ $statement = $select->prepare();
+ if (!$statement->execute()) {
+ throw new Wootook_Empire_Exception_RuntimeException('No more planet to colonize!'); // Oops, no more free place
+ }
+ } catch (Wootook_Core_Exception_Database_Error $e) {
+ Wootook_Core_ErrorProfiler::getSingleton()->addException($e);
+ //$this->getWriteConnection()->rollback();
+ return null;
+ }
+
+ $systemInfo = $statement->fetch();
+ if ($systemInfo['count'] >= Wootook::getGameConfig('engine/universe/positions')) {
+ throw new Wootook_Empire_Exception_RuntimeException('No more planet to colonize!'); // Oops, no more free place
+ }
+
+ $collection = new Wootook_Empire_Resource_Planet_Collection($player->getReadConnection());
+ $collection->addTypeToFilter(Wootook_Empire_Model_Planet::TYPE_PLANET)
+ ->addFieldToFilter('galaxy', $systemInfo['galaxy'])
+ ->addFieldToFilter('system', $systemInfo['system'])
+ ;
+
+ $positions = range(1, Wootook::getGameConfig('engine/universe/positions'));
+ foreach ($collection as $planet) {
+ $key = array_search($planet->getData('position'), $positions);
+ if ($key !== false) {
+ unset($positions[$key]);
+ }
+ }
+ $key = array_rand($positions, 1);
+ $finalPosition = $positions[$key];
+
+ $planet = $player->createNewPlanet(
+ $systemInfo['galaxy'],
+ $systemInfo['system'],
+ $finalPosition,
+ Wootook_Empire_Model_Planet::TYPE_PLANET,
+ Wootook::__('Planet'),
+ Wootook::getGameConfig('resource/initial/fields')
+ );
+
+ $player
+ ->setData('id_planet', $planet->getId())
+ ->setData('current_planet', $planet->getId())
+ ->setData('galaxy', $planet->getGalaxy())
+ ->setData('system', $planet->getSystem())
+ ->setData('planet', $planet->getPosition())
+ ;
+
+ Wootook::dispatchEvent('player.init', array(
+ 'player' => $player
+ ));
+
+ $player->save();
+ } catch (Wootook_Core_Exception_DataAccessException $e) {
+ //$player->getWriteConnection()->rollback();
+ $session = Wootook_Core_Model_Session::factory(Wootook_Player_Model_Entity::SESSION_KEY);
+
+ Wootook_Core_ErrorProfiler::getSingleton()->addException($e);
+ $session->addError($e->getMessage());
+ return null;
+ } catch (Wootook_Empire_Exception_RuntimeException $e) {
+ //$player->getWriteConnection()->rollback();
+ $session = Wootook_Core_Model_Session::factory(Wootook_Player_Model_Entity::SESSION_KEY);
+
+ Wootook_Core_ErrorProfiler::getSingleton()->addException($e);
+ $session->addError($e->getMessage());
+ return null;
+ }
+ //$player->getWriteConnection()->commit();
+
+ return $player;
+ }
+
+ public function createNewPlanet($galaxy, $system, $position, $type, $name, $size = null)
+ {
+ if ($size === null) {
+ $size = Wootook::getGameConfig('planet/initial/fields');
+ }
+ if ($size === null) {
+ $size = 200;
+ }
+
+ $now = new Wootook_Core_DateTime();
+ $planet = new Wootook_Empire_Model_Planet(array(), $this);
+ $planet
+ ->setData('name', $name)
+ ->setData('galaxy', $galaxy)
+ ->setData('system', $system)
+ ->setData('planet', $position)
+ ->setData('planet_type', $type)
+ ->setData('field_max', $size)
+ ->setData('diameter', pow($size, 2) + mt_rand(0, $size * $position))
+ ->setData('field_current', 0)
+ ->setData('last_update', $now)
+ ->setData('b_tech', $now)
+ ->setData('b_hangar', $now)
+ ->setData('b_building', $now)
+ ;
+
+ $resourceList = Wootook_Empire_Helper_Config_Resources::getSingleton();
+ $resourceConfig = Wootook::getGameConfig('resources/initial');
+ foreach ($resourceList as $resource => $resourceData) {
+ if ($resourceData['field'] === null || !isset($resourceConfig[$resource])) {
+ continue;
+ }
+ $planet->setData($resourceData['field'], $resourceConfig[$resource]);
+ }
+
+ $resourceConfig = Wootook::getGameConfig('resources/base-income');
+ foreach ($resourceList as $resource => $resourceData) {
+ if ($resourceData['production_field'] === null || !isset($resourceConfig[$resource])) {
+ continue;
+ }
+ $planet->setData($resourceData['production_field'], $resourceConfig[$resource]);
+ }
+
+ $planet->updateStorages($now);
+ $planet->updateBuildingQueue($now);
+ $planet->updateResourceProduction($now);
+ $planet->updateResources($now);
+
+ $planet->save();
+
+ if ($planet->isPlanet()) {
+ $galaxy = new Wootook_Empire_Model_Galaxy_Position();
+ $galaxy
+ ->setData('galaxy', $planet->getGalaxy())
+ ->setData('system', $planet->getSystem())
+ ->setData('planet', $planet->getPosition())
+ ->setData('id_planet', $planet->getId())
+ ->save()
+ ;
+ }
+
+ Wootook::dispatchEvent('planet.init', array(
+ 'planet' => $planet,
+ 'player' => $this
+ ));
+
+ $planet->save();
+
+ return $planet;
+ }
+
+ /**
+ *
+ * Enter description here ...
+ * @param int|Wootook_Empire_Model_Planet $planet
+ */
+ public function updateCurrentPlanet($planet)
+ {
+ if (!$planet instanceof Wootook_Empire_Model_Planet) {
+ $planetCollection = $this->_preparePlanetCollection()->where('id=:id');
+
+ $planetCollection->load(array(
+ 'id' => $planet,
+ 'user' => $this->getId()
+ ));
+
+ if ($planetCollection->count() !== 1) {
+ return $this;
+ }
+
+ $planet = $planetCollection->current();
+ }
+
+ if ($planet->getPlayerId() != $this->getId() || $planet->isDestroyed()) {
+ return $this;
+ }
+
+ $this->setData('current_planet', $planet->getId())->save();
+
+ return $this;
+ }
+
+ /**
+ *
+ * Enter description here ...
+ * @param Wootook_Empire_Model_Planet $planet
+ */
+ public function setHomePlanet(Wootook_Empire_Model_Planet $planet)
+ {
+ if ($planet->getPlayerId() != $this->getId() || $planet->isDestroyed()) {
+ return $this;
+ }
+
+ $this->setData('id_planet', $planet->getId());
+ $this->_homePlanet = $planet;
+
+ return $this;
+ }
+
+ /**
+ *
+ * Enter description here ...
+ * @param Wootook_Empire_Model_Planet $planet
+ */
+ public function setCurrentPlanet(Wootook_Empire_Model_Planet $planet)
+ {
+ if ($planet->getPlayerId() != $this->getId() || $planet->isDestroyed()) {
+ return $this;
+ }
+
+ $this->setData('current_planet', $planet->getId());
+ $this->_currentPlanet = $planet;
+
+ return $this;
+ }
+
+ /**
+ *
+ * Enter description here ...
+ * @return Wootook_Empire_Model_Planet
+ */
+ public function getHomePlanet()
+ {
+ if ($this->_homePlanet === null) {
+ $planetId = $this->getData('id_planet');
+ if (!$planetId) {
+ return null;
+ }
+
+ $planet = Wootook_Empire_Model_Planet::factory($planetId);
+
+ if ($planet->getPlayerId() != $this->getId() || $planet->isDestroyed()) {
+ return null;
+ }
+
+ $this->_homePlanet = $planet;
+ }
+
+ return $planet;
+ }
+
+ /**
+ *
+ * Enter description here ...
+ * @return Wootook_Empire_Model_Planet
+ */
+ public function getCurrentPlanet()
+ {
+ if ($this->_currentPlanet === null) {
+ $planetId = $this->getData('current_planet');
+
+ if (!$planetId) {
+ $this->_currentPlanet = $this->getHomePlanet();
+ if ($this->_currentPlanet === null) {
+ return null;
+ }
+ $this->setData('current_planet', $this->_currentPlanet->getId())->save();
+
+ return $this->_currentPlanet;
+ }
+
+ $planet = Wootook_Empire_Model_Planet::factory($planetId);
+
+ if ($planet->getPlayerId() != $this->getId() || $planet->isDestroyed()) {
+ $this->_currentPlanet = $this->getHomePlanet();
+ $this->setData('current_planet', $this->_currentPlanet->getId())->save();
+
+ return $this->_currentPlanet;
+ }
+
+ $this->_currentPlanet = $planet;
+ }
+
+ return $this->_currentPlanet;
+ }
+
+ protected function _preparePlanetCollection()
+ {
+ $planetCollection = new Wootook_Empire_Resource_Planet_Collection($this->getReadConnection());
+ $planetCollection->addPlayerToFilter($this);
+
+ $order = ($this->getData('planet_sort_order') == 1) ? 'DESC' : 'ASC';
+
+ switch ($this->getData('planet_sort')) {
+ case self::PLANET_SORT_POSITION:
+ $planetCollection
+ ->addOrderBy('galaxy', $order)
+ ->addOrderBy('system', $order)
+ ->addOrderBy('planet', $order)
+ ->addOrderBy('planet_type', $order)
+ ;
+ break;
+
+ case self::PLANET_SORT_NAME:
+ $planetCollection->addOrderBy('name', $order);
+ break;
+
+ case self::PLANET_SORT_DATE:
+ default:
+ $planetCollection->addOrderBy('id', $order);
+ break;
+ }
+ return $planetCollection;
+ }
+
+ public function getPlanetCollection(Array $typeFilter = array())
+ {
+ $planetCollection = $this->_preparePlanetCollection();
+
+ if (!empty($typeFilter)) {
+ $planetCollection->addFieldToFilter('planet_type', array(array('in' => $typeFilter)));
+ }
+
+ return $planetCollection;
+ }
+
+ protected function _prepareFleetCollection($collection)
+ {
+ $collection->addFieldToFilter('fleet_owner', $this->getId());
+
+ return $this;
+ }
+
+ /**
+ * Returns all the flying fleets owned by the player
+ *
+ * @return Wootook_Empire_Resource_Fleet_Collection
+ */
+ public function getFleets()
+ {
+ $collection = new Wootook_Empire_Resource_Fleet_Collection($this->getReadConnection());
+
+ $this->_prepareFleetCollection($collection);
+
+ return $collection;
+ }
+
+ /**
+ * Counts all the flying fleets owned by the player
+ *
+ * @return mixed
+ */
+ public function getFleetCount()
+ {
+ return $this->getFleets()->getSize();
+ }
+
+ /**
+ * Returns all the visible fleets
+ *
+ * @param null $time
+ * @return Wootook_Empire_Resource_Fleet_Collection
+ */
+ public function getVisibleFleets($time = null)
+ {
+ $collection = new Wootook_Empire_Resource_Fleet_Collection($this->getReadConnection());
+
+ if ($time === null) {
+ $time = new Wootook_Core_DateTime();
+ }
+ $collection->addIsVisibleToFilter($this, $time);
+
+ return $collection;
+ }
+
+ /**
+ * Returns all the visible fleets
+ *
+ * @param null $time
+ * @return Wootook_Empire_Resource_Fleet_Collection
+ * @deprecated
+ * @alias getVisibleFleets
+ */
+ public function getFleetCollection($time = null)
+ {
+ return $this->getVisibleFleets($time);
+ }
+
+ public function getElement($elementId)
+ {
+ $fields = Wootook_Empire_Helper_Config_FieldsAlias::getSingleton();
+
+ return $this->getData($fields[$elementId]);
+ }
+
+ public function setElement($elementId, $level)
+ {
+ $fields = Wootook_Empire_Helper_Config_FieldsAlias::getSingleton();
+
+ return $this->setData($fields[$elementId], $level);
+ }
+
+ public function hasElement($elementId, $levelRequired = 0)
+ {
+ $fields = Wootook_Empire_Helper_Config_FieldsAlias::getSingleton();
+
+ return $this->hasData($fields[$elementId]) && Math::comp($this->getElement($elementId), $levelRequired) > 0;
+ }
+
+ public function getSkinPath($default = null)
+ {
+ if ($path = $this->getData('dpath')) {
+ return $path;
+ }
+ return $default;
+ }
+
+ public function setSkinPath($path)
+ {
+ $this->setData('dpath', $path);
+
+ return $this;
+ }
+
+ public function checkPassword($password)
+ {
+ if (self::hash($password) == $this->getData('password')) {
+ return true;
+ }
+ return false;
+ }
+
+ public function getNewMessagesCount()
+ {
+ $messageCollection = new Wootook_Player_Resource_Message_Collection($this->getReadConnection());
+ $messageCollection->addPlayerToFilter($this)->addUnreadToFilter();
+
+ $newMessages = null;
+ if (($count = $messageCollection->getSize()) > 0) {
+ return $count;
+ }
+ return null;
+ }
+
+ public static function layoutPrepareAfterListener($eventData)
+ {
+ $player = Wootook_Player_Model_Session::getSingleton()->getPlayer();
+ if ($player === null || !$player->getId() || !in_array($player->getData('authlevel'), array(LEVEL_ADMIN, LEVEL_OPERATOR, LEVEL_MODERATOR))) {
+ return;
+ }
+
+ if (!isset($eventData['layout']) || !$eventData['layout'] instanceof Wootook_Core_Model_Layout) {
+ return;
+ }
+ $layout = $eventData['layout'];
+ $navigation = $layout->getBlock('navigation');
+
+ if ($navigation === null) {
+ return;
+ }
+
+ if (!defined('IN_ADMIN')) {
+ $navigation->addLink('tools/admin', 'Admin Panel', 'Admin Panel', 'admin/overview.php', array(), array('admin'));
+ } else {
+ $navigation->addLink('tools/back', 'Go back to the game', 'Go back to the game', 'overview.php', array(), array('admin'));
+ }
+ }
+
+ public function isBanned()
+ {
+ return $this->getData('bana') ? true : false;
+ }
+
+ public function isVacation()
+ {
+ return $this->getData('urlaubs_modus') ? true : false;
+ }
+
+ public function getVacationEndDate()
+ {
+ return $this->getData('urlaubs_until');
+ }
+
+ public function getLastLoginDate()
+ {
+ return $this->getData('onlinetime');
+ }
+
+ public function setVacation($active = true)
+ {
+ $this->setData('urlaubs_modus', $active);
+
+ foreach ($this->getPlanetCollection() as $planet) {
+ $planet->updateResources();
+ $planet->updateResourceProduction();
+ $planet->save();
+ }
+
+ if ($active) {
+ $this->setData('urlaubs_until', time() + Wootook::getConfig('engine/options/vacation-min-time'));
+ } else {
+ $this->setData('urlaubs_until', null);
+ }
+ $this->save();
+
+ return $this;
+ }
+
+ public function isAuthorized($levels = array(LEVEL_ADMIN))
+ {
+ if (!is_array($levels)) {
+ $levels = array($levels);
+ }
+
+ if (in_array($this->getData('authlevel'), $levels)) {
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/application/code/core/Wootook/Empire/Model/User/Message.php b/src/application/code/core/Wootook/Player/Model/Message.php
similarity index 59%
rename from application/code/core/Wootook/Empire/Model/User/Message.php
rename to src/application/code/core/Wootook/Player/Model/Message.php
index 80241ef..0002d94 100644
--- a/application/code/core/Wootook/Empire/Model/User/Message.php
+++ b/src/application/code/core/Wootook/Player/Model/Message.php
@@ -1,14 +1,14 @@
_tableName = 'messages';
$this->_idFieldNames = array('message_id', 'message_owner');
}
-}
\ No newline at end of file
+}
diff --git a/src/application/code/core/Wootook/Player/Model/Session.php b/src/application/code/core/Wootook/Player/Model/Session.php
new file mode 100644
index 0000000..9ae226c
--- /dev/null
+++ b/src/application/code/core/Wootook/Player/Model/Session.php
@@ -0,0 +1,205 @@
+getData('player_id');
+ }
+
+ public function setPlayer(Wootook_Player_Model_Entity $player)
+ {
+ $this->_player = $player;
+ $this->setData('player_id', $player->getId());
+
+ return $this;
+ }
+
+ /**
+ *
+ * Enter description here ...
+ * @return Wootook_Player_Model_Entity
+ */
+ public function getPlayer()
+ {
+ if ($this->_player === null) {
+ $this->_player = new Wootook_Player_Model_Entity();
+
+ try {
+ if ($this->hasData('player_id')) {
+ $id = intval($this->getData('player_id'));
+ } else if (Wootook::getRequest() !== null &&
+ ($cookieData = Wootook::getRequest()->getCookie($this->_player->getCookieName())) !== null &&
+ is_array($cookieData)) {
+
+ $adapter = $this->_player->getReadConnection();
+ $select = $adapter->select(array('user' => $adapter->getTable('users')));
+
+ $select
+ ->column('id')
+ ->where('id', isset($cookieData['id']) ? intval($cookieData['id']) : 0)
+ ->where(new Wootook_Core_Database_Sql_Placeholder_Expression(
+ ':key=CONCAT((@salt:=MID(:key, 0, 4)), SHA1(CONCAT(user.username, user.password, @salt)))',
+ array('key' => isset($cookieData['key']) ? $adapter->quote($cookieData['key']) : null)))
+ ;
+ try {
+ $statement = $adapter->prepare($select);
+ if (!$statement->execute($cookieData) || $statement->rowCount() <= 0) {
+ throw new Wootook_Player_Exception_Session('Your session has expired, please login.');
+ }
+
+ $id = $statement->fetchColumn();
+ } catch (Wootook_Core_Exception_Database_AdapterError $e) {
+ throw new Wootook_Core_Exception_DataAccessException('Session error.', null, $e);
+ } catch (Wootook_Core_Exception_Database_StatementError $e) {
+ throw new Wootook_Core_Exception_DataAccessException('Session error.', null, $e);
+ }
+ } else {
+ //throw new Wootook_Player_Exception_Session('Your session has expired, please login.');
+ return $this->_player;
+ }
+ } catch (Wootook_Player_Exception_Session $e) {
+ $this->addError($e->getMessage());
+ return $this->_player;
+ }
+
+ try {
+ $this->_player->load($id);
+ } catch (Wootook_Core_Exception_DataAccessException $e) {
+ $this->addError('Session error.');
+ return $this->_player;
+ }
+ $this->_player->updateActivity();
+ }
+ return $this->_player;
+ }
+
+ public function isLoggedIn()
+ {
+ if ($this->getPlayerId()) {
+ return true;
+ }
+ return false;
+ }
+
+ public function logout()
+ {
+ $this->clearData();
+
+ return $this;
+ }
+
+ public function login($username, $password, $remember = false)
+ {
+ try {
+ if ($this->_player === null) {
+ $this->_player = new Wootook_Player_Model_Entity();
+ }
+
+ if ($this->_player->getId()) {
+ return $this->_player;
+ }
+ $adapter = $this->_player->getReadConnection();
+ $select = $adapter->select(array('user' => $adapter->getTable($this->_player->getTableName())));
+
+ $passwordHash = $this->_player->hash($password);
+ $select
+ ->column(array(
+ 'id' => 'user.id',
+ 'username' => 'user.username',
+ 'password_hash' => 'user.password',
+ 'is_banned' => 'user.banaday',
+ 'login_rememberme' => new Wootook_Core_Database_Sql_Placeholder_Expression('CONCAT((@salt:=MID(MD5(RAND()), 0, 4)), SHA1(CONCAT(user.username, user.password, @salt)))'),
+ 'login_success' => new Wootook_Core_Database_Sql_Placeholder_Expression("(CASE WHEN user.password={$adapter->quote($passwordHash)} THEN 1 ELSE 0 END)")
+ ))
+ ->where(new Wootook_Core_Database_Sql_Placeholder_Expression('user.username=:username', array('username' => $username)));
+
+ $statement = $adapter->prepare($select);
+ if (!$statement->execute()) {
+ $this->addError(Wootook::__('No such user.'));
+ return $this->_player;
+ }
+ } catch (Wootook_Core_Exception_Database_StatementError $e) {
+ Wootook_Core_ErrorProfiler::getSingleton()->exceptionManager($e);
+ $this->addError(Wootook::__('No such user.'));
+ return $this->_player;
+ } catch (Wootook_Core_Exception_DataAccessException $e) {
+ Wootook_Core_ErrorProfiler::getSingleton()->exceptionManager($e);
+ $this->addError(Wootook::__('No such user.'));
+ return $this->_player;
+ }
+
+ $login = $statement->fetch();
+
+ if (intval($login['login_success']) == 1) {
+ $this->_player->load($login['id']);
+
+ if ($login['is_banned'] != 0) {
+ if ($login['is_banned'] <= time()) {
+ $this->_player->setData('banaday', 0)
+ ->setData('bana', 0)
+ ->setData('urlaubs_modus', 0)
+ ->setData('urlaubs_until', null)
+ ->save()
+ ;
+ } else {
+ $this->addError(Wootook::__('You were banned, please contact admin for more information.'));
+ return $this->_player;
+ }
+ }
+
+ if (isset($_POST["rememberme"]) && Wootook::getResponse() !== null) {
+ Wootook::getResponse()->setCookie(
+ $this->_player->getCookieName(),
+ array('id' => $this->_player->getId(), 'key' => $login['login_rememberme']),
+ $this->_player->getCookieLifetime(),
+ $this->_player->getCookiePath(),
+ $this->_player->getCookieDomain()
+ );
+ }
+
+ $this->setLoggedIn($this->_player);
+ return $this->_player;
+ }
+
+ $this->addError(Wootook::__('Your username or credential is invalid, please check your input.'));
+ return $this->_player;
+ }
+
+ public function setLoggedIn(Wootook_Player_Model_Entity $player)
+ {
+ $player->updateActivity();
+
+ $this->setData('player_id', intval($player->getId()));
+
+ return $this;
+ }
+}
diff --git a/src/application/code/core/Wootook/Player/Mvc/Controller/Registered.php b/src/application/code/core/Wootook/Player/Mvc/Controller/Registered.php
new file mode 100644
index 0000000..3374acf
--- /dev/null
+++ b/src/application/code/core/Wootook/Player/Mvc/Controller/Registered.php
@@ -0,0 +1,32 @@
+getSession()->getPlayer();
+ }
+
+ public function getCurrentPlanet()
+ {
+ return $this->getPlayer()->getCurrentPlanet();
+ }
+
+ public function preDispatch()
+ {
+ if (!$this->getSession()->isLoggedIn()) {
+ $this->_redirectLogin();
+ }
+ }
+
+ protected function _redirectLogin()
+ {
+ return $this->_redirect('player/account/login');
+ }
+}
diff --git a/src/application/code/core/Wootook/Player/Resource/Entity/Collection.php b/src/application/code/core/Wootook/Player/Resource/Entity/Collection.php
new file mode 100644
index 0000000..3e2c1bc
--- /dev/null
+++ b/src/application/code/core/Wootook/Player/Resource/Entity/Collection.php
@@ -0,0 +1,37 @@
+_init('users', 'Wootook_Player_Model_Entity');
+ }
+
+ public function addAuthlevelToFilter(Array $levels, $exclude = false)
+ {
+ if ($exclude === true) {
+ $this->addFieldToFilter('authlevel', array(array('nin' => $levels)));
+ } else {
+ $this->addFieldToFilter('authlevel', array(array('in' => $levels)));
+ }
+
+ return $this;
+ }
+
+ public function addIsOnlineToFilter($onlineTime = 900)
+ {
+ $onlineTime = (int) $onlineTime;
+
+ $date = new Wootook_Core_DateTime();
+ $date->sub($onlineTime, Wootook_Core_DateTime::TIMESTAMP);
+
+ if ($onlineTime > 0) {
+ $this->addFieldToFilter('onlinetime', array(array(
+ Wootook_Core_Database_Sql_Select::OPERATOR_DATE => array('from' => $date)
+ )));
+ }
+
+ return $this;
+ }
+}
diff --git a/src/application/code/core/Wootook/Player/Resource/Message/Collection.php b/src/application/code/core/Wootook/Player/Resource/Message/Collection.php
new file mode 100644
index 0000000..e6d9198
--- /dev/null
+++ b/src/application/code/core/Wootook/Player/Resource/Message/Collection.php
@@ -0,0 +1,24 @@
+_init('messages', 'Wootook_Player_Model_Message');
+ }
+
+ public function addPlayerToFilter(Wootook_Player_Model_Entity $player)
+ {
+ $this->addFieldToFilter('message_owner', $player->getId());
+
+ return $this;
+ }
+
+ public function addUnreadToFilter()
+ {
+ $this->addFieldToFilter('message_read_at', array(array('lteq' => 0)));
+
+ return $this;
+ }
+}
diff --git a/application/design/base/default/scripts/empire/planet/shipyard/queue.phtml b/src/application/code/core/Wootook/Server/Mvc/Dispatcher.php
similarity index 100%
rename from application/design/base/default/scripts/empire/planet/shipyard/queue.phtml
rename to src/application/code/core/Wootook/Server/Mvc/Dispatcher.php
diff --git a/application/code/libraries/Math.php b/src/application/code/libraries/Math.php
similarity index 99%
rename from application/code/libraries/Math.php
rename to src/application/code/libraries/Math.php
index 7ea2d08..f429008 100644
--- a/application/code/libraries/Math.php
+++ b/src/application/code/libraries/Math.php
@@ -3,7 +3,7 @@
* This file is part of Wootook
*
* @license http://www.gnu.org/licenses/agpl-3.0.txt
- * @see http://www.wootook.com/
+ * @see http://wootook.org/
*
* Copyright (c) 2011-Present, Grégory PLANCHAT
* All rights reserved.
diff --git a/application/code/libraries/Math/Bcmath.php b/src/application/code/libraries/Math/Bcmath.php
similarity index 99%
rename from application/code/libraries/Math/Bcmath.php
rename to src/application/code/libraries/Math/Bcmath.php
index bbf9b45..e5368c6 100644
--- a/application/code/libraries/Math/Bcmath.php
+++ b/src/application/code/libraries/Math/Bcmath.php
@@ -3,7 +3,7 @@
* This file is part of Wootook
*
* @license http://www.gnu.org/licenses/agpl-3.0.txt
- * @see http://www.wootook.com/
+ * @see http://wootook.org/
*
* Copyright (c) 2011-Present, Grégory PLANCHAT
* All rights reserved.
diff --git a/application/code/libraries/Math/Native.php b/src/application/code/libraries/Math/Native.php
similarity index 98%
rename from application/code/libraries/Math/Native.php
rename to src/application/code/libraries/Math/Native.php
index 300d8e7..0958113 100644
--- a/application/code/libraries/Math/Native.php
+++ b/src/application/code/libraries/Math/Native.php
@@ -3,7 +3,7 @@
* This file is part of Wootook
*
* @license http://www.gnu.org/licenses/agpl-3.0.txt
- * @see http://www.wootook.com/
+ * @see http://wootook.org/
*
* Copyright (c) 2011-Present, Grégory PLANCHAT
* All rights reserved.
diff --git a/src/application/code/libraries/Wildfire/Stream.php b/src/application/code/libraries/Wildfire/Stream.php
new file mode 100644
index 0000000..9966a44
--- /dev/null
+++ b/src/application/code/libraries/Wildfire/Stream.php
@@ -0,0 +1,1753 @@
+
+ * @license http://www.opensource.org/licenses/bsd-license.php
+ * @package FirePHPCore
+ */
+
+
+/**
+ * Sends the given data to the FirePHP Firefox Extension.
+ * The data can be displayed in the Firebug Console or in the
+ * "Server" request tab.
+ *
+ * For more information see: http://www.firephp.org/
+ *
+ * @copyright Copyright (C) 2007-2009 Christoph Dorn
+ * @author Christoph Dorn
+ * @license http://www.opensource.org/licenses/bsd-license.php
+ * @package FirePHPCore
+ */
+class Wildfire_Stream {
+
+ /**
+ * FirePHP version
+ *
+ * @var string
+ */
+ const VERSION = '0.3'; // @pinf replace '0.3' with '%%package.version%%'
+
+ /**
+ * Firebug LOG level
+ *
+ * Logs a message to firebug console.
+ *
+ * @var string
+ */
+ const LOG = 'LOG';
+
+ /**
+ * Firebug INFO level
+ *
+ * Logs a message to firebug console and displays an info icon before the message.
+ *
+ * @var string
+ */
+ const INFO = 'INFO';
+
+ /**
+ * Firebug WARN level
+ *
+ * Logs a message to firebug console, displays an warning icon before the message and colors the line turquoise.
+ *
+ * @var string
+ */
+ const WARN = 'WARN';
+
+ /**
+ * Firebug ERROR level
+ *
+ * Logs a message to firebug console, displays an error icon before the message and colors the line yellow. Also increments the firebug error count.
+ *
+ * @var string
+ */
+ const ERROR = 'ERROR';
+
+ /**
+ * Dumps a variable to firebug's server panel
+ *
+ * @var string
+ */
+ const DUMP = 'DUMP';
+
+ /**
+ * Displays a stack trace in firebug console
+ *
+ * @var string
+ */
+ const TRACE = 'TRACE';
+
+ /**
+ * Displays an exception in firebug console
+ *
+ * Increments the firebug error count.
+ *
+ * @var string
+ */
+ const EXCEPTION = 'EXCEPTION';
+
+ /**
+ * Displays an table in firebug console
+ *
+ * @var string
+ */
+ const TABLE = 'TABLE';
+
+ /**
+ * Starts a group in firebug console
+ *
+ * @var string
+ */
+ const GROUP_START = 'GROUP_START';
+
+ /**
+ * Ends a group in firebug console
+ *
+ * @var string
+ */
+ const GROUP_END = 'GROUP_END';
+
+ /**
+ * Singleton instance of FirePHP
+ *
+ * @var FirePHP
+ */
+ protected static $instance = null;
+
+ /**
+ * Flag whether we are logging from within the exception handler
+ *
+ * @var boolean
+ */
+ protected $inExceptionHandler = false;
+
+ /**
+ * Flag whether to throw PHP errors that have been converted to ErrorExceptions
+ *
+ * @var boolean
+ */
+ protected $throwErrorExceptions = true;
+
+ /**
+ * Flag whether to convert PHP assertion errors to Exceptions
+ *
+ * @var boolean
+ */
+ protected $convertAssertionErrorsToExceptions = true;
+
+ /**
+ * Flag whether to throw PHP assertion errors that have been converted to Exceptions
+ *
+ * @var boolean
+ */
+ protected $throwAssertionExceptions = false;
+
+ /**
+ * Wildfire protocol message index
+ *
+ * @var int
+ */
+ protected $messageIndex = 1;
+
+ /**
+ * Options for the library
+ *
+ * @var array
+ */
+ protected $options = array('maxDepth' => 10,
+ 'maxObjectDepth' => 5,
+ 'maxArrayDepth' => 5,
+ 'useNativeJsonEncode' => true,
+ 'includeLineNumbers' => true);
+
+ /**
+ * Filters used to exclude object members when encoding
+ *
+ * @var array
+ */
+ protected $objectFilters = array(
+ 'firephp' => array('objectStack', 'instance', 'json_objectStack'),
+ 'firephp_test_class' => array('objectStack', 'instance', 'json_objectStack')
+ );
+
+ /**
+ * A stack of objects used to detect recursion during object encoding
+ *
+ * @var object
+ */
+ protected $objectStack = array();
+
+ /**
+ * Flag to enable/disable logging
+ *
+ * @var boolean
+ */
+ protected $enabled = true;
+
+ /**
+ * The insight console to log to if applicable
+ *
+ * @var object
+ */
+ protected $logToInsightConsole = null;
+
+ /**
+ * When the object gets serialized only include specific object members.
+ *
+ * @return array
+ */
+ public function __sleep()
+ {
+ return array('options','objectFilters','enabled');
+ }
+
+ /**
+ * Gets singleton instance of FirePHP
+ *
+ * @param boolean $AutoCreate
+ * @return FirePHP
+ */
+ public static function getInstance($AutoCreate = false)
+ {
+ if ($AutoCreate===true && !self::$instance) {
+ self::init();
+ }
+ return self::$instance;
+ }
+
+ /**
+ * Creates FirePHP object and stores it for singleton access
+ *
+ * @return FirePHP
+ */
+ public static function init()
+ {
+ return self::setInstance(new self());
+ }
+
+ /**
+ * Set the instance of the FirePHP singleton
+ *
+ * @param FirePHP $instance The FirePHP object instance
+ * @return FirePHP
+ */
+ public static function setInstance($instance)
+ {
+ return self::$instance = $instance;
+ }
+
+ /**
+ * Set an Insight console to direct all logging calls to
+ *
+ * @param object $console The console object to log to
+ * @return void
+ */
+ public function setLogToInsightConsole($console)
+ {
+ if(is_string($console)) {
+ if(get_class($this)!='FirePHP_Insight' && !is_subclass_of($this, 'FirePHP_Insight')) {
+ throw new Exception('FirePHP instance not an instance or subclass of FirePHP_Insight!');
+ }
+ $this->logToInsightConsole = $this->to('request')->console($console);
+ } else {
+ $this->logToInsightConsole = $console;
+ }
+ }
+
+ /**
+ * Enable and disable logging to Firebug
+ *
+ * @param boolean $Enabled TRUE to enable, FALSE to disable
+ * @return void
+ */
+ public function setEnabled($Enabled)
+ {
+ $this->enabled = $Enabled;
+ }
+
+ /**
+ * Check if logging is enabled
+ *
+ * @return boolean TRUE if enabled
+ */
+ public function getEnabled()
+ {
+ return $this->enabled;
+ }
+
+ /**
+ * Specify a filter to be used when encoding an object
+ *
+ * Filters are used to exclude object members.
+ *
+ * @param string $Class The class name of the object
+ * @param array $Filter An array of members to exclude
+ * @return void
+ */
+ public function setObjectFilter($Class, $Filter)
+ {
+ $this->objectFilters[strtolower($Class)] = $Filter;
+ }
+
+ /**
+ * Set some options for the library
+ *
+ * Options:
+ * - maxDepth: The maximum depth to traverse (default: 10)
+ * - maxObjectDepth: The maximum depth to traverse objects (default: 5)
+ * - maxArrayDepth: The maximum depth to traverse arrays (default: 5)
+ * - useNativeJsonEncode: If true will use json_encode() (default: true)
+ * - includeLineNumbers: If true will include line numbers and filenames (default: true)
+ *
+ * @param array $Options The options to be set
+ * @return void
+ */
+ public function setOptions($Options)
+ {
+ $this->options = array_merge($this->options,$Options);
+ }
+
+ /**
+ * Get options from the library
+ *
+ * @return array The currently set options
+ */
+ public function getOptions()
+ {
+ return $this->options;
+ }
+
+ /**
+ * Set an option for the library
+ *
+ * @param string $Name
+ * @param mixed $Value
+ * @throws Exception
+ * @return void
+ */
+ public function setOption($Name, $Value)
+ {
+ if (!isset($this->options[$Name])) {
+ throw $this->newException('Unknown option: ' . $Name);
+ }
+ $this->options[$Name] = $Value;
+ }
+
+ /**
+ * Get an option from the library
+ *
+ * @param string $Name
+ * @throws Exception
+ * @return mixed
+ */
+ public function getOption($Name)
+ {
+ if (!isset($this->options[$Name])) {
+ throw $this->newException('Unknown option: ' . $Name);
+ }
+ return $this->options[$Name];
+ }
+
+ /**
+ * Register FirePHP as your error handler
+ *
+ * Will throw exceptions for each php error.
+ *
+ * @return mixed Returns a string containing the previously defined error handler (if any)
+ */
+ public function registerErrorHandler($throwErrorExceptions = false)
+ {
+ //NOTE: The following errors will not be caught by this error handler:
+ // E_ERROR, E_PARSE, E_CORE_ERROR,
+ // E_CORE_WARNING, E_COMPILE_ERROR,
+ // E_COMPILE_WARNING, E_STRICT
+
+ $this->throwErrorExceptions = $throwErrorExceptions;
+
+ return set_error_handler(array($this,'errorHandler'));
+ }
+
+ /**
+ * FirePHP's error handler
+ *
+ * Throws exception for each php error that will occur.
+ *
+ * @param int $errno
+ * @param string $errstr
+ * @param string $errfile
+ * @param int $errline
+ * @param array $errcontext
+ */
+ public function errorHandler($errno, $errstr, $errfile, $errline, $errcontext)
+ {
+ // Don't throw exception if error reporting is switched off
+ if (error_reporting() == 0) {
+ return;
+ }
+ // Only throw exceptions for errors we are asking for
+ if (error_reporting() & $errno) {
+
+ $exception = new ErrorException($errstr, 0, $errno, $errfile, $errline);
+ if ($this->throwErrorExceptions) {
+ throw $exception;
+ } else {
+ $this->fb($exception);
+ }
+ }
+ }
+
+ /**
+ * Register FirePHP as your exception handler
+ *
+ * @return mixed Returns the name of the previously defined exception handler,
+ * or NULL on error.
+ * If no previous handler was defined, NULL is also returned.
+ */
+ public function registerExceptionHandler()
+ {
+ return set_exception_handler(array($this,'exceptionHandler'));
+ }
+
+ /**
+ * FirePHP's exception handler
+ *
+ * Logs all exceptions to your firebug console and then stops the script.
+ *
+ * @param Exception $Exception
+ * @throws Exception
+ */
+ function exceptionHandler($Exception)
+ {
+
+ $this->inExceptionHandler = true;
+
+ header('HTTP/1.1 500 Internal Server Error');
+
+ try {
+ $this->fb($Exception);
+ } catch (Exception $e) {
+ echo 'We had an exception: ' . $e;
+ }
+ $this->inExceptionHandler = false;
+ }
+
+ /**
+ * Register FirePHP driver as your assert callback
+ *
+ * @param boolean $convertAssertionErrorsToExceptions
+ * @param boolean $throwAssertionExceptions
+ * @return mixed Returns the original setting or FALSE on errors
+ */
+ public function registerAssertionHandler($convertAssertionErrorsToExceptions = true, $throwAssertionExceptions = false)
+ {
+ $this->convertAssertionErrorsToExceptions = $convertAssertionErrorsToExceptions;
+ $this->throwAssertionExceptions = $throwAssertionExceptions;
+
+ if ($throwAssertionExceptions && !$convertAssertionErrorsToExceptions) {
+ throw $this->newException('Cannot throw assertion exceptions as assertion errors are not being converted to exceptions!');
+ }
+
+ return assert_options(ASSERT_CALLBACK, array($this, 'assertionHandler'));
+ }
+
+ /**
+ * FirePHP's assertion handler
+ *
+ * Logs all assertions to your firebug console and then stops the script.
+ *
+ * @param string $file File source of assertion
+ * @param int $line Line source of assertion
+ * @param mixed $code Assertion code
+ */
+ public function assertionHandler($file, $line, $code)
+ {
+ if ($this->convertAssertionErrorsToExceptions) {
+
+ $exception = new ErrorException('Assertion Failed - Code[ '.$code.' ]', 0, null, $file, $line);
+
+ if ($this->throwAssertionExceptions) {
+ throw $exception;
+ } else {
+ $this->fb($exception);
+ }
+
+ } else {
+ $this->fb($code, 'Assertion Failed', FirePHP::ERROR, array('File'=>$file,'Line'=>$line));
+ }
+ }
+
+ /**
+ * Start a group for following messages.
+ *
+ * Options:
+ * Collapsed: [true|false]
+ * Color: [#RRGGBB|ColorName]
+ *
+ * @param string $Name
+ * @param array $Options OPTIONAL Instructions on how to log the group
+ * @return true
+ * @throws Exception
+ */
+ public function group($Name, $Options = null)
+ {
+
+ if (!$Name) {
+ throw $this->newException('You must specify a label for the group!');
+ }
+
+ if ($Options) {
+ if (!is_array($Options)) {
+ throw $this->newException('Options must be defined as an array!');
+ }
+ if (array_key_exists('Collapsed', $Options)) {
+ $Options['Collapsed'] = ($Options['Collapsed'])?'true':'false';
+ }
+ }
+
+ return $this->fb(null, $Name, FirePHP::GROUP_START, $Options);
+ }
+
+ /**
+ * Ends a group you have started before
+ *
+ * @return true
+ * @throws Exception
+ */
+ public function groupEnd()
+ {
+ return $this->fb(null, null, FirePHP::GROUP_END);
+ }
+
+ /**
+ * Log object with label to firebug console
+ *
+ * @see FirePHP::LOG
+ * @param mixes $Object
+ * @param string $Label
+ * @return true
+ * @throws Exception
+ */
+ public function log($Object, $Label = null, $Options = array())
+ {
+ return $this->fb($Object, $Label, FirePHP::LOG, $Options);
+ }
+
+ /**
+ * Log object with label to firebug console
+ *
+ * @see FirePHP::INFO
+ * @param mixes $Object
+ * @param string $Label
+ * @return true
+ * @throws Exception
+ */
+ public function info($Object, $Label = null, $Options = array())
+ {
+ return $this->fb($Object, $Label, FirePHP::INFO, $Options);
+ }
+
+ /**
+ * Log object with label to firebug console
+ *
+ * @see FirePHP::WARN
+ * @param mixes $Object
+ * @param string $Label
+ * @return true
+ * @throws Exception
+ */
+ public function warn($Object, $Label = null, $Options = array())
+ {
+ return $this->fb($Object, $Label, FirePHP::WARN, $Options);
+ }
+
+ /**
+ * Log object with label to firebug console
+ *
+ * @see FirePHP::ERROR
+ * @param mixes $Object
+ * @param string $Label
+ * @return true
+ * @throws Exception
+ */
+ public function error($Object, $Label = null, $Options = array())
+ {
+ return $this->fb($Object, $Label, FirePHP::ERROR, $Options);
+ }
+
+ /**
+ * Dumps key and variable to firebug server panel
+ *
+ * @see FirePHP::DUMP
+ * @param string $Key
+ * @param mixed $Variable
+ * @return true
+ * @throws Exception
+ */
+ public function dump($Key, $Variable, $Options = array())
+ {
+ if (!is_string($Key)) {
+ throw $this->newException('Key passed to dump() is not a string');
+ }
+ if (strlen($Key)>100) {
+ throw $this->newException('Key passed to dump() is longer than 100 characters');
+ }
+ if (!preg_match_all('/^[a-zA-Z0-9-_\.:]*$/', $Key, $m)) {
+ throw $this->newException('Key passed to dump() contains invalid characters [a-zA-Z0-9-_\.:]');
+ }
+ return $this->fb($Variable, $Key, FirePHP::DUMP, $Options);
+ }
+
+ /**
+ * Log a trace in the firebug console
+ *
+ * @see FirePHP::TRACE
+ * @param string $Label
+ * @return true
+ * @throws Exception
+ */
+ public function trace($Label)
+ {
+ return $this->fb($Label, FirePHP::TRACE);
+ }
+
+ /**
+ * Log a table in the firebug console
+ *
+ * @see FirePHP::TABLE
+ * @param string $Label
+ * @param string $Table
+ * @return true
+ * @throws Exception
+ */
+ public function table($Label, $Table, $Options = array())
+ {
+ return $this->fb($Table, $Label, FirePHP::TABLE, $Options);
+ }
+
+ /**
+ * Insight API wrapper
+ *
+ * @see Insight_Helper::to()
+ */
+ public static function to()
+ {
+ $instance = self::getInstance();
+ if (!method_exists($instance, "_to")) {
+ throw new Exception("FirePHP::to() implementation not loaded");
+ }
+ $args = func_get_args();
+ return call_user_func_array(array($instance, '_to'), $args);
+ }
+
+ /**
+ * Insight API wrapper
+ *
+ * @see Insight_Helper::plugin()
+ */
+ public static function plugin()
+ {
+ $instance = self::getInstance();
+ if (!method_exists($instance, "_plugin")) {
+ throw new Exception("FirePHP::plugin() implementation not loaded");
+ }
+ $args = func_get_args();
+ return call_user_func_array(array($instance, '_plugin'), $args);
+ }
+
+ /**
+ * Check if FirePHP is installed on client
+ *
+ * @return boolean
+ */
+ public function detectClientExtension()
+ {
+ // Check if FirePHP is installed on client via User-Agent header
+ if (@preg_match_all('/\sFirePHP\/([\.\d]*)\s?/si',$this->getUserAgent(),$m) &&
+ version_compare($m[1][0],'0.0.6','>=')) {
+ return true;
+ } else
+ // Check if FirePHP is installed on client via X-FirePHP-Version header
+ if (@preg_match_all('/^([\.\d]*)$/si',$this->getRequestHeader("X-FirePHP-Version"),$m) &&
+ version_compare($m[1][0],'0.0.6','>=')) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Log varible to Firebug
+ *
+ * @see http://www.firephp.org/Wiki/Reference/Fb
+ * @param mixed $Object The variable to be logged
+ * @return true Return TRUE if message was added to headers, FALSE otherwise
+ * @throws Exception
+ */
+ public function fb($Object)
+ {
+ if($this instanceof FirePHP_Insight && method_exists($this, '_logUpgradeClientMessage')) {
+ if(!FirePHP_Insight::$upgradeClientMessageLogged) { // avoid infinite recursion as _logUpgradeClientMessage() logs a message
+ $this->_logUpgradeClientMessage();
+ }
+ }
+
+ static $insightGroupStack = array();
+
+ if (!$this->getEnabled()) {
+ return false;
+ }
+
+ if ($this->headersSent($filename, $linenum)) {
+ // If we are logging from within the exception handler we cannot throw another exception
+ if ($this->inExceptionHandler) {
+ // Simply echo the error out to the page
+ echo 'FirePHP ERROR: Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.
';
+ } else {
+ throw $this->newException('Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.');
+ }
+ }
+
+ $Type = null;
+ $Label = null;
+ $Options = array();
+
+ if (func_num_args()==1) {
+ } else
+ if (func_num_args()==2) {
+ switch(func_get_arg(1)) {
+ case self::LOG:
+ case self::INFO:
+ case self::WARN:
+ case self::ERROR:
+ case self::DUMP:
+ case self::TRACE:
+ case self::EXCEPTION:
+ case self::TABLE:
+ case self::GROUP_START:
+ case self::GROUP_END:
+ $Type = func_get_arg(1);
+ break;
+ default:
+ $Label = func_get_arg(1);
+ break;
+ }
+ } else
+ if (func_num_args()==3) {
+ $Type = func_get_arg(2);
+ $Label = func_get_arg(1);
+ } else
+ if (func_num_args()==4) {
+ $Type = func_get_arg(2);
+ $Label = func_get_arg(1);
+ $Options = func_get_arg(3);
+ } else {
+ throw $this->newException('Wrong number of arguments to fb() function!');
+ }
+
+ if($this->logToInsightConsole!==null && (get_class($this)=='FirePHP_Insight' || is_subclass_of($this, 'FirePHP_Insight'))) {
+ $msg = $this->logToInsightConsole;
+ if ($Object instanceof Exception) {
+ $Type = self::EXCEPTION;
+ }
+ if($Label && $Type!=self::TABLE && $Type!=self::GROUP_START) {
+ $msg = $msg->label($Label);
+ }
+ switch($Type) {
+ case self::DUMP:
+ case self::LOG:
+ return $msg->log($Object);
+ case self::INFO:
+ return $msg->info($Object);
+ case self::WARN:
+ return $msg->warn($Object);
+ case self::ERROR:
+ return $msg->error($Object);
+ case self::TRACE:
+ return $msg->trace($Object);
+ case self::EXCEPTION:
+ return $this->plugin('engine')->handleException($Object, $msg);
+ case self::TABLE:
+ if (isset($Object[0]) && !is_string($Object[0]) && $Label) {
+ $Object = array($Label, $Object);
+ }
+ return $msg->table($Object[0], array_slice($Object[1],1), $Object[1][0]);
+ case self::GROUP_START:
+ $insightGroupStack[] = $msg->group(md5($Label))->open();
+ return $msg->log($Label);
+ case self::GROUP_END:
+ if(count($insightGroupStack)==0) {
+ throw new Error('Too many groupEnd() as opposed to group() calls!');
+ }
+ $group = array_pop($insightGroupStack);
+ return $group->close();
+ default:
+ return $msg->log($Object);
+ }
+ }
+
+ if (!$this->detectClientExtension()) {
+ return false;
+ }
+
+ $meta = array();
+ $skipFinalObjectEncode = false;
+
+ if ($Object instanceof Exception) {
+
+ $meta['file'] = $this->_escapeTraceFile($Object->getFile());
+ $meta['line'] = $Object->getLine();
+
+ $trace = $Object->getTrace();
+ if ($Object instanceof ErrorException
+ && isset($trace[0]['function'])
+ && $trace[0]['function']=='errorHandler'
+ && isset($trace[0]['class'])
+ && $trace[0]['class']=='FirePHP') {
+
+ $severity = false;
+ switch($Object->getSeverity()) {
+ case E_WARNING: $severity = 'E_WARNING'; break;
+ case E_NOTICE: $severity = 'E_NOTICE'; break;
+ case E_USER_ERROR: $severity = 'E_USER_ERROR'; break;
+ case E_USER_WARNING: $severity = 'E_USER_WARNING'; break;
+ case E_USER_NOTICE: $severity = 'E_USER_NOTICE'; break;
+ case E_STRICT: $severity = 'E_STRICT'; break;
+ case E_RECOVERABLE_ERROR: $severity = 'E_RECOVERABLE_ERROR'; break;
+ case E_DEPRECATED: $severity = 'E_DEPRECATED'; break;
+ case E_USER_DEPRECATED: $severity = 'E_USER_DEPRECATED'; break;
+ }
+
+ $Object = array('Class'=>get_class($Object),
+ 'Message'=>$severity.': '.$Object->getMessage(),
+ 'File'=>$this->_escapeTraceFile($Object->getFile()),
+ 'Line'=>$Object->getLine(),
+ 'Type'=>'trigger',
+ 'Trace'=>$this->_escapeTrace(array_splice($trace,2)));
+ $skipFinalObjectEncode = true;
+ } else {
+ $Object = array('Class'=>get_class($Object),
+ 'Message'=>$Object->getMessage(),
+ 'File'=>$this->_escapeTraceFile($Object->getFile()),
+ 'Line'=>$Object->getLine(),
+ 'Type'=>'throw',
+ 'Trace'=>$this->_escapeTrace($trace));
+ $skipFinalObjectEncode = true;
+ }
+ $Type = self::EXCEPTION;
+
+ } else
+ if ($Type==self::TRACE) {
+
+ $trace = debug_backtrace();
+ if (!$trace) return false;
+ for( $i=0 ; $i_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
+ || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
+ /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
+ } else
+ if (isset($trace[$i]['class'])
+ && isset($trace[$i+1]['file'])
+ && $trace[$i]['class']=='FirePHP'
+ && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
+ /* Skip fb() */
+ } else
+ if ($trace[$i]['function']=='fb'
+ || $trace[$i]['function']=='trace'
+ || $trace[$i]['function']=='send') {
+
+ $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'',
+ 'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'',
+ 'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'',
+ 'Message'=>$trace[$i]['args'][0],
+ 'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'',
+ 'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'',
+ 'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'',
+ 'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1)));
+
+ $skipFinalObjectEncode = true;
+ $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
+ $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
+ break;
+ }
+ }
+
+ } else
+ if ($Type==self::TABLE) {
+
+ if (isset($Object[0]) && is_string($Object[0])) {
+ $Object[1] = $this->encodeTable($Object[1]);
+ } else {
+ $Object = $this->encodeTable($Object);
+ }
+
+ $skipFinalObjectEncode = true;
+
+ } else
+ if ($Type==self::GROUP_START) {
+
+ if (!$Label) {
+ throw $this->newException('You must specify a label for the group!');
+ }
+
+ } else {
+ if ($Type===null) {
+ $Type = self::LOG;
+ }
+ }
+
+ if ($this->options['includeLineNumbers']) {
+ if (!isset($meta['file']) || !isset($meta['line'])) {
+
+ $trace = debug_backtrace();
+ for( $i=0 ; $trace && $i_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
+ || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
+ /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
+ } else
+ if (isset($trace[$i]['class'])
+ && isset($trace[$i+1]['file'])
+ && $trace[$i]['class']=='FirePHP'
+ && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
+ /* Skip fb() */
+ } else
+ if (isset($trace[$i]['file'])
+ && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') {
+ /* Skip FB::fb() */
+ } else {
+ $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
+ $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
+ break;
+ }
+ }
+ }
+ } else {
+ unset($meta['file']);
+ unset($meta['line']);
+ }
+
+ $this->setHeader('X-Wf-Protocol-1','http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
+ $this->setHeader('X-Wf-1-Plugin-1','http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'.self::VERSION);
+
+ $structure_index = 1;
+ if ($Type==self::DUMP) {
+ $structure_index = 2;
+ $this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
+ } else {
+ $this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
+ }
+
+ if ($Type==self::DUMP) {
+ $msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}';
+ } else {
+ $msg_meta = $Options;
+ $msg_meta['Type'] = $Type;
+ if ($Label!==null) {
+ $msg_meta['Label'] = $Label;
+ }
+ if (isset($meta['file']) && !isset($msg_meta['File'])) {
+ $msg_meta['File'] = $meta['file'];
+ }
+ if (isset($meta['line']) && !isset($msg_meta['Line'])) {
+ $msg_meta['Line'] = $meta['line'];
+ }
+ $msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']';
+ }
+
+ $parts = explode("\n",chunk_split($msg, 5000, "\n"));
+
+ for( $i=0 ; $i2) {
+ // Message needs to be split into multiple parts
+ $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
+ (($i==0)?strlen($msg):'')
+ . '|' . $part . '|'
+ . (($isetHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
+ strlen($part) . '|' . $part . '|');
+ }
+
+ $this->messageIndex++;
+
+ if ($this->messageIndex > 99999) {
+ throw $this->newException('Maximum number (99,999) of messages reached!');
+ }
+ }
+ }
+
+ $this->setHeader('X-Wf-1-Index',$this->messageIndex-1);
+
+ return true;
+ }
+
+ /**
+ * Standardizes path for windows systems.
+ *
+ * @param string $Path
+ * @return string
+ */
+ protected function _standardizePath($Path)
+ {
+ return preg_replace('/\\\\+/','/',$Path);
+ }
+
+ /**
+ * Escape trace path for windows systems
+ *
+ * @param array $Trace
+ * @return array
+ */
+ protected function _escapeTrace($Trace)
+ {
+ if (!$Trace) return $Trace;
+ for( $i=0 ; $i_escapeTraceFile($Trace[$i]['file']);
+ }
+ if (isset($Trace[$i]['args'])) {
+ $Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']);
+ }
+ }
+ return $Trace;
+ }
+
+ /**
+ * Escape file information of trace for windows systems
+ *
+ * @param string $File
+ * @return string
+ */
+ protected function _escapeTraceFile($File)
+ {
+ /* Check if we have a windows filepath */
+ if (strpos($File,'\\')) {
+ /* First strip down to single \ */
+
+ $file = preg_replace('/\\\\+/','\\',$File);
+
+ return $file;
+ }
+ return $File;
+ }
+
+ /**
+ * Check if headers have already been sent
+ *
+ * @param string $Filename
+ * @param integer $Linenum
+ */
+ protected function headersSent(&$Filename, &$Linenum)
+ {
+ return headers_sent($Filename, $Linenum);
+ }
+
+ /**
+ * Send header
+ *
+ * @param string $Name
+ * @param string $Value
+ */
+ protected function setHeader($Name, $Value)
+ {
+ return header($Name.': '.$Value);
+ }
+
+ /**
+ * Get user agent
+ *
+ * @return string|false
+ */
+ protected function getUserAgent()
+ {
+ if (!isset($_SERVER['HTTP_USER_AGENT'])) return false;
+ return $_SERVER['HTTP_USER_AGENT'];
+ }
+
+ /**
+ * Get all request headers
+ *
+ * @return array
+ */
+ public static function getAllRequestHeaders() {
+ static $_cached_headers = false;
+ if($_cached_headers!==false) {
+ return $_cached_headers;
+ }
+ $headers = array();
+ if(function_exists('getallheaders')) {
+ foreach( getallheaders() as $name => $value ) {
+ $headers[strtolower($name)] = $value;
+ }
+ } else {
+ foreach($_SERVER as $name => $value) {
+ if(substr($name, 0, 5) == 'HTTP_') {
+ $headers[strtolower(str_replace(' ', '-', str_replace('_', ' ', substr($name, 5))))] = $value;
+ }
+ }
+ }
+ return $_cached_headers = $headers;
+ }
+
+ /**
+ * Get a request header
+ *
+ * @return string|false
+ */
+ protected function getRequestHeader($Name)
+ {
+ $headers = self::getAllRequestHeaders();
+ if (isset($headers[strtolower($Name)])) {
+ return $headers[strtolower($Name)];
+ }
+ return false;
+ }
+
+ /**
+ * Returns a new exception
+ *
+ * @param string $Message
+ * @return Exception
+ */
+ protected function newException($Message)
+ {
+ return new Exception($Message);
+ }
+
+ /**
+ * Encode an object into a JSON string
+ *
+ * Uses PHP's jeson_encode() if available
+ *
+ * @param object $Object The object to be encoded
+ * @return string The JSON string
+ */
+ public function jsonEncode($Object, $skipObjectEncode = false)
+ {
+ if (!$skipObjectEncode) {
+ $Object = $this->encodeObject($Object);
+ }
+
+ if (function_exists('json_encode')
+ && $this->options['useNativeJsonEncode']!=false) {
+
+ return json_encode($Object);
+ } else {
+ return $this->json_encode($Object);
+ }
+ }
+
+ /**
+ * Encodes a table by encoding each row and column with encodeObject()
+ *
+ * @param array $Table The table to be encoded
+ * @return array
+ */
+ protected function encodeTable($Table)
+ {
+
+ if (!$Table) return $Table;
+
+ $new_table = array();
+ foreach($Table as $row) {
+
+ if (is_array($row)) {
+ $new_row = array();
+
+ foreach($row as $item) {
+ $new_row[] = $this->encodeObject($item);
+ }
+
+ $new_table[] = $new_row;
+ }
+ }
+
+ return $new_table;
+ }
+
+ /**
+ * Encodes an object including members with
+ * protected and private visibility
+ *
+ * @param Object $Object The object to be encoded
+ * @param int $Depth The current traversal depth
+ * @return array All members of the object
+ */
+ protected function encodeObject($Object, $ObjectDepth = 1, $ArrayDepth = 1, $MaxDepth = 1)
+ {
+ if ($MaxDepth > $this->options['maxDepth']) {
+ return '** Max Depth ('.$this->options['maxDepth'].') **';
+ }
+
+ $return = array();
+
+ if (is_resource($Object)) {
+
+ return '** '.(string)$Object.' **';
+
+ } else
+ if (is_object($Object)) {
+
+ if ($ObjectDepth > $this->options['maxObjectDepth']) {
+ return '** Max Object Depth ('.$this->options['maxObjectDepth'].') **';
+ }
+
+ foreach ($this->objectStack as $refVal) {
+ if ($refVal === $Object) {
+ return '** Recursion ('.get_class($Object).') **';
+ }
+ }
+ array_push($this->objectStack, $Object);
+
+ $return['__className'] = $class = get_class($Object);
+ $class_lower = strtolower($class);
+
+ $reflectionClass = new ReflectionClass($class);
+ $properties = array();
+ foreach( $reflectionClass->getProperties() as $property) {
+ $properties[$property->getName()] = $property;
+ }
+
+ $members = (array)$Object;
+
+ foreach( $properties as $plain_name => $property ) {
+
+ $name = $raw_name = $plain_name;
+ if ($property->isStatic()) {
+ $name = 'static:'.$name;
+ }
+ if ($property->isPublic()) {
+ $name = 'public:'.$name;
+ } else
+ if ($property->isPrivate()) {
+ $name = 'private:'.$name;
+ $raw_name = "\0".$class."\0".$raw_name;
+ } else
+ if ($property->isProtected()) {
+ $name = 'protected:'.$name;
+ $raw_name = "\0".'*'."\0".$raw_name;
+ }
+
+ if (!(isset($this->objectFilters[$class_lower])
+ && is_array($this->objectFilters[$class_lower])
+ && in_array($plain_name,$this->objectFilters[$class_lower]))) {
+
+ if (array_key_exists($raw_name,$members)
+ && !$property->isStatic()) {
+
+ $return[$name] = $this->encodeObject($members[$raw_name], $ObjectDepth + 1, 1, $MaxDepth + 1);
+
+ } else {
+ if (method_exists($property,'setAccessible')) {
+ $property->setAccessible(true);
+ $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1, $MaxDepth + 1);
+ } else
+ if ($property->isPublic()) {
+ $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1, $MaxDepth + 1);
+ } else {
+ $return[$name] = '** Need PHP 5.3 to get value **';
+ }
+ }
+ } else {
+ $return[$name] = '** Excluded by Filter **';
+ }
+ }
+
+ // Include all members that are not defined in the class
+ // but exist in the object
+ foreach( $members as $raw_name => $value ) {
+
+ $name = $raw_name;
+
+ if ($name{0} == "\0") {
+ $parts = explode("\0", $name);
+ $name = $parts[2];
+ }
+
+ $plain_name = $name;
+
+ if (!isset($properties[$name])) {
+ $name = 'undeclared:'.$name;
+
+ if (!(isset($this->objectFilters[$class_lower])
+ && is_array($this->objectFilters[$class_lower])
+ && in_array($plain_name,$this->objectFilters[$class_lower]))) {
+
+ $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1, $MaxDepth + 1);
+ } else {
+ $return[$name] = '** Excluded by Filter **';
+ }
+ }
+ }
+
+ array_pop($this->objectStack);
+
+ } elseif (is_array($Object)) {
+
+ if ($ArrayDepth > $this->options['maxArrayDepth']) {
+ return '** Max Array Depth ('.$this->options['maxArrayDepth'].') **';
+ }
+
+ foreach ($Object as $key => $val) {
+
+ // Encoding the $GLOBALS PHP array causes an infinite loop
+ // if the recursion is not reset here as it contains
+ // a reference to itself. This is the only way I have come up
+ // with to stop infinite recursion in this case.
+ if ($key=='GLOBALS'
+ && is_array($val)
+ && array_key_exists('GLOBALS',$val)) {
+ $val['GLOBALS'] = '** Recursion (GLOBALS) **';
+ }
+
+ $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1, $MaxDepth + 1);
+ }
+ } else {
+ if (self::is_utf8($Object)) {
+ return $Object;
+ } else {
+ return utf8_encode($Object);
+ }
+ }
+ return $return;
+ }
+
+ /**
+ * Returns true if $string is valid UTF-8 and false otherwise.
+ *
+ * @param mixed $str String to be tested
+ * @return boolean
+ */
+ protected static function is_utf8($str)
+ {
+ if(function_exists('mb_detect_encoding')) {
+ return (mb_detect_encoding($str) == 'UTF-8');
+ }
+ $c=0; $b=0;
+ $bits=0;
+ $len=strlen($str);
+ for($i=0; $i<$len; $i++){
+ $c=ord($str[$i]);
+ if ($c > 128){
+ if (($c >= 254)) return false;
+ elseif ($c >= 252) $bits=6;
+ elseif ($c >= 248) $bits=5;
+ elseif ($c >= 240) $bits=4;
+ elseif ($c >= 224) $bits=3;
+ elseif ($c >= 192) $bits=2;
+ else return false;
+ if (($i+$bits) > $len) return false;
+ while($bits > 1){
+ $i++;
+ $b=ord($str[$i]);
+ if ($b < 128 || $b > 191) return false;
+ $bits--;
+ }
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Converts to and from JSON format.
+ *
+ * JSON (JavaScript Object Notation) is a lightweight data-interchange
+ * format. It is easy for humans to read and write. It is easy for machines
+ * to parse and generate. It is based on a subset of the JavaScript
+ * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
+ * This feature can also be found in Python. JSON is a text format that is
+ * completely language independent but uses conventions that are familiar
+ * to programmers of the C-family of languages, including C, C++, C#, Java,
+ * JavaScript, Perl, TCL, and many others. These properties make JSON an
+ * ideal data-interchange language.
+ *
+ * This package provides a simple encoder and decoder for JSON notation. It
+ * is intended for use with client-side Javascript applications that make
+ * use of HTTPRequest to perform server communication functions - data can
+ * be encoded into JSON notation for use in a client-side javascript, or
+ * decoded from incoming Javascript requests. JSON format is native to
+ * Javascript, and can be directly eval()'ed with no further parsing
+ * overhead
+ *
+ * All strings should be in ASCII or UTF-8 format!
+ *
+ * LICENSE: Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met: Redistributions of source code must retain the
+ * above copyright notice, this list of conditions and the following
+ * disclaimer. Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * @category
+ * @package Services_JSON
+ * @author Michal Migurski
+ * @author Matt Knapp
+ * @author Brett Stimmerman
+ * @author Christoph Dorn
+ * @copyright 2005 Michal Migurski
+ * @version CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $
+ * @license http://www.opensource.org/licenses/bsd-license.php
+ * @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198
+ */
+
+
+ /**
+ * Keep a list of objects as we descend into the array so we can detect recursion.
+ */
+ private $json_objectStack = array();
+
+
+ /**
+ * convert a string from one UTF-8 char to one UTF-16 char
+ *
+ * Normally should be handled by mb_convert_encoding, but
+ * provides a slower PHP-only method for installations
+ * that lack the multibye string extension.
+ *
+ * @param string $utf8 UTF-8 character
+ * @return string UTF-16 character
+ * @access private
+ */
+ private function json_utf82utf16($utf8)
+ {
+ // oh please oh please oh please oh please oh please
+ if (function_exists('mb_convert_encoding')) {
+ return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+ }
+
+ switch(strlen($utf8)) {
+ case 1:
+ // this case should never be reached, because we are in ASCII range
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return $utf8;
+
+ case 2:
+ // return a UTF-16 character from a 2-byte UTF-8 char
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return chr(0x07 & (ord($utf8{0}) >> 2))
+ . chr((0xC0 & (ord($utf8{0}) << 6))
+ | (0x3F & ord($utf8{1})));
+
+ case 3:
+ // return a UTF-16 character from a 3-byte UTF-8 char
+ // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ return chr((0xF0 & (ord($utf8{0}) << 4))
+ | (0x0F & (ord($utf8{1}) >> 2)))
+ . chr((0xC0 & (ord($utf8{1}) << 6))
+ | (0x7F & ord($utf8{2})));
+ }
+
+ // ignoring UTF-32 for now, sorry
+ return '';
+ }
+
+ /**
+ * encodes an arbitrary variable into JSON format
+ *
+ * @param mixed $var any number, boolean, string, array, or object to be encoded.
+ * see argument 1 to Services_JSON() above for array-parsing behavior.
+ * if var is a strng, note that encode() always expects it
+ * to be in ASCII or UTF-8 format!
+ *
+ * @return mixed JSON string representation of input var or an error if a problem occurs
+ * @access public
+ */
+ private function json_encode($var)
+ {
+
+ if (is_object($var)) {
+ if (in_array($var,$this->json_objectStack)) {
+ return '"** Recursion **"';
+ }
+ }
+
+ switch (gettype($var)) {
+ case 'boolean':
+ return $var ? 'true' : 'false';
+
+ case 'NULL':
+ return 'null';
+
+ case 'integer':
+ return (int) $var;
+
+ case 'double':
+ case 'float':
+ return (float) $var;
+
+ case 'string':
+ // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+ $ascii = '';
+ $strlen_var = strlen($var);
+
+ /*
+ * Iterate over every character in the string,
+ * escaping with a slash or encoding to UTF-8 where necessary
+ */
+ for ($c = 0; $c < $strlen_var; ++$c) {
+
+ $ord_var_c = ord($var{$c});
+
+ switch (true) {
+ case $ord_var_c == 0x08:
+ $ascii .= '\b';
+ break;
+ case $ord_var_c == 0x09:
+ $ascii .= '\t';
+ break;
+ case $ord_var_c == 0x0A:
+ $ascii .= '\n';
+ break;
+ case $ord_var_c == 0x0C:
+ $ascii .= '\f';
+ break;
+ case $ord_var_c == 0x0D:
+ $ascii .= '\r';
+ break;
+
+ case $ord_var_c == 0x22:
+ case $ord_var_c == 0x2F:
+ case $ord_var_c == 0x5C:
+ // double quote, slash, slosh
+ $ascii .= '\\'.$var{$c};
+ break;
+
+ case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+ // characters U-00000000 - U-0000007F (same as ASCII)
+ $ascii .= $var{$c};
+ break;
+
+ case (($ord_var_c & 0xE0) == 0xC0):
+ // characters U-00000080 - U-000007FF, mask 110XXXXX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
+ $c += 1;
+ $utf16 = $this->json_utf82utf16($char);
+ $ascii .= sprintf('\u%04s', bin2hex($utf16));
+ break;
+
+ case (($ord_var_c & 0xF0) == 0xE0):
+ // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $char = pack('C*', $ord_var_c,
+ ord($var{$c + 1}),
+ ord($var{$c + 2}));
+ $c += 2;
+ $utf16 = $this->json_utf82utf16($char);
+ $ascii .= sprintf('\u%04s', bin2hex($utf16));
+ break;
+
+ case (($ord_var_c & 0xF8) == 0xF0):
+ // characters U-00010000 - U-001FFFFF, mask 11110XXX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $char = pack('C*', $ord_var_c,
+ ord($var{$c + 1}),
+ ord($var{$c + 2}),
+ ord($var{$c + 3}));
+ $c += 3;
+ $utf16 = $this->json_utf82utf16($char);
+ $ascii .= sprintf('\u%04s', bin2hex($utf16));
+ break;
+
+ case (($ord_var_c & 0xFC) == 0xF8):
+ // characters U-00200000 - U-03FFFFFF, mask 111110XX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $char = pack('C*', $ord_var_c,
+ ord($var{$c + 1}),
+ ord($var{$c + 2}),
+ ord($var{$c + 3}),
+ ord($var{$c + 4}));
+ $c += 4;
+ $utf16 = $this->json_utf82utf16($char);
+ $ascii .= sprintf('\u%04s', bin2hex($utf16));
+ break;
+
+ case (($ord_var_c & 0xFE) == 0xFC):
+ // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $char = pack('C*', $ord_var_c,
+ ord($var{$c + 1}),
+ ord($var{$c + 2}),
+ ord($var{$c + 3}),
+ ord($var{$c + 4}),
+ ord($var{$c + 5}));
+ $c += 5;
+ $utf16 = $this->json_utf82utf16($char);
+ $ascii .= sprintf('\u%04s', bin2hex($utf16));
+ break;
+ }
+ }
+
+ return '"'.$ascii.'"';
+
+ case 'array':
+ /*
+ * As per JSON spec if any array key is not an integer
+ * we must treat the the whole array as an object. We
+ * also try to catch a sparsely populated associative
+ * array with numeric keys here because some JS engines
+ * will create an array with empty indexes up to
+ * max_index which can cause memory issues and because
+ * the keys, which may be relevant, will be remapped
+ * otherwise.
+ *
+ * As per the ECMA and JSON specification an object may
+ * have any string as a property. Unfortunately due to
+ * a hole in the ECMA specification if the key is a
+ * ECMA reserved word or starts with a digit the
+ * parameter is only accessible using ECMAScript's
+ * bracket notation.
+ */
+
+ // treat as a JSON object
+ if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
+
+ $this->json_objectStack[] = $var;
+
+ $properties = array_map(array($this, 'json_name_value'),
+ array_keys($var),
+ array_values($var));
+
+ array_pop($this->json_objectStack);
+
+ foreach($properties as $property) {
+ if ($property instanceof Exception) {
+ return $property;
+ }
+ }
+
+ return '{' . join(',', $properties) . '}';
+ }
+
+ $this->json_objectStack[] = $var;
+
+ // treat it like a regular array
+ $elements = array_map(array($this, 'json_encode'), $var);
+
+ array_pop($this->json_objectStack);
+
+ foreach($elements as $element) {
+ if ($element instanceof Exception) {
+ return $element;
+ }
+ }
+
+ return '[' . join(',', $elements) . ']';
+
+ case 'object':
+ $vars = self::encodeObject($var);
+
+ $this->json_objectStack[] = $var;
+
+ $properties = array_map(array($this, 'json_name_value'),
+ array_keys($vars),
+ array_values($vars));
+
+ array_pop($this->json_objectStack);
+
+ foreach($properties as $property) {
+ if ($property instanceof Exception) {
+ return $property;
+ }
+ }
+
+ return '{' . join(',', $properties) . '}';
+
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * array-walking function for use in generating JSON-formatted name-value pairs
+ *
+ * @param string $name name of key to use
+ * @param mixed $value reference to an array element to be encoded
+ *
+ * @return string JSON-formatted name-value pair, like '"name":value'
+ * @access private
+ */
+ private function json_name_value($name, $value)
+ {
+ // Encoding the $GLOBALS PHP array causes an infinite loop
+ // if the recursion is not reset here as it contains
+ // a reference to itself. This is the only way I have come up
+ // with to stop infinite recursion in this case.
+ if ($name=='GLOBALS'
+ && is_array($value)
+ && array_key_exists('GLOBALS',$value)) {
+ $value['GLOBALS'] = '** Recursion **';
+ }
+
+ $encoded_value = $this->json_encode($value);
+
+ if ($encoded_value instanceof Exception) {
+ return $encoded_value;
+ }
+
+ return $this->json_encode(strval($name)) . ':' . $encoded_value;
+ }
+}
diff --git a/src/application/code/local/.placeholder b/src/application/code/local/.placeholder
new file mode 100644
index 0000000..e69de29
diff --git a/application/code/test/Legacies/Core/LayoutTest.php b/src/application/code/test/Legacies/Core/LayoutTest.php
similarity index 100%
rename from application/code/test/Legacies/Core/LayoutTest.php
rename to src/application/code/test/Legacies/Core/LayoutTest.php
diff --git a/application/code/test/Legacies/Empire/Model/BuilderTest.php b/src/application/code/test/Legacies/Empire/Model/BuilderTest.php
similarity index 100%
rename from application/code/test/Legacies/Empire/Model/BuilderTest.php
rename to src/application/code/test/Legacies/Empire/Model/BuilderTest.php
diff --git a/application/code/test/Legacies/ObjectTest.php b/src/application/code/test/Legacies/ObjectTest.php
similarity index 100%
rename from application/code/test/Legacies/ObjectTest.php
rename to src/application/code/test/Legacies/ObjectTest.php
diff --git a/application/code/test/LegaciesTest.php b/src/application/code/test/WootookTest.php
similarity index 99%
rename from application/code/test/LegaciesTest.php
rename to src/application/code/test/WootookTest.php
index d230e54..8962684 100644
--- a/application/code/test/LegaciesTest.php
+++ b/src/application/code/test/WootookTest.php
@@ -1,6 +1,6 @@
array(
+ 'resource' => array(
+ 'database' => array(
+ 'default' => array(
+ 'engine' => 'mysql',
+ 'options' => array(
+ ),
+ 'params' => array(
+ 'hostname' => 'localhost',
+ 'username' => 'root',
+ 'password' => '',
+ 'database' => 'db_wootook'
+ ),
+ 'table_prefix' => 'wtk_',
+ ),
+ ),
+ ),
+ ),
+ 'backend' => array(
+ 'web' => array(
+ 'url' => array(
+ 'base' => 'http://testing.wootook.org/',
+ 'skin' => 'http://testing.wootook.org/skin/',
+ 'js' => 'http://testing.wootook.org/js/',
+ 'css' => 'http://testing.wootook.org/css/',
+ ),
+ 'session' => array(
+ 'time' => 900,
+ 'domain' => 'testing.wootook.org',
+ 'path' => '/'
+ )
+ ),
+ 'system' => array(
+ 'path' => array(
+ 'base' => ROOT_PATH,
+ 'skin' => ROOT_PATH . 'skin' . DIRECTORY_SEPARATOR,
+ ),
+ 'date' => array(
+ 'timezone' => 'Europe/Paris'
+ ),
+ ),
+ ),
+ 'frontend' => array(
+ 'web' => array(
+ 'url' => array(
+ 'base' => 'http://testing.wootook.org/',
+ 'skin' => 'http://testing.wootook.org/skin/',
+ 'js' => 'http://testing.wootook.org/js/',
+ 'css' => 'http://testing.wootook.org/css/',
+ ),
+ 'session' => array(
+ 'time' => 900,
+ 'domain' => 'testing.wootook.org',
+ 'path' => '/'
+ )
+ ),
+ 'system' => array(
+ 'path' => array(
+ 'base' => ROOT_PATH,
+ 'skin' => ROOT_PATH . 'skin' . DIRECTORY_SEPARATOR,
+ ),
+ 'date' => array(
+ 'timezone' => 'Europe/Paris'
+ ),
+ ),
+ 'engine' => array(
+ 'storyline' => array(
+ 'universe' => 'legacies',
+ 'episode' => 'default',
+ ),
+ 'core' => array(
+ 'use_large_numbers' => true
+ ),
+ 'universe' => array(
+ 'galaxies' => 3,
+ 'systems' => 100,
+ 'positions' => 15
+ ),
+ 'combat' => array(
+ 'allow_spy_drone_attacks' => true
+ )
+ ),
+ )
+ );
\ No newline at end of file
diff --git a/src/application/configs/system.php b/src/application/configs/system.php
new file mode 100644
index 0000000..8246cb4
--- /dev/null
+++ b/src/application/configs/system.php
@@ -0,0 +1,72 @@
+ array(
+ 'resource' => array(
+ 'database' => array(
+ 'default' => array(
+ 'engine' => 'pdo_mysql',
+ 'options' => array(
+ ),
+ 'params' => array(
+ 'hostname' => 'localhost',
+ 'username' => 'root',
+ 'password' => '',
+ 'database' => 'db_wootook'
+ ),
+ 'table_prefix' => 'wtk_',
+ ),
+ 'core_setup' => array(
+ 'use' => 'default'
+ ),
+ 'core_read' => array(
+ 'use' => 'default'
+ ),
+ 'core_write' => array(
+ 'use' => 'default'
+ ),
+ )
+ )
+ ),
+ 'default' => array(
+ 'engine' => array(
+ 'core' => array(
+ 'use_large_numbers' => true,
+ ),
+ 'universe' => array(
+ 'galaxies' => 3,
+ 'systems' => 100,
+ 'positions' => 15,
+ ),
+ 'combat' => array(
+ 'allow_spy_drone_attacks' => true,
+ )
+ ),
+ 'system' => array(
+ 'date' => array(
+ 'timezone' => 'Europe/Paris'
+ ),
+ ),
+ 'game' => array(
+ 'speed' => array(
+ 'general' => 1000,
+ 'ships' => 1000
+ ),
+ 'home' => array(
+ 'title' => 'Welcome on Wootook!',
+ 'formated-welcome-text' => 'Wootook make you an emperor.
Conquer outer space and master other players on Wootook.
'
+ )
+ )
+ ),
+ 'frontend' => array(
+ 'layout' => array(
+ 'page' => 'page.xml',
+ 'player' => 'player.xml',
+ 'empire' => 'empire.xml'
+ ),
+ ),
+ 'backend' => array(
+ 'layout' => array(
+ 'page' => 'page.xml',
+ 'admin' => 'admin.php'
+ ),
+ )
+ );
diff --git a/src/application/design/backend/base/default/layouts/admin.php b/src/application/design/backend/base/default/layouts/admin.php
new file mode 100644
index 0000000..ddac4e8
--- /dev/null
+++ b/src/application/design/backend/base/default/layouts/admin.php
@@ -0,0 +1,283 @@
+ array(
+ 'update' => array('1column'),
+ 'reference' => array(
+ 'header' => array(
+ 'children' => array(
+ 'navigation' => array(
+ 'type' => 'core/html.navigation',
+ 'template' => 'page/html/navigation.phtml',
+ 'actions' => array(
+ array(
+ 'method' => 'setNodeTitle',
+ 'params' => array(
+ 'path' => 'system',
+ 'title' => 'System'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'system/overview',
+ 'label' => 'Overview',
+ 'title' => 'Overview',
+ 'uri' => 'admin/overview.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'system/settings',
+ 'label' => 'Settings',
+ 'title' => 'Settings',
+ 'uri' => 'admin/settings.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'system/reset-universe',
+ 'label' => 'Reset Universe',
+ 'title' => 'Reset Universe',
+ 'uri' => 'admin/XNovaResetUnivers.php'
+ )
+ ),
+ array(
+ 'method' => 'setNodeTitle',
+ 'params' => array(
+ 'path' => 'players',
+ 'title' => 'Player Accounts'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'players/list',
+ 'label' => 'List',
+ 'title' => 'List',
+ 'uri' => 'admin/userlist.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'players/password-recovery',
+ 'label' => 'Change a password',
+ 'title' => 'Change a password',
+ 'uri' => 'admin/md5changepass.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'players/search',
+ 'label' => 'Search',
+ 'title' => 'Search',
+ 'uri' => 'admin/paneladmina.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'players/multi-account-alerts',
+ 'label' => 'Multi account alerts',
+ 'title' => 'Multi account alerts',
+ 'uri' => 'admin/multi.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'players/declared-multi-account',
+ 'label' => 'Declared multi accounts',
+ 'title' => 'Declared multi accounts',
+ 'uri' => 'admin/declare_list.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'players/add-resources',
+ 'label' => 'Add Resources',
+ 'title' => 'Add Resources',
+ 'uri' => 'admin/add_money.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'players/messages',
+ 'label' => 'Private messages management',
+ 'title' => 'Private messages management',
+ 'uri' => 'admin/messagelist.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'players/chat',
+ 'label' => 'Manage Chat',
+ 'title' => 'Manage Chat',
+ 'uri' => 'chat.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'players/ban',
+ 'label' => 'Ban Player',
+ 'title' => 'Ban Player',
+ 'uri' => 'admin/banned.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'players/unban',
+ 'label' => 'Unban Player',
+ 'title' => 'Unban Player',
+ 'uri' => 'admin/unbanned.php'
+ )
+ ),
+ array(
+ 'method' => 'setNodeTitle',
+ 'params' => array(
+ 'path' => 'empire',
+ 'title' => 'Empires'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'empire/planet-list',
+ 'label' => 'Planet List',
+ 'title' => 'Planet List',
+ 'uri' => 'admin/planetlist.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'empire/moon-list',
+ 'label' => 'Moon List',
+ 'title' => 'Moon List',
+ 'uri' => 'admin/moonlist.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'empire/add-moon',
+ 'label' => 'Add a moon',
+ 'title' => 'Add a moon',
+ 'uri' => 'admin/add_moon.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'empire/planet-activity',
+ 'label' => 'Planet Activity',
+ 'title' => 'Planet Activity',
+ 'uri' => 'admin/activeplanet.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'empire/fleet-list',
+ 'label' => 'Fleet list',
+ 'title' => 'Fleet list',
+ 'uri' => 'admin/ShowFlyingFleets.php'
+ )
+ ),
+ array(
+ 'method' => 'setNodeTitle',
+ 'params' => array(
+ 'path' => 'tools',
+ 'title' => 'Tools'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'tools/phpinfo',
+ 'label' => 'PHP Info',
+ 'title' => 'PHP Info',
+ 'uri' => 'variables.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'tools/stats',
+ 'label' => 'Stats updater',
+ 'title' => 'Stats updater',
+ 'uri' => 'statbuilder.php'
+ )
+ ),
+ array(
+ 'method' => 'addLink',
+ 'params' => array(
+ 'name' => 'tools/errors',
+ 'label' => 'Error reporting',
+ 'title' => 'Error reporting',
+ 'uri' => 'errors.php'
+ )
+ ),
+ array(
+ 'method' => 'addExternalLink',
+ 'params' => array(
+ 'name' => 'tools/help',
+ 'label' => 'Need help?',
+ 'title' => 'Need help?',
+ 'url' => 'http://wootook.org/board/'
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ ),
+ 'admin.grid' => array(
+ 'update' => array('admin'),
+ 'reference' => array(
+ 'content' => array(
+ 'children' => array(
+ 'grid.container' => array(
+ 'type' => 'admin/grid.container',
+ 'template' => 'grid/container.phtml',
+ 'children' => array(
+ 'mass-actions' => array(
+ 'type' => 'admin/grid.mass-actions',
+ 'template' => 'grid/view.phtml',
+ ),
+ 'grid' => array(
+ 'type' => 'admin/grid.view',
+ 'template' => 'grid/view.phtml',
+ )
+ )
+ )
+ )
+ )
+ )
+ ),
+ 'admin.user.grid' => array(
+ 'update' => array('admin.grid'),
+ 'reference' => array(
+ 'grid' => array(
+ 'actions' => array(
+ array(
+ 'method' => 'addColumn',
+ 'params' => array(
+ 'name' => 'index',
+ 'type' => 'indexer',
+ 'config' => array()
+ )
+ )
+ )
+ )
+ )
+ )
+ );
diff --git a/src/application/design/backend/base/default/layouts/admin.xml b/src/application/design/backend/base/default/layouts/admin.xml
new file mode 100644
index 0000000..18fde20
--- /dev/null
+++ b/src/application/design/backend/base/default/layouts/admin.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+ system
+ System
+
+
+ players
+ Player Accounts
+
+
+
+
+
diff --git a/src/application/design/backend/base/default/layouts/page.xml b/src/application/design/backend/base/default/layouts/page.xml
new file mode 100644
index 0000000..6becaf2
--- /dev/null
+++ b/src/application/design/backend/base/default/layouts/page.xml
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+ page/2columns-left.phtml
+
+
+
+
+
+
+
+
+
+ page/2columns-right.phtml
+
+
+
+
+
+
+
+
+
+ page/3columns.phtml
+
+
+
+
+
+
+
+
+
+ css/base.css
+
+
+ css/deprecated/default.css
+
+
+ css/deprecated/formate.css
+
+
+ scripts/jquery/jquery-1.6.4.js
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/application/design/base/default/scripts/deprecated/admin/activeplanet_body.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/activeplanet_body.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/activeplanet_body.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/activeplanet_body.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/add_money.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/add_money.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/add_money.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/add_money.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/add_moon.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/add_moon.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/add_moon.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/add_moon.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/admin_panel_asw1.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/admin_panel_asw1.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/admin_panel_asw1.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/admin_panel_asw1.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/admin_panel_asw2.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/admin_panel_asw2.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/admin_panel_asw2.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/admin_panel_asw2.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/admin_panel_frm1.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/admin_panel_frm1.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/admin_panel_frm1.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/admin_panel_frm1.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/admin_panel_frm2.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/admin_panel_frm2.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/admin_panel_frm2.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/admin_panel_frm2.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/admin_panel_frm3.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/admin_panel_frm3.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/admin_panel_frm3.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/admin_panel_frm3.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/admin_panel_frm4.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/admin_panel_frm4.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/admin_panel_frm4.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/admin_panel_frm4.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/admin_panel_main.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/admin_panel_main.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/admin_panel_main.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/admin_panel_main.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/banadni.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/banadni.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/banadni.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/banadni.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/banned.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/banned.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/banned.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/banned.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/changepass.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/changepass.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/changepass.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/changepass.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/chat_body.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/chat_body.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/chat_body.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/chat_body.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/credit_body.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/credit_body.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/credit_body.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/credit_body.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/declarelist_body.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/declarelist_body.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/declarelist_body.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/declarelist_body.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/declarelist_rows.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/declarelist_rows.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/declarelist_rows.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/declarelist_rows.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/deletuser.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/deletuser.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/deletuser.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/deletuser.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/errors_body.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/errors_body.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/errors_body.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/errors_body.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/exec_query.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/exec_query.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/exec_query.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/exec_query.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/fleet_body.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/fleet_body.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/fleet_body.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/fleet_body.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/fleet_rows.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/fleet_rows.tpl
similarity index 100%
rename from application/design/base/default/scripts/deprecated/admin/fleet_rows.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/fleet_rows.tpl
diff --git a/application/design/base/default/scripts/deprecated/admin/left_menu.tpl b/src/application/design/backend/base/default/scripts/deprecated/admin/left_menu.tpl
similarity index 97%
rename from application/design/base/default/scripts/deprecated/admin/left_menu.tpl
rename to src/application/design/backend/base/default/scripts/deprecated/admin/left_menu.tpl
index 6955190..9cc9100 100644
--- a/application/design/base/default/scripts/deprecated/admin/left_menu.tpl
+++ b/src/application/design/backend/base/default/scripts/deprecated/admin/left_menu.tpl
@@ -78,7 +78,7 @@ parent.frames['Hauptframe'].location.replace("overview.php");
![](\"../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);
- } else {
- AdminMessage ( $lang['sys_noalloaw'], $lang['sys_noaccess'] );
- }
-
-?>
diff --git a/admin/settings.php b/admin/settings.php
deleted file mode 100644
index 5466aa1..0000000
--- a/admin/settings.php
+++ /dev/null
@@ -1,310 +0,0 @@
-
- * All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see ?> "<?php echo $this->__('Metal')?>"){kind=small}
- ?> "<?php echo $this->__('Cristal')?>"){kind=small}
- ?> "<?php echo $this->__('Deuterium')?>"){kind=small}
- ?> "<?php echo $this->__('Energy')?>"){kind=small}
- ?> "<?php echo $this->__('Messages')?>"){kind=small}
- ![](templates/".$userrow["template"]."/images/forum/smileys/sourire.gif)
", $chaine);
- $chaine = str_replace(";)", "![](templates/".$userrow["template"]."/images/forum/smileys/clin.gif)
", $chaine);
- $chaine = str_replace(":(", "![](templates/".$userrow["template"]."/images/forum/smileys/triste.gif)
", $chaine);
- $chaine = str_replace(":surpris:", "![](templates/".$userrow["template"]."/images/forum/smileys/yeuxrond.gif)
", $chaine);
- $chaine = str_replace(":o", "![](templates/".$userrow["template"]."/images/forum/smileys/etonne.gif)
", $chaine);
- $chaine = str_replace(":confus:", "![](templates/".$userrow["template"]."/images/forum/smileys/confus.gif)
", $chaine);
- $chaine = str_replace(":lol:", "![](templates/".$userrow["template"]."/images/forum/smileys/lol.gif)
", $chaine);
- $chaine = str_replace(":fire:", " ![](templates/".$userrow["template"]."/images/forum/smileys/flame.gif)
", $chaine);
- $chaine = str_replace(":splif:", "![](templates/".$userrow["template"]."/images/forum/smileys/petard.gif)
", $chaine);
- $chaine = str_replace(":bigsmile:", "![](templates/".$userrow["template"]."/images/forum/smileys/green.gif)
", $chaine);
- $chaine = str_replace(":x", "![](templates/".$userrow["template"]."/images/forum/smileys/mod.gif)
", $chaine);
- $chaine = str_replace(":roll:", "![](templates/".$userrow["template"]."/images/forum/smileys/rolleyes.gif)
", $chaine);
- $chaine = str_replace(":bigcry:", "![](templates/".$userrow["template"]."/images/forum/smileys/crying.gif)
", $chaine);
- $chaine = str_replace(":colere:", "![](templates/".$userrow["template"]."/images/forum/smileys/colere.gif)
", $chaine);
- $chaine = str_replace(":P", "![](templates/".$userrow["template"]."/images/forum/smileys/razz.gif)
", $chaine);
- $chaine = str_replace("8)", "![](templates/".$userrow["template"]."/images/forum/smileys/lunettes.gif)
", $chaine);
- $chaine = str_replace(":)", "![](templates/".$userrow["template"]."/images/forum/smileys/redface.gif.gif)
", $chaine);
-
- return($chaine);
-
- }
-
-
-
-}
-
-?>
\ No newline at end of file
diff --git a/includes/databaseinfos.php b/includes/databaseinfos.php
deleted file mode 100644
index 4d8ff84..0000000
--- a/includes/databaseinfos.php
+++ /dev/null
@@ -1,551 +0,0 @@
-
- * All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see  . '.jpg')?>)
- ![\"{$lang['Delete_range']}\"](\"../pic/abort.gif\")
";
$lang['r0'] = $b['name'];
$lang['a'] = $a;
$lang['r1'] = ""; //{$b[1]}
@@ -688,7 +688,6 @@ elseif ($user->getData('ally_id') != 0 && $user->getData('ally_request') == 0) {
} else {
$lang['id'] = $a;
$lang['r0'] = $b['name'];
- $lang['delete'] = "![\"{$lang['Delete_range']}\"](\"./pic/abort.gif\")
";
$lang['a'] = $a;
$lang['r1'] = "-";
$lang['r2'] = "";
@@ -721,24 +720,18 @@ elseif ($user->getData('ally_id') != 0 && $user->getData('ally_request') == 0) {
if ($t != 1 && $t != 2 && $t != 3) {
$t = 1;
}
- if (!get_magic_quotes_gpc()) {
- $_POST['owner_range'] = isset($_POST['owner_range']) ? stripslashes($_POST['owner_range']) : null;
- $_POST['web'] = isset($_POST['web']) ? stripslashes($_POST['web']) : null;
- $_POST['image'] = isset($_POST['image']) ? stripslashes($_POST['image']) : null;
- $_POST['text'] = isset($_POST['text']) ? stripslashes($_POST['text']) : null;
- }
- if ($_POST['options']) {
- $ally['ally_owner_range'] = htmlspecialchars(strip_tags($_POST['owner_range']));
+ if ($options) {
+ $ally['ally_owner_range'] = htmlspecialchars(strip_tags($request->getPost('owner_range')));
- $ally['ally_web'] = htmlspecialchars(strip_tags($_POST['web']));
+ $ally['ally_web'] = htmlspecialchars(strip_tags($request->getPost('web')));
- $ally['ally_image'] = htmlspecialchars(strip_tags($_POST['image']));
+ $ally['ally_image'] = htmlspecialchars(strip_tags($request->getPost('image')));
- $ally['ally_request_notallow'] = intval($_POST['request_notallow']);
+ $ally['ally_request_notallow'] = intval($request->getPost('request_notallow'));
if ($ally['ally_request_notallow'] != 0 && $ally['ally_request_notallow'] != 1) {
- message("Aller � \"Candidature\" et sur une option dans le formulaire!", "Erreur");
+ message("Aller � \"Candidature\" et sur une option dans le formulaire!", "Erreur");
exit;
}
@@ -748,20 +741,20 @@ elseif ($user->getData('ally_id') != 0 && $user->getData('ally_request') == 0) {
`ally_web`={$db->quote($ally['ally_web'])},
`ally_request_notallow`='{$ally['ally_request_notallow']}'
WHERE `id`='{$ally['id']}'", "alliance");
- } elseif ($_POST['t']) {
+ } elseif ($actionType) {
if ($t == 3) {
- $ally['ally_request'] = strip_tags($_POST['text']);
+ $ally['ally_request'] = strip_tags($request->getPost('text'));
doquery("UPDATE {{table}} SET
`ally_request`={$db->quote($ally['ally_request'])}
WHERE `id`='{$ally['id']}'", "alliance");
} elseif ($t == 2) {
- $ally['ally_text'] = strip_tags($_POST['text']);
+ $ally['ally_text'] = strip_tags($request->getPost('text'));
doquery("UPDATE {{table}} SET
`ally_text`={$db->quote($ally['ally_text'])}
WHERE `id`='{$ally['id']}'", "alliance");
} else {
- $ally['ally_description'] = strip_tags($_POST['text']);
+ $ally['ally_description'] = strip_tags($request->getPost('text'));
doquery("UPDATE {{table}} SET
`ally_description`=" . $db->quote($ally['ally_description']) . "
@@ -808,8 +801,8 @@ elseif ($user->getData('ally_id') != 0 && $user->getData('ally_request') == 0) {
}
if ($mode == 'admin' && $edit == 'give') {
- if ($_POST["id"]) {
- doquery("update {{table}} set `ally_owner`=".$db->quote($_POST["id"])." where `id`='".$user['ally_id']."'",'alliance');
+ if ($request->getPost('id')) {
+ doquery("update {{table}} set `ally_owner`=".$db->quote($request->getPost('id'))." where `id`='".$user['ally_id']."'",'alliance');
} else {
$selection=doquery("SELECT * FROM {{table}} where ally_id='".$user['ally_id']."'",'users');
$select='';
@@ -848,12 +841,12 @@ elseif ($user->getData('ally_id') != 0 && $user->getData('ally_request') == 0) {
if ($u['ally_id'] == $ally['id'] && $u['id'] != $ally['ally_owner']) {
doquery("UPDATE {{table}} SET `ally_id`='0', `ally_name`='', `ally_rank_id` = '0' WHERE `id`='{$u['id']}'", 'users');
}
- } elseif (isset($_POST['newrang'])) {
- $newrank = isset($_POST['newrang']) ? intval($_POST['newrang']) : null;
- $q = doquery("SELECT * FROM {{table}} WHERE id='{intval($id}' LIMIT 1", 'users', true);
+ } else if ($request->getPost('newrang') !== null) {
+ $newrank = $request->getPost('newrang');
+ $selectedUser = Wootook_Player_Model_Entity::factory($id);
- if (isset($ally_ranks[$newrank]) && $q['id'] != $ally['ally_owner']) {
- doquery("UPDATE {{table}} SET `ally_rank_id`=" . $newrank . " WHERE `id`='" . intval($id) . "'", 'users');
+ if ($newrank !== null && isset($ally_ranks[$newrank]) && $selectedUser->getId() != $ally['ally_owner']) {
+ $selectedUser->setData('ally_rank_id', $newrank)->save();
}
}
@@ -861,9 +854,9 @@ elseif ($user->getData('ally_id') != 0 && $user->getData('ally_request') == 0) {
$f_template = gettemplate('alliance_admin_members_function');
// Order of displaying the different users
- $sort2 = isset($_GET['sort2']) ? intval($_GET['sort2']) : null;
+ $sort2 = intval($request->getQuery('sort2'));
if ($sort2) {
- $sort1 = isset($_GET['sort1']) ? intval($_GET['sort1']) : null;
+ $sort1 = intval($request->getQuery('sort1'));
switch($sort1){
case 1:
$sort = " ORDER BY `username`";
@@ -999,9 +992,7 @@ elseif ($user->getData('ally_id') != 0 && $user->getData('ally_request') == 0) {
message($lang['Denied_access'], $lang['Check_the_requests']);
}
- if ($_POST['action'] == "Accepter") {
- $_POST['text'] = strip_tags($_POST['text']);
-
+ if ($action == "Accepter") {
$u = doquery("SELECT * FROM {{table}} WHERE id=$show", 'users', true);
// add points from the user who join the alliance
doquery("UPDATE {{table}} SET
@@ -1017,7 +1008,7 @@ elseif ($user->getData('ally_id') != 0 && $user->getData('ally_request') == 0) {
mnl_alliance=mnl_alliance+1
WHERE id='{$show}'", 'users');
- $message = "Bonjour,