Changeset 603 for team

Timestamp:

09/09/07 14:00:22 (15 months ago)

Author:

www-data

Message:

automerge commit

Location:

team/michiel/import_blogs

Files:

• . (modified) (1 prop)
• common/mvblog.php (modified) (1 diff)
• common/mvblog_admin.php (modified) (1 diff)
• common/mvblog_common.php (modified) (1 diff)
• common/rss.php (modified) (3 diffs)

team/michiel/import_blogs/common/mvblog.php

@@ -455 +455 @@
                         if ($row["dossier_id"]) {
                                 echo $this->dossiers[$row["dossier_id"]]["name"];
+                                $dossierrssuri = $this->webroot.sprintf("common/rss.php?mode=dossier&dossier_id=%d", $row["dossier_id"]);
+                                echo "&nbsp;&nbsp;<a href=\"".$dossierrssuri."\" class=\"dossier_rss_link\">rss</a>";
                                 echo "<br />";
                                 //get dossier articles

team/michiel/import_blogs/common/mvblog_admin.php

@@ -211 +211 @@
                 session_destroy();
                 header("Location: index.php");
-        }
-        /* }}} */
-        /* db_quote {{{ */
-        /**
-         * Quote a fieldname with the database specific quote style
-         *
-         * @param string fieldname to quote
-         * @return string the quoted version
-         */
-        public function db_quote($field) {
-                /* get the db type */
-                $dbtype = $this->db->dbsyntax;
-                switch ($dbtype) {
-                        case "mysql" :
-                                $return = "`".$field."`";
-                                break;
-                        case "pgsql" :
-                                $return = "\"".$field."\"";
-                                break;
-                        default :
-                                $return = $field;
-                                break;
-                }
-                return $return;
         }
         /* }}} */

team/michiel/import_blogs/common/mvblog_common.php

@@ -362 +362 @@
                 }
                 return $_data;
+        }
+        /* }}} */
+        /* db_quote {{{ */
+        /**
+         * Quote a fieldname with the database specific quote style
+         *
+         * @param string fieldname to quote
+         * @return string the quoted version
+         */
+        public function db_quote($field) {
+                /* get the db type */
+                $dbtype = $this->db->dbsyntax;
+                switch ($dbtype) {
+                        case "mysql" :
+                                $return = "`".$field."`";
+                                break;
+                        case "pgsql" :
+                                $return = "\"".$field."\"";
+                                break;
+                        default :
+                                $return = $field;
+                                break;
+                }
+                return $return;
         }
         /* }}} */

team/michiel/import_blogs/common/rss.php

@@ -63 +63 @@
         $comments = false;
         break;
+case "dossier" :
+        if (!array_key_exists("dossier_id", $_REQUEST)) {
+                /* list of dossiers */
+                $sql = "SELECT id, name AS title, 0 AS authors_id, ".$mvblog->db_quote("desc")." AS body, '".mktime()."' AS date FROM dossiers WHERE public = 1 AND active = 1 ORDER BY name";
+        } else {
+                /* list articles in given dossier */
+                $sql = sprintf("SELECT * FROM articles WHERE active = 1 AND public = 1 AND dossier_id = %d", $_REQUEST["dossier_id"]);
+        }
+        $comments = false;
+        break;
 default :
         $sql = sprintf("SELECT * FROM articles WHERE date <= %d AND active=1 AND public=1 ORDER BY date DESC", $max_time);
@@ -99 +109 @@
                 echo "\t\t\t<author>".htmlspecialchars($mvblog->authors[$row["authors_id"]]["email"])." (".htmlspecialchars($mvblog->authors[$row["authors_id"]]["fullname"]).")</author>\n";
         } else {
-                echo "\t\t\t<link>".$url."index.php?action=view&amp;id=".$row["id"]."$link</link>\n";
+                if (array_key_exists("mode", $_REQUEST) && $_REQUEST["mode"] == "dossier" && !array_key_exists("dossier_id", $_REQUEST))
+                        echo "\t\t\t<link>".$url."index.php?action=viewdossier&amp;id=".$row["id"]."$link</link>\n";
+                else
+                        echo "\t\t\t<link>".$url."index.php?action=view&amp;id=".$row["id"]."$link</link>\n";
                 if (array_key_exists("categories_ids", $row))
                         $categories = explode(",", $row["categories_ids"]);
@@ -112 +125 @@
                 echo implode(", ", $category_names);
                 echo "</category>\n";
-                echo "\t\t\t<guid isPermaLink=\"true\">".$url."index.php?action=view&amp;id=".$row["id"]."$link</guid>\n";
+                if (array_key_exists("mode", $_REQUEST) && $_REQUEST["mode"] == "dossier" && !array_key_exists("dossier_id", $_REQUEST))
+                        echo "\t\t\t<guid isPermaLink=\"true\">".$url."index.php?action=viewdossier&amp;id=".$row["id"]."$link</guid>\n";
+                else
+                        echo "\t\t\t<guid isPermaLink=\"true\">".$url."index.php?action=view&amp;id=".$row["id"]."$link</guid>\n";
                 if (!$comments) {
                         echo "\t\t\t<comments>".$url."index.php?action=view&amp;id=".$row["id"]."#comments</comments>\n";