Merge remote branch 'upstream/master'

workflow/engine/controllers/admin.php

@@ -15,6 +15,8 @@ class Admin extends Controller
 
     public function system ()
     {
+        global $RBAC;
+        $RBAC->requirePermissions( 'PM_SETUP' );
         require_once PATH_CONTROLLERS . 'main.php';
         G::loadClass( 'system' );
         $skinsList = System::getSkingList();
@@ -60,6 +62,8 @@ class Admin extends Controller
 
     public function uxList ()
     {
+        global $RBAC;
+        $RBAC->requirePermissions( 'PM_SETUP' );
         require_once PATH_CONTROLLERS . 'adminProxy.php';
         $this->includeExtJS( 'admin/uxUsersList' );
         G::LoadClass( 'configuration' );

workflow/engine/controllers/dashboard.php

@@ -16,6 +16,12 @@ class Dashboard extends Controller
     // Class constructor
     public function __construct ()
     {
+        global $RBAC;
+        if ($RBAC->userCanAccess('PM_DASHBOARD') != 1) {
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header( 'location: login/login' );
+            exit(0);
+        }
         G::LoadClass( 'pmDashlet' );
         $this->pmDashlet = new PMDashlet();
     }