Changeset 2088
- Timestamp:
- Sep 12, 2007, 5:52:16 AM (17 years ago)
- Location:
- branches/branch-1_7
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/branch-1_7/admin/notification_by_mail.php
r2060 r2088 85 85 $must_repost = true; 86 86 array_push($page['errors'], 87 l10n_dec('nbm_background_treatment_redirect_second', 87 l10n_dec('nbm_background_treatment_redirect_second', 88 88 'nbm_background_treatment_redirect_seconds', 89 89 $time_refresh)); … … 165 165 array_push 166 166 ( 167 $inserts, 167 $inserts, 168 168 array 169 169 ( … … 176 176 array_push 177 177 ( 178 $page['infos'], 178 $page['infos'], 179 179 sprintf( 180 l10n('nbm_user_x_added'), 181 $nbm_user['username'], 180 l10n('nbm_user_x_added'), 181 $nbm_user['username'], 182 182 get_email_address_as_display_text($nbm_user['mail_address']) 183 183 ) … … 204 204 $result = pwg_query($query); 205 205 206 redirect($base_url.get_query_string_diff(array() ), l10n('nbm_redirect_msg'));206 redirect($base_url.get_query_string_diff(array(), false), l10n('nbm_redirect_msg')); 207 207 } 208 208 } … … 219 219 global $conf, $page, $user, $lang_info, $lang, $env_nbm; 220 220 $return_list = array(); 221 221 222 222 if (in_array($action, array('list_to_send', 'send'))) 223 223 { … … 314 314 array 315 315 ( 316 'DATE_BETWEEN_1' => $nbm_user['last_send'], 316 'DATE_BETWEEN_1' => $nbm_user['last_send'], 317 317 'DATE_BETWEEN_2' => $dbnow, 318 318 'END_PUNCT' => $end_punct … … 422 422 } 423 423 } 424 424 425 425 // unset env nbm user 426 426 unset_user_on_env_nbm(); … … 520 520 } 521 521 } 522 522 523 523 array_push($page['infos'], 524 524 l10n_dec('nbm_updated_param_count', 'nbm_updated_params_count', … … 587 587 ( 588 588 'caption' => l10n('nbm_param_mode'), 589 'url' => add_url_params($base_url.get_query_string_diff(array('mode', 'select')), 589 'url' => add_url_params($base_url.get_query_string_diff(array('mode', 'select')), 590 590 array('mode' => 'param')) 591 591 ), … … 627 627 $template->assign_block_vars 628 628 ( 629 'repost', 629 'repost', 630 630 array 631 631 ( -
branches/branch-1_7/admin/user_list.php
r2042 r2088 257 257 array_push($page['errors'], l10n('Guest cannot be deleted')); 258 258 } 259 if (($conf['guest_id'] != $conf['default_user_id']) and 259 if (($conf['guest_id'] != $conf['default_user_id']) and 260 260 in_array($conf['default_user_id'], $collection)) 261 261 { … … 354 354 'show_nb_hits', 'maxheight', 'status', 'enabled_high'); 355 355 356 $true_false_fields = array('expand', 'show_nb_comments', 356 $true_false_fields = array('expand', 'show_nb_comments', 357 357 'show_nb_hits', 'enabled_high'); 358 358 if ($conf['allow_adviser']) … … 439 439 PHPWG_ROOT_PATH. 440 440 'admin.php'. 441 get_query_string_diff( 442 array( 443 'start' 444 ) 445 ) 441 get_query_string_diff(array(), false) 446 442 ); 447 443 } … … 837 833 'EMAIL' => get_email_address_as_display_text($local_user['email']), 838 834 'GROUPS' => $groups_string, 839 'PROPERTIES' => 835 'PROPERTIES' => 840 836 (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true')) 841 837 ? $lang['is_high_enabled'] : $lang['is_high_disabled'] -
branches/branch-1_7/include/functions.inc.php
r2085 r2088 429 429 430 430 $do_log = trigger_event('pwg_log_allowed', $do_log, $image_id, $image_type); 431 431 432 432 if (!$do_log) 433 433 { … … 459 459 list($curyear, $curmonth, $curday) = explode('-', $curdate); 460 460 list($curhour) = explode(':', $curtime); 461 461 462 462 $query = ' 463 463 INSERT INTO '.HISTORY_TABLE.' … … 712 712 * 713 713 * @param array $rejects 714 * @param boolean $escape - if true escape & to & (for html) 714 715 * @returns string 715 716 */ 716 function get_query_string_diff($rejects = array())717 function get_query_string_diff($rejects=array(), $escape=true) 717 718 { 718 719 $query_string = ''; … … 726 727 if (!in_array($key, $rejects)) 727 728 { 728 $query_string.= $is_first ? '?' : '&';729 $query_string.= $is_first ? '?' : ($escape ? '&' : '&' ); 729 730 $is_first = false; 730 731 $query_string.= $key.'='.$value; … … 838 839 $thumbnail_title = ''; 839 840 } 840 841 841 842 if (!empty($element_info['filesize'])) 842 843 { … … 1074 1075 * 1075 1076 * @param element/array $key_args: element or array of l10n_args elements 1076 * @param $sep: if $key_args is array, 1077 * @param $sep: if $key_args is array, 1077 1078 * separator is used when translated l10n_args elements are concated 1078 1079 * @return string
Note: See TracChangeset
for help on using the changeset viewer.