adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-11 19:23:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature:2538 Make a unified messages management

Browse Source 
use only $page['infos'] and $page['errors'] vars and and necessary template to all main pages

git-svn-id: http://piwigo.org/svn/trunk@12764 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2011-12-18 21:46:24 +00:00
parent f500499530
commit ca230a6f53
25 changed files with 83 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/common.inc.php
+4 -1
View File
@@ -63,7 +63,10 @@ if ( !empty($_SERVER["PATH_INFO"]) )
// rewriting of language and otherarray values via URI params
//
$conf = array();
$page = array();
$page = array(
'infos' => array(),
'errors' => array(),
);
$user = array();
$lang = array();
$header_msgs = array();
include/page_header.php
+16
View File
@@ -98,6 +98,22 @@ if ( isset( $refresh ) and intval($refresh) >= 0
));
}
// messages
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());
include/picture_comment.inc.php
+4 -9
View File
@@ -53,28 +53,23 @@ if ( $page['show_comments'] and isset( $_POST['content'] ) )
include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
$comment_action = insert_user_comment($comm, @$_POST['key'], $infos );
$comment_action = insert_user_comment($comm, @$_POST['key'], $page['infos']);
switch ($comment_action)
{
case 'moderate':
array_push( $infos, l10n('An administrator must authorize your comment before it is visible.') );
array_push($page['infos'], l10n('An administrator must authorize your comment before it is visible.') );
case 'validate':
array_push( $infos, l10n('Your comment has been registered'));
array_push($page['infos'], l10n('Your comment has been registered'));
break;
case 'reject':
set_status_header(403);
array_push($infos, l10n('Your comment has NOT been registered because it did not pass the validation rules') );
array_push($page['errors'], l10n('Your comment has NOT been registered because it did not pass the validation rules') );
break;
default:
trigger_error('Invalid comment action '.$comment_action, E_USER_WARNING);
}
$template->assign(
($comment_action=='reject') ? 'errors' : 'infos',
$infos
);
// allow plugins to notify what's going on
trigger_action( 'user_comment_insertion',
array_merge($comm, array('action'=>$comment_action) )