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

feature 2761: Pass all kind of messages through session on admin

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@18463 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2012-10-04 16:03:25 +00:00
parent b1cec7bf86
commit b3e71e424c
3 changed files with 4 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
admin.php
View file

@ -156,16 +156,6 @@ else
$page['page'] = 'intro';
}
$page['errors'] = array();
$page['infos'] = array();
$page['warnings'] = array();
if (isset($_SESSION['page_infos']))
{
$page['infos'] = array_merge($page['infos'], $_SESSION['page_infos']);
unset($_SESSION['page_infos']);
}
$link_start = PHPWG_ROOT_PATH.'admin.php?page=';
$conf_link = $link_start.'configuration&section=';
@ -290,27 +280,8 @@ if (
trigger_action('loc_begin_admin_page');
include(PHPWG_ROOT_PATH.'admin/'.$page['page'].'.php');
// +-----------------------------------------------------------------------+
// | Errors, Infos & Warnings |
// +-----------------------------------------------------------------------+
$template->assign('ACTIVE_MENU', get_active_menu($page['page']));
if (count($page['errors']) != 0)
{
$template->assign('errors', $page['errors']);
}
if (count($page['infos']) != 0)
{
$template->assign('infos', $page['infos']);
}
if (count($page['warnings']) != 0)
{
$template->assign('warnings', $page['warnings']);
}
// +-----------------------------------------------------------------------+
// | Sending html code |
// +-----------------------------------------------------------------------+
@ -322,6 +293,8 @@ include(PHPWG_ROOT_PATH.'include/page_header.php');
trigger_action('loc_end_admin');
include(PHPWG_ROOT_PATH.'include/page_messages.php');
$template->pparse('admin');
include(PHPWG_ROOT_PATH.'include/page_tail.php');

1
include/common.inc.php
View file

@ -64,6 +64,7 @@ $conf = array();
$page = array(
'infos' => array(),
'errors' => array(),
'warnings' => array(),
);
$user = array();
$lang = array();

2
include/page_messages.php
View file

@ -24,7 +24,7 @@
// messages only if no redirection
if ($template->get_template_vars('page_refresh') === null)
{
foreach (array('errors','infos') as $mode)
foreach (array('errors','infos','warnings') as $mode)
{
if (isset($_SESSION['page_'.$mode]))
{