From 1907e678b8bf8ff7b55478ff4aaba60a56d3d935 Mon Sep 17 00:00:00 2001
From: Teatek <teatek0512@gmail.com>
Date: Mon, 28 Jan 2019 17:15:52 +0100
Subject: [PATCH] Fixes #273 (Add ui option to display or not the date of an
 album)

---
 admin/configuration.php                       |  1 +
 .../template/configuration_display.tpl        |  8 +++
 include/config_default.inc.php                |  4 --
 install/config.sql                            |  1 +
 install/db/153-database.php                   | 59 +++++++++++++++++++
 language/en_UK/admin.lang.php                 |  1 +
 6 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 install/db/153-database.php

diff --git a/admin/configuration.php b/admin/configuration.php
index caed2a1bc..b7662ca26 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -90,6 +90,7 @@ $display_checkboxes = array(
     'index_new_icon',
     'index_edit_icon',
     'index_caddie_icon',
+    'display_fromto',
     'picture_metadata_icon',
     'picture_slideshow_icon',
     'picture_favorite_icon',
diff --git a/admin/themes/default/template/configuration_display.tpl b/admin/themes/default/template/configuration_display.tpl
index a898f7714..d2756f676 100644
--- a/admin/themes/default/template/configuration_display.tpl
+++ b/admin/themes/default/template/configuration_display.tpl
@@ -106,6 +106,14 @@
         </label>
       </li>
 
+      <li>
+        <label class="font-checkbox">
+          <span class="icon-check"></span>
+          <input type="checkbox" name="display_fromto" {if ($display.display_fromto)}checked="checked"{/if}>
+          {'Display category date'|translate}
+        </label>
+      </li>
+
       <li>
         <label>
           {'Number of albums per page'|translate}
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 5bf61d70d..d4a929e72 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -199,10 +199,6 @@ $conf['header_notes']  = array();
 // show_thumbnail_caption : on thumbnails page, show thumbnail captions ?
 $conf['show_thumbnail_caption'] = true;
 
-// display_fromto: display the date creation bounds of a
-// category.
-$conf['display_fromto'] = false;
-
 // allow_random_representative : do you wish Piwigo to search among
 // categories elements a new representative at each reload ?
 //
diff --git a/install/config.sql b/install/config.sql
index 87e075ff5..9ab93744f 100644
--- a/install/config.sql
+++ b/install/config.sql
@@ -69,6 +69,7 @@ INSERT INTO piwigo_config (param,value) VALUES ('picture_sizes_icon','true');
 INSERT INTO piwigo_config (param,value) VALUES ('index_sizes_icon','true');
 INSERT INTO piwigo_config (param,value) VALUES ('index_edit_icon','true');
 INSERT INTO piwigo_config (param,value) VALUES ('index_caddie_icon','true');
+INSERT INTO piwigo_config (param,value) VALUES ('display_fromto','false');
 INSERT INTO piwigo_config (param,value) VALUES ('picture_edit_icon','true');
 INSERT INTO piwigo_config (param,value) VALUES ('picture_caddie_icon','true');
 INSERT INTO piwigo_config (param,value) VALUES ('picture_representative_icon','true');
diff --git a/install/db/153-database.php b/install/db/153-database.php
new file mode 100644
index 000000000..9b1f4bad4
--- /dev/null
+++ b/install/db/153-database.php
@@ -0,0 +1,59 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+$upgrade_description = 'Show date of a category';
+
+function value_display_fromto()
+{
+  $file = PHPWG_ROOT_PATH.'local/config/config.inc.php';
+  if (file_exists($file))
+  {
+    $conf = array();
+    include($file);
+    if (isset($conf['display_fromto']) and $conf['display_fromto'])
+    {
+      return 'true';
+    }
+  }
+  return 'false';
+}
+$value = value_display_fromto();
+
+$query = '
+INSERT INTO '.PREFIX_TABLE.'config (param,value,comment)
+  VALUES (\'display_fromto\',\''.$value.'\', \''.$upgrade_description.'\')
+;';
+
+pwg_query($query);
+
+echo
+"\n"
+. $upgrade_description
+."\n"
+;
+?>
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 4f3882e3a..b6553befa 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -1015,3 +1015,4 @@ $lang['With no checksum'] = 'With no checksum';
 $lang['Compute %d missing checksums'] = 'Compute %d missing checksums';
 $lang['checksums to add'] = 'checksums to add';
 $lang['Synchronization in progress'] = 'Synchronization in progress';
+$lang['Display category date'] = 'Display category date';