Changeset 1071

Timestamp:

12/13/09 12:14:06 (2 years ago)

Author:

bogdan2412

Message:

Merge changes from live.

• Added a better date format for the roundparam macro.
• Fixed check-attachments script.
• Reverted some bad changes from update-ratings script.
• Fixed recursive-move script.
• Fixed attachment methods failing because of missing mem cache functions.

Location:

trunk

Files:

• common/db/attachment.php (modified) (1 diff)
• scripts/check-attachments (modified) (1 diff)
• scripts/recursive-move (modified) (2 diffs)
• scripts/update-ratings (modified) (3 diffs)
• www/config.php (modified) (1 diff)
• www/macros/macro_roundparam.php (modified) (2 diffs)
• www/views/header.php (modified) (1 diff)

trunk/common/db/attachment.php

@@ -3 +3 @@
 require_once(IA_ROOT_DIR."common/db/db.php");
 require_once(IA_ROOT_DIR."common/attachment.php");
+require_once(IA_ROOT_DIR."common/cache.php");
 
 // Add $attachment to cache if not null and return $attachment.

trunk/scripts/check-attachments

@@ -57 +57 @@
         if (read_bool("Want to delete them?", false)) {
             foreach ($extra_atts as $att) {
-                attachment_delete($att['id']);
+                attachment_delete_by_id($att['id']);
             }
         }

trunk/scripts/recursive-move

@@ -6 +6 @@
 
 log_print("Recursive page move, for huge changes.");
+db_connect();
 
 $src = read_line("Source root?", 'task');
@@ -23 +24 @@
 foreach ($page_list as $page) {
     $old_name = $page['name'];
-    $new_name = preg_replace("/^".preg_quote($src, '/').'/si', preg_quote($dst, '/'), $old_name);
+    $new_name = preg_replace("/^".preg_quote($src, '/').'/si', $dst, $old_name);
     textblock_move($old_name, $new_name);
 }

trunk/scripts/update-ratings

@@ -74 +74 @@
 log_print(count($round_users) . " users registered for this round.");
 foreach ($round_users as $row) {
-    if (!isset($row['username'])) {
-        continue;
-    }
-
     log_assert(isset($row['username']));
     $scores[$row['username']] = 0;
@@ -87 +83 @@
 log_print(count($round_rows) . " users were scored in this round.");
 foreach ($round_rows as $row) {
-    if (!isset($row['user_name'])) {
-        continue;
-    }
-
     log_assert(isset($row['user_name']) && isset($row['score']));
     if (isset($scores[$row['user_name']])) {
@@ -103 +95 @@
 log_print("Updating database...");
 foreach ($round_users as $row) {
-    if (!isset($row['username'])) {
-        continue;
-    }
-
     $username = $row['username'];
     $user_id = $row['user_id'];

trunk/www/config.php

@@ -41 +41 @@
 // Date formatting for the user is done in www/format/format.php
 define('IA_DATE_DEFAULT_TIMEZONE', 'Europe/Bucharest');
-define('IA_DATE_DEFAULT_FORMAT', '%A %e %B %Y %H:%M:%S');
+define('IA_DATE_DEFAULT_FORMAT', '%e %B %Y %H:%M:%S');
 
 // mail sender

trunk/www/macros/macro_roundparam.php

@@ -2 +2 @@
 
 require_once(IA_ROOT_DIR . "common/db/round.php");
+require_once(IA_ROOT_DIR . "www/format/format.php");
 
 // Displays a round field, be it a hard-coded field such as round title or a grader parameter such as `type`.
@@ -60 +61 @@
                 $html .= "data necunoscuta";
             } else {
-                $html .= format_date($round['start_time']);
+                $html .= format_date($round['start_time'],
+                    '%A %e %B %Y, la ora %H:%M:%S');
             }
             break;

trunk/www/views/header.php

@@ -40 +40 @@
     <meta name="verify-v1" content="PQDTb5Advw297iADXVUYuxh0z+iQKfq1wtYWnfHCb1Y=" />
     <meta name="verify-v1" content="GUKPcDm0TzwAR7r5xbagq576p/YWH9su/Ca4o8YlYBg=" /> <!--bogdan2412-->
+    <meta name="google-site-verification" content="T_HFYNIO3S70696yFC5rkbPn339gjnfVwMqYPmU866I" /> <!--devilkind-->
 <?php
     }