Changeset 590

Timestamp:

09/02/07 23:00:37 (15 months ago)

Author:

www-data

Message:

automerge commit

Location:

team/michiel/import_blogs

Files:

• . (modified) (1 prop)
• CSS-Documentation (modified) (1 diff)
• common/mvblog.php (modified) (2 diffs)
• common/mvblog_common.php (modified) (3 diffs)

team/michiel/import_blogs/CSS-Documentation

@@ -42 +42 @@
                                         span.log_post_commentsrss : tag for the RSS url for single post
                                         span.log_post_trackbacklink : tag for the trackback url for single post
+
+                        div.log_dossierinfo : container tag for dossier info and links to other articles in the dossier
+
+                                div.log_dossierinfo a : hyperlink to the article
 
                         div.log_comment : container tag for comments on single post

team/michiel/import_blogs/common/mvblog.php

@@ -420 +420 @@
                                         $text = $this->strip_invalid_xml(stripslashes(str_replace("##BREAKPOINT##", "<a name=\"READMORE\"></a>", $row["body"])));
                                         $text = $this->replace_num_ref($text);
+                                        $text = $this->replace_dossier_ref($text);
                                         $text = $this->plugman->run_hooks("text_output", $text);
                                         echo $text;
@@ -443 +444 @@
                                 <?php } ?>
                         </div>
-                        <a name="comments"></a>
+                </div>
+                <div class="log_dossierinfo">
+                        <?php
+                        if ($row["dossier_id"]) {
+                                echo $this->dossiers[$row["dossier_id"]]["name"];
+                                echo "<br />";
+                                //get dossier articles
+                                $dq = sprintf("SELECT id, title FROM articles WHERE active=1 AND public=1 AND dossier_id = %d ORDER BY date", $row["dossier_id"]);
+                                $dr = $this->db->query($dq);
+                                while ($dossieritem = $dr->fetchRow(MDB2_FETCHMODE_ASSOC)) {
+                                        if ($dossieritem["id"] == $row["id"])
+                                                echo $dossieritem["title"]."<br />";
+                                        else
+                                                echo sprintf("<a href=\"index.php?action=view&amp;id=%d\">%s</a><br />", $dossieritem["id"], $dossieritem["title"]);
+                                }
+                        }
+                        ?>
                 </div>
                 <div class="log_comment">
+                        <a name="comments"></a>
                         <?php
                         if (!$errormode) {

team/michiel/import_blogs/common/mvblog_common.php

@@ -126 +126 @@
         /* __construct {{{ */
         /**
-         * Setup stuff and handle settings etc and populate the data containers
+         * Setup stuff and handle settings etc and populate the data containers.
+         *
+         * If one of the default values for the function parameters is changed, 
+         * please also change the call in mvblog_upgrade constructor.
          *
          * @param string $plugindir Directory where the plugins are.
          * @param int $adminmode Must be 1 if in the admin interface.
          * @param int $upgrade If set to 1 the data containers will not be populated to allow upgrades to them.
-         *
-         * If one of the default values is changed, please also change the call in mvblog_upgrade constructor.
          */
         public function __construct($plugindir="plugins/", $adminmode=0, $upgrade=0) {
@@ -630 +631 @@
                         $i = 0;
                         while ($row = $res->fetchRow(MDB2_FETCHMODE_ASSOC)) {
-                                if (array_key_exists("replace_references", $options) && $options["replace_references"] == 1)
+                                if (array_key_exists("replace_references", $options) && $options["replace_references"] == 1) {
                                         $row["body"] = $this->replace_num_ref($row["body"]);
+                                        $row["body"] = $this->replace_dossier_ref($row["body"]);
+                                }
                                 $posts["posts"][$i] = $row;
                                 $i++;
@@ -665 +668 @@
         }
         /* }}} */
+        /* replace_dossier_ref {{{ */
+        /**
+         * Replace references to dossiers in a piece of data.
+         *
+         * You can reference to dossiers in postdata by including
+         * a string like [#d<dossiernumber>].
+         * The output will be: <a href="index.php?action=viewdossier&id=<dossiernumber>">dossiertitle</a>
+         *
+         * @param string $data The code to do the replacement in
+         * @return string input with the postreference code replaced
+         */
+        public function replace_dossier_ref($data) {
+                //replace [#dnumber] with a link to this dossier and replace the number with the dossier title
+                preg_match_all("/\[#d(\d{1,})\]/s", $data, $matches);
+                if (count($matches[0])) {
+                        // we have something to replace
+                        foreach ($matches[0] as $k => $v) {
+                                $q = sprintf("SELECT name FROM dossiers WHERE id = %d", $matches[1][$k]);
+                                $r = $this->db->query($q);
+                                $ref = $r->fetchRow(MDB2_FETCHMODE_ASSOC);
+                                $data = str_replace($matches[0][$k], "<a href=\"".$this->webroot."index.php?action=viewdossier&amp;id=".$matches[1][$k]."\">".$ref["name"]."</a>", $data);
+                        }
+                }
+                return $data;
+        }
+        /* }}} */
+
         /* output methods */
         /* html_header: {{{ */