Changeset 3522:187d31e91d0a

Timestamp:

01/20/17 19:13:43 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

blogs’ admin (ie not super-admin) got back their blogs’ list but only super-admin may do actions

Files:

• admin/blogs.php (modified) (4 diffs)
• inc/admin/lib.pager.php (modified) (2 diffs)

admin/blogs.php

@@ -13 +13 @@
 require dirname(__FILE__).'/../inc/admin/prepend.php';
 
-dcPage::checkSuper();
+dcPage::check('usage,contentadmin');
 
 # Filters
@@ -34 +34 @@
 
 # Actions
-$blogs_actions_page = new dcBlogsActionsPage($core,$core->adminurl->get("admin.blogs"));
 
-if ($blogs_actions_page->process()) {
-     return;
+if ($core->auth->isSuperAdmin()) {
+     $blogs_actions_page = new dcBlogsActionsPage($core,$core->adminurl->get("admin.blogs"));
+     if ($blogs_actions_page->process()) {
+          return;
+     }
 }
 
@@ -128 +130 @@
      '<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>'.
+     ($core->auth->isSuperAdmin() ?
+          '<p><label for="status" class="ib">'.__('Status:').'</label> '.
+          form::combo('status',$status_combo,$status).'</p>' : '').
      '</div>'.
 
@@ -149 +152 @@
      # Show blogs
      $blog_list->display($page,$nb_per_page,
-     '<form action="'.$core->adminurl->get("admin.blogs").'" method="post" id="form-blogs">'.
+     ($core->auth->isSuperAdmin() ?
+          '<form action="'.$core->adminurl->get("admin.blogs").'" method="post" id="form-blogs">' : '').
 
      '%s'.
 
-     '<div class="two-cols">'.
-     '<p class="col checkboxes-helpers"></p>'.
+     ($core->auth->isSuperAdmin() ?
+          '<div class="two-cols">'.
+          '<p class="col checkboxes-helpers"></p>'.
 
-     '<p class="col right"><label for="action" class="classic">'.__('Selected blogs action:').'</label> '.
-     form::combo('action',$blogs_actions_page->getCombo(),'online','','','','title="'.__('Actions').'"').
-     $core->formNonce().
-     '<input id="do-action" type="submit" value="'.__('ok').'" /></p>'.
-     form::hidden(array('sortby'),$sortby).
-     form::hidden(array('order'),$order).
-     form::hidden(array('status'),$status).
-     form::hidden(array('page'),$page).
-     form::hidden(array('nb'),$nb_per_page).
-     '</div>'.
+          '<p class="col right"><label for="action" class="classic">'.__('Selected blogs action:').'</label> '.
+          form::combo('action',$blogs_actions_page->getCombo(),'online','','','','title="'.__('Actions').'"').
+          $core->formNonce().
+          '<input id="do-action" type="submit" value="'.__('ok').'" /></p>'.
+          '</div>'.
 
-     '<div>'.
-     '<p><label for="pwd">'.__('Please give your password to confirm blog(s) deletion:').'</label> '.
-     form::password('pwd',20,255).'</p>'.
-     '</div>'.
+          '<div>'.
+          '<p><label for="pwd">'.__('Please give your password to confirm blog(s) deletion:').'</label> '.
+          form::password('pwd',20,255).'</p>'.
+          '</div>'.
 
-     '</form>',
+          form::hidden(array('sortby'),$sortby).
+          form::hidden(array('order'),$order).
+          form::hidden(array('status'),$status).
+          form::hidden(array('page'),$page).
+          form::hidden(array('nb'),$nb_per_page).
+
+          '</form>' : ''),
      $show_filters
      );

inc/admin/lib.pager.php

@@ -686 +686 @@
 
                $cols = array(
-                    'blog' => '<th colspan="2" scope="col" abbr="comm" class="first nowrap">'.__('Blog id').'</th>',
+                    'blog' => '<th'.
+                         ($this->core->auth->isSuperAdmin() ? ' colspan="2"' : '').
+                         ' scope="col" abbr="comm" class="first nowrap">'.__('Blog id').'</th>',
                     'name' => '<th scope="col" abbr="name">'.__('Blog name').'</th>',
                     'url' => '<th scope="col" class="nowrap">'.__('URL').'</th>',
@@ -734 +736 @@
           $cols = array(
                'check' =>
+                    ($this->core->auth->isSuperAdmin() ?
                     '<td class="nowrap">'.
                     form::checkbox(array('blogs[]'),$this->rs->blog_id,$checked,'','',0).
-                    '</td>',
+                    '</td>' : ''),
                'blog' =>
                     '<td class="nowrap">'.
-                    '<a href="'.$this->core->adminurl->get("admin.blog",array('id' => $blog_id)).'"  '.
-                    'title="'.sprintf(__('Edit blog settings for %s'),$blog_id).'">'.
-                    '<img src="images/edit-mini.png" alt="'.__('Edit blog settings').'" /> '.$blog_id.'</a> '.
+                    ($this->core->auth->isSuperAdmin() ?
+                         '<a href="'.$this->core->adminurl->get("admin.blog",array('id' => $blog_id)).'"  '.
+                              'title="'.sprintf(__('Edit blog settings for %s'),$blog_id).'">'.
+                              '<img src="images/edit-mini.png" alt="'.__('Edit blog settings').'" /> '.$blog_id.'</a> ' :
+                         $blog_id.' ').
                     '</td>',
                'name' =>