Changeset 883

Timestamp:

01/19/08 12:33:02 (4 years ago)

Author:

bogdanpasoi@…

Message:

Open source - first draft.

Location:

trunk

Files:

• common/db/job.php (modified) (1 diff)
• common/security.php (modified) (5 diffs)
• common/task.php (modified) (2 diffs)
• scripts/opensource.php (added)
• smf/SSI.php (modified) (1 diff)
• www/controllers/task.php (modified) (2 diffs)
• www/views/task_edit.php (modified) (3 diffs)

trunk/common/db/job.php

@@ -90 +90 @@
                    `task`.`page_name` AS `task_page_name`, task.`title` AS `task_title`,
                    `task`.`hidden` AS `task_hidden`, `task`.`user_id` AS `task_owner_id`,
+                   `task`.`open_source` AS `task_open_source`,
                    `round`.`id` AS `round_id`,
                    `round`.`page_name` AS `round_page_name`, `round`.`title` AS `round_title`";

trunk/common/security.php

@@ -127 +127 @@
         case 'grader-delete':
         case 'grader-rename':
-        case 'grader-download':
         case 'simple-edit':
             return 'simple-edit';
@@ -144 +143 @@
         // Special actions fall through
         // FIXME: As few as possible.
+        case 'grader-download':
         case 'task-submit':
         case 'round-submit':
@@ -397 +397 @@
             return ($task['hidden'] == false && $is_running);
 
+        case 'grader-download':
+            if ($task['open_tests']) {
+                $can_view = $task['hidden'] == false;
+            } else {
+                $can_view = false;
+            }
+            return $can_view || $is_owner || $is_admin;
+
         default:
             log_error('Invalid task action: '.$action);
@@ -502 +510 @@
     $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;
 
     // Log query response.
@@ -521 +530 @@
 
         case 'job-download': //FIXME: this should be job-view-source, job-download is too confusing
-            return $can_view_job && ($is_admin || $is_owner);
+            return $can_view_job && $can_view_source;
 
         default:

trunk/common/task.php

@@ -38 +38 @@
                         'name' => "Grupare teste",
 
-                ),
-                'okfiles' => array(
-                        'description' => "Daca evaluator-ul foloseste fisiere .ok",
-                        'default' => '0',
-                        'type' => 'bool',
-                        'name' => "Foloseste .ok",
-                ),
-                'evaluator' => array(
-                        'description' => "Sursa evaluatorului. Poate fi omis pentru evaluare cu diff",
-                        'default' => 'eval.c',
-                        'type' => 'string',
-                        'name' => "Evaluator",
-                ),
-        ),
-        'output-only' => array(
-                'tests' => array(
-                        'description' => "Numar de teste",
-                        'default' => 10,
-                        'type' => 'integer',
-                        'name' => "Numar de teste",
-                ),
-                'testgroups' => array(
-                        'description' => "Descrierea gruparii testelor.",
-                        'default' => '1;2;3;4;5;6;7;8;9;10',
-                        'type' => 'string',
-                        'name' => "Grupare teste",
-                ),
-                'okfiles' => array(
-                        'description' => "Daca evaluator-ul foloseste fisiere .ok",
-                        'default' => '0',
-                        'type' => 'bool',
-                        'name' => "Foloseste .ok",
-                ),
-                'evaluator' => array(
-                        'description' => "Sursa evaluatorului. Poate fi omis pentru evaluare cu diff",
-                        'default' => 'eval.c',
-                        'type' => 'string',
-                        'name' => "Evaluator",
-                ),
-        ),
-    );
+            ),
+            'okfiles' => array(
+                    'description' => "Daca evaluator-ul foloseste fisiere .ok",
+                    'default' => '0',
+                    'type' => 'bool',
+                    'name' => "Foloseste .ok",
+            ),
+            'evaluator' => array(
+                    'description' => "Sursa evaluatorului. Poate fi omis pentru evaluare cu diff",
+                    'default' => 'eval.c',
+                    'type' => 'string',
+                    'name' => "Evaluator",
+            ),
+    ),
+    'output-only' => array(
+            'tests' => array(
+                    'description' => "Numar de teste",
+                    'default' => 10,
+                    'type' => 'integer',
+                    'name' => "Numar de teste",
+            ),
+            'testgroups' => array(
+                    'description' => "Descrierea gruparii testelor.",
+                    'default' => '1;2;3;4;5;6;7;8;9;10',
+                    'type' => 'string',
+                    'name' => "Grupare teste",
+            ),
+            'okfiles' => array(
+                    'description' => "Daca evaluator-ul foloseste fisiere .ok",
+                    'default' => '0',
+                    'type' => 'bool',
+                    'name' => "Foloseste .ok",
+            ),
+            'evaluator' => array(
+                    'description' => "Sursa evaluatorului. Poate fi omis pentru evaluare cu diff",
+                    'default' => 'eval.c',
+                    'type' => 'string',
+                    'name' => "Evaluator",
+            ),
+    ),
+);
 }
 
@@ -129 +129 @@
     if ($hidden != '0' && $hidden != '1') {
         $errors['hidden'] = 'Se accepta doar 0/1';
+    }
+
+    $open_source = getattr($task, 'open_source');
+    if ($open_source != '0' && $open_source != '1') {
+        $errors['open_source'] = 'Se accepta doar 0/1';
+    }
+
+    $open_tests = getattr($task, 'open_tests');
+    if ($open_tests != '0' && $open_tests != '1') {
+        $errors['open_tests'] = 'Se accepta doar 0/1';
     }
 

trunk/smf/SSI.php

@@ -1762 +1762 @@
     echo '<div class="calendar">';
     echo '<div class="header">';
-    echo '<a href="'.IA_URL.'/forum?action=calendar">In curand..</a></div>';
         foreach ($return as $mday => $array)
     {

trunk/www/controllers/task.php

@@ -49 +49 @@
     $values['title'] = request('title', $task['title']);
     $values['page_name'] = request('page_name', $task['page_name']);
+    $values['open_source'] = request('open_source', $task['open_source']);
+    $values['open_tests'] = request('open_tests', $task['open_tests']);
 
     // Parameter values, for all possible types of tasks.
@@ -76 +78 @@
         $new_task['type'] = $values['type'];
         $new_task['hidden'] = $values['hidden'];
+        $new_task['open_source'] = $values['open_source'];
+        $new_task['open_tests'] = $values['open_tests'];
 
         $task_errors = task_validate($new_task);

trunk/www/views/task_edit.php

@@ -51 +51 @@
                 'default' => 'classic',
         ),
+        'open_source' => array(
+                'name' => 'Acces liber la surse',
+                'type' => 'bool'
+        ),
+        'open_tests' => array(
+                'name' => 'Acces liber la teste',
+                'type' => 'bool'
+        ),
 );
 
@@ -81 +89 @@
 ?>
     <fieldset>
+    <legend>Acces la surse si teste</legend>
+    <ul class="form">
+        <?= view_form_field_li($form_fields['open_source'], 'open_source') ?>
+        <?= view_form_field_li($form_fields['open_tests'], 'open_tests') ?>
+    </ul>
+    </fieldset>
+
+    <fieldset>
     <legend>Detalii despre evaluare</legend>
     <ul class="form">
@@ -91 +107 @@
     </ul>
     </fieldset>
+
     <div class="submit">
         <ul class="form">