archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@15578 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2012-06-06 20:29:30 +00:00
commit 8c4a87a0f5
14 changed files with 55 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
about.php
View file

@ -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');
?>

1
comments.php
View file

@ -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');
?>

1
identification.php
View file

@ -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');
?>

15
include/page_header.php
View file

@ -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());

42
include/page_messages.php Normal file
View file

@ -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]);
}
}
}
?>

1
index.php
View file

@ -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();

1
nbm.php
View file

@ -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');
?>

1
notification.php
View file

@ -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');

1
password.php
View file

@ -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');

1
picture.php
View file

@ -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');

1
profile.php
View file

@ -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');
}

1
register.php
View file

@ -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');
?>

1
search.php
View file

@ -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');
?>

1
tags.php
View file

@ -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');
?>