Changeset 987 for trunk/common

Timestamp:

01/20/09 02:39:25 (3 years ago)

Author:

strat.cristian@…

Message:

HTML Newsletter

This patch adds support for HTML in the infoarena newsletter. A newsletter can be created just like a regular wiki page, using textile, macros, and templates. Sending is still done with a command-line script.

• Adds HTML newsletter library.
• Adds UI, display index of all newsletters.
• Adds UI, view newsletter in browser.
• Adds migration script to convert old text/plain newsletters to decent textile versions.
• Adds external library: PHPMailer (​http://phpmailer.codeworxtech.com/index.php?pg=phpmailer).

Location:

trunk/common

Files:

• db/textblock.php (modified) (3 diffs)
• external_libs/class.phpmailer.php (added)
• external_libs/class.smtp.php (added)
• newsletter.php (added)
• newsletter_template.php (added)

trunk/common/db/textblock.php

@@ -72 +72 @@
 function textblock_complex_query($options)
 {
-    //log_print_r($options);
+    // log_print_r($options);
 
     $field_list = "`name`, `title`, `creation_timestamp`, `timestamp`, `security`, `user_id`, `forum_topic`";
@@ -112 +112 @@
                           $where, $where, $order, $options['limit_start'], $options['limit_count']);
     } else {
-        $query = "SELECT $field_list FROM ia_textblock $join $where";
-    }
-    //log_print("QUERY: " . $query);
+        $query = "SELECT $field_list FROM ia_textblock
+                  $join $where ORDER BY ia_textblock.`creation_timestamp` $order";
+    }
+    // log_print("QUERY: " . $query);
     return db_fetch_all($query);
 }
@@ -166 +167 @@
 // Get all textblocks(without content) with a certain prefix).
 // Ordered by name.
-function textblock_get_by_prefix($prefix, $content = false, $username = false) {
+function textblock_get_by_prefix($prefix, $content = false, $username = false,
+        $order = 'asc') {
     return textblock_complex_query(array(
             'content' => $content,
             'username' => $username,
             'prefix' => $prefix,
+            'order' => $order,
     ));
 }