Merge branch 'better-admin'

1 files changed, 26 insertions, 15 deletions

diff --git a/app/class/Modelmedia.php b/app/class/Modelmedia.php
index 61a2286..567e659 100644
--- a/app/class/Modelmedia.php
+++ b/app/class/Modelmedia.php
@@ -111,30 +111,41 @@ class Modelmedia extends Model
 
 	public function listfavicon()
 	{
-		$extensions = ['ico', 'png', 'jpg', 'jpeg'];
-		$faviconlist = [];
-		foreach ($extensions as $extension ) {
-			$glob = Model::FAVICON_DIR . '*.' . $extension;
-			$faviconlist = array_merge($faviconlist, glob($glob));
-		}
-		$faviconlist = array_map(function ($input){
-			return basename($input);
-		}, $faviconlist);
+		$faviconlist = $this->globlist(self::FAVICON_DIR, ['ico', 'png', 'jpg', 'jpeg', 'gif']);
+		return $faviconlist;
+	}
+
+	public function listthumbnail()
+	{
+		$faviconlist = $this->globlist(self::THUMBNAIL_DIR, ['ico', 'png', 'jpg', 'jpeg', 'gif']);
 		return $faviconlist;
 	}
 
 
 	public function listinterfacecss()
 	{
-		$glob = Model::CSS_DIR . '*.css';
-		$listinterfacecss = glob($glob);
-		$listinterfacecss = array_map(function ($input) {
-			return basename($input);
-		}, $listinterfacecss);
-		$listinterfacecss = array_diff($listinterfacecss, ['edit.css', 'home.css']);
+		$listinterfacecss = $this->globlist(self::CSS_DIR, ['css']);
+		$listinterfacecss = array_diff($listinterfacecss, ['edit.css', 'home.css', 'tagcolors.css']);
 		return $listinterfacecss;
 	}
 
+	public function globlist (string $dir = '', array $extensions = []) : array
+	{
+		$list = [];
+		if(empty($extensions)) {
+			$glob = $dir . '*.';
+		} else {
+			foreach ($extensions as $extension ) {
+				$glob = $dir . '*.' . $extension;
+				$list = array_merge($list, glob($glob));
+			}
+		}
+		$list = array_map(function ($input){
+			return basename($input);
+		}, $list);
+		return $list;
+	}
+
 
 	/**
 	 * Generate an reccursive array where each folder is a array and containing a filecount in each folder