update feeds with errors dialog

[tt-rss.git] / modules / opml_domdoc.php

diff --git a/modules/opml_domdoc.php b/modules/opml_domdoc.php
index 1c0404c342f423b4e78fb85a20673f14bbaad209..08715093a9cb4dcfea42dc62443c8cd5a51e6180 100644 (file)
--- a/modules/opml_domdoc.php
+++ b/modules/opml_domdoc.php
@@ -22,8 +22,6 @@
 
                                $outlines = $xpath->query($query);
 
-                               print "<table>";
-
                                foreach ($outlines as $outline) {
 
                                        $feed_title = db_escape_string($outline->attributes->getNamedItem('text')->nodeValue);
@@ -39,29 +37,56 @@
                                        }
 
                                        $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);
+
                                        if ($cat_title && !$feed_url) {
 
-                                               db_query($link, "BEGIN");
+                                               if ($cat_title != "tt-rss-prefs") {
+
+                                                       db_query($link, "BEGIN");
+       
+                                                       $result = db_query($link, "SELECT id FROM
+                                                                       ttrss_feed_categories WHERE title = '$cat_title' AND
+                                                                       owner_uid = '$owner_uid' LIMIT 1");
+       
+                                                       if (db_num_rows($result) == 0) {
+       
+                                                               printf(__("<li>Adding category <b>%s</b>.</li>"), $cat_title);
+       
+                                                               db_query($link, "INSERT INTO ttrss_feed_categories
+                                                                               (title,owner_uid) 
+                                                                               VALUES ('$cat_title', '$owner_uid')");
+                                                       }
+       
+                                                       db_query($link, "COMMIT");
+                                               }
+                                       }
 
-                                               $result = db_query($link, "SELECT id FROM
-                                                               ttrss_feed_categories WHERE title = '$cat_title' AND
-                                                               owner_uid = '$owner_uid' LIMIT 1");
+                                       //                                              print "$active_category : $feed_title : $feed_url<br>";
 
-                                               if (db_num_rows($result) == 0) {
+                                       if ($pref_name) {
+                                               $parent_node = $outline->parentNode;
 
-                                                       printf(__("Adding category <b>%s</b>...<br>"), $cat_title);
+                                               if ($parent_node && $parent_node->nodeName == "outline") {
+                                                       $cat_check = $parent_node->attributes->getNamedItem('title')->nodeValue;
+                                                       if ($cat_check == "tt-rss-prefs") {
+                                                               $pref_value = db_escape_string($outline->attributes->getNamedItem('value')->nodeValue);
 
-                                                       db_query($link, "INSERT INTO ttrss_feed_categories
-                                                                       (title,owner_uid) 
-                                                                       VALUES ('$cat_title', '$owner_uid')");
-                                               }
+                                                               printf("<li>".
+                                                                       __("Setting preference key %s to %s")."</li>", 
+                                                                               $pref_name, $pref_value);
 
-                                               db_query($link, "COMMIT");
-                                       }
+                                                               set_pref($link, $pref_name, $pref_value);       
 
-                                       //                                              print "$active_category : $feed_title : $feed_url<br>";
+                                                       }
+                                               }
+                                       }
 
                                        if (!$feed_title || !$feed_url) continue;
 
@@ -93,14 +118,14 @@
                                        }                                                               
 
                                        $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
-                                                       (title = '$feed_title' OR feed_url = '$feed_url') 
+                                                       feed_url = '$feed_url'
                                                        AND owner_uid = '$owner_uid'");
 
-                                       print "<tr><td><a target='_new' href='$site_url'><b>$feed_title</b></a></b> 
-                                               (<a target='_new' href=\"$feed_url\">rss</a>)</td>";
+                                       print "<li><a target='_blank' href='$site_url'><b>$feed_title</b></a></b> 
+                                               (<a target='_blank' href=\"$feed_url\">rss</a>)&nbsp;";
 
                                        if (db_num_rows($result) > 0) {
-                                               print "<td>".__('Already imported.')."</td>";
+                                               print __('is already imported.');
                                        } else {
 
                                                if ($cat_id) {
@@ -120,22 +145,20 @@
                                                //print $add_query;
                                                db_query($link, $add_query);
 
-                                               print "<td><b>".__('Done.')."</b></td>";
+                                               print __('OK');
                                        }
 
-                                       print "</tr>";
+                                       print "</li>";
 
                                        db_query($link, "COMMIT");
                                }
 
-                               print "</table>";
-
                        } else {
-                               print "<div class=\"error\">".__('Error while parsing document.')."</div>";
+                               print_error(__('Error while parsing document.'));
                        }
 
                } else {
-                       print "<div class=\"error\">".__('Error: please upload OPML file.')."</div>";
+                       print_error(__('Error: please upload OPML file.'));
                }