From c8827d3236f5760ac8683e338436bc4e4a9035d0 Mon Sep 17 00:00:00 2001
From: rub <rub@piwigo.org>
Date: Tue, 30 Sep 2008 21:14:16 +0000
Subject: [PATCH] Fix bad content of NBM mail.

git-svn-id: http://piwigo.org/svn/trunk@2628 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/cat_modify.php                          |  1 -
 template/yoga/mail/text/html/admin/index.php  | 30 -------------------
 .../text/html/{admin => }/cat_group_info.tpl  |  0
 .../html/{admin => }/notification_by_mail.tpl |  0
 template/yoga/mail/text/plain/admin/index.php | 30 -------------------
 .../text/plain/{admin => }/cat_group_info.tpl |  0
 .../{admin => }/notification_by_mail.tpl      |  0
 7 files changed, 61 deletions(-)
 delete mode 100644 template/yoga/mail/text/html/admin/index.php
 rename template/yoga/mail/text/html/{admin => }/cat_group_info.tpl (100%)
 rename template/yoga/mail/text/html/{admin => }/notification_by_mail.tpl (100%)
 delete mode 100644 template/yoga/mail/text/plain/admin/index.php
 rename template/yoga/mail/text/plain/{admin => }/cat_group_info.tpl (100%)
 rename template/yoga/mail/text/plain/{admin => }/notification_by_mail.tpl (100%)

diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index 6f313f9ea..74f59f0a8 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -485,7 +485,6 @@ SELECT id, file, path, tn_ext
     get_str_email_format(true), /* TODO add a checkbox in order to choose format*/
     get_l10n_args('[%s] Come to visit the category %s',
       array($conf['gallery_title'], $category['name'])),
-    'admin',
     'cat_group_info',
     array
     (
diff --git a/template/yoga/mail/text/html/admin/index.php b/template/yoga/mail/text/html/admin/index.php
deleted file mode 100644
index c15b15795..000000000
--- a/template/yoga/mail/text/html/admin/index.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based picture gallery                                  |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      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.                                                                  |
-// +-----------------------------------------------------------------------+
-
-// Recursive call
-$url = '../';
-header( 'Request-URI: '.$url );
-header( 'Content-Location: '.$url );
-header( 'Location: '.$url );
-exit();
-?>
diff --git a/template/yoga/mail/text/html/admin/cat_group_info.tpl b/template/yoga/mail/text/html/cat_group_info.tpl
similarity index 100%
rename from template/yoga/mail/text/html/admin/cat_group_info.tpl
rename to template/yoga/mail/text/html/cat_group_info.tpl
diff --git a/template/yoga/mail/text/html/admin/notification_by_mail.tpl b/template/yoga/mail/text/html/notification_by_mail.tpl
similarity index 100%
rename from template/yoga/mail/text/html/admin/notification_by_mail.tpl
rename to template/yoga/mail/text/html/notification_by_mail.tpl
diff --git a/template/yoga/mail/text/plain/admin/index.php b/template/yoga/mail/text/plain/admin/index.php
deleted file mode 100644
index c15b15795..000000000
--- a/template/yoga/mail/text/plain/admin/index.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based picture gallery                                  |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      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.                                                                  |
-// +-----------------------------------------------------------------------+
-
-// Recursive call
-$url = '../';
-header( 'Request-URI: '.$url );
-header( 'Content-Location: '.$url );
-header( 'Location: '.$url );
-exit();
-?>
diff --git a/template/yoga/mail/text/plain/admin/cat_group_info.tpl b/template/yoga/mail/text/plain/cat_group_info.tpl
similarity index 100%
rename from template/yoga/mail/text/plain/admin/cat_group_info.tpl
rename to template/yoga/mail/text/plain/cat_group_info.tpl
diff --git a/template/yoga/mail/text/plain/admin/notification_by_mail.tpl b/template/yoga/mail/text/plain/notification_by_mail.tpl
similarity index 100%
rename from template/yoga/mail/text/plain/admin/notification_by_mail.tpl
rename to template/yoga/mail/text/plain/notification_by_mail.tpl