Update Phrasea Core

lib/Alchemy/Phrasea/Application.php

@@ -4,57 +4,271 @@ namespace Alchemy\Phrasea;
 
 use Alchemy\Phrasea\PhraseanetServiceProvider;
 use Alchemy\Phrasea\Core\Provider\BrowserServiceProvider;
-use Alchemy\Phrasea\Core\Provider\TaskManagerServiceProvider;
+use Alchemy\Phrasea\Core\Provider\BorderManagerServiceProvider;
+use Alchemy\Phrasea\Core\Provider\CacheServiceProvider;
+use Alchemy\Phrasea\Core\Provider\ConfigurationServiceProvider;
+use Alchemy\Phrasea\Core\Provider\ORMServiceProvider;
+use Alchemy\Phrasea\Security\Firewall;
+use FFMpeg\FFMpegServiceProvider;
+use Grom\Silex\ImagineServiceProvider;
+use MediaVorus\MediaVorusServiceProvider;
+use MediaAlchemyst\MediaAlchemystServiceProvider;
 use Neutron\Silex\Provider\FilesystemServiceProvider;
+use PHPExiftool\PHPExiftoolServiceProvider;
 use Silex\Application as SilexApplication;
+use Silex\Provider\MonologServiceProvider;
 use Silex\Provider\TwigServiceProvider;
 use Silex\Provider\UrlGeneratorServiceProvider;
 use Silex\Provider\ValidatorServiceProvider;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler;
+use XPDF\XPDFServiceProvider;
 
 class Application extends SilexApplication
 {
+    protected static $availableLanguages = array(
+        'ar_SA' => 'العربية'
+        , 'de_DE' => 'Deutsch'
+        , 'en_GB' => 'English'
+        , 'es_ES' => 'Español'
+        , 'fr_FR' => 'Français'
+    );
+    private $environment;
 
-    public function __construct()
+    public function getEnvironment()
+    {
+        return $this->environment;
+    }
+
+    public function __construct($environment = 'prod')
     {
         parent::__construct();
 
+        $this->environment = $environment;
+
+        ini_set('output_buffering', '4096');
+
+        if ((int) ini_get('memory_limit') < 2048) {
+            ini_set('memory_limit', '2048M');
+        }
+
+        ini_set('error_reporting', '6143');
+        ini_set('default_charset', 'UTF-8');
+        ini_set('session.use_cookies', '1');
+        ini_set('session.use_only_cookies', '1');
+        ini_set('session.auto_start', '0');
+        ini_set('session.hash_function', '1');
+        ini_set('session.hash_bits_per_character', '6');
+        ini_set('session.cache_limiter', '');
+        ini_set('allow_url_fopen', 'on');
+
+
+
         $this['charset'] = 'UTF-8';
 
+        $this->register(new ConfigurationServiceProvider());
+
+
         $this->register(new PhraseanetServiceProvider());
 
-        $this['debug'] = $this['phraseanet.core']->getEnv() !== 'prod';
 
+        $this['debug'] = $this->share(function(Application $app) {
+                return $app->getEnvironment() !== 'prod';
+            });
+
+
+        $this->register(new BorderManagerServiceProvider());
+        $this->register(new CacheServiceProvider());
+        $this->register(new ORMServiceProvider());
         $this->register(new ValidatorServiceProvider());
         $this->register(new UrlGeneratorServiceProvider());
         $this->register(new BrowserServiceProvider());
-        $this->register(new TaskManagerServiceProvider());
+        $this->register(new ImagineServiceProvider());
+        $this->register(new FFMpegServiceProvider());
+        $this->register(new PHPExiftoolServiceProvider());
+        $this->register(new MediaVorusServiceProvider());
+        $this->register(new XPDFServiceProvider());
+        $this->register(new MonologServiceProvider());
+        $this->register(new MediaAlchemystServiceProvider());
+        $this->register(new \Silex\Provider\SessionServiceProvider());
+        $this->register(new Core\Provider\GeonamesServiceProvider);
 
+
+        $this['session.test'] = $this->share(function(Application $app) {
+                return $app->getEnvironment() == 'test';
+            });
+
+        $this['locale'] = $this->share(function(Application $app) {
+                if ($app['request']->cookies->has('locale')) {
+                    return $app['request']->cookies->get('locale');
+                }
+            });
+
+//        $this['session.storage.handler'] = $this->share(function(Application $app) {
+//                return new PdoSessionHandler($app['EM']->getConnection()->getWrappedConnection());
+//            });
+
+        $this['imagine.factory'] = 'Gmagick';
+
+        $this['monolog.handler'] = $this->share(function () {
+                return new \Monolog\Handler\NullHandler();
+            });
+
+
+        $this['phraseanet.registry'] = $this->share(function(Application $app) {
+                return new \registry($app);
+            });
+
+        $app = $this;
+        $this['phraseanet.logger'] = $this->protect(function($databox) use ($app) {
+                try {
+                    return \Session_Logger::load($app, $databox);
+                } catch (\Exception_Session_LoggerNotFound $e) {
+                    return \Session_Logger::create($app, $databox, $app['browser']);
+                }
+            });
+
+        $this['phraseanet.user'] = function(Application $app) {
+                if ($app->isAuthenticated()) {
+                    return \User_Adapter::getInstance($app['session']->get('usr_id'), $app);
+                }
+
+                return null;
+            };
+
+        $this['date-formatter'] = $this->share(function(Application $app) {
+                return new \phraseadate($app);
+            });
+
+
+        /**
+         * Rajouter
+          if ($core->getRegistry()->get('GV_pdfmaxpages')) {
+          $pdftotext->setPageQuantity($core->getRegistry()->get('GV_pdfmaxpages'));
+          }
+         */
+        /**
+         * Rajouter log rooms
+         */
         $this->register(new TwigServiceProvider(), array(
             'twig.options' => array(
-                'cache' => realpath(__DIR__ . '/../../../../../../tmp/cache_twig/'),
+                'cache'           => realpath(__DIR__ . '/../../../../../../tmp/cache_twig/'),
             )
         ));
+        $this['firewall'] = $this->share(function() use ($app) {
+                return new Firewall($app);
+            });
+
 
         $this->setupTwig();
 
-        $this->before(function(Request $request) {
-            $request->setRequestFormat(
-                $request->getFormat(
-                    array_shift(
-                        $request->getAcceptableContentTypes()
-                    )
-                )
-            );
-        });
 
         $this->register(new FilesystemServiceProvider());
 
+        $request = Request::createFromGlobals();
+
+        if (!!stripos($request->server->get('HTTP_USER_AGENT'), 'flash') && $request->getRequestUri() === '/prod/upload/') {
+            if (null !== $sessionId = $request->get('php_session_id')) {
+                session_id($sessionId);
+            }
+        }
+
+        $this['events-manager'] = $this->share(function(Application $app) {
+                $events = new \eventsmanager_broker($app);
+                $events->start();
+
+                return $events;
+            });
+
+
+//        $request = Request::createFromGlobals();
+//        $gatekeeper = \gatekeeper::getInstance($this);
+//        $gatekeeper->check_directory($request);
+
+        \phrasea::start($this['phraseanet.configuration']);
+
+
+
+        $request = Request::createFromGlobals();
+
+
+
+
+        if ($this['phraseanet.registry']->is_set('GV_timezone'))
+            date_default_timezone_set($this['phraseanet.registry']->get('GV_timezone'));
+        else
+            date_default_timezone_set('Europe/Berlin');
+
+//        if ($this['phraseanet.configuration']->isInstalled()) {
+//            if ($this['phraseanet.configuration']->isDisplayingErrors()) {
+        ini_set('display_errors', 'on');
+        error_reporting(E_ALL);
+//            } else {
+//                ini_set('display_errors', 'off');
+//            }
+//        }
+
+
+
+
+
+
+
+
+
+        $php_log = $this['phraseanet.registry']->get('GV_RootPath') . 'logs/php_error.log';
+
+        ini_set('error_log', $php_log);
+
+        if ($this['phraseanet.registry']->get('GV_log_errors')) {
+            ini_set('log_errors', 'on');
+        } else {
+            ini_set('log_errors', 'off');
+        }
+
+        /**
+         * TODO NEUTRON add content nego
+         */
+        $request->setDefaultLocale(
+            $this['phraseanet.registry']->get('GV_default_lng', 'en_GB')
+        );
+
+
+        $cookies = $request->cookies;
+
+        if (isset(static::$availableLanguages[$cookies->get('locale')])) {
+            $request->setLocale($cookies->get('locale'));
+        }
+
+        $app['locale'] = $request->getLocale();
+        $data = explode('_', $app['locale']);
+        $app['locale.I18n'] = $data[0];
+        $app['locale.l10n'] = $data[1];
+
+        mb_internal_encoding("UTF-8");
+        \phrasea::use_i18n($request->getLocale());
+
+
+        !defined('JETON_MAKE_SUBDEF') ? define('JETON_MAKE_SUBDEF', 0x01) : '';
+        !defined('JETON_WRITE_META_DOC') ? define('JETON_WRITE_META_DOC', 0x02) : '';
+        !defined('JETON_WRITE_META_SUBDEF') ? define('JETON_WRITE_META_SUBDEF', 0x04) : '';
+        !defined('JETON_WRITE_META') ? define('JETON_WRITE_META', 0x06) : '';
+
+
+        $this->before(function(Request $request) {
+                $request->setRequestFormat(
+                    $request->getFormat(
+                        array_shift(
+                            $request->getAcceptableContentTypes()
+                        )
+                    )
+                );
+            });
+
 //        $this->register(new \Silex\Provider\HttpCacheServiceProvider());
 //        $this->register(new \Silex\Provider\MonologServiceProvider());
 //        $this->register(new \Silex\Provider\SecurityServiceProvider());
-//        $this->register(new \Silex\Provider\SessionServiceProvider());
 //        $this->register(new \Silex\Provider\SwiftmailerServiceProvider());
 //        $this->register(new \Silex\Provider\UrlGeneratorServiceProvider());
     }
@@ -78,15 +292,9 @@ class Application extends SilexApplication
                         ));
                     }
 
-                    $twig->addGlobal('session', $app['phraseanet.appbox']->get_session());
-                    $twig->addGlobal('version_number', $app['phraseanet.core']->getVersion()->getNumber());
-                    $twig->addGlobal('version_name', $app['phraseanet.core']->getVersion()->getName());
-                    $twig->addGlobal('core', $app['phraseanet.core']);
-                    $twig->addGlobal('browser', $app['browser']);
-                    $twig->addGlobal('request', $app['request']);
-                    $twig->addGlobal('events', \eventsmanager_broker::getInstance($app['phraseanet.appbox'], $app['phraseanet.core']));
+                    $twig->addGlobal('app', $app);
                     $twig->addGlobal('display_chrome_frame', $app['phraseanet.appbox']->get_registry()->is_set('GV_display_gcf') ? $app['phraseanet.appbox']->get_registry()->get('GV_display_gcf') : true);
-                    $twig->addGlobal('user', $app['phraseanet.core']->getAuthenticatedUser());
+                    $twig->addGlobal('user', $app['phraseanet.user']);
                     $twig->addGlobal('current_date', new \DateTime());
                     $twig->addGlobal('home_title', $app['phraseanet.appbox']->get_registry()->get('GV_homeTitle'));
                     $twig->addGlobal('meta_description', $app['phraseanet.appbox']->get_registry()->get('GV_metaDescription'));
@@ -116,40 +324,98 @@ class Application extends SilexApplication
                     $twig->addFilter('implode', new \Twig_Filter_Function('implode'));
                     $twig->addFilter('get_class', new \Twig_Filter_Function('get_class'));
                     $twig->addFilter('stripdoublequotes', new \Twig_Filter_Function('stripdoublequotes'));
-                    $twig->addFilter('geoname_display', new \Twig_Filter_Function('geonames::name_from_id'));
                     $twig->addFilter('get_collection_logo', new \Twig_Filter_Function('collection::getLogo'));
                     $twig->addFilter('floor', new \Twig_Filter_Function('floor'));
                     $twig->addFilter('bas_names', new \Twig_Filter_Function('phrasea::bas_names'));
                     $twig->addFilter('sbas_names', new \Twig_Filter_Function('phrasea::sbas_names'));
                     $twig->addFilter('urlencode', new \Twig_Filter_Function('urlencode'));
-                    $twig->addFilter('sbasFromBas', new \Twig_Filter_Function('phrasea::sbasFromBas'));
                     $twig->addFilter('key_exists', new \Twig_Filter_Function('array_key_exists'));
                     $twig->addFilter('array_keys', new \Twig_Filter_Function('array_keys'));
                     $twig->addFilter('round', new \Twig_Filter_Function('round'));
-                    $twig->addFilter('formatDate', new \Twig_Filter_Function('phraseadate::getDate'));
-                    $twig->addFilter('prettyDate', new \Twig_Filter_Function('phraseadate::getPrettyString'));
                     $twig->addFilter('formatOctets', new \Twig_Filter_Function('p4string::format_octets'));
-                    $twig->addFilter('geoname_name_from_id', new \Twig_Filter_Function('geonames::name_from_id'));
                     $twig->addFilter('base_from_coll', new \Twig_Filter_Function('phrasea::baseFromColl'));
                     $twig->addFilter('AppName', new \Twig_Filter_Function('Alchemy\Phrasea\Controller\Admin\ConnectedUsers::appName'));
 
                     return $twig;
                 }));
     }
+//    public function run(Request $request = null)
+//    {
+//        $app = $this;
+//
+//        $this->error(function($e) use ($app) {
+//
+//                if ($app['debug']) {
+//                    return new Response($e->getMessage(), 500);
+//                } else {
+//                    return new Response(_('An error occured'), 500);
+//                }
+//            });
+//        parent::run($request);
+//    }
 
-    public function run(Request $request = null)
+    /**
+     * Tell if current seession is authenticated
+     *
+     * @return boolean
+     */
+    public function isAuthenticated()
     {
-        $app = $this;
+        return $this['session']->has('usr_id');
+    }
 
-        $this->error(function($e) use ($app) {
+    /**
+     * Return available language for phraseanet
+     *
+     * @return Array
+     */
+    public static function getAvailableLanguages()
+    {
+        return static::$availableLanguages;
+    }
 
-            if ($app['debug']) {
-                return new Response($e->getMessage(), 500);
-            } else {
-                return new Response(_('An error occured'), 500);
+    public function openAccount(\Session_Authentication_Interface $auth, $ses_id = null)
+    {
+        $user = $auth->get_user();
+
+        $this['session']->clear();
+        $this['session']->set('usr_id', $user->get_id());
+
+        if ($ses_id) {
+            phrasea_close_session($ses_id);
+        }
+
+        if (!phrasea_open_session($this['session']->get('phrasea_session_id'), $user->get_id())) {
+            if (!$ses_id = phrasea_create_session($user->get_id())) {
+                throw new \Exception_InternalServerError('Unable to create phrasea session');
             }
-        });
-        parent::run($request);
+            $this['session']->set('phrasea_session_id', $ses_id);
+        }
+
+        $session = new \Entities\Session();
+        $session->setBrowserName($this['browser']->getBrowser())
+            ->setBrowserVersion($this['browser']->getVersion())
+            ->setPlatform($this['browser']->getPlatform())
+            ->setUserAgent($this['browser']->getUserAgent())
+            ->setUsrId($user->get_id());
+
+        $this['EM']->persist($session);
+        $this['EM']->flush();
+
+        $this['session']->set('session_id', $session->getId());
+
+        foreach ($user->ACL()->get_granted_sbas() as $databox) {
+            \cache_databox::insertClient($this, $databox);
+        }
+    }
+
+    public function closeAccount()
+    {
+        if ($this['session']->has('phrasea_session_id')) {
+            phrasea_close_session($this['session']->get('phrasea_session_id'));
+        }
+
+        $this['session']->clear();
     }
 }
 

lib/Alchemy/Phrasea/CLI.php

@@ -33,7 +33,7 @@ class CLI extends Application
      *
      * @param bool $interactive runs in an interactive shell if true.
      */
-    public function run($interactive = false)
+    public function runCLI($interactive = false)
     {
         $app = $this['console'];
         if ($interactive) {
@@ -43,6 +43,11 @@ class CLI extends Application
         $app->run();
     }
 
+    public function run(\Symfony\Component\HttpFoundation\Request $request = null)
+    {
+        $this->runCLI();
+    }
+
     /**
      * Adds a command object.
      *

lib/Alchemy/Phrasea/PhraseanetServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace Alchemy\Phrasea;
 
+use Alchemy\Phrasea\Core\Version;
 use Silex\Application as SilexApplication;
 use Silex\ServiceProviderInterface;
 
@@ -10,12 +11,12 @@ class PhraseanetServiceProvider implements ServiceProviderInterface
 
     public function register(SilexApplication $app)
     {
-        $app['phraseanet.core'] = $app->share(function($app) {
-            return \bootstrap::getCore();
+        $app['phraseanet.appbox'] = $app->share(function($app) {
+            return new \appbox($app);
         });
 
-        $app['phraseanet.appbox'] = $app->share(function($app) {
-            return new \appbox($app['phraseanet.core']);
+        $app['phraseanet.version'] = $app->share(function($app) {
+            return new Version();
         });
     }