Merge branch 'master' of madoka.volgo-balt.ru:public_html/testbox/tt-rss

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);

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) {

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 {
@@ -1480,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) {

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);
 			}
 		}
 	}