Changeset 3400:765789715255

Timestamp:

11/09/16 23:27:55 (9 years ago)

Author:

Jean-Christian Denis

Branch:

default

Message:

Add blog status to Blogs filters, addresses #1566

Files:

• admin/blogs.php (modified) (4 diffs)
• inc/core/class.dc.core.php (modified) (1 diff)

admin/blogs.php

@@ -16 +16 @@
 
 # Filters
+$status_combo = array_merge(
+     array('-' => ''),
+     dcAdminCombos::getBlogStatusesCombo()
+);
+
 $sortby_combo = array(
 __('Last update') => 'blog_upddt',
 __('Blog name') => 'UPPER(blog_name)',
-__('Blog ID') => 'B.blog_id'
+__('Blog ID') => 'B.blog_id',
+__('Status') => 'blog_status'
 );
 
@@ -28 +34 @@
 
 $q = !empty($_GET['q']) ? $_GET['q'] : '';
+$status = isset($_GET['status']) ? $_GET['status'] : '';
 $sortby = !empty($_GET['sortby']) ? $_GET['sortby'] : 'blog_upddt';
 $order = !empty($_GET['order']) ? $_GET['order'] : 'desc';
@@ -47 +54 @@
      $params['q'] = $q;
      $show_filters = true;
+}
+
+# - Status filter
+if ($status !== '' && in_array($status,$status_combo)) {
+     $params['blog_status'] = $status;
+     $show_filters = true;
+} else {
+     $status='';
 }
 
@@ -108 +123 @@
      '<p><label for="q" class="ib">'.__('Search:').'</label> '.
      form::field('q',20,255,html::escapeHTML($q)).'</p>'.
+     '<p><label for="status" class="ib">'.__('Status:').'</label> '.
+     form::combo('status',$status_combo,$status).'</p>'.
      '</div>'.
 

inc/core/class.dc.core.php

@@ -1015 +1015 @@
           } elseif (!$this->auth->userID()) {
                $where = 'AND blog_status IN (1,0) ';
+          }
+
+          if (!empty($params['blog_status']) && $this->auth->isSuperAdmin()) {
+               $where = 'AND blog_status = '.(integer) $params['blog_status'].' ';
           }