aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/ws_functions/pwg.categories.php1
-rw-r--r--language/en_UK/help/photos_add_ftp.html23
2 files changed, 18 insertions, 6 deletions
diff --git a/include/ws_functions/pwg.categories.php b/include/ws_functions/pwg.categories.php
index 502c8f18d..79b27d75e 100644
--- a/include/ws_functions/pwg.categories.php
+++ b/include/ws_functions/pwg.categories.php
@@ -614,6 +614,7 @@ SELECT *
if ($params['status'] != $category['status'])
{
+ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
set_cat_status(array($params['category_id']), $params['status']);
}
}
diff --git a/language/en_UK/help/photos_add_ftp.html b/language/en_UK/help/photos_add_ftp.html
index 3d39f1e63..ce90aebc2 100644
--- a/language/en_UK/help/photos_add_ftp.html
+++ b/language/en_UK/help/photos_add_ftp.html
@@ -39,15 +39,24 @@ galleries
| |-- dancers002.jpg
| +-- dancers003.jpg
+-- honeymoon
- |-- hotel.png
- |-- video-from-plane.avi
- +-- pwg_representative
- +-- video-from-plane.jpg
+| |-- hotel.png
+| |-- video-from-plane.avi
+| +-- pwg_representative
+| +-- video-from-plane.jpg
++-- photoshoot
+ |-- img0001.jpg
+ |-- img0002.jpg
+ +-- pwg_format
+ |-- img0001.cr2
+ |-- img0001.cmyk.jpg
+ |-- img0001.zip
+ |-- img0002.cr2
+ +-- img0002.cmyk.jpg
</pre>
</li>
- <li>Except for "pwg_representative" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.</li>
+ <li>Except for "pwg_representative" and "pwg_format" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.</li>
<li>Basically, an element is represented by a file. A file can be a
Piwigo element if its extension is among <code>file_ext</code>
@@ -56,10 +65,12 @@ galleries
be a picture if its extension is among <code>picture_ext</code>
configuration parameter possibilities.</li>
- <li>No photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename
+ <li>Non photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename
extension. Optionally, you can associate a thumbnail and a representative
file (see video.avi in the example above).</li>
+ <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
<li><em>Warning</em>: the name of directories and files must contain only letters, figures, "-", "_" or ".". No blank space, nor accentuated characters.</li>
<li>Once photos are correctly placed in the