diff --git a/lib/Alchemy/Phrasea/Application/Lightbox.php b/lib/Alchemy/Phrasea/Application/Lightbox.php index 6aaa885ae0..bfe88ef773 100644 --- a/lib/Alchemy/Phrasea/Application/Lightbox.php +++ b/lib/Alchemy/Phrasea/Application/Lightbox.php @@ -418,7 +418,7 @@ class Lightbox implements ControllerProviderInterface $evt_mngr = $app['events-manager']; $expires = new \DateTime('+10 days'); - $url = $app['phraseanet.appbox']->get_registry()->get('GV_ServerName') + $url = $app['phraseanet.registry']->get('GV_ServerName') . 'lightbox/index.php?LOG=' . \random::getUrlToken( $app, \random::TYPE_VALIDATE , $basket->getValidation()->getInitiator($app)->get_id() diff --git a/lib/Alchemy/Phrasea/Application/OAuth2.php b/lib/Alchemy/Phrasea/Application/OAuth2.php index bcce9bb95f..010442fa83 100644 --- a/lib/Alchemy/Phrasea/Application/OAuth2.php +++ b/lib/Alchemy/Phrasea/Application/OAuth2.php @@ -62,7 +62,7 @@ return call_user_func(function($environment = 'prod') { $custom_template = sprintf( "%sconfig/templates/web/api/auth/end_user_authorization/%s.html.twig" - , $app['phraseanet.appbox']->get_registry()->get('GV_RootPath') + , $app['phraseanet.registry']->get('GV_RootPath') , $client->get_id() ); diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Databox.php b/lib/Alchemy/Phrasea/Controller/Admin/Databox.php index 4f8d1eb467..587794c54f 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Databox.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Databox.php @@ -652,10 +652,9 @@ class Databox implements ControllerProviderInterface */ public function mountCollection(Application $app, Request $request, $databox_id, $collection_id) { - $appbox = $app['phraseanet.appbox']; $user = $app['phraseanet.user']; - $appbox->get_connection()->beginTransaction(); + $app['phraseanet.appbox']->get_connection()->beginTransaction(); try { $baseId = \collection::mount_collection($app, $app['phraseanet.appbox']->get_databox($databox_id), $collection_id, $user); @@ -676,11 +675,11 @@ class Databox implements ControllerProviderInterface $n += 50; } - $appbox->get_connection()->commit(); + $app['phraseanet.appbox']->get_connection()->commit(); return $app->redirect('/admin/databox/' . $databox_id . '/?mount=ok'); } catch (\Exception $e) { - $appbox->get_connection()->rollBack(); + $app['phraseanet.appbox']->get_connection()->rollBack(); return $app->redirect('/admin/databox/' . $databox_id . '/?mount=ko'); } @@ -899,7 +898,7 @@ class Databox implements ControllerProviderInterface $app->abort(400, _('Bad request format, only JSON is allowed')); } - $appbox = $app['phraseanet.appbox']; + $app['phraseanet.appbox'] = $app['phraseanet.appbox']; $ret = array( 'success' => false, @@ -914,10 +913,10 @@ class Databox implements ControllerProviderInterface ); try { - $databox = $appbox->get_databox($databox_id); + $databox = $app['phraseanet.appbox']->get_databox($databox_id); $datas = $databox->get_indexed_record_amount(); - $ret['indexable'] = $appbox->is_databox_indexable($databox); + $ret['indexable'] = $app['phraseanet.appbox']->is_databox_indexable($databox); $ret['viewname'] = (($databox->get_dbname() == $databox->get_viewname()) ? _('admin::base: aucun alias') : $databox->get_viewname()); $ret['records'] = $databox->get_record_amount(); $ret['sbas_id'] = $databox_id; diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php b/lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php index 4b1c2167cc..65766280c3 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php @@ -288,7 +288,6 @@ class Databoxes implements ControllerProviderInterface return $app->redirect('/admin/databoxes/?success=0&error=special-chars'); } - $appbox = $app['phraseanet.appbox']; $registry = $app['phraseanet.registry']; if ((null === $request->request->get('new_settings'))) { @@ -301,14 +300,14 @@ class Databoxes implements ControllerProviderInterface $user = $connexion->get('user'); $password = $connexion->get('password'); - $appbox->get_connection()->beginTransaction(); + $app['phraseanet.appbox']->get_connection()->beginTransaction(); $base = \databox::mount($app, $hostname, $port, $user, $password, $dbName, $registry); $base->registerAdmin($app['phraseanet.user']); - $appbox->get_connection()->commit(); + $app['phraseanet.appbox']->get_connection()->commit(); return $app->redirect('/admin/databox/' . $base->get_sbas_id() . '/?success=1&reload-tree=1'); } catch (\Exception $e) { - $appbox->get_connection()->rollBack(); + $app['phraseanet.appbox']->get_connection()->rollBack(); return $app->redirect('/admin/databoxes/?success=0&error=mount-failed'); } } @@ -321,14 +320,14 @@ class Databoxes implements ControllerProviderInterface && (null !== $passwordDb = $request->request->get('new_password'))) { try { - $appbox->get_connection()->beginTransaction(); + $app['phraseanet.appbox']->get_connection()->beginTransaction(); $base = \databox::mount($app, $hostname, $port, $userDb, $passwordDb, $dbName, $registry); $base->registerAdmin($app['phraseanet.user']); - $appbox->get_connection()->commit(); + $app['phraseanet.appbox']->get_connection()->commit(); return $app->redirect('/admin/databox/' . $base->get_sbas_id() . '/?success=1&reload-tree=1'); } catch (\Exception $e) { - $appbox->get_connection()->rollBack(); + $app['phraseanet.appbox']->get_connection()->rollBack(); return $app->redirect('/admin/databoxes/?success=0&error=mount-failed'); } diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Root.php b/lib/Alchemy/Phrasea/Controller/Admin/Root.php index ace291267c..b07063cdc7 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Root.php @@ -38,7 +38,6 @@ class Root implements ControllerProviderInterface }); $controllers->get('/', function(Application $app, Request $request) { - $appbox = $app['phraseanet.appbox']; $user = $app['phraseanet.user']; \User_Adapter::updateClientInfos($app, 3); @@ -70,7 +69,7 @@ class Root implements ControllerProviderInterface } $databoxes = $off_databoxes = array(); - foreach ($appbox->get_databoxes() as $databox) { + foreach ($app['phraseanet.appbox']->get_databoxes() as $databox) { try { if (!$user->ACL()->has_access_to_sbas($databox->get_sbas_id())) { continue; @@ -105,7 +104,6 @@ class Root implements ControllerProviderInterface })->bind('admin'); $controllers->get('/tree/', function(Application $app, Request $request) { - $appbox = $app['phraseanet.appbox']; $user = $app['phraseanet.user']; \User_Adapter::updateClientInfos($app, 3); @@ -138,7 +136,7 @@ class Root implements ControllerProviderInterface } $databoxes = $off_databoxes = array(); - foreach ($appbox->get_databoxes() as $databox) { + foreach ($app['phraseanet.appbox']->get_databoxes() as $databox) { try { if (!$user->ACL()->has_access_to_sbas($databox->get_sbas_id())) { continue; diff --git a/lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php b/lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php index 09b6b19d28..a83ccb1d62 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php @@ -85,7 +85,7 @@ class TaskManager implements ControllerProviderInterface $controllers->get('/scheduler/log', function(Application $app, Request $request) { $appbox = $app['phraseanet.appbox']; - $registry = $appbox->get_registry(); + $registry = $app['phraseanet.registry']; $logdir = \p4string::addEndSlash($registry->get('GV_RootPath') . 'logs'); $rname = '/scheduler((\.log)|(-.*\.log))$/'; @@ -129,7 +129,7 @@ class TaskManager implements ControllerProviderInterface $controllers->get('/task/{id}/log', function(Application $app, Request $request, $id) { $appbox = $app['phraseanet.appbox']; - $registry = $appbox->get_registry(); + $registry = $app['phraseanet.registry']; $logdir = \p4string::addEndSlash($registry->get('GV_RootPath') . 'logs'); $rname = '/task_' . $id . '((\.log)|(-.*\.log))$/'; diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php b/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php index e3dc05fa9b..ba7ba9b5e7 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php @@ -70,7 +70,7 @@ class Bridge implements ControllerProviderInterface $controllers->get('/login/{api_name}/', function(Application $app, $api_name) { $appbox = $app['phraseanet.appbox']; - $connector = \Bridge_Api::get_connector_by_name($appbox->get_registry(), $api_name); + $connector = \Bridge_Api::get_connector_by_name($app['phraseanet.registry'], $api_name); return $app->redirect($connector->get_auth_url()); }); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index 33499535ba..94cf47c0ef 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -228,7 +228,7 @@ class Feed implements ControllerProviderInterface $user = $app['phraseanet.user']; $feeds = \Feed_Collection::load_all($app, $user); - $registry = $app['phraseanet.appbox']->get_registry(); + $registry = $app['phraseanet.registry']; $output = array( 'texte' => '

' . _('publication::Voici votre fil RSS personnel. Il vous permettra d\'etre tenu au courrant des publications.') @@ -244,7 +244,7 @@ class Feed implements ControllerProviderInterface $renew = ($request->query->get('renew') === 'true'); $user = $app['phraseanet.user']; $feed = \Feed_Adapter::load_with_user($app, $user, $id); - $registry = $app['phraseanet.appbox']->get_registry(); + $registry = $app['phraseanet.registry']; $output = array( 'texte' => '

' . _('publication::Voici votre fil RSS personnel. Il vous permettra d\'etre tenu au courrant des publications.') diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Query.php b/lib/Alchemy/Phrasea/Controller/Prod/Query.php index 7e1908f24a..195c7998ea 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Query.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Query.php @@ -38,7 +38,7 @@ class Query implements ControllerProviderInterface $controllers->post('/', function(Application $app, Request $request) { $appbox = $app['phraseanet.appbox']; - $registry = $appbox->get_registry(); + $registry = $app['phraseanet.registry']; $user = $app['phraseanet.user']; diff --git a/lib/classes/ACL.class.php b/lib/classes/ACL.class.php index 749f99ff81..c79f677c1d 100644 --- a/lib/classes/ACL.class.php +++ b/lib/classes/ACL.class.php @@ -1439,7 +1439,7 @@ class ACL implements cache_cacheableInterface foreach ($this->get_granted_base(array(), array($databox->get_sbas_id())) as $collection) { $stmt->execute(array( - ':site_id' => $this->app['phraseanet.appbox']->get_registry()->get('GV_sit'), + ':site_id' => $this->app['phraseanet.registry']->get('GV_sit'), ':usr_id' => $this->user->get_id(), ':coll_id' => $collection->get_coll_id(), ':mask_and' => $this->get_mask_and($collection->get_base_id()), @@ -1467,7 +1467,7 @@ class ACL implements cache_cacheableInterface $sql = 'DELETE FROM collusr WHERE usr_id = :usr_id AND site = :site'; $params = array( ':usr_id' => $this->user->get_id() - , ':site' => $this->app['phraseanet.appbox']->get_registry()->get('GV_sit') + , ':site' => $this->app['phraseanet.registry']->get('GV_sit') ); $stmt = $databox->get_connection()->prepare($sql); $stmt->execute($params); diff --git a/lib/classes/API/V1/adapter.class.php b/lib/classes/API/V1/adapter.class.php index bb12da919d..637b1f26ce 100644 --- a/lib/classes/API/V1/adapter.class.php +++ b/lib/classes/API/V1/adapter.class.php @@ -829,7 +829,7 @@ class API_V1_adapter extends API_V1_Abstract public function search_records(Request $request) { $user = $this->app['phraseanet.user']; - $registry = $this->app['phraseanet.appbox']->get_registry(); + $registry = $this->app['phraseanet.registry']; $result = new API_V1_result($request, $this); $search_type = ($request->get('search_type') @@ -1044,7 +1044,7 @@ class API_V1_adapter extends API_V1_Abstract $mimes = $request->get('mimes', array()); foreach ($record->get_embedable_medias($devices, $mimes) as $name => $media) { - $ret[] = $this->list_embedable_media($media, $this->app['phraseanet.appbox']->get_registry()); + $ret[] = $this->list_embedable_media($media, $this->app['phraseanet.registry']); } $result->set_datas(array("embed" => $ret)); diff --git a/lib/classes/Bridge/Api.class.php b/lib/classes/Bridge/Api.class.php index 63df23077c..7c5eb4fc98 100644 --- a/lib/classes/Bridge/Api.class.php +++ b/lib/classes/Bridge/Api.class.php @@ -77,7 +77,7 @@ class Bridge_Api if ( ! $row) throw new Bridge_Exception_ApiNotFound('Api Not Found'); - $this->connector = self::get_connector_by_name($this->app['phraseanet.appbox']->get_registry(), $row['name']); + $this->connector = self::get_connector_by_name($this->app['phraseanet.registry'], $row['name']); $this->disable_time = $row['disable_time'] ? new DateTime($row['disable_time']) : null; $this->updated_on = new DateTime($row['updated_on']); $this->created_on = new DateTime($row['created_on']); diff --git a/lib/classes/Feed/Adapter.class.php b/lib/classes/Feed/Adapter.class.php index 4a61b43b63..f3b57290bf 100644 --- a/lib/classes/Feed/Adapter.class.php +++ b/lib/classes/Feed/Adapter.class.php @@ -138,7 +138,7 @@ class Feed_Adapter extends Feed_Abstract implements Feed_Interface, cache_cachea $url = '/skins/icons/rss32.gif'; - $file = $this->app['phraseanet.appbox']->get_registry()->get('GV_RootPath') + $file = $this->app['phraseanet.registry']->get('GV_RootPath') . 'www/custom/feed_' . $this->get_id() . '.jpg'; if (file_exists($file)) { diff --git a/lib/classes/Session/Authentication/Native.class.php b/lib/classes/Session/Authentication/Native.class.php index fc19858b15..232f99115d 100644 --- a/lib/classes/Session/Authentication/Native.class.php +++ b/lib/classes/Session/Authentication/Native.class.php @@ -249,7 +249,7 @@ class Session_Authentication_Native implements Session_Authentication_Interface protected function check_and_revoke_badlogs($ip) { $conn = $this->app['phraseanet.appbox']->get_connection(); - $registry = $this->app['phraseanet.appbox']->get_registry(); + $registry = $this->app['phraseanet.registry']; $sql = 'SELECT id FROM badlog WHERE (login = :login OR ip = :ip) AND locked="1"'; @@ -285,7 +285,7 @@ class Session_Authentication_Native implements Session_Authentication_Interface */ protected function is_captcha_activated(registryInterface $registry) { - $registry = $this->app['phraseanet.appbox']->get_registry(); + $registry = $this->app['phraseanet.registry']; return ($registry->get('GV_captchas') && trim($registry->get('GV_captcha_private_key')) !== '' diff --git a/lib/classes/Session/Logger.class.php b/lib/classes/Session/Logger.class.php index b487283c40..4f66ed5730 100644 --- a/lib/classes/Session/Logger.class.php +++ b/lib/classes/Session/Logger.class.php @@ -156,7 +156,7 @@ class Session_Logger WHERE site = :site AND sit_session = :ses_id'; $params = array( - ':site' => $databox->get_registry()->get('GV_sit') + ':site' => $app['phraseanet.registry']->get('GV_sit') , ':ses_id' => $app['session']->get('phrasea_session_id') ); diff --git a/lib/classes/User/Adapter.class.php b/lib/classes/User/Adapter.class.php index 6406de92fe..113f7dcf41 100644 --- a/lib/classes/User/Adapter.class.php +++ b/lib/classes/User/Adapter.class.php @@ -434,7 +434,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface */ public function get_protected_rss_url($renew = false) { - $registry = $this->app['phraseanet.appbox']->get_registry(); + $registry = $this->app['phraseanet.registry']; $token = $title = false; @@ -1632,7 +1632,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface public function get_locale() { - $registry = $this->app['phraseanet.appbox']->get_registry(); + $registry = $this->app['phraseanet.registry']; $sql = "SELECT locale FROM usr WHERE usr_id = :usr_id"; $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); diff --git a/lib/classes/appbox.class.php b/lib/classes/appbox.class.php index 39520c4bb4..c42ea78793 100644 --- a/lib/classes/appbox.class.php +++ b/lib/classes/appbox.class.php @@ -205,7 +205,7 @@ class appbox extends base } } - $registry = $databox->get_registry(); + $registry = $this->app['phraseanet.registry']; $file = $registry->get('GV_RootPath') . 'config/minilogos/' . $pic_type . '_' . $databox->get_sbas_id() . '.jpg'; $custom_path = $registry->get('GV_RootPath') . 'www/custom/minilogos/' . $pic_type . '_' . $databox->get_sbas_id() . '.jpg'; @@ -323,7 +323,7 @@ class appbox extends base $upgrader->add_steps(7 + count($this->get_databoxes())); - $registry = $this->get_registry(); + $registry = $this->app['phraseanet.registry']; /** * Step 1 diff --git a/lib/classes/base.class.php b/lib/classes/base.class.php index 56ec18bb8d..6f631d6153 100644 --- a/lib/classes/base.class.php +++ b/lib/classes/base.class.php @@ -133,15 +133,6 @@ abstract class base implements cache_cacheableInterface return $this->host; } - /** - * - * @return registry - */ - public function get_registry() - { - return $this->app['phraseanet.registry']; - } - /** * * @return connection_pdo diff --git a/lib/classes/databox.class.php b/lib/classes/databox.class.php index 1ec9bc9219..f375c5f8a0 100644 --- a/lib/classes/databox.class.php +++ b/lib/classes/databox.class.php @@ -348,7 +348,7 @@ class databox extends base $n+=50; } - $params = array(':site_id' => $this->get_registry()->get('GV_sit')); + $params = array(':site_id' => $this->app['phraseanet.registry']->get('GV_sit')); $sql = 'DELETE FROM clients WHERE site_id = :site_id'; $stmt = $this->get_connection()->prepare($sql); diff --git a/lib/classes/eventsmanager/broker.class.php b/lib/classes/eventsmanager/broker.class.php index a561c04779..73035699e2 100644 --- a/lib/classes/eventsmanager/broker.class.php +++ b/lib/classes/eventsmanager/broker.class.php @@ -26,8 +26,8 @@ class eventsmanager_broker public function start() { $iterators_pool = array( - 'event' => (is_array($this->app['phraseanet.appbox']->get_registry()->get('GV_events')) ? $this->app['phraseanet.appbox']->get_registry()->get('GV_events') : array()), - 'notify' => (is_array($this->app['phraseanet.appbox']->get_registry()->get('GV_notifications')) ? $this->app['phraseanet.appbox']->get_registry()->get('GV_notifications') : array()) + 'event' => (is_array($this->app['phraseanet.registry']->get('GV_events')) ? $this->app['phraseanet.registry']->get('GV_events') : array()), + 'notify' => (is_array($this->app['phraseanet.registry']->get('GV_notifications')) ? $this->app['phraseanet.registry']->get('GV_notifications') : array()) ); foreach ($iterators_pool as $type => $iterators) { diff --git a/lib/classes/eventsmanager/notify/autoregister.class.php b/lib/classes/eventsmanager/notify/autoregister.class.php index 0133eb54f1..40bf4a2baa 100644 --- a/lib/classes/eventsmanager/notify/autoregister.class.php +++ b/lib/classes/eventsmanager/notify/autoregister.class.php @@ -125,8 +125,8 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract $to = array('email' => $admin_user->get_email(), 'name' => $dest); $from = array( - 'email' => $this->app['phraseanet.appbox']->get_registry()->get('GV_defaulmailsenderaddr'), - 'name' => $this->app['phraseanet.appbox']->get_registry()->get('GV_homeTitle') + 'email' => $this->app['phraseanet.registry']->get('GV_defaulmailsenderaddr'), + 'name' => $this->app['phraseanet.registry']->get('GV_homeTitle') ); if (self::mail($to, $from, $datas)) @@ -196,7 +196,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract public function mail($to, $from, $datas) { $subject = sprintf(_('admin::register: Inscription automatique sur %s') - , $this->app['phraseanet.appbox']->get_registry()->get('GV_homeTitle')); + , $this->app['phraseanet.registry']->get('GV_homeTitle')); $body = "

" . _('admin::register: un utilisateur s\'est inscrit') . "
\n"; @@ -261,7 +261,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract { $bool = false; $login = new \login(); - + if ( ! $this->app->isAuthenticated() || ! $login->register_enabled($this->app)) { return false; } diff --git a/lib/classes/eventsmanager/notify/bridgeuploadfail.class.php b/lib/classes/eventsmanager/notify/bridgeuploadfail.class.php index 590181e6ad..24baf2ffe9 100644 --- a/lib/classes/eventsmanager/notify/bridgeuploadfail.class.php +++ b/lib/classes/eventsmanager/notify/bridgeuploadfail.class.php @@ -87,8 +87,8 @@ class eventsmanager_notify_bridgeuploadfail extends eventsmanager_notifyAbstract $to = array('email' => $user->get_email(), 'name' => $name); $from = array( - 'email' => $this->app['phraseanet.appbox']->get_registry()->get('GV_defaulmailsenderaddr'), - 'name' => $this->app['phraseanet.appbox']->get_registry()->get('GV_homeTitle') + 'email' => $this->app['phraseanet.registry']->get('GV_defaulmailsenderaddr'), + 'name' => $this->app['phraseanet.registry']->get('GV_homeTitle') ); if (self::mail($to, $from, $datas)) @@ -160,7 +160,7 @@ class eventsmanager_notify_bridgeuploadfail extends eventsmanager_notifyAbstract public function mail($to, $from, $datas) { $subject = sprintf('Echec upload sur %s' - , $this->app['phraseanet.appbox']->get_registry()->get('GV_homeTitle')); + , $this->app['phraseanet.registry']->get('GV_homeTitle')); $sx = simplexml_load_string($datas); diff --git a/lib/classes/eventsmanager/notify/downloadmailfail.class.php b/lib/classes/eventsmanager/notify/downloadmailfail.class.php index 13b961927e..3bbdeae108 100644 --- a/lib/classes/eventsmanager/notify/downloadmailfail.class.php +++ b/lib/classes/eventsmanager/notify/downloadmailfail.class.php @@ -90,8 +90,8 @@ class eventsmanager_notify_downloadmailfail extends eventsmanager_notifyAbstract $to = array('email' => $user->get_email(), 'name' => $name); $from = array( - 'email' => $this->app['phraseanet.appbox']->get_registry()->get('GV_defaulmailsenderaddr'), - 'name' => $this->app['phraseanet.appbox']->get_registry()->get('GV_homeTitle') + 'email' => $this->app['phraseanet.registry']->get('GV_defaulmailsenderaddr'), + 'name' => $this->app['phraseanet.registry']->get('GV_homeTitle') ); if (parent::email()) diff --git a/lib/classes/eventsmanager/notify/feed.class.php b/lib/classes/eventsmanager/notify/feed.class.php index b1cad73c5d..8f6624a9cd 100644 --- a/lib/classes/eventsmanager/notify/feed.class.php +++ b/lib/classes/eventsmanager/notify/feed.class.php @@ -93,14 +93,14 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract ); $token = \random::getUrlToken( - $this->app, + $this->app, \random::TYPE_FEED_ENTRY , $user_to_notif->get_id() , null , $entry->get_id() ); - $url = $this->app['phraseanet.appbox']->get_registry()->get('GV_ServerName') . 'lightbox/index.php?LOG=' . $token; + $url = $this->app['phraseanet.registry']->get('GV_ServerName') . 'lightbox/index.php?LOG=' . $token; if (self::mail($email, $from, $url, $entry)) $mailed = true; diff --git a/lib/classes/eventsmanager/notify/order.class.php b/lib/classes/eventsmanager/notify/order.class.php index 0bd7cd8692..35ddb76ce6 100644 --- a/lib/classes/eventsmanager/notify/order.class.php +++ b/lib/classes/eventsmanager/notify/order.class.php @@ -108,8 +108,8 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract $to = array('email' => $user->get_email(), 'name' => $dest); $from = array( - 'email' => $this->app['phraseanet.appbox']->get_registry()->get('GV_defaulmailsenderaddr'), - 'name' => $this->app['phraseanet.appbox']->get_registry()->get('GV_homeTitle') + 'email' => $this->app['phraseanet.registry']->get('GV_defaulmailsenderaddr'), + 'name' => $this->app['phraseanet.registry']->get('GV_homeTitle') ); if (self::mail($to, $from, $datas)) { @@ -183,7 +183,7 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract public function mail($to, $from, $datas) { $subject = sprintf(_('admin::register: Nouvelle commande sur %s') - , $this->app['phraseanet.appbox']->get_registry()->get('GV_homeTitle')); + , $this->app['phraseanet.registry']->get('GV_homeTitle')); $body = "
" . _('admin::register: un utilisateur a commande des documents') diff --git a/lib/classes/eventsmanager/notify/orderdeliver.class.php b/lib/classes/eventsmanager/notify/orderdeliver.class.php index 3f11ed7f67..5429cfa391 100644 --- a/lib/classes/eventsmanager/notify/orderdeliver.class.php +++ b/lib/classes/eventsmanager/notify/orderdeliver.class.php @@ -205,7 +205,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract _('%s vous a delivre votre commande, consultez la en ligne a l\'adresse suivante'), $from['name'] ) . "
\n"; - $body .= "
\n" . $this->app['phraseanet.appbox']->get_registry()->get('GV_ServerName') . 'lightbox/validate/' . $ssel_id; + $body .= "
\n" . $this->app['phraseanet.registry']->get('GV_ServerName') . 'lightbox/validate/' . $ssel_id; return mail::send_mail($this->app, $subject, $body, $to, $from, array()); } diff --git a/lib/classes/eventsmanager/notify/register.class.php b/lib/classes/eventsmanager/notify/register.class.php index 7b23759fda..d4e97ca200 100644 --- a/lib/classes/eventsmanager/notify/register.class.php +++ b/lib/classes/eventsmanager/notify/register.class.php @@ -123,8 +123,8 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract $to = array('email' => $admin_user->get_email(), 'name' => $dest); $from = array( - 'email' => $this->app['phraseanet.appbox']->get_registry()->get('GV_defaulmailsenderaddr'), - 'name' => $this->app['phraseanet.appbox']->get_registry()->get('GV_homeTitle') + 'email' => $this->app['phraseanet.registry']->get('GV_defaulmailsenderaddr'), + 'name' => $this->app['phraseanet.registry']->get('GV_homeTitle') ); if (self::mail($to, $from, $datas)) @@ -159,7 +159,7 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract $ret = array( 'text' => sprintf( - _('%1$s demande votre approbation sur une ou plusieurs %2$scollections%3$s'), $sender, '', '' + _('%1$s demande votre approbation sur une ou plusieurs %2$scollections%3$s'), $sender, '', '' ) , 'class' => '' ); @@ -195,7 +195,7 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract public function mail($to, $from, $datas) { $subject = sprintf( - _('admin::register: demande d\'inscription sur %s'), $this->app['phraseanet.appbox']->get_registry()->get('GV_homeTitle') + _('admin::register: demande d\'inscription sur %s'), $this->app['phraseanet.registry']->get('GV_homeTitle') ); $body = "
" @@ -249,7 +249,7 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract $body .= "\n"; - $body .= "
\n
get_registry()->get('GV_ServerName') + $body .= "
\n
get('GV_ServerName') . "login/?redirect=admin' target='_blank'>" . _('admin::register: vous pourrez traiter ses demandes en ligne via l\'interface d\'administration') . "
\n"; diff --git a/lib/classes/eventsmanager/notify/uploadquarantine.class.php b/lib/classes/eventsmanager/notify/uploadquarantine.class.php index 1164f0c3ae..b013a86338 100644 --- a/lib/classes/eventsmanager/notify/uploadquarantine.class.php +++ b/lib/classes/eventsmanager/notify/uploadquarantine.class.php @@ -110,8 +110,8 @@ class eventsmanager_notify_uploadquarantine extends eventsmanager_notifyAbstract $to = array('email' => $user->get_email(), 'name' => $user->get_display_name()); $from = array( - 'email' => $this->app['phraseanet.appbox']->get_registry()->get('GV_defaulmailsenderaddr'), - 'name' => $this->app['phraseanet.appbox']->get_registry()->get('GV_homeTitle') + 'email' => $this->app['phraseanet.registry']->get('GV_defaulmailsenderaddr'), + 'name' => $this->app['phraseanet.registry']->get('GV_homeTitle') ); if (self::mail($to, $from, $datas)) { diff --git a/lib/classes/eventsmanager/notify/validate.class.php b/lib/classes/eventsmanager/notify/validate.class.php index 51c44f1455..fa96badc5e 100644 --- a/lib/classes/eventsmanager/notify/validate.class.php +++ b/lib/classes/eventsmanager/notify/validate.class.php @@ -145,7 +145,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract } $bask_link = '' . $basket_name . ''; diff --git a/lib/classes/eventsmanager/notify/validationreminder.class.php b/lib/classes/eventsmanager/notify/validationreminder.class.php index 13b5768003..53310a5bf4 100644 --- a/lib/classes/eventsmanager/notify/validationreminder.class.php +++ b/lib/classes/eventsmanager/notify/validationreminder.class.php @@ -163,7 +163,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra $ret = array( 'text' => sprintf( - _('Rappel : Il vous reste %1$d jours pour valider %2$s de %3$s'), $this->app['phraseanet.appbox']->get_registry()->get('GV_validation_reminder'), $bask_link, $sender + _('Rappel : Il vous reste %1$d jours pour valider %2$s de %3$s'), $this->app['phraseanet.registry']->get('GV_validation_reminder'), $bask_link, $sender ) , 'class' => ($unread == 1 ? 'reload_baskets' : '') ); @@ -202,7 +202,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra $body = "
" . sprintf( - _('Il ne vous reste plus que %d jours pour terminer votre validation'), $this->app['phraseanet.appbox']->get_registry()->get('GV_validation_reminder')) + _('Il ne vous reste plus que %d jours pour terminer votre validation'), $this->app['phraseanet.registry']->get('GV_validation_reminder')) . "
\n"; if (trim($url) != '') { diff --git a/lib/classes/media/subdef.class.php b/lib/classes/media/subdef.class.php index b098def342..b058f11c00 100644 --- a/lib/classes/media/subdef.class.php +++ b/lib/classes/media/subdef.class.php @@ -276,7 +276,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface */ protected function find_substitute_file() { - $registry = $this->record->get_databox()->get_registry(); + $registry = $this->app['phraseanet.registry']; if ($this->record->is_grouping()) { $this->mime = 'image/png'; diff --git a/lib/classes/module/console/checkExtension.class.php b/lib/classes/module/console/checkExtension.class.php index 2498e627b7..b2404b0f4a 100644 --- a/lib/classes/module/console/checkExtension.class.php +++ b/lib/classes/module/console/checkExtension.class.php @@ -51,7 +51,7 @@ class module_console_checkExtension extends Command $appbox = $this->getService('phraseanet.appbox'); - $registry = $appbox->get_registry(); + $registry = $this->container['phraseanet.registry']; $usrId = $input->getArgument('usr_id'); diff --git a/lib/classes/module/console/sphinxGenerateSuggestion.class.php b/lib/classes/module/console/sphinxGenerateSuggestion.class.php index d12603810f..a1f80287db 100644 --- a/lib/classes/module/console/sphinxGenerateSuggestion.class.php +++ b/lib/classes/module/console/sphinxGenerateSuggestion.class.php @@ -42,7 +42,7 @@ class module_console_sphinxGenerateSuggestion extends Command define('SUGGEST_DEBUG', 0); $appbox = $this->getService('phraseanet.appbox'); - $registry = $appbox->get_registry(); + $registry = $this->container['phraseanet.registry']; $params = phrasea::sbas_params($this->container); diff --git a/lib/classes/module/report/download.class.php b/lib/classes/module/report/download.class.php index 4bee896209..b2d70d2f7b 100644 --- a/lib/classes/module/report/download.class.php +++ b/lib/classes/module/report/download.class.php @@ -214,7 +214,7 @@ class module_report_download extends module_report $databox = $appbox->get_databox((int) $sbas_id); $conn = $databox->get_connection(); - $registry = $databox->get_registry(); + $registry = $app['phraseanet.registry']; $params = array(':site_id' => $registry->get('GV_sit')); $datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax); diff --git a/lib/classes/patch/303.class.php b/lib/classes/patch/303.class.php index 9615fe43b4..87f653ae27 100644 --- a/lib/classes/patch/303.class.php +++ b/lib/classes/patch/303.class.php @@ -56,8 +56,8 @@ class patch_303 implements patchInterface public function apply(base $appbox, Application $app) { - $this->update_users_log_datas($appbox); - $this->update_users_search_datas($appbox); + $this->update_users_log_datas($appbox, $app); + $this->update_users_search_datas($appbox, $app); return true; } @@ -66,7 +66,7 @@ class patch_303 implements patchInterface * * @return patch_303 */ - public function update_users_log_datas(appbox $appbox) + public function update_users_log_datas(appbox $appbox, Application $app) { $col = array('fonction', 'societe', 'activite', 'pays'); @@ -90,7 +90,7 @@ class patch_303 implements patchInterface foreach ($appbox->get_databoxes() as $databox) { foreach ($tab_usr as $id => $columns) { $f_req = array(); - $params = array(':usr_id' => $id, ':site' => $appbox->get_registry()->get('GV_sit')); + $params = array(':usr_id' => $id, ':site' => $app['phraseanet.registry']->get('GV_sit')); foreach ($columns as $column => $value) { $column = trim($column); $f_req[] = $column . " = :" . $column; @@ -112,7 +112,7 @@ class patch_303 implements patchInterface * * @return patch_303 */ - public function update_users_search_datas(appbox $appbox) + public function update_users_search_datas(appbox $appbox, Application $app) { foreach ($appbox->get_databoxes() as $databox) { $date_debut = '0000-00-00 00:00:00'; diff --git a/lib/classes/patch/320aa.class.php b/lib/classes/patch/320aa.class.php index d574672fd3..357b750bb9 100644 --- a/lib/classes/patch/320aa.class.php +++ b/lib/classes/patch/320aa.class.php @@ -60,7 +60,7 @@ class patch_320aa implements patchInterface } else { return; } - + require __DIR__ . '/../../../lib/conf.d/_GV_template.inc'; define('GV_STATIC_URL', ''); @@ -70,7 +70,7 @@ class patch_320aa implements patchInterface define('GV_sphinx_rt_host', ''); define('GV_sphinx_rt_port', ''); - $registry = $appbox->get_registry(); + $registry = $app['phraseanet.registry']; foreach ($GV as $section => $datas_section) { foreach ($datas_section['vars'] as $datas) { diff --git a/lib/classes/phrasea.class.php b/lib/classes/phrasea.class.php index 9950c3cfcd..3efe67039a 100644 --- a/lib/classes/phrasea.class.php +++ b/lib/classes/phrasea.class.php @@ -76,7 +76,7 @@ class phrasea public function getHome(Application $app, $type = 'PUBLI', $context = 'prod') { $appbox = $app['phraseanet.appbox']; - $registry = $appbox->get_registry(); + $registry = $app['phraseanet.registry']; $user = $app['phraseanet.user']; if ($type == 'HELP') { if (file_exists($registry->get('GV_RootPath') . "config/help_" . $app['locale.I18n'] . ".php")) { diff --git a/lib/classes/record/adapter.class.php b/lib/classes/record/adapter.class.php index 899dd61e98..abf8d1e553 100644 --- a/lib/classes/record/adapter.class.php +++ b/lib/classes/record/adapter.class.php @@ -505,7 +505,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface $this->base_id = $collection->get_base_id(); try { - $sphinx_rt = sphinxrt::get_instance($appbox->get_registry()); + $sphinx_rt = sphinxrt::get_instance($this->app['phraseanet.registry']); $sbas_id = $this->get_sbas_id(); $sbas_params = phrasea::sbas_params($this->app); @@ -1575,7 +1575,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface $connbas = $this->get_databox()->get_connection(); $sbas_id = $this->get_databox()->get_sbas_id(); $appbox = $this->app['phraseanet.appbox']; - $registry = $appbox->get_registry(); + $registry = $this->app['phraseanet.registry']; $conn = $appbox->get_connection(); $ftodel = array(); @@ -2066,7 +2066,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface WHERE rid_child = :record_id'; $params = array( - ':GV_site' => $appbox->get_registry()->get('GV_sit') + ':GV_site' => $this->app['phraseanet.registry']->get('GV_sit') , ':usr_id' => $this->app['phraseanet.user']->get_id() , ':record_id' => $this->get_record_id() ); diff --git a/lib/classes/record/preview.class.php b/lib/classes/record/preview.class.php index c6818c0870..31e1edfb5c 100644 --- a/lib/classes/record/preview.class.php +++ b/lib/classes/record/preview.class.php @@ -317,7 +317,7 @@ class record_preview extends record_adapter $tab = array(); $appbox = $this->app['phraseanet.appbox']; - $registry = $appbox->get_registry(); + $registry = $this->app['phraseanet.registry']; $user = $this->app['phraseanet.user']; $report = $user->ACL()->has_right_on_base($this->get_base_id(), 'canreport'); @@ -408,7 +408,7 @@ class record_preview extends record_adapter $user = $this->app['phraseanet.user']; $report = $user->ACL()->has_right_on_base( $this->get_base_id(), 'canreport'); - $registry = $appbox->get_registry(); + $registry = $this->app['phraseanet.registry']; if ( ! $report && ! $registry->get('GV_google_api')) { $this->view_popularity = false; @@ -501,7 +501,7 @@ class record_preview extends record_adapter $user = $this->app['phraseanet.user']; $report = $user->ACL()->has_right_on_base( $this->get_base_id(), 'canreport'); - $registry = $appbox->get_registry(); + $registry = $this->app['phraseanet.registry']; if ( ! $report && ! $registry->get('GV_google_api')) { $this->refferer_popularity = false; @@ -582,7 +582,7 @@ class record_preview extends record_adapter $appbox = $this->app['phraseanet.appbox']; $user = $this->app['phraseanet.user']; - $registry = $appbox->get_registry(); + $registry = $this->app['phraseanet.registry']; $report = $user->ACL()->has_right_on_base( $this->get_base_id(), 'canreport'); diff --git a/lib/classes/searchEngine/adapter/phrasea/engine.class.php b/lib/classes/searchEngine/adapter/phrasea/engine.class.php index 92614d4d48..733405dac6 100644 --- a/lib/classes/searchEngine/adapter/phrasea/engine.class.php +++ b/lib/classes/searchEngine/adapter/phrasea/engine.class.php @@ -243,10 +243,8 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract $query .= ' AND recordtype=' . $this->opt_record_type; } - $appbox = $this->app['phraseanet.appbox']; - $sql = 'SELECT query, query_time FROM cache WHERE session_id = :ses_id'; - $stmt = $appbox->get_connection()->prepare($sql); + $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); $stmt->execute(array(':ses_id' => $this->app['session']->get('phrasea_session_id'))); $row = $stmt->fetch(PDO::FETCH_ASSOC); $stmt->closeCursor(); @@ -364,8 +362,7 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract */ protected function query() { - $appbox = $this->app['phraseanet.appbox']; - $registry = $appbox->get_registry(); + $registry = $this->app['phraseanet.registry']; $dateLog = date("Y-m-d H:i:s"); $nbanswers = 0; @@ -378,7 +375,7 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract , ':ses_id' => $this->app['session']->get('phrasea_session_id') ); - $stmt = $appbox->get_connection()->prepare($sql); + $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); $stmt->execute($params); $stmt->closeCursor(); @@ -424,7 +421,7 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract if ($this->results[$sbas_id]) $nbanswers += $this->results[$sbas_id]["nbanswers"]; - $logger = $this->app['phraseanet.logger']($appbox->get_databox($sbas_id)); + $logger = $this->app['phraseanet.logger']($this->app['phraseanet.appbox']->get_databox($sbas_id)); $conn2 = connection::getPDOConnection($this->app, $sbas_id); @@ -464,7 +461,6 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract */ protected function singleParse($sbas) { - $appbox = $this->app['phraseanet.appbox']; $this->qp[$sbas] = new searchEngine_adapter_phrasea_queryParser($this->app, $this->app['locale']); $this->qp[$sbas]->debug = false; if ($sbas == 'main') @@ -494,9 +490,7 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract $qry .= trim($query); } - $appbox = $this->app['phraseanet.appbox']; - - foreach ($appbox->get_databoxes() as $databox) { + foreach ($this->app['phraseanet.appbox']->get_databoxes() as $databox) { foreach ($databox->get_collections() as $coll) { if (in_array($coll->get_base_id(), $this->opt_bases)) { $this->queries[$databox->get_sbas_id()] = $qry; @@ -550,7 +544,7 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract foreach ($this->queries as $sbas => $qryBas) $this->singleParse($sbas); - foreach ($appbox->get_databoxes() as $databox) { + foreach ($this->app['phraseanet.appbox']->get_databoxes() as $databox) { if ( ! isset($this->queries[$databox->get_sbas_id()])) continue; diff --git a/lib/classes/searchEngine/adapter/sphinx/engine.class.php b/lib/classes/searchEngine/adapter/sphinx/engine.class.php index 3cba61c6b6..c975c6763a 100644 --- a/lib/classes/searchEngine/adapter/sphinx/engine.class.php +++ b/lib/classes/searchEngine/adapter/sphinx/engine.class.php @@ -102,10 +102,8 @@ class searchEngine_adapter_sphinx_engine extends searchEngine_adapter_abstract i $filters = array(); - $appbox = $this->app['phraseanet.appbox']; - foreach ($sbas_ids as $sbas_id) { - $fields = $appbox->get_databox($sbas_id)->get_meta_structure(); + $fields = $this->app['phraseanet.appbox']->get_databox($sbas_id)->get_meta_structure(); foreach ($fields as $field) { if ( ! in_array($field->get_id(), $options->get_fields())) @@ -142,12 +140,11 @@ class searchEngine_adapter_sphinx_engine extends searchEngine_adapter_abstract i $this->sphinx->SetFilter('crc_struct_id', $filters); } - $appbox = $this->app['phraseanet.appbox']; /** * @todo : enhance : check status better */ foreach ($sbas_ids as $sbas_id) { - $s_status = $appbox->get_databox($sbas_id)->get_statusbits(); + $s_status = $this->app['phraseanet.appbox']->get_databox($sbas_id)->get_statusbits(); $status_opts = $options->get_status(); foreach ($s_status as $n => $status) { if ( ! array_key_exists($n, $status_opts)) @@ -485,14 +482,13 @@ class searchEngine_adapter_sphinx_engine extends searchEngine_adapter_abstract i if ( ! $this->current_index) $this->current_index = '*'; - $appbox = $this->app['phraseanet.appbox']; $supposed_qry = mb_strtolower($this->query); $pieces = explode(" ", str_replace(array("all", "last", "et", "ou", "sauf", "and", "or", "except", "in", "dans", "'", '"', "(", ")", "_", "-"), ' ', $supposed_qry)); $clef = 'sph_sugg_' . crc32(serialize($this->options) . ' ' . $this->current_index . implode(' ', $pieces) . ' ' . ($only_last_word ? '1' : '0')); try { - return $appbox->get_data_from_cache($clef); + return $this->app['phraseanet.appbox']->get_data_from_cache($clef); } catch (Exception $e) { } @@ -578,7 +574,7 @@ class searchEngine_adapter_sphinx_engine extends searchEngine_adapter_abstract i $clef_unique_datas = 'sph_sugg_' . crc32(serialize($this->options) . $this->current_index . $f); try { - $datas = $appbox->get_data_from_cache($clef_unique_datas); + $datas = $this->app['phraseanet.appbox']->get_data_from_cache($clef_unique_datas); } catch (Exception $e) { $datas = false; } @@ -594,7 +590,7 @@ class searchEngine_adapter_sphinx_engine extends searchEngine_adapter_abstract i if ($tmp_res !== false && isset($tmp_res['total_found'])) { $found = (int) $tmp_res['total_found']; } - $appbox->set_data_to_cache($found, $clef_unique_datas, 3600); + $this->app['phraseanet.appbox']->set_data_to_cache($found, $clef_unique_datas, 3600); } if ($found > 0) { @@ -617,7 +613,7 @@ class searchEngine_adapter_sphinx_engine extends searchEngine_adapter_abstract i unset($propals[$key]); } - $appbox->set_data_to_cache($propals, $clef, 3600); + $this->app['phraseanet.appbox']->set_data_to_cache($propals, $clef, 3600); return $propals; } @@ -649,7 +645,6 @@ class searchEngine_adapter_sphinx_engine extends searchEngine_adapter_abstract i */ public function build_excerpt($query, array $fields, record_adapter $record) { - $appbox = $this->app['phraseanet.appbox']; $selected_sbas_id = $record->get_sbas_id(); $index = ''; diff --git a/lib/classes/set/exportftp.class.php b/lib/classes/set/exportftp.class.php index 7c21412aa7..2b3995f5ec 100644 --- a/lib/classes/set/exportftp.class.php +++ b/lib/classes/set/exportftp.class.php @@ -35,9 +35,8 @@ class set_exportftp extends set_export */ public function export_ftp($usr_to, $host, $login, $password, $ssl, $retry, $passif, $destfolder, $makedirectory, $logfile) { - $appbox = $this->app['phraseanet.appbox']; $user_f = $this->app['phraseanet.user']; - $conn = $appbox->get_connection(); + $conn = $this->app['phraseanet.appbox']->get_connection(); $email_dest = ''; if ($usr_to) { diff --git a/lib/classes/set/order.class.php b/lib/classes/set/order.class.php index bf683d5da6..e6fd0586e0 100644 --- a/lib/classes/set/order.class.php +++ b/lib/classes/set/order.class.php @@ -211,8 +211,7 @@ class set_order extends set_abstract public function __construct(Application $app, $id) { $this->app = $app; - $appbox = $app['phraseanet.appbox']; - $conn = $appbox->get_connection(); + $conn = $app['phraseanet.appbox']->get_connection(); $sql = 'SELECT o.id, o.usr_id, o.created_on, o.`usage`, o.deadline, COUNT(e.id) as total, o.ssel_id, COUNT(e2.id) as todo @@ -459,8 +458,7 @@ class set_order extends set_abstract */ public function deny_elements(Array $elements_ids) { - $appbox = $this->app['phraseanet.appbox']; - $conn = $appbox->get_connection(); + $conn = $app['phraseanet.appbox']->get_connection(); $n = 0; diff --git a/lib/classes/task/appboxAbstract.class.php b/lib/classes/task/appboxAbstract.class.php index a3f4c77aec..ca6b51cc55 100755 --- a/lib/classes/task/appboxAbstract.class.php +++ b/lib/classes/task/appboxAbstract.class.php @@ -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: diff --git a/lib/classes/task/databoxAbstract.class.php b/lib/classes/task/databoxAbstract.class.php index db4decf3ee..da1d35f984 100755 --- a/lib/classes/task/databoxAbstract.class.php +++ b/lib/classes/task/databoxAbstract.class.php @@ -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; diff --git a/lib/classes/task/manager.class.php b/lib/classes/task/manager.class.php index a0104a616d..c6e68e311a 100755 --- a/lib/classes/task/manager.class.php +++ b/lib/classes/task/manager.class.php @@ -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( diff --git a/lib/classes/task/period/RecordMover.class.php b/lib/classes/task/period/RecordMover.class.php index e7005960d2..05312c1964 100644 --- a/lib/classes/task/period/RecordMover.class.php +++ b/lib/classes/task/period/RecordMover.class.php @@ -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']); diff --git a/lib/classes/task/period/ftp.class.php b/lib/classes/task/period/ftp.class.php index 3f2433996f..55957b4000 100755 --- a/lib/classes/task/period/ftp.class.php +++ b/lib/classes/task/period/ftp.class.php @@ -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"]; diff --git a/lib/classes/task/period/outofdate.class.php b/lib/classes/task/period/outofdate.class.php index e81f366323..88c2e8008e 100755 --- a/lib/classes/task/period/outofdate.class.php +++ b/lib/classes/task/period/outofdate.class.php @@ -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) { diff --git a/lib/classes/task/period/workflow01.class.php b/lib/classes/task/period/workflow01.class.php index 196afc7669..9023da618d 100755 --- a/lib/classes/task/period/workflow01.class.php +++ b/lib/classes/task/period/workflow01.class.php @@ -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; diff --git a/lib/classes/task/period/writemeta.class.php b/lib/classes/task/period/writemeta.class.php index 62cc1b515c..d3724120a4 100644 --- a/lib/classes/task/period/writemeta.class.php +++ b/lib/classes/task/period/writemeta.class.php @@ -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(); diff --git a/templates/web/login/index.html.twig b/templates/web/login/index.html.twig index 278652e304..bbf036a7cd 100644 --- a/templates/web/login/index.html.twig +++ b/templates/web/login/index.html.twig @@ -44,7 +44,7 @@
{% endif %} - {% if app['phraseanet.appbox'].get_registry().get('GV_display_gcf', 1) and app['request'].cookies.get('gfc_box') == false %} + {% if app['phraseanet.registry'].get('GV_display_gcf', 1) and app['request'].cookies.get('gfc_box') == false %}