Changeset 1091 for trunk

Timestamp:

12/23/09 00:26:25 (2 years ago)

Author:

bogdan2412

Message:

Many many small fixes.

• Changed task-tag action from simple-critical to simple-edit.
• Fixed downloading attachments containing grader from normal (non-task) pages.
• Moved a call to remote_ip_info() from common/ to www/ where it's supposed to be in MVC.
• Fixed round and task tests.
• Fixed test cleanup to delete only the created users and to delete them from the forum also.
• Check that the username doesn't exist in the forum when someone tries to register (there are users on the forum that are not on infoarena, because of the import from info.devnet.ro i guess). Having two smf users with the same name crashes things.
• Allow rounds to have no tasks.

Reviewed: ​http://reviewboard.infoarena.ro/r/126/

Location:

trunk

Files:

• common/db/user.php (modified) (2 diffs)
• common/security.php (modified) (5 diffs)
• tests/round.php (modified) (2 diffs)
• tests/task.php (modified) (2 diffs)
• tests/utilities.php (modified) (2 diffs)
• www/controllers/account_validator.php (modified) (1 diff)
• www/controllers/register.php (modified) (2 diffs)
• www/controllers/round.php (modified) (1 diff)

trunk/common/db/user.php

@@ -131 +131 @@
 // $user must be a valid user struct, user_id ignored
 // Returns created $user or throws up on error.
-function user_create($user)
+function user_create($user, $remote_ip_info=null)
 {
     log_assert_valid(user_validate($user));
@@ -150 +150 @@
     $replace = array("user_id" => $user['username']);
     textblock_copy_replace("template/newuser", IA_USER_TEXTBLOCK_PREFIX.$user['username'],
-                           $replace, "public", $new_user['id'], remote_ip_info());
+                           $replace, "public", $new_user['id'], $remote_ip_info);
 
     // Create SMF user

trunk/common/security.php

@@ -129 +129 @@
         case 'task-create':
         case 'task-delete':
+        case 'task-tag':
         case 'round-delete':
         case 'textblock-delete':
@@ -143 +144 @@
         case 'textblock-change-security':
         case 'task-edit-owner':
-        case 'task-tag':
         case 'round-tag':
         case 'textblock-tag':
@@ -280 +280 @@
 // FIXME: attach-grader?
 function security_attach($user, $action, $attach) {
-
     $att_name = $attach['name'];
     $att_page = normalize_page_name($attach['page']);
@@ -296 +295 @@
     }
 
-    // HACK: magic prefix.
-    if (preg_match('/^grader\_/', $att_name)) {
+    // Speed hack: avatars are always visible. This is good.
+    if ($action == 'attach-download' && $att_name == 'avatar' &&
+            starts_with($att_page, IA_USER_TEXTBLOCK_PREFIX)) {
+        return true;
+    }
+
+    // Forward to textblock.
+    $tb = textblock_get_revision($attach['page']);
+    if (!$tb) {
+        log_print_r($attach);
+    }
+    log_assert($tb, "Orphan attachment");
+
+    // Convert action into a grader action if the textblock is a task
+    // textblock and the attachment has the grader_ prefix.
+    if (preg_match("/^ \s* task: \s* (".IA_RE_TASK_ID.") \s* $/xi", $tb["security"]) &&
+        preg_match('/^grader\_/', $att_name)) {
         $newaction = preg_replace('/^attach/', 'grader', $action);
         if (IA_LOG_SECURITY) {
@@ -304 +318 @@
         $action = $newaction;
     }
-
-    // Speed hack: avatars are always visible. This is good.
-    if ($action == 'attach-download' && $att_name = 'avatar' &&
-            strstr($att_page, IA_USER_TEXTBLOCK_PREFIX) === $att_page) {
-        return true;
-    }
-
-    // Forward to textblock.
-    $tb = textblock_get_revision($attach['page']);
-    if (!$tb) {
-        log_print_r($attach);
-    }
-    log_assert($tb, "Orphan attachment");
 
     return security_textblock($user, $action, $tb);

trunk/tests/round.php

@@ -74 +74 @@
             'type' => 'classic',
             'rating_update' => true,
-)));
-log_assert_equal($res['url'], url_absolute(url_round_edit('test_round')));
-log_assert(strstr($res['content'], 'Concurs clasic'));
+            'start_time' => db_date_format(time() + 3600),
+)));
+log_assert(!strstr($res['content'], '<span class="fieldError"'));
+log_assert(strstr($res['content'], '<option value="classic" selected="selected">Concurs clasic'));
+log_assert_equal($res['url'], url_absolute(url_round_edit('test_round')));
 
 log_print("Admin adds tasks adunare and cmmdc to round.");
@@ -197 +199 @@
 log_assert_equal($res['url'], url_absolute(url_textblock('runda/tEst_Round')));
 log_assert(strstr($res['content'], 'xzx-round-title-xzx'));
-log_assert(!strstr($res['content'], 'Nu esti inscris la'), 
+log_assert(!strstr($res['content'], 'Nu esti inscris la'),
     "Round still waiting, is the evaluator ON?");
 log_assert(strstr($res['content'], 'Nu se mai pot face inscrieri'));

trunk/tests/task.php

@@ -39 +39 @@
         'post' => array(
                 'title' => 'xzx-task1-title-xzx',
-                'author' => 'xzx-task1-author-xzx',
+                'tag_author' => 'xzx-task1-author-xzx',
                 'source' => 'xzx-task1-source-xzx',
 )));
@@ -223 +223 @@
 log_assert(strstr($res['content'], 'xzx-task1-author-xzx'));
 log_assert(strstr($res['content'], 'xzx-task1-source-xzx'));
-log_assert(strstr($res['content'], 'name="author"'));
+log_assert(strstr($res['content'], 'name="tag_author"'));
 log_assert(!strstr($res['content'], 'name="hidden"'));
 

trunk/tests/utilities.php

@@ -66 +66 @@
     $res['content'] = $content;
     curl_close($ch);
-   
+
     if (getattr($args, 'validate_html', false)) {
         validate_html($content);
@@ -132 +132 @@
 function test_cleanup()
 {
-    db_query("DELETE FROM ia_user WHERE `username` LIKE 'test_%'");
-    db_query("DELETE FROM ia_task WHERE `id` LIKE 'test_%'");
-    db_query("DELETE FROM ia_round WHERE `id` LIKE 'test_%'");
+    $test_accounts = "('test_dudE1', 'teSt_dude2', 'teSt_helper1', 'test_hElper2', 'tEst_adMin')";
+    db_query("DELETE FROM ia_user WHERE `username` IN $test_accounts");
+    db_query("DELETE FROM ia_smf_members WHERE `memberName` IN $test_accounts");
+    db_query("DELETE FROM ia_task WHERE `id` LIKE 'test\_%'");
+    db_query("DELETE FROM ia_round WHERE `id` LIKE 'test\_%'");
     // Remove various stuff from the wiki.
     $prefixes = array('sandbox', 'utilizator', 'runda', 'problema');
     foreach ($prefixes as $prefix) {
         db_query("DELETE FROM `ia_textblock` ".
-                 "WHERE `name` LIKE '$prefix/test_%'");
+                 "WHERE `name` LIKE '$prefix/test\_%'");
         db_query("DELETE FROM `ia_textblock_revision` ".
-                 "WHERE `name` LIKE '$prefix/test_%'");
+                 "WHERE `name` LIKE '$prefix/test\_%'");
         db_query("DELETE FROM `ia_file` ".
-                 "WHERE `page` LIKE '$prefix/test_%'");
+                 "WHERE `page` LIKE '$prefix/test\_%'");
     }
 }

trunk/www/controllers/account_validator.php

@@ -46 +46 @@
                                   .'invalide.';
         }
-        elseif (user_get_by_username($data['username'])) {
+        elseif (user_get_by_username($data['username']) ||
+                smf_get_member_by_name($data['username'])) {
             $errors['username'] = 'Nume utilizator rezervat de altcineva. Va '
                                   .'rugam alegeti altul.';

trunk/www/controllers/register.php

@@ -47 +47 @@
 
             // There are no acceptable errors in user_create.
-            user_create($user);
+            user_create($user, remote_ip_info());
             flash("Felicitari! Contul a fost creat. Acum te poti "
                   ."autentifica.");
@@ -59 +59 @@
         $data['tnc'] = 1;
     }
-    
+
     if(!IA_DEVELOPMENT_MODE) {
         $view['captcha'] = recaptcha_get_html(IA_CAPTCHA_PUBLIC_KEY);

trunk/www/controllers/round.php

@@ -134 +134 @@
     }
 
-    if (request_is_post() && count($values['tasks']) == 0) {
-        $errors['tasks'] = "Trebuie sa alegi cel putin o problema";
-    }
-
     // Additional validation for user defined tasks
     if (!array_key_exists('tasks', $errors)