From e06d9ae13df4563779988a251ebd11f58f091179 Mon Sep 17 00:00:00 2001
From: rub <rub@piwigo.org>
Date: Sun, 4 Mar 2007 22:40:28 +0000
Subject: Add on $conf value of the function get_recent_post_dates

git-svn-id: http://piwigo.org/svn/trunk@1871 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/notification_by_mail.php         |  3 ++-
 feed.php                               |  4 ++--
 include/config_default.inc.php         |  6 ++++++
 include/functions_notification.inc.php | 17 +++++++++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php
index 456235e04..0894afe4f 100644
--- a/admin/notification_by_mail.php
+++ b/admin/notification_by_mail.php
@@ -353,7 +353,8 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l
 
               if ($conf['nbm_send_html_mail'] and $conf['nbm_send_recent_post_dates'])
               {
-                $recent_post_dates = get_recent_post_dates(7, 3, 9);
+                $recent_post_dates = get_recent_post_dates_array(
+                  $conf['recent_post_dates']['NBM']);
                 foreach ($recent_post_dates as $date_detail)
                 {
                   $env_nbm['mail_template']->assign_block_vars
diff --git a/feed.php b/feed.php
index e246c0520..1c215592a 100644
--- a/feed.php
+++ b/feed.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | file          : $Id$
 // | last update   : $Date$
@@ -164,7 +164,7 @@ else
   }
 }
 
-$dates = get_recent_post_dates(5, 6, 6);
+$dates = get_recent_post_dates_array($conf['recent_post_dates']['RSS']);
 
 foreach($dates as $date_detail)
 { // for each recent post date we create a feed item
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 5879fe2d8..e6d947514 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -577,6 +577,12 @@ $conf['nbm_max_treatment_timeout_percent'] = 0.8;
 // nbm_treatment_timeout_default is used by default
 $conf['nbm_treatment_timeout_default'] = 20;
 
+// Parameters used in get_recent_post_dates for the 2 kind of notification
+$conf['recent_post_dates'] = array(
+  'RSS' => array('max_dates' => 5, 'max_elements' => 6, 'max_cats' => 6),
+  'NBM' => array('max_dates' => 7, 'max_elements' => 3, 'max_cats' => 9)
+  );
+
 // +-----------------------------------------------------------------------+
 // | Set default admin layout                                              |
 // +-----------------------------------------------------------------------+
diff --git a/include/functions_notification.inc.php b/include/functions_notification.inc.php
index 8677d5bff..c744e046b 100644
--- a/include/functions_notification.inc.php
+++ b/include/functions_notification.inc.php
@@ -511,6 +511,23 @@ SELECT DISTINCT c.uppercats, COUNT(DISTINCT i.id) img_count
   return $dates;
 }
 
+/*
+  Call function get_recent_post_dates but 
+  the parameters to be passed to the function, as an indexed array.
+  
+*/
+function get_recent_post_dates_array($args)
+{
+  return
+    get_recent_post_dates
+    (
+      (empty($args['max_dates']) ? 3 : $args['max_dates']),
+      (empty($args['max_elements']) ? 3 : $args['max_elements']),
+      (empty($args['max_cats']) ? 3 : $args['max_cats'])
+    );
+}
+
+
 /**
  * returns html description about recently published elements grouped by post date
  * @param $date_detail: selected date computed by get_recent_post_dates function
-- 
cgit v1.2.3