mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-26 11:19:55 +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

24
admin/notification_by_mail.php
View file

@ -84,7 +84,7 @@ function do_timeout_treatment($post_keyname, $check_key_treated = array())
$must_repost = true;
array_push($page['errors'],
l10n_dec('nbm_background_treatment_redirect_second',
l10n_dec('nbm_background_treatment_redirect_second',
'nbm_background_treatment_redirect_seconds',
$time_refresh));
}
@ -164,7 +164,7 @@ order by
// Insert new nbm_users
array_push
(
$inserts,
$inserts,
array
(
'user_id' => $nbm_user['user_id'],
@ -175,10 +175,10 @@ order by
array_push
(
$page['infos'],
$page['infos'],
sprintf(
l10n('nbm_user_x_added'),
$nbm_user['username'],
l10n('nbm_user_x_added'),
$nbm_user['username'],
get_email_address_as_display_text($nbm_user['mail_address'])
)
);
@ -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'));
}
}
}
@ -218,7 +218,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l
{
global $conf, $page, $user, $lang_info, $lang, $env_nbm;
$return_list = array();
if (in_array($action, array('list_to_send', 'send')))
{
list($dbnow) = mysql_fetch_row(pwg_query('SELECT NOW();'));
@ -313,7 +313,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l
'content_new_elements_between',
array
(
'DATE_BETWEEN_1' => $nbm_user['last_send'],
'DATE_BETWEEN_1' => $nbm_user['last_send'],
'DATE_BETWEEN_2' => $dbnow,
'END_PUNCT' => $end_punct
)
@ -421,7 +421,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l
array_push($return_list, $nbm_user);
}
}
// unset env nbm user
unset_user_on_env_nbm();
}
@ -519,7 +519,7 @@ where
$updated_param_count += 1;
}
}
array_push($page['infos'],
l10n_dec('nbm_updated_param_count', 'nbm_updated_params_count',
$updated_param_count));
@ -586,7 +586,7 @@ if (is_autorize_status(ACCESS_WEBMASTER))
'param' => array
(
'caption' => l10n('nbm_param_mode'),
'url' => add_url_params($base_url.get_query_string_diff(array('mode', 'select')),
'url' => add_url_params($base_url.get_query_string_diff(array('mode', 'select')),
array('mode' => 'param'))
),
'subscribe' => array
@ -626,7 +626,7 @@ if ($must_repost)
$template->assign_block_vars
(
'repost',
'repost',
array
(
'REPOST_SUBMIT_NAME' => $repost_submit_name

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

13
include/functions.inc.php
View file

@ -429,7 +429,7 @@ function pwg_log($image_id = null, $image_type = null)
}
$do_log = trigger_event('pwg_log_allowed', $do_log, $image_id, $image_type);
if (!$do_log)
{
return false;
@ -459,7 +459,7 @@ SELECT CURDATE(), CURTIME()
list($curyear, $curmonth, $curday) = explode('-', $curdate);
list($curhour) = explode(':', $curtime);
$query = '
INSERT INTO '.HISTORY_TABLE.'
(
@ -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;
}
@ -839,7 +840,7 @@ function get_thumbnail_title($element_info)
{
$thumbnail_title = '';
}
if (!empty($element_info['filesize']))
{
$thumbnail_title .= ' : '.l10n_dec('%d Kb', '%d Kb', $element_info['filesize']);
@ -1075,7 +1076,7 @@ function get_l10n_args($key, $args)
* returns a string with formated with l10n_args elements
*
* @param element/array $key_args: element or array of l10n_args elements
* @param $sep: if $key_args is array,
* @param $sep: if $key_args is array,
* separator is used when translated l10n_args elements are concated
* @return string
*/

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>