Changeset 1092 for trunk/wifidog-auth/wifidog/classes/Content/RssAggregator/RssAggregator.php

Timestamp:

09/07/06 04:38:25 (5 years ago)

Author:

benoitg

Message:

• Fix #63
• Fix problem with my Splash only user fix (I used match on the

user_id instead of the username).

• Prevent the Splash only user from logging out, wrecking havock

in the tokens.

• Do not allow SplashOnlyUser? to set his preferences.
• Assigning a reusable content to a contentgroup element would

make it non-reusable.
Usability and UI fixes:

• Allow other users to log in when they are at a splash only

node.

• Make isSimpleContent class available for Simple content types.

Make it borderless and backgroundless in the default theme_pack.

• Simplify HTML output for simple content.
• Fix IE layout bug in node admin
• Content linked to nodes and networks now edits in a new

window.

• Remove "Add new node" menu item for consistency.

Files:

• trunk/wifidog-auth/wifidog/classes/Content/RssAggregator/RssAggregator.php (modified) (19 diffs)

trunk/wifidog-auth/wifidog/classes/Content/RssAggregator/RssAggregator.php

@@ -64 +64 @@
 class RssAggregator extends Content {
     /**
-
+    
      */
     private $content_rss_aggregator_row;
 
     /**
-
+    
      */
     private $content_rss_aggregator_feeds_rows;
 
     /**
-
+    
      */
     private $press_review;
@@ -114 +114 @@
         if ($content_rss_aggregator_rows != null) {
             $this->content_rss_aggregator_feeds_rows = $content_rss_aggregator_rows;
-        }
-        else {
+        } else {
             $this->content_rss_aggregator_feeds_rows = array ();
         }
@@ -139 +138 @@
                 }
             }
-        }
-        else {
+        } else {
             $html = _("RSS support is disabled");
         }
@@ -182 +180 @@
 
             $retval = false;
-        }
-        else {
+        } else {
             /*
              * Successfull, but nothing modified
@@ -239 +236 @@
 
             $retval = true;
-        }
-        else {
+        } else {
             /*
              * Successfull, but nothing modified
@@ -305 +301 @@
 
             $retval = false;
-        }
-        else {
+        } else {
             /*
              * Successfull, but nothing modified
@@ -405 +400 @@
         $html .= "<div class='admin_element_label'>\n";
         $html .= _("How much bonus feeds that do not publish as often get over feed that publish more often.
-                            The default is 0.75, with a typical range between 0 and 1.
-                            At 0, you have a classic RSS aggregator, meaning the n most recent entries picked from all feeds
-                            will be displayed. 1 is usually as high as you'll want to go:  Assuming that all
-                            an homogenous internal distribution (ex:  one feed publishes exactly one entry a day, the
-                            second once every two days, and the third once every three days), and you ask for 15 entries,
-                            there will be 5 of each.  While that may not sound usefull, it still is, as the feed's distribution is
-                            usually not homogenous.");
+                                            The default is 0.75, with a typical range between 0 and 1.
+                                            At 0, you have a classic RSS aggregator, meaning the n most recent entries picked from all feeds
+                                            will be displayed. 1 is usually as high as you'll want to go:  Assuming that all
+                                            an homogenous internal distribution (ex:  one feed publishes exactly one entry a day, the
+                                            second once every two days, and the third once every three days), and you ask for 15 entries,
+                                            there will be 5 of each.  While that may not sound usefull, it still is, as the feed's distribution is
+                                            usually not homogenous.");
         $html .= ": </div>\n";
         $html .= "<div class='admin_element_data'>\n";
@@ -428 +423 @@
         $html .= "<div class='admin_element_label'>\n";
         $html .= _("Set the oldest entries (in seconds) you are willing to see.  Any entries older than this will not
-                            be considered at all for display, even if it means that the configured number of items to be displayed isn't reached.
-                            It's only usefull if all your feed publish very rarely, and you don't want very old entries to show up.");
+                                            be considered at all for display, even if it means that the configured number of items to be displayed isn't reached.
+                                            It's only usefull if all your feed publish very rarely, and you don't want very old entries to show up.");
         $html .= ": </div>\n";
         $html .= "<div class='admin_element_data'>\n";
@@ -473 +468 @@
 
         $sql = "SELECT count, content_rss_aggregator_feeds.url, title FROM content_rss_aggregator_feeds
-                        JOIN (SELECT url, count(content_rss_aggregator_feeds.url) as count
-                        FROM content_rss_aggregator_feeds
-                        WHERE content_rss_aggregator_feeds.url NOT IN (SELECT url FROM content_rss_aggregator_feeds WHERE content_id='{$this->id}')
-                        GROUP BY content_rss_aggregator_feeds.content_id, content_rss_aggregator_feeds.url)
-                        AS available_feeds
-                        ON (available_feeds.url=content_rss_aggregator_feeds.url)
-                        ORDER by count DESC";
+                                        JOIN (SELECT url, count(content_rss_aggregator_feeds.url) as count
+                                        FROM content_rss_aggregator_feeds
+                                        WHERE content_rss_aggregator_feeds.url NOT IN (SELECT url FROM content_rss_aggregator_feeds WHERE content_id='{$this->id}')
+                                        GROUP BY content_rss_aggregator_feeds.content_id, content_rss_aggregator_feeds.url)
+                                        AS available_feeds
+                                        ON (available_feeds.url=content_rss_aggregator_feeds.url)
+                                        ORDER by count DESC";
 
         $db->execSql($sql, $feed_urls, false);
-
-        foreach ($feed_urls as $feed_row) {
-            $tab[$i][0] = $feed_row['url'];
-            empty ($feed_row['title']) ? $title = $feed_row['url'] : $title = $feed_row['title'];
-            $tab[$i][1] = sprintf(_("%s, used %d times"), $title, $feed_row['count']);
-            $i++;
-        }
-
+        if ($feed_urls) {
+            foreach ($feed_urls as $feed_row) {
+                $tab[$i][0] = $feed_row['url'];
+                empty ($feed_row['title']) ? $title = $feed_row['url'] : $title = $feed_row['title'];
+                $tab[$i][1] = sprintf(_("%s, used %d times"), $title, $feed_row['count']);
+                $i++;
+            }
+        }
         $name = "rss_aggregator_{$this->id}_feed_add";
         $html .= "<input type='text' size='60' value='' name='$name' id='$name'>\n";
@@ -563 +558 @@
      *
      * @return string HTML code for the administration interface
-
+    
      */
     private function getFeedAdminUI($feed_row) {
@@ -602 +597 @@
         if ($calculated_pub_interval == true) {
             $html .= sprintf(_("The feed publishes an item every %.2f day(s)"), $calculated_pub_interval / (60 * 60 * 24));
-        }
-        else {
+        } else {
             $html .= "<div class='admin_element_label'><span class='warningmsg'>" . _("WARNING:  This feed does not include the publication dates.
-                                                                                                 The system needs to be able to compute approximate publication
-                                                                                                 date for each entry, so the entry can be weighted against the
-                                                                                                 others. In order for the aggregator to do a good job, you need
-                                                                                                 to estimate fublication frequency of the items, in days.
-                                                                                                 If unset, defaults to one day.") . ": </span></div>\n";
+                                                                                                                             The system needs to be able to compute approximate publication
+                                                                                                                             date for each entry, so the entry can be weighted against the
+                                                                                                                             others. In order for the aggregator to do a good job, you need
+                                                                                                                             to estimate fublication frequency of the items, in days.
+                                                                                                                             If unset, defaults to one day.") . ": </span></div>\n";
             $html .= "<div class='admin_element_data'>\n";
             $name = "rss_aggregator_" . $this->id . "_feed_" . md5($feed_row['url']) . "_default_publication_interval";
@@ -615 +609 @@
             if (!empty ($feed_row['default_publication_interval'])) {
                 $value = $feed_row['default_publication_interval'] / (60 * 60 * 24);
-            }
-            else {
+            } else {
                 $value = '';
             }
@@ -631 +624 @@
         $html .= "<li class='admin_element_item_container'>\n";
         $html .= "<div class='admin_element_label'>" . _("The bias to be given to the source by the selection algorithm.
-                                                                Bias must be > 0 , typical values would be between 0.75 and 1.5
-                                                                and default is 1 (no bias).  A bias of 2 will cause the items
-                                                                to \"look\" twice as recent to the algorithm. A bias of 0.5 to
-                                                                look twice as old. Be carefull, a bias of 2 will statistically
-                                                                cause the feed to have MORE than twice as many items displayed.") . ": </div>\n";
+                                                                                    Bias must be > 0 , typical values would be between 0.75 and 1.5
+                                                                                    and default is 1 (no bias).  A bias of 2 will cause the items
+                                                                                    to \"look\" twice as recent to the algorithm. A bias of 0.5 to
+                                                                                    look twice as old. Be carefull, a bias of 2 will statistically
+                                                                                    cause the feed to have MORE than twice as many items displayed.") . ": </div>\n";
         $html .= "<div class='admin_element_data'>\n";
 
@@ -656 +649 @@
      *
      * @return void
-
+    
      */
     private function processFeedAdminUI($feed_row) {
@@ -680 +673 @@
         elseif (!is_numeric($bias) || $bias <= 0) {
             echo _("The bias must be a positive real number");
-        }
-        else {
+        } else {
             /*
              * Successfull, but nothing modified
@@ -709 +701 @@
             elseif (!is_numeric($bias) || $bias <= 0) {
                 echo _("The default publication must must be a positive integer or empty");
-            }
-            else {
+            } else {
                 /*
                  * Successfull, but nothing modified
@@ -732 +723 @@
         elseif (empty ($url)) {
             echo _("The URL cannot be empty!");
-        }
-        else {
+        } else {
             /*
              * Successfull, but nothing modified
@@ -754 +744 @@
             try {
                 $html = $this->press_review->get_rss_html($this->content_rss_aggregator_row['number_of_display_items']);
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 $html = sprintf(_("Could not get RSS feed: %s"), $feed_row['url']);
             }
-        /* Handle hyperlink clicktrough logging */
-        $html = $this->replaceHyperLinks($html);
-
-        }
-        else {
+            /* Handle hyperlink clicktrough logging */
+            $html = $this->replaceHyperLinks($html);
+
+        } else {
             $html = _("RSS support is disabled");
         }
@@ -780 +768 @@
      *
      * @return void
-
+    
      */
     private function refresh() {