Changeset 1491 for branches

Timestamp:

06/12/06 18:33:33 (2 years ago)

Author:

spetersen

Message:

Update PostgreSQL branch to SVN change 1484.

Location:

branches/postgresql

Files:

• cls/categories.php (modified) (1 diff)
• cls/channels.php (modified) (1 diff)
• cls/update.php (modified) (1 diff)
• dbstruct.pgsql.sql (modified) (1 diff)
• extlib/kses.php (modified) (3 diffs)
• intl/ja.php (copied) (copied from trunk/gregarius/intl/ja.php)
• schema.php (modified) (1 diff)
• sql_updates (added)
• sql_updates/pgsql_svn1464.sql (added)
• sql_updates/pgsql_svn1483.sql (added)

branches/postgresql/cls/categories.php

@@ -96 +96 @@
             if (array_key_exists(COLLAPSED_CATEGORIES_COOKIE, $_COOKIE)) {
                 $this->collapsed_ids = explode(":", $_COOKIE[COLLAPSED_CATEGORIES_COOKIE]);
+            } elseif (empty($this->collapsed_ids) && getConfig("rss.output.channelcollapsedefault")) {
+               // Lets collapse all categories
+               $res = rss_query("select distinct(tid) from " . getTable('metatag') . " where ttype='channel'");
+               while (list ($this->collapsed_ids[]) = rss_fetch_row($res)) {
+               }
+               if (!headers_sent()) { // Sajax does not allow us to set cookies
+                setcookie(COLLAPSED_CATEGORIES_COOKIE, 
+                   implode(":", $this->collapsed_ids ) , time()+COOKIE_LIFESPAN,getPath());
+               }
             }
 

branches/postgresql/cls/channels.php

@@ -205 +205 @@
             if (array_key_exists(COLLAPSED_FOLDERS_COOKIE, $_COOKIE)) {
                 $this->collapsed_ids = explode(":", $_COOKIE[COLLAPSED_FOLDERS_COOKIE]);
-            }
-    
-            //get unread count per folder
+            }  elseif (empty($this->collapsed_ids) && getConfig("rss.output.channelcollapsedefault")) {
+               // Lets collapse all folders
+               $res = rss_query("select id from " . getTable('folders') . " where id != 0");
+               while (list ($this->collapsed_ids[]) = rss_fetch_row($res)) {
+               }
+               if (!headers_sent()) { // Sajax does not allow us to set cookies
+                setcookie(COLLAPSED_FOLDERS_COOKIE, 
+                  implode(":", $this->collapsed_ids ) , time()+COOKIE_LIFESPAN,getPath());
+               }
+            }
     
             //get unread count per folder                                                                        

branches/postgresql/cls/update.php

@@ -259 +259 @@
         echo "</table>\n";
         echo "<script type=\"text/javascript\">\n";
-        echo "for (k =0; k < " . AJAX_PARALLEL_SIZE . "; k++){\n";
-        echo "doUpdate();}\n</script>\n";
+        echo "function runAjaxUpdate() { \n";
+        echo "    for (k =0; k < " . AJAX_PARALLEL_SIZE . "; k++){\n";
+        echo "    doUpdate();\n";
+        echo "    }\n";
+        echo "}\n";
+        // Fix for IE's stupid "Operation Aborted" Error
+        echo "   if (window.addEventListener) window.addEventListener(\"load\",runAjaxUpdate,false); else if (window.attachEvent) window.attachEvent(\"onload\",runAjaxUpdate);\n";
+        echo "</script>\n";
     }
 }

branches/postgresql/dbstruct.pgsql.sql

@@ -267 +267 @@
 insert into config (key_,value_,default_,type_,desc_,export_) values ('rss.config.defaultdashboard', '1', '1','boolean','If the first page seen when entering the admin section should be the dashboard',NULL);
 insert into config (key_,value_,default_,type_,desc_,export_) values ('rss.output.nav.unread', 'false', 'false','boolean','If the navigation hints on the feeds page should go to the next feed with unread items.  If false, it simply goes to the next feed.',NULL);
+insert into config (key_,value_,default_,type_,desc_,export_) values ('rss.output.channelcollapsedefault', 'false','false','boolean','Collapse the channels on the main page by default',NULL);
 
 INSERT INTO  dashboard  (title, url, position, obj, daterefreshed, itemcount) VALUES  ('Latest Gregarius News', 'http://devlog.gregarius.net/feed/?db=', '0', '', null, 3);

branches/postgresql/extlib/kses.php

@@ -241 +241 @@
       case 2: # attribute value, a URL after href= for instance
 
-        if (preg_match('/^"([^"]*)"(\s+|$|\/)/', $attr, $match))
+        if (preg_match('/^"([^"]*)"(\s+|$|\/)?/', $attr, $match))
          # "value"
         {
@@ -252 +252 @@
                          'vless' => 'n');
           $working = 1; $mode = 0;
-          $attr = preg_replace('/^"[^"]*"(\s+|$|\/)/', '', $attr);
+          $attr = preg_replace('/^"[^"]*"(\s+|$|\/)?/', '', $attr);
           break;
         }
 
-        if (preg_match("/^'([^']*)'(\s+|$|\/)/", $attr, $match))
+        if (preg_match("/^'([^']*)'(\s+|$|\/)?/", $attr, $match))
          # 'value'
         {
@@ -267 +267 @@
                          'vless' => 'n');
           $working = 1; $mode = 0;
-          $attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
+          $attr = preg_replace("/^'[^']*'(\s+|$)?/", '', $attr);
           break;
         }

branches/postgresql/schema.php

@@ -437 +437 @@
         "rss.output.compression"    =>      array("true","true","boolean","This variable turns output compression on and off. Output compression is handled by most browsers.",NULL),
         "rss.output.channelcollapse"=>  array("true","true","boolean","Allow collapsing of channels on the main page. ",NULL),
+        "rss.output.channelcollapsedefault"=>   array("false","false","boolean","Collapse the channels on the main page by default",NULL),
         "rss.output.usepermalinks"  =>      array("true","true","boolean","Display a permalink icon and allow linking a given item directly.",NULL),
         "rss.config.markreadonupdate"=> array("false","false","boolean","Mark all old unread feeds as read when updating if new unread feeds are found.",NULL),