mprins / dokuwiki-plugin-dokusioc

lib/sioc_dokuwiki.php

Braces +13 added lines, -5 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']]))
@@ -274,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";
@@ -288,7 +294,9 @@ 
         }
         $rdf .= "\t<sioc:account_of>\n";
         $rdf .= "\t\t<foaf:Person>\n";
-        if ($this->_name) $rdf .= "\t\t\t<foaf:name>".clean($this->_name)."</foaf:name>\n";
+        if ($this->_name) {
+          $rdf .= "\t\t\t<foaf:name>".clean($this->_name)."</foaf:name>\n";
+        }
         if ($this->_email) { $rdf .= "\t\t\t<foaf:mbox_sha1sum>".$this->_sha1."</foaf:mbox_sha1sum>\n"; }
         if ($this->_foaf_url) { $rdf .= "\t\t\t<rdfs:seeAlso rdf:resource=\"".$this->_foaf_url."\"/>\n"; }
         $rdf .= "\t\t</foaf:Person>\n";  

lib/sioc_inc.php

Braces +94 added lines, -38 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,7 +702,9 @@ 
 
     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) {
@@ -707,7 +740,9 @@ 
             }
         }
         $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";
@@ -801,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) {
@@ -823,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";
@@ -854,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";
@@ -866,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";
@@ -878,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";
@@ -894,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";
@@ -916,7 +962,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";
@@ -938,7 +986,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";
@@ -948,7 +998,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";
@@ -963,7 +1015,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";
         }
 
@@ -1026,7 +1080,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');
   }
 }