Changeset 1784

Timestamp:

02/06/07 23:55:12 (6 years ago)

Author:

rub

Message:

Issue 0000598: NBM: Add new informations

Notification by mail:
Add new informations about last categories and last images like new feature of RSS notification.

2 parts:

• Possibility to send HTML mail
• Include last categories and last images on HTML format into notification mail

ccs & HTML experts! Please! Check, fix, improve and enhance HTML mail content!

Location:

trunk

Files:

• . (modified) (1 prop)
• admin/include/functions_notification_by_mail.inc.php (modified) (9 diffs)
• admin/notification_by_mail.php (modified) (7 diffs)
• feed.php (modified) (3 diffs)
• include/functions_mail.inc.php (modified) (7 diffs)
• include/functions_notification.inc.php (modified) (3 diffs)
• install/config.sql (modified) (1 diff)
• install/db/49-database.php (added)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (4 diffs)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (10 diffs)
• template/yoga/admin/notification_by_mail.tpl (modified) (4 diffs)
• template/yoga/mail/admin (deleted)
• template/yoga/mail/index.php (modified) (1 diff)
• template/yoga/mail/text (added)
• template/yoga/mail/text/html (added)
• template/yoga/mail/text/html/footer.tpl (moved) (moved from trunk/template/yoga/mail/footer.tpl) (1 diff)
• template/yoga/mail/text/html/header.tpl (moved) (moved from trunk/template/yoga/mail/header.tpl)
• template/yoga/mail/text/html/index.php (added)
• template/yoga/mail/text/index.php (added)
• template/yoga/mail/text/plain (added)
• template/yoga/mail/text/plain/footer.tpl (added)
• template/yoga/mail/text/plain/header.tpl (added)
• template/yoga/mail/text/plain/index.php (added)

trunk

@@ -2 +2 @@
 gal2
 feed.xml
+testmail

@@ -2 +2 @@
 gal2
 feed.xml
+testmail

trunk/admin/include/functions_notification_by_mail.inc.php

@@ -3 +3 @@
 // | 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) 2006 Ruben ARNAUD - team@phpwebgallery.net              |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2006-2007 Ruben ARNAUD - team@phpwebgallery.net         |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
@@ -204 +204 @@
   {
     // Init mail configuration
+    $env_nbm['email_format'] = get_str_email_format($conf['nbm_send_html_mail']);
     $env_nbm['send_as_name'] = ((isset($conf['nbm_send_mail_as']) and !empty($conf['nbm_send_mail_as'])) ? $conf['nbm_send_mail_as'] : $conf['gallery_title']);
     $env_nbm['send_as_mail_address'] = get_webmaster_mail_address();
@@ -230 +231 @@
   $lang_info = $env_nbm['save_lang_info'];
   $lang = $env_nbm['save_lang'];
-}
-
-/*
- * Set user_id on nbm enviromnent
- *
- * Return none
- */
-function set_user_id_on_env_nbm($user_id)
+
+  if ($env_nbm['is_to_send_mail'])
+  {
+    unset($env_nbm['email_format']);
+    unset($env_nbm['send_as_name']);
+    unset($env_nbm['send_as_mail_address']);
+    unset($env_nbm['send_as_mail_formated']);
+    // Don t unset counter
+    //unset($env_nbm['error_on_mail_count']);
+    //unset($env_nbm['sent_mail_count']);
+    unset($env_nbm['msg_info']);
+    unset($env_nbm['msg_error']);
+  }
+
+  unset($env_nbm['save_user']);
+  unset($env_nbm['save_lang_info']);
+  unset($env_nbm['save_lang']);
+  unset($env_nbm['last_language']);
+  unset($env_nbm['is_to_send_mail']);
+
+}
+
+/*
+ * Set user on nbm enviromnent
+ *
+ * Return none
+ */
+function set_user_on_env_nbm($user_id, $is_action_send)
 {
   global $user, $lang, $lang_info, $env_nbm;
@@ -261 +282 @@
     @include(get_language_filepath('local.lang.php'));
   }
+  
+  if ($is_action_send)
+  {
+    $env_nbm['mail_template'] = get_mail_template($env_nbm['email_format']);
+    $env_nbm['mail_template']->set_filename('notification_by_mail', 'admin/notification_by_mail.tpl');
+  }
+}
+
+/*
+ * Unset user on nbm enviromnent
+ *
+ * Return none
+ */
+function unset_user_on_env_nbm()
+{
+  global $env_nbm;
+
+  unset($env_nbm['mail_template']);
 }
 
@@ -300 +339 @@
   if ($env_nbm['error_on_mail_count'] != 0)
   {
-    array_push($page['errors'], sprintf(l10n('nbm_msg_no_mail_to_send'), $env_nbm['error_on_mail_count']));
+    array_push($page['errors'], l10n_dec('nbm_msg_n_mail_not_send', 'nbm_msg_n_mails_not_send', $env_nbm['error_on_mail_count']));
     if ($env_nbm['sent_mail_count'] != 0)
-      array_push($page['infos'], sprintf(l10n('nbm_msg_n_mails_sent'), $env_nbm['sent_mail_count']));
+      array_push($page['infos'], l10n_dec('nbm_msg_n_mail_sent', 'nbm_msg_n_mails_sent', $env_nbm['sent_mail_count']));
   }
   else
@@ -309 +348 @@
       array_push($page['infos'], l10n('nbm_no_mail_to_send'));
     else
-      array_push($page['infos'], sprintf(l10n('nbm_msg_n_mails_sent'), $env_nbm['sent_mail_count']));
-  }
-}
-
-function get_mail_content_subscribe_unsubcribe($nbm_user)
+      array_push($page['infos'], l10n_dec('nbm_msg_n_mail_sent', 'nbm_msg_n_mails_sent', $env_nbm['sent_mail_count']));
+  }
+}
+
+function assign_vars_nbm_mail_content($nbm_user)
 {
   global $env_nbm;
-  
-  $content = "\n\n\n";
-  
+
   set_make_full_url();
-  
-  $content .= "___________________________________________________\n\n";
-  $content .= sprintf(l10n('nbm_content_unsubscribe_link'), add_url_params(get_root_url().'nbm.php', array('unsubscribe' => $nbm_user['check_key'])))."\n";
-  $content .= sprintf(l10n('nbm_content_subscribe_link'), add_url_params(get_root_url().'nbm.php', array('subscribe' => $nbm_user['check_key'])))."\n";
-  $content .= sprintf(l10n('nbm_content_subscribe_unsubscribe_contact'), $env_nbm['send_as_mail_address'])."\n";
-  $content .= "___________________________________________________\n\n\n\n";
+
+  $env_nbm['mail_template']->assign_vars
+  (
+    array
+    (
+      'USERNAME' => $nbm_user['username'],
+
+      'SEND_AS_NAME' => $env_nbm['send_as_name'],
+
+      'UNSUBSCRIBE_LINK' => add_url_params(get_root_url().'nbm.php', array('unsubscribe' => $nbm_user['check_key'])),
+      'SUBSCRIBE_LINK' => add_url_params(get_root_url().'nbm.php', array('subscribe' => $nbm_user['check_key'])),
+      'CONTACT_EMAIL' => $env_nbm['send_as_mail_address']
+    )
+  );
 
   unset_make_full_url();
-
-  return $content;
 }
 
@@ -387 +430 @@
       {
         // set env nbm user
-        set_user_id_on_env_nbm($nbm_user['user_id']);
-
-        $message = '';
+        set_user_on_env_nbm($nbm_user['user_id'], true);
 
         $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('nbm_object_subcribe'): l10n('nbm_object_unsubcribe'));
-        $message .= sprintf(l10n('nbm_content_hello'), $nbm_user['username']).",\n\n";
-
-        if ($is_subscribe)
-        {
-          $message .= l10n($is_admin_request ? 'nbm_content_subscribe_by_admin' : 'nbm_content_subscribe_by_himself');
-        }
-        else
-        {
-          $message .= l10n($is_admin_request ? 'nbm_content_unsubscribe_by_admin' : 'nbm_content_unsubscribe_by_himself');
-        }
-
-        $message .= "\n\n";
-        $message .= l10n('nbm_content_byebye')."\n   ".$env_nbm['send_as_name']."\n\n";
-
-        $message .= get_mail_content_subscribe_unsubcribe($nbm_user);
-
-        if (pwg_mail(format_email($nbm_user['username'], $nbm_user['mail_address']), $env_nbm['send_as_mail_formated'], $subject, $message))
+
+        // Assign current var for nbm mail
+        assign_vars_nbm_mail_content($nbm_user);
+
+        $section_action_by = ($is_subscribe ? 'subscribe_by_' : 'unsubscribe_by_');
+        $section_action_by .= ($is_admin_request ? 'admin' : 'himself');
+        $env_nbm['mail_template']->assign_block_vars
+        (
+          $section_action_by, array('DUMMY' => 'dummy')
+        );
+
+        if (pwg_mail(
+              format_email($nbm_user['username'], $nbm_user['mail_address']),
+              $env_nbm['send_as_mail_formated'],
+              $subject,
+              $env_nbm['mail_template']->parse('notification_by_mail', true),
+              $env_nbm['email_format'], $env_nbm['email_format']
+              ))
         {
           inc_mail_sent_success($nbm_user);
@@ -417 +459 @@
           $do_update = false;
         }
+
+        // unset env nbm user
+        unset_user_on_env_nbm();
+
       }
 
@@ -457 +503 @@
   }
 
-  array_push($page['infos'], sprintf(l10n('nbm_user_change_enabled_updated_data_count'), $updated_data_count));
+  array_push($page['infos'], l10n_dec('nbm_user_change_enabled_updated_data_count', 'nbm_users_change_enabled_updated_data_count', $updated_data_count));
   if ($error_on_updated_data_count != 0)
   {
-    array_push($page['errors'], sprintf(l10n('nbm_user_change_enabled_error_on_updated_data_count'), $error_on_updated_data_count));
+    array_push($page['errors'],
+      l10n_dec('nbm_user_change_enabled_error_on_updated_data_count',
+               'nbm_users_change_enabled_error_on_updated_data_count',
+               $error_on_updated_data_count));
   }
 

trunk/admin/notification_by_mail.php

@@ -85 +85 @@
 
       $must_repost = true;
-      array_push($page['errors'], sprintf(l10n('nbm_background_treatment_redirect'), $time_refresh));
+      array_push($page['errors'],
+        l10n_dec('nbm_background_treatment_redirect_second', 
+                 'nbm_background_treatment_redirect_seconds',
+                  $time_refresh));
     }
   }
@@ -271 +274 @@
 
           // set env nbm user
-          set_user_id_on_env_nbm($nbm_user['user_id']);
+          set_user_on_env_nbm($nbm_user['user_id'], $is_action_send);
 
           if ($is_action_send)
           {
+            set_make_full_url();
             // Fill return list of "treated" check_key for 'send'
             array_push($return_list, $nbm_user['check_key']);
-            $message = '';
 
             if ($conf['nbm_send_detailed_content'])
             {
-               $news = news($nbm_user['last_send'], $dbnow);
+               $news = news($nbm_user['last_send'], $dbnow, false, $conf['nbm_send_html_mail']);
                $exist_data = count($news) > 0;
             }
@@ -292 +295 @@
             {
               $subject = '['.$conf['gallery_title'].']: '.l10n('nbm_object_news');
-              $message .= sprintf(l10n('nbm_content_hello'), $nbm_user['username']).",\n\n";
+
+              // Assign current var for nbm mail
+              assign_vars_nbm_mail_content($nbm_user);
+
+              $end_punct = ($conf['nbm_send_detailed_content'] ? ':' : '.');
 
               if (!is_null($nbm_user['last_send']))
-                $message .= sprintf(l10n('nbm_content_new_elements_between'), $nbm_user['last_send'], $dbnow);
-              else
-                $message .= sprintf(l10n('nbm_content_new_elements'), $dbnow);
-
-              if ($conf['nbm_send_detailed_content'])
               {
-                $message .= ":\n";
-
-                foreach ($news as $line)
-                {
-                  $message .= '  o '.$line."\n";
-                }
-                $message .= "\n";
+                $env_nbm['mail_template']->assign_block_vars
+                (
+                  'content_new_elements_between',
+                  array
+                  (
+                    'DATE_BETWEEN_1' => $nbm_user['last_send'], 
+                    'DATE_BETWEEN_2' => $dbnow,
+                    'END_PUNCT' => $end_punct
+                  )
+                );
               }
               else
               {
-                $message .= ".\n";
+                $env_nbm['mail_template']->assign_block_vars
+                (
+                  'content_new_elements_single',
+                  array
+                  (
+                    'DATE_SINGLE' => $dbnow,
+                    'END_PUNCT' => $end_punct
+                  )
+                );
               }
 
-              $message .= sprintf(l10n('nbm_content_goto'), $conf['gallery_title'], $conf['gallery_url'])."\n\n";
-              $message .= $customize_mail_content."\n\n";
-              $message .= l10n('nbm_content_byebye')."\n   ".$env_nbm['send_as_name']."\n\n";
-
-              $message .= get_mail_content_subscribe_unsubcribe($nbm_user);
-
-              if (pwg_mail(format_email($nbm_user['username'], $nbm_user['mail_address']), $env_nbm['send_as_mail_formated'], $subject, $message))
+              if ($conf['nbm_send_detailed_content'])
+              {
+                foreach ($news as $data)
+                {
+                  $env_nbm['mail_template']->assign_block_vars
+                  (
+                    'global_new_line.new_line', array('DATA' => $data)
+                  );
+                }
+              }
+
+              if (!empty($customize_mail_content))
+              {
+                $env_nbm['mail_template']->assign_block_vars
+                (
+                  'custom', array('CUSTOMIZE_MAIL_CONTENT' => $customize_mail_content)
+                );
+              }
+
+              if ($conf['nbm_send_html_mail'] and $conf['nbm_send_recent_post_dates'])
+              {
+                $recent_post_dates = get_recent_post_dates(7, 5, 9);
+                foreach ($recent_post_dates as $date_detail)
+                {
+                  $env_nbm['mail_template']->assign_block_vars
+                  (
+                    'recent_post.recent_post_block',
+                    array
+                    (
+                      'TITLE' => get_title_recent_post_date($date_detail),
+                      'HTML_DATA' => get_html_description_recent_post_date($date_detail)
+                    )
+                  );
+                }
+              }
+
+              $env_nbm['mail_template']->assign_block_vars
+              (
+                'goto',
+                array
+                (
+                  'GALLERY_TITLE' => $conf['gallery_title'],
+                  'GALLERY_URL' => $conf['gallery_url']
+                )
+              );
+
+              $env_nbm['mail_template']->assign_block_vars
+              (
+                'byebye', array('SEND_AS_NAME' => $env_nbm['send_as_name'])
+              );
+
+              if (pwg_mail(
+                    format_email($nbm_user['username'], $nbm_user['mail_address']),
+                    $env_nbm['send_as_mail_formated'],
+                    $subject,
+                    $env_nbm['mail_template']->parse('notification_by_mail', true),
+                    $env_nbm['email_format'], $env_nbm['email_format']
+                    ))
               {
                 inc_mail_sent_success($nbm_user);
@@ -332 +396 @@
                 inc_mail_sent_failed($nbm_user);
               }
+
+              unset_make_full_url();
             }
           }
@@ -342 +408 @@
             }
           }
+          
+          // unset env nbm user
+          unset_user_on_env_nbm();
         }
 
@@ -438 +507 @@
       }
     
-      array_push($page['infos'], sprintf(l10n('nbm_updated_param_count'), $updated_param_count));
+      array_push($page['infos'],
+        l10n_dec('nbm_updated_param_count', 'nbm_updated_params_count',
+          $updated_param_count));
 
       // Reload conf with new values
@@ -543 +614 @@
       $page['mode'],
       array(
+        'SEND_HTML_MAIL_YES' => ($conf['nbm_send_html_mail'] ? 'checked="checked"' : ''),
+        'SEND_HTML_MAIL_NO' => (!$conf['nbm_send_html_mail'] ? 'checked="checked"' : ''),
         'SEND_MAIL_AS' => $conf['nbm_send_mail_as'],
         'SEND_DETAILED_CONTENT_YES' => ($conf['nbm_send_detailed_content'] ? 'checked="checked"' : ''),
         'SEND_DETAILED_CONTENT_NO' => (!$conf['nbm_send_detailed_content'] ? 'checked="checked"' : ''),
-        'COMPLEMENTARY_MAIL_CONTENT' => $conf['nbm_complementary_mail_content']
+        'COMPLEMENTARY_MAIL_CONTENT' => $conf['nbm_complementary_mail_content'],
+        'SEND_RECENT_POST_DATES_YES' => ($conf['nbm_send_recent_post_dates'] ? 'checked="checked"' : ''),
+        'SEND_RECENT_POST_DATES_NO' => (!$conf['nbm_send_recent_post_dates'] ? 'checked="checked"' : '')
         ));
     break;

trunk/feed.php

@@ -33 +33 @@
 // |                               functions                               |
 // +-----------------------------------------------------------------------+
-
-/**
- * explodes a MySQL datetime format (2005-07-14 23:01:37) in fields "year",
- * "month", "day", "hour", "minute", "second".
- *
- * @param string mysql datetime format
- * @return array
- */
-function explode_mysqldt($mysqldt)
-{
-  $date = array();
-  list($date['year'],
-       $date['month'],
-       $date['day'],
-       $date['hour'],
-       $date['minute'],
-       $date['second'])
-    = preg_split('/[-: ]/', $mysqldt);
-
-  return $date;
-}
 
 /**
@@ -186 +165 @@
 }
 
-$dates = get_recent_post_dates( 5, 6, 6);
+$dates = get_recent_post_dates(5, 6, 6);
 
-foreach($dates as  $date_detail)
+foreach($dates as $date_detail)
 { // for each recent post date we create a feed item
+  $item = new FeedItem();
   $date = $date_detail['date_available'];
-  $exploded_date = explode_mysqldt($date);
-  $item = new FeedItem();
-  $item->title = l10n_dec('%d new element', '%d new elements', $date_detail['nb_elements']);
-  $item->title .= ' ('.$lang['month'][(int)$exploded_date['month']].' '.$exploded_date['day'].')';
+  $item->title = get_title_recent_post_date($date_detail);
   $item->link = make_index_url(
         array(
@@ -207 +184 @@
     '<a href="'.make_index_url().'">'.$conf['gallery_title'].'</a><br/> ';
 
-  $item->description .=
-        '<li>'
-        .l10n_dec('%d new element', '%d new elements', $date_detail['nb_elements'])
-        .' ('
-        .'<a href="'.make_index_url(array('section'=>'recent_pics')).'">'
-          .l10n('recent_pics_cat').'</a>'
-        .')'
-        .'</li>';
-
-  foreach( $date_detail['elements'] as $element )
-  {
-    $tn_src = get_thumbnail_url($element);
-    $item->description .= '<img src="'.$tn_src.'"/>';
-  }
-  $item->description .= '...<br/>';
-
-  $item->description .=
-        '<li>'
-        .l10n_dec('%d category updated', '%d categories updated',
-                  $date_detail['nb_cats'])
-        .'</li>';
-
-  $item->description .= '<ul>';
-  foreach( $date_detail['categories'] as $cat )
-  {
-    $item->description .=
-          '<li>'
-          .get_cat_display_name_cache($cat['uppercats'])
-          .' ('.
-          l10n_dec('%d new element',
-                   '%d new elements', $cat['img_count']).')'
-          .'</li>';
-  }
-  $item->description .= '</ul>';
+  $item->description .= get_html_description_recent_post_date($date_detail);
 
   $item->descriptionHtmlSyndicated = true;

trunk/include/functions_mail.inc.php

@@ -65 +65 @@
     format_email($conf['gallery_title'], $conf_mail['email_webmaster']);
 
-  // what to display at the bottom of each mail ?
-  $conf_mail['text_footer'] =
-    "\n\n-- \nPhpWebGallery ".($conf['show_version'] ? PHPWG_VERSION : '');
-  
   return $conf_mail;
 }
@@ -106 +102 @@
  * @param none
  */
-function get_mail_template()
+function get_mail_template($email_format)
 {
   global $conf;
@@ -113 +109 @@
   list($tmpl, $thm) = explode('/', $conf['default_template']);
   $mail_template = new Template(PHPWG_ROOT_PATH.'template/'.$tmpl, $thm);
+  $mail_template->set_rootdir(PHPWG_ROOT_PATH.'template/'.$tmpl.'/mail/'.$email_format);
 
   return $mail_template;
@@ -118 +115 @@
 
 /**
+ * Return string email format (html or not) 
+ *
+ * @param string format
+ */
+function get_str_email_format($is_html)
+{
+  return ($is_html ? 'text/html' : 'text/plain');
+}
+
+/**
  * sends an email, using PhpWebGallery specific informations
  */
 function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '', $format_infos = 'text/plain', $email_format = null)
 {
-  global $conf, $conf_mail, $lang_info, $user, $page;
+  global $conf, $conf_mail, $lang_info, $page;
 
   $cvt7b_subject = str_translate_to_ascii7bits($subject);
@@ -171 +178 @@
   $content = '';
 
-  if (!isset($conf_mail[$email_format][$lang_info['charset']]['header']))
-  {
-    if ($email_format == 'text/html')
-    {
-      $mail_template = get_mail_template();
-
-      $mail_template->set_filenames(array('mail_header'=>'mail/header.tpl'));
-
-      $mail_template->assign_vars(
-        array(
-          'BODY_ID' =>
-            isset($page['body_id']) ?
-              $page['body_id'] : '',
-
-          'CONTENT_ENCODING' => $lang_info['charset'],
-          'LANG' => $lang_info['code'],
-          'DIR' => $lang_info['direction']
-          ));
-
-      $conf_mail[$email_format][$lang_info['charset']]['header'] =
-        $mail_template->parse('mail_header', true);
-    }
-    else
-    {
-      $conf_mail[$email_format][$lang_info['charset']]['header'] = '';
-    }
+  if (!isset($conf_mail[$email_format][$lang_info['charset']]))
+  {
+    if (!isset($mail_template))
+    {
+      $mail_template = get_mail_template($email_format);
+    }
+
+    $mail_template->set_filename('mail_header', 'header.tpl');
+    $mail_template->set_filename('mail_footer', 'footer.tpl');
+
+    $mail_template->assign_vars(
+      array(
+        //Header
+        'BODY_ID' =>
+          isset($page['body_id']) ?
+            $page['body_id'] : '',
+
+        'CONTENT_ENCODING' => $lang_info['charset'],
+        'LANG' => $lang_info['code'],
+        'DIR' => $lang_info['direction'],
+        
+        // Footer
+        'GALLERY_URL' =>
+          isset($page['gallery_url']) ?
+                $page['gallery_url'] : $conf['gallery_url'],
+        'GALLERY_TITLE' =>
+          isset($page['gallery_title']) ?
+                $page['gallery_title'] : $conf['gallery_title'],
+        'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '',
+        'PHPWG_URL' => PHPWG_URL,
+
+        'TITLE_MAIL' => urlencode(l10n('title_send_mail')),
+        'MAIL' => get_webmaster_mail_address()
+        ));
+
+    // what are displayed on the header of each mail ?
+    $conf_mail[$email_format][$lang_info['charset']]['header'] =
+      $mail_template->parse('mail_header', true);
+
+    // what are displayed on the footer of each mail ?
+    $conf_mail[$email_format][$lang_info['charset']]['footer'] =
+      $mail_template->parse('mail_footer', true);
   }
 
@@ -208 +231 @@
   {
     $content.= $infos;
-  }
-
-  if (!isset($conf_mail[$email_format][$lang_info['charset']]['footer']))
-  {
-    if ($email_format == 'text/html')
-    {
-      $mail_template->set_filenames(array('mail_footer'=>'mail/footer.tpl'));
-
-      $mail_template->assign_vars(
-        array(
-          'GALLERY_URL' =>
-            isset($page['gallery_url']) ?
-                  $page['gallery_url'] : $conf['gallery_url'],
-          'GALLERY_TITLE' =>
-            isset($page['gallery_title']) ?
-                  $page['gallery_title'] : $conf['gallery_title'],
-          'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '',
-          'PHPWG_URL' => PHPWG_URL,
-
-          'TITLE_MAIL' => urlencode(l10n('title_send_mail')),
-          'MAIL' => get_webmaster_mail_address()
-          ));
-
-      $conf_mail[$email_format][$lang_info['charset']]['footer'] =
-        $mail_template->parse('mail_footer', true);
-    }
-    else
-    {
-      $conf_mail[$email_format][$lang_info['charset']]['footer'] = $conf_mail['text_footer'];
-    }
   }
 
@@ -248 +241 @@
   }
 
+  /*Testing block
+  {
+    global $user;
+    @mkdir(PHPWG_ROOT_PATH.'testmail');
+    $filename = PHPWG_ROOT_PATH.'testmail/mail.'.$user['username'];
+    if ($format_infos == 'text/plain')
+    {
+      $filename .= '.txt';
+    }
+    else
+    {
+      $filename .= '.html';
+    }
+    $file = fopen($filename, 'w+');
+    fwrite($file, $content);
+    fclose($file);
+    return true;
+  }
+  */
+
   if ($conf_mail['mail_options'])
   {

trunk/include/functions_notification.inc.php

@@ -408 +408 @@
   {
     add_news_line( $news,
-      nb_new_elements($start, $end), '%d new element', '%d new elements');
+      nb_new_elements($start, $end), '%d new element', '%d new elements',
+      get_root_url().'index.php?/recent_pics', $add_url );
   }
 
@@ -414 +415 @@
   {
     add_news_line( $news,
-      nb_updated_categories($start, $end), '%d category updated', '%d categories updated');
+      nb_updated_categories($start, $end), '%d category updated', '%d categories updated',
+      get_root_url().'/index.php?/recent_cats', $add_url );
   }
 
@@ -510 +512 @@
   return $dates;
 }
+
+/**
+ * returns html description about recently published elements grouped by post date
+ * @param $date_detail: selected date computed by get_recent_post_dates function
+ */
+function get_html_description_recent_post_date($date_detail)
+{
+  global $conf;
+
+  $description = '';
+  
+  $description .=
+        '<li>'
+        .l10n_dec('%d new element', '%d new elements', $date_detail['nb_elements'])
+        .' ('
+        .'<a href="'.make_index_url(array('section'=>'recent_pics')).'">'
+          .l10n('recent_pics_cat').'</a>'
+        .')'
+        .'</li><br/>';
+
+  foreach($date_detail['elements'] as $element)
+  {
+    $tn_src = get_thumbnail_url($element);
+    $description .= '<img src="'.$tn_src.'"/>';
+  }
+  $description .= '...<br/>';
+
+  $description .=
+        '<li>'
+        .l10n_dec('%d category updated', '%d categories updated',
+                  $date_detail['nb_cats'])
+        .'</li>';
+
+  $description .= '<ul>';
+  foreach($date_detail['categories'] as $cat)
+  {
+    $description .=
+          '<li>'
+          .get_cat_display_name_cache($cat['uppercats'])
+          .' ('.
+          l10n_dec('%d new element',
+                   '%d new elements', $cat['img_count']).')'
+          .'</li>';
+  }
+  $description .= '</ul>';
+
+  return $description;
+}
+
+/**
+ * explodes a MySQL datetime format (2005-07-14 23:01:37) in fields "year",
+ * "month", "day", "hour", "minute", "second".
+ *
+ * @param string mysql datetime format
+ * @return array
+ */
+function explode_mysqldt($mysqldt)
+{
+  $date = array();
+  list($date['year'],
+       $date['month'],
+       $date['day'],
+       $date['hour'],
+       $date['minute'],
+       $date['second'])
+    = preg_split('/[-: ]/', $mysqldt);
+
+  return $date;
+}
+
+/**
+ * returns title about recently published elements grouped by post date
+ * @param $date_detail: selected date computed by get_recent_post_dates function
+ */
+function get_title_recent_post_date($date_detail)
+{
+  global $lang;
+
+  $date = $date_detail['date_available'];
+  $exploded_date = explode_mysqldt($date);
+
+  $title = l10n_dec('%d new element', '%d new elements', $date_detail['nb_elements']);
+  $title .= ' ('.$lang['month'][(int)$exploded_date['month']].' '.$exploded_date['day'].')';
+
+  return $title;
+}
+
 ?>

trunk/install/config.sql

@@ -25 +25 @@
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('allow_user_registration','true','allow visitors to register?');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('secret_key', MD5(RAND()), 'a secret key specific to the gallery for internal use');
--- Notification by mail
+INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nbm_send_html_mail','true','Send mail on HTML format for notification by mail');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nbm_send_mail_as','','Send mail as param value for notification by mail');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nbm_send_detailed_content','true','Send detailed content for notification by mail');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nbm_complementary_mail_content','','Complementary mail content for notification by mail');
+INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nbm_send_recent_post_dates','true','Send recent post by dates for notification by mail');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('email_admin_on_new_user','false','Send an email to the admin when a user registers');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('email_admin_on_comment','false','Send an email to the admin when a valid comment is entered');

trunk/language/en_UK.iso-8859-1/admin.lang.php

@@ -270 +270 @@
 $lang['metadata_iptc'] = 'IPTC';
 $lang['name'] = 'name';
-$lang['nbm_background_treatment_redirect'] = 'Execution time is out, treatment must be continue [Estmated time: %d secondes].';
+$lang['nbm_background_treatment_redirect_second'] = 'Execution time is out, treatment must be continue [Estmated time: %d second].';
+$lang['nbm_background_treatment_redirect_seconds'] = 'Execution time is out, treatment must be continue [Estmated time: %d seconds].';
 $lang['nbm_break_timeout_list_user'] = 'Prepared time for list of users to send mail is limited. Others users are not listed.';
 $lang['nbm_break_timeout_send_mail'] = 'Time to send mail is limited. Others mails are skipped.';
@@ -278 +279 @@
 $lang['nbm_col_user'] = 'User';
 $lang['nbm_complementary_mail_content'] = 'Complementary mail content';
-$lang['nbm_content_byebye'] = 'See you soon';
-$lang['nbm_content_goto'] = 'Go to %s %s.';
-$lang['nbm_content_hello'] = 'Hello %s';
-$lang['nbm_content_new_elements'] = 'New elements were added on %s';
-$lang['nbm_content_new_elements_between'] = 'New elements were added between %s and %s';
+$lang['nbm_content_byebye'] = 'See you soon,';
+$lang['nbm_content_goto_1'] = 'Go to ';
+$lang['nbm_content_goto_2'] = '.';
+$lang['nbm_content_hello_1'] = 'Hello ';
+$lang['nbm_content_hello_2'] = ',';
+$lang['nbm_content_new_elements'] = 'New elements were added ';
+$lang['nbm_content_new_elements_single'] = ' on ';
+$lang['nbm_content_new_elements_between_1'] = 'between ';
+$lang['nbm_content_new_elements_between_2'] = ' and ';
 $lang['nbm_content_subscribe_by_admin'] = 'The webmaster has subcribed you for receiving notifications by mail';
 $lang['nbm_content_subscribe_by_himself'] = 'You have subcribed to receiving notifications by mail';
-$lang['nbm_content_subscribe_link'] = 'To subscribe, click on %s .';
-$lang['nbm_content_subscribe_unsubscribe_contact'] = 'If you encounter problems or have any question, please send a message to %s.';
+$lang['nbm_content_subscribe_link'] = 'To subscribe';
+$lang['nbm_content_problem_contact'] = 'If you encounter problems or have any question, please send a message to ';
+$lang['nbm_content_pb_contact_object'] = '[NBM] Problems or questions';
 $lang['nbm_content_unsubscribe_by_admin'] = 'The webmaster has unsubcribed you from receiving notifications by mail';
 $lang['nbm_content_unsubscribe_by_himself'] = 'You have unsubcribed from receiving notifications by mail';
-$lang['nbm_content_unsubscribe_link'] = 'To unsubscribe, click on %s .';
+$lang['nbm_content_click_on'] = ', click on ';
+$lang['nbm_content_unsubscribe_link'] = 'To unsubscribe';
 $lang['nbm_info_send_mail_as'] = 'With blank value, gallery title will be used';
 $lang['nbm_item_notification'] = 'Notification';
 $lang['nbm_msg_error_sending_email_to'] = 'Error when sending email to %s [%s].';
 $lang['nbm_msg_mail_sent_to'] = 'Mail sent to %s [%s].';
+$lang['nbm_msg_n_mail_sent'] = '%d mail was sent.';
 $lang['nbm_msg_n_mails_sent'] = '%d mails were sent.';
-$lang['nbm_msg_no_mail_to_send'] = '%d mails were not sent.';
+$lang['nbm_msg_n_mail_not_send'] = '%d mail was not sent.';
+$lang['nbm_msg_n_mails_not_send'] = '%d mails were not sent.';
 $lang['nbm_no_mail_to_send'] = 'No mail to send.';
 $lang['nbm_no_user_available_to_send_L1'] = 'No user are available in order to send mail.';
@@ -309 +318 @@
 $lang['nbm_send_check_all'] = 'Check All';
 $lang['nbm_send_complementary_mail_content'] = 'Complementary mail content';
-$lang['nbm_send_detailed_content'] = 'Send detailed content';
+$lang['nbm_send_detailed_content'] = 'Add detailed content';
 $lang['nbm_send_mail_as'] = 'Send mail as';
 $lang['nbm_send_mail_to_users'] = 'Send mail to users';
@@ -322 +331 @@
 $lang['nbm_title_subscribe'] = 'Subscribe/unsubscribe users';
 $lang['nbm_unsubscribe_col'] = 'Unsubcribed';
-$lang['nbm_updated_param_count'] = '%d parameters are updated.';
-$lang['nbm_user_change_enabled_error_on_updated_data_count'] = '%d user(s) are not updated.';
-$lang['nbm_user_change_enabled_false'] = 'User %s [%s] removed from the subscription list.';
-$lang['nbm_user_change_enabled_true'] = 'User %s [%s] added to the subscription list.';
-$lang['nbm_user_change_enabled_updated_data_count'] = '%d user(s) are updated.';
-$lang['nbm_user_not_change_enabled_false'] = 'User %s [%s] not removed from the subscription list.';
-$lang['nbm_user_not_change_enabled_true'] = 'User %s [%s] not added to the subscription list.';
+$lang['nbm_updated_param_count'] = '%d parameter was updated.';
+$lang['nbm_updated_params_count'] = '%d parameters were updated.';
+$lang['nbm_user_change_enabled_error_on_updated_data_count'] = '%d user was not updated.';
+$lang['nbm_users_change_enabled_error_on_updated_data_count'] = '%d users were not updated.';
+$lang['nbm_user_change_enabled_false'] = 'User %s [%s] was removed from the subscription list.';
+$lang['nbm_user_change_enabled_true'] = 'User %s [%s] was added to the subscription list.';
+$lang['nbm_user_change_enabled_updated_data_count'] = '%d user was updated.';
+$lang['nbm_users_change_enabled_updated_data_count'] = '%d users were updated.';
+$lang['nbm_user_not_change_enabled_false'] = 'User %s [%s] was not removed from the subscription list.';
+$lang['nbm_user_not_change_enabled_true'] = 'User %s [%s] was not added to the subscription list.';
 $lang['nbm_user_x_added'] = 'User %s [%s] added.';
 $lang['nbm_warning_subscribe_unsubcribe'] = 'Warning: subscribing or unsubcribing will send mails to users';
+$lang['nbm_send_html_mail'] = 'Send mail on HTML format';
+$lang['nbm_send_recent_post_dates'] = 'Include display of recent pictures group by dates';
+$lang['nbm_info_send_recent_post_dates'] = 'Available only with HTML format';
 $lang['no_write_access'] = 'no write access';
 $lang['path'] = 'path';

trunk/language/fr_FR.iso-8859-1/admin.lang.php

@@ -29 +29 @@
 $lang['%d categories including %d physical and %d virtual'] = '%d cat�gories dont %d physiques et %d virtuelles';
 $lang['%d categories moved'] = '%d cat�gories d�plac�es';
-$lang['%d comments'] = '%d commentaires utilisateur';
+$lang['%d comments'] = '%d commentaires d\'utilisateurs';
 $lang['%d elements'] = '%d �l�ments';
 $lang['%d groups'] = '%d groupes';
 $lang['%d members'] = '%d membres';
 $lang['%d tags'] = '%d tags';
-$lang['%d user comments rejected'] = '%d commentaires utilisateur rejet�s';
-$lang['%d user comments validated'] = '%d commentaires utilisateur valid�s';
+$lang['%d user comments rejected'] = '%d commentaires d\'utilisateurs rejet�s';
+$lang['%d user comments validated'] = '%d commentaires d\'utilisateurs valid�s';
 $lang['%d users deleted'] = '%d utilisateurs supprim�s';
 $lang['%d users'] = '%d utilisateurs';
@@ -63 +63 @@
 $lang['Check for upgrade failed for unknown reasons.'] = 'La v�rification de la derni�re version sur le serveur a �chou�e pour une raison inconnue.';
 $lang['Check for upgrade'] = 'Derni�re version ?';
-$lang['Comments for all'] = 'Commentaires utilisateur pour tous';
+$lang['Comments for all'] = 'Commentaires pour tous';
 $lang['Controversy'] = 'Controverse';
 $lang['Creation date'] = 'Date de cr�ation';
@@ -124 +124 @@
 $lang['No tag defined. Use Administration>Pictures>Tags'] = 'Aucun tag d�fini. Utiliser l\'�cran Adminstration>Images>Tags';
 $lang['No'] = 'Non';
-$lang['Number of comments per page'] = 'Nombre de commentaires utilisateur par page';
+$lang['Number of comments per page'] = 'Nombre de commentaires par page';
 $lang['Number of images per row'] = 'Nombre de miniatures par ligne';
 $lang['Number of rates'] = 'Nombre de notes';
@@ -179 +179 @@
 $lang['Uninstall'] = 'D�sinstaller';
 $lang['Use default sort order']='Utiliser l\'ordre de tri des images par d�faut (d�fini dans le fichier de configuration)';
-$lang['User comments validation'] = 'Validation des commentaires utilisateur';
+$lang['User comments validation'] = 'Validation des commentaires d\'utilisateurs';
 $lang['Users'] = 'Utilisateurs';
 $lang['Validate All'] = 'Tout valider';
@@ -216 +216 @@
 $lang['category'] = 'cat�gorie';
 $lang['conf_access'] = 'Type d\'acc�s';
-$lang['conf_comments_title'] = 'Commentaires utilisateur';
+$lang['conf_comments_title'] = 'Commentaires d\'utilisateurs';
 $lang['conf_confirmation'] = 'Informations enregistr�es dans la base de donn�es';
 $lang['conf_default'] = 'Affichage par d�faut';
@@ -222 +222 @@
 $lang['conf_gallery_url_error'] = 'L\'adresse de la galerie n\'est pas valide.';
 $lang['conf_general_title'] = 'Configuration principale';
-$lang['conf_nb_comment_page_error'] = 'Le nombre de commentaires utilisateurs par page doit �tre compris entre 5 et 50.';
+$lang['conf_nb_comment_page_error'] = 'Le nombre de commentaires d\'utilisateurs par page doit �tre compris entre 5 et 50.';
 $lang['config'] = 'Configuration';
 $lang['confirm'] = 'confirmer';
@@ -270 +270 @@
 $lang['metadata_iptc'] = 'IPTC';
 $lang['name'] = 'nom';
-$lang['nbm_background_treatment_redirect'] = 'Le temps d\'ex�cution �tant d�pass�, le traitement doit continuer [Temps estim�: %d secondes].';
+$lang['nbm_background_treatment_redirect_second'] = 'Le temps d\'ex�cution �tant d�pass�, le traitement doit continuer [Temps estim�: %d second].';
+$lang['nbm_background_treatment_redirect_seconds'] = 'Le temps d\'ex�cution �tant d�pass�, le traitement doit continuer [Temps estim�: %d secondes].';
 $lang['nbm_break_timeout_list_user'] = 'Le temps de pr�paration de la liste des utilisateurs pour l\'envoi est limit�. Les autres utilisateurs ne sont pas list�s.';
 $lang['nbm_break_timeout_send_mail'] = 'Le temps d\'envoi des mails est limit�. Les autres envois de mail ont �t� ignor�s.';
@@ -278 +279 @@
 $lang['nbm_col_user'] = 'Utilisateur';
 $lang['nbm_complementary_mail_content'] = 'Contenu compl�mentaire au mail';
-$lang['nbm_content_byebye'] = 'A bient�t';
-$lang['nbm_content_goto'] = 'Rendez-vous sur %s %s.';
-$lang['nbm_content_hello'] = 'Bonjour %s';
-$lang['nbm_content_new_elements'] = 'Des nouveaux �l�ments ont �t� ajout�s le %s';
-$lang['nbm_content_new_elements_between'] = 'Des nouveaux �l�ments ont �t� ajout�s entre le %s et le %s';
+$lang['nbm_content_byebye'] = 'A bient�t,';
+$lang['nbm_content_goto_1'] = 'Rendez-vous sur ';
+$lang['nbm_content_goto_2'] = '.';
+$lang['nbm_content_hello_1'] = 'Bonjour ';
+$lang['nbm_content_hello_2'] = ',';
+$lang['nbm_content_new_elements'] = 'De nouveaux �l�ments ont �t� ajout�s ';
+$lang['nbm_content_new_elements_single'] = ' le ';
+$lang['nbm_content_new_elements_between_1'] = 'entre le ';
+$lang['nbm_content_new_elements_between_2'] = ' et le ';
 $lang['nbm_content_subscribe_by_admin'] = 'Vous venez d\'�tre inscrit par le webmestre du site pour recevoir la notification par mail.';
 $lang['nbm_content_subscribe_by_himself'] = 'Vous venez de vous inscrire pour recevoir la notification par mail.';
-$lang['nbm_content_subscribe_link'] = 'Pour vous inscrire, cliquez sur %s .';
-$lang['nbm_content_subscribe_unsubscribe_contact'] = 'En cas de probl�mes ou de questions, envoyer un mail � %s.';
+$lang['nbm_content_subscribe_link'] = 'Pour vous inscrire';
+$lang['nbm_content_problem_contact'] = 'En cas de probl�mes ou de questions, envoyer un mail � ';
+$lang['nbm_content_pb_contact_object'] = '[NBM] Probl�mes ou de questions';
 $lang['nbm_content_unsubscribe_by_admin'] = 'Vous venez d\'�tre d�sinscrit par le webmestre du site pour recevoir la notification par mail.';
 $lang['nbm_content_unsubscribe_by_himself'] = 'Vous venez de vous d�sinscrire pour recevoir la notification par mail.';
-$lang['nbm_content_unsubscribe_link'] = 'Pour vous d�sinscrire, cliquez sur %s .';
+$lang['nbm_content_click_on'] = ', cliquez sur ';
+$lang['nbm_content_unsubscribe_link'] = 'Pour vous d�sinscrire';
 $lang['nbm_info_send_mail_as'] = 'Sans valeur, le titre de la galerie sera utilis�';
 $lang['nbm_item_notification'] = 'Notification';
 $lang['nbm_msg_error_sending_email_to'] = 'Erreur lors de l\'envoi du mail � %s [%s].';
 $lang['nbm_msg_mail_sent_to'] = 'Mail envoy� � %s [%s].';
+$lang['nbm_msg_n_mail_sent'] = '%s mail a �t� envoy�.';
 $lang['nbm_msg_n_mails_sent'] = '%s mails ont �t� envoy�s.';
-$lang['nbm_msg_no_mail_to_send'] = '%s mails n\'ont pas �t� envoy�s.';
+$lang['nbm_msg_n_mail_not_send'] = '%s mail n\'a pas �t� envoy�.';
+$lang['nbm_msg_n_mails_not_send'] = '%s mails n\'ont pas �t� envoy�s.';
 $lang['nbm_no_mail_to_send'] = 'Pas de mail � envoyer.';
 $lang['nbm_no_user_available_to_send_L1'] = 'Il n\'y a pas d\'utilisateur � notifier par mail.';
@@ -309 +318 @@
 $lang['nbm_send_check_all'] = 'Tout cocher';
 $lang['nbm_send_complementary_mail_content'] = 'Contenu compl�mentaire du mail';
-$lang['nbm_send_detailed_content'] = 'Envoi d\'un contenu d�taill�';
+$lang['nbm_send_detailed_content'] = 'Ajout d\'un contenu d�taill�';
 $lang['nbm_send_mail_as'] = 'Envoyer le mail en tant que';
 $lang['nbm_send_mail_to_users'] = 'Envoi de mail aux utilisateurs';
@@ -322 +331 @@
 $lang['nbm_title_subscribe'] = 'Inscrire/d�sinscrire les utilisateurs';
 $lang['nbm_unsubscribe_col'] = 'Non Inscrits';
-$lang['nbm_updated_param_count'] = '%d param�tres ont �t� mis � jour.';
-$lang['nbm_user_change_enabled_error_on_updated_data_count'] = '%d utilisateurs n\'ont pas �t� mis � jour.';
+$lang['nbm_updated_param_count'] = '%d param�tre a �t� mis � jour.';
+$lang['nbm_updated_params_count'] = '%d param�tres ont �t� mis � jour.';
+$lang['nbm_user_change_enabled_error_on_updated_data_count'] = '%d utilisateur n\'a pas �t� mis � jour.';
+$lang['nbm_users_change_enabled_error_on_updated_data_count'] = '%d utilisateurs n\'ont pas �t� mis � jour.';
 $lang['nbm_user_change_enabled_false'] = 'L\'utilisateur %s [%s] a �t� supprim� de la liste des inscrits.';
 $lang['nbm_user_change_enabled_true'] = 'L\'utilisateur %s [%s] a �t� ajout� � la liste des inscrits.';
-$lang['nbm_user_change_enabled_updated_data_count'] = '%d utilisateurs ont �t� mis � jour.';
+$lang['nbm_user_change_enabled_updated_data_count'] = '%d utilisateur a �t� mis � jour.';
+$lang['nbm_users_change_enabled_updated_data_count'] = '%d utilisateurs ont �t� mis � jour.';
 $lang['nbm_user_not_change_enabled_false'] = 'L\'utilisateur %s [%s] n\'a pas �t� supprim� de la liste des inscrits.';
 $lang['nbm_user_not_change_enabled_true'] = 'L\'utilisateur %s [%s] n\'a pas �t� ajout� � la liste des inscrits.';
 $lang['nbm_user_x_added'] = 'Utilisateur %s [%s] ajout�.';
 $lang['nbm_warning_subscribe_unsubcribe'] = 'Attention, l\'inscription ou la d�sincription entraine l\'envoi de mails aux utilisateurs concern�s';
+$lang['nbm_send_html_mail'] = 'Envoyer le mail au format HTML';
+$lang['nbm_send_recent_post_dates'] = 'Inclure l\'affichage des derni�res images group�es par dates';
+$lang['nbm_info_send_recent_post_dates'] = 'Disponible uniquement avec le format HTML';
 $lang['no_write_access'] = 'pas d\'acc�s en �criture';
 $lang['path'] = 'chemin';

trunk/template/yoga/admin/notification_by_mail.tpl

@@ -28 +28 @@
     <table>
       <tr>
+        <td><label>{lang:nbm_send_html_mail}</label></td>
+        <td>
+          <label><input type="radio" name="nbm_send_html_mail" value="true"  {param.SEND_HTML_MAIL_YES}/>{lang:yes}</label>
+          <label><input type="radio" name="nbm_send_html_mail" value="false" {param.SEND_HTML_MAIL_NO}/>{lang:no}</label>
+        </td>
+      </tr>
+      <tr>
         <td>
           <label for="send_mail_as">{lang:nbm_send_mail_as}</label>
@@ -34 +41 @@
         <td><input type="text" maxlength="35" size="35" name="nbm_send_mail_as" id="send_mail_as" value="{param.SEND_MAIL_AS}"/></td>
       </tr>
-      <tr> 
-        <td><label>{lang:nbm_send_detailed_content} </label></td>
+      <tr>
+        <td><label>{lang:nbm_send_detailed_content}</label></td>
         <td>
           <label><input type="radio" name="nbm_send_detailed_content" value="true"  {param.SEND_DETAILED_CONTENT_YES}/>{lang:yes}</label>
@@ -42 +49 @@
       </tr>
      <tr>
-        <td><label for="complementary_mail_content">{lang:nbm_complementary_mail_content} </label></td>
+        <td><label for="complementary_mail_content">{lang:nbm_complementary_mail_content}</label></td>
         <td><textarea cols="50" rows="5" name="nbm_complementary_mail_content" id="complementary_mail_content">{param.COMPLEMENTARY_MAIL_CONTENT}</textarea></td>
+      </tr>
+      <tr>
+        <td>
+          <label>{lang:nbm_send_recent_post_dates}</label>
+          <br><i><small>{lang:nbm_info_send_recent_post_dates}</small></i>
+        </td>
+        <td>
+          <label><input type="radio" name="nbm_send_recent_post_dates" value="true"  {param.SEND_RECENT_POST_DATES_YES}/>{lang:yes}</label>
+          <label><input type="radio" name="nbm_send_recent_post_dates" value="false" {param.SEND_RECENT_POST_DATES_NO}/>{lang:no}</label>
+        </td>
       </tr>
     </table>
@@ -99 +116 @@
       <table>
        <tr>
-          <td><label for="send_customize_mail_content">{lang:nbm_send_complementary_mail_content} </label></td>
+          <td><label for="send_customize_mail_content">{lang:nbm_send_complementary_mail_content}</label></td>
           <td><textarea cols="50" rows="5" name="send_customize_mail_content" id="send_customize_mail_content">{send.send_data.CUSTOMIZE_MAIL_CONTENT}</textarea></td>
         </tr>

trunk/template/yoga/mail/index.php

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)

trunk/template/yoga/mail/text/html/footer.tpl

@@ -1 +1 @@
 <div id="copyright">
-
+<HR>
  <!-- Please, do not remove this copyright. If you really want to,
       contact us on http://phpwebgallery.net to find a solution on how

@@ -2 +2 @@
 gal2
 feed.xml
+testmail