Changeset 315

Timestamp:

01/11/05 23:00:06 (8 years ago)

Author:

benoitg

Message:

2004-01-11 Benoit Gr�goire <bock@…>

• INSTALL: Mandate PHP5
• wifidog/hotspot_status.php: Allow export of the list as a RSS feed
• wifidog/classes/RssPressReview.inc: Make it truly functionnal.
• wifidog/portal/index.php: Support multiple RSS feeds. The system will automatically pick the best 5 entries from all the feeds. It will compensate for disparate publication intervals. An entry from a feed that does not publish often will live longer than an entry from a feed that publishes very often. If a feed doesn't have any entry that makes the cut, it will not appear at all.
• wifidog/templates/hotspot_status.html: Add link to the RSS version.

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• INSTALL (modified) (1 diff)
• wifidog/classes/RssPressReview.inc (modified) (14 diffs)
• wifidog/hotspot_status.php (modified) (2 diffs)
• wifidog/portal/index.php (modified) (5 diffs)
• wifidog/templates/hotspot_status.html (modified) (1 diff)

trunk/wifidog-auth/ChangeLog

@@ -1 +1 @@
 # $Header$
-2004-01-10 Benoit Gr�goire  <bock@step.polymtl.ca>
+2004-01-11 Benoit Gr�goire  <bock@step.polymtl.ca>
+        * INSTALL: Mandate PHP5
+        * wifidog/hotspot_status.php: Allow export of the list as a RSS feed
+        * wifidog/classes/RssPressReview.inc:  Make it truly functionnal.
+        * wifidog/portal/index.php:  Support multiple RSS feeds.  The system will automatically pick the best 5 entries from all the feeds.  It will compensate for disparate publication intervals.  An entry from a feed that does not publish often will live longer than an entry from a feed that publishes very often.  If a feed doesn't have any entry that makes the cut, it will not appear at all.
+        * wifidog/templates/hotspot_status.html:  Add link to the RSS version.
+
+2004-01-11 Benoit Gr�goire  <bock@step.polymtl.ca>
         * wifidog/config.php:  Add list of hotspot to network rss feed list (not yet functionnal)
         * wifidog/hotspot_status.php:  Allow RSS export of the list of deployed HotSpots.

trunk/wifidog-auth/INSTALL

@@ -1 +1 @@
 Prerequisites:
-Smarty template engine http://smarty.php.net/
-magpierss http://magpierss.sourceforge.net/ (Required for RSS support.  RSS support must be manually disabled if you do not insall it)
-php's php-xml extention installed. (Required if RSS support is on)
-php compiled with gettext support (Will be autodetected if unavailable, but you will loose internationalization)
-PostgreSQL (mysql code also exists, but is looking for a maintainer)
+-PHP5
+-Smarty template engine http://smarty.php.net/
+-Magpierss http://magpierss.sourceforge.net/ (Required for RSS support.  RSS support must be manually disabled if you do not insall it)
+-php's php-xml extention installed. (Required if RSS support is on)
+-php's dom extension installed. (Required if you want to export the list of HotSpots as a RSS feed)
+-php compiled with gettext support (Will be autodetected if unavailable, but you will loose internationalization)
+-PostgreSQL (mysql code also exists, but is looking for a maintainer)
 
 Install files:

trunk/wifidog-auth/wifidog/classes/RssPressReview.inc

@@ -77 +77 @@
    @return the date in timestamp format of -1 if unavailable
   */
-  private function get_item_date ( $item, $debug = 0 )
-  {
-    $retval = -1;
-    if(!empty($item['dc']['date']))
-      {
-        $datestr = $item['dc']['date'];
-      }
-    else if (!empty($item['pubdate']))
-      {
-        $datestr = $item['pubdate'];
-      }
-    else if (!empty($item['date']))
-      {
-        $datestr = $item['date'];
-      }
-    else if (!empty($item['created']))
-      {
-        $datestr = $item['created'];
-      }
-    else
-      {
-        if ($debug)
-          {
-            echo "<p>get_item_date(): No date present!</p>";
-          }
-        $datestr = null;
-      }
+  static private function get_item_date ( $item, $debug = 0 )
+    {
+      $retval = -1;
+      if(!empty($item['dc']['date']))
+        {
+          $datestr = $item['dc']['date'];
+        }
+      else if (!empty($item['pubdate']))
+        {
+          $datestr = $item['pubdate'];
+        }
+      else if (!empty($item['date']))
+        {
+          $datestr = $item['date'];
+        }
+      else if (!empty($item['created']))
+        {
+          $datestr = $item['created'];
+        }
+      else
+        {
+          if ($debug)
+            {
+              echo "<p>get_item_date(): No date present!</p>";
+            }
+          $datestr = null;
+        }
                 
-    if ($datestr==null)
-      {
-        $retval = -1;
-      }
-    else
-      {
-        if ($debug)
-          {
-            echo "<p>get_item_date(): String to convert: $datestr</p>"; 
-          }
+      if ($datestr==null)
+        {
+          $retval = -1;
+        }
+      else
+        {
+          if ($debug)
+            {
+              echo "<p>get_item_date(): String to convert: $datestr</p>";       
+            }
         
-        $retval = parse_w3cdtf($datestr);
-        if($retval == -1)
-          {
-            $retval = strtotime($datestr);
-          }
+          $retval = parse_w3cdtf($datestr);
+          if($retval == -1)
+            {
+              $retval = strtotime($datestr);
+            }
                 
-        if ($debug)
-          {
-            if ($retval == -1)
-              {
-                echo "<p>get_item_date(): Conversion of $datestr failed!</p>";  
-              }
-            else
-              {
-                echo "<p>get_item_date(): Conversion succeded</p>";     
-                setlocale(LC_TIME, "fr_CA");
-                echo strftime("%c", $retval);
-              }
-          }
-
-      }
-    if ($debug)
-      {
-        echo "<p>get_item_date(): Retval: $retval</p>";
-      }
-    return $retval;
-
-  }
+          if ($debug)
+            {
+              if ($retval == -1)
+                {
+                  echo "<p>get_item_date(): Conversion of $datestr failed!</p>";        
+                }
+              else
+                {
+                  echo "<p>get_item_date(): Conversion succeded</p>";   
+                  setlocale(LC_TIME, "fr_CA");
+                  echo strftime("%c", $retval);
+                }
+            }
+
+        }
+      if ($debug)
+        {
+          echo "<p>get_item_date(): Retval: $retval</p>";
+        }
+      return $retval;
+
+    }
     
   /** Inverted comparaison function for adjusted dates (so that the most recent are first */
@@ -169 +169 @@
     return $string;
   }
+
+  /** This is the static comparing function to sort rss items in chronological order: */
+  static function cmp_date_item($a, $b)
+    {
+      $a_date=self::get_item_date($a);
+      $b_date=self::get_item_date($b);
+      if ($a_date == $b_date) {
+        return 0;
+      }
+      /*echo "cmp_date_item(): a:$a_date, b:$b_date ";
+       echo ($a_date < $b_date) ? +1 : -1;*/
+      return ($a_date < $b_date) ? +1 : -1;
+    }
+
 
   /*
@@ -201 +215 @@
         $publication_interval_total = null; //running total of the difference between the date of the current item and the previous one
         $average_publication_interval = null;
-        $previous_item_date;
+        $previous_item_date=null;
         $rss = fetch_rss( $rss_source['url'] );
         if ( !$rss )
@@ -212 +226 @@
             //$rss->show_channel();
             //$rss->show_list();
-              
+            
+            /* Sort the array in chronological order */
+
+            /*foreach  ($rss->items as $item) {echo "$item[title] ". self::get_item_date($item) . "<br>\n";}*/
+            if(!uasort($rss->items, array("RssPressReview","cmp_date_item")))
+              {
+                echo "Error: uasort() failed<br />\n";
+              }
+            /*foreach  ($rss->items as $item) {echo "$item[title] ". self::get_item_date($item) . "<br>\n";}*/
+
+            /* Calculate the publication interval for this source */
             foreach ($rss->items as $item)
               {
-                $date = $this->get_item_date($item);
+                $date = self::get_item_date($item);
                       
                 if ($date == -1)
@@ -237 +261 @@
                 $i++;
               }// End foreach items
+
+
             if($i >= 2  && $publication_interval_total != 0)
               {
@@ -273 +299 @@
     //print_r($item_date_array);
 
-    usort($item_date_array, "$this->cmp");
+    usort($item_date_array, array("RssPressReview","cmp"));
     //print_r($item_date_array);
     //echo "</pre>\n";
@@ -286 +312 @@
     /************** Now we actually display the feeds **************/
     $sidx=0;
+    $rss_html_all_feeds='';
+    //print_r($rss_sources);
+    reset($rss_sources);
     foreach ($rss_sources as $rss_sources_key => $rss_source)
       {
-        //echo "<h1>$rss_source[url]</h1>";
+        //echo "<h3>$rss_source[url]</h3>";
         $rss = fetch_rss( $rss_source['url'] );
         if ( !$rss )
@@ -302 +331 @@
             if ($rss_sources_key!=0)
               {
-                $rss_header .= "<hr />\n";
+                //$rss_header .= "<hr />\n";
               }
             $rss_header .= "<p class=textegris>"._('Source: ')."<b>";
@@ -318 +347 @@
             $header_is_displayed = false;
             $i = 0;
+            /* Sort the items by date, so we get the most recent first */
+            if(!uasort($rss->items, array("RssPressReview","cmp_date_item")))
+              {
+                echo "Error: uasort() failed<br />\n";
+              }
+
             foreach ($rss->items as $item)
               {
-                $date = $this->get_item_date($item);
+                $date = self::get_item_date($item);
                 $realdate = $date;
                 if ($date == -1)
@@ -329 +364 @@
                       
                 $average_publication_interval = $rss_sources[$rss_sources_key]['average_publication_interval'];
+
                 $adjust_factor = $all_feed_publication_interval/$average_publication_interval;
                 $adjusted_date = time()- ((time()-$date)*$adjust_factor);
-
-                //echo "adjusted_date $adjusted_date, min_adjusted_date_to_display $min_adjusted_date_to_display<br>";
+                //echo "<pre>";print_r($item);echo"</pre>";
+                /*      setlocale(LC_TIME, "fr_CA");
+                 $display_date= strftime("%x", $realdate);
+                 echo "$item[title] ($display_date): adjusted_date $adjusted_date, min_adjusted_date_to_display $min_adjusted_date_to_display<br>";
+                 echo "average_publication_interval: $average_publication_interval, adjust_factor: $adjust_factor, date: $date, $adjusted_date: $adjusted_date<br>";*/
                 if ($adjusted_date >= $min_adjusted_date_to_display)
                   {
@@ -340 +379 @@
                         $header_is_displayed = true;
                       }
-                    $href = $item['link'];
+                    if(!empty($item['link']))
+                      {
+                        $href = $item['link'];
+                      }
+                    else
+                      {
+                        $href = false;
+                      }
                     $title = $this->convert_string_encoding($item['title']);
 
-                    $summary =  $this->convert_string_encoding($item['summary']);       
-
+                    if(!empty($item['summary']))
+                      {
+                        $summary =  $this->convert_string_encoding($item['summary']);   
+                      }
+                    else
+                      {
+                        $summary = '';
+                      }
                     if($realdate!= -1)
                       {
@@ -356 +408 @@
               
                     $author='';
-                    if(trim($item['dc']['creator'])!='')
+                    if(!empty($item['dc']['creator']))
                       {
                         $author = trim($item['dc']['creator']);
                       }
-                    elseif (trim($item['author'])!='')
+                    elseif (!empty($item['author']))
                       {
                         $author = trim($item['author']);
                       }
-                    elseif (trim($item['author_name'])!='')
+                    elseif (!empty($item['author_name']))
                       {
                         $author = trim($item['author_name']);
@@ -376 +428 @@
                     $dhtml_id = "summary_".mt_rand(1, 10000). "_".$sidx;
                     $rss_html .= "<li>\n";
-                    $rss_html .= "<span class='textegrispetit'>$display_date</span><a class='y' onMouseOver=\"changestyle('$dhtml_id','visible');\" onMouseOut=\"changestyle('$dhtml_id','hidden');\"  href='$href'>\n";
-                    $rss_html .= "<b>$title</b><br />\n";
-                    $rss_html .= "</a>\n";
+                    $rss_html .= "<span class='textegrispetit'>$display_date</span><span class='y' onMouseOver=\"changestyle('$dhtml_id','visible');\" onMouseOut=\"changestyle('$dhtml_id','hidden');\">\n";
+                    if($href)
+                      {
+                        $rss_html .= "<a class='y' href='$href'>\n";
+                      }
+                    $rss_html .= "<b>$title</b></span><br />\n";
+                    if($href)
+                      {
+                        $rss_html .= "</a>\n";
+                      }
                     $rss_html .= "<div style='z-index: 1000; position: relative'>\n";
                     $rss_html .= "<div style='z-index: 1000;' id='$dhtml_id' class='introduction'>
@@ -390 +449 @@
                 $sidx++;
               }// End foreach items
+
             if($header_is_displayed)
               {
                 $rss_html .= "</ul>\n";
               }
-            return $rss_html;
-                  
+            $rss_html_all_feeds .= $rss_html;
           }
       }// End foreach rss feeds
+    return $rss_html_all_feeds;
     error_reporting($old_error_level);
   }

trunk/wifidog-auth/wifidog/hotspot_status.php

@@ -67 +67 @@
     $title = $channel->appendChild($title);
 
-    $textnode = $xmldoc->createTextNode(utf8_encode(_("New ").HOTSPOT_NETWORK_NAME. _("Hotspots")));
+    $textnode = $xmldoc->createTextNode(utf8_encode(_("Newest")." ".HOTSPOT_NETWORK_NAME. " ". _("Hotspots")));
     $title->appendChild($textnode);
 
@@ -292 +292 @@
      }
      $smarty->assign("nodes_count", count($node_results));
+     $smarty->assign("rss_format_url", 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'].'?format=RSS');
      echo $style->GetHeader(HOTSPOT_NETWORK_NAME.' hotspot status');
      $smarty->display("hotspot_status.html");

trunk/wifidog-auth/wifidog/portal/index.php

@@ -46 +46 @@
     $hotspot_rss_url = UNKNOWN_HOTSPOT_RSS_URL;
   }
-else
-  {
-    $smarty->assign('hotspot_name', $node_info['name']);
-    $hotspot_rss_url =  $node_info['rss_url'];
-  }
+ else
+   {
+     $smarty->assign('hotspot_name', $node_info['name']);
+     $hotspot_rss_url =  $node_info['rss_url'];
+   }
 
 /* Find out who is online */
@@ -60 +60 @@
   {
     foreach ($users as $user_info)
-    {
-      $smarty->append("online_users", $user_info);
-    }
+      {
+        $smarty->append("online_users", $user_info);
+      }
   }
 
 if(RSS_SUPPORT)
   {
-//      $old_error_level = error_reporting(E_ERROR);
+    //      $old_error_level = error_reporting(E_ERROR);
     define('MAGPIE_DIR', BASEPATH.MAGPIE_REL_PATH);
-//    require_once(MAGPIE_DIR.'rss_fetch.inc');
-//    define('MAGPIE_DEBUG', 0);
- require_once BASEPATH.'classes/RssPressReview.inc';
- $press_review=new RssPressReview;
-   $tokens = "/[\s,]+/";
- $network_rss_sources = NETWORK_RSS_URL;
- $network_rss_html = null;
-                     if(!empty($network_rss_sources))
-                     {
+    //    require_once(MAGPIE_DIR.'rss_fetch.inc');
+    //    define('MAGPIE_DEBUG', 0);
+    require_once BASEPATH.'classes/RssPressReview.inc';
+    $press_review=new RssPressReview;
+    $tokens = "/[\s,]+/";
+    $network_rss_sources = NETWORK_RSS_URL;
+    $network_rss_html = null;
+    if(!empty($network_rss_sources))
+      {
 
-  $extract_array=null;
-  $extract_array = preg_split($tokens, $network_rss_sources);
-  //print_r($extract_array);
-  foreach($extract_array as $source)
-  {
-$network_rss_sources_array[] = array('url' => $source, 'default_publication_interval' => 7*24*3600);
-                     }
-                     $network_rss_html=$press_review->get_rss_html($network_rss_sources_array, 5);
-                     }
+        $extract_array=null;
+        $extract_array = preg_split($tokens, $network_rss_sources);
+        //print_r($extract_array);
+        foreach($extract_array as $source)
+          {
+            $network_rss_sources_array[] = array('url' => $source, 'default_publication_interval' => 7*24*3600);
+          }
+        $network_rss_html=$press_review->get_rss_html($network_rss_sources_array, 5);
+      }
                      
-                     $hotspot_rss_html=null;
-                     if(!empty($hotspot_rss_url))
-                     {
-                       $extract_array=null;
-  $extract_array = preg_split($tokens, $hotspot_rss_url);
-  //print_r($extract_array);
-  foreach($extract_array as $source)
-  {
-$hotspot_rss_sources_array[] = array('url' => $source, 'default_publication_interval' => 7*24*3600);
-                     }
-                     $hotspot_rss_html=$press_review->get_rss_html($hotspot_rss_sources_array, 5);     
-}
+    $hotspot_rss_html=null;
+    if(!empty($hotspot_rss_url))
+      {
+        $extract_array=null;
+        $extract_array = preg_split($tokens, $hotspot_rss_url);
+        //print_r($extract_array);
+        foreach($extract_array as $source)
+          {
+            $hotspot_rss_sources_array[] = array('url' => $source, 'default_publication_interval' => 7*24*3600);
+          }
+        $hotspot_rss_html=$press_review->get_rss_html($hotspot_rss_sources_array, 5);     
+      }
     /**
      @return the generated html or the error message or an empty string if called without a URL.
@@ -121 +121 @@
               $rss_html .= "<ul>\n";
               foreach ($rss->items as $item)
-              {
-                //echo '<pre>'; print_r($item);         echo '</pre>';
-                $href = $item['link'];
-                $title = $item['title'];
-                $summary =  $item['summary'];   
-                $rss_html .= "<li><emp><a href=$href>$title</a></emp> $summary</li>\n";
-              }
+                {
+                  //echo '<pre>'; print_r($item);       echo '</pre>';
+                  $href = $item['link'];
+                  $title = $item['title'];
+                  $summary =  $item['summary']; 
+                  $rss_html .= "<li><emp><a href=$href>$title</a></emp> $summary</li>\n";
+                }
               $rss_html .= "</ul>\n";
             }
@@ -143 +143 @@
     //echo $hotspot_rss_html;
     $smarty->assign("hotspot_rss_html", $hotspot_rss_html);
-     //   error_reporting($old_error_level);
+    //   error_reporting($old_error_level);
   }
 $smarty->assign("user_management_menu", get_user_management_menu());
@@ -156 +156 @@
     $smarty->display(NODE_CONTENT_SMARTY_PATH.PORTAL_PAGE_NAME);
   }
-else
-  {
-    $smarty->display(DEFAULT_CONTENT_SMARTY_PATH.PORTAL_PAGE_NAME);
-  }
+ else
+   {
+     $smarty->display(DEFAULT_CONTENT_SMARTY_PATH.PORTAL_PAGE_NAME);
+   }
 
 ?>

trunk/wifidog-auth/wifidog/templates/hotspot_status.html

@@ -7 +7 @@
 <thead>
 <tr class='spreadsheet'>
-    <th class='spreadsheet' colspan=6>Status of the {$nodes_count} open {$smarty.const.HOTSPOT_NETWORK_NAME} HotSpots</th>
+    <th class='spreadsheet' colspan=6>Status of the {$nodes_count} open {$smarty.const.HOTSPOT_NETWORK_NAME} HotSpots (Get this list as a <a href='{$rss_format_url}'>RSS feed</a>)</th>
 </tr>
 <tr class='spreadsheet'>