Changeset 1150 for trunk/common

Timestamp:

07/05/11 05:31:36 (11 months ago)

Author:

savin.tiberiu@…

Message:

Permissions for interns

File:

• trunk/common/security.php (modified) (13 diffs)

trunk/common/security.php

@@ -132 +132 @@
         case 'task-tag':
         case 'task-reeval':
-        case 'round-delete':
+        case 'task-edit-ratings': 
         case 'textblock-delete':
         case 'textblock-delete-revision':
+        case 'round-tag':
+        case 'round-view-progress': 
         case 'grader-overwrite':
         case 'grader-delete':
@@ -145 +147 @@
         case 'task-change-open':
         case 'textblock-change-security':
-        case 'task-edit-owner':
-        case 'task-edit-ratings':
-        case 'round-tag':
-        case 'round-view-progress':
         case 'textblock-tag':
         case 'job-reeval':
+        case 'round-delete':
+        case 'task-edit-owner':
         case 'simple-critical':
             return 'simple-critical';
@@ -375 +375 @@
     $usersec = getattr($user, 'security_level', 'anonymous');
     $is_admin = $usersec == 'admin';
+    $is_intern = $usersec == 'intern';
     $is_owner = ($task['user_id'] == $user['id'] && $usersec == 'helper');
+    $is_boss = $is_admin || $is_intern || $is_owner;
 
     // Log query response.
@@ -390 +392 @@
         // Read-only access.
         case 'simple-view':
-            return ($task['hidden'] == false) || $is_owner || $is_admin;
+            return ($task['hidden'] == false) || $is_boss;
 
         // Edit access.
         case 'simple-rev-edit':
-            return $is_owner || $is_admin;
+            return $is_boss;
 
         case 'simple-edit':
-            return $is_owner || $is_admin;
+            return $is_boss;
 
         // View tags
@@ -408 +410 @@
                 }
             }
-            return $in_archive || $is_owner || $is_admin;
+            return $in_archive || $is_boss;
 
         // Admin stuff:
@@ -441 +443 @@
                 return false;
             }
-            if ($is_owner || $is_admin) {
+            if ($is_boss) {
                 return true;
             }
@@ -465 +467 @@
 
         case 'sensitive-info':
-            return ($usersec == 'admin' || $usersec == 'helper');
+            return $is_boss;
 
         default:
@@ -476 +478 @@
     $usersec = getattr($user, 'security_level', 'anonymous');
     $is_admin = $usersec == 'admin';
+    $is_intern = $usersec == 'intern';
 
     // Log query response.
@@ -495 +498 @@
               return $usersec != 'anonymous';
           } else {
-              return $is_admin;
+              return $is_admin || $is_intern;
           }
 
@@ -504 +507 @@
           }
           if ($round['type'] == 'user-defined') {
-              return $user['id'] == $round['user_id'] || $is_admin;
+              return $user['id'] == $round['user_id'] || $is_admin || $is_intern;
           } else {
-              return $is_admin;
+              return $is_admin || $is_intern;
           }
 
         case 'round-view-tasks':
-            return $round['state'] != 'waiting' || $is_admin;
+            return $round['state'] != 'waiting' || $is_admin || $is_intern;
         case 'round-view-scores':
-            return $round['public_eval'] == true || $is_admin;
+            return $round['public_eval'] == true || $is_admin || $is_intern;
 
         case 'simple-edit':
+            return $is_admin || $is_intern;
+
         case 'simple-critical':
             return $is_admin;
@@ -530 +535 @@
 
         case 'sensitive-info':
-            return ($usersec == 'admin' || $usersec == 'helper');
+            return in_array($usersec, array('admin', 'intern', 'helper'));
 
         default:
@@ -577 +582 @@
     $usersec = getattr($user, 'security_level', 'anonymous');
     $is_admin = $usersec == 'admin';
+    $is_intern = $usersec == 'intern';
     $is_owner = ($job['user_id'] == $user['id']);
     $is_task_owner = ($job['task_owner_id'] == $user['id'] && $usersec == 'helper');
     $can_view_job = ($job['task_hidden'] == false) || $is_task_owner || $is_admin;
-    $can_view_source = ($job['task_open_source'] == true) || $is_task_owner || $is_owner || $is_admin;
+    $can_view_source = ($job['task_open_source'] == true) || $is_task_owner || 
+                       $is_owner || $is_admin || $is_intern;
     $can_view_source_size = ($job['round_type'] == "archive") ||
                             ($job['round_type'] != "archive" && $job['round_state'] == "complete") ||
                             $can_view_source;
-    $can_view_score = ($job['round_public_eval'] == true) || $is_task_owner || $is_admin;
-    $can_view_partial_feedback = $is_owner || $is_admin;
-    $can_view_sensitive_info = ($usersec == 'admin' || $usersec == 'helper');
+    $can_view_score = ($job['round_public_eval'] == true) || $is_task_owner || $is_admin || $is_intern;
+    $can_view_partial_feedback = $is_owner || $is_admin || $is_intern;
+    $can_view_sensitive_info = in_array($usersec, array('admin', 'intern', 'helper'));
 
     // Log query response.
@@ -600 +607 @@
     switch ($action) {
         case 'simple-critical':
-            return $is_admin;
+            return $is_admin || $is_intern;
 
         case 'job-view':