Merge develop into master

Author: cdujeu

core/src/.htaccess

@@ -22,6 +22,13 @@ RewriteRule (.*) index.php [L]
 
 #RewriteCond %{HTTP:Authorization} ^(.*)
 #RewriteRule ^(.*) - [E=HTTP_AUTHORIZATION:%1]
+
+#Following lines may be necessary for a PHP-FPM setup
+# to make sure that authorization is transmitted.
+# Just remove the # at the beginning of the line
+
+#SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
+
 </IfModule>
 
 AddType application/json .json

core/src/conf/RELEASE_NOTE

@@ -1,5 +1,105 @@
 Pydio ##VERSION_NUMBER## Release Note
 
+Pydio 6.0.3 - Important Bugfix release
+
+Probably found the root cause of "Ooops your language file is empty..." (details)
+Admin Delegation: fix various criteria filtering and workspace listing conditions that were breaking template-created workspaces for group Admin, as well as returning wrong users count (although correct users list). (details)
+Fix various customization options: logo height/width + add a class to the main element observing the current workspace slug, can be used for specific welcome, settings, etc styling. (details)
+Changed action name (details)
+Changed action name (details)
+Added Plugin Parameters (details)
+Added configuration parameters (details)
+meta.user plugin translation into Czech (details)
+meta.comments plugin translation into Czech (details)
+core.ajaxplorer Czech translation update, as there was already something available (details)
+FIX: Changed some translations to convert accented letters (details)
+FIX: Some other little changes in Italian translations (details)
+Fixed some little translation error (details)
+FIX: Italian little fixes (details)
+Italian translation for plugin 'editor.imagick' (details)
+Italian translation for plugin 'editor.openlayer' (details)
+Italian translation for plugin 'editor.other' (details)
+Italian transtaltion for plugin 'editor.pixlr' (details)
+Make sure to use the dirDefault attribute when overriding the ls action, or it can be lost by XML merging. Was breaking folder opening in guest user mode. (details)
+Fix video player overlap with menu in FF and IE (details)
+Fix wrong typing for settings leftpane initA value, was making the right pane disappear if folded. (details)
+Fix positioning problems that could lead to the right panel totally disappearing (details)
+Stop observing click after clicking on a workspace to avoid multiple loading Replace margin-top by top positioning to use window height instead of window with as reference. z-index and width fix in gui.ios (details)
+Faster Loading GUI (details)
+conf.sql plugin Czech translation (details)
+Update ru.php (details)
+access.mysql Czech translation (details)
+missing "," character in access.mysql en.php file causing missing string via php2po transition (details)
+Fix cpane_container positioning for minisites (details)
+Update ru.php (details)
+Create ru.php (details)
+Update ru.php (details)
+Update ru.php (details)
+Update french translation (details)
+Expand a simple diagnostic tool to test REST API on a given workspace. Call runTests.php?api=true to trigger. (details)
+Filter the for(var k in ...) entries with hasOwnProperty() call in RoleEditor. Fixes #789 (details)
+Do not include shared repositories in updateAdminRights or it can end up filing the role with tons of repos. (details)
+Fix sqlite deleteRepository case - Use better error message and log SQL error. Fix #779 (details)
+The return of the QRCode - Fix #783 (details)
+Add an optional parameter to use a specific header value (e.g. X-Forwarder-For) instead of local detected IP in the logs. Fix #763 (details)
+Do not trigger error on fopen (it is catched later). (details)
+Experimental feature to monitor underlying storage changes. To be tested. (details)
+access.fs: Sort filenames case insensitive (details)
+Index new detected items recursively (details)
+Move folder operation for s3: get all keys with prefix, copy objects to new key and delete old ones. (details)
+Make sure to catch exception on S3Client->headObject calls. Could lead to NoSuchKeyException in some cases (minisites). (details)
+Make sure to use minisite_session parameter in plUploader (details)
+Plupload Fix Minisite-Problem (details)
+Italian translation for plugin 'editor.soundmanager' (details)
+Italian translation for plugin 'editor.text' (details)
+Italian translation for plugin 'editor.video' (details)
+Italian translation for plugin 'editor.webodf' (details)
+Italian translation for plugin 'editor.zoho' (details)
+Fix videos tutorial zIndex issue (details)
+Fix #807 - Change language on Public minisite Error (details)
+In some case it's possible to hit save on non-writeable workspace, which creates duplicates. Fix #806 (details)
+UI bug, fix #796 (details)
+Issue in static repository id was creating a bug in updateAdminRights, inflating admin role until DB error. (details)
+Disable guest user detection for minisite. UpdateAdminRights : do not call method in foreach loop (details)
+Display a new panel in My Account to manage api keys. Let this plugin active for all protocols otherwise it will not appear in web interface. Ability to manually revoke one or all keys. Hook to the new user.after_password_change event to revoke all keys automatically. New osFromUserAgent function for prettier display. Minor tweaks in core js/css (details)
+Fix guest login screen (details)
+Drop IE6 support (png hack, useless) Clean parameters passed to bootstrap using exposed plugin configs instead. Create aliases in window: pydio and pydioBootstrap objects: (details)
+fix typo (details)
+Clean legacy hard-coded gui preferences, and use get/setUserPreference method in classes. Make sure display pref is loaded at init time for FilesList, shoud fix #777 (details)
+Fix "Share folder as workspaces only" parameter (details)
+Re fix #777 : hidden columns were broken (details)
+Little Charset bug in User Feed (details)
+Italian translation for plugin 'gui.ajax' (details)
+Italian translation for plugin 'gui.ios' (details)
+Italian translation for plugin 'gui.light' (details)
+Italian translation for plugin 'gui.mobile' (details)
+Italian translation for plugin 'gui.user' (details)
+Replace dibi minified by latest head to fix #610 Add autoloader for dibi and remove requires (details)
+Display issue in non-writeable workspaces (details)
+Performance issues with innerText usage (details)
+Make sure to re-display the authorization URL in case of step 2 error. (details)
+getFilteredOption() : pass an optional userObject to be used as mergeRole resolver (details)
+Quota filtered Option: grab values from parent repository owner, not current user. (details)
+Better response for update_user_group - Fix #725 (details)
+Add IPTC support, inspired by and close #577 (details)
+ZIP with SMB Access don't work (details)
+Fix tree issue when domain name contains 'plus'. Manual merge & close #681 (details)
+Fix #819 (missing log refresh button) and fix #820 (restore old "Copy as Text" button) (details)
+Fix the way scheduler handle the "*" users to make it less consuming (not necessary to load whole user objects, jst their ID.). Always use queue mechanism. (details)
+Perf issues with massive ldap directories: divide listing time by 2 (details)
+Add an option to disable the bruteForce test (and thus the Captcha) (details)
+New option "leavesOpenOnSelect" on search engine used in the admin panel, to avoid never-ending searching on the correct user page. Fix #814 (details)
+Catch handle erros on purge operations (details)
+Use background-size: cover when possible (fix #821) (details)
+Fix login header in multi mode. Remove login_patch.xml that was not used anymore (details)
+Fix api test script (details)
+Make sure db is connected for serial-based setup that would use the DB only for indexation. (details)
+Fix API Auth form some server+php configs (details)
+Add the comment SetEnvIf instruction for PHP-FPM setups. (details)
+When fake MemberOf enabled, depend ldap system, the member/memberUid value (attribute of group) is cn (short) or dn (full name). In general, this value is dn but in ldap of Apple, he use cn (details)
+Do not set write persmission on stat_hash, or it prevents the sync of readonly workspaces (details)
+
+
 Pydio 6.0.2 - Microfix for install screen
 
 Previous release fixed XML problems by xml-encoding some messages, which breaks the HTML display of the install wizard.

core/src/conf/bootstrap_context.php

@@ -94,6 +94,9 @@
 
 function AjaXplorer_autoload($className)
 {
+    if($className == "dibi"){
+        require_once(AJXP_BIN_FOLDER."/dibi/dibi.php");
+    }
     $fileName = AJXP_BIN_FOLDER."/"."class.".$className.".php";
     if (file_exists($fileName)) {
         require_once($fileName);

core/src/core/classes/class.AJXP_Plugin.php

@@ -135,12 +135,15 @@ public function init($options)
         $this->options = array_merge($this->loadOptionsDefaults(), $options);
     }
 
-    protected function getFilteredOption($optionName, $repositoryScope = AJXP_REPO_SCOPE_ALL)
+    protected function getFilteredOption($optionName, $repositoryScope = AJXP_REPO_SCOPE_ALL, $userObject = null)
     {
         if(!is_array($this->options)) $this->options = array();
         $merged = $this->options;
         if(is_array($this->pluginConf)) $merged = array_merge($merged, $this->pluginConf);
-        $loggedUser = AuthService::getLoggedUser();
+        $loggedUser = $userObject;
+        if($loggedUser == null){
+            $loggedUser = AuthService::getLoggedUser();
+        }
         if ($loggedUser != null) {
             if ($repositoryScope == AJXP_REPO_SCOPE_ALL) {
                 $repo = ConfService::getRepository();

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

@@ -871,7 +871,13 @@ public static function detectServerURL($withURI = false)
         if (!$withURI) {
             return "$protocol://$name$port";
         } else {
-            return "$protocol://$name$port".dirname($_SERVER["REQUEST_URI"]);
+            $uri = dirname($_SERVER["REQUEST_URI"]);
+            $api = ConfService::currentContextIsRestAPI();
+            if(!empty($api)){
+                // Keep only before api base
+                $uri = array_shift(explode("/".$api."/", $uri));
+            }
+            return "$protocol://$name$port".$uri;
         }
     }
 
@@ -1490,6 +1496,67 @@ public static function userAgentIsNativePydioApp(){
         );
     }
 
+    public static function osFromUserAgent($useragent = null) {
+
+        $osList = array
+        (
+            'Windows 10' => 'windows nt 10.0',
+            'Windows 8.1' => 'windows nt 6.3',
+            'Windows 8' => 'windows nt 6.2',
+            'Windows 7' => 'windows nt 6.1',
+            'Windows Vista' => 'windows nt 6.0',
+            'Windows Server 2003' => 'windows nt 5.2',
+            'Windows XP' => 'windows nt 5.1',
+            'Windows 2000 sp1' => 'windows nt 5.01',
+            'Windows 2000' => 'windows nt 5.0',
+            'Windows NT 4.0' => 'windows nt 4.0',
+            'Windows Me' => 'win 9x 4.9',
+            'Windows 98' => 'windows 98',
+            'Windows 95' => 'windows 95',
+            'Windows CE' => 'windows ce',
+            'Windows (version unknown)' => 'windows',
+            'OpenBSD' => 'openbsd',
+            'SunOS' => 'sunos',
+            'Ubuntu' => 'ubuntu',
+            'Linux' => '(linux)|(x11)',
+            'Mac OSX Beta (Kodiak)' => 'mac os x beta',
+            'Mac OSX Cheetah' => 'mac os x 10.0',
+            'Mac OSX Puma' => 'mac os x 10.1',
+            'Mac OSX Jaguar' => 'mac os x 10.2',
+            'Mac OSX Panther' => 'mac os x 10.3',
+            'Mac OSX Tiger' => 'mac os x 10.4',
+            'Mac OSX Leopard' => 'mac os x 10.5',
+            'Mac OSX Snow Leopard' => 'mac os x 10.6',
+            'Mac OSX Lion' => 'mac os x 10.7',
+            'Mac OSX Mountain Lion' => 'mac os x 10.8',
+            'Mac OSX Mavericks' => 'mac os x 10.9',
+            'Mac OSX Yosemite' => 'mac os x 10.10',
+            'Mac OS (classic)' => '(mac_powerpc)|(macintosh)',
+            'QNX' => 'QNX',
+            'BeOS' => 'beos',
+            'OS2' => 'os/2',
+            'SearchBot'=>'(nuhk)|(googlebot)|(yammybot)|(openbot)|(slurp)|(msnbot)|(ask jeeves/teoma)|(ia_archiver)'
+        );
+
+        if($useragent == null){
+            $useragent = $_SERVER['HTTP_USER_AGENT'];
+            $useragent = strtolower($useragent);
+        }
+
+        $found = "Not automatically detected.$useragent";
+        foreach($osList as $os=>$match) {
+            if (preg_match('/' . $match . '/i', $useragent)) {
+                $found = $os;
+                break;
+            }
+        }
+
+        return $found;
+
+
+    }
+
+
     /**
      * Try to remove a file without errors
      * @static
@@ -1677,7 +1744,6 @@ public static function cleanDibiDriverParameters($params)
 
     public static function runCreateTablesQuery($p, $file)
     {
-        require_once(AJXP_BIN_FOLDER."/dibi.compact.php");
 
         switch ($p["driver"]) {
             case "sqlite":
@@ -1694,7 +1760,7 @@ public static function runCreateTablesQuery($p, $file)
                 $ext = ".pgsql";
                 break;
             default:
-                return "ERROR!, DB driver "+ $p["driver"] +" not supported yet in __FUNCTION__";
+                return "ERROR!, DB driver ". $p["driver"] ." not supported yet in __FUNCTION__";
         }
 
         $result = array();
@@ -1884,6 +1950,7 @@ public static function glob_recursive($pattern, $flags = 0)
 
     public static function regexpToLike($regexp)
     {
+        $regexp = trim($regexp, '/');
         $left = "~";
         $right = "~";
         if ($regexp[0]=="^") {
@@ -1900,6 +1967,7 @@ public static function regexpToLike($regexp)
 
     public static function cleanRegexp($regexp)
     {
+        $regexp = str_replace("\/", "/", trim($regexp, '/'));
         return ltrim(rtrim($regexp, "$"), "^");
     }