From 0d471a1233f5ba1e0c70adfab2d90a42f7a7d370 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 21 Sep 2010 11:53:54 +0400 Subject: opml import: add workaround for LiveJournal OPML files with xmlURL attribute --- modules/opml_domdoc.php | 4 ++++ modules/opml_domxml.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/opml_domdoc.php b/modules/opml_domdoc.php index a1efb1e93..08715093a 100644 --- a/modules/opml_domdoc.php +++ b/modules/opml_domdoc.php @@ -37,6 +37,10 @@ } $feed_url = db_escape_string($outline->attributes->getNamedItem('xmlUrl')->nodeValue); + + if (!$feed_url) + $feed_url = db_escape_string($outline->attributes->getNamedItem('xmlURL')->nodeValue); + $site_url = db_escape_string($outline->attributes->getNamedItem('htmlUrl')->nodeValue); $pref_name = db_escape_string($outline->attributes->getNamedItem('pref-name')->nodeValue); diff --git a/modules/opml_domxml.php b/modules/opml_domxml.php index 1cc1467a8..8262c3040 100644 --- a/modules/opml_domxml.php +++ b/modules/opml_domxml.php @@ -39,6 +39,10 @@ } $feed_url = db_escape_string($outline->get_attribute('xmlUrl')); + + if (!$feed_url) + $feed_url = db_escape_string($outline->get_attribute('xmlURL')); + $site_url = db_escape_string($outline->get_attribute('htmlUrl')); if ($cat_title && !$feed_url) { -- cgit v1.2.3 From a5ff2e77257f6884896a40c9d3303b768c49302f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 30 Sep 2010 16:53:23 +0400 Subject: reenable piggie (refs #42) --- prefs.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/prefs.js b/prefs.js index 64fe0a3d5..83621b6d4 100644 --- a/prefs.js +++ b/prefs.js @@ -1456,8 +1456,7 @@ function pref_hotkey_handler(e) { } if ($("piggie")) { - - if (seq.match("807371717369")) { + if (seq.match("8073717369")) { seq = ""; piggie(true); } else { -- cgit v1.2.3 From 0618b81c0716002966b61f07324b552c542face6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 30 Sep 2010 17:03:02 +0400 Subject: daemon: less gentle child unstucking --- update_daemon2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update_daemon2.php b/update_daemon2.php index ce6a3ee9c..053a73d7d 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -73,7 +73,7 @@ if (time() - $started > MAX_CHILD_RUNTIME) { _debug("[MASTER] child process $pid seems to be stuck, aborting..."); - posix_kill($pid, SIGINT); + posix_kill($pid, SIGKILL); } } } -- cgit v1.2.3 From 5ba53dde355add2f6098887611b5d2a7eb32b44b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 30 Sep 2010 18:30:15 +0400 Subject: editFeedCats: show progress message --- prefs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/prefs.js b/prefs.js index 83621b6d4..9fce9059b 100644 --- a/prefs.js +++ b/prefs.js @@ -1479,6 +1479,8 @@ function editFeedCats() { try { var query = "?op=pref-feeds&subop=editCats"; + notify_progress("Loading, please wait..."); + new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { -- cgit v1.2.3