Games/wootook-reloaded
Watch
1
0
Fork
You've already forked wootook-reloaded
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated install and fixed bugs

Browse source 
Added session messages display
Fixed field and validator loading.
Updated form validation
Updated root config management
Muted error reporting in file evaluation
Added menu updates
Fixed galaxy data access error
Fixed config bug
Added HTTP request method checks
Added Form manager
Fixed core bugs

Signed-off-by: Gregory PLANCHAT <g.planchat@gmail.com>
This commit is contained in:
Gregory PLANCHAT 2011-11-08 08:56:53 +01:00
commit 9636b4bb00
69 changed files with 2434 additions and 789 deletions
Download patch file Download diff file Expand all files Collapse all files

67
application/code/core/Wootook/Empire/Model/Planet.php
View file

@ -26,6 +26,11 @@ class Wootook_Empire_Model_Planet
*/
protected $_moon = null;
/**
* @var Wootook_Empire_Model_Planet
*/
protected $_planet = null;
/**
* @var Wootook_Empire_Model_Planet_Builder
*/
@ -175,10 +180,14 @@ 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)
@ -533,10 +542,62 @@ class Wootook_Empire_Model_Planet
));
$this->_moon = $statement->current();
if ($this->_moon !== null && $this->_moon instanceof self) {
$this->_moon->setPlanet($this);
}
}
return $this->_moon;
}
public function setMoon(Wootook_Empire_Model_Planet $moon)
{
$this->_moon = $moon;
return $this;
}
public function getPlanet()
{
static $statement = null;
if ($this->isPlanet()) {
return null;
}
if ($this->_planet === 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_PLANET))
;
}
$statement->load(array(
'galaxy' => $this->getGalaxy(),
'system' => $this->getSystem(),
'position' => $this->getPosition()
));
$this->_planet = $statement->current();
if ($this->_planet !== null && $this->_planet instanceof self) {
$this->_planet->setMoon($this);
}
}
return $this->_planet;
}
public function setPlanet(Wootook_Empire_Model_Planet $planet)
{
$this->_planet = $planet;
return $this;
}
public function setGalaxy($galaxy)
{
$this->setData('galaxy', $galaxy);

6
application/code/core/Wootook/Empire/Model/User.php
View file

@ -555,6 +555,10 @@ class Wootook_Empire_Model_User
$layout = $eventData['layout'];
$navigation = $layout->getBlock('navigation');
$navigation->addLink('tools/admin', 'Admin Panel', 'Admin Panel', 'admin/index.php', array(), array('admin'));
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'));
}
}
}