renaming, reformatting

Author: Klap-in

helper/repository.php

@@ -12,7 +12,7 @@
  */
 class helper_plugin_pluginrepo_repository extends Plugin
 {
-    public array $dokuReleases = []; // array of DokuWiki releases (name & date)
+    private array $dokuReleases = []; // array of DokuWiki releases (name & date)
 
     public array $types = [
         1   => 'Syntax',
@@ -292,15 +292,15 @@ public function getPlugins($filter = null)
         $sortsql = $this->getPluginsSortSql($sort);
 
         $alltypes = 0;
-        foreach (array_keys($this->types) as $t) {
-            $alltypes += $t;
+        foreach (array_keys($this->types) as $number) {
+            $alltypes += $number;
         }
 
         if ($tag) {
             if ($type < 1 || $type > $alltypes) {
                 $type = $alltypes; //all types
             }
-            $sql = "SELECT A.*, SUBSTR(A.plugin,10) as simplename
+            $sql = "    SELECT A.*, SUBSTR(A.plugin,10) as simplename
                         FROM plugins A
                         WHERE A.type = 32 AND $where_filtered
                             AND (A.type & :plugin_type)
@@ -317,7 +317,7 @@ public function getPlugins($filter = null)
                 $values
             );
         } elseif ($type > 0 && $type <= $alltypes) {
-            $sql = "SELECT A.*, SUBSTR(A.plugin,10) as simplename
+            $sql = "    SELECT A.*, SUBSTR(A.plugin,10) as simplename
                         FROM plugins A
                         WHERE A.type = 32 AND $where_filtered
                             AND (A.type & :plugin_type)
@@ -427,8 +427,8 @@ public function getFilteredPlugins(
 
         // default to all extensions
         if ($type == 0) {
-            foreach (array_keys($this->types) as $t) {
-                $type += $t;
+            foreach (array_keys($this->types) as $number) {
+                $type += $number;
             }
         }
 
@@ -1025,11 +1025,11 @@ public function parsetags($string)
     public function listtype($type, $target, $sep = ', ')
     {
         $types = [];
-        foreach ($this->types as $k => $v) {
-            if ($type & $k) {
-                $url = wl($target, ['plugintype' => $k]) . '#extension__table';
-                $types[] = '<a href="' . $url . '" class="wikilink1" title="List all ' . $v . ' plugins">'
-                        . $v
+        foreach ($this->types as $number => $label) {
+            if ($type & $number) {
+                $url = wl($target, ['plugintype' => $number]) . '#extension__table';
+                $types[] = '<a href="' . $url . '" class="wikilink1" title="List all ' . $label . ' plugins">'
+                        . $label
                         . '</a>';
             }
         }
@@ -1046,9 +1046,9 @@ public function listtype($type, $target, $sep = ', ')
     public function listtypes($type)
     {
         $types = [];
-        foreach ($this->types as $k => $v) {
-            if ($type & $k) {
-                $types[] = $v;
+        foreach ($this->types as $number => $label) {
+            if ($type & $number) {
+                $types[] = $label;
             }
         }
         sort($types);
@@ -1064,9 +1064,9 @@ public function listtypes($type)
     public function parsetype($types)
     {
         $type = 0;
-        foreach ($this->types as $k => $v) {
-            if (preg_match('#' . preg_quote($v) . '#i', $types)) {
-                $type += $k;
+        foreach ($this->types as $number => $label) {
+            if (preg_match('#' . preg_quote($label) . '#i', $types)) {
+                $type += $number;
             }
         }
         if ($type === 0 && $types === '') {

repository.php

@@ -73,9 +73,9 @@ function getRepository()
         $feed .= '<type>';
         if ($plugin['type']) {
             $types = [];
-            foreach ($hlp->types as $k => $v) {
-                if ($plugin['type'] & $k) {
-                    $types[] = $v;
+            foreach ($hlp->types as $number => $label) {
+                if ($plugin['type'] & $number) {
+                    $types[] = $label;
                 }
             }
             sort($types);

syntax/news.php

@@ -211,8 +211,9 @@ public function showDefault($R, $data)
 
             $url = $row['screenshot'];
             if ($url && $data['showscreenshot']) {
-                $R->doc .= '<a href="' . ml($url) . '" class="media screenshot" rel="lightbox">';
-                $R->doc .= '<img src="' . ml($url, "w=200") . '" alt="" width="200" /></a>';
+                $R->doc .= '<a href="' . ml($url) . '" class="media screenshot" rel="lightbox">'
+                    . '<img src="' . ml($url, "w=200") . '" alt="" width="200" />'
+                    . '</a>';
             }
 
             $R->doc .= '<p class="author">Author: ';

syntax/query.php

@@ -250,9 +250,9 @@ public function render($format, Doku_Renderer $renderer, $data)
                     $renderer->doc .= '<td>';
 
                     if ($field == 'type') {
-                        foreach ($this->hlp->types as $k => $v) {
-                            if ($row['type'] & $k) {
-                                $renderer->doc .= $v . ' ';
+                        foreach ($this->hlp->types as $number => $label) {
+                            if ($row['type'] & $number) {
+                                $renderer->doc .= $label . ' ';
                             }
                         }
                     } elseif ($field == 'plugin') {

syntax/table.php

@@ -170,7 +170,7 @@ public function showMainSearch($R)
         <p>
             $intro
         </p>
-        <form action="{$url}" accept-charset="utf-8" class="plugin-search" id="dw__search2" method="get">
+        <form action="$url" accept-charset="utf-8" class="plugin-search" id="dw__search2" method="get">
             <div class="no">
                 <input type="hidden" name="do" value="search" />
                 <input type="hidden" id="dw__ns" name="ns" value="$searchNS" />
@@ -258,9 +258,10 @@ public function tagcloud($R, $data)
         $tagData = $this->hlp->getTags($data['cloudmin'], $data);
         // $tagData will be sorted by cnt (descending)
         foreach ($tagData as $tag) {
+            // obsolete plugins are not included in the table
             if ($tag['tag'] == $this->hlp->obsoleteTag) {
                 continue;
-            } // obsolete plugins are not included in the table
+            }
             $tags[$tag['tag']] = $tag['cnt'];
             if (!$max) {
                 $max = $tag['cnt'];