Merge remote branch 'upstream/master'

2014-06-26 16:51:24 -04:00
parent d34273d72b 553bf33ae6
commit a0a6e37f97
27 changed files with 218 additions and 87 deletions
--- a/workflow/engine/controllers/admin.php
+++ b/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' );