linting, fix typo & probable #3

lerni · Jun 28, 2023 · 892da10 · 892da10
1 parent 5732bb0
commit 892da10
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Silverstripe FolderIndex
-Silverstripe FolderIndex let you manage visibility of files for Search Engines on parent folder basis, by setting X-Robots header-tags `noindex`, `nofollow`, `noimageindex`, `noarchive`, `nosnippet`. By uncheck `ShowInSearch` under `Details` of a folder, headers 'll be set on all files contained, inclusive files in sub-folders. If `gorriecoe/silverstripe-robots` is installed, "unchecked folders" are also disallowed per `robots.txt`.
+Silverstripe FolderIndex lets you manage the visibility of files for Search Engines on a parent folder basis, by setting X-Robots header-tags `noindex`, `nofollow`, `noimageindex`, `noarchive`, `nosnippet`. By unchecking `ShowInSearch` under `Details` of a folder, headers will be set on all files contained, including files in sub-folders. If `gorriecoe/silverstripe-robots` is installed, "unchecked folders" are also disallowed per `robots.txt`.
 
 The module also adds `NoFileIndex()` to `File`. This can be used for checking in xml-sitemap, schema etc. and is used in CMS/Assets to indicate, if a file has X-Robots-Tag headers set per parent Folder or parent/parent/etc. If headers are set, it return the Folder-Object that blocks indexing, otherwise false. So far this module just integrates with Apache `.htaccess`.
 

diff --git a/composer.json b/composer.json
@@ -1,30 +1,30 @@
 {
-    "name": "lerni/folderindex",
-    "type": "silverstripe-vendormodule",
-    "description": "Silverstripe Extension to send  noindex, nofollow for files in foldes that do not ShowInSearch.",
-    "homepage": "https://github.com/lerni/folderindex",
-    "keywords": ["Silverstripe", "assets", "noindex", "File", "Image"],
-    "license": "BSD-3-Clause",
-    "keywords": [
-        "Silverstripe",
-        "assets",
-        "noindex",
-        "File",
-        "Image"
-    ],
-    "homepage": "https://github.com/lerni/folderindex",
-    "license": "BSD-3-Clause",
-    "require": {
-        "silverstripe/asset-admin": "^1.6"
-    },
+	"name": "lerni/folderindex",
+	"type": "silverstripe-vendormodule",
+	"description": "Silverstripe Extension to send  noindex, nofollow for files in foldes that do not ShowInSearch.",
+	"homepage": "https://github.com/lerni/folderindex",
+	"keywords": ["Silverstripe", "assets", "noindex", "File", "Image"],
+	"license": "BSD-3-Clause",
+	"keywords": [
+		"Silverstripe",
+		"assets",
+		"noindex",
+		"File",
+		"Image"
+	],
+	"homepage": "https://github.com/lerni/folderindex",
+	"license": "BSD-3-Clause",
+	"require": {
+		"silverstripe/asset-admin": "^1.6"
+	},
 	"suggest": {
 		"gorriecoe/silverstripe-robots": "robots.txt generation for Silverstripe"
 	},
-    "autoload": {
-        "psr-4": {
-            "Kraftausdruck\\": "src/"
-        }
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+	"autoload": {
+		"psr-4": {
+			"Kraftausdruck\\Extensions\\": "src/"
+		}
+	},
+	"minimum-stability": "dev",
+	"prefer-stable": true
 }
diff --git a/src/Extensions/FileIndexExtension.php b/src/Extensions/FileIndexExtension.php
@@ -23,14 +23,13 @@ public function NoFileIndex()
             $parentIterInstance = $this->owner->parent();
             $counter = 0;
             $max = 10;
-            while($parentIterInstance->ShowInSearch and ($counter < $max)) {
+            while ($parentIterInstance->ShowInSearch and ($counter < $max)) {
                 $parentIterInstance = $parentIterInstance->parent();
                 $counter++;
             }
             if ($parentIterInstance->ID != 0) {
                 return $parentIterInstance;
             }
-
         } else {
             return false;
         }

diff --git a/src/Extensions/FolderIndexTemplateUtils.php b/src/Extensions/FolderIndexTemplateUtils.php
@@ -8,21 +8,24 @@
 use SilverStripe\Core\ClassInfo;
 use SilverStripe\View\TemplateGlobalProvider;
 
-class FolderIndexTemplateUtils implements TemplateGlobalProvider {
+class FolderIndexTemplateUtils implements TemplateGlobalProvider
+{
 
     private static $utility_functions = [
         'KraftausdruckFolderIndex'
     ];
 
-    public static function get_template_global_variables() {
+    public static function get_template_global_variables()
+    {
         return static::$utility_functions;
     }
 
-    public static function KraftausdruckFolderIndex() {
+    public static function KraftausdruckFolderIndex()
+    {
 
         $fileClasses = ClassInfo::subclassesFor(File::class);
 
-        if (count($fileClasses)) {
+        if (count($fileClasses) && ClassInfo::hasTable('File')) {
             $blockingFolders = Folder::get()->filter(['ShowInSearch' => 0]);
             $blockingFoldersArr = [];
             foreach ($blockingFolders as $bf) {
@@ -38,7 +41,7 @@ public static function KraftausdruckFolderIndex() {
                     }
                 }
             }
-            if(count($subBlockingFoldersArr)) {
+            if (count($subBlockingFoldersArr)) {
                 $blockingFolders = $blockingFolders->exclude(['ID' => $subBlockingFoldersArr]);
             }
         } else {

diff --git a/src/Extensions/RobotsFoldersExtension.php b/src/Extensions/RobotsFoldersExtension.php
@@ -13,7 +13,7 @@ public function updateDisallowedUrls(&$urls)
         if (Robots::config()->disallow_unsearchable) {
             $blockingFolders = Folder::get()->filter(['ShowInSearch' => 0]);
             foreach ($blockingFolders as $folder) {
-                $urls[] = '/assets/'. $folder->getFilename();
+                $urls[] = '/assets/' . $folder->getFilename();
             }
         }
     }