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

Refactor Appbox

Browse Source
This commit is contained in:
Romain Neutron
2012-02-21 16:09:34 +01:00
parent 6ce734c50d
commit 1d6eb86c90
5 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/classes/User/Adapter.class.php
View File

@@ -482,7 +482,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
{
try
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$session = $appbox->get_session();
$user = User_Adapter::getInstance($session->get_usr_id(), $appbox);
@@ -1523,7 +1523,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
public static function updateClientInfos($app_id)
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$session = $appbox->get_session();
if (!$session->is_authenticated())
@@ -1632,7 +1632,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
{
try
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$session = $appbox->get_session();
$sql = "UPDATE usr SET create_db='0' WHERE create_db='1' AND usr_id != :usr_id";
@@ -1659,7 +1659,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
{
$users = self::get_sys_admins();
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$conn = $appbox->get_connection();
foreach ($appbox->get_databoxes() as $databox)
@@ -1717,7 +1717,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
$locale = 'en_GB';
try
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$session = $appbox->get_session();
$registry = $appbox->get_registry();
$locale = $registry->get('GV_default_lng');

2
lib/classes/User/Query.class.php
View File

@@ -209,7 +209,7 @@ class User_Query implements User_QueryInterface
{
$this->sql_params = array();
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$session = $appbox->get_session();
$sql = '