Refactor Appbox

This commit is contained in:
Romain Neutron
2012-02-21 16:26:07 +01:00
parent 65f62f9c10
commit cc8acb342e
8 changed files with 11 additions and 11 deletions

View File

@@ -177,7 +177,7 @@ class task_period_apibridge extends task_appboxAbstract
, 'sbas_id' => $element->get_record()->get_sbas_id()
, 'record_id' => $element->get_record()->get_record_id()
);
$events_mngr = eventsmanager_broker::getInstance(appbox::get_instance(), $Core);
$events_mngr = eventsmanager_broker::getInstance(appbox::get_instance(\bootstrap::getCore()), $Core);
$events_mngr->trigger('__BRIDGE_UPLOAD_FAIL__', $params);
break;

View File

@@ -226,7 +226,7 @@ class task_period_archive extends task_abstract
*/
public function printInterfaceHTML()
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
ob_start();
?>

View File

@@ -54,7 +54,7 @@ class task_period_batchupload extends task_appboxAbstract
protected function process_one_content(appbox $appbox, Array $row)
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$registry = $appbox->get_registry();
$conn = $appbox->get_connection();
$session = $appbox->get_session();

View File

@@ -400,7 +400,7 @@ class task_period_outofdate extends task_abstract
{
global $usr_id;
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$session = $appbox->get_session();
$user = User_Adapter::getInstance($session->get_usr_id(), $appbox);
ob_start();

View File

@@ -43,7 +43,7 @@ class task_period_upgradetov31 extends task_abstract
{
printf("taskid %s starting." . PHP_EOL, $this->get_task_id());
// task can't be stopped here
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$conn = $appbox->get_connection();
$registry = $appbox->get_registry();
$running = true;
@@ -58,7 +58,7 @@ class task_period_upgradetov31 extends task_abstract
$todo = $this->how_many_left();
$done = 0;
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$ret = 'stopped';
$this->setProgress($done, $todo);
@@ -156,7 +156,7 @@ class task_period_upgradetov31 extends task_abstract
private function how_many_left()
{
$todo = 0;
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
foreach ($appbox->get_databoxes() as $databox)
{

View File

@@ -61,7 +61,7 @@ class task_period_upgradetov32 extends task_abstract
printf("taskid %s starting." . PHP_EOL, $this->get_task_id());
$registry = registry::get_instance();
$registry->set('GV_cache_server_type', 'nocache', \registry::TYPE_STRING);
// $registry->set('GV_cache_server_type', 'nocache', \registry::TYPE_STRING);
$registry->set('GV_sphinx', false, \registry::TYPE_BOOLEAN);
if (!$this->sbas_id)

View File

@@ -308,7 +308,7 @@ class task_period_workflow01 extends task_databoxAbstract
public function printInterfaceHTML()
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$session = $appbox->get_session();
$user = User_Adapter::getInstance($session->get_usr_id(), $appbox);
ob_start();
@@ -475,7 +475,7 @@ class task_period_workflow01 extends task_databoxAbstract
{
$request = http_request::getInstance();
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$session = $appbox->get_session();
$user = User_Adapter::getInstance($session->get_usr_id(), $appbox);

View File

@@ -183,7 +183,7 @@ class task_period_writemeta extends task_databoxAbstract
public function printInterfaceHTML()
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$session = $appbox->get_session();
$sbas_ids = User_Adapter::getInstance($session->get_usr_id(), $appbox)
->ACL()->get_granted_sbas(array('bas_manage'));