mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-26 19:29:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge -r2088 from branch-1_7 to trunk

Browse source 
- urls used in http redirections must not be html escaped (eg. should use & instead of &)

git-svn-id: http://piwigo.org/svn/trunk@2089 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2007-09-12 04:01:54 +00:00
parent 9aa5052f6d
commit 69d0dae55d
4 changed files with 22 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/notification_by_mail.php
View file

@ -203,7 +203,7 @@ order by
$query = 'delete from '.USER_MAIL_NOTIFICATION_TABLE.' where check_key in ('.implode(",", $quoted_check_key_list).');';
$result = pwg_query($query);
redirect($base_url.get_query_string_diff(array()), l10n('nbm_redirect_msg'));
redirect($base_url.get_query_string_diff(array(), false), l10n('nbm_redirect_msg'));
}
}
}

10
admin/user_list.php
View file

@ -440,11 +440,7 @@ DELETE FROM '.USER_GROUP_TABLE.'
redirect(
PHPWG_ROOT_PATH.
'admin.php'.
get_query_string_diff(
array(
'start'
)
)
get_query_string_diff(array(), false)
);
}
@ -834,12 +830,11 @@ foreach ($visible_user_list as $num => $local_user)
}
$properties = array();
$properties[] = l10n( sprintf('Level %d', $local_user['level']) );
$properties[] =
(isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true'))
? $lang['is_high_enabled'] : $lang['is_high_disabled'];
$properties[] = l10n( sprintf('Level %d', $local_user['level']) );
$template->assign_block_vars(
'user',
array(
@ -859,7 +854,6 @@ foreach ($visible_user_list as $num => $local_user)
'EMAIL' => get_email_address_as_display_text($local_user['email']),
'GROUPS' => $groups_string,
'PROPERTIES' => implode( ',', $properties),
)
);
trigger_action('loc_assign_block_var_local_user_list', $local_user);

5
include/functions.inc.php
View file

@ -712,9 +712,10 @@ function redirect( $url , $msg = '', $refresh_time = 0)
* returns $_SERVER['QUERY_STRING'] whitout keys given in parameters
*
* @param array $rejects
* @param boolean $escape - if true escape & to & (for html)
* @returns string
*/
function get_query_string_diff($rejects = array())
function get_query_string_diff($rejects=array(), $escape=true)
{
$query_string = '';
@ -726,7 +727,7 @@ function get_query_string_diff($rejects = array())
{
if (!in_array($key, $rejects))
{
$query_string.= $is_first ? '?' : '&';
$query_string.= $is_first ? '?' : ($escape ? '&' : '&' );
$is_first = false;
$query_string.= $key.'='.$value;
}

2
template/yoga/admin/user_list.tpl
View file

@ -58,7 +58,7 @@
</select>
</label>
<input class="submit" type="submit" name="submit_filter" value="{lang:submit}" />
<input class="submit" type="submit" value="{lang:submit}" />
</fieldset>