diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php index e8d9a49cf530..6677d9839afa 100644 --- a/app/Http/Controllers/ImportController.php +++ b/app/Http/Controllers/ImportController.php @@ -123,6 +123,7 @@ class ImportController extends Controller $hit = false; $unsetKey = false; + // array_multisort(array_column($translated_keys, 'label'), SORT_ASC, $translated_keys); foreach($translated_keys as $tkey => $tvalue) { @@ -131,10 +132,10 @@ class ImportController extends Controller $hit = $available_keys[$tvalue['key']]; $unsetKey = $tkey; } - elseif($this->testMatch($value, $tvalue['index'])) { - $hit = $available_keys[$tvalue['key']]; - $unsetKey = $tkey; - } + // elseif($this->testMatch($value, $tvalue['index'])) { + // $hit = $available_keys[$tvalue['key']]; + // $unsetKey = $tkey; + // } } @@ -148,13 +149,13 @@ class ImportController extends Controller } + nlog($translated_keys); + return $hints; } private function testMatch($haystack, $needle): bool - { nlog("needle = {$needle}"); - nlog("haystack = {$haystack}"); - + { return stripos($haystack, $needle) !== false; } diff --git a/public/storage/.htaccess b/public/storage/.htaccess new file mode 100644 index 000000000000..377516b7230a --- /dev/null +++ b/public/storage/.htaccess @@ -0,0 +1,4 @@ + +Order deny,Allow +Deny from all + diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore old mode 100755 new mode 100644