Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
feature:2538 little rework of messages system, now can be used on 'lo…
…c_end_index' and 'loc_end_picture'

git-svn-id: http://piwigo.org/svn/trunk@15578 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
mistic100 committed Jun 6, 2012
1 parent e11d4eb commit 8c4a87a
Show file tree
Hide file tree
Showing 14 changed files with 55 additions and 16 deletions.
1 change: 1 addition & 0 deletions about.php
Expand Up @@ -57,6 +57,7 @@
}

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 change: 1 addition & 0 deletions comments.php
Expand Up @@ -549,6 +549,7 @@
// | 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 change: 1 addition & 0 deletions identification.php
Expand Up @@ -107,6 +107,7 @@

//----------------------------------------------------------- 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');
?>
17 changes: 1 addition & 16 deletions include/page_header.php
Expand Up @@ -99,22 +99,7 @@
)
));
}
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());
Expand Down
42 changes: 42 additions & 0 deletions 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]);
}
}
}

?>
1 change: 1 addition & 0 deletions index.php
Expand Up @@ -341,6 +341,7 @@

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();
Expand Down
1 change: 1 addition & 0 deletions nbm.php
Expand Up @@ -76,6 +76,7 @@
// | 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 change: 1 addition & 0 deletions notification.php
Expand Up @@ -112,6 +112,7 @@ function find_available_feed_id()
// | 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');

Expand Down
1 change: 1 addition & 0 deletions password.php
Expand Up @@ -354,6 +354,7 @@ function reset_password()
// +-----------------------------------------------------------------------+

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

Expand Down
1 change: 1 addition & 0 deletions picture.php
Expand Up @@ -980,6 +980,7 @@ function default_picture_content($content, $element_info)

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');
Expand Down
1 change: 1 addition & 0 deletions profile.php
Expand Up @@ -85,6 +85,7 @@

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');
}
Expand Down
1 change: 1 addition & 0 deletions register.php
Expand Up @@ -128,6 +128,7 @@
}

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 change: 1 addition & 0 deletions search.php
Expand Up @@ -231,6 +231,7 @@

//------------------------------------------------------------ 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 change: 1 addition & 0 deletions tags.php
Expand Up @@ -202,6 +202,7 @@ function id_compare($a, $b)
}

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

0 comments on commit 8c4a87a

Please sign in to comment.