hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 12:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Appbox

Browse Source
This commit is contained in:
Romain Neutron
2012-02-21 16:06:01 +01:00
parent 375fd3d493
commit e576989c7f
15 changed files with 90 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/classes/appbox.class.php
View File

@@ -45,6 +45,7 @@ class appbox extends base
protected $cache;
protected $connection;
protected $registry;
protected $Core;
const CACHE_LIST_BASES = 'list_bases';
const CACHE_SBAS_IDS = 'sbas_ids';
@@ -54,11 +55,11 @@ class appbox extends base
*
* @return appbox
*/
public static function get_instance(registryInterface &$registry = null)
public static function get_instance(\Alchemy\Phrasea\Core $Core, registryInterface &$registry = null)
{
if (!self::$_instance instanceof self)
{
self::$_instance = new self($registry);
self::$_instance = new self($Core, $registry);
}
return self::$_instance;
@@ -69,11 +70,12 @@ class appbox extends base
*
* @return appbox
*/
protected function __construct(registryInterface $registry = null)
protected function __construct(\Alchemy\Phrasea\Core $Core, registryInterface $registry = null)
{
$this->connection = connection::getPDOConnection();
$this->Core = $Core;
if (!$registry)
$registry = registry::get_instance();
$registry = registry::get_instance($Core);
$this->connection = connection::getPDOConnection(null, $registry);
$this->registry = $registry;
$this->session = Session_Handler::getInstance($this);
@@ -283,7 +285,7 @@ class appbox extends base
$stmt->execute(array(':viewname' => $viewname, ':sbas_id' => $databox->get_sbas_id()));
$stmt->closeCursor();
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$appbox->delete_data_from_cache(appbox::CACHE_LIST_BASES);
cache_databox::update($databox->get_sbas_id(), 'structure');
@@ -571,7 +573,7 @@ class appbox extends base
}
catch (Exception $e)
{
}
try
@@ -619,7 +621,7 @@ class appbox extends base
}
catch (Exception $e)
{
}
}
@@ -636,7 +638,7 @@ class appbox extends base
}
catch (Exception $e)
{
}
$sql = 'SELECT sbas_id FROM sbas';