Changeset 945

Timestamp:

11/15/08 16:05:16 (4 years ago)

Author:

bogdan2412

Message:

Merge changes from live

Location:

trunk

Files:

• common/email.php (modified) (1 diff)
• scripts/fs-benchmark (added)
• scripts/link-task-forum (modified) (2 diffs)
• scripts/send-newsletter (modified) (2 diffs)
• www/config.php (modified) (1 diff)
• www/controllers/textblock.php (modified) (2 diffs)
• www/static/css/screen.css (modified) (1 diff)
• www/views/header.php (modified) (1 diff)
• www/views/textblock_diff.php (modified) (1 diff)

trunk/common/email.php

@@ -33 +33 @@
 
     // headers
-    $headers = 'From: ' . $from . "\r\n" .
-               'Reply-To: ' . $reply_to . "\r\n" .
+    $headers = 'From: ' . $from . "\n" .
+               'Reply-To: ' . $reply_to . "\n" .
+               "Content-type: text/plain\n" .
                'X-Mailer: infoarena/newsletter';
 

trunk/scripts/link-task-forum

@@ -100 +100 @@
         continue;
     }
-    $str2 = strtoupper(($task['order']-1).$page['title']);
+    $str2 = strtoupper(($task['order']-1).$task['title']);
     
     if ($task['order'] <= 10) { 
@@ -123 +123 @@
         log_warn('Numarul pentru problema "'.$task['id'].'" este gresit! Am cautat '.$str1.' si '.$str2);
         $str1 = strtoupper($task['id']);
-        $str2 = strtoupper($page['title']);
+        $str2 = strtoupper($task['title']);
         for ($i = count($topics)-1; $i >= 0; --$i) {
             if (match($topics[$i]['subject'], $str1) || match($topics[$i]['subject'], $str2)) {

trunk/scripts/send-newsletter

@@ -26 +26 @@
 function list_valid_ids() {
     $valid = array(
-        'all', 'admins', 'rated', 'test'
+        'all', 'admins', 'rated', 'test', 'tinytest'
     );
     return $valid;
@@ -56 +56 @@
             $usernames = array('wickedman', 'fluffy', 'domino', 'silviug',
                                'Cosmin', 'wick3dman');
+            $query = "SELECT * FROM ia_user
+                      WHERE username IN ('".join("', '", $usernames)."')
+                      ORDER BY full_name";
+            return db_fetch_all($query);
+
+        case 'tinytest':
+            $usernames = array('wickedman', 'wick3dman');
             $query = "SELECT * FROM ia_user
                       WHERE username IN ('".join("', '", $usernames)."')

trunk/www/config.php

@@ -16 +16 @@
 
 // maximum attachment size for wiki pages
-define("IA_ATTACH_MAXSIZE", 20*1024*1024);
+define("IA_ATTACH_MAXSIZE", 60*1024*1024);
 
 // maximum jobs to reeval

trunk/www/controllers/textblock.php

@@ -92 +92 @@
     $diff_title = diff_inline(array($revfrom['title'], $revto['title']));
     $diff_content = diff_inline(array($revfrom['text'], $revto['text']));
+    $diff_security = diff_inline(array($revfrom['security'], $revto['security']));
 
     $view = array();
@@ -100 +101 @@
     $view['diff_title'] = $diff_title;
     $view['diff_content'] = $diff_content;
+    $view['diff_security'] = $diff_security;
     execute_view_die('views/textblock_diff.php', $view);
 }

trunk/www/static/css/screen.css

@@ -1423 +1423 @@
 }
 
+.picture-box {
+    font-size: .85em;
+    padding: 5px;
+    border: 1px solid gray;
+    margin: 0 1em 1em 0;
+    float: left;
+}
+
+.picture-box img {
+    border: 1px solid silver;
+    display: block;
+    margin-bottom: 5px;
+}
+
+/* OKRs */
+
+ul.okr > li:before {
+    content: "O: ";
+    font-weight: bold;
+}
+
+ul.okr > li li:before {
+    content: "KR: ";
+    font-weight: bold;
+}
+
+ul.okr li {
+    list-style: none;
+}
+
+ul.okr .comment {
+    display: block;
+    margin: 0 0 0 2em;
+    color: gray;
+}
+

trunk/www/views/header.php

@@ -68 +68 @@
         <li><a href="<?= html_escape(url_home()) ?>">Home</a></li>
         <li><?= format_link_access(url_textblock('arhiva'), "Arhiva de probleme", 'a') ?></li>
+        <li><a href="<?= html_escape(url_textblock('arhiva-educationala')) ?>">Arhiva educationala</a></li>
         <li><a href="<?= html_escape(url_textblock('concursuri')) ?>">Concursuri</a></li>
         <li><a href="<?= html_escape(url_textblock('clasament-rating')) ?>">Clasament</a></li>

trunk/www/views/textblock_diff.php

@@ -66 +66 @@
 ?>
 
+<?php
+if (empty($view['diff_security'])) {
+    echo "<h3>Nu exista diferente intre securitate.</h3>";
+}
+else {
+    echo "<h3>Diferente intre securitate:</h3>";
+    print_diff($view['diff_security']);
+}
+?>
+
 <?php include('footer.php'); ?>