methods and properties defined as static cause problems when working with the controller and add-ons views at the same time.

Author: Guillermo Cespedes

Particle/Core/AssetConfig.php

@@ -16,12 +16,13 @@ public static function getInstance()
  return self::$instance;
  }
 
- final private function add($sAssetName, $aCssFileLayout, $aJsFileHeadLayout, $aJsFileFooterLayout)
+ final private function add($sAssetName, $aCssFileLayout, $aJsFileHeadLayout, $aJsFileFooterLayout, $aPHPFileLayout)
  {
  $this->AssetConfig[$sAssetName] = array(
  'aCssFileLayout' => $aCssFileLayout,
  'aJsFileHeadLayout' => $aJsFileHeadLayout,
  'aJsFileFooterLayout' => $aJsFileFooterLayout,
+ 'aPHPFileLayout' => $aPHPFileLayout
  );
  }
 
@@ -48,12 +49,16 @@ final public function init()
  if (!isset($itemAsset['aJsFileFooterLayout']) || empty($itemAsset['aJsFileFooterLayout'])) {
  $itemAsset['aJsFileFooterLayout'] = array();
  }
+ if (!isset($itemAsset['aPHPFileLayout']) || empty($itemAsset['aPHPFileLayout'])) {
+ $itemAsset['aPHPFileLayout'] = array();
+ }
 
  $aCssFileLayout = $itemAsset['aCssFileLayout'];
  $aJsFileHeadLayout = $itemAsset['aJsFileHeadLayout'];
  $aJsFileFooterLayout = $itemAsset['aJsFileFooterLayout'];
+ $aPHPFileLayout = $itemAsset['aPHPFileLayout'];
 
- $this->add($sAssetName, $aCssFileLayout, $aJsFileHeadLayout, $aJsFileFooterLayout);
+ $this->add($sAssetName, $aCssFileLayout, $aJsFileHeadLayout, $aJsFileFooterLayout, $aPHPFileLayout);
  }
 
  return true;

Particle/Core/Controller.php

@@ -19,34 +19,34 @@ abstract class Controller extends Core\SpotLoad
  protected $args = null;
  protected $spot = null;
 
- private static $currentAddons;
- private static $controller;
- private static $method;
+ private $currentAddons;
+ private $controller;
+ private $method;
 
  public function __construct($noLoadView = false)
  {
  parent::__construct(); // init $spotInstance
  //$this->spot = parent::$spotInstance;
 
- self::$controller = Core\App::getInstance()->getAppController();
- self::$method = Core\App::getInstance()->getAppMethod();
+ $this->controller = Core\App::getInstance()->getAppController();
+ $this->method = Core\App::getInstance()->getAppMethod();
 
  $this->args = Core\App::getInstance()->getAppArgs();
 
  $cacheKey = Core\App::getInstance()->getAppRequest(); // $cacheKey
 
  if (!$noLoadView) {
- $this->view = new \Particle\Core\View(self::$controller, self::$method, $cacheKey, false);
+ $this->view = new \Particle\Core\View($this->controller, $this->method, $cacheKey, false);
  }
  }
 
- final protected static function loadViewAddons()
+ final protected function loadViewAddons()
  {
- self::$currentAddons = Core\App::getInstance()->getAppCurrentAddons();
- return new \Particle\Core\View(self::$currentAddons, 'index', false, true);
+ $this->currentAddons = Core\App::getInstance()->getAppCurrentAddons();
+ return new \Particle\Core\View($this->currentAddons, 'index', false, true);
  }
 
- final protected static function loadAddons($addons_name = false, $noException = false)
+ final protected function loadAddons($addons_name = false, $noException = false)
  {
  $classPlugin = $addons_name.'Addons';
 

Particle/Core/Cookies.php

@@ -36,7 +36,7 @@ public static function read($name)
  * @param string $value Value of the cookie. Destroy the cookie if omitted or null
  * @param int $duration Life time of the cookie. Uses default value if omitted or null
  */
- public static function write($name, $value = null, $duration = 0)
+ public static function write($name, $value = null, $duration = 0, $httponly = true)
  {
  if (!isset($value)) {
  return self::delete($name);
@@ -45,7 +45,6 @@ public static function write($name, $value = null, $duration = 0)
  $domain=ini_get('session.cookie_domain');
  $path=ini_get('session.cookie_path');
  $secure=isset($_SERVER['HTTPS']);
- $httponly=true;
 
  // Expiration date from the life time in seconds
  if ($duration==0) {