Merge pull request #158 from pablor44/fix69-clean

Fix issue 69 : OPML with folders
fossar · Mar 26, 2013 · b75fe6e · b75fe6e
2 parents 0ed907b + 8e9eb34
commit b75fe6e
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/controllers/Opml.php b/controllers/Opml.php
@@ -88,16 +88,22 @@ function processGroup($xml,$tags = Array()){
         $errors = Array();
 
         // tags are the words of the outline parent
-        if((string)$xml['title']){
+        if((string)$xml['title'] && $xml['title']!='/'){
             $tags[] = (string)$xml['title'];
         }
 
         // parse every outline item
         foreach($xml->outline as $outline){
             if((string)$outline['type']) {
-                $ret = $this->addSubscription($outline,$tags);
-                if($ret!==true) {
-                    $errors[] = $ret;
+                //support folders in opml
+                if($outline['type']=='folder') {
+                    $ret = $this->processGroup($outline,$tags);
+                    $errors = array_merge($errors,$ret);
+                } else {
+                    $ret = $this->addSubscription($outline,$tags);
+                    if($ret!==true) {
+                        $errors[] = $ret;
+                    }
                 }
             } else {
                 $ret = $this->processGroup($outline,$tags);