Merge branch 'cosmocode:master' into metadata-fix

Author: alexdraconian

_test/ConfigParserTest.php

@@ -87,6 +87,7 @@ public function test_simple()
             'nesting' => 0,
             'index' => 0,
             'classes' => ['struct-custom-foo', 'struct-custom-bar'],
+            'actcol' => -1,
         ];
 
         $this->assertEquals($expected_config, $actual_config);

_test/InlineConfigParserTest.php

@@ -54,6 +54,7 @@ public function test_simple()
             'nesting' => 0,
             'index' => 0,
             'classes' => [],
+            'actcol' => -1,
         ];
 
         $this->assertEquals($expected_config, $actual_config);

_test/SearchConfigTest.php

@@ -33,6 +33,40 @@ public function test_filtervars_simple()
         $this->assertEquals(date('Y-m-d'), $searchConfig->applyFilterVars('$DATE(now)$'));
     }
 
+    public function test_filtervars_nsorid()
+    {
+        global $INFO;
+
+
+        $searchConfig = new SearchConfig([]);
+
+        // normal page
+        $INFO['id'] = 'foo:bar:baz';
+        $this->assertEquals('foo:bar:baz', $searchConfig->applyFilterVars('$NSORID$'));
+
+        // start page: start in namespace
+        $INFO['id'] = 'foo:bar:start';
+        saveWikiText($INFO['id'], 'start page', 'start created');
+        $this->assertEquals('foo:bar', $searchConfig->applyFilterVars('$NSORID$'));
+        saveWikiText($INFO['id'], '', 'start page deleted');
+        clearstatcache();
+
+        // start page: same as namespace in namespace
+        $INFO['id'] = 'foo:bar:bar';
+        saveWikiText($INFO['id'], 'start page', 'start created');
+        $this->assertEquals('foo:bar', $searchConfig->applyFilterVars('$NSORID$'));
+        saveWikiText($INFO['id'], '', 'start page deleted');
+        clearstatcache();
+
+        // start page: same as namespace in above namespace
+        // incidally this is the same as a normal page
+        $INFO['id'] = 'foo:bar';
+        saveWikiText($INFO['id'], 'start page', 'start created');
+        $this->assertEquals('foo:bar', $searchConfig->applyFilterVars('$NSORID$'));
+        saveWikiText($INFO['id'], '', 'start page deleted');
+        clearstatcache();
+    }
+
     public function test_filtervars_struct()
     {
         global $INFO;

action/migration.php

@@ -413,7 +413,7 @@ protected function getFixedValues($row)
             }
         }
 
-        if (!empty($fixes)) {
+        if ($fixes !== []) {
             $fixes = array_map(static fn($set, $key) => "$key = '$set'", $fixes, array_keys($fixes));
         }
 

helper/config.php

@@ -20,7 +20,7 @@ class helper_plugin_struct_config extends Plugin
      */
     public function parseSort($val)
     {
-        if (substr($val, 0, 1) == '^') {
+        if (str_starts_with($val, '^')) {
             return [substr($val, 1), false];
         }
         return [$val, true];

jsoneditor/setup.js

@@ -28,6 +28,10 @@ jQuery(function () {
         this.updateEditor = function () {
             editor.setText($config.val());
         };
+        // collapse all nodes except for the new element
+        if(!$config.parents('.new').length) {
+            editor.collapseAll();
+        }
     });
 
     /**

lang/en/lang.php

@@ -81,7 +81,6 @@
 $lang['Exception no sqlite']   = 'The struct plugin requires the sqlite plugin. Please install and enable it.';
 $lang['Exception column not in table'] = 'There is no column %s in schema %s.';
 $lang['Exception datefilter']  = 'The filter: \'<code>$Date(%s)$</code>\' contains an unsupported value.';
-$lang['Warning: no filters for cloud'] = 'Filters are not supported for struct clouds.';
 $lang['sort']                  = 'Sort by this column';
 $lang['next']                  = 'Next page';
 $lang['prev']                  = 'Previous page';

meta/Assignments.php

@@ -291,12 +291,12 @@ protected function matchPagePattern($pattern, $page, $pns = null)
         }
 
         $ans = ':' . cleanID($pattern) . ':';
-        if (substr($pattern, -2) == '**') {
+        if (str_ends_with($pattern, '**')) {
             // upper namespaces match
-            if (strpos($pns, $ans) === 0) {
+            if (str_starts_with($pns, $ans)) {
                 return true;
             }
-        } elseif (substr($pattern, -1) == '*') {
+        } elseif (str_ends_with($pattern, '*')) {
             // namespaces match exact
             if ($ans == $pns) {
                 return true;

meta/Column.php

@@ -193,9 +193,9 @@ public static function allTypes($reload = false)
         $files = glob(DOKU_PLUGIN . 'struct/types/*.php');
         foreach ($files as $file) {
             $file = basename($file, '.php');
-            if (substr($file, 0, 8) == 'Abstract') continue;
-            if (substr($file, 0, 5) == 'Trait') continue;
-            if (substr($file, 0, 4) == 'Auto') continue;
+            if (str_starts_with($file, 'Abstract')) continue;
+            if (str_starts_with($file, 'Trait')) continue;
+            if (str_starts_with($file, 'Auto')) continue;
             $map[$file] = 'dokuwiki\\plugin\\struct\\types\\' . $file;
         }
 

meta/ConfigParser.php

@@ -30,7 +30,8 @@ class ConfigParser
         'csv' => true,
         'nesting' => 0,
         'index' => 0,
-        'classes' => []
+        'classes' => [],
+        'actcol' => -1,
     ];
 
     /**
@@ -131,6 +132,11 @@ public function __construct($lines)
                 case 'classes':
                     $this->config['classes'] = $this->parseClasses($val);
                     break;
+                case 'actcol':
+                case 'actioncol':
+                case 'actioncolumn':
+                    $this->config['actcol'] = (int) $val;
+                    break;
                 default:
                     $data = ['config' => &$this->config, 'key' => $key, 'val' => $val];
                     $ev = new Event('PLUGIN_STRUCT_CONFIGPARSER_UNKNOWNKEY', $data);