md5() -> hash(); ws

diff --git a/hippo/planet.horde.org/libs/aggregator.php b/hippo/planet.horde.org/libs/aggregator.php
index 1f56567..132d674 100644 (file)
--- a/hippo/planet.horde.org/libs/aggregator.php
+++ b/hippo/planet.horde.org/libs/aggregator.php
@@ -7,16 +7,16 @@ include_once('utf2entities.php');
 include_once('magpierss/rss_fetch.inc');
 
 class aggregator {
-    
+
     var $mdb = null;
-    
+
     function __construct() {
         $this->mdb = MDB2::connect($GLOBALS['BX_config']['dsn']);
         if(MDB2::isError($this->mdb)) {
             die('unable to connect to db');
         }
     }
-    
+
     function aggregateAllBlogs($id = null) {
     $where = '';
        if ($id) {
@@ -31,7 +31,7 @@ class aggregator {
        }
        while ($row = $res->fetchRow(MDB2_FETCHMODE_ASSOC)) {
            //get remote feed from magpie
-           $feed = $this->getRemoteFeed($row['link']);  
+           $feed = $this->getRemoteFeed($row['link']);
            if(!$feed) {
                continue;
            }
@@ -40,7 +40,7 @@ class aggregator {
                print "NO channel/link... PLEASE FIX THIS\n";
                continue;
            }
-          
+
            $blog = $this->getBlogEntry($feed->channel['link']);
            $blog = $this->mdb->queryRow ("select * from blogs where id = ".(int)$row['blogsid'], null,MDB2_FETCHMODE_ASSOC);
            $newBlog = false;
@@ -52,14 +52,14 @@ class aggregator {
                //TODO: check for changed channel entries
                $id = $blog['id'];
                if ($feed->channel['title'] && $blog['title'] != $feed->channel['title'] && $row['section'] != 'comments') {
-                    // $this->updateBlogEntry($feed->channel, $id);   
+                    // $this->updateBlogEntry($feed->channel, $id);
                }
            }
            // update id, if not the same
            if ($row['blogsid'] != $id) {
-               // $this->updateFeedBlogID($row['link'], $id);   
+               // $this->updateFeedBlogID($row['link'], $id);
             }
-            
+
             //loop through feeds
 
             foreach ($feed->items as $item) {
@@ -75,17 +75,17 @@ class aggregator {
 
                if (!isset($item['content']['encoded']) && isset($item['atom_content'])) {
                        $item['content']['encoded'] = $item['atom_content'];
-               } 
+               }
                 $item['md5']  = $this->generateMD5($item);
-                
+
                 $feedInDB = $this->getEntry($guid);
                 if (!$feedInDB) {
                     // check for category stuff
-                    // we only do that for new entries 
+                    // we only do that for new entries
                     if (isset($item['dc']['subject'])) {
-                        $item['category'] = $item['dc']['subject']; 
+                        $item['category'] = $item['dc']['subject'];
                     }
-                    
+
                     if ($row['cats']) {
                         $cats = explode(",",$row['cats']);
                         $hit = false;
@@ -94,7 +94,7 @@ class aggregator {
                                 $hit = true;
                             }
                         }
-                        
+
                         if (!$hit) {
                             print $item['title'] . " - " . $item['category'] . " not in list\n";
                             continue;
@@ -107,30 +107,30 @@ class aggregator {
                     $item = $this->truncateEntries($item);
                     $this->updateEntry($item,$feedInDB['id']);
                 }
-                
+
             }
        }
     }
-    
+
     function truncateEntries($item) {
         $maxsize = 5000;
         if (isset($item['content']['encoded']) && strlen($item['content']['encoded']) > $maxsize + 500) {
             print "TRUNCATE content_encoded on ". $item['title'] ."\n";
             $morebytes = (strlen($item['content']['encoded']) - $maxsize);
             $item['content']['encoded'] = $this->getBody(substr($item['content']['encoded'],0,$maxsize));
-            $item['content']['encoded'] .= '<p><i>Truncated by Planet Horde, read more at <a href="'.$item['link'].'">the original</a> (another ' . $morebytes .' bytes)</i></p>'; 
+            $item['content']['encoded'] .= '<p><i>Truncated by Planet Horde, read more at <a href="'.$item['link'].'">the original</a> (another ' . $morebytes .' bytes)</i></p>';
         } else if (isset($item['description']) && strlen($item['description']) > $maxsize + 500) {
             print "TRUNCATE description ". $item['title'] ."\n";
             $morebytes = (strlen($item['description']) - $maxsize);
-            
+
             $item['description'] = $this->getBody(substr($item['description'],0,$maxsize));
             $item['description'] .= '<p><i>Truncated by Planet Horde, read more at <a href="'.$item['link'].'">the original</a> (another ' . $morebytes .' bytes)</i></p>';
         }
         return $item;
     }
-    
+
     function getBody($html) {
-        
+
         $d = new DomDocument();
         $html = '<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head><body>'.$html.'</body>';
         @$d->loadHTML($html);
@@ -142,11 +142,11 @@ class aggregator {
         }
         return $body;
     }
-    
+
     function generateMD5($item) {
-        return md5($item['title'] .$item['link'] . (isset($item['description']) ? $item['description'] : '') . (isset($item['content']['encoded']) ? $item['content']['encoded'] : ''));
+        return hash('md5', $item['title'] .$item['link'] . (isset($item['description']) ? $item['description'] : '') . (isset($item['content']['encoded']) ? $item['content']['encoded'] : ''));
     }
-    
+
     function updateEntry($item, $entryID) {
        $date =  $this->getDcDate($item, 0,true);
        $query = "update entries set " .
@@ -157,7 +157,7 @@ class aggregator {
        if ($date) {
         $query .= " dc_date = '".$date."',";
        }
-       
+
        $query .= " md5=  '" .$item['md5'] . "' ".
        " where ID = $entryID";
        print "update " . $item['title'] ."\n";
@@ -179,12 +179,12 @@ class aggregator {
         if (!isset($item['guid']) || $item['guid'] == '') {
             $item['guid'] = $item['link'];
         }
-       
+
         $date =  $this->getDcDate($item, $offset);
-        
+
         $query = "insert into entries (ID,feedsID, title,link, guid,description,dc_date, dc_creator, content_encoded, md5) VALUES (".        $id . "," .
         $feedID . ",'" .
-        
+
         mysql_escape_string(utf2entities($item['title'])) . "','" .
         mysql_escape_string(trim($item['link'])) . "','" .
         mysql_escape_string(($item['guid'])) . "','" .
@@ -193,7 +193,7 @@ class aggregator {
         $item['dc']['creator'] . "','" .
         mysql_escape_string(utf2entities($item['content']['encoded'])) . "','".
         $item['md5'] . "')";
-        
+
         print "insert " . $item['title'] ."\n";
         $res = $this->mdb->query($query);
         if (MDB2::isError($res)) {
@@ -203,7 +203,7 @@ class aggregator {
             return $id;
         }
     }
-    
+
     function getDcDate($item, $nowOffset = 0, $returnNull = false) {
         //we want the dates in UTC... Looks like MySQL can't handle timezones...
         //putenv("TZ=UTC");
@@ -224,24 +224,24 @@ class aggregator {
             $dcdate = gmdate("Y-m-d H:i:s O",time() + $nowOffset);
         }
         return $dcdate;
-        
+
     }
-    
+
     function fixdate($date) {
         $date =  preg_replace("/([0-9])T([0-9])/","$1 $2",$date);
         $date =  preg_replace("/([\+\-][0-9]{2}):([0-9]{2})/","$1$2",$date);
-       $time = strtotime($date);        
+       $time = strtotime($date);
         //if time is too much in the future (more than 1 hours)
-        // set it to now()                  
-        if (($time - time()) > 3600)  {              
-                $time = time();             
+        // set it to now()
+        if (($time - time()) > 3600) {
+                $time = time();
         }
         $date =  gmdate("Y-m-d H:i:s O",$time);
         return $date;
     }
-        
+
     function updateFeedBlogID($url, $id) {
-        
+
         $query = "update feeds set blogsID = $id where link = '$url'";
         $res = $this->mdb->query($query);
         if (MDB2::isError($res)) {
@@ -251,9 +251,9 @@ class aggregator {
             return $id;
         }
     }
-    
+
     function insertBlogEntry($channel) {
-        
+
         $id =  $this->mdb->nextID("planet");
         $query = "insert into blogs (ID,title,link,description) VALUES (".
         $id . ",'" .
@@ -268,16 +268,14 @@ class aggregator {
             return $id;
         }
     }
-    
-    
+
+
      function updateBlogEntry($channel,$id) {
-        
-      
         $query = "update blogs set
         title =  '".mysql_escape_string($channel['title']) . "',
         link = '".mysql_escape_string($channel['link']) . "',
         description = '".mysql_escape_string($channel['description']) . "' where ID = ". $id;
-        
+
         $res = $this->mdb->query($query);
         if (MDB2::isError($res)) {
             print "DB ERROR: ". $res->getMessage() . "\n". $res->getUserInfo(). "\n";
@@ -290,21 +288,21 @@ class aggregator {
     function getBlogEntry($url) {
          return  $this->mdb->queryRow ("select * from blogs where link = '$url'",null,MDB2_FETCHMODE_ASSOC);
     }
-    
+
     function getFeedEntry($url) {
          return  $this->mdb->queryRow ("select * from feeds where link = '$url'",null,MDB2_FETCHMODE_ASSOC);
     }
     function getEntry($url) {
          return  $this->mdb->queryRow ("select * from entries where guid = '$url'",null,MDB2_FETCHMODE_ASSOC);
     }
-        
+
     function getRemoteFeed($url) {
         if ($feed = fetch_rss($url)) {
             return $feed;
         } else {
             print "$url is not a valid feed \n";
             return false;
-        } 
+        }
     }
-    
+
 }