fix #22, fix #44

2 files changed, 7 insertions, 3 deletions

diff --git a/app/class/Model.php b/app/class/Model.php
index 40e3a2e..9c0d500 100644
--- a/app/class/Model.php
+++ b/app/class/Model.php
@@ -58,7 +58,7 @@ abstract class Model
 		'' => 'other'
 	];
 
-	const COLUMNS = ['id', 'title', 'description', 'tag', 'date', 'datemodif', 'datecreation', 'secure', 'authors', 'linkfrom', 'linkto', 'visitcount', 'affcount', 'editcount'];
+	const COLUMNS = ['id', 'favicon', 'title', 'description', 'tag', 'date', 'datemodif', 'datecreation', 'secure', 'authors', 'linkfrom', 'linkto', 'visitcount', 'affcount', 'editcount'];
 
 	const TEXT_ELEMENTS = ['header', 'nav', 'main', 'aside', 'footer'];
 
diff --git a/app/class/Modelmedia.php b/app/class/Modelmedia.php
index a6a682b..61a2286 100644
--- a/app/class/Modelmedia.php
+++ b/app/class/Modelmedia.php
@@ -111,8 +111,12 @@ class Modelmedia extends Model
 
 	public function listfavicon()
 	{
-		$glob = Model::FAVICON_DIR . '*.png';
-		$faviconlist = glob($glob);
+		$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);