Font-based mimes

pydio · Jul 11, 2016 · cf0ba6f · cf0ba6f
1 parent 60dcdcd
commit cf0ba6f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/core/src/core/src/pydio/Core/Utils/Vars/StatHelper.php b/core/src/core/src/pydio/Core/Utils/Vars/StatHelper.php
@@ -66,7 +66,7 @@ public static function getMimeInfo($ajxpNode, $isDir = null)
         if (!isSet($mime)) {
             $mime = $registeredExtensions["ajxp_empty"];
         }
-        return array($mime[2], $mime[1]);
+        return array($mime[3], $mime[1], $mime[2]);
 
     }
 
@@ -95,7 +95,12 @@ private static function getRegisteredExtensions(ContextInterface $ctx)
             $res = array();
             /** @var \DOMElement $node */
             foreach ($nodes as $node) {
-                $res[$node->getAttribute("mime")] = array($node->getAttribute("mime"), $node->getAttribute("icon"), $node->getAttribute("messageId"));
+                $res[$node->getAttribute("mime")] = array(
+                    $node->getAttribute("mime"),
+                    $node->getAttribute("icon"),
+                    $node->getAttribute("font"),
+                    $node->getAttribute("messageId")
+                );
             }
             if (count($res)) {
                 $EXTENSIONS = array_merge($EXTENSIONS, $res);

diff --git a/core/src/plugins/access.ajxp_conf/ConfAccessDriver.php b/core/src/plugins/access.ajxp_conf/ConfAccessDriver.php
@@ -3198,4 +3198,4 @@ public static function availableDriversToXML($filterByTagName = "", $filterByDri
      */
     protected function initRepository(ContextInterface $ctx){
     }
-}
+}
diff --git a/core/src/plugins/access.fs/FsAccessDriver.php b/core/src/plugins/access.fs/FsAccessDriver.php
@@ -1586,13 +1586,17 @@ public function loadNodeInfo(&$ajxpNode, $parentNode = false, $details = false)
         if (RecycleBinManager::recycleEnabled() && $ajxpNode->getPath() == RecycleBinManager::getRelativeRecycle()) {
             $recycleIcon = ($this->countChildren($ajxpNode, false, true)>0?"trashcan_full.png":"trashcan.png");
             $metaData["icon"] = $recycleIcon;
+            $metaData["fonticon"] = "delete";
             $metaData["mimestring_id"] = 122;
             //$ajxpNode->setLabel($mess[122]);
             $metaData["ajxp_mime"] = "ajxp_recycle";
         } else {
             $mimeData = StatHelper::getMimeInfo($ajxpNode, !$isLeaf);
             $metaData["mimestring_id"] = $mimeData[0];
             $metaData["icon"] = $mimeData[1];
+            if(!empty($mimeData[2])){
+                $metaData["fonticon"] = $mimeData[2];
+            }
             if ($metaData["icon"] == "folder.png") {
                 $metaData["openicon"] = "folder_open.png";
             }