From e517cfad640d7697eb021cb698e5958f154f908b Mon Sep 17 00:00:00 2001
From: rub <rub@piwigo.org>
Date: Tue, 6 Feb 2007 22:55:12 +0000
Subject: 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!


git-svn-id: http://piwigo.org/svn/trunk@1784 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 template/yoga/admin/notification_by_mail.tpl | 25 ++++++++++++++++----
 template/yoga/mail/admin/index.php           | 35 ----------------------------
 template/yoga/mail/footer.tpl                | 18 --------------
 template/yoga/mail/header.tpl                | 10 --------
 template/yoga/mail/index.php                 |  2 +-
 template/yoga/mail/text/html/footer.tpl      | 18 ++++++++++++++
 template/yoga/mail/text/html/header.tpl      | 10 ++++++++
 template/yoga/mail/text/html/index.php       | 35 ++++++++++++++++++++++++++++
 template/yoga/mail/text/index.php            | 35 ++++++++++++++++++++++++++++
 template/yoga/mail/text/plain/footer.tpl     |  3 +++
 template/yoga/mail/text/plain/header.tpl     |  1 +
 template/yoga/mail/text/plain/index.php      | 35 ++++++++++++++++++++++++++++
 12 files changed, 159 insertions(+), 68 deletions(-)
 delete mode 100644 template/yoga/mail/admin/index.php
 delete mode 100644 template/yoga/mail/footer.tpl
 delete mode 100644 template/yoga/mail/header.tpl
 create mode 100644 template/yoga/mail/text/html/footer.tpl
 create mode 100644 template/yoga/mail/text/html/header.tpl
 create mode 100644 template/yoga/mail/text/html/index.php
 create mode 100644 template/yoga/mail/text/index.php
 create mode 100644 template/yoga/mail/text/plain/footer.tpl
 create mode 100644 template/yoga/mail/text/plain/header.tpl
 create mode 100644 template/yoga/mail/text/plain/index.php

(limited to 'template/yoga')

diff --git a/template/yoga/admin/notification_by_mail.tpl b/template/yoga/admin/notification_by_mail.tpl
index 620f8a8dc..da61bcdfb 100644
--- a/template/yoga/admin/notification_by_mail.tpl
+++ b/template/yoga/admin/notification_by_mail.tpl
@@ -26,6 +26,13 @@
   <fieldset>
     <legend>{lang:nbm_title_param}</legend>
     <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>
@@ -33,17 +40,27 @@
         </td>
         <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>
           <label><input type="radio" name="nbm_send_detailed_content" value="false" {param.SEND_DETAILED_CONTENT_NO}/>{lang:no}</label>
         </td>
       </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>
   </fieldset>
 
@@ -98,7 +115,7 @@
       <legend>{lang:nbm_send_options}</legend>
       <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>
       </table>
diff --git a/template/yoga/mail/admin/index.php b/template/yoga/mail/admin/index.php
deleted file mode 100644
index ad16c4524..000000000
--- a/template/yoga/mail/admin/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | 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 |
-// +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
-// | last update   : $Date: 2006-03-15 23:44:35 +0100 (mer., 15 mars 2006) $
-// | last modifier : $Author: plg $
-// | revision      : $Revision: 1082 $
-// +-----------------------------------------------------------------------+
-// | 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.                                                                  |
-// +-----------------------------------------------------------------------+
-
-// recursive call of index.php
-
-$url = '../index.php';
-header( 'Request-URI: '.$url );
-header( 'Content-Location: '.$url );
-header( 'Location: '.$url );
-exit();
-?>
diff --git a/template/yoga/mail/footer.tpl b/template/yoga/mail/footer.tpl
deleted file mode 100644
index 22076068a..000000000
--- a/template/yoga/mail/footer.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<div id="copyright">
-
- <!-- Please, do not remove this copyright. If you really want to,
-      contact us on http://phpwebgallery.net to find a solution on how
-      to show the origin of the script...-->
-
-  {lang:powered_by} 
-  <a href="http://www.phpwebgallery.net" class="PWG">
-  <span class="P">Php</span><span class="W">Web</span><span class="G">Gallery</span></a>
-  {VERSION}
-  - {lang:send_mail}
-  <a href="mailto:{MAIL}?subject={TITLE_MAIL}">{lang:Webmaster}</a>
-
-</div> <!-- copyright -->
-</div> <!-- the_page -->
-
-</body>
-</html>
diff --git a/template/yoga/mail/header.tpl b/template/yoga/mail/header.tpl
deleted file mode 100644
index fee4d441c..000000000
--- a/template/yoga/mail/header.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-"http://www.w3.org/TR/html4/strict.dtd">
-<html lang="{LANG}" dir="{DIR}">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">
-</head>
-
-<body id="{BODY_ID}">
-<div id="the_mail">
-
diff --git a/template/yoga/mail/index.php b/template/yoga/mail/index.php
index ad16c4524..871f06a8e 100644
--- a/template/yoga/mail/index.php
+++ b/template/yoga/mail/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | 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)
 // | file          : $RCSfile$
diff --git a/template/yoga/mail/text/html/footer.tpl b/template/yoga/mail/text/html/footer.tpl
new file mode 100644
index 000000000..ac0d2784f
--- /dev/null
+++ b/template/yoga/mail/text/html/footer.tpl
@@ -0,0 +1,18 @@
+<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
+      to show the origin of the script...-->
+
+  {lang:powered_by} 
+  <a href="http://www.phpwebgallery.net" class="PWG">
+  <span class="P">Php</span><span class="W">Web</span><span class="G">Gallery</span></a>
+  {VERSION}
+  - {lang:send_mail}
+  <a href="mailto:{MAIL}?subject={TITLE_MAIL}">{lang:Webmaster}</a>
+
+</div> <!-- copyright -->
+</div> <!-- the_page -->
+
+</body>
+</html>
diff --git a/template/yoga/mail/text/html/header.tpl b/template/yoga/mail/text/html/header.tpl
new file mode 100644
index 000000000..fee4d441c
--- /dev/null
+++ b/template/yoga/mail/text/html/header.tpl
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html lang="{LANG}" dir="{DIR}">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">
+</head>
+
+<body id="{BODY_ID}">
+<div id="the_mail">
+
diff --git a/template/yoga/mail/text/html/index.php b/template/yoga/mail/text/html/index.php
new file mode 100644
index 000000000..871f06a8e
--- /dev/null
+++ b/template/yoga/mail/text/html/index.php
@@ -0,0 +1,35 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery                           |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch        : BSF (Best So Far)
+// | file          : $RCSfile$
+// | last update   : $Date: 2006-03-15 23:44:35 +0100 (mer., 15 mars 2006) $
+// | last modifier : $Author: plg $
+// | revision      : $Revision: 1082 $
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// recursive call of index.php
+
+$url = '../index.php';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/template/yoga/mail/text/index.php b/template/yoga/mail/text/index.php
new file mode 100644
index 000000000..871f06a8e
--- /dev/null
+++ b/template/yoga/mail/text/index.php
@@ -0,0 +1,35 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery                           |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch        : BSF (Best So Far)
+// | file          : $RCSfile$
+// | last update   : $Date: 2006-03-15 23:44:35 +0100 (mer., 15 mars 2006) $
+// | last modifier : $Author: plg $
+// | revision      : $Revision: 1082 $
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// recursive call of index.php
+
+$url = '../index.php';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/template/yoga/mail/text/plain/footer.tpl b/template/yoga/mail/text/plain/footer.tpl
new file mode 100644
index 000000000..7d97bba50
--- /dev/null
+++ b/template/yoga/mail/text/plain/footer.tpl
@@ -0,0 +1,3 @@
+
+------------------------
+PhpWebGallery {VERSION}
diff --git a/template/yoga/mail/text/plain/header.tpl b/template/yoga/mail/text/plain/header.tpl
new file mode 100644
index 000000000..fec68b422
--- /dev/null
+++ b/template/yoga/mail/text/plain/header.tpl
@@ -0,0 +1 @@
+{FAKE_SIMULATE_EMPTY_FILE}
\ No newline at end of file
diff --git a/template/yoga/mail/text/plain/index.php b/template/yoga/mail/text/plain/index.php
new file mode 100644
index 000000000..871f06a8e
--- /dev/null
+++ b/template/yoga/mail/text/plain/index.php
@@ -0,0 +1,35 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery                           |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch        : BSF (Best So Far)
+// | file          : $RCSfile$
+// | last update   : $Date: 2006-03-15 23:44:35 +0100 (mer., 15 mars 2006) $
+// | last modifier : $Author: plg $
+// | revision      : $Revision: 1082 $
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// recursive call of index.php
+
+$url = '../index.php';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
-- 
cgit v1.2.3