Changeset 1107:3943962d69b8 for admin/posts.php

Timestamp:

02/27/13 11:48:32 (13 years ago)

Author:

JcDenis

Branch:

sexy

Parents:

880:02c78f56f430 (diff), 1105:ce855d61f9ce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with default branch in 2.5-RC

Files:

• admin/posts.php (modified) (1 diff)
• admin/posts.php (modified) (9 diffs)

admin/posts.php

@@ -108 +108 @@
 );
 $combo_action[__('Change')] = array();
+
 if ($core->auth->check('admin',$core->blog->id))
 {

admin/posts.php

@@ -15 +15 @@
 dcPage::check('usage,contentadmin');
 
-# Getting categories
-try {
-     $categories = $core->blog->getCategories(array('post_type'=>'post'));
-} catch (Exception $e) {
-     $core->error->add($e->getMessage());
-}
-
 # Getting authors
 try {
@@ -47 +40 @@
 {
      # Filter form we'll put in html_block
-     $users_combo = $categories_combo = array();
-     $users_combo['-'] = $categories_combo['-'] = '';
-     while ($users->fetch())
+     $users_combo = array();
+     $users_combo['-'] = '';
+     foreach ($users as $user)
      {
-          $user_cn = dcUtils::getUserCN($users->user_id,$users->user_name,
-          $users->user_firstname,$users->user_displayname);
+          $user_cn = dcUtils::getUserCN($user->user_id,$user->user_name,
+          $user->user_firstname,$user->user_displayname);
           
-          if ($user_cn != $users->user_id) {
-               $user_cn .= ' ('.$users->user_id.')';
+          if ($user_cn != $user->user_id) {
+               $user_cn .= ' ('.$user->user_id.')';
           }
           
-          $users_combo[$user_cn] = $users->user_id; 
-     }
-     
-     $categories_combo[__('None')] = 'NULL';
-     while ($categories->fetch()) {
-          $categories_combo[str_repeat('  ',$categories->level-1).($categories->level-1 == 0 ? '' : '• ').
-               html::escapeHTML($categories->cat_title).
-               ' ('.$categories->nb_post.')'] = $categories->cat_id;
+          $users_combo[$user_cn] = $user->user_id; 
      }
      
@@ -83 +69 @@
      # Months array
      $dt_m_combo['-'] = '';
-     while ($dates->fetch()) {
-          $dt_m_combo[dt::str('%B %Y',$dates->ts())] = $dates->year().$dates->month();
+     foreach($dates as $d) {
+          $dt_m_combo[dt::str('%B %Y',$d->ts())] = $d->year().$d->month();
      }
      
      $lang_combo['-'] = '';
-     while ($langs->fetch()) {
-          $lang_combo[$langs->post_lang] = $langs->post_lang;
+     foreach($langs as $l) {
+          $lang_combo[$l->post_lang] = $l->post_lang;
      }
      
@@ -95 +81 @@
      __('Date') => 'post_dt',
      __('Title') => 'post_title',
-     __('Category') => 'cat_title',
      __('Author') => 'user_id',
      __('Status') => 'post_status',
@@ -122 +107 @@
      __('Mark as unselected') => 'unselected'
 );
-$combo_action[__('Change')] = array(
-     __('Change category') => 'category',
-     __('Change language') => 'lang');
+$combo_action[__('Change')] = array();
+
 if ($core->auth->check('admin',$core->blog->id))
 {
@@ -141 +125 @@
 -------------------------------------------------------- */
 $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'] : '';
@@ -170 +153 @@
 } else {
      $user_id='';
-}
-
-# - Categories filter
-if ($cat_id !== '' && in_array($cat_id,$categories_combo)) {
-     $params['cat_id'] = $cat_id;
-     $show_filters = true;
-} else {
-     $cat_id='';
 }
 
@@ -265 +240 @@
      '<label for="user_id">'.__('Author:').
      form::combo('user_id',$users_combo,$user_id).'</label> '.
-     '<label for="cat_id">'.__('Category:').
-     form::combo('cat_id',$categories_combo,$cat_id).'</label> '.
      '<label for="status">'.__('Status:').
      form::combo('status',$status_combo,$status).'</label> '.
@@ -307 +280 @@
      '<input type="submit" value="'.__('ok').'" /></p>'.
      form::hidden(array('user_id'),$user_id).
-     form::hidden(array('cat_id'),$cat_id).
      form::hidden(array('status'),$status).
      form::hidden(array('selected'),$selected).