Merge branch 'develop' into rewrites/coding-convention-split2

[friendica.git] / include / ostatus.php

diff --git a/include/ostatus.php b/include/ostatus.php
index e6087de0873e0e85aa4ac7796cf509a7b6277354..7090e765feb154a6416048aaf8e494f0aa4d689b 100644 (file)
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -410,43 +410,51 @@ class ostatus {
                                                if ($attributes->name == "title")
                                                        $title = $attributes->textContent;
                                        }
-                                       if (($rel != "") AND ($href != ""))
-                                               switch($rel) {
+                                       if (($rel != "") AND ($href != "")) {
+                                               switch ($rel) {
                                                        case "alternate":
                                                                $item["plink"] = $href;
+                                                               /// @TODO These multi-lines can confuse, let's avoid them
                                                                if (($item["object-type"] == ACTIVITY_OBJ_QUESTION) OR
-                                                                       ($item["object-type"] == ACTIVITY_OBJ_EVENT))
+                                                                       ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
                                                                        $item["body"] .= add_page_info($href);
+                                                               }
                                                                break;
                                                        case "ostatus:conversation":
                                                                $conversation = $href;
                                                                break;
                                                        case "enclosure":
                                                                $enclosure = $href;
-                                                               if(strlen($item["attach"]))
+                                                               if (strlen($item["attach"])) {
                                                                        $item["attach"] .= ',';
+                                                               }
 
-                                                               $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
+                                                               $item["attach"] .= '[attach]href="' . $href . '" length="' . $length . '" type="' . $type . '" title="' . $title . '"[/attach]';
                                                                break;
                                                        case "related":
                                                                if ($item["object-type"] != ACTIVITY_OBJ_BOOKMARK) {
-                                                                       if (!isset($item["parent-uri"]))
+                                                                       if (!isset($item["parent-uri"])) {
                                                                                $item["parent-uri"] = $href;
+                                                                       }
 
-                                                                       if ($related == "")
+                                                                       if ($related == "") {
                                                                                $related = $href;
-                                                               } else
+                                                                       }
+                                                               } else {
                                                                        $item["body"] .= add_page_info($href);
+                                                               }
                                                                break;
                                                        case "self":
                                                                $self = $href;
                                                                break;
                                                        case "mentioned":
                                                                // Notification check
-                                                               if ($importer["nurl"] == normalise_link($href))
+                                                               if ($importer["nurl"] == normalise_link($href)) {
                                                                        $mention = true;
+                                                               }
                                                                break;
                                                }
+                                       }
                                }
                        }