mprins / dokuwiki-plugin-dokusioc

action.php

Braces +121 added lines, -74 removed lines

@@ -68,8 +68,12 @@ 
  * - proof of concept release under CC-BY-SA
  **/
  
-if(!defined('DOKU_INC')) die();
-if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+if(!defined('DOKU_INC')) {
+  die();
+}
+if(!defined('DOKU_PLUGIN')) {
+  define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+}
 require_once(DOKU_PLUGIN.'action.php');
  
 class action_plugin_dokusioc extends DokuWiki_Action_Plugin {
@@ -103,7 +107,9 @@ 
         // test the requested action
         $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE',  $this, 'checkAction', $controller);
         // pingthesemanticweb.com
-        if ($this->getConf('pingsw')) $controller->register_hook('ACTION_SHOW_REDIRECT', 'BEFORE',  $this, 'pingService', $controller);
+        if ($this->getConf('pingsw')) {
+          $controller->register_hook('ACTION_SHOW_REDIRECT', 'BEFORE',  $this, 'pingService', $controller);
+        }
     }
  
     /* -- Event handlers ---------------------------------------------------- */
@@ -118,18 +124,18 @@ 
         {
             // give back rdf
             $this->exportSioc();
-        }
-        elseif (($action->data == 'show' || $action->data == 'index') && $INFO['perm'] && !defined('DOKU_MEDIADETAIL') && ($INFO['exists'] || getDwUserInfo($INFO['id'],$this)) && !isHiddenPage($INFO['id']))
+        } elseif (($action->data == 'show' || $action->data == 'index') && $INFO['perm'] && !defined('DOKU_MEDIADETAIL') && ($INFO['exists'] || getDwUserInfo($INFO['id'],$this)) && !isHiddenPage($INFO['id']))
         {
             if ($this->isRdfXmlRequest())
             {
                 // forward to rdfxml document if requested
                 // print_r(headers_list()); die();
                 $location = $this->createRdfLink();
-                if (function_exists('header_remove')) header_remove();
+                if (function_exists('header_remove')) {
+                  header_remove();
+                }
                 header('Location: '.$location['href'], true, 303); exit();
-            }
-            else
+            } else
             {
                 // add meta link to html head
                 $controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE',  $this, 'createRdfLink');
@@ -167,8 +173,9 @@ 
         
         // Test for hidden pages
         
-        if (isHiddenPage($ID))
-            return false;
+        if (isHiddenPage($ID)) {
+                    return false;
+        }
         
         // Get type of SIOC content
         
@@ -176,13 +183,16 @@ 
         
         // Test for valid types
         
-        if (!(($sioc_type == 'post' && $INFO['exists']) || $sioc_type == 'user' || $sioc_type == 'container'))
-            return false;
+        if (!(($sioc_type == 'post' && $INFO['exists']) || $sioc_type == 'user' || $sioc_type == 'container')) {
+                    return false;
+        }
         
         // Test for permission
         
-        if (!$INFO['perm']) // not enough rights to see the wiki page
+        if (!$INFO['perm']) {
+          // not enough rights to see the wiki page
             return false;
+        }
 
         $userinfo = getDwUserInfo($ID, $this);
         
@@ -207,8 +217,9 @@ 
             default:
                 $title = htmlentities("Article '".$INFO['meta']['title']."' (SIOC document as RDF/XML)");
                 $queryAttr =  array('type'=>'post');
-                if (isset($_GET['rev']) && $_GET['rev'] == intval($_GET['rev']))
-                    $queryAttr['rev'] = $_GET['rev'];
+                if (isset($_GET['rev']) && $_GET['rev'] == intval($_GET['rev'])) {
+                                    $queryAttr['rev'] = $_GET['rev'];
+                }
                 break;
         }
     
@@ -220,8 +231,9 @@ 
             $event->data['link'][] = $metalink;
             
             // set canocial link for type URIs to prevent indexing double content
-            if ($_GET['type'])
-                $event->data['link'][] = array('rel'=>'canonical', 'href'=>getAbsUrl(wl($ID)));
+            if ($_GET['type']) {
+                            $event->data['link'][] = array('rel'=>'canonical', 'href'=>getAbsUrl(wl($ID)));
+            }
         }
         
         return $metalink;
@@ -235,8 +247,9 @@ 
         
         // Test for hidden pages
         
-        if (isHiddenPage($ID))
-            $this->_exit("HTTP/1.0 404 Not Found");
+        if (isHiddenPage($ID)) {
+                    $this->_exit("HTTP/1.0 404 Not Found");
+        }
         
         // Get type of SIOC content
         
@@ -244,16 +257,21 @@ 
         
         // Test for valid types
         
-        if (!(($sioc_type == 'post' && $INFO['exists']) || $sioc_type == 'user' || $sioc_type == 'container'))
-            $this->_exit("HTTP/1.0 404 Not Found");
+        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']) // not enough rights to see the wiki page
+        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
         
@@ -285,8 +303,9 @@ 
         }
     
         // export
-        if ($this->getConf('noindx')) 
-            header("X-Robots-Tag: noindex", true);
+        if ($this->getConf('noindx')) {
+                    header("X-Robots-Tag: noindex", true);
+        }
         $rdf->export();
         
         //print_r(headers_list()); die();
@@ -331,8 +350,7 @@ 
                 if (count($formatspec)==2)
                 {
                     $test_accept[$k] = trim($formatspec[1]);
-                }
-                else
+                } else
                 {
                     $test_accept[$k] = 'q=1.0';
                 }
@@ -367,18 +385,15 @@ 
             if ($userinfo)
             {
                 $type = 'user';
-            }
-            elseif (isset($_GET['do']) && $_GET['do'] == 'index')
+            } elseif (isset($_GET['do']) && $_GET['do'] == 'index')
             {
                 $type = 'container';
-            }
-            else
+            } else
             {
                 $type = 'post';
             }
             
-        }
-        else
+        } else
         {
             $type = $_GET['type'];
         }
@@ -422,10 +437,18 @@ 
                                             rawWiki($ID,$REV) // body (content)
                                             );
         /* encoded content   */ $wikipage->addContentEncoded(p_cached_output(wikiFN($ID,$REV),'xhtml'));
-        /* created           */ if (isset($INFO['meta']['date']['created'])) $wikipage->addCreated(date('c', $INFO['meta']['date']['created']));
-        /* or 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));
-        /* is creator        */ if (isset($INFO['meta']['date']['created'])) $wikipage->isCreator();
+        /* created           */ if (isset($INFO['meta']['date']['created'])) {
+          $wikipage->addCreated(date('c', $INFO['meta']['date']['created']));
+        }
+        /* or 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));
+        }
+        /* is creator        */ 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
@@ -433,8 +456,9 @@ 
         {
             $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;
+            foreach($INFO['meta']['contributor'] as $cont_id => $cont_name) {
+                            $cont_temp[$cont_ns.$cont_id] = $cont_name;
+            }
             $wikipage->addContributors($cont_temp);
         }
         
@@ -443,7 +467,9 @@ 
         {
             require_once(DOKU_INC.'inc/fulltext.php');
             $backlinks = ft_backlinks($ID);
-            if (count($backlinks) > 0) $wikipage->addBacklinks($backlinks);
+            if (count($backlinks) > 0) {
+              $wikipage->addBacklinks($backlinks);
+            }
         }
         
         // TODO: addLinksExtern
@@ -456,8 +482,7 @@ 
         {
             // latest revision, previous rev is on top in array
             $prevrev = 0;
-        }
-        else
+        } else
         {
             // other revision
             $currentrev = array_search($REV, $pagerevs);
@@ -467,15 +492,23 @@ 
                 $nextrev = $currentrev - 1;
             }
         }
-        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]))
-        /* next revision*/ $wikipage->addVersionNext($pagerevs[$nextrev]);
+        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])) {
+                /* next revision*/ $wikipage->addVersionNext($pagerevs[$nextrev]);
+        }
 
-        /* latest revision   */ if ($REV) $wikipage->addVersionLatest();
+        /* latest revision   */ if ($REV) {
+          $wikipage->addVersionLatest();
+        }
         // TODO: topics
-        /* has_container     */ if ($INFO['namespace']) $wikipage->addContainer($INFO['namespace']); 
-        /* has_space         */ if ($this->getConf('owners')) $wikipage->addSite($this->getConf('owners')); 
+        /* has_container     */ if ($INFO['namespace']) {
+          $wikipage->addContainer($INFO['namespace']);
+        }
+        /* has_space         */ if ($this->getConf('owners')) {
+          $wikipage->addSite($this->getConf('owners'));
+        }
         // TODO: dc:contributor / has_modifier
         // TODO: attachment (e.g. pictures in that dwns)
         
@@ -494,12 +527,10 @@ 
         if ($ID == $conf['start'])
         {
             $title = $conf['title'];
-        }
-        elseif (isset($INFO['meta']['title']))
+        } elseif (isset($INFO['meta']['title']))
         {
             $title = $INFO['meta']['title'];
-        }
-        else
+        } else
         {
             $title = $ID;
         }
@@ -517,9 +548,15 @@ 
                                                    normalizeUri($exporter->siocURL('container', $ID))
                                                   );
 
-        /* container is type=wiki */ if ($ID == $conf['start']) $wikicontainer->isWiki();
-        /* sioc:name              */ if ($INFO['exists']) $wikicontainer->addTitle($INFO['meta']['title']);
-        /* has_parent             */ if ($INFO['namespace']) $wikicontainer->addParent($INFO['namespace']); 
+        /* container is type=wiki */ if ($ID == $conf['start']) {
+          $wikicontainer->isWiki();
+        }
+        /* sioc:name              */ if ($INFO['exists']) {
+          $wikicontainer->addTitle($INFO['meta']['title']);
+        }
+        /* has_parent             */ if ($INFO['namespace']) {
+          $wikicontainer->addParent($INFO['namespace']);
+        }
 
         // search next level entries (posts, sub containers) in container
         require_once(DOKU_INC.'inc/search.php');
@@ -534,8 +571,7 @@ 
             {
                 // wikisite
                 $posts[] = $entry;
-            }
-            elseif($entry['type'] === 'd')
+            } elseif($entry['type'] === 'd')
             {
                 // sub container
                 $containers[] = $entry;
@@ -543,11 +579,16 @@ 
         }
         
         // without sub content it can't be a container (so it does not exist as a container)
-        if (count($posts) + count($containers) == 0)
-            $this->_exit("HTTP/1.0 404 Not Found");
+        if (count($posts) + count($containers) == 0) {
+                    $this->_exit("HTTP/1.0 404 Not Found");
+        }
         
-        if (count($posts)>0) $wikicontainer->addArticles($posts);
-        if (count($containers)>0) $wikicontainer->addContainers($containers);
+        if (count($posts)>0) {
+          $wikicontainer->addArticles($posts);
+        }
+        if (count($containers)>0) {
+          $wikicontainer->addContainers($containers);
+        }
 
         //print_r($containers);die();
         
@@ -565,8 +606,9 @@ 
         $userinfo = getDwUserInfo($ID,$this);
         
         // no userinfo means there is n user space or user does not exists
-        if ($userinfo === false)
-            $this->_exit("HTTP/1.0 404 Not Found");
+        if ($userinfo === false) {
+                    $this->_exit("HTTP/1.0 404 Not Found");
+        }
         
         $exporter->setParameters('Account: '.$userinfo['name'],
                             getAbsUrl(),
@@ -603,7 +645,9 @@ 
     
     function _getDate($date, $date_alt=null)
     {
-        if (!$date) $date = $date_alt;
+        if (!$date) {
+          $date = $date_alt;
+        }
         return date('c',$date);
     }
     
@@ -613,7 +657,9 @@ 
 {
     function getAbsUrl($url=null)
     {
-        if ($url == null) $url = DOKU_BASE;
+        if ($url == null) {
+          $url = DOKU_BASE;
+        }
         return str_replace(DOKU_BASE, DOKU_URL, $url);
     }
 }
@@ -626,8 +672,7 @@ 
         if ($info = $auth->getUserData($user))
         {
             return $info['mail'];
-        }
-        else
+        } else
         {
             return false;
         }
@@ -640,7 +685,9 @@ 
     {
         global $auth, $conf;
         
-        if (!$pobj->getConf('userns')) return false;
+        if (!$pobj->getConf('userns')) {
+          return false;
+        }
         
         // get user id
         $userid = str_replace(cleanID($pobj->getConf('userns')).($conf['useslash']?'/':':'),'',$id);
@@ -650,13 +697,11 @@ 
             if ($key)
             {
                 return $info['key'];
-            }
-            else
+            } else
             {
                 return $info;
             }
-        }
-        else
+        } else
         {
             return false;
         }
@@ -678,7 +723,9 @@ 
             
             // test separator
             $sep = '&';
-            if (strpos($query, '&') !== false) $sep = '&';
+            if (strpos($query, '&') !== false) {
+              $sep = '&';
+            }
             $attr = explode($sep, $query);
             
             sort($attr);

syntax.php

Braces +6 added lines, -2 removed lines

@@ -6,9 +6,13 @@
  */
  
 // must be run within DokuWiki
-if(!defined('DOKU_INC')) die();
+if(!defined('DOKU_INC')) {
+  die();
+}
  
-if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+if(!defined('DOKU_PLUGIN')) {
+  define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+}
 require_once(DOKU_PLUGIN.'syntax.php');
  
 /**

lib/sioc_dokuwiki.php

Braces +19 added lines, -7 removed lines

@@ -47,7 +47,10 @@ 
     function addCreator($creator) { $this->_creator = $creator; }
     function addContributors($contributors) { $this->_contributors = $contributors; }
     function isCreator() { $this->_is_creator = true; }
-    function addLinks($links) { if (is_array($links) && count($links)>0) $this->_links = $links; }
+    function addLinks($links) { if (is_array($links) && count($links)>0) {
+      $this->_links = $links;
+    }
+    }
     function addBacklinks($links) { $this->_backlinks = $links; }
     //function addLinksExtern($links) { if (is_array($links) && count($links)>0) $this->_ext_links = $links; }
     function addVersionPrevious($rev) { $this->_previous_version = $rev; }
@@ -74,8 +77,9 @@ 
         {
             foreach($this->_contributors as $cont_id => $cont_name)
             {
-                if(!isset($this->_creator['sioc:modifier']) || ($this->_creator['sioc:modifier'] != $cont_id))
-                    $rdf .= "\t<sioc:has_modifier rdf:resource=\"".normalizeUri($exp->siocURL('user', $cont_id))."\" rdfs:label=\"".clean($cont_name)."\"/>\n";
+                if(!isset($this->_creator['sioc:modifier']) || ($this->_creator['sioc:modifier'] != $cont_id)) {
+                                    $rdf .= "\t<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']]))
@@ -90,8 +94,12 @@ 
             //     $rdf .= "\t<foaf:maker rdf:resource=\"".clean($this->_creator['foaf:maker'])."\"/>\n";
             if ($this->_creator['sioc:modifier'])
             {
-                if ($this->_is_creator === false) $rdf .= "\t<sioc:has_modifier rdf:resource=\"".normalizeUri($exp->siocURL('user', $this->_creator['sioc:modifier']))."\" $creator_name/>\n";
-                if ($this->_is_creator === true) $rdf .= "\t<sioc:has_creator rdf:resource=\"".normalizeUri($exp->siocURL('user', $this->_creator['sioc:modifier']))."\" $creator_name/>\n";
+                if ($this->_is_creator === false) {
+                  $rdf .= "\t<sioc:has_modifier rdf:resource=\"".normalizeUri($exp->siocURL('user', $this->_creator['sioc:modifier']))."\" $creator_name/>\n";
+                }
+                if ($this->_is_creator === true) {
+                  $rdf .= "\t<sioc:has_creator rdf:resource=\"".normalizeUri($exp->siocURL('user', $this->_creator['sioc:modifier']))."\" $creator_name/>\n";
+                }
             }
         }
         
@@ -270,7 +278,9 @@ 
 
     function getContent( &$exp ) {
         $rdf = "<sioc:UserAccount rdf:about=\"" . clean($this->_url, true) ."\">\n";
-        if($this->_nick) $rdf .= "\t<sioc:name>" . clean($this->_nick) . "</sioc:name>\n";
+        if($this->_nick) {
+          $rdf .= "\t<sioc:name>" . clean($this->_nick) . "</sioc:name>\n";
+        }
         if($this->_email) {
             if ($exp->_export_email) { $rdf .= "\t<sioc:email rdf:resource=\"" . $this->_email ."\"/>\n"; }
             $rdf .= "\t<sioc:email_sha1>" . $this->_sha1 . "</sioc:email_sha1>\n";
@@ -284,7 +294,9 @@ 
         }
         $rdf .= "\t<sioc:account_of>\n";
         $rdf .= "\t\t<foaf:Person>\n";
-        if($this->_name) $rdf .= "\t\t\t<foaf:name>". clean($this->_name) . "</foaf:name>\n";
+        if($this->_name) {
+          $rdf .= "\t\t\t<foaf:name>". clean($this->_name) . "</foaf:name>\n";
+        }
         if($this->_email) { $rdf .= "\t\t\t<foaf:mbox_sha1sum>" . $this->_sha1 . "</foaf:mbox_sha1sum>\n"; }
         if($this->_foaf_url) { $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"". $this->_foaf_url ."\"/>\n"; }
         $rdf .= "\t\t</foaf:Person>\n";  

lib/sioc_inc.php

Braces +111 added lines, -46 removed lines

@@ -100,10 +100,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 {
@@ -145,10 +146,14 @@ 
 	<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; 
+        if ($rdf_content) {
+          $rdf .= $rdf_content;
+        }
         if (sizeof($this->_objects)) {
             foreach($this->_objects as $object) {
-                if($object) $rdf .= $object->getContent( $this );
+                if($object) {
+                  $rdf .= $object->getContent( $this );
+                }
             }
         }
         $rdf .= "\n</rdf:RDF>";
@@ -328,12 +333,16 @@ 
 
     function getContent( &$exp ) {
         $rdf = "<foaf:Person rdf:about=\"" . clean($this->_foaf_uri) . "\">\n";
-        if($this->_name) $rdf .= "\t<foaf:name>". $this->_name . "</foaf:name>\n";
+        if($this->_name) {
+          $rdf .= "\t<foaf:name>". $this->_name . "</foaf:name>\n";
+        }
         if($this->_email) { $rdf .= "\t<foaf:mbox_sha1sum>" . $this->_sha1 . "</foaf:mbox_sha1sum>\n"; }
         if($this->_foaf_url) { $rdf .= "\t<rdfs:seeAlso rdf:resource=\"". $this->_foaf_url ."\"/>\n"; }
         $rdf .= "\t<foaf:holdsAccount>\n";
         $rdf .= "\t\t<sioc:UserAccount rdf:about=\"" . clean($this->_uri) ."\">\n";
-        if($this->_nick) $rdf .= "\t\t\t<sioc:name>" . $this->_nick . "</sioc:name>\n";
+        if($this->_nick) {
+          $rdf .= "\t\t\t<sioc:name>" . $this->_nick . "</sioc:name>\n";
+        }
         if($this->_email) {
             if ($exp->_export_email) { $rdf .= "\t\t\t<sioc:email rdf:resource=\"" . $this->_email ."\"/>\n"; }
             $rdf .= "\t\t\t<sioc:email_sha1>" . $this->_sha1 . "</sioc:email_sha1>\n";
@@ -409,8 +418,12 @@ 
     function getContent( &$exp) {
         $rdf .= '<sioc:Thread rdf:about="' . clean($this->_url) . "\">\n";
         $rdf .= "\t<sioc:link rdf:resource=\"" . clean($this->_url) . "\"/>\n";
-        if ($this->_views)  $rdf .= "\t<sioc:num_views>" . $this->_views . "</sioc:num_views>\n";
-        if ($this->_note)   $rdf .= "\t<rdfs:comment>" . $this->_note . "</rdfs:comment>\n";
+        if ($this->_views) {
+          $rdf .= "\t<sioc:num_views>" . $this->_views . "</sioc:num_views>\n";
+        }
+        if ($this->_note) {
+          $rdf .= "\t<rdfs:comment>" . $this->_note . "</rdfs:comment>\n";
+        }
 		if ($this->_subject) { $rdf .= "\t<dc:title>" . $this->_subject . "</dc:title>\n"; }
         if ($this->_created) { $rdf .= "\t<dcterms:created>" . $this->_created . "</dcterms:created>\n"; }
         if ($this->_parents) {
@@ -536,11 +549,19 @@ 
 
     function getContent( &$exp) {
         $rdf .= '<'.$this->_type. ' rdf:about="' . clean($this->_url) . "\">\n";
-		if ($this->_type != 'sioc:Forum') $rdf .= "\t<rdf:type rdf:resource=\"http://rdfs.org/sioc/ns#Forum\" />\n";
+		if ($this->_type != 'sioc:Forum') {
+		  $rdf .= "\t<rdf:type rdf:resource=\"http://rdfs.org/sioc/ns#Forum\" />\n";
+		}
         $rdf .= "\t<sioc:link rdf:resource=\"" . clean($this->_url) . "\"/>\n";
-        if ($this->_blog_title)  $rdf .= "\t<dc:title>" . $this->_blog_title . "</dc:title>\n";
-        if ($this->_description) $rdf .= "\t<dc:description>" . $this->_description . "</dc:description>\n";
-        if ($this->_note)        $rdf .= "\t<rdfs:comment>" . $this->_note . "</rdfs:comment>\n";
+        if ($this->_blog_title) {
+          $rdf .= "\t<dc:title>" . $this->_blog_title . "</dc:title>\n";
+        }
+        if ($this->_description) {
+          $rdf .= "\t<dc:description>" . $this->_description . "</dc:description>\n";
+        }
+        if ($this->_note) {
+          $rdf .= "\t<rdfs:comment>" . $this->_note . "</rdfs:comment>\n";
+        }
 		
 		if ($this->_parents) {
 			foreach($this->_parents as $id => $uri) {
@@ -576,23 +597,32 @@ 
             if ($this->_creator->_id) {
                 $rdf .= "\t<sioc:has_creator>\n";
                 $rdf .= "\t\t<sioc:UserAccount rdf:about=\"" . clean($this->_creator->_uri) ."\">\n";
-                if($this->_creator->_sioc_url) { $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"". $this->_creator->_sioc_url ."\"/>\n"; }
-                else $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('user', $this->_creator->_id). "\"/>\n";
+                if($this->_creator->_sioc_url) { $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"". $this->_creator->_sioc_url ."\"/>\n"; } else {
+                  $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('user', $this->_creator->_id). "\"/>\n";
+                }
                 $rdf .= "\t\t</sioc:UserAccount>\n";
                 $rdf .= "\t</sioc:has_creator>\n";
                 $rdf .= "\t<foaf:maker>\n";
                 $rdf .= "\t\t<foaf:Person rdf:about=\"" . clean($this->_creator->_foaf_uri) ."\">\n";
-                if($this->_creator->_foaf_url) { $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"". $this->_creator->_foaf_url ."\"/>\n"; }
-                else $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('user', $this->_creator->_id). "\"/>\n";
+                if($this->_creator->_foaf_url) { $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"". $this->_creator->_foaf_url ."\"/>\n"; } else {
+                  $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('user', $this->_creator->_id). "\"/>\n";
+                }
                 $rdf .= "\t\t</foaf:Person>\n";
                 $rdf .= "\t</foaf:maker>\n";
             } else {
                 $rdf .= "\t<foaf:maker>\n";
                 $rdf .= "\t\t<foaf:Person";
-                if($this->_creator->_name) $rdf .= " foaf:name=\"" . $this->_creator->_name ."\"";
-                if($this->_creator->_sha1) $rdf .= " foaf:mbox_sha1sum=\"" . $this->_creator->_sha1 ."\"";
-                if($this->_creator->_name) $rdf .= ">\n\t\t\t<foaf:homepage rdf:resource=\"" . $this->_creator->_homepage ."\"/>\n\t\t</foaf:Person>\n";
-                else $rdf .= "/>\n";
+                if($this->_creator->_name) {
+                  $rdf .= " foaf:name=\"" . $this->_creator->_name ."\"";
+                }
+                if($this->_creator->_sha1) {
+                  $rdf .= " foaf:mbox_sha1sum=\"" . $this->_creator->_sha1 ."\"";
+                }
+                if($this->_creator->_name) {
+                  $rdf .= ">\n\t\t\t<foaf:homepage rdf:resource=\"" . $this->_creator->_homepage ."\"/>\n\t\t</foaf:Person>\n";
+                } else {
+                  $rdf .= "/>\n";
+                }
                 $rdf .= "\t</foaf:maker>\n";
             }
         }
@@ -601,8 +631,9 @@ 
             if ($this->_administrator->_id) {
                 $rdf .= "\t<sioc:has_administrator>\n";
                 $rdf .= "\t\t<sioc:UserAccount rdf:about=\"" . clean($this->_administrator->_uri) ."\">\n";
-                if($this->_administrator->_sioc_url) { $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"". $this->_administrator->_sioc_url ."\"/>\n"; }
-                else $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('user', $this->_administrator->_id). "\"/>\n";
+                if($this->_administrator->_sioc_url) { $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"". $this->_administrator->_sioc_url ."\"/>\n"; } else {
+                  $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('user', $this->_administrator->_id). "\"/>\n";
+                }
                 $rdf .= "\t\t</sioc:UserAccount>\n";
                 $rdf .= "\t</sioc:has_administrator>\n";
             } 
@@ -671,34 +702,47 @@ 
 
     function getContent( &$exp ) {
         $rdf = '<'.$this->_type." rdf:about=\"" . clean($this->_url) . "\">\n";
-        if ($this->_type != 'sioc:Post') $rdf .= "\t<rdf:type rdf:resource=\"http://rdfs.org/sioc/ns#Post\" />\n";
+        if ($this->_type != 'sioc:Post') {
+          $rdf .= "\t<rdf:type rdf:resource=\"http://rdfs.org/sioc/ns#Post\" />\n";
+        }
         if ($this->_subject) { $rdf .= "\t<dc:title>" . $this->_subject . "</dc:title>\n"; }
         if ($this->_creator) {
             if ($this->_creator->_id) {
                 $rdf .= "\t<sioc:has_creator>\n";
                 $rdf .= "\t\t<sioc:UserAccount rdf:about=\"" . clean($this->_creator->_uri) ."\">\n";
-                if($this->_creator->_sioc_url) { $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"". $this->_creator->_sioc_url ."\"/>\n"; }
-                else $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('user', $this->_creator->_id). "\"/>\n";
+                if($this->_creator->_sioc_url) { $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"". $this->_creator->_sioc_url ."\"/>\n"; } else {
+                  $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('user', $this->_creator->_id). "\"/>\n";
+                }
                 $rdf .= "\t\t</sioc:UserAccount>\n";
                 $rdf .= "\t</sioc:has_creator>\n";
                 $rdf .= "\t<foaf:maker>\n";
                 $rdf .= "\t\t<foaf:Person rdf:about=\"" . clean($this->_creator->_foaf_uri) ."\">\n";
-                if($this->_creator->_foaf_url) { $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"". $this->_creator->_foaf_url ."\"/>\n"; }
-                else $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('user', $this->_creator->_id). "\"/>\n";
+                if($this->_creator->_foaf_url) { $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"". $this->_creator->_foaf_url ."\"/>\n"; } else {
+                  $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('user', $this->_creator->_id). "\"/>\n";
+                }
                 $rdf .= "\t\t</foaf:Person>\n";
                 $rdf .= "\t</foaf:maker>\n";
             } else {
                 $rdf .= "\t<foaf:maker>\n";
                 $rdf .= "\t\t<foaf:Person";
-                if($this->_creator->_name) $rdf .= " foaf:name=\"" . $this->_creator->_name ."\"";
-                if($this->_creator->_sha1) $rdf .= " foaf:mbox_sha1sum=\"" . $this->_creator->_sha1 ."\"";
-                if($this->_creator->_name) $rdf .= ">\n\t\t\t<foaf:homepage rdf:resource=\"" . $this->_creator->_homepage ."\"/>\n\t\t</foaf:Person>\n";
-                else $rdf .= "/>\n";
+                if($this->_creator->_name) {
+                  $rdf .= " foaf:name=\"" . $this->_creator->_name ."\"";
+                }
+                if($this->_creator->_sha1) {
+                  $rdf .= " foaf:mbox_sha1sum=\"" . $this->_creator->_sha1 ."\"";
+                }
+                if($this->_creator->_name) {
+                  $rdf .= ">\n\t\t\t<foaf:homepage rdf:resource=\"" . $this->_creator->_homepage ."\"/>\n\t\t</foaf:Person>\n";
+                } else {
+                  $rdf .= "/>\n";
+                }
                 $rdf .= "\t</foaf:maker>\n";
             }
         }
         $rdf .= "\t<dcterms:created>" . $this->_created . "</dcterms:created>\n";
-        if ($this->_updated AND ($this->_created != $this->_updated) ) $rdf .= "\t<dcterms:modified>" . $this->_updated . "</dcterms:modified>\n";
+        if ($this->_updated AND ($this->_created != $this->_updated) ) {
+          $rdf .= "\t<dcterms:modified>" . $this->_updated . "</dcterms:modified>\n";
+        }
         $rdf .= "\t<sioc:content>" . pureContent($this->_content) . "</sioc:content>\n";
 			
         $rdf .= "\t<content:encoded><![CDATA[" . $this->_encoded . "]]></content:encoded>\n";
@@ -792,8 +836,9 @@ 
         if ($this->_subject)
         {
             $rdf .= "\t<dc:title>" . clean($this->_subject) . "</dc:title>\n";
-            if(strcmp($this->_has_container, 'http://en.wikipedia.org')===0)
-                $rdf .= "\t<foaf:primaryTopic rdf:resource=\"".clean('http://dbpedia.org/resource/'.$this->_subject)."\"/>\n";
+            if(strcmp($this->_has_container, 'http://en.wikipedia.org')===0) {
+                            $rdf .= "\t<foaf:primaryTopic rdf:resource=\"".clean('http://dbpedia.org/resource/'.$this->_subject)."\"/>\n";
+            }
         }
         if ($this->_creator->_nick) {
             /*if ($this->_creator->_id) {
@@ -814,7 +859,9 @@ 
                 $rdf .= "\t\t<sioc:UserAccount rdf:about=\"" . clean($this->_creator->_uri) ."\">\n";
                 $rdf .= "\t\t\t<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);
+                if ($this->_api) {
+                  $rdf .= clean("&api=" . $this->_api);
+                }
                 $rdf .= "\"/>\n";
                 $rdf .= "\t\t</sioc:UserAccount>\n";
                 $rdf .= "\t</sioc:has_creator>\n";
@@ -845,7 +892,9 @@ 
                 $rdf .= "\t\t<sioct:Category rdf:about=\"" . clean($url) ."\">\n";
                 $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" .
                         clean('http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki='.$url);
-                if ($this->_api) $rdf .= clean("&api=" . $this->_api);
+                if ($this->_api) {
+                  $rdf .= clean("&api=" . $this->_api);
+                }
                 $rdf .= "\"/>\n";
                 $rdf .= "\t\t</sioct:Category>\n";
                 $rdf .= "\t</sioc:topic>\n";
@@ -857,7 +906,9 @@ 
                 $rdf .= "\t\t<sioct:WikiArticle rdf:about=\"" . clean($url) ."\">\n";
                 $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" .
                         clean('http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki='.$url);
-                if ($this->_api) $rdf .= clean("&api=" . $this->_api);
+                if ($this->_api) {
+                  $rdf .= clean("&api=" . $this->_api);
+                }
                 $rdf .= "\"/>\n";
                 $rdf .= "\t\t</sioct:WikiArticle>\n";
                 $rdf .= "\t</sioc:links_to>\n";
@@ -869,7 +920,9 @@ 
                 $rdf .= "\t\t<sioct:WikiArticle rdf:about=\"" . clean($this->_links) ."\">\n";
                 $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" .
                         clean('http://ws.sioc-project.org/mediawiki/mediawiki.php?wiki='.$this->_links);
-                if ($this->_api) $rdf .= clean("&api=" . $this->_api);
+                if ($this->_api) {
+                  $rdf .= clean("&api=" . $this->_api);
+                }
                 $rdf .= "\"/>\n";
                 $rdf .= "\t\t</sioct:WikiArticle>\n";
                 $rdf .= "\t</sioc:links_to>\n";
@@ -885,7 +938,9 @@ 
                 $rdf .= "\t\t<sioct:WikiArticle rdf:about=\"" . clean($this->_previous_version) ."\">\n";
                 $rdf .= "\t\t\t<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);
+                if ($this->_api) {
+                  $rdf .= clean("&api=" . $this->_api);
+                }
                 $rdf .= "\"/>\n";
                 $rdf .= "\t\t</sioct:WikiArticle>\n";
                 $rdf .= "\t</sioc:previous_version>\n";
@@ -905,7 +960,9 @@ 
                 $rdf .= "\t\t<sioct:WikiArticle rdf:about=\"" . clean($this->_next_version) ."\">\n";
                 $rdf .= "\t\t\t<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);
+                if ($this->_api) {
+                  $rdf .= clean("&api=" . $this->_api);
+                }
                 $rdf .= "\"/>\n";
                 $rdf .= "\t\t</sioct:WikiArticle>\n";
                 $rdf .= "\t</sioc:next_version>\n";
@@ -925,7 +982,9 @@ 
                 $rdf .= "\t\t<sioct:WikiArticle rdf:about=\"" . clean($this->_latest_version) ."\">\n";
                 $rdf .= "\t\t\t<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);
+                if ($this->_api) {
+                  $rdf .= clean("&api=" . $this->_api);
+                }
                 $rdf .= "\"/>\n";
                 $rdf .= "\t\t</sioct:WikiArticle>\n";
                 $rdf .= "\t</sioc:latest_version>\n";
@@ -935,7 +994,9 @@ 
                 $rdf .= "\t\t<sioct:WikiArticle rdf:about=\"" . clean($this->_has_discussion) ."\">\n";
                 $rdf .= "\t\t\t<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);
+                if ($this->_api) {
+                  $rdf .= clean("&api=" . $this->_api);
+                }
                 $rdf .= "\"/>\n";
                 $rdf .= "\t\t</sioct:WikiArticle>\n";
                 $rdf .= "\t</sioc:has_discussion>\n";
@@ -950,7 +1011,9 @@ 
             $rdf .= "\t<owl:sameAs rdf:resource=\"" . clean($this->_redirpage) ."\"/>\n";
             $rdf .= "\t<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->_api) {
+              $rdf .= clean("&api=" . $this->_api);
+            }
             $rdf .= "\"/>\n";
         }
 
@@ -1013,7 +1076,9 @@ 
 #    return htmlentities2( $text );
     // double encoding is preventable now
     // $text = htmlspecialchars_decode($text, ENT_COMPAT);
-    if ($url) $text = str_replace('&amp;','&', $text);
+    if ($url) {
+      $text = str_replace('&amp;','&', $text);
+    }
     return htmlspecialchars($text, ENT_COMPAT, 'UTF-8');
   }
 }