Passed
Pull Request — master (#2)
by Mark
02:12 queued 31s
created
action.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -80,8 +80,8 @@  discard block
 block discarded – undo
80 80
     /* -- Methods to manage plugin ------------------------------------------ */
81 81
 
82 82
     /**
83
-    * Register its handlers with the DokuWiki's event controller
84
-    */
83
+     * Register its handlers with the DokuWiki's event controller
84
+     */
85 85
     function register(Doku_Event_Handler $controller)
86 86
     {
87 87
         //print_r(headers_list()); die();
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
     }
147 147
     
148 148
     /**
149
-    */
149
+     */
150 150
     function createRdfLink($event = null, $param = null)
151 151
     {
152 152
         global $ID, $INFO, $conf;
@@ -500,7 +500,7 @@  discard block
 block discarded – undo
500 500
 
501 501
         // create container object
502 502
         $wikicontainer = new SIOCDokuWikiContainer($ID,
503
-                                                   normalizeUri($exporter->siocURL('container', $ID))
503
+                                                    normalizeUri($exporter->siocURL('container', $ID))
504 504
                                                   );
505 505
 
506 506
         /* container is type=wiki */ if ($ID == $conf['start']) $wikicontainer->isWiki();
@@ -563,10 +563,10 @@  discard block
 block discarded – undo
563 563
         // create user object
564 564
         //print_r($userinfo); die();
565 565
         $wikiuser = new SIOCDokuWikiUser($ID,
566
-                                         normalizeUri($exporter->siocURL('user', $ID)),
567
-                                         $userid,
568
-                                         $userinfo['name'],
569
-                                         $userinfo['mail']);
566
+                                          normalizeUri($exporter->siocURL('user', $ID)),
567
+                                          $userid,
568
+                                          $userinfo['name'],
569
+                                          $userinfo['mail']);
570 570
         /* TODO: avatar (using Gravatar) */
571 571
         /* TODO: creator_of */
572 572
         // add user to exporter
Please login to merge, or discard this patch.
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
68 68
  * - proof of concept release under CC-BY-SA
69 69
  **/
70 70
  
71
-if(!defined('DOKU_INC')) die();
72
-if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
71
+if (!defined('DOKU_INC')) die();
72
+if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC.'lib/plugins/');
73 73
 require_once(DOKU_PLUGIN.'action.php');
74 74
  
75 75
 class action_plugin_dokusioc extends DokuWiki_Action_Plugin {
@@ -87,9 +87,9 @@  discard block
 block discarded – undo
87 87
         //print_r(headers_list()); die();
88 88
         
89 89
         // test the requested action
90
-        $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE',  $this, 'checkAction', $controller);
90
+        $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'checkAction', $controller);
91 91
         // pingthesemanticweb.com
92
-        if ($this->getConf('pingsw')) $controller->register_hook('ACTION_SHOW_REDIRECT', 'BEFORE',  $this, 'pingService', $controller);
92
+        if ($this->getConf('pingsw')) $controller->register_hook('ACTION_SHOW_REDIRECT', 'BEFORE', $this, 'pingService', $controller);
93 93
     }
94 94
  
95 95
     /* -- Event handlers ---------------------------------------------------- */
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
             // give back rdf
106 106
             $this->exportSioc();
107 107
         }
108
-        elseif (($action->data == 'show' || $action->data == 'index') && $INFO['perm'] && !defined('DOKU_MEDIADETAIL') && ($INFO['exists'] || getDwUserInfo($INFO['id'],$this)) && !isHiddenPage($INFO['id']))
108
+        elseif (($action->data == 'show' || $action->data == 'index') && $INFO['perm'] && !defined('DOKU_MEDIADETAIL') && ($INFO['exists'] || getDwUserInfo($INFO['id'], $this)) && !isHiddenPage($INFO['id']))
109 109
         {
110 110
             if ($this->isRdfXmlRequest())
111 111
             {
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
             else
119 119
             {
120 120
                 // add meta link to html head
121
-                $controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE',  $this, 'createRdfLink');
121
+                $controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'createRdfLink');
122 122
             }
123 123
         }
124 124
         /*
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
             //die('http://pingthesemanticweb.com/rest/?url='.urlencode(getAbsUrl(wl($data->data['id']))));
141 141
             //$ping = fopen('http://pingthesemanticweb.com/rest/?url='.urlencode(getAbsUrl(wl($data->data['id']))),'r');
142 142
             // it must be a post, and it's the last revision
143
-            $ping = @fopen('http://pingthesemanticweb.com/rest/?url='.urlencode(normalizeUri(getAbsUrl(exportlink($data->data['id'], 'siocxml', array('type'=>'post'), false, '&')))),'r');
143
+            $ping = @fopen('http://pingthesemanticweb.com/rest/?url='.urlencode(normalizeUri(getAbsUrl(exportlink($data->data['id'], 'siocxml', array('type'=>'post'), false, '&')))), 'r');
144 144
             @fclose($ping);
145 145
         }
146 146
     }
@@ -180,19 +180,19 @@  discard block
 block discarded – undo
180 180
         switch ($sioc_type)
181 181
         {
182 182
             case 'container':
183
-                $title = htmlentities("Container '".(isset($INFO['meta']['title'])?$INFO['meta']['title']:$ID)."' (SIOC document as RDF/XML)");
183
+                $title = htmlentities("Container '".(isset($INFO['meta']['title']) ? $INFO['meta']['title'] : $ID)."' (SIOC document as RDF/XML)");
184 184
                 $queryAttr = array('type'=>'container');
185 185
                 break;
186 186
                 
187 187
             case 'user':
188 188
                 $title = htmlentities("User account '".$userinfo['name']."' (SIOC document as RDF/XML)");
189
-                $queryAttr =  array('type'=>'user');
189
+                $queryAttr = array('type'=>'user');
190 190
                 break;
191 191
 
192 192
             case 'post':
193 193
             default:
194 194
                 $title = htmlentities("Article '".$INFO['meta']['title']."' (SIOC document as RDF/XML)");
195
-                $queryAttr =  array('type'=>'post');
195
+                $queryAttr = array('type'=>'post');
196 196
                 if (isset($_GET['rev']) && $_GET['rev'] == intval($_GET['rev']))
197 197
                     $queryAttr['rev'] = $_GET['rev'];
198 198
                 break;
@@ -304,17 +304,17 @@  discard block
 block discarded – undo
304 304
             return true;
305 305
         }
306 306
         
307
-        if (count($accepted)>0)
307
+        if (count($accepted) > 0)
308 308
         {
309 309
             // hard check, only serve RDF if it is requested first or equal to first type
310 310
     
311 311
             // extract accepting ratio
312 312
             $test_accept = array();
313
-            foreach($accepted as $format)
313
+            foreach ($accepted as $format)
314 314
             {
315
-                $formatspec = explode(';',$format);
315
+                $formatspec = explode(';', $format);
316 316
                 $k = trim($formatspec[0]);
317
-                if (count($formatspec)==2)
317
+                if (count($formatspec) == 2)
318 318
                 {
319 319
                     $test_accept[$k] = trim($formatspec[1]);
320 320
                 }
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
     {
378 378
         global $ID, $INFO, $REV, $conf;
379 379
 
380
-        $exporter->setParameters('Article: '.$INFO['meta']['title'].($REV?' (rev '.$REV.')':''),
380
+        $exporter->setParameters('Article: '.$INFO['meta']['title'].($REV ? ' (rev '.$REV.')' : ''),
381 381
                             $this->_getDokuUrl(),
382 382
                             $this->_getDokuUrl().'doku.php?',
383 383
                             'utf-8',
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
 
387 387
         // create user object
388 388
         // $id, $uri, $name, $email, $homepage='', $foaf_uri='', $role=false, $nick='', $sioc_url='', $foaf_url=''
389
-        $dwuserpage_id = cleanID($this->getConf('userns')).($conf['useslash']?'/':':').$INFO['editor'];
389
+        $dwuserpage_id = cleanID($this->getConf('userns')).($conf['useslash'] ? '/' : ':').$INFO['editor'];
390 390
         /*
391 391
         if ($INFO['editor'] && $this->getConf('userns'))
392 392
             $pageuser = new SIOCUser($INFO['editor'],
@@ -403,14 +403,14 @@  discard block
 block discarded – undo
403 403
         
404 404
         // create wiki page object
405 405
         $wikipage = new SIOCDokuWikiArticle($ID, // id
406
-                                            normalizeUri($exporter->siocURL('post', $ID.($REV?$exporter->_urlseparator.'rev'.$exporter->_urlequal.$REV:''))), // url
407
-                                            $INFO['meta']['title'].($REV?' (rev '.$REV.')':''), // subject
408
-                                            rawWiki($ID,$REV) // body (content)
406
+                                            normalizeUri($exporter->siocURL('post', $ID.($REV ? $exporter->_urlseparator.'rev'.$exporter->_urlequal.$REV : ''))), // url
407
+                                            $INFO['meta']['title'].($REV ? ' (rev '.$REV.')' : ''), // subject
408
+                                            rawWiki($ID, $REV) // body (content)
409 409
                                             );
410
-        /* encoded content   */ $wikipage->addContentEncoded(p_cached_output(wikiFN($ID,$REV),'xhtml'));
410
+        /* encoded content   */ $wikipage->addContentEncoded(p_cached_output(wikiFN($ID, $REV), 'xhtml'));
411 411
         /* created           */ if (isset($INFO['meta']['date']['created'])) $wikipage->addCreated(date('c', $INFO['meta']['date']['created']));
412 412
         /* or modified       */ if (isset($INFO['meta']['date']['modified'])) $wikipage->addModified(date('c', $INFO['meta']['date']['modified']));
413
-        /* creator/modifier  */ if ($INFO['editor'] && $this->getConf('userns')) $wikipage->addCreator(array('foaf:maker'=>'#'.$INFO['editor'],'sioc:modifier'=>$dwuserpage_id));
413
+        /* creator/modifier  */ if ($INFO['editor'] && $this->getConf('userns')) $wikipage->addCreator(array('foaf:maker'=>'#'.$INFO['editor'], 'sioc:modifier'=>$dwuserpage_id));
414 414
         /* is creator        */ if (isset($INFO['meta']['date']['created'])) $wikipage->isCreator();
415 415
         /* intern wiki links */ $wikipage->addLinks($INFO['meta']['relation']['references']);
416 416
         
@@ -418,8 +418,8 @@  discard block
 block discarded – undo
418 418
         if (!$REV && $this->getConf('userns') && isset($INFO['meta']['contributor']))
419 419
         {
420 420
             $cont_temp = array();
421
-            $cont_ns = $this->getConf('userns').($conf['useslash']?'/':':');
422
-            foreach($INFO['meta']['contributor'] as $cont_id => $cont_name)
421
+            $cont_ns = $this->getConf('userns').($conf['useslash'] ? '/' : ':');
422
+            foreach ($INFO['meta']['contributor'] as $cont_id => $cont_name)
423 423
                 $cont_temp[$cont_ns.$cont_id] = $cont_name;
424 424
             $wikipage->addContributors($cont_temp);
425 425
         }
@@ -436,7 +436,7 @@  discard block
 block discarded – undo
436 436
 
437 437
         /* previous and next revision */
438 438
         $changelog = new PageChangeLog($ID);
439
-        $pagerevs = $changelog->getRevisions(0,$conf['recent']+1);
439
+        $pagerevs = $changelog->getRevisions(0, $conf['recent'] + 1);
440 440
         $prevrev = false; $nextrev = false;
441 441
         if (!$REV)
442 442
         {
@@ -453,9 +453,9 @@  discard block
 block discarded – undo
453 453
                 $nextrev = $currentrev - 1;
454 454
             }
455 455
         }
456
-        if ($prevrev !== false && $prevrev > -1 && page_exists($ID,$pagerevs[$prevrev]))
456
+        if ($prevrev !== false && $prevrev > -1 && page_exists($ID, $pagerevs[$prevrev]))
457 457
         /* previous revision*/ $wikipage->addVersionPrevious($pagerevs[$prevrev]);
458
-        if ($nextrev !== false && $nextrev > -1 && page_exists($ID,$pagerevs[$nextrev]))
458
+        if ($nextrev !== false && $nextrev > -1 && page_exists($ID, $pagerevs[$nextrev]))
459 459
         /* next revision*/ $wikipage->addVersionNext($pagerevs[$nextrev]);
460 460
 
461 461
         /* latest revision   */ if ($REV) $wikipage->addVersionLatest();
@@ -509,11 +509,11 @@  discard block
 block discarded – undo
509 509
 
510 510
         // search next level entries (posts, sub containers) in container
511 511
         require_once(DOKU_INC.'inc/search.php');
512
-        $dir  = utf8_encodeFN(str_replace(':','/',$ID));
512
+        $dir = utf8_encodeFN(str_replace(':', '/', $ID));
513 513
         $entries = array();
514 514
         $posts = array();
515 515
         $containers = array();
516
-        search($entries,$conf['datadir'],'search_index',array('ns' => $ID),$dir);
516
+        search($entries, $conf['datadir'], 'search_index', array('ns' => $ID), $dir);
517 517
         foreach ($entries as $entry)
518 518
         {
519 519
             if ($entry['type'] === 'f')
@@ -521,7 +521,7 @@  discard block
 block discarded – undo
521 521
                 // wikisite
522 522
                 $posts[] = $entry;
523 523
             }
524
-            elseif($entry['type'] === 'd')
524
+            elseif ($entry['type'] === 'd')
525 525
             {
526 526
                 // sub container
527 527
                 $containers[] = $entry;
@@ -532,8 +532,8 @@  discard block
 block discarded – undo
532 532
         if (count($posts) + count($containers) == 0)
533 533
             $this->_exit("HTTP/1.0 404 Not Found");
534 534
         
535
-        if (count($posts)>0) $wikicontainer->addArticles($posts);
536
-        if (count($containers)>0) $wikicontainer->addContainers($containers);
535
+        if (count($posts) > 0) $wikicontainer->addArticles($posts);
536
+        if (count($containers) > 0) $wikicontainer->addContainers($containers);
537 537
 
538 538
         //print_r($containers);die();
539 539
         
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
548 548
         global $ID;
549 549
                 
550 550
         // get user info
551
-        $userinfo = getDwUserInfo($ID,$this);
551
+        $userinfo = getDwUserInfo($ID, $this);
552 552
         
553 553
         // no userinfo means there is n user space or user does not exists
554 554
         if ($userinfo === false)
@@ -582,22 +582,22 @@  discard block
 block discarded – undo
582 582
         die();
583 583
     }
584 584
 
585
-    function _getDokuUrl($url=null)
585
+    function _getDokuUrl($url = null)
586 586
     {
587 587
         return getAbsUrl($url);
588 588
     }
589 589
     
590
-    function _getDate($date, $date_alt=null)
590
+    function _getDate($date, $date_alt = null)
591 591
     {
592 592
         if (!$date) $date = $date_alt;
593
-        return date('c',$date);
593
+        return date('c', $date);
594 594
     }
595 595
     
596 596
 }
597 597
 
598 598
 if (!function_exists('getAbsUrl'))
599 599
 {
600
-    function getAbsUrl($url=null)
600
+    function getAbsUrl($url = null)
601 601
     {
602 602
         if ($url == null) $url = DOKU_BASE;
603 603
         return str_replace(DOKU_BASE, DOKU_URL, $url);
@@ -629,7 +629,7 @@  discard block
 block discarded – undo
629 629
         if (!$pobj->getConf('userns')) return false;
630 630
         
631 631
         // get user id
632
-        $userid = str_replace(cleanID($pobj->getConf('userns')).($conf['useslash']?'/':':'),'',$id);
632
+        $userid = str_replace(cleanID($pobj->getConf('userns')).($conf['useslash'] ? '/' : ':'), '', $id);
633 633
         
634 634
         if ($info = $auth->getUserData($userid))
635 635
         {
Please login to merge, or discard this patch.