Changeset 796:43a9cace0f39

Timestamp:

02/08/12 23:10:39 (13 years ago)

Author:

Dsls <dsls@…>

Branch:

2.4

Message:

Far cleaner this way...

Location:

admin

Files:

• comments.php (modified) (6 diffs)
• posts.php (modified) (9 diffs)

admin/comments.php

@@ -45 +45 @@
 /* Get comments
 -------------------------------------------------------- */
-$author = isset($_GET['author']) ? html::escapeHTML($_GET['author']) : '';
-$status = isset($_GET['status']) ?      html::escapeHTML($_GET['status']) : '';
-$type = !empty($_GET['type']) ?         html::escapeHTML($_GET['type']) : '';
-$sortby = !empty($_GET['sortby']) ?     html::escapeHTML($_GET['sortby']) : 'comment_dt';
-$order = !empty($_GET['order']) ?       html::escapeHTML($_GET['order']) : 'desc';
-$ip = !empty($_GET['ip']) ?             html::escapeHTML($_GET['ip']) : '';
+$author = isset($_GET['author']) ? $_GET['author'] : '';
+$status = isset($_GET['status']) ?      $_GET['status'] : '';
+$type = !empty($_GET['type']) ?         $_GET['type'] : '';
+$sortby = !empty($_GET['sortby']) ?     $_GET['sortby'] : 'comment_dt';
+$order = !empty($_GET['order']) ?       $_GET['order'] : 'desc';
+$ip = !empty($_GET['ip']) ?             $_GET['ip'] : '';
 
 $with_spam = $author || $status || $type || $sortby != 'comment_dt' || $order != 'desc' || $ip;
@@ -73 +73 @@
      $params['q_author'] = $author;
      $show_filters = true;
+} else {
+     $author='';
 }
 
@@ -79 +81 @@
      $params['comment_trackback'] = ($type == 'tb');
      $show_filters = true;
+} else {
+     $type='';
 }
 
@@ -87 +91 @@
 } elseif (!$with_spam) {
      $params['comment_status_not'] = -2;
+     $status='';
+} else {
+     $status='';
 }
 
@@ -99 +106 @@
      if ($order !== '' && in_array($order,$order_combo)) {
           $params['order'] = $sortby.' '.$order;
+     } else {
+          $order = 'desc';
      }
      
@@ -104 +113 @@
           $show_filters = true;
      }
+} else {
+     $sortby = 'comment_dt';
+     $order = 'desc';
 }
 

admin/posts.php

@@ -138 +138 @@
 /* Get posts
 -------------------------------------------------------- */
-$user_id = !empty($_GET['user_id']) ?   html::escapeHTML($_GET['user_id']) : '';
-$cat_id = !empty($_GET['cat_id']) ?     html::escapeHTML($_GET['cat_id']) : '';
-$status = isset($_GET['status']) ? html::escapeHTML($_GET['status']) : '';
-$selected = isset($_GET['selected']) ?  html::escapeHTML($_GET['selected']) : '';
-$month = !empty($_GET['month']) ?       html::escapeHTML($_GET['month']) : '';
-$lang = !empty($_GET['lang']) ?         html::escapeHTML($_GET['lang']) : '';
-$sortby = !empty($_GET['sortby']) ?     html::escapeHTML($_GET['sortby']) : 'post_dt';
-$order = !empty($_GET['order']) ?       html::escapeHTML($_GET['order']) : 'desc';
+$user_id = !empty($_GET['user_id']) ?   $_GET['user_id'] : '';
+$cat_id = !empty($_GET['cat_id']) ?     $_GET['cat_id'] : '';
+$status = isset($_GET['status']) ? $_GET['status'] : '';
+$selected = isset($_GET['selected']) ?  $_GET['selected'] : '';
+$month = !empty($_GET['month']) ?       $_GET['month'] : '';
+$lang = !empty($_GET['lang']) ?         $_GET['lang'] : '';
+$sortby = !empty($_GET['sortby']) ?     $_GET['sortby'] : 'post_dt';
+$order = !empty($_GET['order']) ?       $_GET['order'] : 'desc';
 
 $show_filters = false;
@@ -166 +166 @@
      $params['user_id'] = $user_id;
      $show_filters = true;
+} else {
+     $user_id='';
 }
 
@@ -172 +174 @@
      $params['cat_id'] = $cat_id;
      $show_filters = true;
+} else {
+     $cat_id='';
 }
 
@@ -178 +182 @@
      $params['post_status'] = $status;
      $show_filters = true;
+} else {
+     $status='';
 }
 
@@ -184 +190 @@
      $params['post_selected'] = $selected;
      $show_filters = true;
+} else {
+     $selected='';
 }
 
@@ -191 +199 @@
      $params['post_year'] = substr($month,0,4);
      $show_filters = true;
+} else {
+     $month='';
 }
 
@@ -197 +207 @@
      $params['post_lang'] = $lang;
      $show_filters = true;
+} else {
+     $lang='';
 }
 
@@ -203 +215 @@
      if ($order !== '' && in_array($order,$order_combo)) {
           $params['order'] = $sortby.' '.$order;
+     } else {
+          $order='desc';
      }
      
@@ -208 +222 @@
           $show_filters = true;
      }
+} else {
+     $sortby='post_dt';
+     $order='desc';
 }