Changeset 1685

Timestamp:

02/05/07 11:51:37 (21 months ago)

Author:

mbonetti

Message:

experimental: if the item has an image enclosure, display it inline with the item's content. Testcase: http://favicon2dots.com/rss

Files:

• trunk/gregarius/util.php (modified) (13 diffs)

trunk/gregarius/util.php

@@ -30 +30 @@
 
 function getLastModif() {
-    return getProperty('__meta__','meta.lastupdate');
+    return getProperty('__meta__','meta.lastupdate');
 }
 
@@ -316 +316 @@
             if (array_key_exists('enclosure@url', $item) ) {
                 $enclosure = $item['enclosure@url'];
+                // If the enclosure is an image, append it to the content
+                if ($enclosure && array_key_exists('enclosure@type', $item) && preg_match('#image/(png|gif|jpe?g)#', $item['enclosure@type'])) {
+                    $description = '<img src="'.$enclosure.'" alt="" />' . $description;
+                    $enclosure = '';
+                }
             } else {
                 $enclosure = "";
@@ -460 +465 @@
         }
         elseif (is_object($rss) && array_key_exists('title#', $rss->channel)) {
-            if (array_key_exists('title', $rss->channel)) {
-                $title = rss_real_escape_string($rss->channel['title']);
+            if (array_key_exists('title', $rss->channel)) {
+                $title = rss_real_escape_string($rss->channel['title']);
             } else {
-                $title = " ";
+                $title = " ";
             }
         }
@@ -521 +526 @@
                 $mode |= RSS_MODE_PRIVATE_STATE;
             }
-            
+
             $sql = "insert into ".getTable("channels")
                    ." (title, url, siteurl, parent, descr, dateadded, icon, position, mode, daterefreshed)"
@@ -534 +539 @@
             }
 
-            if($tags != ""){
+            if($tags != "") {
                 __exp__submitTag($newid,$tags,"'channel'");
             }
@@ -638 +643 @@
             $ret = substr($ret, 0, strlen($ret) - strlen(RSS_FILE_LOCATION));
         }
-    if (substr($ret, -1) == "\\") { // Take off trailing backslash
+        if (substr($ret, -1) == "\\") { // Take off trailing backslash
             $ret = substr($ret, 0, -1);
-    }
+        }
         if (substr($ret, -1) != "/") {  // Add a frontslash
             $ret .= "/";
@@ -846 +851 @@
 
 function showViewForm($args) { //$curValue, $show_private) {
-        list($curValue, $show_private) = $args;
+    list($curValue, $show_private) = $args;
 
     // post back to self, we should be able to handle the request, shouldn't we.
@@ -856 +861 @@
     ."</select>"
     ."</p>\n";
-/*
-        if(isLoggedIn()) {
-            echo "<p><label for=\"chkPrivate\">".__('Show Private:')."</label>\n"
-            ."<input type=\"checkbox\" name=\"chkPrivate\" id=\"chkPrivate\" value=\"1\" onchange=\"if(false == document.getElementById('chkPrivate').checked) { document.getElementById('chkPrivate').value = 0; document.getElementById('chkPrivate').checked = true; } document.getElementById('frmShow').submit();\"" . (1 == $show_private ? " checked" : "") . ">\n"
-            ."</p>\n";
-        }
-        */
-        echo "</form>\n";
+    /*
+            if(isLoggedIn()) {
+                echo "<p><label for=\"chkPrivate\">".__('Show Private:')."</label>\n"
+                ."<input type=\"checkbox\" name=\"chkPrivate\" id=\"chkPrivate\" value=\"1\" onchange=\"if(false == document.getElementById('chkPrivate').checked) { document.getElementById('chkPrivate').value = 0; document.getElementById('chkPrivate').checked = true; } document.getElementById('frmShow').submit();\"" . (1 == $show_private ? " checked" : "") . ">\n"
+                ."</p>\n";
+            }
+            */
+    echo "</form>\n";
 }
 
@@ -965 +970 @@
 // moved from ajax.php
 function __exp__submitTag($id,$tags,$type = "'item'") {
-    $tags = strip_tags($tags);
+    $tags = strip_tags($tags);
     $ftags = utf8_encode( preg_replace(ALLOWED_TAGS_REGEXP,'', trim($tags)));
     $tarr = array_slice(explode(" ",$ftags),0,MAX_TAGS_PER_ITEM);
@@ -981 +986 @@
             continue;
         }
-        $ttag = sanitize($ttag,
-            RSS_SANITIZER_NO_SPACES | RSS_SANITIZER_SIMPLE_SQL
-        );
-        
+        $ttag = sanitize($ttag,
+                         RSS_SANITIZER_NO_SPACES | RSS_SANITIZER_SIMPLE_SQL
+                        );
+
         rss_query( "insert into ". getTable('tag')
                    . " (tag) values ('$ttag')", false );
@@ -1068 +1073 @@
     return ("echo stripslashes(\"".addslashes($arr[1])."\");");
 }
-
+ 
 function eval_mixed($string) {
     $string = "<? ?>".$string."<? ?>";
@@ -1094 +1099 @@
 
 function cacheFavicon($icon) {
-     // Make sure only real favicons get fetched into the DB
-     if (! preg_match('#^https?://.+$#',$icon)) {
-        return false;
-     }
-     
+    // Make sure only real favicons get fetched into the DB
+    if (! preg_match('#^https?://.+$#',$icon)) {
+        return false;
+    }
+
     $icon_ = rss_real_escape_string($icon);
     $binIcon = getUrl($icon);
@@ -1144 +1149 @@
 
 function hidePrivate() {
-    $ret = 0;
-
-  if(isLoggedIn()) {
-        $ret = rss_user_show_private();
-    }
-
-    return !$ret;
+    $ret = 0;
+
+    if(isLoggedIn()) {
+        $ret = rss_user_show_private();
+    }
+
+    return !$ret;
 }
 
 function isLoggedIn() {
-    if (!isset($GLOBALS['rssuser'])) {
-        require_once('cls/user.php');
-    }
-
-    return rss_user_check_user_level(RSS_USER_LEVEL_PRIVATE);
-}
-
-// Send a crappy 404 (to save bandwidth) for webbots 
+    if (!isset($GLOBALS['rssuser'])) {
+        require_once('cls/user.php');
+    }
+
+    return rss_user_check_user_level(RSS_USER_LEVEL_PRIVATE);
+}
+
+// Send a crappy 404 (to save bandwidth) for webbots
 function rss_404() {
-    header("HTTP/1.1 404 Not Found");
-    echo "404 Page Not Found\n";
+    header("HTTP/1.1 404 Not Found");
+    echo "404 Page Not Found\n";
 }
 
 function rss_uri($title, $sep=RSS_URI_SEPARATOR) {
-    return utf8_uri_encode(preg_replace('#[ \#%&/\+\'"\?]#',$sep,$title));
+    return utf8_uri_encode(preg_replace('#[ \#%&/\+\'"\?]#',$sep,$title));
 }
 ?>