Changeset 752

Timestamp:

09/12/05 15:02:57 (8 years ago)

Author:

benoitg

Message:

2005-09-12 Benoit Gr�goire <bock@…>

• schema_validate.php: Fix a bug version 26. The conversion of the old account_origin as a parameter to the authenticator was wrong. To fix it manually if you already ran the script, you must quote the parameter in column network_authenticator_params in the networks table.
• Network.php: Fix improper quoting of Authenticator arguments.
• RssPressReview?.php: Make expansion of today's item optionnal.

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• wifidog/classes/Network.php (modified) (1 diff)
• wifidog/include/schema_validate.php (modified) (1 diff)
• wifidog/lib/RssPressReview/RssPressReview.php (modified) (3 diffs)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-09-12 Benoit Grégoire  <bock@step.polymtl.ca>
+        * schema_validate.php:  Fix a bug version 26.  The conversion of the old account_origin as a parameter 
+        to the authenticator was wrong.  To fix it manually if you already ran the script,
+         you must quote the parameter in column network_authenticator_params in the networks table.
+        * RssPressReview.php:  Make expansion of today's item optionnal.
+
 2005-09-11 Francois Proulx <francois.proulx@gmail.com>
         * Fixed dependency check, found a workaround for the file_exists problem

trunk/wifidog-auth/wifidog/classes/Network.php

@@ -389 +389 @@
                         throw new Exception("Network::getAuthenticator():  Security error:  The parameters passed to the constructor of the authenticator are potentially unsafe");
                 }
-                $objstring = 'return new '.$this->mRow['network_authenticator_class']."('".$this->mRow['network_authenticator_params']."');";
+                $objstring = 'return new '.$this->mRow['network_authenticator_class']."(".$this->mRow['network_authenticator_params'].");";
                 return eval ($objstring);
         }

trunk/wifidog-auth/wifidog/include/schema_validate.php

@@ -580 +580 @@
                         $sql .= "  allow_custom_portal_redirect BOOLEAN NOT NULL DEFAULT FALSE\n";
                         $sql .= ");\n";
-                        $sql .= "INSERT INTO networks (network_id, network_authenticator_class, network_authenticator_params) SELECT  account_origin, COALESCE('AuthenticatorLocalUser') as network_authenticator_class, account_origin FROM users GROUP BY (account_origin) ORDER BY min(reg_date);\n";
+                        $sql .= "INSERT INTO networks (network_id, network_authenticator_class, network_authenticator_params) SELECT  account_origin, COALESCE('AuthenticatorLocalUser') as network_authenticator_class, '\'' || account_origin || '\'' FROM users GROUP BY (account_origin) ORDER BY min(reg_date);\n";
                         $sql .= "UPDATE networks SET is_default_network=TRUE WHERE network_id=(SELECT account_origin FROM users GROUP BY (account_origin) ORDER BY min(reg_date) LIMIT 1);\n";
                         $sql .= "ALTER TABLE users ADD CONSTRAINT account_origin_fkey FOREIGN KEY (account_origin) REFERENCES networks (network_id) ON UPDATE CASCADE ON DELETE RESTRICT;\n";

trunk/wifidog-auth/wifidog/lib/RssPressReview/RssPressReview.php

@@ -692 +692 @@
         @param $show_empty_sources Should we show the feed information even if no news item has be selected?
         */
-        function get_rss_html($number_of_items_to_display = 20, $last_visit = null, $show_empty_sources = true)
+        function get_rss_html($number_of_items_to_display = 20, $last_visit = null, $show_empty_sources = true, $highlight_todays_news = true)
         {
                 $html = '';
@@ -750 +750 @@
                                                 $feed_html .= "<li class='rpr_item'>\n";
                                                 $feed_html .= "<p class='rpr_item_title'>\n";
-                                                $item['rpr_is_today'] ? $switch_content = '-' : $switch_content = '+';
+                                                $item['rpr_is_today']&&$highlight_todays_news ? $switch_content = '-' : $switch_content = '+';
 
                                                 $feed_html .= "<a class='rpr_expand_switch' href='#dummy' onClick=\"toggleItemVisibility('$dhtml_id'); if(this.innerHTML=='+'){this.innerHTML='-';}else{this.innerHTML='+';}\">$switch_content</a> ";
@@ -766 +766 @@
                                                 $feed_html .= "<div class='rpr_popup_outer_div'>\n";
                                                 $class = 'rpr_popup_inner_div';
-                                                $item['rpr_is_today'] ? $class = 'rpr_popup_inner_div_expanded' : $class = 'rpr_popup_inner_div';
+                                                $item['rpr_is_today']&&$highlight_todays_news ? $class = 'rpr_popup_inner_div_expanded' : $class = 'rpr_popup_inner_div';
                                                 $style = '';
-                                                //$item['rpr_is_today'] ? $style = 'z-index: 1000;' : $style = '';
-                                                $item['rpr_is_today'] ? $script= "changestyle('$dhtml_id','visible');" : $script = '';
+                                                $item['rpr_is_today']&&$highlight_todays_news ? $script= "changestyle('$dhtml_id','visible');" : $script = '';
                                                 $feed_html .= "<div class='$class' style='$style' id='$dhtml_id'>\n";
-                                                //$feed_html .= "<script type=\"text/javascript\">$script</script>\n";
                                                 $feed_html .= "<p class='rpr_text'>{$item['rpr_author']} ({$feed['channel']['title']}) $display_date</p>\n";
                                                 $summary = strip_tags($item['rpr_content'], "<br><p><a><img><b><i>");