Changeset 1989:b234959829da

Timestamp:

09/22/13 02:49:48 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

default

Message:

Revamp plugin maintenance, step 5, now open to admin user and various fixes, addresses #999

Files:

• locales/en/plugins.po (modified) (6 diffs)
• locales/fr/plugins.po (modified) (6 diffs)
• plugins/importExport/inc/lib.ie.maintenance.php (modified) (1 diff)
• plugins/maintenance/_admin.php (modified) (2 diffs)
• plugins/maintenance/_define.php (modified) (1 diff)
• plugins/maintenance/inc/class.dc.maintenance.php (modified) (1 diff)
• plugins/maintenance/inc/class.dc.maintenance.task.php (modified) (4 diffs)
• plugins/maintenance/inc/tasks/class.dc.maintenance.indexcomments.php (modified) (1 diff)
• plugins/maintenance/inc/tasks/class.dc.maintenance.indexposts.php (modified) (1 diff)
• plugins/maintenance/inc/tasks/class.dc.maintenance.zipmedia.php (modified) (1 diff)
• plugins/maintenance/inc/tasks/class.dc.maintenance.ziptheme.php (modified) (1 diff)
• plugins/maintenance/index.php (modified) (11 diffs)

locales/en/plugins.po

@@ -1003 +1003 @@
 msgstr ""
 
-msgid "Display count of expired tasks on maintenance dashboard icon"
-msgstr ""
-
-msgid "Display list of expired tasks on dashboard items"
+msgid "Display count of late tasks on maintenance dashboard icon"
+msgstr ""
+
+msgid "Display list of late tasks on dashboard items"
 msgstr ""
 
@@ -1036 +1036 @@
 msgstr ""
 
-msgid "Index all comments"
+msgid "Index all comments for search engine"
 msgstr ""
 
@@ -1052 +1052 @@
 msgstr ""
 
-msgid "Index all posts"
+msgid "Index all entries for search engine"
 msgstr ""
 
@@ -1106 +1106 @@
 msgstr ""
 
+msgid "You have not sufficient permissions to view this page"
+msgstr ""
+
 msgid "Settings successfully updated"
 msgstr ""
@@ -1121 +1124 @@
 msgstr ""
 
-msgid "Display alert messages on expired tasks"
+msgid "Display alert messages on late tasks"
 msgstr ""
 
@@ -1130 +1133 @@
 msgstr ""
 
-msgid "You can place list of expired tasks on your %s."
+msgid "You can place list of late tasks on your %s."
 msgstr ""
 

locales/fr/plugins.po

@@ -1219 +1219 @@
 msgstr "Gérer les tâches"
 
-msgid "Display count of expired tasks on maintenance dashboard icon"
-msgstr "Afficher le nombre de tâches expirées sur l'icône maintenance du tableau de bord"
-
-msgid "Display list of expired tasks on dashboard items"
-msgstr "Afficher la liste des tâches expirées dans les éléments du tableau de bord"
+msgid "Display count of late tasks on maintenance dashboard icon"
+msgstr "Afficher le nombre de tâches en retard sur l'icône maintenance du tableau de bord"
+
+msgid "Display list of late tasks on dashboard items"
+msgstr "Afficher la liste des tâches en retard dans les éléments du tableau de bord"
 
 msgid "Failed to execute task."
@@ -1252 +1252 @@
 msgstr "Index du moteur de recherche"
 
-msgid "Index all comments"
-msgstr "Indexation de tous les commentaires"
+msgid "Index all comments for search engine"
+msgstr "Indexer tous les commentaires pour le moteur de recherche"
 
 msgid "Next"
@@ -1267 +1267 @@
 msgstr "Impossible d'indexer les commentaires."
 
-msgid "Index all posts"
-msgstr "Indexation de tous les billets"
+msgid "Index all entries for search engine"
+msgstr "Indexer tous les billets pour le moteur de recherche"
 
 msgid "Indexing entry %d to %d."
@@ -1321 +1321 @@
 msgstr "Jamais"
 
+msgid "You have not sufficient permissions to view this page"
+msgstr "Vous n'avez pas les autorisations suffisantes pour accéder à cette page"
+
 msgid "Settings successfully updated"
 msgstr "Paramètres mis à jour avec succès"
 
 msgid "You should execute it now."
-msgstr "Vous devriez l'exécuter à nouveau."
+msgstr "Vous devriez l'exécuter dès maintenant."
 
 msgid "Execute task"
@@ -1336 +1339 @@
 msgstr "Paramètres"
 
-msgid "Display alert messages on expired tasks"
-msgstr "Afficher les messages d'alert sur les tâches expirées."
+msgid "Display alert messages on late tasks"
+msgstr "Afficher les messages d'alerte sur les tâches en retard."
 
 msgid "Recall time for all tasks:"
@@ -1345 +1348 @@
 msgstr "Délai de rappel par tâche :"
 
-msgid "You can place list of expired tasks on your %s."
-msgstr "Vous pouvez placer la liste des tâches expirées sur votre %s."
+msgid "You can place list of late tasks on your %s."
+msgstr "Vous pouvez placer la liste des tâches en retard sur votre %s."
 
 #, php-format

plugins/importExport/inc/lib.ie.maintenance.php

@@ -14 +14 @@
 class ieMaintenanceExportblog extends dcMaintenanceTask
 {
+     protected $perm = 'admin';
      protected $tab = 'backup';
      protected $group = 'zipblog';

plugins/maintenance/_admin.php

@@ -18 +18 @@
      'index.php?pf=maintenance/icon.png',
      preg_match('/plugin.php\?p=maintenance(&.*)?$/', $_SERVER['REQUEST_URI']),
-     $core->auth->isSuperAdmin()
+     $core->auth->check('admin', $core->blog->id)
 );
 
@@ -192 +192 @@
           '<p><label for="maintenance_dashboard_icon" class="classic">'.
           form::checkbox('maintenance_dashboard_icon', 1, $core->auth->user_prefs->maintenance->dashboard_icon).
-          __('Display count of expired tasks on maintenance dashboard icon').'</label></p>'.
+          __('Display count of late tasks on maintenance dashboard icon').'</label></p>'.
 
           '<p><label for="maintenance_dashboard_item" class="classic">'.
           form::checkbox('maintenance_dashboard_item', 1, $core->auth->user_prefs->maintenance->dashboard_item).
-          __('Display list of expired tasks on dashboard items').'</label></p>'.
+          __('Display list of late tasks on dashboard items').'</label></p>'.
 
           '</div>';

plugins/maintenance/_define.php

@@ -16 +16 @@
      /* Description*/         "Maintain your installation",
      /* Author */             "Olivier Meunier & Association Dotclear",
-     /* Version */            '1.3'
+     /* Version */            '1.3.1',
+     /* Permission */         'admin'
 );

plugins/maintenance/inc/class.dc.maintenance.php

@@ -77 +77 @@
                }
 
-               $this->tasks[$task] = new $task($this, 'plugin.php?p=maintenance');
+               if (($t = new $task($this, 'plugin.php?p=maintenance')) === null
+               || $t->perm() === null && !$this->core->auth->isSuperAdmin()
+               || !$this->core->auth->check($t->perm(), $this->core->blog->id)) {
+                    continue;
+               }
+
+               $this->tasks[$task] = $t;
           }
 

plugins/maintenance/inc/class.dc.maintenance.task.php

@@ -29 +29 @@
      protected $ajax = false;
      protected $blog = false;
+     protected $perm = null;
 
      protected $id;
@@ -55 +56 @@
           $this->init();
 
+          if ($this->perm() === null && !$this->core->auth->isSuperAdmin()
+          || !$this->core->auth->check($this->perm(), $this->core->blog->id)) {
+               return null;
+          }
+
           $this->p_url = $p_url;
           $this->id = get_class($this);
@@ -72 +78 @@
 
           $this->ts = abs((integer) $ts);
+
+          return true;
      }
 
@@ -83 +91 @@
      {
           return null;
+     }
+
+     /**
+      * Get task permission.
+      *
+      * Return user permission required to run this task 
+      * or null for super admin.
+      *
+      * @return <b>mixed</b> Permission.
+      */
+     public function perm()
+     {
+          return $this->perm;
+     }
+
+     /**
+      * Get task scope.
+      *.
+      * Is task limited to current blog.
+      *
+      * @return <b>boolean</b> Limit to blog
+      */
+     public function blog()
+     {
+          return $this->blog;
      }
 

plugins/maintenance/inc/tasks/class.dc.maintenance.indexcomments.php

@@ -22 +22 @@
      {
           $this->name         = __('Search engine index');
-          $this->task         = __('Index all comments');
+          $this->task         = __('Index all comments for search engine');
           $this->step_task    = __('Next');
           $this->step         = __('Indexing comment %d to %d.');

plugins/maintenance/inc/tasks/class.dc.maintenance.indexposts.php

@@ -22 +22 @@
      {
           $this->name         = __('Search engine index');
-          $this->task         = __('Index all posts');
+          $this->task         = __('Index all entries for search engine');
           $this->step_task    = __('Next');
           $this->step         = __('Indexing entry %d to %d.');

plugins/maintenance/inc/tasks/class.dc.maintenance.zipmedia.php

@@ -14 +14 @@
 class dcMaintenanceZipmedia extends dcMaintenanceTask
 {
+     protected $perm = 'admin';
      protected $blog = true;
      protected $tab = 'backup';

plugins/maintenance/inc/tasks/class.dc.maintenance.ziptheme.php

@@ -14 +14 @@
 class dcMaintenanceZiptheme extends dcMaintenanceTask
 {
+     protected $perm = 'admin';
      protected $blog = true;
      protected $tab = 'backup';

plugins/maintenance/index.php

@@ -12 +12 @@
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 
-dcPage::checkSuper();
-
-// main class
+// Set env
+
+$core->blog->settings->addNamespace('maintenance');
 
 $maintenance = new dcMaintenance($core);
-$core->blog->settings->addNamespace('maintenance');
-
-// Set var
+$tasks = $maintenance->getTasks();
 
 $msg = '';
@@ -28 +26 @@
 
 $code = empty($_POST['code']) ? null : (integer) $_POST['code'];
-$tab = empty($_REQUEST['tab']) ? 'maintenance' : $_REQUEST['tab'];
+$tab = empty($_REQUEST['tab']) ? '' : $_REQUEST['tab'];
 
 // Save settings
@@ -39 +37 @@
                !empty($_POST['settings_plugin_message']), 
                'boolean', 
-               'Display alert message of expired tasks on plugin page', 
+               'Display alert message of late tasks on plugin page', 
                true, 
                true
           );
 
-          foreach($maintenance->getTasks() as $t) {
+          foreach($tasks as $t) {
                if (!empty($_POST['settings_recall_time']) && $_POST['settings_recall_time'] == 'seperate') {
                     $ts = empty($_POST['settings_ts_'.$t->id()]) ? 0 : $_POST['settings_ts_'.$t->id()];
@@ -57 +55 @@
                     sprintf('Recall time for task %s', $t->id()), 
                     true, 
-                    true
+                    $t->blog()
                );
           }
@@ -138 +136 @@
 </head>
 <body>';
+
+// Check if there is somthing to display according to user permissions
+if (empty($tasks)) {
+     echo dcPage::breadcrumb(
+          array(
+               __('Plugins') => '',
+               '<a href="'.$p_url.'">'.__('Maintenance').'</a>' => '',
+               '<span class="page-title">'.html::escapeHTML($task->name()).'</span>' => ''
+          )
+     ).
+     '<p class="warn">'.__('You have not sufficient permissions to view this page.').'</p>'.
+     '</body></html>';
+
+     return null;
+}
 
 // Success message
@@ -201 +214 @@
      {
           $res_group = '';
-          foreach($maintenance->getGroups($core) as $group_id => $group_name)
+          foreach($maintenance->getGroups() as $group_id => $group_name)
           {
                $res_task = '';
-               foreach($maintenance->getTasks($core) as $t)
+               foreach($tasks as $t)
                {
                     if ($t->group() != $group_id || $t->tab() != $tab_id) {
@@ -256 +269 @@
                form::hidden(array('tab'), $tab_id).
                $core->formNonce().'</p>'.
-               '<p class="form-note info">'.__('This may take a very long time.').'.</p>'.
+               '<p class="form-note info">'.__('This may take a very long time.').'</p>'.
                '</form>'.
                '</div>';
@@ -264 +277 @@
      // Advanced tasks (that required a tab)
 
-     foreach($maintenance->getTasks($core) as $t)
+     foreach($tasks as $t)
      {
           if ($t->group() !== null) {
@@ -292 +305 @@
      '<p><label for="settings_plugin_message" class="classic">'.
      form::checkbox('settings_plugin_message', 1, $core->blog->settings->maintenance->plugin_message).
-     __('Display alert messages on expired tasks').'</label></p>'.
+     __('Display alert messages on late tasks').'</label></p>'.
 
      '<p><label for="settings_recall_time">'.__('Recall time for all tasks:').'</label>'.
@@ -300 +313 @@
      '<p>'.__('Recall time per task:').'</p>';
 
-     foreach($maintenance->getTasks($core) as $t)
+     foreach($tasks as $t)
      {
           echo
@@ -319 +332 @@
      '</form>'.
      '<p class="info">'.sprintf(
-          __('You can place list of expired tasks on your %s.'),
+          __('You can place list of late tasks on your %s.'),
           '<a href="preferences.php#user-favorites">'.__('Dashboard').'</a>'
      ).'</a></p>'.