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

replaced page_messages.php with a function to call

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@20609 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2013-02-07 21:17:08 +00:00
parent e86d61a4d2
commit ec50a59f75
15 changed files with 35 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
about.php
View file

@ -57,7 +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');
flush_page_messages();
$template->pparse('about');
include(PHPWG_ROOT_PATH.'include/page_tail.php');
?>

2
admin.php
View file

@ -292,7 +292,7 @@ include(PHPWG_ROOT_PATH.'include/page_header.php');
trigger_action('loc_end_admin');
include(PHPWG_ROOT_PATH.'include/page_messages.php');
flush_page_messages();
$template->pparse('admin');

2
comments.php
View file

@ -609,7 +609,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theCommentsPage', $themecon
// +-----------------------------------------------------------------------+
include(PHPWG_ROOT_PATH.'include/page_header.php');
trigger_action('loc_end_comments');
include(PHPWG_ROOT_PATH.'include/page_messages.php');
flush_page_messages();
$template->pparse('comments');
include(PHPWG_ROOT_PATH.'include/page_tail.php');
?>

2
identification.php
View file

@ -110,7 +110,7 @@ if (!$conf['gallery_locked'] && (!isset($themeconf['hide_menu_on']) OR !in_array
//----------------------------------------------------------- html code display
include(PHPWG_ROOT_PATH.'include/page_header.php');
trigger_action('loc_end_identification');
include(PHPWG_ROOT_PATH.'include/page_messages.php');
flush_page_messages();
$template->pparse('identification');
include(PHPWG_ROOT_PATH.'include/page_tail.php');
?>

22
include/functions_html.inc.php
View file

@ -614,4 +614,26 @@ function get_element_url_protection_handler($url, $infos)
return get_action_url($infos['id'], 'e', false);
}
function flush_page_messages()
{
global $template, $page;
if ($template->get_template_vars('page_refresh') === null)
{
foreach (array('errors','infos','warnings') 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]);
}
}
}
}
?>

42
include/page_messages.php
View file

@ -1,42 +0,0 @@
<?php
// +-----------------------------------------------------------------------+
// | Piwigo - a PHP based photo gallery |
// +-----------------------------------------------------------------------+
// | Copyright(C) 2008-2013 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','warnings') 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]);
}
}
}
?>

2
index.php
View file

@ -333,7 +333,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');
flush_page_messages();
$template->parse_index_buttons();
$template->pparse('index');
//------------------------------------------------------------ log informations

2
nbm.php
View file

@ -76,7 +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');
flush_page_messages();
$template->parse('nbm');
include(PHPWG_ROOT_PATH.'include/page_tail.php');
?>

2
notification.php
View file

@ -115,7 +115,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theNotificationPage', $them
// +-----------------------------------------------------------------------+
include(PHPWG_ROOT_PATH.'include/page_header.php');
trigger_action('loc_end_notification');
include(PHPWG_ROOT_PATH.'include/page_messages.php');
flush_page_messages();
$template->pparse('notification');
include(PHPWG_ROOT_PATH.'include/page_tail.php');

2
password.php
View file

@ -357,7 +357,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('thePasswordPage', $themecon
include(PHPWG_ROOT_PATH.'include/page_header.php');
trigger_action('loc_end_password');
include(PHPWG_ROOT_PATH.'include/page_messages.php');
flush_page_messages();
$template->pparse('password');
include(PHPWG_ROOT_PATH.'include/page_tail.php');

2
picture.php
View file

@ -990,7 +990,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');
flush_page_messages();
if ($page['slideshow'] and $conf['light_slideshow'])
{
$template->pparse('slideshow');

2
profile.php
View file

@ -85,7 +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');
flush_page_messages();
$template->pparse('profile');
include(PHPWG_ROOT_PATH.'include/page_tail.php');
}

2
register.php
View file

@ -131,7 +131,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theRegisterPage', $themecon
include(PHPWG_ROOT_PATH.'include/page_header.php');
trigger_action('loc_end_register');
include(PHPWG_ROOT_PATH.'include/page_messages.php');
flush_page_messages();
$template->parse('register');
include(PHPWG_ROOT_PATH.'include/page_tail.php');
?>

2
search.php
View file

@ -234,7 +234,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theSearchPage', $themeconf[
//------------------------------------------------------------ html code display
include(PHPWG_ROOT_PATH.'include/page_header.php');
trigger_action('loc_end_search');
include(PHPWG_ROOT_PATH.'include/page_messages.php');
flush_page_messages();
$template->pparse('search');
include(PHPWG_ROOT_PATH.'include/page_tail.php');
?>

2
tags.php
View file

@ -203,7 +203,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theTagsPage', $themeconf['h
include(PHPWG_ROOT_PATH.'include/page_header.php');
trigger_action('loc_end_tags');
include(PHPWG_ROOT_PATH.'include/page_messages.php');
flush_page_messages();
$template->pparse('tags');
include(PHPWG_ROOT_PATH.'include/page_tail.php');
?>