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

Remove get_registry method

Browse Source
This commit is contained in:
Romain Neutron
2012-09-28 14:19:48 +02:00
parent 65589f3b21
commit 58af2b4c9c
52 changed files with 109 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/classes/task/appboxAbstract.class.php
View File

@@ -73,7 +73,6 @@ abstract class task_appboxAbstract extends task_abstract
break;
}
$appbox = $this->dependencyContainer['phraseanet.appbox'];
try {
$this->loadSettings(simplexml_load_string($row['settings']));
} catch (Exception $e) {
@@ -81,7 +80,7 @@ abstract class task_appboxAbstract extends task_abstract
continue;
}
$process_ret = $this->process($appbox);
$process_ret = $this->process($this->dependencyContainer['phraseanet.appbox']);
switch ($process_ret) {
case self::STATE_MAXMEGSREACHED:

3
lib/classes/task/databoxAbstract.class.php
View File

@@ -85,10 +85,9 @@ abstract class task_databoxAbstract extends task_abstract
$this->sbas_id = (int) $row['sbas_id'];
$this->log('This task works now on ' . phrasea::sbas_names($this->sbas_id, $app));
$appbox = $this->dependencyContainer['phraseanet.appbox'];
try {
// get the records to process
$databox = $appbox->get_databox((int) $row['sbas_id']);
$databox = $this->dependencyContainer['phraseanet.appbox']->get_databox((int) $row['sbas_id']);
} catch (Exception $e) {
$this->log(sprintf('Warning : can\' connect to sbas(%s)', $row['sbas_id']));
continue;

6
lib/classes/task/manager.class.php
View File

@@ -126,13 +126,13 @@ class task_manager
public function getSchedulerProcess()
{
$phpcli = $this->appbox->get_registry()->get('GV_cli');
$phpcli = $this->app['phraseanet.registry']->get('GV_cli');
$cmd = $phpcli . ' -f ' . $this->appbox->get_registry()->get('GV_RootPath') . "bin/console scheduler:start";
$cmd = $phpcli . ' -f ' . $this->app['phraseanet.registry']->get('GV_RootPath') . "bin/console scheduler:start";
return new Process($cmd);
}
public function setSchedulerState($status)
{
$av_status = array(

9
lib/classes/task/period/RecordMover.class.php
View File

@@ -502,8 +502,7 @@ class task_period_RecordMover extends task_appboxAbstract
protected function processOneContent(appbox $appbox, Array $row)
{
$logsql = (int) ($this->sxTaskSettings->logsql) > 0;
$appbox = $this->dependencyContainer['phraseanet.appbox'];
$databox = $appbox->get_databox($row['sbas_id']);
$databox = $this->dependencyContainer['phraseanet.appbox']->get_databox($row['sbas_id']);
$rec = new record_adapter($this->dependencyContainer, $row['sbas_id'], $row['record_id']);
switch ($row['action']) {
@@ -512,7 +511,7 @@ class task_period_RecordMover extends task_appboxAbstract
// change collection ?
if (array_key_exists('coll', $row)) {
$coll = collection::get_from_coll_id($this->dependencyContainer, $databox, $row['coll']);
$rec->move_to_collection($coll, $appbox);
$rec->move_to_collection($coll, $this->dependencyContainer['phraseanet.appbox']);
if ($logsql) {
$this->log(sprintf("on sbas %s move rid %s to coll %s \n", $row['sbas_id'], $row['record_id'], $coll->get_coll_id()));
}
@@ -574,8 +573,6 @@ class task_period_RecordMover extends task_appboxAbstract
*/
private function calcSQL($sxtask, $playTest = false)
{
$appbox = $this->dependencyContainer['phraseanet.appbox'];
$sbas_id = (int) ($sxtask['sbas_id']);
$ret = array(
@@ -592,7 +589,7 @@ class task_period_RecordMover extends task_appboxAbstract
);
try {
$dbox = $appbox->get_databox($sbas_id);
$dbox = $this->dependencyContainer['phraseanet.appbox']->get_databox($sbas_id);
$ret['basename'] = $dbox->get_viewname();
$ret['basename_htmlencoded'] = htmlentities($ret['basename']);

2
lib/classes/task/period/ftp.class.php
View File

@@ -304,7 +304,7 @@ class task_period_ftp extends task_appboxAbstract
protected function processOneContent(appbox $appbox, Array $ftp_export)
{
$conn = $appbox->get_connection();
$registry = $appbox->get_registry();
$registry = $app['phraseanet.registry'];
$id = $ftp_export['id'];
$ftp_export[$id]["crash"] = $ftp_export["crash"];

4
lib/classes/task/period/outofdate.class.php
View File

@@ -312,7 +312,6 @@ class task_period_outofdate extends task_abstract
// ====================================================================
public function getInterfaceHTML()
{
$appbox = $this->dependencyContainer['phraseanet.appbox'];
$user = $this->dependencyContainer['phraseanet.user'];
ob_start();
@@ -732,7 +731,6 @@ class task_period_outofdate extends task_abstract
{
$ret = NULL;
$appbox = $this->dependencyContainer['phraseanet.appbox'];
$request = http_request::getInstance();
$parm2 = $request->get_parms(
'ACT', 'bid'
@@ -752,7 +750,7 @@ class task_period_outofdate extends task_abstract
if ($parm2['bid'] != '') {
$sbas_id = (int) $parm2['bid'];
try {
$databox = $appbox->get_databox($sbas_id);
$databox = $this->dependencyContainer['phraseanet.appbox']->get_databox($sbas_id);
$meta_struct = $databox->get_meta_structure();
foreach ($meta_struct as $meta) {

4
lib/classes/task/period/workflow01.class.php
View File

@@ -263,7 +263,6 @@ class task_period_workflow01 extends task_databoxAbstract
public function getInterfaceHTML()
{
$appbox = $this->dependencyContainer['phraseanet.appbox'];
$user = $this->dependencyContainer['phraseanet.user'];
ob_start();
?>
@@ -431,7 +430,6 @@ class task_period_workflow01 extends task_databoxAbstract
{
$request = http_request::getInstance();
$appbox = $this->dependencyContainer['phraseanet.appbox'];
$user = $this->dependencyContainer['phraseanet.user'];
$parm = $request->get_parms("bid");
@@ -446,7 +444,7 @@ class task_period_workflow01 extends task_databoxAbstract
$sbas_id = (int) $parm['bid'];
try {
$databox = $appbox->get_databox($sbas_id);
$databox = $this->dependencyContainer['phraseanet.appbox']->get_databox($sbas_id);
foreach ($databox->get_meta_structure() as $meta) {
if ($meta->get_type() !== 'date') {
continue;

1
lib/classes/task/period/writemeta.class.php
View File

@@ -173,7 +173,6 @@ class task_period_writemeta extends task_databoxAbstract
public function getInterfaceHTML()
{
$appbox = $this->dependencyContainer['phraseanet.appbox'];
$sbas_ids = $this->dependencyContainer['phraseanet.user']->ACL()->get_granted_sbas(array('bas_manage'));
ob_start();