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

Remove datapath web / baseurl

Browse Source
This commit is contained in:
Romain Neutron
2012-05-24 11:22:45 +02:00
parent 650f1121be
commit a9620ffaa5
9 changed files with 18 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hudson/fixtures.sql
View File

File diff suppressed because one or more lines are too long

2
lib/Alchemy/Phrasea/Controller/Setup/Installer.php
View File

@@ -220,8 +220,6 @@ class Installer implements ControllerProviderInterface
$appbox->set_registry($registry); $appbox->set_registry($registry);
$registry->set('GV_base_datapath_noweb', \p4string::addEndSlash($request->get('datapath_noweb')), \registry::TYPE_STRING); $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_ServerName', $servername, \registry::TYPE_STRING);
$registry->set('GV_cli', $request->get('binary_php'), \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); $registry->set('GV_imagick', $request->get('binary_convert'), \registry::TYPE_STRING);

2
lib/classes/API/V1/adapter.class.php
View File

@@ -421,9 +421,7 @@ class API_V1_adapter extends API_V1_Abstract
'allowedFileExtension' => $registry->get('GV_appletAllowedFileEx'), 'allowedFileExtension' => $registry->get('GV_appletAllowedFileEx'),
), ),
'filesystem' => array( 'filesystem' => array(
'web' => $registry->get('GV_base_datapath_web'),
'noWeb' => $registry->get('GV_base_datapath_noweb'), 'noWeb' => $registry->get('GV_base_datapath_noweb'),
'thumbnail' => $registry->get('GV_base_dataurl'),
), ),
'searchEngine' => array( 'searchEngine' => array(
'configuration' => array( 'configuration' => array(

8
lib/classes/databox.class.php
View File

@@ -468,7 +468,7 @@ class databox extends base
$databox = self::get_instance($sbas_id); $databox = self::get_instance($sbas_id);
$databox->insert_datas(); $databox->insert_datas();
$databox->setNewStructure( $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; return $databox;
@@ -845,7 +845,7 @@ class databox extends base
return $this; 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())) { if ( ! file_exists($data_template->getPathname())) {
throw new \InvalidArgumentException(sprintf('File %s does not exists')); 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 = file_get_contents($data_template->getPathname());
$contents = str_replace( $contents = str_replace(
array("{{basename}}", "{{datapathweb}}", "{{datapathnoweb}}") array("{{basename}}", "{{datapathnoweb}}")
, array($this->dbname, $path_web, $path_doc) , array($this->dbname, $path_doc)
, $contents , $contents
); );

4
lib/classes/setup.class.php
View File

@@ -441,14 +441,10 @@ class setup
$root . 'tmp/download', $root . 'tmp/download',
$root . 'tmp/batches'); $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')) { if ($registry->is_set('GV_base_datapath_noweb')) {
$pathes[] = $registry->get('GV_base_datapath_noweb'); $pathes[] = $registry->get('GV_base_datapath_noweb');
} }
$constraints = array(); $constraints = array();
foreach ($pathes as $p) { foreach ($pathes as $p) {

18
lib/conf.d/_GV_template.inc
View File

@@ -287,29 +287,13 @@ $GV = array(
'default' => 'jpg,jpeg,bmp,tif,gif,png,pdf,doc,odt,mpg,mpeg,mov,avi,xls,flv,mp3,mp2', 'default' => 'jpg,jpeg,bmp,tif,gif,png,pdf,doc,odt,mpg,mpeg,mov,avi,xls,flv,mp3,mp2',
'required' => true '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( array(
'type' => 'string', 'type' => 'string',
'name' => 'GV_base_datapath_noweb', 'name' => 'GV_base_datapath_noweb',
'end_slash' => true, 'end_slash' => true,
'comment' => _('reglages:: dossier de stockage des fichiers proteges de l\'acces direct'), 'comment' => _('Default path for datas'),
'default' => '', 'default' => '',
'required' => true '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
) )
) )
) )

12
lib/conf.d/data_templates/en-simple.xml
View File

@@ -17,7 +17,7 @@
<label lang="en">Preview</label> <label lang="en">Preview</label>
</subdef> </subdef>
<subdef class="thumbnail" name="thumbnail" downloadable="true"> <subdef class="thumbnail" name="thumbnail" downloadable="true">
<path>{{datapathweb}}{{basename}}/subdefs</path> <path>{{datapathnoweb}}{{basename}}/subdefs</path>
<size>200</size> <size>200</size>
<method>resample</method> <method>resample</method>
<dpi>72</dpi> <dpi>72</dpi>
@@ -45,7 +45,7 @@
<label lang="en">Preview</label> <label lang="en">Preview</label>
</subdef> </subdef>
<subdef class="thumbnail" name="thumbnailgif" downloadable="true"> <subdef class="thumbnail" name="thumbnailgif" downloadable="true">
<path>{{datapathweb}}{{basename}}/subdefs</path> <path>{{datapathnoweb}}{{basename}}/subdefs</path>
<size>200</size> <size>200</size>
<mediatype>gif</mediatype> <mediatype>gif</mediatype>
<delay>500</delay> <delay>500</delay>
@@ -54,7 +54,7 @@
<label lang="en">GIF Animation</label> <label lang="en">GIF Animation</label>
</subdef> </subdef>
<subdef class="thumbnail" name="thumbnail" downloadable="true"> <subdef class="thumbnail" name="thumbnail" downloadable="true">
<path>{{datapathweb}}{{basename}}/subdefs</path> <path>{{datapathnoweb}}{{basename}}/subdefs</path>
<size>200</size> <size>200</size>
<mediatype>image</mediatype> <mediatype>image</mediatype>
<writeDatas>no</writeDatas> <writeDatas>no</writeDatas>
@@ -72,7 +72,7 @@
<label lang="en">Preview</label> <label lang="en">Preview</label>
</subdef> </subdef>
<subdef class="thumbnail" name="thumbnail" downloadable="true"> <subdef class="thumbnail" name="thumbnail" downloadable="true">
<path>{{datapathweb}}{{basename}}/subdefs</path> <path>{{datapathnoweb}}{{basename}}/subdefs</path>
<mediatype>image</mediatype> <mediatype>image</mediatype>
<writeDatas>no</writeDatas> <writeDatas>no</writeDatas>
<label lang="fr">Imagette</label> <label lang="fr">Imagette</label>
@@ -88,7 +88,7 @@
<label lang="en">Preview</label> <label lang="en">Preview</label>
</subdef> </subdef>
<subdef class="thumbnail" name="thumbnail" downloadable="false"> <subdef class="thumbnail" name="thumbnail" downloadable="false">
<path>{{datapathweb}}{{basename}}/subdefs</path> <path>{{datapathnoweb}}{{basename}}/subdefs</path>
<mediatype>image</mediatype> <mediatype>image</mediatype>
<method>resample</method> <method>resample</method>
<dpi>72</dpi> <dpi>72</dpi>
@@ -110,7 +110,7 @@
<label lang="en">Preview</label> <label lang="en">Preview</label>
</subdef> </subdef>
<subdef class="thumbnail" name="thumbnail" downloadable="false"> <subdef class="thumbnail" name="thumbnail" downloadable="false">
<path>{{datapathweb}}{{basename}}/subdefs</path> <path>{{datapathnoweb}}{{basename}}/subdefs</path>
<mediatype>image</mediatype> <mediatype>image</mediatype>
<writeDatas>no</writeDatas> <writeDatas>no</writeDatas>
<method>resample</method> <method>resample</method>

12
lib/conf.d/data_templates/fr-simple.xml
View File

@@ -16,7 +16,7 @@
<label lang="en">Preview</label> <label lang="en">Preview</label>
</subdef> </subdef>
<subdef class="thumbnail" name="thumbnail" downloadable="true"> <subdef class="thumbnail" name="thumbnail" downloadable="true">
<path>{{datapathweb}}{{basename}}/subdefs</path> <path>{{datapathnoweb}}{{basename}}/subdefs</path>
<size>200</size> <size>200</size>
<method>resample</method> <method>resample</method>
<dpi>72</dpi> <dpi>72</dpi>
@@ -43,7 +43,7 @@
<label lang="en">Preview</label> <label lang="en">Preview</label>
</subdef> </subdef>
<subdef class="thumbnail" name="thumbnailgif" downloadable="true"> <subdef class="thumbnail" name="thumbnailgif" downloadable="true">
<path>{{datapathweb}}{{basename}}/subdefs</path> <path>{{datapathnoweb}}{{basename}}/subdefs</path>
<size>200</size> <size>200</size>
<mediatype>gif</mediatype> <mediatype>gif</mediatype>
<delay>500</delay> <delay>500</delay>
@@ -52,7 +52,7 @@
<label lang="en">GIF Animation</label> <label lang="en">GIF Animation</label>
</subdef> </subdef>
<subdef class="thumbnail" name="thumbnail" downloadable="true"> <subdef class="thumbnail" name="thumbnail" downloadable="true">
<path>{{datapathweb}}{{basename}}/subdefs</path> <path>{{datapathnoweb}}{{basename}}/subdefs</path>
<size>200</size> <size>200</size>
<mediatype>image</mediatype> <mediatype>image</mediatype>
<writeDatas>no</writeDatas> <writeDatas>no</writeDatas>
@@ -69,7 +69,7 @@
<label lang="en">Preview</label> <label lang="en">Preview</label>
</subdef> </subdef>
<subdef class="thumbnail" name="thumbnail" downloadable="true"> <subdef class="thumbnail" name="thumbnail" downloadable="true">
<path>{{datapathweb}}{{basename}}/subdefs</path> <path>{{datapathnoweb}}{{basename}}/subdefs</path>
<mediatype>image</mediatype> <mediatype>image</mediatype>
<size>200</size> <size>200</size>
<writeDatas>no</writeDatas> <writeDatas>no</writeDatas>
@@ -86,7 +86,7 @@
<label lang="en">Preview</label> <label lang="en">Preview</label>
</subdef> </subdef>
<subdef class="thumbnail" name="thumbnail" downloadable="false"> <subdef class="thumbnail" name="thumbnail" downloadable="false">
<path>{{datapathweb}}{{basename}}/subdefs</path> <path>{{datapathnoweb}}{{basename}}/subdefs</path>
<mediatype>image</mediatype> <mediatype>image</mediatype>
<method>resample</method> <method>resample</method>
<dpi>72</dpi> <dpi>72</dpi>
@@ -108,7 +108,7 @@
<label lang="en">Preview</label> <label lang="en">Preview</label>
</subdef> </subdef>
<subdef class="thumbnail" name="thumbnail" downloadable="false"> <subdef class="thumbnail" name="thumbnail" downloadable="false">
<path>{{datapathweb}}{{basename}}/subdefs</path> <path>{{datapathnoweb}}{{basename}}/subdefs</path>
<mediatype>image</mediatype> <mediatype>image</mediatype>
<writeDatas>no</writeDatas> <writeDatas>no</writeDatas>
<method>resample</method> <method>resample</method>

33
templates/web/setup/step2.html.twig
View File

@@ -662,39 +662,6 @@
<td><label>{% trans 'Repertoire de stockage des fichiers' %}</label></td> <td><label>{% trans 'Repertoire de stockage des fichiers' %}</label></td>
<td><input class="path_to_test test_writeable required" type="text" name="datapath_noweb" value="" /></td> <td><input class="path_to_test test_writeable required" type="text" name="datapath_noweb" value="" /></td>
</tr> </tr>
<tr>
<td><label>{% trans 'Repertoire de stockage des imagettes' %}</label></td>
<td><input class="path_to_test test_writeable required" type="text" name="datapath_web" value="" /></td>
</tr>
<tr>
<td><label>{% trans 'Point de montage des imagettes (voir aide ci dessous)' %}</label></td>
<td><input class="url_to_test same_domain required" type="text" name="mount_point_web" value="web/" /></td>
</tr>
<tr>
<td colspan="2">
<p>
{% trans 'Il faut declarer dans votre serveur web un montage vers le dossier de stockage des imagettes' %}
</p>
<h3>{% trans 'Exemple Apache' %}</h3>
<code>
&lt;VirtualHost *:80&gt;<br/>
&nbsp;&nbsp;...<br/>
&nbsp;&nbsp;Alias /mountpoint&nbsp;&nbsp;/path/to/thumbnail/folder<br/>
&nbsp;&nbsp;...<br/>
&lt;/VirtualHost&gt;
</code>
<h3>{% trans 'Exemple Nginx' %}</h3>
<code>
server {<br/>
&nbsp;&nbsp;...<br/>
&nbsp;&nbsp;location /mountpoint {<br/>
&nbsp;&nbsp;&nbsp;&nbsp;alias /path/to/thumbnail/folder;<br/>
&nbsp;&nbsp;}<br/>
&nbsp;&nbsp;...<br/>
}
</code>
</td>
</tr>
</table> </table>
</td> </td>
</tr> </tr>