Changeset 2089 for trunk

Timestamp:

Sep 12, 2007, 6:01:54 AM (17 years ago)

Author:

rvelices

Message:

merge -r2088 from branch-1_7 to trunk

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

Location:

trunk

Files:

• admin/notification_by_mail.php (modified) (10 diffs)
• admin/user_list.php (modified) (3 diffs)
• include/functions.inc.php (modified) (6 diffs)
• template/yoga/admin/user_list.tpl (modified) (1 diff)

trunk/admin/notification_by_mail.php

@@ -85 +85 @@
       $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));
@@ -165 +165 @@
       array_push
       (
-        $inserts, 
+        $inserts,
         array
         (
@@ -176 +176 @@
       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'])
         )
@@ -204 +204 @@
         $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'));
       }
     }
@@ -219 +219 @@
   global $conf, $page, $user, $lang_info, $lang, $env_nbm;
   $return_list = array();
-  
+
   if (in_array($action, array('list_to_send', 'send')))
   {
@@ -314 +314 @@
                   array
                   (
-                    'DATE_BETWEEN_1' => $nbm_user['last_send'], 
+                    'DATE_BETWEEN_1' => $nbm_user['last_send'],
                     'DATE_BETWEEN_2' => $dbnow,
                     'END_PUNCT' => $end_punct
@@ -422 +422 @@
             }
           }
-          
+
           // unset env nbm user
           unset_user_on_env_nbm();
@@ -520 +520 @@
         }
       }
-    
+
       array_push($page['infos'],
         l10n_dec('nbm_updated_param_count', 'nbm_updated_params_count',
@@ -587 +587 @@
      (
       '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'))
      ),
@@ -627 +627 @@
   $template->assign_block_vars
   (
-    'repost', 
+    'repost',
       array
       (

trunk/admin/user_list.php

@@ -441 +441 @@
     PHPWG_ROOT_PATH.
     'admin.php'.
-    get_query_string_diff(
-      array(
-        'start'
-        )
-      )
+    get_query_string_diff(array(), false)
     );
 }
@@ -835 +831 @@
 
   $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(
@@ -860 +855 @@
       'GROUPS' => $groups_string,
       'PROPERTIES' => implode( ',', $properties),
-
       )
     );

trunk/include/functions.inc.php

@@ -430 +430 @@
 
   $do_log = trigger_event('pwg_log_allowed', $do_log, $image_id, $image_type);
-  
+
   if (!$do_log)
   {
@@ -460 +460 @@
   list($curyear, $curmonth, $curday) = explode('-', $curdate);
   list($curhour) = explode(':', $curtime);
-  
+
   $query = '
 INSERT INTO '.HISTORY_TABLE.'
@@ -713 +713 @@
  *
  * @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 = '';
@@ -727 +728 @@
     if (!in_array($key, $rejects))
     {
-      $query_string.= $is_first ? '?' : '&';
+      $query_string.= $is_first ? '?' : ($escape ? '&' : '&' );
       $is_first = false;
       $query_string.= $key.'='.$value;
@@ -840 +841 @@
     $thumbnail_title = '';
   }
-  
+
   if (!empty($element_info['filesize']))
   {
@@ -1076 +1077 @@
  *
  * @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

trunk/template/yoga/admin/user_list.tpl

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