Changeset 729 for trunk

Timestamp:

12/23/07 12:26:17 (11 months ago)

Author:

michiel

Message:

make category name/icon on posts a link to the category archive.
Also show category icon when viewing a specific post.

Closes #175

Files:

• trunk/common/mvblog.php (modified) (6 diffs)

trunk/common/mvblog.php

@@ -194 +194 @@
         public function get_articles($start, $limit, $archive=0, $dossier=0) {
                 // FB: 20070304: Check key and set a default if not set.
-                if (array_key_exists("top", $_REQUEST)) {
+                if (array_key_exists("top", $_REQUEST))
                         $top = $_REQUEST["top"];
-                }
-                if (!isset($top) || empty($top)) {
+
+                if (!isset($top) || empty($top))
                         $top = 1;
-                }
+
+                //article url base
+                if ($this->settings["cleanurl"])
+                        $link = "post/%d#READMORE";
+                else
+                        $link = "index.php?action=view&id=%d#READMORE";
+
+                //category url base
+                if ($this->settings["cleanurl"])
+                        $catlink = "category/%d";
+                else
+                        $catlink = "index.php?action=archive_cat&c=%d";
 
                 $start = $top-1;
@@ -234 +245 @@
                                         <?php if ($row["aside"] !=1) { ?>
                                                 <div class="log_post_head">
-                                                        <?php
-                                                        if ($this->settings["cleanurl"])
-                                                                $link = "post/".$row["id"]."#READMORE";
-                                                        else
-                                                                $link = "index.php?action=view&amp;id=".$row["id"]."#READMORE";
-                                                        ?>
-                                                        <h1 class="log_post_h1"><a href="<?php echo $link; ?>"><?php echo htmlspecialchars(stripslashes($row["title"])); ?></a></h1>
+                                                        <h1 class="log_post_h1"><a href="<?php echo sprintf($link, $row["id"]); ?>"><?php echo htmlspecialchars(stripslashes($row["title"])); ?></a></h1>
                                                         <h2 class="log_post_h2"><?php echo gettext("category"); ?>:&nbsp;
                                                                 <?php
@@ -246 +251 @@
                                                                 foreach ($categories as $v) {
                                                                         if (array_key_exists($v, $this->categories) && $this->categories[$v]["icon"] && $this->settings["show_cat_icons"])
-                                                                                echo "<img src=\"images/categories/".$this->categories[$v]["icon"]."\" title=\"".htmlspecialchars($this->categories[$v]["name"])."\" alt=\"".htmlspecialchars($this->categories[$v]["name"])."\" class=\"category_icon\" />&nbsp;";
+                                                                                echo "<a href=\"".sprintf($catlink, $v)."\"><img src=\"images/categories/".$this->categories[$v]["icon"]."\" title=\"".htmlspecialchars($this->categories[$v]["name"])."\" alt=\"".htmlspecialchars($this->categories[$v]["name"])."\" class=\"category_icon\" /></a>&nbsp;";
                                                                         elseif (array_key_exists($v, $this->categories))
-                                                                                echo htmlspecialchars($this->categories[$v]["name"])."&nbsp;";
+                                                                                echo "<a href=\"".sprintf($catlink, $v)."\">".htmlspecialchars($this->categories[$v]["name"])."</a>&nbsp;";
                                                                 }
                                                                 ?>
@@ -363 +368 @@
          */
         public function show_article($id, $captcha_error = 0) {
+                //category url base
+                if ($this->settings["cleanurl"])
+                        $catlink = "category/%d";
+                else
+                        $catlink = "index.php?action=archive_cat&amp;c=%d";
+
                 if ($id == "httperror") {
                         $row = array(
@@ -377 +388 @@
                         $errormode = 1;
                 } else {
+
                         $res =& $this->db->query(sprintf("SELECT * FROM articles WHERE id = %d", $id));
 
@@ -404 +416 @@
                                                 $categories = explode(",", $row["categories_ids"]);
                                                 foreach ($categories as $v) {
-                                                        if (array_key_exists($v, $this->categories))
-                                                                echo htmlspecialchars($this->categories[$v]["name"])."&nbsp;";
+                                                        if (array_key_exists($v, $this->categories) && $this->categories[$v]["icon"] && $this->settings["show_cat_icons"])
+                                                                echo "<a href=\"".sprintf($catlink, $v)."\"><img src=\"images/categories/".$this->categories[$v]["icon"]."\" title=\"".htmlspecialchars($this->categories[$v]["name"])."\" alt=\"".htmlspecialchars($this->categories[$v]["name"])."\" class=\"category_icon\" /></a>&nbsp;";
+                                                        elseif (array_key_exists($v, $this->categories))
+                                                                echo "<a href=\"".sprintf($catlink, $v)."\">".htmlspecialchars($this->categories[$v]["name"])."</a>&nbsp;";
                                                 }
                                                 ?>