From 69d0dae55d52338e5ef96074e2af2215a93b63fa Mon Sep 17 00:00:00 2001 From: rvelices Date: Wed, 12 Sep 2007 04:01:54 +0000 Subject: merge -r2088 from branch-1_7 to trunk - 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 --- admin/notification_by_mail.php | 24 ++++++++++++------------ admin/user_list.php | 10 ++-------- include/functions.inc.php | 13 +++++++------ template/yoga/admin/user_list.tpl | 2 +- 4 files changed, 22 insertions(+), 27 deletions(-) diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php index 8d1cc6520..377aed03e 100644 --- a/admin/notification_by_mail.php +++ b/admin/notification_by_mail.php @@ -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 diff --git a/admin/user_list.php b/admin/user_list.php index 8e3e06d65..8845f4ebe 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -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); diff --git a/include/functions.inc.php b/include/functions.inc.php index 310380ca9..b58d67d78 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -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 */ diff --git a/template/yoga/admin/user_list.tpl b/template/yoga/admin/user_list.tpl index 355d6894b..e4e810a0e 100644 --- a/template/yoga/admin/user_list.tpl +++ b/template/yoga/admin/user_list.tpl @@ -58,7 +58,7 @@ - + -- cgit v1.2.3