feature:2538 little rework of messages system, now can be used on 'loc_end_index' and 'loc_end_picture'

git-svn-id: http://piwigo.org/svn/trunk@15578 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 43 insertions, 16 deletions

diff --git a/include/page_header.php b/include/page_header.php
index cfdf03e74..69e17e771 100644
--- a/include/page_header.php
+++ b/include/page_header.php
@@ -99,22 +99,7 @@ if ( isset( $refresh ) and intval($refresh) >= 0
           )
       ));
 }
-else
-{// messages only if no redirection
-  foreach (array('errors','infos') as $mode)
-  {
-    if (isset($_SESSION['page_'.$mode]))
-    {
-      $page[$mode] = array_merge($page[$mode], $_SESSION['page_'.$mode]);
-      unset($_SESSION['page_'.$mode]);
-    }
-
-    if (count($page[$mode]) != 0)
-    {
-      $template->assign($mode, $page[$mode]);
-    }
-  }
-}
+
 trigger_action('loc_end_page_header');
 
 header('Content-Type: text/html; charset='.get_pwg_charset());
diff --git a/include/page_messages.php b/include/page_messages.php
new file mode 100644
index 000000000..aea8d7afd
--- /dev/null
+++ b/include/page_messages.php
@@ -0,0 +1,42 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// messages only if no redirection
+if ($template->get_template_vars('page_refresh') === null)
+{
+  foreach (array('errors','infos') as $mode)
+  {
+    if (isset($_SESSION['page_'.$mode]))
+    {
+      $page[$mode] = array_merge($page[$mode], $_SESSION['page_'.$mode]);
+      unset($_SESSION['page_'.$mode]);
+    }
+
+    if (count($page[$mode]) != 0)
+    {
+      $template->assign($mode, $page[$mode]);
+    }
+  }
+}
+
+?>
\ No newline at end of file