-Piwigo is photo gallery software for the web, built by an active community of users and developers.
+Manage your photo library. Piwigo is open source photo gallery software for the web. Designed for organisations, teams and individuals.
-Extensions make Piwigo easily customizable. Icing on the cake, Piwigo is free and open source.
+
-
-
- * [piwigo.org](http://piwigo.org)
- * [Demo](http://piwigo.org/demo)
- * [Downloads](http://piwigo.org/basics/downloads)
- * [User guide](http://piwigo.org/doc)
- * [Plugins and themes](http://piwigo.org/ext)
- * [Forum](http://piwigo.org/forum)
- * [News](http://piwigo.org/news)
+The [piwigo.org](https://piwigo.org) website introduces you to Piwigo. You'll find a demo, forums, wiki and news.
## Requirements
* A webserver (Apache or nginx recommended)
- * PHP 5.3 or greater
+ * PHP 5.3 or greater (7+ recommended)
* MySQL 5 or greater or MariaDB equivalent
* ImageMagick (recommended) or PHP GD
@@ -26,26 +17,26 @@ Extensions make Piwigo easily customizable. Icing on the cake, Piwigo is free an
### NetInstall
- * Download the [NetInstall script](http://piwigo.org/download/dlcounter.php?code=netinstall)
+ * Download the [NetInstall script](https://piwigo.org/download/dlcounter.php?code=netinstall)
* Transfer the script to your web space with any FTP client
* Open the script in you web browser (for example http://example.com/piwigo-netinstall.php) and follow the steps
-[More information](http://piwigo.org/basics/installation_netinstall)
+[More information](https://piwigo.org/guides/install/netinstall)
### Manual
- * Download the [latest stable version](http://piwigo.org/download/dlcounter.php?code=latest) and unzip it
+ * Download the [latest stable version](https://piwigo.org/download/dlcounter.php?code=latest) and unzip it
* Transfer everything to your web space with any FTP client
* Open your website (for example http://example.com/piwigo) and follow the steps
-[More information](http://piwigo.org/basics/installation_manual)
+[More information](https://piwigo.org/guides/install/manual)
-If you do not have your own server, consider the [piwigo.com](http://piwigo.com/) hosting solution.
+If you do not have your own server, consider the [piwigo.com](https://piwigo.com/) hosting solution.
## Contributing
-Piwigo is widely driven by its community; if you want to improve the code, fork this repo and submit your changes to the `master` branch.
+Piwigo is widely driven by its community; if you want to improve the code, fork this repo and submit your changes to the `master` branch. See our [Contribution guide](https://github.com/Piwigo/Piwigo/blob/master/docs/CONTRIBUTING.md).
## License
-Piwigo is released under the GPL v2 license.
+Piwigo is released under the GPL v2 license. See our [Copying details](https://github.com/Piwigo/Piwigo/blob/master/COPYING.txt).
diff --git a/action.php b/action.php
index 1d6b23c8c..3b071bc68 100644
--- a/action.php
+++ b/action.php
@@ -220,7 +220,9 @@ if (ini_get('safe_mode') == 0)
{
@set_time_limit(0);
}
-
+// Without clean and flush there may be some image download problems, or image can be corrupted after download
+ob_clean();
+flush();
@readfile($file);
-?>
\ No newline at end of file
+?>
diff --git a/admin.php b/admin.php
index 36d1c3b44..9051d3893 100644
--- a/admin.php
+++ b/admin.php
@@ -181,7 +181,9 @@ $template->assign(
'U_CONFIG_LANGUAGES' => $link_start.'languages',
'U_CONFIG_THEMES'=> $link_start.'themes',
'U_CATEGORIES'=> $link_start.'cat_list',
+ 'U_CAT_MOVE'=> $link_start.'cat_move',
'U_CAT_OPTIONS'=> $link_start.'cat_options',
+ 'U_CAT_SEARCH'=> $link_start.'cat_search',
'U_CAT_UPDATE'=> $link_start.'site_update&site=1',
'U_RATING'=> $link_start.'rating',
'U_RECENT_SET'=> $link_start.'batch_manager&filter=prefilter-last_import',
@@ -238,15 +240,14 @@ if ($nb_photos_in_caddie > 0)
}
// any photos with no md5sum ?
-$nb_no_md5sum = count(get_photos_no_md5sum());
-if ($nb_no_md5sum > 0)
+if (in_array($page['page'], array('site_update', 'batch_manager')))
{
- $template->assign(
- array(
- 'NB_NO_MD5SUM' => $nb_no_md5sum,
- 'U_NO_MD5SUM' => $link_start.'batch_manager&filter=prefilter-no_sync_md5sum',
- )
- );
+ $nb_no_md5sum = count(get_photos_no_md5sum());
+
+ if ($nb_no_md5sum > 0)
+ {
+ $page['no_md5sum_number'] = $nb_no_md5sum;
+ }
}
// any orphan photo?
@@ -262,19 +263,6 @@ if ($nb_orphans > 0)
);
}
-// +-----------------------------------------------------------------------+
-// | Plugin menu |
-// +-----------------------------------------------------------------------+
-
-$plugin_menu_links = trigger_change('get_admin_plugin_menu_links', array() );
-
-function UC_name_compare($a, $b)
-{
- return strcmp(strtolower($a['NAME']), strtolower($b['NAME']));
-}
-usort($plugin_menu_links, 'UC_name_compare');
-$template->assign('plugin_menu_items', $plugin_menu_links);
-
// +-----------------------------------------------------------------------+
// | Refresh permissions |
// +-----------------------------------------------------------------------+
diff --git a/admin/batch_manager.php b/admin/batch_manager.php
index 739bb7777..47ac1bf9c 100644
--- a/admin/batch_manager.php
+++ b/admin/batch_manager.php
@@ -125,6 +125,8 @@ if (isset($_POST['submitFilter']))
if (isset($_POST['filter_category_use']))
{
+ check_input_parameter('filter_category', $_POST, false, PATTERN_ID);
+
$_SESSION['bulk_manager_filter']['category'] = $_POST['filter_category'];
if (isset($_POST['filter_category_recursive']))
@@ -603,7 +605,7 @@ foreach ($filter_sets as $set)
{
$current_set = array_intersect($current_set, $set);
}
-$page['cat_elements_id'] = $current_set;
+$page['cat_elements_id'] = empty($current_set) ? [] : $current_set;
// +-----------------------------------------------------------------------+
diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php
index 688bb5c49..038b8a3eb 100644
--- a/admin/batch_manager_global.php
+++ b/admin/batch_manager_global.php
@@ -453,11 +453,21 @@ if ($conf['enable_synchronization'])
$prefilters[] = array('ID' => 'no_sync_md5sum', 'NAME' => l10n('With no checksum'));
}
+function UC_name_compare($a, $b)
+{
+ return strcmp(strtolower($a['NAME']), strtolower($b['NAME']));
+}
+
$prefilters = trigger_change('get_batch_manager_prefilters', $prefilters);
-usort($prefilters, 'UC_name_compare');
+
+// Sort prefilters by localized name.
+usort($prefilters, function ($a, $b) {
+ return strcmp(strtolower($a['NAME']), strtolower($b['NAME']));
+});
$template->assign(
array(
+ 'conf_checksum_compute_blocksize' => $conf['checksum_compute_blocksize'],
'prefilters' => $prefilters,
'filter' => $_SESSION['bulk_manager_filter'],
'selection' => $collection,
@@ -469,6 +479,15 @@ $template->assign(
)
);
+if (isset($page['no_md5sum_number']))
+{
+ $template->assign(
+ array(
+ 'NB_NO_MD5SUM' => $page['no_md5sum_number'],
+ )
+ );
+}
+
// +-----------------------------------------------------------------------+
// | caddie options |
// +-----------------------------------------------------------------------+
@@ -545,6 +564,8 @@ $template->assign('filter_category_selected', $selected_category);
// Dissociate from a category : categories listed for dissociation can only
// represent virtual links. We can't create orphans. Links to physical
// categories can't be broken.
+$associated_categories = array();
+
if (count($page['cat_elements_id']) > 0)
{
$query = '
@@ -559,9 +580,11 @@ SELECT
)
;';
- $template->assign('associated_categories', query2array($query, 'id', 'id'));
+ $associated_categories = query2array($query, 'id', 'id');
}
+$template->assign('associated_categories', $associated_categories);
+
if (count($page['cat_elements_id']) > 0)
{
// remove tags
@@ -651,10 +674,15 @@ if (count($page['cat_elements_id']) > 0)
$is_category = true;
}
+ // If using the 'duplicates' filter,
+ // order by the fields that are used to find duplicates.
if (isset($_SESSION['bulk_manager_filter']['prefilter'])
- and 'duplicates' == $_SESSION['bulk_manager_filter']['prefilter'])
+ and 'duplicates' === $_SESSION['bulk_manager_filter']['prefilter']
+ and isset($duplicates_on_fields))
{
- $conf['order_by'] = ' ORDER BY file, id';
+ // The $duplicates_on_fields variable is defined in ./batch_manager.php
+ $order_by_fields = array_merge( $duplicates_on_fields, array( 'id' ) );
+ $conf['order_by'] = ' ORDER BY '.join(', ', $order_by_fields);
}
$query = '
@@ -690,7 +718,7 @@ SELECT id,path,representative_ext,file,filesize,level,name,width,height,rotation
;';
$result = pwg_query($query);
- $thumb_params = ImageStdParams::get_by_type(IMG_THUMB);
+ $thumb_params = ImageStdParams::get_by_type(IMG_SQUARE);
// template thumbnail initialization
while ($row = pwg_db_fetch_assoc($result))
{
diff --git a/admin/cat_list.php b/admin/cat_list.php
index ab0f7d54d..d5a46b82a 100644
--- a/admin/cat_list.php
+++ b/admin/cat_list.php
@@ -161,7 +161,7 @@ elseif (isset($_POST['submitAdd']))
$output_create = create_virtual_category(
$_POST['virtual_name'],
@$_GET['parent_id']
- );
+ );
invalidate_user_cache();
if (isset($output_create['error']))
@@ -174,86 +174,6 @@ elseif (isset($_POST['submitAdd']))
$page['infos'][] = $output_create['info'].' '.l10n('Edit album').'';
}
}
-// save manual category ordering
-elseif (isset($_POST['submitManualOrder']))
-{
- asort($_POST['catOrd'], SORT_NUMERIC);
- save_categories_order(array_keys($_POST['catOrd']));
-
- $page['infos'][] = l10n('Album manual order was saved');
-}
-elseif (isset($_POST['submitAutoOrder']))
-{
- if (!isset($sort_orders[ $_POST['order_by'] ]))
- {
- die('Invalid sort order');
- }
-
- $query = '
-SELECT id
- FROM '.CATEGORIES_TABLE.'
- WHERE id_uppercat '.
- (!isset($_GET['parent_id']) ? 'IS NULL' : '= '.$_GET['parent_id']).'
-;';
- $category_ids = array_from_query($query, 'id');
-
- if (isset($_POST['recursive']))
- {
- $category_ids = get_subcat_ids($category_ids);
- }
-
- $categories = array();
- $sort = array();
-
- list($order_by_field, $order_by_asc) = explode(' ', $_POST['order_by']);
-
- $order_by_date = false;
- if (strpos($order_by_field, 'date_') === 0)
- {
- $order_by_date = true;
-
- $ref_dates = get_categories_ref_date(
- $category_ids,
- $order_by_field,
- 'ASC' == $order_by_asc ? 'min' : 'max'
- );
- }
-
- $query = '
-SELECT id, name, id_uppercat
- FROM '.CATEGORIES_TABLE.'
- WHERE id IN ('.implode(',', $category_ids).')
-;';
- $result = pwg_query($query);
- while ($row = pwg_db_fetch_assoc($result))
- {
- if ($order_by_date)
- {
- $sort[] = $ref_dates[ $row['id'] ];
- }
- else
- {
- $sort[] = remove_accents($row['name']);
- }
-
- $categories[] = array(
- 'id' => $row['id'],
- 'id_uppercat' => $row['id_uppercat'],
- );
- }
-
- array_multisort(
- $sort,
- SORT_REGULAR,
- 'ASC' == $order_by_asc ? SORT_ASC : SORT_DESC,
- $categories
- );
-
- save_categories_order($categories);
-
- $page['infos'][] = l10n('Albums automatically sorted');
-}
-
// +-----------------------------------------------------------------------+
// | Navigation path |
// +-----------------------------------------------------------------------+
diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index c817f93bc..e3daa0def 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -109,9 +109,9 @@ if (isset($_POST['submit']))
if ($conf['activate_comments'])
{
- $data['commentable'] = isset($_POST['commentable'])?$_POST['commentable']:'false';
+ $data['commentable'] = isset($_POST['commentable'])? 'true':'false';
}
-
+
single_update(
CATEGORIES_TABLE,
$data,
@@ -131,13 +131,15 @@ UPDATE '.CATEGORIES_TABLE.'
// retrieve cat infos before continuing (following updates are expensive)
$cat_info = get_cat_info($_GET['cat_id']);
- if ($_POST['visible']=='true_sub')
+ $visible = false;
+ if (!isset($_POST['locked']))
{
- set_cat_visible(array($_GET['cat_id']), true, true);
+ $visible = true;
}
- elseif ($cat_info['visible'] != get_boolean( $_POST['visible'] ) )
+
+ if ($visible !== $cat_info['visible'])
{
- set_cat_visible(array($_GET['cat_id']), $_POST['visible']);
+ set_cat_visible(array($_GET['cat_id']), $visible);
}
// in case the use moves his album to the gallery root, we force
@@ -275,7 +277,7 @@ $template->assign(
'CAT_ID' => $category['id'],
'CAT_NAME' => @htmlspecialchars($category['name']),
'CAT_COMMENT' => @htmlspecialchars($category['comment']),
- 'CAT_VISIBLE' => boolean_to_string($category['visible']),
+ 'IS_LOCKED' => !get_boolean($category['visible']),
'U_JUMPTO' => make_index_url(
array(
@@ -317,7 +319,7 @@ SELECT
if ($min_date == $max_date)
{
- $intro = l10n(
+ $info_title = l10n(
'This album contains %d photos, added on %s.',
$image_count,
format_date($min_date)
@@ -325,19 +327,64 @@ SELECT
}
else
{
- $intro = l10n(
+ $info_title = l10n(
'This album contains %d photos, added between %s and %s.',
$image_count,
format_date($min_date),
format_date($max_date)
);
}
+ $info_photos = l10n('%d photos', $image_count);
+
+ $template->assign(
+ array(
+ 'INFO_PHOTO' => $info_photos,
+ 'INFO_TITLE' => $info_title
+ )
+ );
+
}
-else
-{
- $intro = l10n('This album contains no photo.');
+
+// date creation
+$query = '
+SELECT occured_on
+ FROM `'.ACTIVITY_TABLE.'`
+ WHERE object_id = '.$category['id'].'
+ AND object = "album"
+ AND action = "add"
+';
+$result = query2array($query);
+
+if (count($result) > 0) {
+ $template->assign(
+ array(
+ 'INFO_CREATION' => l10n('Created on %s',format_date($result[0]['occured_on'], array('day', 'month','year')))
+ )
+ );
}
+// Sub Albums
+$query = '
+SELECT COUNT(*)
+ FROM `'.CATEGORIES_TABLE.'`
+ WHERE id_uppercat = '.$category['id'].'
+';
+$result = query2array($query);
+
+if ($result[0]['COUNT(*)'] > 0) {
+ $template->assign(
+ array(
+ 'INFO_DIRECT_SUB' => l10n('%d sub-albums',$result[0]['COUNT(*)'])
+ )
+ );
+}
+
+$template->assign(array(
+ 'INFO_ID' => l10n('Numeric identifier : %d',$category['id']),
+ 'INFO_LAST_MODIFIED'=> l10n('Edited on %s',format_date($category['lastmodified'], array('day', 'month','year')))
+ )
+ );
+
// info for deletion
$template->assign(
array(
@@ -349,10 +396,7 @@ $template->assign(
)
);
-$intro.= '