From dc40d1956e1eccd344faf4d0bd4d295db2199eb7 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 2 Apr 2019 16:04:01 +0200
Subject: [PATCH] fixes #945 pwg_log automatically creates a new
 history.section in the enum, when needed

---
 include/functions.inc.php | 51 +++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/include/functions.inc.php b/include/functions.inc.php
index f7493998a..b570a6b16 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -463,28 +463,33 @@ UPDATE '.USER_INFOS_TABLE.'
     $ip = substr($ip, 0, 15);
   }
 
-  // solves issue 945
-  // If plugin developers add their own sections, Piwigo tries to put them into history table. Since the section
-  // column is an enum, php issues a warning. It might be the server is configured to hide those warnings, so the
-  // user won't see it. Piwigo core should make a decision if it is better to refuse the insert at all if section is
-  // not valid, depending on possible future use of the history table
-  if(isset($page['section'])) {
-    //enum: 'categories','tags','search','list','favorites','most_visited','best_rated','recent_pics','recent_cats'
-    if(in_array(
-        $page['section'],
-        array('categories',
-          'tags',
-          'search',
-          'list',
-          'favorites',
-          'most_visited',
-          'best_rated',
-          'recent_pics',
-          'recent_cats'
-          )
-        )
-    ){
-      $mySection = $page['section'];
+  // If plugin developers add their own sections, Piwigo will automatically add it in the history.section enum column
+  if (isset($page['section']))
+  {
+    // set cache if not available
+    if (!isset($conf['history_sections_cache']))
+    {
+      conf_update_param('history_sections_cache', get_enums(HISTORY_TABLE, 'section'), true);
+    }
+
+    $conf['history_sections_cache'] = safe_unserialize($conf['history_sections_cache']);
+
+    if (in_array($page['section'], $conf['history_sections_cache']))
+    {
+      $section = $page['section'];
+    }
+    elseif (preg_match('/^[a-zA-Z0-9_-]+$/', $page['section']))
+    {
+      $history_sections = get_enums(HISTORY_TABLE, 'section');
+      $history_sections[] = $page['section'];
+
+      // alter history table structure, to include a new section
+      pwg_query('ALTER TABLE '.HISTORY_TABLE.' CHANGE section section enum(\''.implode("','", array_unique($history_sections)).'\') DEFAULT NULL;');
+
+      // and refresh cache
+      conf_update_param('history_sections_cache', get_enums(HISTORY_TABLE, 'section'), true);
+
+      $section = $page['section'];
     }
   }
   
@@ -509,7 +514,7 @@ INSERT INTO '.HISTORY_TABLE.'
     CURRENT_TIME,
     '.$user['id'].',
     \''.$ip.'\',
-    '.(isset($mySection) ? "'".$mySection."'" : 'NULL').',
+    '.(isset($section) ? "'".$section."'" : 'NULL').',
     '.(isset($page['category']['id']) ? $page['category']['id'] : 'NULL').',
     '.(isset($image_id) ? $image_id : 'NULL').',
     '.(isset($image_type) ? "'".$image_type."'" : 'NULL').',