mprins / dokuwiki-plugin-dokusioc

lib/sioc_dokuwiki.php

Indentation +1 added lines, -1 removed lines

@@ -266,7 +266,7 @@
                 $this->_sha1 = sha1("mailto:".$email);
             }
         }
-     }
+      }
 
     function getContent( &$exp ) {
         $rdf = "<sioc:UserAccount rdf:about=\"" . clean($this->_url, true) ."\">\n";

Spacing +45 added lines, -45 removed lines

@@ -47,7 +47,7 @@ 
     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; }
@@ -58,12 +58,12 @@ 
     function addSite($url) { $this->_has_space = $url; }
     
 
-    function getContent( &$exp )
+    function getContent(&$exp)
     {
-        $rdf = '<'.$this->_type." rdf:about=\"" . clean($this->_url, true) . "\">\n";
+        $rdf = '<'.$this->_type." rdf:about=\"".clean($this->_url, true)."\">\n";
         if ($this->_subject)
         {
-            $rdf .= "\t<dc:title>" . clean($this->_subject) . "</dc:title>\n";
+            $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";
         }
@@ -72,9 +72,9 @@ 
 
         if (count($this->_contributors) > 0)
         {
-            foreach($this->_contributors as $cont_id => $cont_name)
+            foreach ($this->_contributors as $cont_id => $cont_name)
             {
-                if(!isset($this->_creator['sioc:modifier']) || ($this->_creator['sioc:modifier'] != $cont_id))
+                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";
             }
             
@@ -97,12 +97,12 @@ 
         
         if ($this->_created)
         {
-            $rdf .= "\t<dcterms:created>" . $this->_created . "</dcterms:created>\n";
+            $rdf .= "\t<dcterms:created>".$this->_created."</dcterms:created>\n";
         }
         
         if ($this->_modified)
         {
-            $rdf .= "\t<dcterms:modified>" . $this->_modified . "</dcterms:modified>\n";
+            $rdf .= "\t<dcterms:modified>".$this->_modified."</dcterms:modified>\n";
         }
         
         if ($this->_has_space)
@@ -111,7 +111,7 @@ 
             // TODO: rdfs:label
         }
         
-        if($this->_has_container)
+        if ($this->_has_container)
         {
             $rdf .= "\t<sioc:has_container rdf:resource=\"".normalizeUri($exp->siocURL('container', $this->_has_container))."\" />\n";
             // TODO: rdfs:label
@@ -119,12 +119,12 @@ 
         
         if ($this->_content)
         {
-            $rdf .= "\t<sioc:content><![CDATA[" . pureContent($this->_content) . "]]></sioc:content>\n";
+            $rdf .= "\t<sioc:content><![CDATA[".pureContent($this->_content)."]]></sioc:content>\n";
         }
 
         if ($this->_content_encoded)
         {
-            $rdf .= "\t<content:encoded><![CDATA[" . $this->_content_encoded . "]]></content:encoded>\n";
+            $rdf .= "\t<content:encoded><![CDATA[".$this->_content_encoded."]]></content:encoded>\n";
         }
 
         /*
@@ -142,25 +142,25 @@ 
         }
         */
         
-        if (is_array($this->_links) && count($this->_links)>0)
+        if (is_array($this->_links) && count($this->_links) > 0)
         {
-            foreach($this->_links as $link_id => $link_exists)
+            foreach ($this->_links as $link_id => $link_exists)
             {
                 if ($link_exists && !isHiddenPage($link_id))
                 {
-                    $rdf .= "\t<sioc:links_to rdf:resource=\"". normalizeUri($exp->siocURL('post', $link_id)) ."\"/>\n";
+                    $rdf .= "\t<sioc:links_to rdf:resource=\"".normalizeUri($exp->siocURL('post', $link_id))."\"/>\n";
                     // TODO: rdfs:label
                 }
             }
         }
         
-        if (count($this->_backlinks)>0)
+        if (count($this->_backlinks) > 0)
         {
-            foreach($this->_backlinks as $link_id)
+            foreach ($this->_backlinks as $link_id)
             {
                 if (!isHiddenPage($link_id))
                 {
-                    $rdf .= "\t<dcterms:isReferencedBy rdf:resource=\"". normalizeUri($exp->siocURL('post', $link_id)) ."\"/>\n";
+                    $rdf .= "\t<dcterms:isReferencedBy rdf:resource=\"".normalizeUri($exp->siocURL('post', $link_id))."\"/>\n";
                     // TODO: rdfs:label
                 }
             }
@@ -174,27 +174,27 @@ 
         }
         */
         
-        if($this->_previous_version) {
-                $rdf .= "\t<sioc:previous_version rdf:resource=\"". normalizeUri($exp->siocURL('post', $this->_id.$exp->_urlseparator.'rev'.$exp->_urlequal.$this->_previous_version)) ."\"/>\n";
+        if ($this->_previous_version) {
+                $rdf .= "\t<sioc:previous_version rdf:resource=\"".normalizeUri($exp->siocURL('post', $this->_id.$exp->_urlseparator.'rev'.$exp->_urlequal.$this->_previous_version))."\"/>\n";
                 // TODO: rdfs:label
 
                 /* If there is support for inference and transitivity the following is not needed */
-                $rdf .= "\t<sioc:earlier_version rdf:resource=\"". normalizeUri($exp->siocURL('post', $this->_id.$exp->_urlseparator.'rev'.$exp->_urlequal.$this->_previous_version)) ."\"/>\n";
+                $rdf .= "\t<sioc:earlier_version rdf:resource=\"".normalizeUri($exp->siocURL('post', $this->_id.$exp->_urlseparator.'rev'.$exp->_urlequal.$this->_previous_version))."\"/>\n";
                 // TODO: rdfs:label
 
         }
 
-        if($this->_next_version) {
-                $rdf .= "\t<sioc:next_version rdf:resource=\"". normalizeUri($exp->siocURL('post', $this->_id.$exp->_urlseparator.'rev'.$exp->_urlequal.$this->_next_version)) ."\"/>\n";
+        if ($this->_next_version) {
+                $rdf .= "\t<sioc:next_version rdf:resource=\"".normalizeUri($exp->siocURL('post', $this->_id.$exp->_urlseparator.'rev'.$exp->_urlequal.$this->_next_version))."\"/>\n";
                 // TODO: rdfs:label
                 
                 /* If there is support for inference and transitivity the following is not needed */
-                $rdf .= "\t<sioc:later_version rdf:resource=\"". normalizeUri($exp->siocURL('post', $this->_id.$exp->_urlseparator.'rev'.$exp->_urlequal.$this->_next_version)) ."\"/>\n";
+                $rdf .= "\t<sioc:later_version rdf:resource=\"".normalizeUri($exp->siocURL('post', $this->_id.$exp->_urlseparator.'rev'.$exp->_urlequal.$this->_next_version))."\"/>\n";
                 // TODO: rdfs:label
         }
 
-        if($this->_latest_version) {
-                $rdf .= "\t<sioc:latest_version rdf:resource=\"". normalizeUri($exp->siocURL('post', $this->_id)) ."\"/>\n";
+        if ($this->_latest_version) {
+                $rdf .= "\t<sioc:latest_version rdf:resource=\"".normalizeUri($exp->siocURL('post', $this->_id))."\"/>\n";
                 // TODO: rdfs:label
         }
 
@@ -222,7 +222,7 @@ 
         }
         */
 
-        $rdf .=  "</".$this->_type.">\n";
+        $rdf .= "</".$this->_type.">\n";
         return $rdf;
     }
 }
@@ -268,25 +268,25 @@ 
         }
      }
 
-    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->_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";
+    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->_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";
         }
-        if($this->_role) {
+        if ($this->_role) {
             $rdf .= "\t<sioc:has_function>\n";
             $rdf .= "\t\t<sioc:Role>\n";
-            $rdf .= "\t\t\t<sioc:name>" . $this->_role . "</sioc:name>\n";
+            $rdf .= "\t\t\t<sioc:name>".$this->_role."</sioc:name>\n";
             $rdf .= "\t\t</sioc:Role>\n";
             $rdf .= "\t</sioc:has_function>\n";
         }
         $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->_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"; }
+        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";  
         $rdf .= "\t</sioc:account_of>\n";
         //if($this->_sioc_url) { $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"". $this->_sioc_url ."\"/>\n"; }
@@ -313,7 +313,7 @@ 
     var $_has_parent = null;
     var $_title = null;
 
-    function SIOCDokuWikiContainer ($id, $url)
+    function SIOCDokuWikiContainer($id, $url)
     {
         $this->_id = $id;
         $this->_url = $url;
@@ -325,30 +325,30 @@ 
     function addTitle($title) { $this->_title = $title; }
     function addParent($id) { $this->_has_parent = $id; }
 
-    function getContent( &$exp ) {
-        $rdf = '<'.$this->_type." rdf:about=\"" . normalizeUri(clean($this->_url, true)) . "\" >\n";
+    function getContent(&$exp) {
+        $rdf = '<'.$this->_type." rdf:about=\"".normalizeUri(clean($this->_url, true))."\" >\n";
         
         if ($this->_title)
         {
             $rdf .= "\t<sioc:name>".clean($this->_title)."</sioc:name>\n";
         }
 
-        if($this->_has_parent)
+        if ($this->_has_parent)
         {
             $rdf .= "\t<sioc:has_parent rdf:resource=\"".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 .= "\t<sioc:container_of rdf:resource=\"".normalizeUri($exp->siocURL('post',$article['id']))."\"/>\n";
+            $rdf .= "\t<sioc:container_of rdf:resource=\"".normalizeUri($exp->siocURL('post', $article['id']))."\"/>\n";
             // TODO: inluding title/name
         }
         
-        foreach($this->_subcontainers as $container)
+        foreach ($this->_subcontainers as $container)
         {
-            $rdf .= "\t<sioc:parent_of rdf:resource=\"".normalizeUri($exp->siocURL('container',$container['id']))."\"/>\n";
+            $rdf .= "\t<sioc:parent_of rdf:resource=\"".normalizeUri($exp->siocURL('container', $container['id']))."\"/>\n";
             // TODO: inluding title/name
         }
 

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

Indentation +105 added lines, -105 removed lines

@@ -78,7 +78,7 @@ 
         $this->_sioc_url = $sioc_url;
         $this->_encoding = $encoding;
         $this->_generator = $generator;
-	$this->_export_email = $export_email;
+  $this->_export_email = $export_email;
     }
 	
     // Assigns some objects to the exporter
@@ -86,8 +86,8 @@ 
         $this->_objects[] = &$obj;
     }
 
-	// TS: Used to replace _url4id in the siocURL for a given type (site, forum, etc.) with a parameter ($name) of your choice 
-	// E.g. b2evo exporter uses "blog=" instead of "sioc_id=" in the siocURL of a forum
+  // TS: Used to replace _url4id in the siocURL for a given type (site, forum, etc.) with a parameter ($name) of your choice 
+  // E.g. b2evo exporter uses "blog=" instead of "sioc_id=" in the siocURL of a forum
     function setURLTypeParm($type, $name) {
         $this->_type_table[$type] = $name;
     } 
@@ -96,27 +96,27 @@ 
         $this->_ignore_suffix[$type] = 1;
     }
 
-	function siocURL($type, $id, $page=""){
-		$type_part = $this->_url4type .$this->_urlequal .  $type ;
+  function siocURL($type, $id, $page=""){
+    $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 ($id) {
+      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 {
-			$id_part = '';
-		}
+      $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 = '';
+    ($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 ;
-		return clean($siocURL, true);
-	}
+    $siocURL = $this->_sioc_url . $type_part . $id_part . $page_part . $suffix ;
+    return clean($siocURL, true);
+  }
 	
     function export( $rdf_content='' ) {
         header('Content-Type: application/rdf+xml; charset='.$this->_encoding, true, 200);
@@ -204,10 +204,10 @@ 
         $this->_description = $description;
         $this->_forums = array();
         $this->_users = array();
-	$this->_page = $page;
-	$this->_next_users = false;
-       	$this->_next_forums = false;
-       	$this->_usergroup_uri = $usergroup_uri;
+  $this->_page = $page;
+  $this->_next_users = false;
+          $this->_next_forums = false;
+          $this->_usergroup_uri = $usergroup_uri;
     }
     
     function addForum($id, $url) {
@@ -218,7 +218,7 @@ 
         $this->_users[$id] = $url;
     } 
 	
-	function setNextPageUsers($next) {
+  function setNextPageUsers($next) {
         $this->_next_users = $next;
     }
 	
@@ -236,14 +236,14 @@ 
                 $rdf .= "\t<sioc:host_of rdf:resource=\"" . clean($url) . "\"/>\n";
             }
         }  
-		if($this->_next_forums) {
+    if($this->_next_forums) {
             $rdf .= "\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('site', "", $this->_page+1) ."\"/>\n";
         }	
-		if($this->_usergroup_uri) {
-			$rdf .= "\t<sioc:has_Usergroup rdf:resource=\"" . $this->_usergroup_uri . "\"/>\n";
-		} else {
-			$rdf .= "\t<sioc:has_Usergroup rdf:nodeID=\"" . AUTHORS_NODE . "\"/>\n";
-		}
+    if($this->_usergroup_uri) {
+      $rdf .= "\t<sioc:has_Usergroup rdf:resource=\"" . $this->_usergroup_uri . "\"/>\n";
+    } else {
+      $rdf .= "\t<sioc:has_Usergroup rdf:nodeID=\"" . AUTHORS_NODE . "\"/>\n";
+    }
         $rdf .= "</sioc:Site>\n";
         // Forums
         if($this->_forums) {
@@ -258,11 +258,11 @@ 
         // Usergroup
         if($this->_users) {
             $rdf .= "\n";
-			if($this->_usergroup_uri) {
-				$rdf .= '<sioc:UserAccountgroup rdf:about="' . $this->_usergroup_uri . "\">\n";
-			} else {
-				$rdf .= '<sioc:UserAccountgroup rdf:nodeID="' . AUTHORS_NODE . "\">\n";
-			}
+      if($this->_usergroup_uri) {
+        $rdf .= '<sioc:UserAccountgroup rdf:about="' . $this->_usergroup_uri . "\">\n";
+      } else {
+        $rdf .= '<sioc:UserAccountgroup rdf:nodeID="' . AUTHORS_NODE . "\">\n";
+      }
             $rdf .= "\t<sioc:name>Authors for \"" . clean($this->_name) . "\"</sioc:name>\n";
                 foreach ($this->_users as $id => $url) {
                     $rdf .= "\t<sioc:has_member>\n";
@@ -271,9 +271,9 @@ 
                     $rdf .= "\t\t</sioc:UserAccount>\n";
                     $rdf .= "\t</sioc:has_member>\n";
                 }
-			if($this->_next_users) {
+      if($this->_next_users) {
             $rdf .= "\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('site', "", $this->_page+1) ."\"/>\n";
-			}
+      }
             $rdf .= "</sioc:UserAccountgroup>\n";
         }
 		
@@ -393,7 +393,7 @@ 
         $this->_posts[$id] = array("url" => $url, "prev" => $prev, "next" => $next);
     }
 
-	// add links to things that are similar to this via sioc:related_to 
+  // add links to things that are similar to this via sioc:related_to 
     function addRelated($id, $url) {
         $this->_related[$id] = $url;
     }
@@ -402,7 +402,7 @@ 
         $this->_next = $next;
     }
 	
-	function addParentForum($id, $url) {
+  function addParentForum($id, $url) {
         $this->_parents[$id] = $url;
     }
 
@@ -411,51 +411,51 @@ 
         $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->_subject) { $rdf .= "\t<dc:title>" . $this->_subject . "</dc:title>\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) {
-			foreach($this->_parents as $id => $uri) {
-				$rdf .= "\t<sioc:has_parent>\n";
-				$rdf .= "\t\t<sioc:Forum rdf:about=\"" .clean($uri) ."\">\n";
-				$rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('forum', $id) . "\"/>\n";
-				$rdf .= "\t\t</sioc:Forum>\n";
-				$rdf .= "\t</sioc:has_parent>\n";
-			}
-		}
-		// here the tags are just used as keywords for dc:subject
+      foreach($this->_parents as $id => $uri) {
+        $rdf .= "\t<sioc:has_parent>\n";
+        $rdf .= "\t\t<sioc:Forum rdf:about=\"" .clean($uri) ."\">\n";
+        $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('forum', $id) . "\"/>\n";
+        $rdf .= "\t\t</sioc:Forum>\n";
+        $rdf .= "\t</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 .= "\t<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 use this insert prefixes for moat and tags
-		// if ($this->_tags) { 
-			// $i=1;
+    // here the tags are used by creating a tag object with a blank node, with the keyword as moat:name - if you use this insert prefixes for moat and tags
+    // if ($this->_tags) { 
+      // $i=1;
             // foreach ($this->_tags as $id => $tag) {
-				// $rdf .= "\t<tags:taggedWithTag>\n";
-				// $rdf .= "\t\t<moat:tag rdf:nodeID=\"b$i\">\n";
-				// // actually, the best way is to have 'reference URIs' for tags, e.g. URIs for all the platform (http://tags.example.org/tag/soccer
+        // $rdf .= "\t<tags:taggedWithTag>\n";
+        // $rdf .= "\t\t<moat:tag rdf:nodeID=\"b$i\">\n";
+        // // actually, the best way is to have 'reference URIs' for tags, e.g. URIs for all the platform (http://tags.example.org/tag/soccer
                 // $rdf .= "\t\t\t<moat:name>" . $tag . "</moat:name>\n";  
-				// $rdf .= "\t\t</moat:tag>\n";
-				// $rdf .= "\t</moat:taggedWithTag>\n";
-				// $i++;
+        // $rdf .= "\t\t</moat:tag>\n";
+        // $rdf .= "\t</moat:taggedWithTag>\n";
+        // $i++;
             // }
         // }
 		
-		// here the tags are used are used for sioc:topic, each topic needs to have a URI
-		/*if($this->_tags) {
+    // here the tags are used are used for sioc:topic, each topic needs to have a URI
+    /*if($this->_tags) {
             foreach($this->_tags as $url=>$topic) {
                 $rdf .= "\t<sioc:topic rdfs:label=\"$topic\" rdf:resource=\"" . clean($url) ."\"/>\n";
             }
         }
 		*/
-		if ($this->_related) { 
-			foreach ($this->_related as $id => $url) {
-					$rdf .= "\t<sioc:related_to>\n";
-					$rdf .= "\t\t<sioc:Thread rdf:about=\"" .clean($url) ."\"/>\n";
-					$rdf .= "\t</sioc:related_to>\n"; // todo - each topic needs to have a URI
-			}
-		}		
+    if ($this->_related) { 
+      foreach ($this->_related as $id => $url) {
+          $rdf .= "\t<sioc:related_to>\n";
+          $rdf .= "\t\t<sioc:Thread rdf:about=\"" .clean($url) ."\"/>\n";
+          $rdf .= "\t</sioc:related_to>\n"; // todo - each topic needs to have a URI
+      }
+    }		
 		
         if ($this->_posts) {
             foreach($this->_posts as $id => $data) {
@@ -510,23 +510,23 @@ 
         $this->_next = false;
         $this->_blog_title = $title;
         $this->_description = $descr;
-       	$this->_threads = array();
-       	$this->_parents = array();
-       	$this->_type = $type;
-       	$this->_creator = $creator;
-       	$this->_administrator = $admin;
-       	$this->_links = $links;
+          $this->_threads = array();
+          $this->_parents = array();
+          $this->_type = $type;
+          $this->_creator = $creator;
+          $this->_administrator = $admin;
+          $this->_links = $links;
     }
 	
     function addPost($id, $url) {
         $this->_posts[$id] = $url;
     }
 	
-	function addThread($id, $url) {
+  function addThread($id, $url) {
         $this->_threads[$id] = $url;
     }
 	
-	function addParentForum($id, $url) {
+  function addParentForum($id, $url) {
         $this->_parents[$id] = $url;
     }
 
@@ -536,31 +536,31 @@ 
 
     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->_parents) {
-			foreach($this->_parents as $id => $uri) {
-				$rdf .= "\t<sioc:has_parent>\n";
-				$rdf .= "\t\t<sioc:Forum rdf:about=\"" .clean($uri) ."\">\n";
-				$rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('forum', $id) . "\"/>\n";
-				$rdf .= "\t\t</sioc:Forum>\n";
-				$rdf .= "\t</sioc:has_parent>\n";
+    if ($this->_parents) {
+      foreach($this->_parents as $id => $uri) {
+        $rdf .= "\t<sioc:has_parent>\n";
+        $rdf .= "\t\t<sioc:Forum rdf:about=\"" .clean($uri) ."\">\n";
+        $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('forum', $id) . "\"/>\n";
+        $rdf .= "\t\t</sioc:Forum>\n";
+        $rdf .= "\t</sioc:has_parent>\n";
             }
-		}
+    }
 		
-		if ($this->_threads) {
-			foreach($this->_threads as $id => $uri) {
-				$rdf .= "\t<sioc:parent_of>\n";
-				$rdf .= "\t\t<sioc:Thread rdf:about=\"" .clean($uri) ."\">\n";
-				$rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('thread', $id) . "\"/>\n";
-				$rdf .= "\t\t</sioc:Thread>\n";
-				$rdf .= "\t</sioc:parent_of>\n";
+    if ($this->_threads) {
+      foreach($this->_threads as $id => $uri) {
+        $rdf .= "\t<sioc:parent_of>\n";
+        $rdf .= "\t\t<sioc:Thread rdf:about=\"" .clean($uri) ."\">\n";
+        $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('thread', $id) . "\"/>\n";
+        $rdf .= "\t\t</sioc:Thread>\n";
+        $rdf .= "\t</sioc:parent_of>\n";
             }
-		}
+    }
 		
         if($this->_posts) {
             foreach($this->_posts as $id => $url) {
@@ -572,7 +572,7 @@ 
             }
         }
 		
-		if ($this->_creator) {
+    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";
@@ -597,7 +597,7 @@ 
             }
         }
 		
-		if ($this->_administrator) {
+    if ($this->_administrator) {
             if ($this->_administrator->_id) {
                 $rdf .= "\t<sioc:has_administrator>\n";
                 $rdf .= "\t\t<sioc:UserAccount rdf:about=\"" . clean($this->_administrator->_uri) ."\">\n";
@@ -607,7 +607,7 @@ 
                 $rdf .= "\t</sioc:has_administrator>\n";
             } 
         }
-		if ($this->_links) {
+    if ($this->_links) {
             foreach($this->_links as $url=>$link) {
                 $rdf .= "\t<sioc:links_to rdfs:label=\"$link\" rdf:resource=\"" . clean($url) ."\"/>\n";
             }
@@ -616,7 +616,7 @@ 
         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;
     }
@@ -657,8 +657,8 @@ 
         $this->_links = $links;
         $this->_comments = array();
         $this->_reply_of = array();
-       	$this->_type = $type;
-       	$this->_has_part = $has_part;
+          $this->_type = $type;
+          $this->_has_part = $has_part;
     }
 
     function addComment($id, $url) {
@@ -712,11 +712,11 @@ 
                 $rdf .= "\t<sioc:links_to rdfs:label=\"$link\" rdf:resource=\"" . clean($url) ."\"/>\n";
             }
         }
-		if($this->_has_part) {
+    if($this->_has_part) {
             foreach($this->_has_part as $id=>$url) {
                 $rdf .= "\t<dcterms:hasPart>\n";
-				$rdf .= "\t\t<dcmitype:Image rdf:about=\"" . clean($url) . "\"/>\n";
-				$rdf .= "\t</dcterms:hasPart>\n";
+        $rdf .= "\t\t<dcmitype:Image rdf:about=\"" . clean($url) . "\"/>\n";
+        $rdf .= "\t</dcterms:hasPart>\n";
             }
         }
         if($this->_reply_of) {
@@ -779,9 +779,9 @@ 
         $this->_topics = $topics;
         $this->_links = $links;
         $this->_ext_links = $ext_links;
-       	$this->_type = $type;
+          $this->_type = $type;
         $this->_previous_version = $prev_vers;
-       	$this->_next_version = $next_vers;
+          $this->_next_version = $next_vers;
         $this->_latest_version = $latest_vers;
         $this->_has_discussion = $has_discuss;
         $this->_has_container = $container;
@@ -971,7 +971,7 @@ 
 
     function SIOCWiki ($url, $type='sioct:Wiki') {
         $this->_url = $url;
-       	$this->_type = $type;
+          $this->_type = $type;
     }
 
     function getContent( &$exp ) {
@@ -992,7 +992,7 @@ 
 
     function SIOCCategory ($url, $type='sioct:Category') {
         $this->_url = $url;
-       	$this->_type = $type;
+          $this->_type = $type;
     }
 
     function getContent( &$exp ) {

Spacing +209 added lines, -209 removed lines

@@ -11,7 +11,7 @@ 
  * @author Fabrizio Orlandi <fabrizio.orlandi@deri.org> (addition of SIOCWIki SIOCWikiArticle SIOCCategory)
  */
 
-define('FORUM_NODE', 'forum');		// TODO: Not used at the moment, remove it?
+define('FORUM_NODE', 'forum'); // TODO: Not used at the moment, remove it?
 define('AUTHORS_NODE', 'authors');
 
 define('EXPORTER_URL', 'http://wiki.sioc-project.org/index.php/PHPExportAPI');
@@ -62,7 +62,7 @@ 
         $this->_objects = array();
     }
 
-    function setURLParameters($type='type', $id='id', $page='page', $url_usetype = true, $urlseparator='&', $urlequal='=', $suffix='') {
+    function setURLParameters($type = 'type', $id = 'id', $page = 'page', $url_usetype = true, $urlseparator = '&', $urlequal = '=', $suffix = '') {
         $this->_urlseparator = $urlseparator;
         $this->_urlequal = $urlequal;
         $this->_url4type = $type;
@@ -72,7 +72,7 @@ 
         $this->_url_suffix = $suffix;
     }
 
-    function setParameters($title, $url, $sioc_url, $encoding, $generator, $export_email=false) {
+    function setParameters($title, $url, $sioc_url, $encoding, $generator, $export_email = false) {
         $this->_title = $title;
         $this->_blog_url = $url;
         $this->_sioc_url = $sioc_url;
@@ -82,7 +82,7 @@ 
     }
 	
     // Assigns some objects to the exporter
-    function addObject( &$obj ) {
+    function addObject(&$obj) {
         $this->_objects[] = &$obj;
     }
 
@@ -96,34 +96,34 @@ 
         $this->_ignore_suffix[$type] = 1;
     }
 
-	function siocURL($type, $id, $page=""){
-		$type_part = $this->_url4type .$this->_urlequal .  $type ;
+	function siocURL($type, $id, $page = "") {
+		$type_part = $this->_url4type.$this->_urlequal.$type;
 			
 		if ($id) {
-			if ( isset($this->_type_table[$type]) ) 
-	            $myID = $this->_type_table[$type] ; 
+			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 = '';
+		($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);
 	}
 	
-    function export( $rdf_content='' ) {
+    function export($rdf_content = '') {
         header('Content-Type: application/rdf+xml; charset='.$this->_encoding, true, 200);
         echo $this->makeRDF($rdf_content);
     }
 
-    function makeRDF( $rdf_content='' ) {
+    function makeRDF($rdf_content = '') {
         $rdf = '<?xml version="1.0" encoding="'.$this->_encoding.'" ?>'."\n";
         $rdf .= ' 
 <rdf:RDF
@@ -141,14 +141,14 @@ 
     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).'"/>
+	<foaf:primaryTopic rdf:resource="'.clean($this->_objects[0]->_url, true).'"/>
 	<admin:generatorAgent rdf:resource="'.clean($this->_generator, true).'"/>
 	<admin:generatorAgent rdf:resource="'.clean(EXPORTER_URL, true).'?version='.EXPORTER_VERSION.'"/>
 </foaf:Document>'."\n";
         if ($rdf_content) $rdf .= $rdf_content; 
         if (sizeof($this->_objects)) {
-            foreach($this->_objects as $object) {
-                if($object) $rdf .= $object->getContent( $this );
+            foreach ($this->_objects as $object) {
+                if ($object) $rdf .= $object->getContent($this);
             }
         }
         $rdf .= "\n</rdf:RDF>";
@@ -168,8 +168,8 @@ 
         $this->_note = $note;
     }
 
-    function getContent( &$exp ) {
-        $rdf =  "<sioc:Object>\n";
+    function getContent(&$exp) {
+        $rdf = "<sioc:Object>\n";
         $rdf .= "\t<rdfs:comment>Generic SIOC Object</rdfs:comment>\n";
         $rdf .= "</sioc:Object>\n";
         return $rdf;
@@ -198,7 +198,7 @@ 
     var $_next_forums;
     var $_usergroup_uri;
 
-    function SIOCSite($url, $name, $description, $page='', $usergroup_uri='') {
+    function SIOCSite($url, $name, $description, $page = '', $usergroup_uri = '') {
         $this->_url = $url;
         $this->_name = $name;
         $this->_description = $description;
@@ -226,53 +226,53 @@ 
         $this->_next_forums = $next;
     }
 	
-    function getContent( &$exp ) {
-        $rdf = "<sioc:Site rdf:about=\"" . clean($this->_url) ."\">\n";
-        $rdf .="\t<dc:title>" . clean($this->_name) . "</dc:title>\n";
-        $rdf .= "\t<dc:description>" . clean($this->_description) . "</dc:description>\n";
-        $rdf .= "\t<sioc:link rdf:resource=\"" . clean($this->_url) ."\"/>\n";
-        if($this->_forums) {
+    function getContent(&$exp) {
+        $rdf = "<sioc:Site rdf:about=\"".clean($this->_url)."\">\n";
+        $rdf .= "\t<dc:title>".clean($this->_name)."</dc:title>\n";
+        $rdf .= "\t<dc:description>".clean($this->_description)."</dc:description>\n";
+        $rdf .= "\t<sioc:link rdf:resource=\"".clean($this->_url)."\"/>\n";
+        if ($this->_forums) {
             foreach ($this->_forums as $id => $url) { 
-                $rdf .= "\t<sioc:host_of rdf:resource=\"" . clean($url) . "\"/>\n";
+                $rdf .= "\t<sioc:host_of rdf:resource=\"".clean($url)."\"/>\n";
             }
         }  
-		if($this->_next_forums) {
-            $rdf .= "\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('site', "", $this->_page+1) ."\"/>\n";
+		if ($this->_next_forums) {
+            $rdf .= "\t<rdfs:seeAlso rdf:resource=\"".$exp->siocURL('site', "", $this->_page + 1)."\"/>\n";
         }	
-		if($this->_usergroup_uri) {
-			$rdf .= "\t<sioc:has_Usergroup rdf:resource=\"" . $this->_usergroup_uri . "\"/>\n";
+		if ($this->_usergroup_uri) {
+			$rdf .= "\t<sioc:has_Usergroup rdf:resource=\"".$this->_usergroup_uri."\"/>\n";
 		} else {
-			$rdf .= "\t<sioc:has_Usergroup rdf:nodeID=\"" . AUTHORS_NODE . "\"/>\n";
+			$rdf .= "\t<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 .= "\t<sioc:link rdf:resource=\"" . clean($url) . "\"/>\n";
-                $rdf .= "\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('forum', $id) ."\"/>\n";
+                $rdf .= '<sioc:Forum rdf:about="'.clean($url)."\">\n";
+                $rdf .= "\t<sioc:link rdf:resource=\"".clean($url)."\"/>\n";
+                $rdf .= "\t<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 .= "\t<sioc:name>Authors for \"" . clean($this->_name) . "\"</sioc:name>\n";
+            $rdf .= "\t<sioc:name>Authors for \"".clean($this->_name)."\"</sioc:name>\n";
                 foreach ($this->_users as $id => $url) {
                     $rdf .= "\t<sioc:has_member>\n";
-                    $rdf .= "\t\t<sioc:UserAccount rdf:about=\"" . clean($url) ."\">\n";
-                    $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('user', $id). "\"/>\n";
+                    $rdf .= "\t\t<sioc:UserAccount rdf:about=\"".clean($url)."\">\n";
+                    $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"".$exp->siocURL('user', $id)."\"/>\n";
                     $rdf .= "\t\t</sioc:UserAccount>\n";
                     $rdf .= "\t</sioc:has_member>\n";
                 }
-			if($this->_next_users) {
-            $rdf .= "\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('site', "", $this->_page+1) ."\"/>\n";
+			if ($this->_next_users) {
+            $rdf .= "\t<rdfs:seeAlso rdf:resource=\"".$exp->siocURL('site', "", $this->_page + 1)."\"/>\n";
 			}
             $rdf .= "</sioc:UserAccountgroup>\n";
         }
@@ -303,7 +303,7 @@ 
     var $_sioc_url;
     var $_foaf_url;
 
-    function SIOCUser($id, $uri, $name, $email, $homepage='', $foaf_uri='', $role=false, $nick='', $sioc_url='', $foaf_url='') {
+    function SIOCUser($id, $uri, $name, $email, $homepage = '', $foaf_uri = '', $role = false, $nick = '', $sioc_url = '', $foaf_url = '') {
         $this->_id = $id;
         $this->_uri = $uri;
         $this->_name = $name;
@@ -326,26 +326,26 @@ 
         $this->_sioc_url = $sioc_url;
     }
 
-    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->_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"; }
+    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->_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->_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";
+        $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->_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";
         }
-        if($this->_role) {
+        if ($this->_role) {
             $rdf .= "\t\t\t<sioc:has_function>\n";
             $rdf .= "\t\t\t\t<sioc:Role>\n";
-            $rdf .= "\t\t\t\t\t<sioc:name>" . $this->_role . "</sioc:name>\n";
+            $rdf .= "\t\t\t\t\t<sioc:name>".$this->_role."</sioc:name>\n";
             $rdf .= "\t\t\t\t</sioc:Role>\n";
             $rdf .= "\t\t\t</sioc:has_function>\n";
         }
-        if($this->_sioc_url) { $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"". $this->_sioc_url ."\"/>\n"; }
+        if ($this->_sioc_url) { $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"".$this->_sioc_url."\"/>\n"; }
         $rdf .= "\t\t</sioc:UserAccount>\n";    
         $rdf .= "\t</foaf:holdsAccount>\n";    
         $rdf .= "</foaf:Person>\n";  
@@ -376,7 +376,7 @@ 
     var $_created;
     var $_parents;
 
-    function SIOCThread($id, $url, $page, $views='', $tags=array(), $subject='', $created='' ) {
+    function SIOCThread($id, $url, $page, $views = '', $tags = array(), $subject = '', $created = '') {
         $this->_id = $id;
         $this->_url = $url;
         $this->_page = $page;
@@ -389,7 +389,7 @@ 
         $this->_created = $created;
     }
 
-    function addPost($id, $url, $prev='', $next='') {
+    function addPost($id, $url, $prev = '', $next = '') {
         $this->_posts[$id] = array("url" => $url, "prev" => $prev, "next" => $next);
     }
 
@@ -406,18 +406,18 @@ 
         $this->_parents[$id] = $url;
     }
 
-    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->_subject) { $rdf .= "\t<dc:title>" . $this->_subject . "</dc:title>\n"; }
-        if ($this->_created) { $rdf .= "\t<dcterms:created>" . $this->_created . "</dcterms:created>\n"; }
+    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->_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) {
-			foreach($this->_parents as $id => $uri) {
+			foreach ($this->_parents as $id => $uri) {
 				$rdf .= "\t<sioc:has_parent>\n";
-				$rdf .= "\t\t<sioc:Forum rdf:about=\"" .clean($uri) ."\">\n";
-				$rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('forum', $id) . "\"/>\n";
+				$rdf .= "\t\t<sioc:Forum rdf:about=\"".clean($uri)."\">\n";
+				$rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"".$exp->siocURL('forum', $id)."\"/>\n";
 				$rdf .= "\t\t</sioc:Forum>\n";
 				$rdf .= "\t</sioc:has_parent>\n";
 			}
@@ -425,7 +425,7 @@ 
 		// here the tags are just used as keywords for dc:subject
         if ($this->_tags) { 
             foreach ($this->_tags as $id => $tag) {
-                $rdf .= "\t<dc:subject>" . $tag . "</dc:subject>\n"; 
+                $rdf .= "\t<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 use this insert prefixes for moat and tags
@@ -452,24 +452,24 @@ 
 		if ($this->_related) { 
 			foreach ($this->_related as $id => $url) {
 					$rdf .= "\t<sioc:related_to>\n";
-					$rdf .= "\t\t<sioc:Thread rdf:about=\"" .clean($url) ."\"/>\n";
+					$rdf .= "\t\t<sioc:Thread rdf:about=\"".clean($url)."\"/>\n";
 					$rdf .= "\t</sioc:related_to>\n"; // todo - each topic needs to have a URI
 			}
 		}		
 		
         if ($this->_posts) {
-            foreach($this->_posts as $id => $data) {
+            foreach ($this->_posts as $id => $data) {
                 $rdf .= "\t<sioc:container_of>\n";
-                $rdf .= "\t\t<sioc:Post rdf:about=\"" .clean($data[url]) ."\">\n";
-                $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('post', $id) . "\"/>\n";
-                if ($data[prev]) { $rdf .= "\t\t\t<sioc:previous_by_date rdf:resource=\"" . clean($data[prev]) . "\"/>\n"; }
-                if ($data[next]) { $rdf .= "\t\t\t<sioc:next_by_date rdf:resource=\"" . clean($data[next]) . "\"/>\n"; }
+                $rdf .= "\t\t<sioc:Post rdf:about=\"".clean($data[url])."\">\n";
+                $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"".$exp->siocURL('post', $id)."\"/>\n";
+                if ($data[prev]) { $rdf .= "\t\t\t<sioc:previous_by_date rdf:resource=\"".clean($data[prev])."\"/>\n"; }
+                if ($data[next]) { $rdf .= "\t\t\t<sioc:next_by_date rdf:resource=\"".clean($data[next])."\"/>\n"; }
                 $rdf .= "\t\t</sioc:Post>\n";
                 $rdf .= "\t</sioc:container_of>\n";
             }
         }
-        if($this->_next) {
-            $rdf .= "\r<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('thread', $this->_id, $this->_page+1) ."\"/>\n";
+        if ($this->_next) {
+            $rdf .= "\r<rdfs:seeAlso rdf:resource=\"".$exp->siocURL('thread', $this->_id, $this->_page + 1)."\"/>\n";
         }
         $rdf .= "</sioc:Thread>\n";
         return $rdf;
@@ -502,7 +502,7 @@ 
     var $_creator;
     var $_administrator;
 	
-    function SIOCForum($id, $url, $page, $title='', $descr='', $type='sioc:Forum', $creator='', $admin='', $links=array() ) {
+    function SIOCForum($id, $url, $page, $title = '', $descr = '', $type = 'sioc:Forum', $creator = '', $admin = '', $links = array()) {
         $this->_id = $id;
         $this->_url = $url;
         $this->_page = $page;
@@ -534,39 +534,39 @@ 
         $this->_next = $next;
     }
 
-    function getContent( &$exp) {
-        $rdf .= '<'.$this->_type. ' rdf:about="' . clean($this->_url) . "\">\n";
+    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";
-        $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";
+        $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->_parents) {
-			foreach($this->_parents as $id => $uri) {
+			foreach ($this->_parents as $id => $uri) {
 				$rdf .= "\t<sioc:has_parent>\n";
-				$rdf .= "\t\t<sioc:Forum rdf:about=\"" .clean($uri) ."\">\n";
-				$rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('forum', $id) . "\"/>\n";
+				$rdf .= "\t\t<sioc:Forum rdf:about=\"".clean($uri)."\">\n";
+				$rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"".$exp->siocURL('forum', $id)."\"/>\n";
 				$rdf .= "\t\t</sioc:Forum>\n";
 				$rdf .= "\t</sioc:has_parent>\n";
             }
 		}
 		
 		if ($this->_threads) {
-			foreach($this->_threads as $id => $uri) {
+			foreach ($this->_threads as $id => $uri) {
 				$rdf .= "\t<sioc:parent_of>\n";
-				$rdf .= "\t\t<sioc:Thread rdf:about=\"" .clean($uri) ."\">\n";
-				$rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('thread', $id) . "\"/>\n";
+				$rdf .= "\t\t<sioc:Thread rdf:about=\"".clean($uri)."\">\n";
+				$rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"".$exp->siocURL('thread', $id)."\"/>\n";
 				$rdf .= "\t\t</sioc:Thread>\n";
 				$rdf .= "\t</sioc:parent_of>\n";
             }
 		}
 		
-        if($this->_posts) {
-            foreach($this->_posts as $id => $url) {
+        if ($this->_posts) {
+            foreach ($this->_posts as $id => $url) {
                 $rdf .= "\t<sioc:container_of>\n";
-                $rdf .= "\t\t<sioc:Post rdf:about=\"" .clean($url) ."\">\n";
-                $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('post', $id) . "\"/>\n";
+                $rdf .= "\t\t<sioc:Post rdf:about=\"".clean($url)."\">\n";
+                $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"".$exp->siocURL('post', $id)."\"/>\n";
                 $rdf .= "\t\t</sioc:Post>\n";
                 $rdf .= "\t</sioc:container_of>\n";
             }
@@ -575,23 +575,23 @@ 
 		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";
+                $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";
                 $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";
+                $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";
                 $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";
+                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";
             }
@@ -600,23 +600,23 @@ 
 		if ($this->_administrator) {
             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";
+                $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";
                 $rdf .= "\t\t</sioc:UserAccount>\n";
                 $rdf .= "\t</sioc:has_administrator>\n";
             } 
         }
 		if ($this->_links) {
-            foreach($this->_links as $url=>$link) {
-                $rdf .= "\t<sioc:links_to rdfs:label=\"$link\" rdf:resource=\"" . clean($url) ."\"/>\n";
+            foreach ($this->_links as $url=>$link) {
+                $rdf .= "\t<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;
     }
@@ -645,7 +645,7 @@ 
     var $_type;
     var $_has_part;
 
-    function SIOCPost($url, $subject, $content, $encoded, $creator, $created, $updated="", $topics=array(), $links=array(), $type='sioc:Post', $has_part=array() ) {
+    function SIOCPost($url, $subject, $content, $encoded, $creator, $created, $updated = "", $topics = array(), $links = array(), $type = 'sioc:Post', $has_part = array()) {
         $this->_url = $url;
         $this->_subject = $subject;
         $this->_content = $content;
@@ -669,77 +669,77 @@ 
         $this->_reply_of[$id] = $url;    
     }
 
-    function getContent( &$exp ) {
-        $rdf = '<'.$this->_type." rdf:about=\"" . clean($this->_url) . "\">\n";
+    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->_subject) { $rdf .= "\t<dc:title>" . $this->_subject . "</dc:title>\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";
+                $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";
                 $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";
+                $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";
                 $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";
+                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";
-        $rdf .= "\t<sioc:content>" . pureContent($this->_content) . "</sioc:content>\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";
+        $rdf .= "\t<sioc:content>".pureContent($this->_content)."</sioc:content>\n";
 			
-        $rdf .= "\t<content:encoded><![CDATA[" . $this->_encoded . "]]></content:encoded>\n";
-        if($this->_topics) {
-            foreach($this->_topics as $url=>$topic) {
-                $rdf .= "\t<sioc:topic rdfs:label=\"$topic\" rdf:resource=\"" . clean($url) ."\"/>\n";
+        $rdf .= "\t<content:encoded><![CDATA[".$this->_encoded."]]></content:encoded>\n";
+        if ($this->_topics) {
+            foreach ($this->_topics as $url=>$topic) {
+                $rdf .= "\t<sioc:topic rdfs:label=\"$topic\" rdf:resource=\"".clean($url)."\"/>\n";
             }
         }
-        if($this->_links) {
-            foreach($this->_links as $url=>$link) {
-                $rdf .= "\t<sioc:links_to rdfs:label=\"$link\" rdf:resource=\"" . clean($url) ."\"/>\n";
+        if ($this->_links) {
+            foreach ($this->_links as $url=>$link) {
+                $rdf .= "\t<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 .= "\t<dcterms:hasPart>\n";
-				$rdf .= "\t\t<dcmitype:Image rdf:about=\"" . clean($url) . "\"/>\n";
+				$rdf .= "\t\t<dcmitype:Image rdf:about=\"".clean($url)."\"/>\n";
 				$rdf .= "\t</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 .= "\t<sioc:reply_of>\n";
-                $rdf .= "\t\t<sioc:Post rdf:about=\"" . clean($url) . "\">\n";
-                $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('post', $id) . "\"/>\n";
+                $rdf .= "\t\t<sioc:Post rdf:about=\"".clean($url)."\">\n";
+                $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"".$exp->siocURL('post', $id)."\"/>\n";
                 $rdf .= "\t\t</sioc:Post>\n";
                 $rdf .= "\t</sioc:reply_of>\n";
             }
         }
-        if($this->_comments) {
-            foreach($this->_comments as $id => $url) {
+        if ($this->_comments) {
+            foreach ($this->_comments as $id => $url) {
                 $rdf .= "\t<sioc:has_reply>\n";
-                $rdf .= "\t\t<sioc:Post rdf:about=\"" . clean($url) ."\">\n";
+                $rdf .= "\t\t<sioc:Post rdf:about=\"".clean($url)."\">\n";
         //        if($comments->f('comment_trackback')) $rdf .= "\t\t\t<sioc:type>" . POST_TRACKBACK . "</sioc:type>\n"; 
         //        else $rdf .= "\t\t\t<sioc:type>" . POST_COMMENT  . "</sioc:type>\n";
-                $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" . $exp->siocURL('comment', $id) . "\"/>\n";
+                $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"".$exp->siocURL('comment', $id)."\"/>\n";
                 $rdf .= "\t\t</sioc:Post>\n";
                 $rdf .= "\t</sioc:has_reply>\n";
             }
         }
-        $rdf .=  "</".$this->_type.">\n";
+        $rdf .= "</".$this->_type.">\n";
         return $rdf;    
     }
 }
@@ -769,7 +769,7 @@ 
     var $_has_discussion;
     var $_has_container;
 
-    function SIOCWikiArticle($url, $api, $subject, $redir, $user, $created, $prev_vers, $next_vers, $latest_vers, $has_discuss, $container, $topics=array(), $links=array(), $ext_links=array(), $type='sioct:WikiArticle') {
+    function SIOCWikiArticle($url, $api, $subject, $redir, $user, $created, $prev_vers, $next_vers, $latest_vers, $has_discuss, $container, $topics = array(), $links = array(), $ext_links = array(), $type = 'sioct:WikiArticle') {
         $this->_url = $url;
         $this->_api = $api;
         $this->_subject = $subject;
@@ -787,12 +787,12 @@ 
         $this->_has_container = $container;
     }
 
-    function getContent( &$exp ) {
-        $rdf = '<'.$this->_type." rdf:about=\"" . clean($this->_url) . "\">\n";
+    function getContent(&$exp) {
+        $rdf = '<'.$this->_type." rdf:about=\"".clean($this->_url)."\">\n";
         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<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 ($this->_creator->_nick) {
@@ -811,14 +811,14 @@ 
                 $rdf .= "\t</foaf:maker>\n";
             } else {*/
                 $rdf .= "\t<sioc:has_creator>\n";
-                $rdf .= "\t\t<sioc:UserAccount rdf:about=\"" . clean($this->_creator->_uri) ."\">\n";
-                $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" .
+                $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";
-                $rdf .= "\t<dc:contributor>" . clean($this->_creator->_nick) ."</dc:contributor>\n";
+                $rdf .= "\t<dc:contributor>".clean($this->_creator->_nick)."</dc:contributor>\n";
                 /*$rdf .= "\t<foaf:maker>\n";
                 $rdf .= "\t\t<foaf:Person";
                 if($this->_creator->_name) $rdf .= " foaf:name=\"" . $this->_creator->_name ."\"";
@@ -837,55 +837,55 @@ 
             }
         }
         if ($this->_created) {
-            $rdf .= "\t<dcterms:created>" . $this->_created . "</dcterms:created>\n";
+            $rdf .= "\t<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 .= "\t<sioc:topic>\n";
-                $rdf .= "\t\t<sioct:Category rdf:about=\"" . clean($url) ."\">\n";
-                $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" .
+                $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";
             }
         }
         if (is_array($this->_links)) {
-            foreach($this->_links as $label=>$url) {
+            foreach ($this->_links as $label=>$url) {
                 $rdf .= "\t<sioc:links_to>\n";
-                $rdf .= "\t\t<sioct:WikiArticle rdf:about=\"" . clean($url) ."\">\n";
-                $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" .
+                $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";
             }
         } else
-        { if($this->_links)
+        { if ($this->_links)
             {
                 $rdf .= "\t<sioc:links_to>\n";
-                $rdf .= "\t\t<sioct:WikiArticle rdf:about=\"" . clean($this->_links) ."\">\n";
-                $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" .
+                $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";
             }
         }
-        if(is_array($this->_ext_links)) {
-            foreach($this->_ext_links as $label=>$url) {
-                $rdf .= "\t<sioc:links_to rdf:resource=\"" . clean($url) ."\"/>\n";
+        if (is_array($this->_ext_links)) {
+            foreach ($this->_ext_links as $label=>$url) {
+                $rdf .= "\t<sioc:links_to rdf:resource=\"".clean($url)."\"/>\n";
             }
         }
-        if($this->_previous_version) {
+        if ($this->_previous_version) {
                 $rdf .= "\t<sioc:previous_version>\n";
-                $rdf .= "\t\t<sioct:WikiArticle rdf:about=\"" . clean($this->_previous_version) ."\">\n";
-                $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" .
+                $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";
@@ -900,12 +900,12 @@ 
                 $rdf .= "\t</sioc:earlier_version>\n";
                  */
         }
-        if($this->_next_version) {
+        if ($this->_next_version) {
                 $rdf .= "\t<sioc:next_version>\n";
-                $rdf .= "\t\t<sioct:WikiArticle rdf:about=\"" . clean($this->_next_version) ."\">\n";
-                $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" .
+                $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";
@@ -920,41 +920,41 @@ 
                 $rdf .= "\t</sioc:later_version>\n";
                  */
         }
-        if($this->_latest_version) {
+        if ($this->_latest_version) {
                 $rdf .= "\t<sioc:latest_version>\n";
-                $rdf .= "\t\t<sioct:WikiArticle rdf:about=\"" . clean($this->_latest_version) ."\">\n";
-                $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" .
+                $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";
         }
-        if($this->_has_discussion && (strpos($this->_has_discussion, 'Talk:Talk:') == FALSE)) {
+        if ($this->_has_discussion && (strpos($this->_has_discussion, 'Talk:Talk:') == FALSE)) {
                 $rdf .= "\t<sioc:has_discussion>\n";
-                $rdf .= "\t\t<sioct:WikiArticle rdf:about=\"" . clean($this->_has_discussion) ."\">\n";
-                $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"" .
+                $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";
         }
-        if($this->_has_container) {
+        if ($this->_has_container) {
                 $rdf .= "\t<sioc:has_container>\n";
-                $rdf .= "\t\t<sioct:Wiki rdf:about=\"" . clean($this->_has_container) ."\"/>\n";
+                $rdf .= "\t\t<sioct:Wiki rdf:about=\"".clean($this->_has_container)."\"/>\n";
                 $rdf .= "\t</sioc:has_container>\n";
         }
-        if($this->_redirpage)
+        if ($this->_redirpage)
         {
-            $rdf .= "\t<owl:sameAs rdf:resource=\"" . clean($this->_redirpage) ."\"/>\n";
-            $rdf .= "\t<rdfs:seeAlso rdf:resource=\"" . 
+            $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";
         }
 
-        $rdf .=  "</".$this->_type.">\n";
+        $rdf .= "</".$this->_type.">\n";
         return $rdf;
     }
 }
@@ -969,13 +969,13 @@ 
     var $_url;
     var $_type;
 
-    function SIOCWiki ($url, $type='sioct:Wiki') {
+    function SIOCWiki($url, $type = 'sioct:Wiki') {
         $this->_url = $url;
        	$this->_type = $type;
     }
 
-    function getContent( &$exp ) {
-        $rdf = '<'.$this->_type." rdf:about=\"" . clean($this->_url) . "\"/>\n";
+    function getContent(&$exp) {
+        $rdf = '<'.$this->_type." rdf:about=\"".clean($this->_url)."\"/>\n";
         return $rdf;
     }
 }
@@ -990,13 +990,13 @@ 
     var $_url;
     var $_type;
 
-    function SIOCCategory ($url, $type='sioct:Category') {
+    function SIOCCategory($url, $type = 'sioct:Category') {
         $this->_url = $url;
        	$this->_type = $type;
     }
 
-    function getContent( &$exp ) {
-        $rdf = '<'.$this->_type." rdf:about=\"" . clean($this->_url) . "\"/>\n";
+    function getContent(&$exp) {
+        $rdf = '<'.$this->_type." rdf:about=\"".clean($this->_url)."\"/>\n";
         return $rdf;
     }
 }
@@ -1008,12 +1008,12 @@ 
  * Transforms text so that it can be safely put into XML markup
  */
 if (!function_exists('clean')) {
-  function clean( $text , $url = false) {
+  function clean($text, $url = false) {
 #    return htmlentities( $text );
 #    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');
   }
 }
@@ -1025,9 +1025,9 @@ 
  */
 if (!function_exists('htmlentities2')) {
   function htmlentities2($myHTML) {
-    $translation_table=get_html_translation_table (HTML_ENTITIES,ENT_QUOTES);
+    $translation_table = get_html_translation_table(HTML_ENTITIES, ENT_QUOTES);
     $translation_table[chr(38)] = '&';
-    return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/","&amp;" , strtr($myHTML, $translation_table));
+    return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/", "&amp;", strtr($myHTML, $translation_table));
     //return htmlentities(strtr(str_replace(' ', '%20', $myHTML), $translation_table));
   }
 }

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');
   }
 }

action.php

Indentation +8 added lines, -8 removed lines

@@ -80,8 +80,8 @@ 
     /* -- Methods to manage plugin ------------------------------------------ */
 
     /**
-    * Register its handlers with the DokuWiki's event controller
-    */
+     * Register its handlers with the DokuWiki's event controller
+     */
     public function register(Doku_Event_Handler $controller)
     {
         //print_r(headers_list()); die();
@@ -146,7 +146,7 @@ 
     }
     
     /**
-    */
+     */
     public function createRdfLink($event = null, $param = null)
     {
         global $ID, $INFO, $conf;
@@ -500,7 +500,7 @@ 
 
         // create container object
         $wikicontainer = new SIOCDokuWikiContainer($ID,
-                                                   normalizeUri($exporter->siocURL('container', $ID))
+                                                    normalizeUri($exporter->siocURL('container', $ID))
                                                   );
 
         /* container is type=wiki */ if ($ID == $conf['start']) $wikicontainer->isWiki();
@@ -563,10 +563,10 @@ 
         // create user object
         //print_r($userinfo); die();
         $wikiuser = new SIOCDokuWikiUser($ID,
-                                         normalizeUri($exporter->siocURL('user', $ID)),
-                                         $userid,
-                                         $userinfo['name'],
-                                         $userinfo['mail']);
+                                          normalizeUri($exporter->siocURL('user', $ID)),
+                                          $userid,
+                                          $userinfo['name'],
+                                          $userinfo['mail']);
         /* TODO: avatar (using Gravatar) */
         /* TODO: creator_of */
         // add user to exporter

Spacing +37 added lines, -37 removed lines

@@ -68,8 +68,8 @@ 
  * - 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 {
@@ -87,9 +87,9 @@ 
         //print_r(headers_list()); die();
         
         // test the requested action
-        $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE',  $this, 'checkAction', $controller);
+        $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 ---------------------------------------------------- */
@@ -105,7 +105,7 @@ 
             // 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())
             {
@@ -118,7 +118,7 @@ 
             else
             {
                 // add meta link to html head
-                $controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE',  $this, 'createRdfLink');
+                $controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'createRdfLink');
             }
         }
         /*
@@ -140,7 +140,7 @@ 
             //die('http://pingthesemanticweb.com/rest/?url='.urlencode(getAbsUrl(wl($data->data['id']))));
             //$ping = fopen('http://pingthesemanticweb.com/rest/?url='.urlencode(getAbsUrl(wl($data->data['id']))),'r');
             // it must be a post, and it's the last revision
-            $ping = @fopen('http://pingthesemanticweb.com/rest/?url='.urlencode(normalizeUri(getAbsUrl(exportlink($data->data['id'], 'siocxml', array('type'=>'post'), false, '&')))),'r');
+            $ping = @fopen('http://pingthesemanticweb.com/rest/?url='.urlencode(normalizeUri(getAbsUrl(exportlink($data->data['id'], 'siocxml', array('type'=>'post'), false, '&')))), 'r');
             @fclose($ping);
         }
     }
@@ -180,19 +180,19 @@ 
         switch ($sioc_type)
         {
             case 'container':
-                $title = htmlentities("Container '".(isset($INFO['meta']['title'])?$INFO['meta']['title']:$ID)."' (SIOC document as RDF/XML)");
+                $title = htmlentities("Container '".(isset($INFO['meta']['title']) ? $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)");
-                $queryAttr =  array('type'=>'user');
+                $queryAttr = array('type'=>'user');
                 break;
 
             case 'post':
             default:
                 $title = htmlentities("Article '".$INFO['meta']['title']."' (SIOC document as RDF/XML)");
-                $queryAttr =  array('type'=>'post');
+                $queryAttr = array('type'=>'post');
                 if (isset($_GET['rev']) && $_GET['rev'] == intval($_GET['rev']))
                     $queryAttr['rev'] = $_GET['rev'];
                 break;
@@ -304,17 +304,17 @@ 
             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);
+                $formatspec = explode(';', $format);
                 $k = trim($formatspec[0]);
-                if (count($formatspec)==2)
+                if (count($formatspec) == 2)
                 {
                     $test_accept[$k] = trim($formatspec[1]);
                 }
@@ -377,7 +377,7 @@ 
     {
         global $ID, $INFO, $REV, $conf;
 
-        $exporter->setParameters('Article: '.$INFO['meta']['title'].($REV?' (rev '.$REV.')':''),
+        $exporter->setParameters('Article: '.$INFO['meta']['title'].($REV ? ' (rev '.$REV.')' : ''),
                             $this->_getDokuUrl(),
                             $this->_getDokuUrl().'doku.php?',
                             'utf-8',
@@ -386,7 +386,7 @@ 
 
         // 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'],
@@ -403,14 +403,14 @@ 
         
         // create wiki page object
         $wikipage = new SIOCDokuWikiArticle($ID, // id
-                                            normalizeUri($exporter->siocURL('post', $ID.($REV?$exporter->_urlseparator.'rev'.$exporter->_urlequal.$REV:''))), // url
-                                            $INFO['meta']['title'].($REV?' (rev '.$REV.')':''), // subject
-                                            rawWiki($ID,$REV) // body (content)
+                                            normalizeUri($exporter->siocURL('post', $ID.($REV ? $exporter->_urlseparator.'rev'.$exporter->_urlequal.$REV : ''))), // url
+                                            $INFO['meta']['title'].($REV ? ' (rev '.$REV.')' : ''), // subject
+                                            rawWiki($ID, $REV) // body (content)
                                             );
-        /* encoded content   */ $wikipage->addContentEncoded(p_cached_output(wikiFN($ID,$REV),'xhtml'));
+        /* 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));
+        /* 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']);
         
@@ -418,8 +418,8 @@ 
         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_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);
         }
@@ -436,7 +436,7 @@ 
 
         /* previous and next revision */
         $changelog = new PageChangeLog($ID);
-        $pagerevs = $changelog->getRevisions(0,$conf['recent']+1);
+        $pagerevs = $changelog->getRevisions(0, $conf['recent'] + 1);
         $prevrev = false; $nextrev = false;
         if (!$REV)
         {
@@ -453,9 +453,9 @@ 
                 $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) $wikipage->addVersionLatest();
@@ -509,11 +509,11 @@ 
 
         // search next level entries (posts, sub containers) in container
         require_once(DOKU_INC.'inc/search.php');
-        $dir  = utf8_encodeFN(str_replace(':','/',$ID));
+        $dir = utf8_encodeFN(str_replace(':', '/', $ID));
         $entries = array();
         $posts = array();
         $containers = array();
-        search($entries,$conf['datadir'],'search_index',array('ns' => $ID),$dir);
+        search($entries, $conf['datadir'], 'search_index', array('ns' => $ID), $dir);
         foreach ($entries as $entry)
         {
             if ($entry['type'] === 'f')
@@ -521,7 +521,7 @@ 
                 // wikisite
                 $posts[] = $entry;
             }
-            elseif($entry['type'] === 'd')
+            elseif ($entry['type'] === 'd')
             {
                 // sub container
                 $containers[] = $entry;
@@ -532,8 +532,8 @@ 
         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();
         
@@ -548,7 +548,7 @@ 
         global $ID;
                 
         // get user info
-        $userinfo = getDwUserInfo($ID,$this);
+        $userinfo = getDwUserInfo($ID, $this);
         
         // no userinfo means there is n user space or user does not exists
         if ($userinfo === false)
@@ -582,22 +582,22 @@ 
         die();
     }
 
-    private function _getDokuUrl($url=null)
+    private function _getDokuUrl($url = null)
     {
         return getAbsUrl($url);
     }
     
-    private function _getDate($date, $date_alt=null)
+    private function _getDate($date, $date_alt = null)
     {
         if (!$date) $date = $date_alt;
-        return date('c',$date);
+        return date('c', $date);
     }
     
 }
 
 if (!function_exists('getAbsUrl'))
 {
-    function getAbsUrl($url=null)
+    function getAbsUrl($url = null)
     {
         if ($url == null) $url = DOKU_BASE;
         return str_replace(DOKU_BASE, DOKU_URL, $url);
@@ -629,7 +629,7 @@ 
         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))
         {

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 {
@@ -89,7 +93,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 ---------------------------------------------------- */
@@ -104,18 +110,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');
@@ -153,8 +159,9 @@ 
         
         // Test for hidden pages
         
-        if (isHiddenPage($ID))
-            return false;
+        if (isHiddenPage($ID)) {
+                    return false;
+        }
         
         // Get type of SIOC content
         
@@ -162,13 +169,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);
         
@@ -193,8 +203,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;
         }
     
@@ -206,8 +217,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;
@@ -221,8 +233,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
         
@@ -230,16 +243,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
         
@@ -271,8 +289,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();
@@ -317,8 +336,7 @@ 
                 if (count($formatspec)==2)
                 {
                     $test_accept[$k] = trim($formatspec[1]);
-                }
-                else
+                } else
                 {
                     $test_accept[$k] = 'q=1.0';
                 }
@@ -353,18 +371,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'];
         }
@@ -408,10 +423,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
@@ -419,8 +442,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);
         }
         
@@ -429,7 +453,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
@@ -442,8 +468,7 @@ 
         {
             // latest revision, previous rev is on top in array
             $prevrev = 0;
-        }
-        else
+        } else
         {
             // other revision
             $currentrev = array_search($REV, $pagerevs);
@@ -453,15 +478,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)
         
@@ -480,12 +513,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;
         }
@@ -503,9 +534,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');
@@ -520,8 +557,7 @@ 
             {
                 // wikisite
                 $posts[] = $entry;
-            }
-            elseif($entry['type'] === 'd')
+            } elseif($entry['type'] === 'd')
             {
                 // sub container
                 $containers[] = $entry;
@@ -529,11 +565,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();
         
@@ -551,8 +592,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(),
@@ -589,7 +631,9 @@ 
     
     private function _getDate($date, $date_alt=null)
     {
-        if (!$date) $date = $date_alt;
+        if (!$date) {
+          $date = $date_alt;
+        }
         return date('c',$date);
     }
     
@@ -599,7 +643,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);
     }
 }
@@ -612,8 +658,7 @@ 
         if ($info = $auth->getUserData($user))
         {
             return $info['mail'];
-        }
-        else
+        } else
         {
             return false;
         }
@@ -626,7 +671,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);
@@ -636,13 +683,11 @@ 
             if ($key)
             {
                 return $info['key'];
-            }
-            else
+            } else
             {
                 return $info;
             }
-        }
-        else
+        } else
         {
             return false;
         }
@@ -664,7 +709,9 @@ 
             
             // test separator
             $sep = '&';
-            if (strpos($query, '&') !== false) $sep = '&';
+            if (strpos($query, '&') !== false) {
+              $sep = '&';
+            }
             $attr = explode($sep, $query);
             
             sort($attr);