mprins / dokuwiki-plugin-dokusioc

_test/general.test.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
      * Simple test to make sure the plugin.info.txt is in correct format
      */
     public function test_plugininfo(): void {
-        $file = __DIR__ . '/../plugin.info.txt';
+        $file = __DIR__.'/../plugin.info.txt';
         $this->assertFileExists($file);
 
         $info = confToHash($file);

action.php

Spacing +86 added lines, -86 removed lines

@@ -90,20 +90,20 @@ 
         //print_r($INFO); die();
         //print_r(headers_list()); die();
 
-        if($action->data === 'export_siocxml') {
+        if ($action->data === 'export_siocxml') {
             // give back rdf
             $this->exportSioc();
-        } elseif(($action->data === 'show' || $action->data === 'index') && $INFO['perm']
+        } elseif (($action->data === 'show' || $action->data === 'index') && $INFO['perm']
             && !defined('DOKU_MEDIADETAIL')
             && ($INFO['exists'] || getDwUserInfo($INFO['id'], $this)) && !isHiddenPage($INFO['id'])) {
-            if($this->isRdfXmlRequest()) {
+            if ($this->isRdfXmlRequest()) {
                 // forward to rdfxml document if requested
                 // print_r(headers_list()); die();
                 $location = $this->createRdfLink();
-                if(function_exists('header_remove')) {
+                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
@@ -125,7 +125,7 @@ 
 
         // Test for hidden pages
 
-        if(isHiddenPage($ID)) {
+        if (isHiddenPage($ID)) {
             $this->exit("HTTP/1.0 404 Not Found");
         }
 
@@ -135,26 +135,26 @@ 
 
         // Test for valid types
 
-        if(!(($sioc_type == 'post' && $INFO['exists']) || $sioc_type == 'user' || $sioc_type == 'container')) {
+        if (!(($sioc_type == 'post' && $INFO['exists']) || $sioc_type == 'user' || $sioc_type == 'container')) {
             $this->exit("HTTP/1.0 404 Not Found");
         }
 
         // Test for permission
 
-        if(!$INFO['perm']) {
+        if (!$INFO['perm']) {
             // not enough rights to see the wiki page
             $this->exit("HTTP/1.0 401 Unauthorized");
         }
 
         // Forward to URI with explicit type attribut
-        if(!isset($_GET['type'])) {
-            header('Location:' . $_SERVER['REQUEST_URI'] . '&type=' . $sioc_type, true, 302);
+        if (!isset($_GET['type'])) {
+            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
 
@@ -171,7 +171,7 @@ 
 
         // Create SIOC-RDF content
 
-        switch($sioc_type) {
+        switch ($sioc_type) {
             case 'container':
                 $rdf = $this->exportContainercontent($rdf);
                 break;
@@ -187,7 +187,7 @@ 
         }
 
         // export
-        if($this->getConf('noindx')) {
+        if ($this->getConf('noindx')) {
             header("X-Robots-Tag: noindex", true);
         }
         $rdf->export();
@@ -207,12 +207,12 @@ 
         global $ID, $conf;
 
         // check for type if unknown
-        if(!($_GET['type'] ?? "")) {
+        if (!($_GET['type'] ?? "")) {
             $userinfo = getDwUserInfo($ID, $this);
 
-            if($userinfo) {
+            if ($userinfo) {
                 $type = 'user';
-            } elseif(isset($_GET['do']) && $_GET['do'] == 'index') {
+            } elseif (isset($_GET['do']) && $_GET['do'] == 'index') {
                 $type = 'container';
             } else {
                 $type = 'post';
@@ -229,18 +229,18 @@ 
     private function exportContainercontent($exporter) {
         global $ID, $INFO, $conf;
 
-        if($ID == $conf['start']) {
+        if ($ID == $conf['start']) {
             $title = $conf['title'];
-        } elseif(isset($INFO['meta']['title'])) {
+        } elseif (isset($INFO['meta']['title'])) {
             $title = $INFO['meta']['title'];
         } else {
             $title = $ID;
         }
 
         $exporter->setParameters(
-            'Container: ' . $title,
+            'Container: '.$title,
             getAbsUrl(),
-            getAbsUrl() . 'doku.php?',
+            getAbsUrl().'doku.php?',
             'utf-8',
             $this->agentlink
         );
@@ -252,44 +252,44 @@ 
         );
 
         /* container is type=wiki */
-        if($ID == $conf['start']) {
+        if ($ID == $conf['start']) {
             $wikicontainer->isWiki();
         }
         /* sioc:name              */
-        if($INFO['exists']) {
+        if ($INFO['exists']) {
             $wikicontainer->addTitle($INFO['meta']['title']);
         }
         /* has_parent             */
-        if($INFO['namespace']) {
+        if ($INFO['namespace']) {
             $wikicontainer->addParent($INFO['namespace']);
         }
 
         // 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();
         $containers = array();
         search($entries, $conf['datadir'], 'search_index', array('ns' => $ID), $dir);
-        foreach($entries as $entry) {
-            if($entry['type'] === 'f') {
+        foreach ($entries as $entry) {
+            if ($entry['type'] === 'f') {
                 // wikisite
                 $posts[] = $entry;
-            } elseif($entry['type'] === 'd') {
+            } elseif ($entry['type'] === 'd') {
                 // sub container
                 $containers[] = $entry;
             }
         }
 
         // without sub content it can't be a container (so it does not exist as a container)
-        if(count($posts) + count($containers) == 0) {
+        if (count($posts) + count($containers) == 0) {
             $this->exit("HTTP/1.0 404 Not Found");
         }
 
-        if(count($posts) > 0) {
+        if (count($posts) > 0) {
             $wikicontainer->addArticles($posts);
         }
-        if(count($containers) > 0) {
+        if (count($containers) > 0) {
             $wikicontainer->addContainers($containers);
         }
 
@@ -310,14 +310,14 @@ 
         $userinfo = getDwUserInfo($ID, $this);
 
         // no userinfo means there is no user space or user does not exists
-        if($userinfo === false) {
+        if ($userinfo === false) {
             $this->exit("HTTP/1.0 404 Not Found");
         }
 
         $exporter->setParameters(
-            'Account: ' . $userinfo['name'],
+            'Account: '.$userinfo['name'],
             getAbsUrl(),
-            getAbsUrl() . 'doku.php?',
+            getAbsUrl().'doku.php?',
             'utf-8',
             $this->agentlink
         );
@@ -344,16 +344,16 @@ 
         global $ID, $INFO, $REV, $conf;
 
         $exporter->setParameters(
-            'Article: ' . $INFO['meta']['title'] . ($REV ? ' (rev ' . $REV . ')' : ''),
+            'Article: '.$INFO['meta']['title'].($REV ? ' (rev '.$REV.')' : ''),
             $this->getDokuUrl(),
-            $this->getDokuUrl() . 'doku.php?',
+            $this->getDokuUrl().'doku.php?',
             'utf-8',
             $this->agentlink
         );
 
         // create user object
         // $id, $uri, $name, $email, $homepage='', $foaf_uri='', $role=false, $nick='', $sioc_url='', $foaf_url=''
-        $dwuserpage_id = cleanID($this->getConf('userns')) . ($conf['useslash'] ? '/' : ':') . $INFO['editor'];
+        $dwuserpage_id = cleanID($this->getConf('userns')).($conf['useslash'] ? '/' : ':').$INFO['editor'];
         /*
         if ($INFO['editor'] && $this->getConf('userns'))
             $pageuser = new SIOCUser($INFO['editor'],
@@ -374,49 +374,49 @@ 
             $ID, // id
             normalizeUri(
                 $exporter->siocURL(
-                    'post', $ID . ($REV ? $exporter->_urlseparator . 'rev'
-                              . $exporter->_urlequal . $REV : '')
+                    'post', $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   */
         $wikipage->addContentEncoded(p_cached_output(wikiFN($ID, $REV), 'xhtml'));
         /* created           */
-        if(isset($INFO['meta']['date']['created'])) {
+        if (isset($INFO['meta']['date']['created'])) {
             $wikipage->addCreated(date('c', $INFO['meta']['date']['created']));
         }
         /* or modified       */
-        if(isset($INFO['meta']['date']['modified'])) {
+        if (isset($INFO['meta']['date']['modified'])) {
             $wikipage->addModified(date('c', $INFO['meta']['date']['modified']));
         }
         /* creator/modifier  */
-        if($INFO['editor'] && $this->getConf('userns')) {
-            $wikipage->addCreator(array('foaf:maker' => '#' . $INFO['editor'], 'sioc:modifier' => $dwuserpage_id));
+        if ($INFO['editor'] && $this->getConf('userns')) {
+            $wikipage->addCreator(array('foaf:maker' => '#'.$INFO['editor'], 'sioc:modifier' => $dwuserpage_id));
         }
         /* is creator        */
-        if(isset($INFO['meta']['date']['created'])) {
+        if (isset($INFO['meta']['date']['created'])) {
             $wikipage->isCreator();
         }
         /* intern wiki links */
         $wikipage->addLinks($INFO['meta']['relation']['references']);
 
         // contributors - only for last revision b/c of wrong meta data for older revisions
-        if(!$REV && $this->getConf('userns') && isset($INFO['meta']['contributor'])) {
+        if (!$REV && $this->getConf('userns') && isset($INFO['meta']['contributor'])) {
             $cont_temp = array();
-            $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_ns   = $this->getConf('userns').($conf['useslash'] ? '/' : ':');
+            foreach ($INFO['meta']['contributor'] as $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');
+        if (!$REV) {
+            require_once(DOKU_INC.'inc/fulltext.php');
             $backlinks = ft_backlinks($ID);
-            if(count($backlinks) > 0) {
+            if (count($backlinks) > 0) {
                 $wikipage->addBacklinks($backlinks);
             }
         }
@@ -428,37 +428,37 @@ 
         $pagerevs  = $changelog->getRevisions(0, $conf['recent'] + 1);
         $prevrev   = false;
         $nextrev   = false;
-        if(!$REV) {
+        if (!$REV) {
             // latest revision, previous rev is on top in array
             $prevrev = 0;
         } else {
             // other revision
             $currentrev = array_search($REV, $pagerevs);
-            if($currentrev !== false) {
+            if ($currentrev !== false) {
                 $prevrev = $currentrev + 1;
                 $nextrev = $currentrev - 1;
             }
         }
-        if($prevrev !== false && $prevrev > -1 && page_exists($ID, $pagerevs[$prevrev])) {
+        if ($prevrev !== false && $prevrev > -1 && page_exists($ID, $pagerevs[$prevrev])) {
             /* previous revision*/
             $wikipage->addVersionPrevious($pagerevs[$prevrev]);
         }
-        if($nextrev !== false && $nextrev > -1 && page_exists($ID, $pagerevs[$nextrev])) {
+        if ($nextrev !== false && $nextrev > -1 && page_exists($ID, $pagerevs[$nextrev])) {
             /* next revision*/
             $wikipage->addVersionNext($pagerevs[$nextrev]);
         }
 
         /* latest revision   */
-        if($REV) {
+        if ($REV) {
             $wikipage->addVersionLatest();
         }
         // TODO: topics
         /* has_container     */
-        if($INFO['namespace']) {
+        if ($INFO['namespace']) {
             $wikipage->addContainer($INFO['namespace']);
         }
         /* has_space         */
-        if($this->getConf('owners')) {
+        if ($this->getConf('owners')) {
             $wikipage->addSite($this->getConf('owners'));
         }
         // TODO: dc:contributor / has_modifier
@@ -496,19 +496,19 @@ 
 
         // soft check, route to RDF when client requests it (don't check quality of request)
 
-        if($this->getConf('softck') && strpos($_SERVER['HTTP_ACCEPT'], 'application/rdf+xml') !== false) {
+        if ($this->getConf('softck') && strpos($_SERVER['HTTP_ACCEPT'], 'application/rdf+xml') !== false) {
             return true;
         }
 
-        if(count($accepted) > 0) {
+        if (count($accepted) > 0) {
             // hard check, only serve RDF if it is requested first or equal to first type
 
             // extract accepting ratio
             $test_accept = array();
-            foreach($accepted as $format) {
+            foreach ($accepted as $format) {
                 $formatspec = explode(';', $format);
                 $k          = trim($formatspec[0]);
-                if(count($formatspec) === 2) {
+                if (count($formatspec) === 2) {
                     $test_accept[$k] = trim($formatspec[1]);
                 } else {
                     $test_accept[$k] = 'q=1.0';
@@ -519,7 +519,7 @@ 
             arsort($test_accept);
             $accepted_order = array_keys($test_accept);
 
-            if($accepted_order[0] === 'application/rdf+xml' ||
+            if ($accepted_order[0] === 'application/rdf+xml' ||
                 (array_key_exists('application/rdf+xml', $test_accept)
                     && $test_accept['application/rdf+xml'] === 'q=1.0')
             ) {
@@ -540,7 +540,7 @@ 
 
         // Test for hidden pages
 
-        if(isHiddenPage($ID)) {
+        if (isHiddenPage($ID)) {
             return false;
         }
 
@@ -550,13 +550,13 @@ 
 
         // Test for valid types
 
-        if(!(($sioc_type === 'post' && $INFO['exists']) || $sioc_type === 'user' || $sioc_type === 'container')) {
+        if (!(($sioc_type === 'post' && $INFO['exists']) || $sioc_type === 'user' || $sioc_type === 'container')) {
             return false;
         }
 
         // Test for permission
 
-        if(!$INFO['perm']) {
+        if (!$INFO['perm']) {
             // not enough rights to see the wiki page
             return false;
         }
@@ -568,24 +568,24 @@ 
         $metalink['type'] = 'application/rdf+xml';
         $metalink['rel']  = 'meta';
 
-        switch($sioc_type) {
+        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;
 
             case 'user':
-                $title     = htmlentities("User account '" . $userinfo['name'] . "' (SIOC document as RDF/XML)");
+                $title     = htmlentities("User account '".$userinfo['name']."' (SIOC document as RDF/XML)");
                 $queryAttr = array('type' => 'user');
                 break;
 
             case 'post':
             default:
-                $title     = htmlentities("Article '" . $INFO['meta']['title'] . "' (SIOC document as RDF/XML)");
+                $title     = htmlentities("Article '".$INFO['meta']['title']."' (SIOC document as RDF/XML)");
                 $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;
@@ -594,11 +594,11 @@ 
         $metalink['title'] = $title;
         $metalink['href']  = normalizeUri(getAbsUrl(exportlink($ID, 'siocxml', $queryAttr, false, '&')));
 
-        if($event !== null) {
+        if ($event !== null) {
             $event->data['link'][] = $metalink;
 
             // set canocial link for type URIs to prevent indexing double content
-            if($_GET['type'] ?? "") {
+            if ($_GET['type'] ?? "") {
                 $event->data['link'][] = array('rel' => 'canonical', 'href' => getAbsUrl(wl($ID)));
             }
         }
@@ -607,19 +607,19 @@ 
     }
 }
 
-if(!function_exists('getAbsUrl')) {
+if (!function_exists('getAbsUrl')) {
     function getAbsUrl($url = null) {
-        if($url === null) {
+        if ($url === null) {
             $url = DOKU_BASE;
         }
         return str_replace(DOKU_BASE, DOKU_URL, $url);
     }
 }
 
-if(!function_exists('getDwUserEmail')) {
+if (!function_exists('getDwUserEmail')) {
     function getDwUserEmail($user) {
         global $auth;
-        if($info = $auth->getUserData($user)) {
+        if ($info = $auth->getUserData($user)) {
             return $info['mail'];
         } else {
             return false;
@@ -627,19 +627,19 @@ 
     }
 }
 
-if(!function_exists('getDwUserInfo')) {
+if (!function_exists('getDwUserInfo')) {
     function getDwUserInfo($id, $pobj, $key = null) {
         global $auth, $conf;
 
-        if(!$pobj->getConf('userns')) {
+        if (!$pobj->getConf('userns')) {
             return false;
         }
 
         // 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) {
+        if ($info = $auth->getUserData($userid)) {
+            if ($key) {
                 return $info['key'];
             } else {
                 return $info;
@@ -651,18 +651,18 @@ 
 }
 
 // sort query attributes by name
-if(!function_exists('normalizeUri')) {
+if (!function_exists('normalizeUri')) {
     function normalizeUri($uri) {
         // part URI
         $parts = explode('?', $uri);
 
         // part query
-        if(isset($parts[1])) {
+        if (isset($parts[1])) {
             $query = $parts[1];
 
             // test separator
             $sep = '&';
-            if(strpos($query, '&') !== false) {
+            if (strpos($query, '&') !== false) {
                 $sep = '&';
             }
             $attr = explode($sep, $query);

lib/sioc_dokuwiki.php

Spacing +79 added lines, -79 removed lines

@@ -57,7 +57,7 @@ 
     }
 
     public function addLinks($links) {
-        if(is_array($links) && count($links) > 0) {
+        if (is_array($links) && count($links) > 0) {
             $this->links = $links;
         }
     }
@@ -92,9 +92,9 @@ 
     }
 
     public function getContent(&$exp): string {
-        $rdf = '<' . $this->type . " rdf:about=\"" . clean($this->url, true) . "\">\n";
-        if($this->subject) {
-            $rdf .= "    <dc:title>" . clean($this->subject) . "</dc:title>\n";
+        $rdf = '<'.$this->type." rdf:about=\"".clean($this->url, true)."\">\n";
+        if ($this->subject) {
+            $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";
@@ -102,59 +102,59 @@ 
 
         $creator_name = null;
 
-        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($exp->siocURL('user', $cont_id))
-                        . "\" rdfs:label=\"" . clean($cont_name) . "\"/>\n";
+        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($exp->siocURL('user', $cont_id))
+                        . "\" 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']]) . '"';
+            if (isset($this->contributors[$this->creator['sioc:modifier']])) {
+                $creator_name = 'rdfs:label="'.clean($this->contributors[$this->creator['sioc:modifier']]).'"';
             }
         }
 
-        if(is_array($this->creator)) {
+        if (is_array($this->creator)) {
             // if ($this->creator['foaf:maker'])
             //     $rdf .= "    <foaf:maker rdf:resource=\"".clean($this->creator['foaf:maker'])."\"/>\n";
-            if($this->creator['sioc:modifier']) {
-                if($this->is_creator === false) {
+            if ($this->creator['sioc:modifier']) {
+                if ($this->is_creator === false) {
                     $rdf .= "    <sioc:has_modifier rdf:resource=\""
-                        . normalizeUri($exp->siocURL('user', $this->creator['sioc:modifier'])) . "\" $creator_name/>\n";
+                        . normalizeUri($exp->siocURL('user', $this->creator['sioc:modifier']))."\" $creator_name/>\n";
                 }
-                if($this->is_creator === true) {
+                if ($this->is_creator === true) {
                     $rdf .= "    <sioc:has_creator rdf:resource=\""
-                        . normalizeUri($exp->siocURL('user', $this->creator['sioc:modifier'])) . "\" $creator_name/>\n";
+                        . normalizeUri($exp->siocURL('user', $this->creator['sioc:modifier']))."\" $creator_name/>\n";
                 }
             }
         }
 
-        if($this->created) {
-            $rdf .= "    <dcterms:created>" . $this->created . "</dcterms:created>\n";
+        if ($this->created) {
+            $rdf .= "    <dcterms:created>".$this->created."</dcterms:created>\n";
         }
 
-        if($this->modified) {
-            $rdf .= "    <dcterms:modified>" . $this->modified . "</dcterms:modified>\n";
+        if ($this->modified) {
+            $rdf .= "    <dcterms:modified>".$this->modified."</dcterms:modified>\n";
         }
 
-        if($this->has_space) {
-            $rdf .= "    <sioc:has_space rdf:resource=\"" . clean($this->has_space, true) . "\" />\n";
+        if ($this->has_space) {
+            $rdf .= "    <sioc:has_space rdf:resource=\"".clean($this->has_space, true)."\" />\n";
             // TODO: rdfs:label
         }
 
-        if($this->has_container) {
+        if ($this->has_container) {
             $rdf .= "    <sioc:has_container rdf:resource=\""
-                . normalizeUri($exp->siocURL('container', $this->has_container)) . "\" />\n";
+                . normalizeUri($exp->siocURL('container', $this->has_container))."\" />\n";
             // TODO: rdfs:label
         }
 
-        if($this->content) {
-            $rdf .= "    <sioc:content><![CDATA[" . pureContent($this->content) . "]]></sioc:content>\n";
+        if ($this->content) {
+            $rdf .= "    <sioc:content><![CDATA[".pureContent($this->content)."]]></sioc:content>\n";
         }
 
-        if($this->content_encoded) {
-            $rdf .= "    <content:encoded><![CDATA[" . $this->content_encoded . "]]></content:encoded>\n";
+        if ($this->content_encoded) {
+            $rdf .= "    <content:encoded><![CDATA[".$this->content_encoded."]]></content:encoded>\n";
         }
 
         /*
@@ -172,21 +172,21 @@ 
         }
         */
 
-        if(is_array($this->links) && count($this->links) > 0) {
-            foreach($this->links as $link_id => $link_exists) {
-                if($link_exists && !isHiddenPage($link_id)) {
+        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($exp->siocURL('post', $link_id)) . "\"/>\n";
+                        . normalizeUri($exp->siocURL('post', $link_id))."\"/>\n";
                     // TODO: rdfs:label
                 }
             }
         }
 
-        if(count($this->backlinks) > 0) {
-            foreach($this->backlinks as $link_id) {
-                if(!isHiddenPage($link_id)) {
+        if (count($this->backlinks) > 0) {
+            foreach ($this->backlinks as $link_id) {
+                if (!isHiddenPage($link_id)) {
                     $rdf .= "    <dcterms:isReferencedBy rdf:resource=\""
-                        . normalizeUri($exp->siocURL('post', $link_id)) . "\"/>\n";
+                        . normalizeUri($exp->siocURL('post', $link_id))."\"/>\n";
                     // TODO: rdfs:label
                 }
             }
@@ -200,52 +200,52 @@ 
         }
         */
 
-        if($this->previous_version) {
+        if ($this->previous_version) {
             $rdf .= "    <sioc:previous_version rdf:resource=\""
                 . normalizeUri(
                     $exp->siocURL(
-                        'post', $this->id . $exp->_urlseparator . 'rev' . $exp->_urlequal
+                        'post', $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(
                     $exp->siocURL(
-                        'post', $this->id . $exp->_urlseparator . 'rev' . $exp->_urlequal
+                        'post', $this->id.$exp->_urlseparator.'rev'.$exp->_urlequal
                               . $this->previous_version
                     )
-                ) . "\"/>\n";
+                )."\"/>\n";
             // TODO: rdfs:label
 
         }
 
-        if($this->next_version) {
+        if ($this->next_version) {
             $rdf .= "    <sioc:next_version rdf:resource=\""
                 . normalizeUri(
                     $exp->siocURL(
-                        'post', $this->id . $exp->_urlseparator . 'rev' . $exp->_urlequal
+                        'post', $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(
                     $exp->siocURL(
-                        'post', $this->id . $exp->_urlseparator . 'rev' . $exp->_urlequal
+                        'post', $this->id.$exp->_urlseparator.'rev'.$exp->_urlequal
                               . $this->next_version
                     )
-                ) . "\"/>\n";
+                )."\"/>\n";
             // TODO: rdfs:label
         }
 
-        if($this->latest_version) {
+        if ($this->latest_version) {
             $rdf .= "    <sioc:latest_version rdf:resource=\""
-                . normalizeUri($exp->siocURL('post', $this->id)) . "\"/>\n";
+                . normalizeUri($exp->siocURL('post', $this->id))."\"/>\n";
             // TODO: rdfs:label
         }
 
@@ -273,7 +273,7 @@ 
         }
         */
 
-        $rdf .= "</" . $this->type . ">\n";
+        $rdf .= "</".$this->type.">\n";
         return $rdf;
     }
 }
@@ -306,45 +306,45 @@ 
         //$this->email = $email;
         $this->url = $url;
 
-        if(preg_match_all('/^.+@.+\..+$/Ui', $email, $check, PREG_SET_ORDER)) {
-            if(preg_match_all('/^mailto:(.+@.+\..+$)/Ui', $email, $matches, PREG_SET_ORDER)) {
+        if (preg_match_all('/^.+@.+\..+$/Ui', $email, $check, PREG_SET_ORDER)) {
+            if (preg_match_all('/^mailto:(.+@.+\..+$)/Ui', $email, $matches, PREG_SET_ORDER)) {
                 $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";
-        if($this->nick) {
-            $rdf .= "    <sioc:name>" . clean($this->nick) . "</sioc:name>\n";
+        $rdf = "<sioc:UserAccount rdf:about=\"".clean($this->url, true)."\">\n";
+        if ($this->nick) {
+            $rdf .= "    <sioc:name>".clean($this->nick)."</sioc:name>\n";
         }
-        if($this->email) {
-            if($exp->_export_email) {
-                $rdf .= "    <sioc:email rdf:resource=\"" . $this->email . "\"/>\n";
+        if ($this->email) {
+            if ($exp->_export_email) {
+                $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) {
+        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";
+        if ($this->name) {
+            $rdf .= "            <foaf:name>".clean($this->name)."</foaf:name>\n";
         }
-        if($this->email) {
-            $rdf .= "            <foaf:mbox_sha1sum>" . $this->sha1 . "</foaf:mbox_sha1sum>\n";
+        if ($this->email) {
+            $rdf .= "            <foaf:mbox_sha1sum>".$this->sha1."</foaf:mbox_sha1sum>\n";
         }
-        if($this->foaf_url) {
-            $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $this->foaf_url . "\"/>\n";
+        if ($this->foaf_url) {
+            $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$this->foaf_url."\"/>\n";
         }
         $rdf .= "        </foaf:Person>\n";
         $rdf .= "    </sioc:account_of>\n";
@@ -397,32 +397,32 @@ 
     }
 
     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";
+        if ($this->title) {
+            $rdf .= "    <sioc:name>".clean($this->title)."</sioc:name>\n";
         }
 
-        if($this->_has_parent) {
+        if ($this->_has_parent) {
             $rdf .= "    <sioc:has_parent rdf:resource=\""
-                . normalizeUri($exp->siocURL('container', $this->_has_parent)) . "\" />\n";
+                . normalizeUri($exp->siocURL('container', $this->_has_parent))."\" />\n";
             // TODO: rdfs:label
         }
 
-        foreach($this->posts as $article) {
+        foreach ($this->posts as $article) {
             // TODO: test permission before?
             $rdf .= "    <sioc:container_of rdf:resource=\""
-                . normalizeUri($exp->siocURL('post', $article['id'])) . "\"/>\n";
+                . normalizeUri($exp->siocURL('post', $article['id']))."\"/>\n";
             // TODO: inluding title/name
         }
 
-        foreach($this->subcontainers as $container) {
+        foreach ($this->subcontainers as $container) {
             $rdf .= "    <sioc:parent_of rdf:resource=\""
-                . normalizeUri($exp->siocURL('container', $container['id'])) . "\"/>\n";
+                . normalizeUri($exp->siocURL('container', $container['id']))."\"/>\n";
             // TODO: inluding title/name
         }
 
-        $rdf .= "</" . $this->type . ">\n";
+        $rdf .= "</".$this->type.">\n";
         return $rdf;
     }
 

lib/sioc_inc.php

Spacing +264 added lines, -264 removed lines

@@ -105,35 +105,35 @@ 
     }
 
     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]))
+        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 = '';
 
-        $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, true, 200);
+        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/"
@@ -148,18 +148,18 @@ 
     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) {
+        if ($rdf_content) {
             $rdf .= $rdf_content;
         }
-        if(count($this->objects)) {
-            foreach($this->objects as $object) {
-                if($object) {
+        if (count($this->objects)) {
+            foreach ($this->objects as $object) {
+                if ($object) {
                     $rdf .= $object->getContent($this);
                 }
             }
@@ -240,52 +240,52 @@ 
     }
 
     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";
-        if($this->forums) {
-            foreach($this->forums as $id => $url) {
-                $rdf .= "    <sioc:host_of rdf:resource=\"" . clean($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";
             }
         }
-        if($this->next_forums) {
-            $rdf .= "    <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('site', "", $this->page + 1) . "\"/>\n";
+        if ($this->next_forums) {
+            $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";
+        if ($this->usergroup_uri) {
+            $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) {
+        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";
+            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>\n";
             }
         }
         // Usergroup
-        if($this->users) {
+        if ($this->users) {
             $rdf .= "\n";
-            if($this->usergroup_uri) {
-                $rdf .= '<sioc:UserAccountgroup rdf:about="' . $this->usergroup_uri . "\">\n";
+            if ($this->usergroup_uri) {
+                $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";
-            foreach($this->users as $id => $url) {
+            $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";
+            if ($this->next_users) {
+                $rdf .= "    <rdfs:seeAlso rdf:resource=\"".$exp->siocURL('site', "", $this->page + 1)."\"/>\n";
             }
             $rdf .= "</sioc:UserAccountgroup>\n";
         }
@@ -333,13 +333,13 @@ 
         $this->uri  = $uri;
         $this->name = $name;
 
-        if(preg_match_all('/^.+@.+\..+$/Ui', $email, $check, PREG_SET_ORDER)) {
-            if(preg_match_all('/^mailto:(.+@.+\..+$)/Ui', $email, $matches, PREG_SET_ORDER)) {
+        if (preg_match_all('/^.+@.+\..+$/Ui', $email, $check, PREG_SET_ORDER)) {
+            if (preg_match_all('/^mailto:(.+@.+\..+$)/Ui', $email, $matches, PREG_SET_ORDER)) {
                 $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;
@@ -352,36 +352,36 @@ 
     }
 
     public function getContent(&$exp): string {
-        $rdf = "<foaf:Person rdf:about=\"" . clean($this->foaf_uri) . "\">\n";
-        if($this->name) {
-            $rdf .= "    <foaf:name>" . $this->name . "</foaf:name>\n";
+        $rdf = "<foaf:Person rdf:about=\"".clean($this->foaf_uri)."\">\n";
+        if ($this->name) {
+            $rdf .= "    <foaf:name>".$this->name."</foaf:name>\n";
         }
-        if($this->email) {
-            $rdf .= "    <foaf:mbox_sha1sum>" . $this->sha1 . "</foaf:mbox_sha1sum>\n";
+        if ($this->email) {
+            $rdf .= "    <foaf:mbox_sha1sum>".$this->sha1."</foaf:mbox_sha1sum>\n";
         }
-        if($this->foaf_url) {
-            $rdf .= "    <rdfs:seeAlso rdf:resource=\"" . $this->foaf_url . "\"/>\n";
+        if ($this->foaf_url) {
+            $rdf .= "    <rdfs:seeAlso rdf:resource=\"".$this->foaf_url."\"/>\n";
         }
         $rdf .= "    <foaf:holdsAccount>\n";
-        $rdf .= "        <sioc:UserAccount rdf:about=\"" . clean($this->uri) . "\">\n";
-        if($this->nick) {
-            $rdf .= "            <sioc:name>" . $this->nick . "</sioc:name>\n";
+        $rdf .= "        <sioc:UserAccount rdf:about=\"".clean($this->uri)."\">\n";
+        if ($this->nick) {
+            $rdf .= "            <sioc:name>".$this->nick."</sioc:name>\n";
         }
-        if($this->email) {
-            if($exp->_export_email) {
-                $rdf .= "            <sioc:email rdf:resource=\"" . $this->email . "\"/>\n";
+        if ($this->email) {
+            if ($exp->_export_email) {
+                $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) {
+        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";
+        if ($this->sioc_url) {
+            $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$this->sioc_url."\"/>\n";
         }
         $rdf .= "        </sioc:UserAccount>\n";
         $rdf .= "    </foaf:holdsAccount>\n";
@@ -448,29 +448,29 @@ 
     }
 
     public function getContent(&$exp): string {
-        $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";
-        if($this->note) $rdf .= "    <rdfs:comment>" . $this->note . "</rdfs:comment>\n";
-        if($this->subject) {
-            $rdf .= "    <dc:title>" . $this->subject . "</dc:title>\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";
+        if ($this->note) $rdf .= "    <rdfs:comment>".$this->note."</rdfs:comment>\n";
+        if ($this->subject) {
+            $rdf .= "    <dc:title>".$this->subject."</dc:title>\n";
         }
-        if($this->created) {
-            $rdf .= "    <dcterms:created>" . $this->created . "</dcterms:created>\n";
+        if ($this->created) {
+            $rdf .= "    <dcterms:created>".$this->created."</dcterms:created>\n";
         }
-        if($this->parents) {
-            foreach($this->parents as $id => $uri) {
+        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";
             }
         }
         // 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";
+        if ($this->tags) {
+            foreach ($this->tags as $id => $tag) {
+                $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
@@ -496,31 +496,31 @@ 
                 }
             }
             */
-        if($this->related) {
-            foreach($this->related as $id => $url) {
+        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
             }
         }
 
-        if($this->posts) {
-            foreach($this->posts as $id => $data) {
+        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";
-                if($data[prev]) {
-                    $rdf .= "            <sioc:previous_by_date rdf:resource=\"" . clean($data[prev]) . "\"/>\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";
                 }
-                if($data[next]) {
-                    $rdf .= "            <sioc:next_by_date rdf:resource=\"" . clean($data[next]) . "\"/>\n";
+                if ($data[next]) {
+                    $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)
+        if ($this->next) {
+            $rdf .= "\r<rdfs:seeAlso rdf:resource=\"".$exp->siocURL('thread', $this->id, $this->page + 1)
                 . "\"/>\n";
         }
         $rdf .= "</sioc:Thread>\n";
@@ -600,61 +600,61 @@ 
     }
 
     public function getContent(&$exp): string {
-        $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";
-        if($this->blog_title) $rdf .= "    <dc:title>" . $this->blog_title . "</dc:title>\n";
-        if($this->description) $rdf .= "    <dc:description>" . $this->description . "</dc:description>\n";
-        if($this->note) $rdf .= "    <rdfs:comment>" . $this->note . "</rdfs:comment>\n";
-
-        if($this->parents) {
-            foreach($this->parents as $id => $uri) {
+        $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";
+        if ($this->blog_title) $rdf .= "    <dc:title>".$this->blog_title."</dc:title>\n";
+        if ($this->description) $rdf .= "    <dc:description>".$this->description."</dc:description>\n";
+        if ($this->note) $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";
             }
         }
 
-        if($this->threads) {
-            foreach($this->threads as $id => $uri) {
+        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";
             }
         }
 
-        if($this->posts) {
-            foreach($this->posts as $id => $url) {
+        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";
             }
         }
 
-        if($this->creator) {
-            if($this->creator->_id) {
+        if ($this->creator) {
+            if ($this->creator->_id) {
                 $rdf .= "    <sioc:has_creator>\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 .= "        <sioc:UserAccount rdf:about=\"".clean($this->creator->_uri)."\">\n";
+                if ($this->creator->_sioc_url) {
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$this->creator->_sioc_url."\"/>\n";
                 } else {
-                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('user', $this->creator->_id)
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL('user', $this->creator->_id)
                         . "\"/>\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";
-                if($this->creator->_foaf_url) {
-                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $this->creator->_foaf_url . "\"/>\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";
                 } else {
-                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('user', $this->creator->_id)
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL('user', $this->creator->_id)
                         . "\"/>\n";
                 }
                 $rdf .= "        </foaf:Person>\n";
@@ -662,14 +662,14 @@ 
             } else {
                 $rdf .= "    <foaf:maker>\n";
                 $rdf .= "        <foaf:Person";
-                if($this->creator->_name) {
-                    $rdf .= " foaf:name=\"" . $this->creator->_name . "\"";
+                if ($this->creator->_name) {
+                    $rdf .= " foaf:name=\"".$this->creator->_name."\"";
                 }
-                if($this->creator->_sha1) {
-                    $rdf .= " foaf:mbox_sha1sum=\"" . $this->creator->_sha1 . "\"";
+                if ($this->creator->_sha1) {
+                    $rdf .= " foaf:mbox_sha1sum=\"".$this->creator->_sha1."\"";
                 }
-                if($this->creator->_name) {
-                    $rdf .= ">\n            <foaf:homepage rdf:resource=\"" . $this->creator->_homepage
+                if ($this->creator->_name) {
+                    $rdf .= ">\n            <foaf:homepage rdf:resource=\"".$this->creator->_homepage
                         . "\"/>\n        </foaf:Person>\n";
                 } else {
                     $rdf .= "/>\n";
@@ -678,28 +678,28 @@ 
             }
         }
 
-        if($this->administrator) {
-            if($this->administrator->_id) {
+        if ($this->administrator) {
+            if ($this->administrator->_id) {
                 $rdf .= "    <sioc:has_administrator>\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 .= "        <sioc:UserAccount rdf:about=\"".clean($this->administrator->_uri)."\">\n";
+                if ($this->administrator->_sioc_url) {
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$this->administrator->_sioc_url."\"/>\n";
                 } else $rdf .= "            <rdfs:seeAlso rdf:resource=\""
-                                                        . $exp->siocURL('user', $this->administrator->_id) . "\"/>\n";
+                                                        . $exp->siocURL('user', $this->administrator->_id)."\"/>\n";
                 $rdf .= "        </sioc:UserAccount>\n";
                 $rdf .= "    </sioc:has_administrator>\n";
             }
         }
-        if($this->links) {
-            foreach($this->links as $url => $link) {
-                $rdf .= "    <sioc:links_to rdfs:label=\"$link\" 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";
             }
         }
 
-        if($this->next) {
-            $rdf .= "\r<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('forum', $this->id, $this->page + 1) . "\"/>\n";
+        if ($this->next) {
+            $rdf .= "\r<rdfs:seeAlso rdf:resource=\"".$exp->siocURL('forum', $this->id, $this->page + 1)."\"/>\n";
         }
-        $rdf .= "</" . $this->_type . ">";
+        $rdf .= "</".$this->_type.">";
 
         return $rdf;
     }
@@ -764,29 +764,29 @@ 
     }
 
     public function getContent(&$exp): string {
-        $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 = '<'.$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";
         }
-        if($this->creator) {
-            if($this->creator->_id) {
+        if ($this->creator) {
+            if ($this->creator->_id) {
                 $rdf .= "    <sioc:has_creator>\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 .= "        <sioc:UserAccount rdf:about=\"".clean($this->creator->_uri)."\">\n";
+                if ($this->creator->_sioc_url) {
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$this->creator->_sioc_url."\"/>\n";
                 } else {
-                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('user', $this->creator->_id)
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL('user', $this->creator->_id)
                         . "\"/>\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";
-                if($this->creator->_foaf_url) {
-                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $this->creator->_foaf_url . "\"/>\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";
                 } else {
-                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('user', $this->creator->_id)
+                    $rdf .= "            <rdfs:seeAlso rdf:resource=\"".$exp->siocURL('user', $this->creator->_id)
                         . "\"/>\n";
                 }
                 $rdf .= "        </foaf:Person>\n";
@@ -794,14 +794,14 @@ 
             } else {
                 $rdf .= "    <foaf:maker>\n";
                 $rdf .= "        <foaf:Person";
-                if($this->creator->_name) {
-                    $rdf .= " foaf:name=\"" . $this->creator->_name . "\"";
+                if ($this->creator->_name) {
+                    $rdf .= " foaf:name=\"".$this->creator->_name."\"";
                 }
-                if($this->creator->_sha1) {
-                    $rdf .= " foaf:mbox_sha1sum=\"" . $this->creator->_sha1 . "\"";
+                if ($this->creator->_sha1) {
+                    $rdf .= " foaf:mbox_sha1sum=\"".$this->creator->_sha1."\"";
                 }
-                if($this->creator->_name) {
-                    $rdf .= ">\n            <foaf:homepage rdf:resource=\"" . $this->creator->_homepage
+                if ($this->creator->_name) {
+                    $rdf .= ">\n            <foaf:homepage rdf:resource=\"".$this->creator->_homepage
                         . "\"/>\n        </foaf:Person>\n";
                 } else {
                     $rdf .= "/>\n";
@@ -809,51 +809,51 @@ 
                 $rdf .= "    </foaf:maker>\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 .= "    <sioc:content>" . pureContent($this->content) . "</sioc:content>\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 .= "    <dcterms:created>".$this->created."</dcterms:created>\n";
+        if ($this->updated and ($this->created != $this->updated)) $rdf .= "    <dcterms:modified>"
+            . $this->updated."</dcterms:modified>\n";
+        $rdf .= "    <sioc:content>".pureContent($this->content)."</sioc:content>\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";
             }
         }
-        if($this->links) {
-            foreach($this->links as $url => $link) {
-                $rdf .= "    <sioc:links_to rdfs:label=\"$link\" 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";
             }
         }
-        if($this->has_part) {
-            foreach($this->has_part as $id => $url) {
+        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) {
+        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";
             }
         }
-        if($this->comments) {
-            foreach($this->comments as $id => $url) {
+        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;
     }
 }
@@ -917,17 +917,17 @@ 
     }
 
     public function getContent(&$exp): string {
-        $rdf = '<' . $this->_type . " rdf:about=\"" . clean($this->url) . "\">\n";
-        if($this->subject) {
-            $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(
+        $rdf = '<'.$this->_type." rdf:about=\"".clean($this->url)."\">\n";
+        if ($this->subject) {
+            $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";
+                    )."\"/>\n";
             }
         }
-        if($this->creator->_nick) {
+        if ($this->creator->_nick) {
             /*if ($this->creator->id) {
                 $rdf .= "    <sioc:has_creator>\n";
                 $rdf .= "        <sioc:UserAccount rdf:about=\"" . clean($this->creator->uri) ."\">\n";
@@ -947,16 +947,16 @@ 
                 $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);
-            if($this->api) {
-                $rdf .= clean("&api=" . $this->api);
+            $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 .= "\"/>\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 ."\"";
@@ -967,69 +967,69 @@ 
             $rdf .= "    </foaf:maker>\n";
         }*/
         } else {
-            if($this->creator !== 'void') {
+            if ($this->creator !== 'void') {
                 $rdf .= "    <sioc:has_creator>\n";
                 $rdf .= "        <sioc:UserAccount>\n";
                 $rdf .= "        </sioc:UserAccount>\n";
                 $rdf .= "    </sioc:has_creator>\n";
             }
         }
-        if($this->created) {
-            $rdf .= "    <dcterms:created>" . $this->created . "</dcterms:created>\n";
+        if ($this->created) {
+            $rdf .= "    <dcterms:created>".$this->created."</dcterms:created>\n";
         }
-        if(is_array($this->topics)) {
-            foreach($this->topics as $topic => $url) {
+        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);
-                if($this->api) {
-                    $rdf .= clean("&api=" . $this->api);
+                $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 .= "\"/>\n";
                 $rdf .= "        </sioct:Category>\n";
                 $rdf .= "    </sioc:topic>\n";
             }
         }
-        if(is_array($this->links)) {
-            foreach($this->links as $label => $url) {
+        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);
-                if($this->api) {
-                    $rdf .= clean("&api=" . $this->api);
+                $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 .= "\"/>\n";
                 $rdf .= "        </sioct:WikiArticle>\n";
                 $rdf .= "    </sioc:links_to>\n";
             }
         } else {
-            if($this->links) {
+            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);
-                if($this->api) {
-                    $rdf .= clean("&api=" . $this->api);
+                $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 .= "\"/>\n";
                 $rdf .= "        </sioct:WikiArticle>\n";
                 $rdf .= "    </sioc:links_to>\n";
             }
         }
-        if(is_array($this->ext_links)) {
-            foreach($this->ext_links as $label => $url) {
-                $rdf .= "    <sioc:links_to rdf:resource=\"" . clean($url) . "\"/>\n";
+        if (is_array($this->ext_links)) {
+            foreach ($this->ext_links as $label => $url) {
+                $rdf .= "    <sioc:links_to rdf:resource=\"".clean($url)."\"/>\n";
             }
         }
-        if($this->previous_version) {
+        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);
-            if($this->api) {
-                $rdf .= clean("&api=" . $this->api);
+            $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 .= "\"/>\n";
             $rdf .= "        </sioct:WikiArticle>\n";
@@ -1047,13 +1047,13 @@ 
             $rdf .= "    </sioc:earlier_version>\n";
              */
         }
-        if($this->next_version) {
+        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);
-            if($this->api) {
-                $rdf .= clean("&api=" . $this->api);
+            $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 .= "\"/>\n";
             $rdf .= "        </sioct:WikiArticle>\n";
@@ -1071,46 +1071,46 @@ 
             $rdf .= "    </sioc:later_version>\n";
              */
         }
-        if($this->latest_version) {
+        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);
-            if($this->api) {
-                $rdf .= clean("&api=" . $this->api);
+            $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 .= "\"/>\n";
             $rdf .= "        </sioct:WikiArticle>\n";
             $rdf .= "    </sioc:latest_version>\n";
         }
-        if($this->has_discussion && (strpos($this->has_discussion, 'Talk:Talk:') == false)) {
+        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);
-            if($this->api) {
-                $rdf .= clean("&api=" . $this->api);
+            $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 .= "\"/>\n";
             $rdf .= "        </sioct:WikiArticle>\n";
             $rdf .= "    </sioc:has_discussion>\n";
         }
-        if($this->has_container) {
+        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);
-            if($this->api) {
-                $rdf .= clean("&api=" . $this->api);
+        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);
+            if ($this->api) {
+                $rdf .= clean("&api=".$this->api);
             }
             $rdf .= "\"/>\n";
         }
 
-        $rdf .= "</" . $this->_type . ">\n";
+        $rdf .= "</".$this->_type.">\n";
         return $rdf;
     }
 }
@@ -1131,7 +1131,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;
     }
 }
@@ -1152,7 +1152,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;
     }
 }
@@ -1162,13 +1162,13 @@ 
  *
  * Transforms text so that it can be safely put into XML markup
  */
-if(!function_exists('clean')) {
+if (!function_exists('clean')) {
     function clean($text, $url = false) {
 #    return htmlentities( $text );
 #    return htmlentities2( $text );
         // double encoding is preventable now
         // $text = htmlspecialchars_decode($text, ENT_COMPAT);
-        if($url) {
+        if ($url) {
             $text = str_replace('&amp;', '&', $text);
         }
         return htmlspecialchars($text, ENT_COMPAT, 'UTF-8');
@@ -1180,7 +1180,7 @@ 
  *
  * Same a HTMLEntities, but avoids double-encoding of entities
  */
-if(!function_exists('htmlentities2')) {
+if (!function_exists('htmlentities2')) {
     function htmlentities2($myHTML) {
         $translation_table          = get_html_translation_table(HTML_ENTITIES, ENT_QUOTES);
         $translation_table[chr(38)] = '&';
@@ -1197,7 +1197,7 @@ 
  *
  * Prepares text-only representation of HTML content
  */
-if(!function_exists('pureContent')) {
+if (!function_exists('pureContent')) {
     function pureContent($content) {
         // Remove HTML tags
         // May add more cleanup code later, if validation errors are found

Braces +32 added lines, -13 removed lines

@@ -108,10 +108,11 @@ 
         $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;
+            if(isset($this->type_table[$type])) {
+                            $myID = $this->type_table[$type];
+            } else {
+                            $myID = (($this->url_usetype) ? $type . '_' : '') . $this->url4id;
+            }
 
             $id_part = $this->urlseparator . $myID . $this->urlequal . $id;
         } else {
@@ -450,8 +451,12 @@ 
     public function getContent(&$exp): string {
         $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";
-        if($this->note) $rdf .= "    <rdfs:comment>" . $this->note . "</rdfs:comment>\n";
+        if($this->views) {
+          $rdf .= "    <sioc:num_views>" . $this->views . "</sioc:num_views>\n";
+        }
+        if($this->note) {
+          $rdf .= "    <rdfs:comment>" . $this->note . "</rdfs:comment>\n";
+        }
         if($this->subject) {
             $rdf .= "    <dc:title>" . $this->subject . "</dc:title>\n";
         }
@@ -601,11 +606,19 @@ 
 
     public function getContent(&$exp): string {
         $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";
+        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";
-        if($this->blog_title) $rdf .= "    <dc:title>" . $this->blog_title . "</dc:title>\n";
-        if($this->description) $rdf .= "    <dc:description>" . $this->description . "</dc:description>\n";
-        if($this->note) $rdf .= "    <rdfs:comment>" . $this->note . "</rdfs:comment>\n";
+        if($this->blog_title) {
+          $rdf .= "    <dc:title>" . $this->blog_title . "</dc:title>\n";
+        }
+        if($this->description) {
+          $rdf .= "    <dc:description>" . $this->description . "</dc:description>\n";
+        }
+        if($this->note) {
+          $rdf .= "    <rdfs:comment>" . $this->note . "</rdfs:comment>\n";
+        }
 
         if($this->parents) {
             foreach($this->parents as $id => $uri) {
@@ -684,8 +697,10 @@ 
                 $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";
-                } else $rdf .= "            <rdfs:seeAlso rdf:resource=\""
+                } else {
+                  $rdf .= "            <rdfs:seeAlso rdf:resource=\""
                                                         . $exp->siocURL('user', $this->administrator->_id) . "\"/>\n";
+                }
                 $rdf .= "        </sioc:UserAccount>\n";
                 $rdf .= "    </sioc:has_administrator>\n";
             }
@@ -765,7 +780,9 @@ 
 
     public function getContent(&$exp): string {
         $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->_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";
         }
@@ -810,8 +827,10 @@ 
             }
         }
         $rdf .= "    <dcterms:created>" . $this->created . "</dcterms:created>\n";
-        if($this->updated and ($this->created != $this->updated)) $rdf .= "    <dcterms:modified>"
+        if($this->updated and ($this->created != $this->updated)) {
+          $rdf .= "    <dcterms:modified>"
             . $this->updated . "</dcterms:modified>\n";
+        }
         $rdf .= "    <sioc:content>" . pureContent($this->content) . "</sioc:content>\n";
 
         $rdf .= "    <content:encoded><![CDATA[" . $this->encoded . "]]></content:encoded>\n";