Changeset 1443

Timestamp:

04/17/06 18:13:40 (2 years ago)

Author:

sdcosta

Message:

Fix for the rss view plugin to not show the RSS link and alternate link when we are in admin, plugins and other wierd locations.

Files:

• trunk/rss/plugins/rssview.php (modified) (4 diffs)

trunk/rss/plugins/rssview.php

@@ -30 +30 @@
 /// Author: Marco Bonetti
 /// Description: Adds a RSS link to the header and the footer of each page
-/// Version: 0.5
+/// Version: 0.6
 
 /**
@@ -36 +36 @@
  * 0.4 - Properly escape the RSS url's entities.
  * 0.5 - Adapted to the new theme model
+ * 0.6 - Don't put a link in admin and other locations
  */
 
@@ -41 +42 @@
     $url    = guessTransportProto() . $_SERVER['HTTP_HOST'];
     $url .= $_SERVER["REQUEST_URI"];
-    
+
     if (strstr($_SERVER['REQUEST_URI'],"?") !== FALSE) {
-        $url .= "&media=rss";
+        $url .= "&media=rss";
     } else {
-            $url .= "?media=rss";
-        }
-        $url .= __rss_view_post2get();
-        $url = str_replace('&','&',$url);
+        $url .= "?media=rss";
+    }
+    $url .= __rss_view_post2get();
+    $url = str_replace('&','&',$url);
     return str_replace('&','&',$url);
 }
@@ -56 +57 @@
  */
 function __rss_view_post2get() {
-    $ret = "";
-    foreach($_POST as $key => $val) {
-        if (substr($key,0,4) == 'rss_') {
-            $ret .= "&" ."$key=" . $_POST[$key];
-        }
-    }
-    return $ret;
+    $ret = "";
+    foreach($_POST as $key => $val) {
+        if (substr($key,0,4) == 'rss_') {
+            $ret .= "&" ."$key=" . $_POST[$key];
+        }
+    }
+    return $ret;
 }
 
 function __rss_view_footerlink($dummy) {
-    echo "<span><a href=\"".__rss_view_url()."\">RSS</a></span>\n";
+    if (!defined('RSS_FILE_LOCATION')) {
+        echo "<span><a href=\"".__rss_view_url()."\">RSS</a></span>\n";
+    }
     return $dummy;
 }
 
 function __rss_view_headerlink($dummy) {
-    echo "\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".__rss_view_url()."\" />\n";
+    if (!defined('RSS_FILE_LOCATION')) {
+        echo "\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".__rss_view_url()."\" />\n";
+    }
     return $dummy;
 }