diff --git a/hudson/fixtures.sql b/hudson/fixtures.sql index 68676965fb..b561c28c34 100644 --- a/hudson/fixtures.sql +++ b/hudson/fixtures.sql @@ -1229,7 +1229,7 @@ CREATE TABLE `registry` ( LOCK TABLES `registry` WRITE; /*!40000 ALTER TABLE `registry` DISABLE KEYS */; -INSERT INTO `registry` VALUES (1,'GV_timezone','Europe/Paris','string'),(2,'GV_sit','c51b8b3501fb45447c359fda7d3784d4','string'),(3,'GV_default_lng','fr_FR','string'),(4,'GV_STATIC_URL','','string'),(5,'GV_message','May the force be with you','string'),(6,'GV_message_on','0','boolean'),(7,'GV_log_errors','0','boolean'),(8,'GV_google_api','0','boolean'),(9,'GV_i18n_service','http://localization.webservice.alchemyasp.com/','string'),(10,'GV_bitly_user','','string'),(11,'GV_bitly_key','','string'),(12,'GV_captchas','0','boolean'),(13,'GV_captcha_public_key','','string'),(14,'GV_captcha_private_key','','string'),(15,'GV_youtube_api','0','boolean'),(16,'GV_youtube_client_id','','string'),(17,'GV_youtube_client_secret','','string'),(18,'GV_youtube_dev_key','','string'),(19,'GV_flickr_api','0','boolean'),(20,'GV_flickr_client_id','','string'),(21,'GV_flickr_client_secret','','string'),(22,'GV_dailymotion_api','0','boolean'),(23,'GV_dailymotion_client_id','','string'),(24,'GV_dailymotion_client_secret','','string'),(25,'GV_client_navigator','0','boolean'),(26,'GV_events','a:1:{i:0;s:24:\"eventsmanager_event_test\";}','array'),(27,'GV_notifications','a:12:{i:0;s:33:\"eventsmanager_notify_autoregister\";i:1;s:37:\"eventsmanager_notify_bridgeuploadfail\";i:2;s:37:\"eventsmanager_notify_downloadmailfail\";i:3;s:25:\"eventsmanager_notify_feed\";i:4;s:26:\"eventsmanager_notify_order\";i:5;s:33:\"eventsmanager_notify_orderdeliver\";i:6;s:38:\"eventsmanager_notify_ordernotdelivered\";i:7;s:25:\"eventsmanager_notify_push\";i:8;s:29:\"eventsmanager_notify_register\";i:9;s:29:\"eventsmanager_notify_validate\";i:10;s:35:\"eventsmanager_notify_validationdone\";i:11;s:39:\"eventsmanager_notify_validationreminder\";}','array'),(28,'GV_appletAllowedFileExt','jpg,jpeg,bmp,tif,gif,png,pdf,doc,odt,mpg,mpeg,mov,avi,xls,flv,mp3,mp2','string'),(32,'GV_sphinx','0','boolean'),(33,'GV_sphinx_host','127.0.0.1','string'),(34,'GV_sphinx_port','9306','integer'),(35,'GV_sphinx_rt_host','127.0.0.1','string'),(36,'GV_sphinx_rt_port','9308','integer'),(37,'GV_phrasea_sort','','string'),(38,'GV_modxsendfile','0','boolean'),(39,'GV_X_Accel_Redirect','','string'),(40,'GV_X_Accel_Redirect_mount_point','noweb','string'),(41,'GV_h264_streaming','0','boolean'),(42,'GV_mod_auth_token_directory','','string'),(43,'GV_mod_auth_token_directory_path','','string'),(44,'GV_mod_auth_token_passphrase','','string'),(46,'GV_PHP_INI','','string'),(58,'GV_pdfmaxpages','5','integer'),(59,'GV_filesOwner','','string'),(60,'GV_filesGroup','','string'),(61,'GV_adminMail','support@alchemy.fr','string'),(62,'GV_view_bas_and_coll','0','boolean'),(63,'GV_choose_export_title','0','boolean'),(64,'GV_default_export_title','support@alchemy.fr','string'),(65,'GV_social_tools','none','string'),(66,'GV_home_publi','COOLIRIS','string'),(67,'GV_min_letters_truncation','1','integer'),(68,'GV_defaultQuery','all','string'),(69,'GV_defaultQuery_type','0','string'),(70,'GV_anonymousReport','0','boolean'),(71,'GV_thesaurus','0','boolean'),(72,'GV_multiAndReport','0','boolean'),(73,'GV_seeOngChgDoc','0','boolean'),(74,'GV_seeNewThumb','0','boolean'),(75,'GV_defaulmailsenderaddr','phraseanet@example.com','string'),(76,'GV_smtp','0','boolean'),(77,'GV_smtp_auth','0','boolean'),(78,'GV_smtp_host','','string'),(79,'GV_smtp_port','','string'),(80,'GV_smtp_secure','0','boolean'),(81,'GV_smtp_user','','string'),(82,'GV_smtp_password','','string'),(83,'GV_activeFTP','0','boolean'),(84,'GV_ftp_for_user','0','boolean'),(85,'GV_download_max','120','integer'),(86,'GV_ong_search','1','integer'),(87,'GV_ong_advsearch','2','integer'),(88,'GV_ong_topics','0','integer'),(89,'GV_ong_actif','1','integer'),(90,'GV_client_render_topics','tree','string'),(91,'GV_rollover_reg_preview','0','boolean'),(92,'GV_rollover_chu','0','boolean'),(93,'GV_client_coll_ckbox','checkbox','string'),(94,'GV_viewSizeBaket','0','boolean'),(95,'GV_clientAutoShowProposals','0','boolean'),(96,'GV_needAuth2DL','0','boolean'),(97,'GV_autoselectDB','0','boolean'),(98,'GV_autoregister','0','boolean'),(99,'GV_validation_reminder','2','integer'),(100,'GV_val_expiration','10','integer'),(101,'GV_homeTitle','Phraseanet','string'),(102,'GV_metaKeywords','','string'),(103,'GV_metaDescription','','string'),(104,'GV_googleAnalytics','','string'),(105,'GV_allow_search_engine','0','boolean'),(106,'GV_display_gcf','0','boolean'),(107,'GV_base_datapath_noweb','/tmp/','string'),(108,'GV_base_datapath_web','/tmp/','string'),(109,'GV_base_dataurl','web/','string'),(110,'GV_ServerName','http://local.phrasea/','string'),(111,'GV_cli','/usr/local/bin/php','string'),(112,'GV_imagick','/usr/local/bin/gm','string'),(113,'GV_pathcomposite','/usr/local/bin/gm','string'),(114,'GV_exiftool','/home/vagrant/builds/alchemy-fr/Phraseanet/lib/vendor/exiftool/exiftool','string'),(115,'GV_swf_extract','','string'),(116,'GV_pdf2swf','','string'),(117,'GV_swf_render','','string'),(118,'GV_unoconv','','string'),(119,'GV_ffmpeg','','string'),(120,'GV_mp4box','','string'),(121,'GV_mplayer','/usr/bin/mplayer','string'),(122,'GV_pdftotext','','string'); +INSERT INTO `registry` VALUES (1,'GV_timezone','Europe/Paris','string'),(2,'GV_sit','c51b8b3501fb45447c359fda7d3784d4','string'),(3,'GV_default_lng','fr_FR','string'),(4,'GV_STATIC_URL','','string'),(5,'GV_message','May the force be with you','string'),(6,'GV_message_on','0','boolean'),(7,'GV_log_errors','0','boolean'),(8,'GV_google_api','0','boolean'),(9,'GV_i18n_service','http://localization.webservice.alchemyasp.com/','string'),(10,'GV_bitly_user','','string'),(11,'GV_bitly_key','','string'),(12,'GV_captchas','0','boolean'),(13,'GV_captcha_public_key','','string'),(14,'GV_captcha_private_key','','string'),(15,'GV_youtube_api','0','boolean'),(16,'GV_youtube_client_id','','string'),(17,'GV_youtube_client_secret','','string'),(18,'GV_youtube_dev_key','','string'),(19,'GV_flickr_api','0','boolean'),(20,'GV_flickr_client_id','','string'),(21,'GV_flickr_client_secret','','string'),(22,'GV_dailymotion_api','0','boolean'),(23,'GV_dailymotion_client_id','','string'),(24,'GV_dailymotion_client_secret','','string'),(25,'GV_client_navigator','0','boolean'),(26,'GV_events','a:1:{i:0;s:24:\"eventsmanager_event_test\";}','array'),(27,'GV_notifications','a:12:{i:0;s:33:\"eventsmanager_notify_autoregister\";i:1;s:37:\"eventsmanager_notify_bridgeuploadfail\";i:2;s:37:\"eventsmanager_notify_downloadmailfail\";i:3;s:25:\"eventsmanager_notify_feed\";i:4;s:26:\"eventsmanager_notify_order\";i:5;s:33:\"eventsmanager_notify_orderdeliver\";i:6;s:38:\"eventsmanager_notify_ordernotdelivered\";i:7;s:25:\"eventsmanager_notify_push\";i:8;s:29:\"eventsmanager_notify_register\";i:9;s:29:\"eventsmanager_notify_validate\";i:10;s:35:\"eventsmanager_notify_validationdone\";i:11;s:39:\"eventsmanager_notify_validationreminder\";}','array'),(28,'GV_appletAllowedFileExt','jpg,jpeg,bmp,tif,gif,png,pdf,doc,odt,mpg,mpeg,mov,avi,xls,flv,mp3,mp2','string'),(32,'GV_sphinx','0','boolean'),(33,'GV_sphinx_host','127.0.0.1','string'),(34,'GV_sphinx_port','9306','integer'),(35,'GV_sphinx_rt_host','127.0.0.1','string'),(36,'GV_sphinx_rt_port','9308','integer'),(37,'GV_phrasea_sort','','string'),(38,'GV_modxsendfile','0','boolean'),(39,'GV_X_Accel_Redirect','','string'),(40,'GV_X_Accel_Redirect_mount_point','noweb','string'),(41,'GV_h264_streaming','0','boolean'),(42,'GV_mod_auth_token_directory','','string'),(43,'GV_mod_auth_token_directory_path','','string'),(44,'GV_mod_auth_token_passphrase','','string'),(46,'GV_PHP_INI','','string'),(58,'GV_pdfmaxpages','5','integer'),(59,'GV_filesOwner','','string'),(60,'GV_filesGroup','','string'),(61,'GV_adminMail','support@alchemy.fr','string'),(62,'GV_view_bas_and_coll','0','boolean'),(63,'GV_choose_export_title','0','boolean'),(64,'GV_default_export_title','support@alchemy.fr','string'),(65,'GV_social_tools','none','string'),(66,'GV_home_publi','COOLIRIS','string'),(67,'GV_min_letters_truncation','1','integer'),(68,'GV_defaultQuery','all','string'),(69,'GV_defaultQuery_type','0','string'),(70,'GV_anonymousReport','0','boolean'),(71,'GV_thesaurus','0','boolean'),(72,'GV_multiAndReport','0','boolean'),(73,'GV_seeOngChgDoc','0','boolean'),(74,'GV_seeNewThumb','0','boolean'),(75,'GV_defaulmailsenderaddr','phraseanet@example.com','string'),(76,'GV_smtp','0','boolean'),(77,'GV_smtp_auth','0','boolean'),(78,'GV_smtp_host','','string'),(79,'GV_smtp_port','','string'),(80,'GV_smtp_secure','0','boolean'),(81,'GV_smtp_user','','string'),(82,'GV_smtp_password','','string'),(83,'GV_activeFTP','0','boolean'),(84,'GV_ftp_for_user','0','boolean'),(85,'GV_download_max','120','integer'),(86,'GV_ong_search','1','integer'),(87,'GV_ong_advsearch','2','integer'),(88,'GV_ong_topics','0','integer'),(89,'GV_ong_actif','1','integer'),(90,'GV_client_render_topics','tree','string'),(91,'GV_rollover_reg_preview','0','boolean'),(92,'GV_rollover_chu','0','boolean'),(93,'GV_client_coll_ckbox','checkbox','string'),(94,'GV_viewSizeBaket','0','boolean'),(95,'GV_clientAutoShowProposals','0','boolean'),(96,'GV_needAuth2DL','0','boolean'),(97,'GV_autoselectDB','0','boolean'),(98,'GV_autoregister','0','boolean'),(99,'GV_validation_reminder','2','integer'),(100,'GV_val_expiration','10','integer'),(101,'GV_homeTitle','Phraseanet','string'),(102,'GV_metaKeywords','','string'),(103,'GV_metaDescription','','string'),(104,'GV_googleAnalytics','','string'),(105,'GV_allow_search_engine','0','boolean'),(106,'GV_display_gcf','0','boolean'),(107,'GV_base_datapath_noweb','/tmp/','string'),(110,'GV_ServerName','http://local.phrasea/','string'),(111,'GV_cli','/usr/local/bin/php','string'),(112,'GV_imagick','/usr/local/bin/gm','string'),(113,'GV_pathcomposite','/usr/local/bin/gm','string'),(114,'GV_exiftool','/home/vagrant/builds/alchemy-fr/Phraseanet/lib/vendor/exiftool/exiftool','string'),(115,'GV_swf_extract','','string'),(116,'GV_pdf2swf','','string'),(117,'GV_swf_render','','string'),(118,'GV_unoconv','','string'),(119,'GV_ffmpeg','','string'),(120,'GV_mp4box','','string'),(121,'GV_mplayer','/usr/bin/mplayer','string'),(122,'GV_pdftotext','','string'); /*!40000 ALTER TABLE `registry` ENABLE KEYS */; UNLOCK TABLES; diff --git a/lib/Alchemy/Phrasea/Controller/Setup/Installer.php b/lib/Alchemy/Phrasea/Controller/Setup/Installer.php index 2222ee1067..9ce0111e34 100644 --- a/lib/Alchemy/Phrasea/Controller/Setup/Installer.php +++ b/lib/Alchemy/Phrasea/Controller/Setup/Installer.php @@ -220,8 +220,6 @@ class Installer implements ControllerProviderInterface $appbox->set_registry($registry); $registry->set('GV_base_datapath_noweb', \p4string::addEndSlash($request->get('datapath_noweb')), \registry::TYPE_STRING); - $registry->set('GV_base_datapath_web', \p4string::addEndSlash($request->get('datapath_web')), \registry::TYPE_STRING); - $registry->set('GV_base_dataurl', \p4string::addEndSlash($request->get('mount_point_web')), \registry::TYPE_STRING); $registry->set('GV_ServerName', $servername, \registry::TYPE_STRING); $registry->set('GV_cli', $request->get('binary_php'), \registry::TYPE_STRING); $registry->set('GV_imagick', $request->get('binary_convert'), \registry::TYPE_STRING); diff --git a/lib/classes/API/V1/adapter.class.php b/lib/classes/API/V1/adapter.class.php index d7b6de281d..c68779b326 100644 --- a/lib/classes/API/V1/adapter.class.php +++ b/lib/classes/API/V1/adapter.class.php @@ -421,9 +421,7 @@ class API_V1_adapter extends API_V1_Abstract 'allowedFileExtension' => $registry->get('GV_appletAllowedFileEx'), ), 'filesystem' => array( - 'web' => $registry->get('GV_base_datapath_web'), 'noWeb' => $registry->get('GV_base_datapath_noweb'), - 'thumbnail' => $registry->get('GV_base_dataurl'), ), 'searchEngine' => array( 'configuration' => array( diff --git a/lib/classes/databox.class.php b/lib/classes/databox.class.php index 7306469cc2..1945d6aeb5 100644 --- a/lib/classes/databox.class.php +++ b/lib/classes/databox.class.php @@ -468,7 +468,7 @@ class databox extends base $databox = self::get_instance($sbas_id); $databox->insert_datas(); $databox->setNewStructure( - $data_template, $registry->get('GV_base_datapath_web'), $registry->get('GV_base_datapath_noweb'), $registry->get('GV_base_dataurl') + $data_template, $registry->get('GV_base_datapath_noweb') ); return $databox; @@ -845,7 +845,7 @@ class databox extends base return $this; } - public function setNewStructure(\SplFileInfo $data_template, $path_web, $path_doc) + public function setNewStructure(\SplFileInfo $data_template, $path_doc) { if ( ! file_exists($data_template->getPathname())) { throw new \InvalidArgumentException(sprintf('File %s does not exists')); @@ -854,8 +854,8 @@ class databox extends base $contents = file_get_contents($data_template->getPathname()); $contents = str_replace( - array("{{basename}}", "{{datapathweb}}", "{{datapathnoweb}}") - , array($this->dbname, $path_web, $path_doc) + array("{{basename}}", "{{datapathnoweb}}") + , array($this->dbname, $path_doc) , $contents ); diff --git a/lib/classes/setup.class.php b/lib/classes/setup.class.php index 892f8f8e70..d8dc60a0d6 100644 --- a/lib/classes/setup.class.php +++ b/lib/classes/setup.class.php @@ -441,14 +441,10 @@ class setup $root . 'tmp/download', $root . 'tmp/batches'); - if ($registry->is_set('GV_base_datapath_web')) { - $pathes[] = $registry->get('GV_base_datapath_web'); - } if ($registry->is_set('GV_base_datapath_noweb')) { $pathes[] = $registry->get('GV_base_datapath_noweb'); } - $constraints = array(); foreach ($pathes as $p) { diff --git a/lib/conf.d/_GV_template.inc b/lib/conf.d/_GV_template.inc index cd23a91c22..a67ddaa6b3 100644 --- a/lib/conf.d/_GV_template.inc +++ b/lib/conf.d/_GV_template.inc @@ -287,29 +287,13 @@ $GV = array( 'default' => 'jpg,jpeg,bmp,tif,gif,png,pdf,doc,odt,mpg,mpeg,mov,avi,xls,flv,mp3,mp2', 'required' => true ), - array( - 'type' => 'string', - 'name' => 'GV_base_datapath_web', - 'end_slash' => true, - 'comment' => _('reglages:: dossier de stockage des vignettes publiees en acces direct'), - 'default' => '', - 'required' => true - ), array( 'type' => 'string', 'name' => 'GV_base_datapath_noweb', 'end_slash' => true, - 'comment' => _('reglages:: dossier de stockage des fichiers proteges de l\'acces direct'), + 'comment' => _('Default path for datas'), 'default' => '', 'required' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_base_dataurl', - 'comment' => _('reglages:: point de montage des vignettes publiees en acces direct'), - 'default' => 'web', - 'end_slash' => false, - 'required' => true ) ) ) diff --git a/lib/conf.d/data_templates/en-simple.xml b/lib/conf.d/data_templates/en-simple.xml index 14f52ee1eb..57b8965731 100644 --- a/lib/conf.d/data_templates/en-simple.xml +++ b/lib/conf.d/data_templates/en-simple.xml @@ -17,7 +17,7 @@ - {{datapathweb}}{{basename}}/subdefs + {{datapathnoweb}}{{basename}}/subdefs 200 resample 72 @@ -45,7 +45,7 @@ - {{datapathweb}}{{basename}}/subdefs + {{datapathnoweb}}{{basename}}/subdefs 200 gif 500 @@ -54,7 +54,7 @@ - {{datapathweb}}{{basename}}/subdefs + {{datapathnoweb}}{{basename}}/subdefs 200 image no @@ -72,7 +72,7 @@ - {{datapathweb}}{{basename}}/subdefs + {{datapathnoweb}}{{basename}}/subdefs image no @@ -88,7 +88,7 @@ - {{datapathweb}}{{basename}}/subdefs + {{datapathnoweb}}{{basename}}/subdefs image resample 72 @@ -110,7 +110,7 @@ - {{datapathweb}}{{basename}}/subdefs + {{datapathnoweb}}{{basename}}/subdefs image no resample diff --git a/lib/conf.d/data_templates/fr-simple.xml b/lib/conf.d/data_templates/fr-simple.xml index accb24429e..2f565753f8 100755 --- a/lib/conf.d/data_templates/fr-simple.xml +++ b/lib/conf.d/data_templates/fr-simple.xml @@ -16,7 +16,7 @@ - {{datapathweb}}{{basename}}/subdefs + {{datapathnoweb}}{{basename}}/subdefs 200 resample 72 @@ -43,7 +43,7 @@ - {{datapathweb}}{{basename}}/subdefs + {{datapathnoweb}}{{basename}}/subdefs 200 gif 500 @@ -52,7 +52,7 @@ - {{datapathweb}}{{basename}}/subdefs + {{datapathnoweb}}{{basename}}/subdefs 200 image no @@ -69,7 +69,7 @@ - {{datapathweb}}{{basename}}/subdefs + {{datapathnoweb}}{{basename}}/subdefs image 200 no @@ -86,7 +86,7 @@ - {{datapathweb}}{{basename}}/subdefs + {{datapathnoweb}}{{basename}}/subdefs image resample 72 @@ -108,7 +108,7 @@ - {{datapathweb}}{{basename}}/subdefs + {{datapathnoweb}}{{basename}}/subdefs image no resample diff --git a/templates/web/setup/step2.html.twig b/templates/web/setup/step2.html.twig index 8634998f94..10b6e9416e 100644 --- a/templates/web/setup/step2.html.twig +++ b/templates/web/setup/step2.html.twig @@ -662,39 +662,6 @@ - - - - - - - - - - -

- {% trans 'Il faut declarer dans votre serveur web un montage vers le dossier de stockage des imagettes' %} -

-

{% trans 'Exemple Apache' %}

- - <VirtualHost *:80>
-   ...
-   Alias /mountpoint  /path/to/thumbnail/folder
-   ...
- </VirtualHost> - -

{% trans 'Exemple Nginx' %}

- - server {
-   ...
-   location /mountpoint {
-     alias /path/to/thumbnail/folder;
-   }
-   ...
- } - - -