Rebase and update

Author: DepaMarco

README.md

@@ -8,8 +8,8 @@
 
 This is the main source code repository of Pydio (formerly AjaXplorer), containing all the PHP server and HTML5 Web GUI.
 
-* Latest Stable release : 6.2.0
-* Latest Dev release : 5.3.4 (was RC4 for Pydio 6.0.0)
+* Latest Stable release : 6.4.1
+* Latest Dev release : 6.3.1 (was RC for Pydio 6.4)
 * License: [AGPLv3](https://www.gnu.org/licenses/agpl.html)
 * Lead developer  : Charles du Jeu (cdujeu): [Github](https://github.com/cdujeu) | [Twitter](https://twitter.com/Pydio)
 

core/src/conf/RELEASE_NOTE

@@ -1,5 +1,49 @@
 Pydio ##VERSION_NUMBER## Release Note
 
+Pydio Core 6.4.1 - Bug Fixes for 6.4
+
+Pydio Core 6.4.1 fixes most blocking issues revealed by the massive upgrade to 6.4.0. Installation is done via the "Stable" update channel in-app, or via Linux packages manager depending on your installation mode.
+
+[Overview]
+Many issues fixed in shares, linked to the deep refactoring of this feature. Amongst others, the "shorten" plugins were broken.
+* UI : Missing close button on some new dialogs, mobile display of the web UI was a little buggy
+* CMS Bridges where broken due to an issue in the glueCode.php file
+* Federated Sharing: some installs could have issues with URI's.
+
+
+[Detailed Changelog]
+Fix GlueCode.php (details)
+Use longer description in api generator. (details)
+Missing media.css file in gruntfile. (details)
+Missing log for ShareNode action (details)
+Fix method signature for PHP7 (details)
+Expand api docs generator (details)
+Rework Share options for folders / files vs. public links / internal sharing - Fix #1143 Better invalid share detection and remove it from meta. Fix many error messages. (details)
+Update i18n (details)
+Core.mailer : add DROP TRIGGER IF EXISTS (details)
+Do not display section title if list is empty - Fix #1154 (details)
+Fix #1148 (details)
+Fix some media CSS (details)
+Fix various glitches on Spanish language. Close #1136 (details)
+Fix #1128 : add the ability to reject a previously accepted share. (details)
+Make sure to transfer an empty DATA_TEMPLATE value to child repository - Fix #1152 Fix broken unsharing. (details)
+Remove legacy share js resources - Discourage people to use old themes for now. (details)
+Add a canWrite attribute on editors declaration, use it in ShareDialog to detect if a file has "writeable" editors and show an additional Edit permission for public links on files. (details)
+Fix various issues with shares lists, especially in My Account & Admin panels. (details)
+Use original_path for header if present in metadata. (details)
+Fix failed remote share: make sure to remove unnecessary data on failure. (details)
+Display close icon for mp3 player. Fix #1156 (details)
+Fix htaccess tpl : replace ocs.php by opencollab.php (details)
+Rewire missing action for deleting user-created workspace. (details)
+Fixing S3 and webdav access (details)
+Fix to #1157: adding support for apcu (details)
+Fix to support mysqli (details)
+Display close icon for versioning plugins (details)
+Updated german translations and unified various words (details)
+Fixed typo (details)
+Fix broken shortener plugins : use a url.shorten hook instead of capturing share action output. Store data in share instead of metadata. (details)
+
+----
 Pydio 6.4.0 is a stable release introducing many important new features!
 
 Installation is done via the "Stable" update channel in-app.

core/src/core/classes/class.AJXP_Node.php

@@ -402,15 +402,22 @@ public function loadNodeInfo($forceRefresh = false, $contextNode = false, $detai
         if($this->nodeInfoLoaded && $this->nodeInfoLevel != $details){
             $forceRefresh = true;
         }
-        if($this->nodeInfoLoaded && !$forceRefresh) return;
+        if($this->nodeInfoLoaded && !$forceRefresh){
+            return;
+        }
         if (!empty($this->_wrapperClassName)) {
             $registered = AJXP_PluginsService::getInstance()->getRegisteredWrappers();
             if (!isSet($registered[$this->getScheme()])) {
                 $driver = $this->getDriver();
                 if(is_object($driver)) $driver->detectStreamWrapper(true);
             }
         }
+        AJXP_Controller::applyHook("node.info.start", array(&$this, $contextNode, $details));
+        if($this->nodeInfoLoaded && !$forceRefresh){
+            return;
+        }
         AJXP_Controller::applyHook("node.info", array(&$this, $contextNode, $details));
+        AJXP_Controller::applyHook("node.info.end", array(&$this, $contextNode, $details));
         $this->nodeInfoLoaded = true;
         $this->nodeInfoLevel = $details;
     }
@@ -519,6 +526,23 @@ public function mergeMetadata($metadata, $mergeValues = false)
         }
     }
 
+    /**
+     * Return all metadata loaded during node.info, mainly used for caching.
+     * @return array
+     */
+    public function getNodeInfoMeta(){
+        return $this->_metadata;
+    }
+
+    /**
+     * Set nodeInfoLoaded to true from external.
+     * @param string $level
+     */
+    public function setInfoLoaded($level){
+        $this->nodeInfoLoaded = true;
+        $this->nodeInfoLevel = $level;
+    }
+
     /**
      * Magic getter for metadata
      * @param $varName

core/src/core/classes/class.AJXP_PluginsService.php

@@ -40,6 +40,9 @@ class AJXP_PluginsService
      * @var AbstractConfDriver
      */
     private $confStorage;
+    /**
+     * @var AbstractCacheDriver
+     */
     private $cacheStorage;
     private $mixinsDoc;
     private $mixinsXPath;
@@ -65,7 +68,7 @@ private function _loadRegistryFromCache(){
 
                 // Retrieving Registry from Server Cache
                 if ($this->cacheStorage) {
-                    $res = $this->cacheStorage->fetch('plugins_registry');
+                    $res = $this->cacheStorage->fetch(AJXP_CACHE_SERVICE_NS_SHARED, 'plugins_registry');
 
                     $this->registry=$res;
                 }
@@ -118,7 +121,7 @@ public function loadPluginsRegistryFromCache($cacheStorage = null) {
      */
     public function savePluginsRegistryToCache() {
         if (!empty ($this->cacheStorage)) {
-            $this->cacheStorage->save("plugins_registry", $this->registry);
+            $this->cacheStorage->save(AJXP_CACHE_SERVICE_NS_SHARED, "plugins_registry", $this->registry);
         }
     }
 

core/src/core/classes/class.AJXP_SchemeTranslatorWrapper.php

@@ -44,8 +44,8 @@ class AJXP_SchemeTranslatorWrapper extends AJXP_MetaStreamWrapper implements Ajx
     /*
      * Initialise the path for a file
      */
-    public static function applyInitPathHook($path) {
-        // Not defined
+    public static function applyInitPathHook($path, $context = 'core') {
+        //Do nothing
     }
 
     /**

core/src/core/classes/class.AJXP_Utils.php

@@ -956,7 +956,10 @@ public static function extractHooksToDoc()
         } else {
             $existingHooks = array();
         }
-        $allPhpFiles = self::glob_recursive(AJXP_INSTALL_PATH."/*.php");
+        $allPhpFiles1 = self::glob_recursive(AJXP_INSTALL_PATH."/core/classes/*.php");
+        $allPhpFiles2= self::glob_recursive(AJXP_INSTALL_PATH."/plugins/*.php");
+        $allPhpFiles3= self::glob_recursive(AJXP_INSTALL_PATH."/conf/*.php");
+        $allPhpFiles = array_merge(array_merge($allPhpFiles1, $allPhpFiles2), $allPhpFiles3);
         $hooks = array();
         foreach ($allPhpFiles as $phpFile) {
             $fileContent = file($phpFile);
@@ -966,7 +969,19 @@ public static function extractHooksToDoc()
                     $params = $matches[2];
                     foreach ($names as $index => $hookName) {
                         if(!isSet($hooks[$hookName])) $hooks[$hookName] = array("TRIGGERS" => array(), "LISTENERS" => array());
-                        $hooks[$hookName]["TRIGGERS"][] = array("FILE" => substr($phpFile, strlen(AJXP_INSTALL_PATH)), "LINE" => $lineNumber);
+                        $filename = substr($phpFile, strlen(AJXP_INSTALL_PATH));
+                        if(strpos($filename, "/plugins") === 0) {
+                            $source = explode("/", $filename)[2];
+                        } else {
+                            $source = str_replace(array("class.", ".php"), "", array_pop(explode("/", $filename)));
+                        }
+                        if(!isSet($hooks[$hookName]["TRIGGERS"][$source])){
+                            $hooks[$hookName]["TRIGGERS"][$source] = array();
+                        }
+                        $hooks[$hookName]["TRIGGERS"][$source][] = array(
+                            "FILE" => $filename,
+                            "LINE" => $lineNumber
+                        );
                         $hooks[$hookName]["PARAMETER_SAMPLE"] = $params[$index];
                     }
                 }
@@ -979,9 +994,12 @@ public static function extractHooksToDoc()
             $name = $xmlHook->getAttribute("hookName");
             $method = $xmlHook->getAttribute("methodName");
             $pluginId = $xmlHook->getAttribute("pluginId");
+            $deferred = $xmlHook->getAttribute("defer") === "true";
             if($pluginId == "") $pluginId = $xmlHook->parentNode->parentNode->parentNode->getAttribute("id");
             if(!isSet($regHooks[$name])) $regHooks[$name] = array();
-            $regHooks[$name][] = array("PLUGIN_ID" => $pluginId, "METHOD" => $method);
+            $data = array("PLUGIN_ID" => $pluginId, "METHOD" => $method);
+            if($deferred) $data["DEFERRED"] = true;
+            $regHooks[$name][] = $data;
         }
 
         foreach ($hooks as $h => $data) {

core/src/core/classes/class.AuthService.php

@@ -1147,7 +1147,8 @@ public static function getRole($roleId, $createIfNotExists = false)
     public static function updateRole($roleObject, $userObject = null)
     {
         ConfService::getConfStorageImpl()->updateRole($roleObject, $userObject);
-        CacheService::deleteAll();
+        //CacheService::deleteAll(AJXP_CACHE_SERVICE_NS_SHARED);
+        ConfService::getInstance()->invalidateLoadedRepositories();
     }
     /**
      * Delete a role by its id
@@ -1158,7 +1159,8 @@ public static function updateRole($roleObject, $userObject = null)
     public static function deleteRole($roleId)
     {
         ConfService::getConfStorageImpl()->deleteRole($roleId);
-        CacheService::deleteAll();
+        //CacheService::deleteAll(AJXP_CACHE_SERVICE_NS_SHARED);
+        ConfService::getInstance()->invalidateLoadedRepositories();
     }
 
     public static function filterPluginParameters($pluginId, $params, $repoId = null)

core/src/core/classes/class.CacheService.php

@@ -28,72 +28,77 @@
 class CacheService
 {
     /**
+     * @param $namespace
      * @param $id
      * @return bool
      */
-    public static function contains($id) {
+    public static function contains($namespace, $id) {
         $cacheDriver = ConfService::getCacheDriverImpl();
 
         if ($cacheDriver) {
-            return $cacheDriver->contains($id);
+            return $cacheDriver->contains($namespace, $id);
         }
 
         return false;
     }
 
     /**
+     * @param $namespace
      * @param $id
      * @param $object
      * @param int $timelimit
      * @return bool
      */
-    public static function save($id, $object, $timelimit = 0 ) {
+    public static function save($namespace, $id, $object, $timelimit = 0) {
         $cacheDriver = ConfService::getCacheDriverImpl();
 
         if ($cacheDriver) {
-            return $cacheDriver->save($id, $object, $timelimit);
+            return $cacheDriver->save($namespace, $id, $object, $timelimit);
         }
 
         return false;
     }
 
     /**
+     * @param $namespace
      * @param $id
      * @return bool|mixed
      */
-    public static function fetch($id) {
+    public static function fetch($namespace, $id) {
         $cacheDriver = ConfService::getCacheDriverImpl();
 
         if ($cacheDriver) {
-            $data = $cacheDriver->fetch($id);
+            $data = $cacheDriver->fetch($namespace, $id);
             return $data;
         }
 
         return false;
     }
 
     /**
+     * @param $namespace
      * @param $id
      * @return bool
      */
-    public static function delete($id) {
+    public static function delete($namespace, $id) {
         $cacheDriver = ConfService::getCacheDriverImpl();
 
         if ($cacheDriver) {
-            return $cacheDriver->delete($id);
+            return $cacheDriver->delete($namespace, $id);
         }
 
         return false;
     }
 
     /**
+     * @param $namespace
      * @return bool
      */
-    public static function deleteAll() {
+    public static function deleteAll($namespace) {
         $cacheDriver = ConfService::getCacheDriverImpl();
 
         if ($cacheDriver) {
-            return $cacheDriver->deleteAll();
+            return $cacheDriver->deleteAll($namespace);
         }
 
         return false;