mprins / dokuwiki-plugin-dokusioc

lib/sioc_dokuwiki.php

Spacing +54 added lines, -54 removed lines

@@ -108,9 +108,9 @@ 
 
     public function getContent(&$exp): string
     {
-        $rdf = '<' . $this->type . " rdf:about=\"" . clean($this->url, true) . "\">\n";
+        $rdf = '<'.$this->type." rdf:about=\"".clean($this->url, true)."\">\n";
         if ($this->subject) {
-            $rdf .= "    <dc:title>" . clean($this->subject) . "</dc:title>\n";
+            $rdf .= "    <dc:title>".clean($this->subject)."</dc:title>\n";
             // if(strcmp($this->has_container, 'http://en.wikipedia.org')===0)
             //    $rdf .= "    <foaf:primaryTopic rdf:resource=\"".clean('http://dbpedia.org/resource/'
             //      .$this->subject)."\"/>\n";
@@ -121,14 +121,14 @@ 
         if (count($this->contributors) > 0) {
             foreach ($this->contributors as $cont_id => $cont_name) {
                 if (!isset($this->creator['sioc:modifier']) || ($this->creator['sioc:modifier'] != $cont_id)) {
-                    $rdf .= "    <sioc:has_modifier rdf:resource=\"" . normalizeUri(
+                    $rdf .= "    <sioc:has_modifier rdf:resource=\"".normalizeUri(
                             $exp->siocURL('user', $cont_id)
-                        ) . "\" rdfs:label=\"" . clean($cont_name) . "\"/>\n";
+                        )."\" rdfs:label=\"".clean($cont_name)."\"/>\n";
                 }
             }
 
             if (isset($this->contributors[$this->creator['sioc:modifier']])) {
-                $creator_name = 'rdfs:label="' . clean($this->contributors[$this->creator['sioc:modifier']]) . '"';
+                $creator_name = 'rdfs:label="'.clean($this->contributors[$this->creator['sioc:modifier']]).'"';
             }
         }
 
@@ -137,44 +137,44 @@ 
             //     $rdf .= "    <foaf:maker rdf:resource=\"".clean($this->creator['foaf:maker'])."\"/>\n";
             if ($this->creator['sioc:modifier']) {
                 if ($this->is_creator === false) {
-                    $rdf .= "    <sioc:has_modifier rdf:resource=\"" . normalizeUri(
+                    $rdf .= "    <sioc:has_modifier rdf:resource=\"".normalizeUri(
                             $exp->siocURL('user', $this->creator['sioc:modifier'])
-                        ) . "\" $creator_name/>\n";
+                        )."\" $creator_name/>\n";
                 }
                 if ($this->is_creator === true) {
-                    $rdf .= "    <sioc:has_creator rdf:resource=\"" . normalizeUri(
+                    $rdf .= "    <sioc:has_creator rdf:resource=\"".normalizeUri(
                             $exp->siocURL('user', $this->creator['sioc:modifier'])
-                        ) . "\" $creator_name/>\n";
+                        )."\" $creator_name/>\n";
                 }
             }
         }
 
         if ($this->created) {
-            $rdf .= "    <dcterms:created>" . $this->created . "</dcterms:created>\n";
+            $rdf .= "    <dcterms:created>".$this->created."</dcterms:created>\n";
         }
 
         if ($this->modified) {
-            $rdf .= "    <dcterms:modified>" . $this->modified . "</dcterms:modified>\n";
+            $rdf .= "    <dcterms:modified>".$this->modified."</dcterms:modified>\n";
         }
 
         if ($this->has_space) {
-            $rdf .= "    <sioc:has_space rdf:resource=\"" . clean($this->has_space, true) . "\" />\n";
+            $rdf .= "    <sioc:has_space rdf:resource=\"".clean($this->has_space, true)."\" />\n";
             // TODO: rdfs:label
         }
 
         if ($this->has_container) {
-            $rdf .= "    <sioc:has_container rdf:resource=\"" . normalizeUri(
+            $rdf .= "    <sioc:has_container rdf:resource=\"".normalizeUri(
                     $exp->siocURL('container', $this->has_container)
-                ) . "\" />\n";
+                )."\" />\n";
             // TODO: rdfs:label
         }
 
         if ($this->content) {
-            $rdf .= "    <sioc:content><![CDATA[" . pureContent($this->content) . "]]></sioc:content>\n";
+            $rdf .= "    <sioc:content><![CDATA[".pureContent($this->content)."]]></sioc:content>\n";
         }
 
         if ($this->content_encoded) {
-            $rdf .= "    <content:encoded><![CDATA[" . $this->content_encoded . "]]></content:encoded>\n";
+            $rdf .= "    <content:encoded><![CDATA[".$this->content_encoded."]]></content:encoded>\n";
         }
 
         /*
@@ -195,9 +195,9 @@ 
         if (is_array($this->links) && count($this->links) > 0) {
             foreach ($this->links as $link_id => $link_exists) {
                 if ($link_exists && !isHiddenPage($link_id)) {
-                    $rdf .= "    <sioc:links_to rdf:resource=\"" . normalizeUri(
+                    $rdf .= "    <sioc:links_to rdf:resource=\"".normalizeUri(
                             $exp->siocURL('post', $link_id)
-                        ) . "\"/>\n";
+                        )."\"/>\n";
                     // TODO: rdfs:label
                 }
             }
@@ -206,9 +206,9 @@ 
         if (count($this->backlinks) > 0) {
             foreach ($this->backlinks as $link_id) {
                 if (!isHiddenPage($link_id)) {
-                    $rdf .= "    <dcterms:isReferencedBy rdf:resource=\"" . normalizeUri(
+                    $rdf .= "    <dcterms:isReferencedBy rdf:resource=\"".normalizeUri(
                             $exp->siocURL('post', $link_id)
-                        ) . "\"/>\n";
+                        )."\"/>\n";
                     // TODO: rdfs:label
                 }
             }
@@ -223,48 +223,48 @@ 
         */
 
         if ($this->previous_version) {
-            $rdf .= "    <sioc:previous_version rdf:resource=\"" . normalizeUri(
+            $rdf .= "    <sioc:previous_version rdf:resource=\"".normalizeUri(
                     $exp->siocURL(
                         'post',
-                        $this->id . $exp->_urlseparator . 'rev' . $exp->_urlequal . $this->previous_version
+                        $this->id.$exp->_urlseparator.'rev'.$exp->_urlequal.$this->previous_version
                     )
-                ) . "\"/>\n";
+                )."\"/>\n";
             // TODO: rdfs:label
 
             /* If there is support for inference and transitivity the following is not needed */
-            $rdf .= "    <sioc:earlier_version rdf:resource=\"" . normalizeUri(
+            $rdf .= "    <sioc:earlier_version rdf:resource=\"".normalizeUri(
                     $exp->siocURL(
                         'post',
-                        $this->id . $exp->_urlseparator . 'rev' . $exp->_urlequal . $this->previous_version
+                        $this->id.$exp->_urlseparator.'rev'.$exp->_urlequal.$this->previous_version
                     )
-                ) . "\"/>\n";
+                )."\"/>\n";
             // TODO: rdfs:label
 
         }
 
         if ($this->next_version) {
-            $rdf .= "    <sioc:next_version rdf:resource=\"" . normalizeUri(
+            $rdf .= "    <sioc:next_version rdf:resource=\"".normalizeUri(
                     $exp->siocURL(
                         'post',
-                        $this->id . $exp->_urlseparator . 'rev' . $exp->_urlequal . $this->next_version
+                        $this->id.$exp->_urlseparator.'rev'.$exp->_urlequal.$this->next_version
                     )
-                ) . "\"/>\n";
+                )."\"/>\n";
             // TODO: rdfs:label
 
             /* If there is support for inference and transitivity the following is not needed */
-            $rdf .= "    <sioc:later_version rdf:resource=\"" . normalizeUri(
+            $rdf .= "    <sioc:later_version rdf:resource=\"".normalizeUri(
                     $exp->siocURL(
                         'post',
-                        $this->id . $exp->_urlseparator . 'rev' . $exp->_urlequal . $this->next_version
+                        $this->id.$exp->_urlseparator.'rev'.$exp->_urlequal.$this->next_version
                     )
-                ) . "\"/>\n";
+                )."\"/>\n";
             // TODO: rdfs:label
         }
 
         if ($this->latest_version) {
-            $rdf .= "    <sioc:latest_version rdf:resource=\"" . normalizeUri(
+            $rdf .= "    <sioc:latest_version rdf:resource=\"".normalizeUri(
                     $exp->siocURL('post', $this->id)
-                ) . "\"/>\n";
+                )."\"/>\n";
             // TODO: rdfs:label
         }
 
@@ -292,7 +292,7 @@ 
         }
         */
 
-        $rdf .= "</" . $this->type . ">\n";
+        $rdf .= "</".$this->type.">\n";
         return $rdf;
     }
 }
@@ -332,41 +332,41 @@ 
                 $this->email = $email;
                 $this->sha1  = sha1($email);
             } else {
-                $this->email = "mailto:" . $email;
-                $this->sha1  = sha1("mailto:" . $email);
+                $this->email = "mailto:".$email;
+                $this->sha1  = sha1("mailto:".$email);
             }
         }
     }
 
     public function getContent(&$exp): string
     {
-        $rdf = "<sioc:UserAccount rdf:about=\"" . clean($this->url, true) . "\">\n";
+        $rdf = "<sioc:UserAccount rdf:about=\"".clean($this->url, true)."\">\n";
         if ($this->nick) {
-            $rdf .= "    <sioc:name>" . clean($this->nick) . "</sioc:name>\n";
+            $rdf .= "    <sioc:name>".clean($this->nick)."</sioc:name>\n";
         }
         if ($this->email) {
             if ($exp->_export_email) {
-                $rdf .= "    <sioc:email rdf:resource=\"" . $this->email . "\"/>\n";
+                $rdf .= "    <sioc:email rdf:resource=\"".$this->email."\"/>\n";
             }
-            $rdf .= "    <sioc:email_sha1>" . $this->sha1 . "</sioc:email_sha1>\n";
+            $rdf .= "    <sioc:email_sha1>".$this->sha1."</sioc:email_sha1>\n";
         }
         if ($this->role) {
             $rdf .= "    <sioc:has_function>\n";
             $rdf .= "        <sioc:Role>\n";
-            $rdf .= "            <sioc:name>" . $this->role . "</sioc:name>\n";
+            $rdf .= "            <sioc:name>".$this->role."</sioc:name>\n";
             $rdf .= "        </sioc:Role>\n";
             $rdf .= "    </sioc:has_function>\n";
         }
         $rdf .= "    <sioc:account_of>\n";
         $rdf .= "        <foaf:Person>\n";
         if ($this->name) {
-            $rdf .= "            <foaf:name>" . clean($this->name) . "</foaf:name>\n";
+            $rdf .= "            <foaf:name>".clean($this->name)."</foaf:name>\n";
         }
         if ($this->email) {
-            $rdf .= "            <foaf:mbox_sha1sum>" . $this->sha1 . "</foaf:mbox_sha1sum>\n";
+            $rdf .= "            <foaf:mbox_sha1sum>".$this->sha1."</foaf:mbox_sha1sum>\n";
         }
         if ($this->foaf_url) {
-            $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $this->foaf_url . "\"/>\n";
+            $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$this->foaf_url."\"/>\n";
         }
         $rdf .= "        </foaf:Person>\n";
         $rdf .= "    </sioc:account_of>\n";
@@ -427,35 +427,35 @@ 
 
     public function getContent(&$exp): string
     {
-        $rdf = '<' . $this->type . " rdf:about=\"" . normalizeUri(clean($this->url, true)) . "\" >\n";
+        $rdf = '<'.$this->type." rdf:about=\"".normalizeUri(clean($this->url, true))."\" >\n";
 
         if ($this->title) {
-            $rdf .= "    <sioc:name>" . clean($this->title) . "</sioc:name>\n";
+            $rdf .= "    <sioc:name>".clean($this->title)."</sioc:name>\n";
         }
 
         if ($this->_has_parent) {
-            $rdf .= "    <sioc:has_parent rdf:resource=\"" . normalizeUri(
+            $rdf .= "    <sioc:has_parent rdf:resource=\"".normalizeUri(
                     $exp->siocURL('container', $this->_has_parent)
-                ) . "\" />\n";
+                )."\" />\n";
             // TODO: rdfs:label
         }
 
         foreach ($this->posts as $article) {
             // TODO: test permission before?
-            $rdf .= "    <sioc:container_of rdf:resource=\"" . normalizeUri(
+            $rdf .= "    <sioc:container_of rdf:resource=\"".normalizeUri(
                     $exp->siocURL('post', $article['id'])
-                ) . "\"/>\n";
+                )."\"/>\n";
             // TODO: inluding title/name
         }
 
         foreach ($this->subcontainers as $container) {
-            $rdf .= "    <sioc:parent_of rdf:resource=\"" . normalizeUri(
+            $rdf .= "    <sioc:parent_of rdf:resource=\"".normalizeUri(
                     $exp->siocURL('container', $container['id'])
-                ) . "\"/>\n";
+                )."\"/>\n";
             // TODO: inluding title/name
         }
 
-        $rdf .= "</" . $this->type . ">\n";
+        $rdf .= "</".$this->type.">\n";
         return $rdf;
     }
 

_test/general.test.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
      */
     public function test_plugininfo(): void
     {
-        $file = __DIR__ . '/../plugin.info.txt';
+        $file = __DIR__.'/../plugin.info.txt';
         $this->assertFileExists($file);
 
         $info = confToHash($file);

lib/sioc_inc.php

Spacing +159 added lines, -159 removed lines

@@ -112,39 +112,39 @@ 
 
     public function siocURL($type, $id, $page = "")
     {
-        $type_part = $this->url4type . $this->urlequal . $type;
+        $type_part = $this->url4type.$this->urlequal.$type;
 
         if ($id) {
             if (isset($this->type_table[$type])) {
                 $myID = $this->type_table[$type];
             } else {
-                $myID = (($this->url_usetype) ? $type . '_' : '') . $this->url4id;
+                $myID = (($this->url_usetype) ? $type.'_' : '').$this->url4id;
             }
 
-            $id_part = $this->urlseparator . $myID . $this->urlequal . $id;
+            $id_part = $this->urlseparator.$myID.$this->urlequal.$id;
         } else {
             $id_part = '';
         }
 
-        ($page) ? $page_part = $this->urlseparator . $this->url4page . $this->urlequal . $page : $page_part = '';
+        ($page) ? $page_part = $this->urlseparator.$this->url4page.$this->urlequal.$page : $page_part = '';
 
         ($this->url_suffix && !isset($this->ignore_suffix[$type])) ?
-            $suffix = $this->urlseparator . $this->url_suffix : $suffix = '';
+            $suffix = $this->urlseparator.$this->url_suffix : $suffix = '';
 
-        $siocURL = $this->sioc_url . $type_part . $id_part . $page_part . $suffix;
+        $siocURL = $this->sioc_url.$type_part.$id_part.$page_part.$suffix;
         return clean($siocURL, true);
     }
 
     public function export($rdf_content = '')
     {
-        header('Content-Type: application/rdf+xml; charset=' . $this->encoding,
+        header('Content-Type: application/rdf+xml; charset='.$this->encoding,
                true, 200);
         echo $this->makeRDF($rdf_content);
     }
 
     public function makeRDF($rdf_content = '')
     {
-        $rdf = '<?xml version="1.0" encoding="' . $this->encoding . '" ?>' . "\n";
+        $rdf = '<?xml version="1.0" encoding="'.$this->encoding.'" ?>'."\n";
         $rdf .= ' 
 <rdf:RDF
     xmlns="http://xmlns.com/foaf/0.1/"
@@ -159,11 +159,11 @@ 
     xmlns:sioc="http://rdfs.org/sioc/ns#"
     xmlns:sioct="http://rdfs.org/sioc/types#"
     xmlns:owl="http://www.w3.org/2002/07/owl">
-<foaf:Document rdf:about="' . clean($this->profile_url, true) . '">
-	<dc:title>"' . clean($this->title) . '" (SIOC profile)</dc:title>
-	<foaf:primaryTopic rdf:resource="' . clean($this->objects[0]->_url, true) . '"/>
-	<admin:generatorAgent rdf:resource="' . clean($this->generator, true) . '"/>
-	<admin:generatorAgent rdf:resource="' . clean(EXPORTER_URL, true) . '?version=' . EXPORTER_VERSION . '"/>
+<foaf:Document rdf:about="' . clean($this->profile_url, true).'">
+	<dc:title>"' . clean($this->title).'" (SIOC profile)</dc:title>
+	<foaf:primaryTopic rdf:resource="' . clean($this->objects[0]->_url, true).'"/>
+	<admin:generatorAgent rdf:resource="' . clean($this->generator, true).'"/>
+	<admin:generatorAgent rdf:resource="' . clean(EXPORTER_URL, true).'?version='.EXPORTER_VERSION.'"/>
 </foaf:Document>' . "\n";
         if ($rdf_content) {
             $rdf .= $rdf_content;
@@ -261,31 +261,31 @@ 
 
     public function getContent(&$exp): string
     {
-        $rdf = "<sioc:Site rdf:about=\"" . clean($this->url) . "\">\n";
-        $rdf .= "    <dc:title>" . clean($this->name) . "</dc:title>\n";
-        $rdf .= "    <dc:description>" . clean($this->description) . "</dc:description>\n";
-        $rdf .= "    <sioc:link rdf:resource=\"" . clean($this->url) . "\"/>\n";
+        $rdf = "<sioc:Site rdf:about=\"".clean($this->url)."\">\n";
+        $rdf .= "    <dc:title>".clean($this->name)."</dc:title>\n";
+        $rdf .= "    <dc:description>".clean($this->description)."</dc:description>\n";
+        $rdf .= "    <sioc:link rdf:resource=\"".clean($this->url)."\"/>\n";
         if ($this->forums) {
             foreach ($this->forums as $id => $url) {
-                $rdf .= "    <sioc:host_of rdf:resource=\"" . clean($url) . "\"/>\n";
+                $rdf .= "    <sioc:host_of rdf:resource=\"".clean($url)."\"/>\n";
             }
         }
         if ($this->next_forums) {
-            $rdf .= "    <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('site', "", $this->page + 1) . "\"/>\n";
+            $rdf .= "    <rdfs:seeAlso rdf:resource=\"".$exp->siocURL('site', "", $this->page + 1)."\"/>\n";
         }
         if ($this->usergroup_uri) {
-            $rdf .= "    <sioc:has_Usergroup rdf:resource=\"" . $this->usergroup_uri . "\"/>\n";
+            $rdf .= "    <sioc:has_Usergroup rdf:resource=\"".$this->usergroup_uri."\"/>\n";
         } else {
-            $rdf .= "    <sioc:has_Usergroup rdf:nodeID=\"" . AUTHORS_NODE . "\"/>\n";
+            $rdf .= "    <sioc:has_Usergroup rdf:nodeID=\"".AUTHORS_NODE."\"/>\n";
         }
         $rdf .= "</sioc:Site>\n";
         // Forums
         if ($this->forums) {
             $rdf .= "\n";
             foreach ($this->forums as $id => $url) {
-                $rdf .= '<sioc:Forum rdf:about="' . clean($url) . "\">\n";
-                $rdf .= "    <sioc:link rdf:resource=\"" . clean($url) . "\"/>\n";
-                $rdf .= "    <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('forum', $id) . "\"/>\n";
+                $rdf .= '<sioc:Forum rdf:about="'.clean($url)."\">\n";
+                $rdf .= "    <sioc:link rdf:resource=\"".clean($url)."\"/>\n";
+                $rdf .= "    <rdfs:seeAlso rdf:resource=\"".$exp->siocURL('forum', $id)."\"/>\n";
                 $rdf .= "</sioc:Forum>\n";
             }
         }
@@ -293,20 +293,20 @@ 
         if ($this->users) {
             $rdf .= "\n";
             if ($this->usergroup_uri) {
-                $rdf .= '<sioc:UserAccountgroup rdf:about="' . $this->usergroup_uri . "\">\n";
+                $rdf .= '<sioc:UserAccountgroup rdf:about="'.$this->usergroup_uri."\">\n";
             } else {
-                $rdf .= '<sioc:UserAccountgroup rdf:nodeID="' . AUTHORS_NODE . "\">\n";
+                $rdf .= '<sioc:UserAccountgroup rdf:nodeID="'.AUTHORS_NODE."\">\n";
             }
-            $rdf .= "    <sioc:name>Authors for \"" . clean($this->name) . "\"</sioc:name>\n";
+            $rdf .= "    <sioc:name>Authors for \"".clean($this->name)."\"</sioc:name>\n";
             foreach ($this->users as $id => $url) {
                 $rdf .= "    <sioc:has_member>\n";
-                $rdf .= "        <sioc:UserAccount rdf:about=\"" . clean($url) . "\">\n";
-                $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('user', $id) . "\"/>\n";
+                $rdf .= "        <sioc:UserAccount rdf:about=\"".clean($url)."\">\n";
+                $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL('user', $id)."\"/>\n";
                 $rdf .= "        </sioc:UserAccount>\n";
                 $rdf .= "    </sioc:has_member>\n";
             }
             if ($this->next_users) {
-                $rdf .= "    <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('site', "", $this->page + 1) . "\"/>\n";
+                $rdf .= "    <rdfs:seeAlso rdf:resource=\"".$exp->siocURL('site', "", $this->page + 1)."\"/>\n";
             }
             $rdf .= "</sioc:UserAccountgroup>\n";
         }
@@ -360,8 +360,8 @@ 
                 $this->email = $email;
                 $this->sha1  = sha1($email);
             } else {
-                $this->email = "mailto:" . $email;
-                $this->sha1  = sha1("mailto:" . $email);
+                $this->email = "mailto:".$email;
+                $this->sha1  = sha1("mailto:".$email);
             }
         }
         $this->homepage = $homepage;
@@ -375,36 +375,36 @@ 
 
     public function getContent(&$exp): string
     {
-        $rdf = "<foaf:Person rdf:about=\"" . clean($this->foaf_uri) . "\">\n";
+        $rdf = "<foaf:Person rdf:about=\"".clean($this->foaf_uri)."\">\n";
         if ($this->name) {
-            $rdf .= "    <foaf:name>" . $this->name . "</foaf:name>\n";
+            $rdf .= "    <foaf:name>".$this->name."</foaf:name>\n";
         }
         if ($this->email) {
-            $rdf .= "    <foaf:mbox_sha1sum>" . $this->sha1 . "</foaf:mbox_sha1sum>\n";
+            $rdf .= "    <foaf:mbox_sha1sum>".$this->sha1."</foaf:mbox_sha1sum>\n";
         }
         if ($this->foaf_url) {
-            $rdf .= "    <rdfs:seeAlso rdf:resource=\"" . $this->foaf_url . "\"/>\n";
+            $rdf .= "    <rdfs:seeAlso rdf:resource=\"".$this->foaf_url."\"/>\n";
         }
         $rdf .= "    <foaf:holdsAccount>\n";
-        $rdf .= "        <sioc:UserAccount rdf:about=\"" . clean($this->uri) . "\">\n";
+        $rdf .= "        <sioc:UserAccount rdf:about=\"".clean($this->uri)."\">\n";
         if ($this->nick) {
-            $rdf .= "            <sioc:name>" . $this->nick . "</sioc:name>\n";
+            $rdf .= "            <sioc:name>".$this->nick."</sioc:name>\n";
         }
         if ($this->email) {
             if ($exp->_export_email) {
-                $rdf .= "            <sioc:email rdf:resource=\"" . $this->email . "\"/>\n";
+                $rdf .= "            <sioc:email rdf:resource=\"".$this->email."\"/>\n";
             }
-            $rdf .= "            <sioc:email_sha1>" . $this->sha1 . "</sioc:email_sha1>\n";
+            $rdf .= "            <sioc:email_sha1>".$this->sha1."</sioc:email_sha1>\n";
         }
         if ($this->role) {
             $rdf .= "            <sioc:has_function>\n";
             $rdf .= "                <sioc:Role>\n";
-            $rdf .= "                    <sioc:name>" . $this->role . "</sioc:name>\n";
+            $rdf .= "                    <sioc:name>".$this->role."</sioc:name>\n";
             $rdf .= "                </sioc:Role>\n";
             $rdf .= "            </sioc:has_function>\n";
         }
         if ($this->sioc_url) {
-            $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $this->sioc_url . "\"/>\n";
+            $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$this->sioc_url."\"/>\n";
         }
         $rdf .= "        </sioc:UserAccount>\n";
         $rdf .= "    </foaf:holdsAccount>\n";
@@ -478,25 +478,25 @@ 
 
     public function getContent(&$exp): string
     {
-        $rdf = '<sioc:Thread rdf:about="' . clean($this->url) . "\">\n";
-        $rdf .= "    <sioc:link rdf:resource=\"" . clean($this->url) . "\"/>\n";
+        $rdf = '<sioc:Thread rdf:about="'.clean($this->url)."\">\n";
+        $rdf .= "    <sioc:link rdf:resource=\"".clean($this->url)."\"/>\n";
         if ($this->views) {
-            $rdf .= "    <sioc:num_views>" . $this->views . "</sioc:num_views>\n";
+            $rdf .= "    <sioc:num_views>".$this->views."</sioc:num_views>\n";
         }
         if ($this->note) {
-            $rdf .= "    <rdfs:comment>" . $this->note . "</rdfs:comment>\n";
+            $rdf .= "    <rdfs:comment>".$this->note."</rdfs:comment>\n";
         }
         if ($this->subject) {
-            $rdf .= "    <dc:title>" . $this->subject . "</dc:title>\n";
+            $rdf .= "    <dc:title>".$this->subject."</dc:title>\n";
         }
         if ($this->created) {
-            $rdf .= "    <dcterms:created>" . $this->created . "</dcterms:created>\n";
+            $rdf .= "    <dcterms:created>".$this->created."</dcterms:created>\n";
         }
         if ($this->parents) {
             foreach ($this->parents as $id => $uri) {
                 $rdf .= "    <sioc:has_parent>\n";
-                $rdf .= "        <sioc:Forum rdf:about=\"" . clean($uri) . "\">\n";
-                $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('forum', $id) . "\"/>\n";
+                $rdf .= "        <sioc:Forum rdf:about=\"".clean($uri)."\">\n";
+                $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL('forum', $id)."\"/>\n";
                 $rdf .= "        </sioc:Forum>\n";
                 $rdf .= "    </sioc:has_parent>\n";
             }
@@ -504,7 +504,7 @@ 
         // here the tags are just used as keywords for dc:subject
         if ($this->tags) {
             foreach ($this->tags as $id => $tag) {
-                $rdf .= "    <dc:subject>" . $tag . "</dc:subject>\n";
+                $rdf .= "    <dc:subject>".$tag."</dc:subject>\n";
             }
         }
         // here the tags are used by creating a tag object with a blank node, with the keyword as moat:name - if you
@@ -533,7 +533,7 @@ 
         if ($this->related) {
             foreach ($this->related as $id => $url) {
                 $rdf .= "    <sioc:related_to>\n";
-                $rdf .= "        <sioc:Thread rdf:about=\"" . clean($url) . "\"/>\n";
+                $rdf .= "        <sioc:Thread rdf:about=\"".clean($url)."\"/>\n";
                 $rdf .= "    </sioc:related_to>\n"; // todo - each topic needs to have a URI
             }
         }
@@ -541,20 +541,20 @@ 
         if ($this->posts) {
             foreach ($this->posts as $id => $data) {
                 $rdf .= "    <sioc:container_of>\n";
-                $rdf .= "        <sioc:Post rdf:about=\"" . clean($data[url]) . "\">\n";
-                $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('post', $id) . "\"/>\n";
+                $rdf .= "        <sioc:Post rdf:about=\"".clean($data[url])."\">\n";
+                $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL('post', $id)."\"/>\n";
                 if ($data[prev]) {
-                    $rdf .= "            <sioc:previous_by_date rdf:resource=\"" . clean($data[prev]) . "\"/>\n";
+                    $rdf .= "            <sioc:previous_by_date rdf:resource=\"".clean($data[prev])."\"/>\n";
                 }
                 if ($data[next]) {
-                    $rdf .= "            <sioc:next_by_date rdf:resource=\"" . clean($data[next]) . "\"/>\n";
+                    $rdf .= "            <sioc:next_by_date rdf:resource=\"".clean($data[next])."\"/>\n";
                 }
                 $rdf .= "        </sioc:Post>\n";
                 $rdf .= "    </sioc:container_of>\n";
             }
         }
         if ($this->next) {
-            $rdf .= "\r<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('thread', $this->id, $this->page + 1) . "\"/>\n";
+            $rdf .= "\r<rdfs:seeAlso rdf:resource=\"".$exp->siocURL('thread', $this->id, $this->page + 1)."\"/>\n";
         }
         $rdf .= "</sioc:Thread>\n";
         return $rdf;
@@ -639,26 +639,26 @@ 
 
     public function getContent(&$exp): string
     {
-        $rdf = '<' . $this->_type . ' rdf:about="' . clean($this->url) . "\">\n";
+        $rdf = '<'.$this->_type.' rdf:about="'.clean($this->url)."\">\n";
         if ($this->_type != 'sioc:Forum') {
             $rdf .= "    <rdf:type rdf:resource=\"http://rdfs.org/sioc/ns#Forum\" />\n";
         }
-        $rdf .= "    <sioc:link rdf:resource=\"" . clean($this->url) . "\"/>\n";
+        $rdf .= "    <sioc:link rdf:resource=\"".clean($this->url)."\"/>\n";
         if ($this->blog_title) {
-            $rdf .= "    <dc:title>" . $this->blog_title . "</dc:title>\n";
+            $rdf .= "    <dc:title>".$this->blog_title."</dc:title>\n";
         }
         if ($this->description) {
-            $rdf .= "    <dc:description>" . $this->description . "</dc:description>\n";
+            $rdf .= "    <dc:description>".$this->description."</dc:description>\n";
         }
         if ($this->note) {
-            $rdf .= "    <rdfs:comment>" . $this->note . "</rdfs:comment>\n";
+            $rdf .= "    <rdfs:comment>".$this->note."</rdfs:comment>\n";
         }
 
         if ($this->parents) {
             foreach ($this->parents as $id => $uri) {
                 $rdf .= "    <sioc:has_parent>\n";
-                $rdf .= "        <sioc:Forum rdf:about=\"" . clean($uri) . "\">\n";
-                $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('forum', $id) . "\"/>\n";
+                $rdf .= "        <sioc:Forum rdf:about=\"".clean($uri)."\">\n";
+                $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL('forum', $id)."\"/>\n";
                 $rdf .= "        </sioc:Forum>\n";
                 $rdf .= "    </sioc:has_parent>\n";
             }
@@ -667,8 +667,8 @@ 
         if ($this->threads) {
             foreach ($this->threads as $id => $uri) {
                 $rdf .= "    <sioc:parent_of>\n";
-                $rdf .= "        <sioc:Thread rdf:about=\"" . clean($uri) . "\">\n";
-                $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('thread', $id) . "\"/>\n";
+                $rdf .= "        <sioc:Thread rdf:about=\"".clean($uri)."\">\n";
+                $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL('thread', $id)."\"/>\n";
                 $rdf .= "        </sioc:Thread>\n";
                 $rdf .= "    </sioc:parent_of>\n";
             }
@@ -677,8 +677,8 @@ 
         if ($this->posts) {
             foreach ($this->posts as $id => $url) {
                 $rdf .= "    <sioc:container_of>\n";
-                $rdf .= "        <sioc:Post rdf:about=\"" . clean($url) . "\">\n";
-                $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('post', $id) . "\"/>\n";
+                $rdf .= "        <sioc:Post rdf:about=\"".clean($url)."\">\n";
+                $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL('post', $id)."\"/>\n";
                 $rdf .= "        </sioc:Post>\n";
                 $rdf .= "    </sioc:container_of>\n";
             }
@@ -687,26 +687,26 @@ 
         if ($this->creator) {
             if ($this->creator->_id) {
                 $rdf .= "    <sioc:has_creator>\n";
-                $rdf .= "        <sioc:UserAccount rdf:about=\"" . clean($this->creator->_uri) . "\">\n";
+                $rdf .= "        <sioc:UserAccount rdf:about=\"".clean($this->creator->_uri)."\">\n";
                 if ($this->creator->_sioc_url) {
-                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $this->creator->_sioc_url . "\"/>\n";
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$this->creator->_sioc_url."\"/>\n";
                 } else {
-                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL(
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL(
                             'user',
                             $this->creator->_id
-                        ) . "\"/>\n";
+                        )."\"/>\n";
                 }
                 $rdf .= "        </sioc:UserAccount>\n";
                 $rdf .= "    </sioc:has_creator>\n";
                 $rdf .= "    <foaf:maker>\n";
-                $rdf .= "        <foaf:Person rdf:about=\"" . clean($this->creator->_foaf_uri) . "\">\n";
+                $rdf .= "        <foaf:Person rdf:about=\"".clean($this->creator->_foaf_uri)."\">\n";
                 if ($this->creator->_foaf_url) {
-                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $this->creator->_foaf_url . "\"/>\n";
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$this->creator->_foaf_url."\"/>\n";
                 } else {
-                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL(
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL(
                             'user',
                             $this->creator->_id
-                        ) . "\"/>\n";
+                        )."\"/>\n";
                 }
                 $rdf .= "        </foaf:Person>\n";
                 $rdf .= "    </foaf:maker>\n";
@@ -714,13 +714,13 @@ 
                 $rdf .= "    <foaf:maker>\n";
                 $rdf .= "        <foaf:Person";
                 if ($this->creator->_name) {
-                    $rdf .= " foaf:name=\"" . $this->creator->_name . "\"";
+                    $rdf .= " foaf:name=\"".$this->creator->_name."\"";
                 }
                 if ($this->creator->_sha1) {
-                    $rdf .= " foaf:mbox_sha1sum=\"" . $this->creator->_sha1 . "\"";
+                    $rdf .= " foaf:mbox_sha1sum=\"".$this->creator->_sha1."\"";
                 }
                 if ($this->creator->_name) {
-                    $rdf .= ">\n<foaf:homepage rdf:resource=\"" . $this->creator->_homepage . "\"/>\n</foaf:Person>\n";
+                    $rdf .= ">\n<foaf:homepage rdf:resource=\"".$this->creator->_homepage."\"/>\n</foaf:Person>\n";
                 } else {
                     $rdf .= "/>\n";
                 }
@@ -731,14 +731,14 @@ 
         if ($this->administrator) {
             if ($this->administrator->_id) {
                 $rdf .= "    <sioc:has_administrator>\n";
-                $rdf .= "        <sioc:UserAccount rdf:about=\"" . clean($this->administrator->_uri) . "\">\n";
+                $rdf .= "        <sioc:UserAccount rdf:about=\"".clean($this->administrator->_uri)."\">\n";
                 if ($this->administrator->_sioc_url) {
-                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $this->administrator->_sioc_url . "\"/>\n";
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$this->administrator->_sioc_url."\"/>\n";
                 } else {
-                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL(
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL(
                             'user',
                             $this->administrator->_id
-                        ) . "\"/>\n";
+                        )."\"/>\n";
                 }
                 $rdf .= "        </sioc:UserAccount>\n";
                 $rdf .= "    </sioc:has_administrator>\n";
@@ -746,14 +746,14 @@ 
         }
         if ($this->links) {
             foreach ($this->links as $url => $link) {
-                $rdf .= "    <sioc:links_to rdfs:label=\"$link\" rdf:resource=\"" . clean($url) . "\"/>\n";
+                $rdf .= "    <sioc:links_to rdfs:label=\"$link\" rdf:resource=\"".clean($url)."\"/>\n";
             }
         }
 
         if ($this->next) {
-            $rdf .= "\r<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('forum', $this->id, $this->page + 1) . "\"/>\n";
+            $rdf .= "\r<rdfs:seeAlso rdf:resource=\"".$exp->siocURL('forum', $this->id, $this->page + 1)."\"/>\n";
         }
-        $rdf .= "</" . $this->_type . ">";
+        $rdf .= "</".$this->_type.">";
 
         return $rdf;
     }
@@ -822,36 +822,36 @@ 
 
     public function getContent(&$exp): string
     {
-        $rdf = '<' . $this->_type . " rdf:about=\"" . clean($this->url) . "\">\n";
+        $rdf = '<'.$this->_type." rdf:about=\"".clean($this->url)."\">\n";
         if ($this->_type != 'sioc:Post') {
             $rdf .= "    <rdf:type rdf:resource=\"http://rdfs.org/sioc/ns#Post\" />\n";
         }
         if ($this->subject) {
-            $rdf .= "    <dc:title>" . $this->subject . "</dc:title>\n";
+            $rdf .= "    <dc:title>".$this->subject."</dc:title>\n";
         }
         if ($this->creator) {
             if ($this->creator->_id) {
                 $rdf .= "    <sioc:has_creator>\n";
-                $rdf .= "        <sioc:UserAccount rdf:about=\"" . clean($this->creator->_uri) . "\">\n";
+                $rdf .= "        <sioc:UserAccount rdf:about=\"".clean($this->creator->_uri)."\">\n";
                 if ($this->creator->_sioc_url) {
-                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $this->creator->_sioc_url . "\"/>\n";
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$this->creator->_sioc_url."\"/>\n";
                 } else {
-                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL(
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL(
                             'user',
                             $this->creator->_id
-                        ) . "\"/>\n";
+                        )."\"/>\n";
                 }
                 $rdf .= "        </sioc:UserAccount>\n";
                 $rdf .= "    </sioc:has_creator>\n";
                 $rdf .= "    <foaf:maker>\n";
-                $rdf .= "        <foaf:Person rdf:about=\"" . clean($this->creator->_foaf_uri) . "\">\n";
+                $rdf .= "        <foaf:Person rdf:about=\"".clean($this->creator->_foaf_uri)."\">\n";
                 if ($this->creator->_foaf_url) {
-                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $this->creator->_foaf_url . "\"/>\n";
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$this->creator->_foaf_url."\"/>\n";
                 } else {
-                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL(
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL(
                             'user',
                             $this->creator->_id
-                        ) . "\"/>\n";
+                        )."\"/>\n";
                 }
                 $rdf .= "        </foaf:Person>\n";
                 $rdf .= "    </foaf:maker>\n";
@@ -859,48 +859,48 @@ 
                 $rdf .= "    <foaf:maker>\n";
                 $rdf .= "        <foaf:Person";
                 if ($this->creator->_name) {
-                    $rdf .= " foaf:name=\"" . $this->creator->_name . "\"";
+                    $rdf .= " foaf:name=\"".$this->creator->_name."\"";
                 }
                 if ($this->creator->_sha1) {
-                    $rdf .= " foaf:mbox_sha1sum=\"" . $this->creator->_sha1 . "\"";
+                    $rdf .= " foaf:mbox_sha1sum=\"".$this->creator->_sha1."\"";
                 }
                 if ($this->creator->_name) {
-                    $rdf .= ">\n<foaf:homepage rdf:resource=\"" . $this->creator->_homepage . "\"/>\n</foaf:Person>\n";
+                    $rdf .= ">\n<foaf:homepage rdf:resource=\"".$this->creator->_homepage."\"/>\n</foaf:Person>\n";
                 } else {
                     $rdf .= "/>\n";
                 }
                 $rdf .= "    </foaf:maker>\n";
             }
         }
-        $rdf .= "    <dcterms:created>" . $this->created . "</dcterms:created>\n";
+        $rdf .= "    <dcterms:created>".$this->created."</dcterms:created>\n";
         if ($this->updated and ($this->created != $this->updated)) {
-            $rdf .= "    <dcterms:modified>" . $this->updated . "</dcterms:modified>\n";
+            $rdf .= "    <dcterms:modified>".$this->updated."</dcterms:modified>\n";
         }
-        $rdf .= "    <sioc:content>" . pureContent($this->content) . "</sioc:content>\n";
+        $rdf .= "    <sioc:content>".pureContent($this->content)."</sioc:content>\n";
 
-        $rdf .= "    <content:encoded><![CDATA[" . $this->encoded . "]]></content:encoded>\n";
+        $rdf .= "    <content:encoded><![CDATA[".$this->encoded."]]></content:encoded>\n";
         if ($this->topics) {
             foreach ($this->topics as $url => $topic) {
-                $rdf .= "    <sioc:topic rdfs:label=\"$topic\" rdf:resource=\"" . clean($url) . "\"/>\n";
+                $rdf .= "    <sioc:topic rdfs:label=\"$topic\" rdf:resource=\"".clean($url)."\"/>\n";
             }
         }
         if ($this->links) {
             foreach ($this->links as $url => $link) {
-                $rdf .= "    <sioc:links_to rdfs:label=\"$link\" rdf:resource=\"" . clean($url) . "\"/>\n";
+                $rdf .= "    <sioc:links_to rdfs:label=\"$link\" rdf:resource=\"".clean($url)."\"/>\n";
             }
         }
         if ($this->has_part) {
             foreach ($this->has_part as $id => $url) {
                 $rdf .= "    <dcterms:hasPart>\n";
-                $rdf .= "        <dcmitype:Image rdf:about=\"" . clean($url) . "\"/>\n";
+                $rdf .= "        <dcmitype:Image rdf:about=\"".clean($url)."\"/>\n";
                 $rdf .= "    </dcterms:hasPart>\n";
             }
         }
         if ($this->reply_of) {
             foreach ($this->reply_of as $id => $url) {
                 $rdf .= "    <sioc:reply_of>\n";
-                $rdf .= "        <sioc:Post rdf:about=\"" . clean($url) . "\">\n";
-                $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('post', $id) . "\"/>\n";
+                $rdf .= "        <sioc:Post rdf:about=\"".clean($url)."\">\n";
+                $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL('post', $id)."\"/>\n";
                 $rdf .= "        </sioc:Post>\n";
                 $rdf .= "    </sioc:reply_of>\n";
             }
@@ -908,16 +908,16 @@ 
         if ($this->comments) {
             foreach ($this->comments as $id => $url) {
                 $rdf .= "    <sioc:has_reply>\n";
-                $rdf .= "        <sioc:Post rdf:about=\"" . clean($url) . "\">\n";
+                $rdf .= "        <sioc:Post rdf:about=\"".clean($url)."\">\n";
                 //        if($comments->f('comment_trackback')) $rdf .= "            <sioc:type>"
                 // . POST_TRACKBACK . "</sioc:type>\n";
                 //        else $rdf .= "            <sioc:type>" . POST_COMMENT  . "</sioc:type>\n";
-                $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('comment', $id) . "\"/>\n";
+                $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL('comment', $id)."\"/>\n";
                 $rdf .= "        </sioc:Post>\n";
                 $rdf .= "    </sioc:has_reply>\n";
             }
         }
-        $rdf .= "</" . $this->_type . ">\n";
+        $rdf .= "</".$this->_type.">\n";
         return $rdf;
     }
 }
@@ -983,13 +983,13 @@ 
 
     public function getContent(&$exp): string
     {
-        $rdf = '<' . $this->_type . " rdf:about=\"" . clean($this->url) . "\">\n";
+        $rdf = '<'.$this->_type." rdf:about=\"".clean($this->url)."\">\n";
         if ($this->subject) {
-            $rdf .= "    <dc:title>" . clean($this->subject) . "</dc:title>\n";
+            $rdf .= "    <dc:title>".clean($this->subject)."</dc:title>\n";
             if (strcmp($this->has_container, 'http://en.wikipedia.org') === 0) {
-                $rdf .= "    <foaf:primaryTopic rdf:resource=\"" . clean(
-                        'http://dbpedia.org/resource/' . $this->subject
-                    ) . "\"/>\n";
+                $rdf .= "    <foaf:primaryTopic rdf:resource=\"".clean(
+                        'http://dbpedia.org/resource/'.$this->subject
+                    )."\"/>\n";
             }
         }
         if ($this->creator->_nick) {
@@ -1012,17 +1012,17 @@ 
                 $rdf .= "    </foaf:maker>\n";
             } else {*/
             $rdf .= "    <sioc:has_creator>\n";
-            $rdf .= "        <sioc:UserAccount rdf:about=\"" . clean($this->creator->_uri) . "\">\n";
-            $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . clean(
-                    'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki=' . $this->creator->_uri
+            $rdf .= "        <sioc:UserAccount rdf:about=\"".clean($this->creator->_uri)."\">\n";
+            $rdf .= "            <rdfs:seeAlso rdf:resource=\"".clean(
+                    'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki='.$this->creator->_uri
                 );
             if ($this->api) {
-                $rdf .= clean("&api=" . $this->api);
+                $rdf .= clean("&api=".$this->api);
             }
             $rdf .= "\"/>\n";
             $rdf .= "        </sioc:UserAccount>\n";
             $rdf .= "    </sioc:has_creator>\n";
-            $rdf .= "    <dc:contributor>" . clean($this->creator->_nick) . "</dc:contributor>\n";
+            $rdf .= "    <dc:contributor>".clean($this->creator->_nick)."</dc:contributor>\n";
             /*$rdf .= "    <foaf:maker>\n";
             $rdf .= "        <foaf:Person";
             if($this->creator->name) $rdf .= " foaf:name=\"" . $this->creator->name ."\"";
@@ -1041,17 +1041,17 @@ 
             }
         }
         if ($this->created) {
-            $rdf .= "    <dcterms:created>" . $this->created . "</dcterms:created>\n";
+            $rdf .= "    <dcterms:created>".$this->created."</dcterms:created>\n";
         }
         if (is_array($this->topics)) {
             foreach ($this->topics as $topic => $url) {
                 $rdf .= "    <sioc:topic>\n";
-                $rdf .= "        <sioct:Category rdf:about=\"" . clean($url) . "\">\n";
-                $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . clean(
-                        'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki=' . $url
+                $rdf .= "        <sioct:Category rdf:about=\"".clean($url)."\">\n";
+                $rdf .= "            <rdfs:seeAlso rdf:resource=\"".clean(
+                        'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki='.$url
                     );
                 if ($this->api) {
-                    $rdf .= clean("&api=" . $this->api);
+                    $rdf .= clean("&api=".$this->api);
                 }
                 $rdf .= "\"/>\n";
                 $rdf .= "        </sioct:Category>\n";
@@ -1061,12 +1061,12 @@ 
         if (is_array($this->links)) {
             foreach ($this->links as $label => $url) {
                 $rdf .= "    <sioc:links_to>\n";
-                $rdf .= "        <sioct:WikiArticle rdf:about=\"" . clean($url) . "\">\n";
-                $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . clean(
-                        'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki=' . $url
+                $rdf .= "        <sioct:WikiArticle rdf:about=\"".clean($url)."\">\n";
+                $rdf .= "            <rdfs:seeAlso rdf:resource=\"".clean(
+                        'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki='.$url
                     );
                 if ($this->api) {
-                    $rdf .= clean("&api=" . $this->api);
+                    $rdf .= clean("&api=".$this->api);
                 }
                 $rdf .= "\"/>\n";
                 $rdf .= "        </sioct:WikiArticle>\n";
@@ -1075,12 +1075,12 @@ 
         } else {
             if ($this->links) {
                 $rdf .= "    <sioc:links_to>\n";
-                $rdf .= "        <sioct:WikiArticle rdf:about=\"" . clean($this->links) . "\">\n";
-                $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . clean(
-                        'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki=' . $this->links
+                $rdf .= "        <sioct:WikiArticle rdf:about=\"".clean($this->links)."\">\n";
+                $rdf .= "            <rdfs:seeAlso rdf:resource=\"".clean(
+                        'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki='.$this->links
                     );
                 if ($this->api) {
-                    $rdf .= clean("&api=" . $this->api);
+                    $rdf .= clean("&api=".$this->api);
                 }
                 $rdf .= "\"/>\n";
                 $rdf .= "        </sioct:WikiArticle>\n";
@@ -1089,17 +1089,17 @@ 
         }
         if (is_array($this->ext_links)) {
             foreach ($this->ext_links as $label => $url) {
-                $rdf .= "    <sioc:links_to rdf:resource=\"" . clean($url) . "\"/>\n";
+                $rdf .= "    <sioc:links_to rdf:resource=\"".clean($url)."\"/>\n";
             }
         }
         if ($this->previous_version) {
             $rdf .= "    <sioc:previous_version>\n";
-            $rdf .= "        <sioct:WikiArticle rdf:about=\"" . clean($this->previous_version) . "\">\n";
-            $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . clean(
-                    'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki=' . $this->previous_version
+            $rdf .= "        <sioct:WikiArticle rdf:about=\"".clean($this->previous_version)."\">\n";
+            $rdf .= "            <rdfs:seeAlso rdf:resource=\"".clean(
+                    'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki='.$this->previous_version
                 );
             if ($this->api) {
-                $rdf .= clean("&api=" . $this->api);
+                $rdf .= clean("&api=".$this->api);
             }
             $rdf .= "\"/>\n";
             $rdf .= "        </sioct:WikiArticle>\n";
@@ -1119,12 +1119,12 @@ 
         }
         if ($this->next_version) {
             $rdf .= "    <sioc:next_version>\n";
-            $rdf .= "        <sioct:WikiArticle rdf:about=\"" . clean($this->next_version) . "\">\n";
-            $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . clean(
-                    'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki=' . $this->next_version
+            $rdf .= "        <sioct:WikiArticle rdf:about=\"".clean($this->next_version)."\">\n";
+            $rdf .= "            <rdfs:seeAlso rdf:resource=\"".clean(
+                    'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki='.$this->next_version
                 );
             if ($this->api) {
-                $rdf .= clean("&api=" . $this->api);
+                $rdf .= clean("&api=".$this->api);
             }
             $rdf .= "\"/>\n";
             $rdf .= "        </sioct:WikiArticle>\n";
@@ -1144,12 +1144,12 @@ 
         }
         if ($this->latest_version) {
             $rdf .= "    <sioc:latest_version>\n";
-            $rdf .= "        <sioct:WikiArticle rdf:about=\"" . clean($this->latest_version) . "\">\n";
-            $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . clean(
-                    'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki=' . $this->latest_version
+            $rdf .= "        <sioct:WikiArticle rdf:about=\"".clean($this->latest_version)."\">\n";
+            $rdf .= "            <rdfs:seeAlso rdf:resource=\"".clean(
+                    'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki='.$this->latest_version
                 );
             if ($this->api) {
-                $rdf .= clean("&api=" . $this->api);
+                $rdf .= clean("&api=".$this->api);
             }
             $rdf .= "\"/>\n";
             $rdf .= "        </sioct:WikiArticle>\n";
@@ -1157,12 +1157,12 @@ 
         }
         if ($this->has_discussion && (strpos($this->has_discussion, 'Talk:Talk:') == false)) {
             $rdf .= "    <sioc:has_discussion>\n";
-            $rdf .= "        <sioct:WikiArticle rdf:about=\"" . clean($this->has_discussion) . "\">\n";
-            $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . clean(
-                    'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki=' . $this->has_discussion
+            $rdf .= "        <sioct:WikiArticle rdf:about=\"".clean($this->has_discussion)."\">\n";
+            $rdf .= "            <rdfs:seeAlso rdf:resource=\"".clean(
+                    'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki='.$this->has_discussion
                 );
             if ($this->api) {
-                $rdf .= clean("&api=" . $this->api);
+                $rdf .= clean("&api=".$this->api);
             }
             $rdf .= "\"/>\n";
             $rdf .= "        </sioct:WikiArticle>\n";
@@ -1170,21 +1170,21 @@ 
         }
         if ($this->has_container) {
             $rdf .= "    <sioc:has_container>\n";
-            $rdf .= "        <sioct:Wiki rdf:about=\"" . clean($this->has_container) . "\"/>\n";
+            $rdf .= "        <sioct:Wiki rdf:about=\"".clean($this->has_container)."\"/>\n";
             $rdf .= "    </sioc:has_container>\n";
         }
         if ($this->redirpage) {
-            $rdf .= "    <owl:sameAs rdf:resource=\"" . clean($this->redirpage) . "\"/>\n";
-            $rdf .= "    <rdfs:seeAlso rdf:resource=\"" . clean(
-                    'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki=' . $this->redirpage
+            $rdf .= "    <owl:sameAs rdf:resource=\"".clean($this->redirpage)."\"/>\n";
+            $rdf .= "    <rdfs:seeAlso rdf:resource=\"".clean(
+                    'http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki='.$this->redirpage
                 );
             if ($this->api) {
-                $rdf .= clean("&api=" . $this->api);
+                $rdf .= clean("&api=".$this->api);
             }
             $rdf .= "\"/>\n";
         }
 
-        $rdf .= "</" . $this->_type . ">\n";
+        $rdf .= "</".$this->_type.">\n";
         return $rdf;
     }
 }
@@ -1208,7 +1208,7 @@ 
 
     public function getContent(&$exp): string
     {
-        $rdf = '<' . $this->type . " rdf:about=\"" . clean($this->url) . "\"/>\n";
+        $rdf = '<'.$this->type." rdf:about=\"".clean($this->url)."\"/>\n";
         return $rdf;
     }
 }
@@ -1232,7 +1232,7 @@ 
 
     public function getContent(&$exp): string
     {
-        $rdf = '<' . $this->type . " rdf:about=\"" . clean($this->url) . "\"/>\n";
+        $rdf = '<'.$this->type." rdf:about=\"".clean($this->url)."\"/>\n";
         return $rdf;
     }
 }

action.php

Spacing +21 added lines, -21 removed lines

@@ -61,7 +61,7 @@ 
                 if (function_exists('header_remove')) {
                     header_remove();
                 }
-                header('Location: ' . $location['href'], true, 303);
+                header('Location: '.$location['href'], true, 303);
                 exit();
             } else {
                 // add meta link to html head
@@ -101,12 +101,12 @@ 
 
         // Forward to URI with explicit type attribut
         if (!isset($_GET['type'])) {
-            header('Location:' . $_SERVER['REQUEST_URI'] . '&type=' . $sioc_type, true, 302);
+            header('Location:'.$_SERVER['REQUEST_URI'].'&type='.$sioc_type, true, 302);
         }
 
         // Include SIOC libs
-        require_once(__DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'sioc_inc.php');
-        require_once(__DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'sioc_dokuwiki.php');
+        require_once(__DIR__.DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'sioc_inc.php');
+        require_once(__DIR__.DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'sioc_dokuwiki.php');
 
         // Create exporter
 
@@ -194,9 +194,9 @@ 
         }
 
         $exporter->setParameters(
-            'Container: ' . $title,
+            'Container: '.$title,
             getAbsUrl(),
-            getAbsUrl() . 'doku.php?',
+            getAbsUrl().'doku.php?',
             'utf-8',
             $this->agentlink
         );
@@ -220,7 +220,7 @@ 
         }
 
         // search next level entries (posts, sub containers) in container
-        require_once(DOKU_INC . 'inc/search.php');
+        require_once(DOKU_INC.'inc/search.php');
         $dir        = utf8_encodeFN(str_replace(':', '/', $ID));
         $entries    = array();
         $posts      = array();
@@ -271,9 +271,9 @@ 
         }
 
         $exporter->setParameters(
-            'Account: ' . $userinfo['name'],
+            'Account: '.$userinfo['name'],
             getAbsUrl(),
-            getAbsUrl() . 'doku.php?',
+            getAbsUrl().'doku.php?',
             'utf-8',
             $this->agentlink
         );
@@ -296,25 +296,25 @@ 
         global $ID, $INFO, $REV, $conf;
 
         $exporter->setParameters(
-            $INFO['meta']['title'] . ($REV ? ' (rev ' . $REV . ')' : ''),
+            $INFO['meta']['title'].($REV ? ' (rev '.$REV.')' : ''),
             $this->getDokuUrl(),
-            $this->getDokuUrl() . 'doku.php?',
+            $this->getDokuUrl().'doku.php?',
             'utf-8',
             $this->agentlink
         );
 
         // create user object
-        $dwuserpage_id = cleanID($this->getConf('userns')) . ($conf['useslash'] ? '/' : ':') . $INFO['editor'];
+        $dwuserpage_id = cleanID($this->getConf('userns')).($conf['useslash'] ? '/' : ':').$INFO['editor'];
         // create wiki page object
         $wikipage = new SIOCDokuWikiArticle(
             $ID, // id
             normalizeUri(
                 $exporter->siocURL(
                     'post',
-                    $ID . ($REV ? $exporter->_urlseparator . 'rev' . $exporter->_urlequal . $REV : '')
+                    $ID.($REV ? $exporter->_urlseparator.'rev'.$exporter->_urlequal.$REV : '')
                 )
             ), // url
-            $INFO['meta']['title'] . ($REV ? ' (rev ' . $REV . ')' : ''), // subject
+            $INFO['meta']['title'].($REV ? ' (rev '.$REV.')' : ''), // subject
             rawWiki($ID, $REV) // body (content)
         );
         /* encoded content   */
@@ -329,7 +329,7 @@ 
         }
         /* creator/modifier  */
         if ($INFO['editor'] && $this->getConf('userns')) {
-            $wikipage->addCreator(array('foaf:maker' => '#' . $INFO['editor'], 'sioc:modifier' => $dwuserpage_id));
+            $wikipage->addCreator(array('foaf:maker' => '#'.$INFO['editor'], 'sioc:modifier' => $dwuserpage_id));
         }
         /* is creator        */
         if (isset($INFO['meta']['date']['created'])) {
@@ -341,16 +341,16 @@ 
         // contributors - only for last revision b/c of wrong meta data for older revisions
         if (!$REV && $this->getConf('userns') && isset($INFO['meta']['contributor'])) {
             $cont_temp = array();
-            $cont_ns   = $this->getConf('userns') . ($conf['useslash'] ? '/' : ':');
+            $cont_ns   = $this->getConf('userns').($conf['useslash'] ? '/' : ':');
             foreach ($INFO['meta']['contributor'] as $cont_id => $cont_name) {
-                $cont_temp[$cont_ns . $cont_id] = $cont_name;
+                $cont_temp[$cont_ns.$cont_id] = $cont_name;
             }
             $wikipage->addContributors($cont_temp);
         }
 
         // backlinks - only for last revision
         if (!$REV) {
-            require_once(DOKU_INC . 'inc/fulltext.php');
+            require_once(DOKU_INC.'inc/fulltext.php');
             $backlinks = ft_backlinks($ID);
             if (count($backlinks) > 0) {
                 $wikipage->addBacklinks($backlinks);
@@ -495,7 +495,7 @@ 
         switch ($sioc_type) {
             case 'container':
                 $title     = htmlentities(
-                    "Container '" . ($INFO['meta']['title'] ?? $ID) . "' (SIOC document as RDF/XML)"
+                    "Container '".($INFO['meta']['title'] ?? $ID)."' (SIOC document as RDF/XML)"
                 );
                 $queryAttr = array('type' => 'container');
                 break;
@@ -509,7 +509,7 @@ 
             default:
                 $title     = htmlentities($INFO['meta']['title'] ?? $ID);
                 $queryAttr = array('type' => 'post');
-                if (isset($_GET['rev']) && $_GET['rev'] === (int)$_GET['rev']) {
+                if (isset($_GET['rev']) && $_GET['rev'] === (int) $_GET['rev']) {
                     $queryAttr['rev'] = $_GET['rev'];
                 }
                 break;
@@ -581,7 +581,7 @@ 
         }
 
         // get user id
-        $userid = str_replace(cleanID($pobj->getConf('userns')) . ($conf['useslash'] ? '/' : ':'), '', $id);
+        $userid = str_replace(cleanID($pobj->getConf('userns')).($conf['useslash'] ? '/' : ':'), '', $id);
 
         if ($info = $auth->getUserData($userid)) {
             if ($key) {