From 8c4a87a0f5cd0b4518f261f9eaccff8143701c9f Mon Sep 17 00:00:00 2001
From: mistic100 <mistic@piwigo.org>
Date: Wed, 6 Jun 2012 20:29:30 +0000
Subject: 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
---
 about.php                 |  1 +
 comments.php              |  1 +
 identification.php        |  1 +
 include/page_header.php   | 17 +----------------
 include/page_messages.php | 42 ++++++++++++++++++++++++++++++++++++++++++
 index.php                 |  1 +
 nbm.php                   |  1 +
 notification.php          |  1 +
 password.php              |  1 +
 picture.php               |  1 +
 profile.php               |  1 +
 register.php              |  1 +
 search.php                |  1 +
 tags.php                  |  1 +
 14 files changed, 55 insertions(+), 16 deletions(-)
 create mode 100644 include/page_messages.php

diff --git a/about.php b/about.php
index fcae794ab..7cf246baf 100644
--- a/about.php
+++ b/about.php
@@ -57,6 +57,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theAboutPage', $themeconf['
 }
 
 include(PHPWG_ROOT_PATH.'include/page_header.php');
+include(PHPWG_ROOT_PATH.'include/page_messages.php');
 $template->pparse('about');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
diff --git a/comments.php b/comments.php
index 5a7163fd9..d23e992c7 100644
--- a/comments.php
+++ b/comments.php
@@ -549,6 +549,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theCommentsPage', $themecon
 // |                           html code display                           |
 // +-----------------------------------------------------------------------+
 include(PHPWG_ROOT_PATH.'include/page_header.php');
+include(PHPWG_ROOT_PATH.'include/page_messages.php');
 $template->pparse('comments');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
\ No newline at end of file
diff --git a/identification.php b/identification.php
index 4a8e65e6b..0ddc20014 100644
--- a/identification.php
+++ b/identification.php
@@ -107,6 +107,7 @@ if (!$conf['gallery_locked'] && (!isset($themeconf['hide_menu_on']) OR !in_array
 
 //----------------------------------------------------------- html code display
 include(PHPWG_ROOT_PATH.'include/page_header.php');
+include(PHPWG_ROOT_PATH.'include/page_messages.php');
 $template->pparse('identification');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
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
diff --git a/index.php b/index.php
index 0646461a5..c6ee29d96 100644
--- a/index.php
+++ b/index.php
@@ -341,6 +341,7 @@ if (!empty($page['cat_slideshow_url']))
 
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 trigger_action('loc_end_index');
+include(PHPWG_ROOT_PATH.'include/page_messages.php');
 $template->pparse('index');
 //------------------------------------------------------------ log informations
 pwg_log();
diff --git a/nbm.php b/nbm.php
index 4fb5f9213..4ce08fddb 100644
--- a/nbm.php
+++ b/nbm.php
@@ -76,6 +76,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theNBMPage', $themeconf['hi
 // | html code display                                                     |
 // +-----------------------------------------------------------------------+
 include(PHPWG_ROOT_PATH.'include/page_header.php');
+include(PHPWG_ROOT_PATH.'include/page_messages.php');
 $template->parse('nbm');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
diff --git a/notification.php b/notification.php
index 0be9aa8b7..716993755 100644
--- a/notification.php
+++ b/notification.php
@@ -112,6 +112,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theNotificationPage', $them
 // |                           html code display                           |
 // +-----------------------------------------------------------------------+
 include(PHPWG_ROOT_PATH.'include/page_header.php');
+include(PHPWG_ROOT_PATH.'include/page_messages.php');
 $template->pparse('notification');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 
diff --git a/password.php b/password.php
index 70c3185e0..58b8ece3a 100644
--- a/password.php
+++ b/password.php
@@ -354,6 +354,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('thePasswordPage', $themecon
 // +-----------------------------------------------------------------------+
 
 include(PHPWG_ROOT_PATH.'include/page_header.php');
+include(PHPWG_ROOT_PATH.'include/page_messages.php');
 $template->pparse('password');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 
diff --git a/picture.php b/picture.php
index 649c54311..6048aa2e0 100644
--- a/picture.php
+++ b/picture.php
@@ -980,6 +980,7 @@ if ($conf['picture_menu'] AND (!isset($themeconf['hide_menu_on']) OR !in_array('
 
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 trigger_action('loc_end_picture');
+include(PHPWG_ROOT_PATH.'include/page_messages.php');
 if ($page['slideshow'] and $conf['light_slideshow'])
 {
   $template->pparse('slideshow');
diff --git a/profile.php b/profile.php
index 6dff2ce69..259b0e382 100644
--- a/profile.php
+++ b/profile.php
@@ -85,6 +85,7 @@ SELECT '.implode(',', $fields).'
   
   include(PHPWG_ROOT_PATH.'include/page_header.php');
   trigger_action('loc_end_profile');
+  include(PHPWG_ROOT_PATH.'include/page_messages.php');
   $template->pparse('profile');
   include(PHPWG_ROOT_PATH.'include/page_tail.php');
 }
diff --git a/register.php b/register.php
index 8b8f1be61..afc0dfaec 100644
--- a/register.php
+++ b/register.php
@@ -128,6 +128,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theRegisterPage', $themecon
 }
 
 include(PHPWG_ROOT_PATH.'include/page_header.php');
+include(PHPWG_ROOT_PATH.'include/page_messages.php');
 $template->parse('register');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
diff --git a/search.php b/search.php
index 043cbcd70..f7db92269 100644
--- a/search.php
+++ b/search.php
@@ -231,6 +231,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theSearchPage', $themeconf[
 
 //------------------------------------------------------------ html code display
 include(PHPWG_ROOT_PATH.'include/page_header.php');
+include(PHPWG_ROOT_PATH.'include/page_messages.php');
 $template->pparse('search');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
diff --git a/tags.php b/tags.php
index 1f7a766b2..da61d6cd3 100644
--- a/tags.php
+++ b/tags.php
@@ -202,6 +202,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theTagsPage', $themeconf['h
 }
 
 include(PHPWG_ROOT_PATH.'include/page_header.php');
+include(PHPWG_ROOT_PATH.'include/page_messages.php');
 $template->pparse('tags');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
\ No newline at end of file
-- 
cgit v1.2.3