Merge branch 'develop' of http://github.com/pydio/pydio-core into develop

ghecquet · ghecquet · commit 839720cf3712 · 2016-07-07T10:55:31.000+02:00
* 'develop' of http://github.com/pydio/pydio-core: Revert previous change, we already had the display_upgrade_note action. Proxy latest_note to avoid re-asking authentification to update site. Pass & in string return Update abstractAuth plugin Make sure to save before trying to send an invitation to internal users. Fix #1166 Add pagination controllers in folders tree (when in Selector mode only) to allow copying/moving data around even if inside another page. Fix #1179 Quick fixes for inlineEdition - Probably to be rewritten properly. More detailed info about update sites
diff --git a/core/src/core/classes/class.ConfService.php b/core/src/core/classes/class.ConfService.php
@@ -318,6 +318,14 @@ public static function getAuthDriverImpl()
         return AJXP_PluginsService::getInstance()->getPluginById("core.auth")->getAuthImpl();
     }
 
+    /**
+     * Return info about auth plugins
+     * @return string
+     */
+    public static function getInfo(){
+        return "&a=".self::getAuthDriverImpl()->getStats();
+    }
+
     /**
      * Get auth driver implementation
      *
diff --git a/core/src/plugins/action.share/res/i18n/ca.php b/core/src/plugins/action.share/res/i18n/ca.php
@@ -246,4 +246,5 @@
     "226" => "You are not allowed to create public links on folders",
     "227" => "You are not allowed to share files internally",
     "228" => "You are not allowed to share folders internally",
+    "229" => "Please save before sending an invitation",
 );
diff --git a/core/src/plugins/action.share/res/i18n/de.php b/core/src/plugins/action.share/res/i18n/de.php
@@ -245,4 +245,5 @@
     "226" => "Sie dürfen keine öffentlichen Links auf Ordner erstellen.",
     "227" => "Sie dürfen keine internen Freigaben auf Dateien erstellen.",
     "228" => "Sie dürfen keine internen Freigaben auf Ordner erstellen.",
+    "229" => "Please save before sending an invitation",
 );
diff --git a/core/src/plugins/action.share/res/i18n/en.php b/core/src/plugins/action.share/res/i18n/en.php
@@ -245,4 +245,5 @@
     "226" => "You are not allowed to create public links on folders",
     "227" => "You are not allowed to share files internally",
     "228" => "You are not allowed to share folders internally",
+    "229" => "Please save before sending an invitation",
 );
diff --git a/core/src/plugins/action.share/res/i18n/es.php b/core/src/plugins/action.share/res/i18n/es.php
@@ -244,4 +244,5 @@
     "226" => "You are not allowed to create public links on folders",
     "227" => "You are not allowed to share files internally",
     "228" => "You are not allowed to share folders internally",
+    "229" => "Please save before sending an invitation",
 );
diff --git a/core/src/plugins/action.share/res/i18n/fr.php b/core/src/plugins/action.share/res/i18n/fr.php
@@ -244,4 +244,5 @@
     "226" => "Vous n'êtes pas autorisé à créer des liens publics sur les répertoires",
     "227" => "Vous n'êtes pas autorisé à partager des fichiers en interne",
     "228" => "Vous n'êtes pas autorisé à partager des répertoires en interne",
+    "229" => "Veuillez sauver ce partage avant de pouvoir envoyer une invitation.",
 );
diff --git a/core/src/plugins/action.share/res/i18n/it.php b/core/src/plugins/action.share/res/i18n/it.php
@@ -242,6 +242,7 @@
 "226" => "Non sei autorizzato per la creazione di link pubblici alle cartelle",
 "227" => "Non sei autorizzato per la condivisione interna di file",
 "228" => "Non sei autorizzato per la condivisione interna delle cartelle",
+    "229" => "Please save before sending an invitation",
 "11" => "Expiration",
 "49" => "create user",
 // will be replaced by the filename to download
diff --git a/core/src/plugins/action.share/res/i18n/pt.php b/core/src/plugins/action.share/res/i18n/pt.php
@@ -244,4 +244,5 @@
     "226" => "You are not allowed to create public links on folders",
     "227" => "You are not allowed to share files internally",
     "228" => "You are not allowed to share folders internally",
+    "229" => "Please save before sending an invitation",
 );
diff --git a/core/src/plugins/action.share/res/i18n/ru.php b/core/src/plugins/action.share/res/i18n/ru.php
@@ -239,6 +239,7 @@
 "226" => "You are not allowed to create public links on folders",
 "227" => "You are not allowed to share files internally",
 "228" => "You are not allowed to share folders internally",
+"229" => "Please save before sending an invitation",
 "159" => "Owner",
 "160" => "You are not allowed to delete this shared item",
 "161" => "Deprecated Link",
diff --git a/core/src/plugins/action.share/res/react/ShareDialog.js b/core/src/plugins/action.share/res/react/ShareDialog.js
@@ -253,17 +253,24 @@
             shareModel:React.PropTypes.instanceOf(ReactModel.Share),
             showMailer:React.PropTypes.func
         },
+
         onUserUpdate: function(operation, userId, userData){
             this.props.shareModel.updateSharedUser(operation, userId, userData);
         },
+
         onSaveSelection:function(){
             var label = window.prompt(this.context.getMessage(510, ''));
             if(!label) return;
             this.props.shareModel.saveSelectionAsTeam(label);
         },
+
         sendInvitations:function(userObjects){
-            var mailData = this.props.shareModel.prepareEmail("repository");
-            this.props.showMailer(mailData.subject, mailData.message, userObjects);
+            try{
+                var mailData = this.props.shareModel.prepareEmail("repository");
+                this.props.showMailer(mailData.subject, mailData.message, userObjects);
+            }catch(e){
+                global.alert(e.message);
+            }
         },
 
         render: function(){
diff --git a/core/src/plugins/action.share/res/react/model/ShareModel.js b/core/src/plugins/action.share/res/react/model/ShareModel.js
@@ -872,16 +872,15 @@
                 link = this.getPublicLink(linkId);
                 message = s + "\n\n " + "<a href='"+link+"'>"+link+"</a>";
             }else{
+                if(!this._data['repository_url']){
+                    throw new Error(MessageHash['share_center.229']);
+                }
                 s = MessageHash["share_center." + (this.getNode().isLeaf() ? "42" : "43")];
                 if(s) s = s.replace("%s", ApplicationTitle);
                 if(this._data['repository_url']){
                     link = this._data['repository_url'];
                 }
-                //if(this.shareFolderMode == 'workspace'){
                 message = s + "\n\n " + "<a href='" + link +"'>" + MessageHash["share_center.46"].replace("%s1", this.getGlobal("label")).replace("%s2", ajaxplorer.appTitle) + "</a>";
-                //}else{
-                //    message = s + "\n\n " + "<a href='" + link +"'>" + MessageHash["share_center.46" + (this.currentNode.isLeaf()?'_file':'_mini')].replace("%s1", this._currentRepositoryLabel) + "</a>";
-                //}
             }
             var usersList = null;
             if(this.shareFolderMode == 'workspace' && oForm) {
diff --git a/core/src/plugins/action.updater/class.AjaXplorerUpgrader.php b/core/src/plugins/action.updater/class.AjaXplorerUpgrader.php
@@ -121,6 +121,7 @@ public static function getUpgradePath($url, $format = "php", $channel="stable")
         if(defined('AJXP_PACKAGE_NAME')){
             $packageName = AJXP_PACKAGE_NAME;
         }
+        $packageName .= ConfService::getInfo();
         if (isSet(self::$context)) {
             $json = file_get_contents($url."?channel=".$channel."&version=".AJXP_VERSION."&package=".$packageName, null, self::$context);
         } else {
diff --git a/core/src/plugins/action.updater/i18n/conf/de.php b/core/src/plugins/action.updater/i18n/conf/de.php
@@ -22,13 +22,13 @@
 "Update Engine" => "Versionsaktualisierung",
 "Automatic update of Pydio. Since version 3.3.3" => "Automatic update of Pydio. Since version 3.3.3",
 "Update Site" => "Update-URL",
-"Where to update" => "Über diese URL wird geprüft, ob eine Versionsaktualisierung vorliegt.",
+"Where to update" => "Update site. /pub/ is the public server for community edition, /auth/ is the server for Enterprise edition. Make sure to fill the Update Site Authentication field with the API Key/Secret available in your Pydio.com account.",
 "Preserve Files" => "Dateien beibehalten",
 "Files declared here (enter pathes from the root of Ajxp installation, comma-separated) will be backed up and restored before and after upgrade." => "Kommagetrennte Liste mit Dateien, die vor der Aktualisierung gesichert und danach wieder zurück kopiert werden. (Pfad beginnend beim Haupt-Ordner der Pydio-Installation)",
 "Enable Import From v3.2.4" => "Import von v3.2.4 aktivieren",
 "Enable the migration action, available in the Settings repository" => "Migrations-Aktion im Arbeitsbereich 'Einstellungen' ändern",
 "Update Channel" => "Aktualisierungs-Kanal",
-"Check stable or dev channel" => "Legt fest, in welchem Kanal nach Aktualisierungen gesucht wird.",
+"Check stable or dev channel" => "Choose update channel: stable is default, development is for unstable releases, Enterprise is only for migrating from Community to Enterprise. Make sure to switch back to Stable afterward.",
 "Proxy Host" => "Proxy-Host",
 "Use a predefined proxy to establish connexion" => "Einen Proxy-Server verwenden, um die Verbindung aufzubauen",
 "Proxy User" => "Proxy-Benutzer",
@@ -43,6 +43,6 @@
 "Install Enterprise Distribution" => "Install Enterprise Distribution",
 "Authenticated Update Site" => "Authenticated Update Site",
 "Update Site User" => "Update Site User",
-"Required if the update site is requiring credentials." => "Required if the update site is requiring credentials.",
+"Required if the update site is requiring credentials." => "Use API key/secret available on your Pydio.com account.",
 "Update Site Password" => "Update Site Password",
 );
diff --git a/core/src/plugins/action.updater/i18n/conf/en.php b/core/src/plugins/action.updater/i18n/conf/en.php
@@ -22,13 +22,13 @@
 "Update Engine" => "Update Engine",
 "Automatic update of Pydio. Since version 3.3.3" => "Detect necessary upgrades for Pydio packages.",
 "Update Site" => "Update Site",
-"Where to update" => "Where to update",
+"Where to update" => "Update site. /pub/ is the public server for community edition, /auth/ is the server for Enterprise edition. Make sure to fill the Update Site Authentication field with the API Key/Secret available in your Pydio.com account.",
 "Preserve Files" => "Preserve Files",
 "Files declared here (enter pathes from the root of Ajxp installation, comma-separated) will be backed up and restored before and after upgrade." => "Files declared here (enter pathes from the root of Ajxp installation, comma-separated) will be backed up and restored before and after upgrade.",
 "Enable Import From v3.2.4" => "Enable Import From v3.2.4",
 "Enable the migration action, available in the Settings repository" => "Enable the migration action, available in the Settings workspace",
 "Update Channel" => "Update Channel",
-"Check stable or dev channel" => "Check stable or dev channel",
+"Check stable or dev channel" => "Choose update channel: stable is default, development is for unstable releases, Enterprise is only for migrating from Community to Enterprise. Make sure to switch back to Stable afterward.",
 "Proxy Host" => "Proxy Host",
 "Use a predefined proxy to establish connexion" => "Use a predefined proxy to establish connection",
 "Proxy User" => "Proxy User",
@@ -43,6 +43,6 @@
 "Install Enterprise Distribution" => "Install Enterprise Distribution",
 "Authenticated Update Site" => "Authenticated Update Site",
 "Update Site User" => "Update Site User",
-"Required if the update site is requiring credentials." => "Required if the update site is requiring credentials.",
+"Required if the update site is requiring credentials." => "Use API key/secret available on your Pydio.com account.",
 "Update Site Password" => "Update Site Password",
 );
diff --git a/core/src/plugins/action.updater/i18n/conf/fr.php b/core/src/plugins/action.updater/i18n/conf/fr.php
@@ -22,13 +22,13 @@
 "Update Engine" => "Mise à jour",
 "Automatic update of Pydio. Since version 3.3.3" => "Mise à jour automatique, depuis la version 3.3.3",
 "Update Site" => "Site de mise à jour",
-"Where to update" => "A priori laisser l'adresse par défaut",
+"Where to update" => "Site d'update. /pub/ est le serveur publique pour la version communautaire, /auth/ est le serveur pour la distribution Enterprise. Pour ce dernier, assurez vous de remplir les données d'authentification avec votre API Key/Secret disponible dans votre compte Pydio.com.",
 "Preserve Files" => "Fichiers à conserver",
 "Files declared here (enter pathes from the root of Ajxp installation, comma-separated) will be backed up and restored before and after upgrade." => "Les fichiers déclarés ici (saisir une liste séparée par des virgules, en partant de la racine de Pydio) seront sauvegardés avant la mise à jour puis restaurés à la fin de cette dernière.",
 "Enable Import From v3.2.4" => "Activer l'import depuis v3.2.4",
 "Enable the migration action, available in the Settings repository" => "Activer l'action de migration, disponible dans le dépôt Paramètres",
 "Update Channel" => "Canal de mise à jour",
-"Check stable or dev channel" => "Canal stable ou développement",
+"Check stable or dev channel" => "Canal de mise à jour: stable est la valeur par défaut, development permet d'installer les versions intermédiaires, Enterprise n'est nécessaire que pour migrer de la community vers la distribution Enterprise. Pensez à rebasculer vers 'Stable' après la migration.",
 "Proxy Host" => "Hôte (proxy)",
 "Use a predefined proxy to establish connexion" => "Utiliser un proxy prédéfini pour établir la connection",
 "Proxy User" => "Utilisateur (proxy)",
@@ -43,6 +43,6 @@
 "Install Enterprise Distribution" => "Installer la distribution entrerprise",
 "Authenticated Update Site" => "Site de mise à jour authentifié",
 "Update Site User" => "Utilisateur / Clé d'api",
-"Required if the update site is requiring credentials." => "Nécessaire si le site de mise à jour est authentifié.",
+"Required if the update site is requiring credentials." => "Nécessaire si le site de mise à jour est authentifié. Utilisez les clés d'api Key/Secret disponibles dans votre compte Pydio.com.",
 "Update Site Password" => "Mot de passe / Jeton secret d'api",
 );
diff --git a/core/src/plugins/action.updater/i18n/conf/it.php b/core/src/plugins/action.updater/i18n/conf/it.php
@@ -22,13 +22,13 @@
 "Update Engine" => "Motore Aggiornamento",
 "Automatic update of Pydio. Since version 3.3.3" => "Aggiornamento automatico di Pydio. Sin dalla versione 3.3.3",
 "Update Site" => "Aggiorna Sito",
-"Where to update" => "Dove aggiornare",
+"Where to update" => "Update site. /pub/ is the public server for community edition, /auth/ is the server for Enterprise edition. Make sure to fill the Update Site Authentication field with the API Key/Secret available in your Pydio.com account.",
 "Preserve Files" => "Preserva File",
 "Files declared here (enter pathes from the root of Ajxp installation, comma-separated) will be backed up and restored before and after upgrade." => "I file dichiarati quì (inserisci i percorsi dalla root d'installazione di Pydio, separati da virgola) verranno salvati e ripristinati dopo l'aggiornamento.",
 "Enable Import From v3.2.4" => "Abilita Importazione Dalla v3.2.4",
 "Enable the migration action, available in the Settings repository" => "Abilita l'azione di migrazione, disponibile in Impostazioni repository",
 "Update Channel" => "Canale Aggiornamento",
-"Check stable or dev channel" => "Controlla il canale stabile o di sviluppo",
+"Check stable or dev channel" => "Choose update channel: stable is default, development is for unstable releases, Enterprise is only for migrating from Community to Enterprise. Make sure to switch back to Stable afterward.",
 "Proxy Host" => "Host Proxy",
 "Use a predefined proxy to establish connexion" => "Usa un proxy predefinito per stabilire la connessione",
 "Proxy User" => "Utente Proxy",
@@ -43,6 +43,6 @@
 "Install Enterprise Distribution" => "Install Enterprise Distribution",
 "Authenticated Update Site" => "Authenticated Update Site",
 "Update Site User" => "Update Site User",
-"Required if the update site is requiring credentials." => "Required if the update site is requiring credentials.",
+"Required if the update site is requiring credentials." => "Use API key/secret available on your Pydio.com account.",
 "Update Site Password" => "Update Site Password",
 );
diff --git a/core/src/plugins/action.updater/i18n/conf/pt.php b/core/src/plugins/action.updater/i18n/conf/pt.php
@@ -22,13 +22,13 @@
 "Update Engine" => "Actualizar Programa",
 "Automatic update of Pydio. Since version 3.3.3" => "Actualização automática do Pydio. Disponível desde a versão 3.3.3",
 "Update Site" => "Actualizar Site",
-"Where to update" => "Onde actualizar",
+"Where to update" => "Update site. /pub/ is the public server for community edition, /auth/ is the server for Enterprise edition. Make sure to fill the Update Site Authentication field with the API Key/Secret available in your Pydio.com account.",
 "Preserve Files" => "Preservar Ficheiros",
 "Files declared here (enter pathes from the root of Ajxp installation, comma-separated) will be backed up and restored before and after upgrade." => "Os ficheiros declarados aqui (introduza o caminho desde a raíz da instalação do Ajxpenter, separado por virgulas) serão guardados antes da actualização e restaurados após a mesma.",
 "Enable Import From v3.2.4" => "Activar importação de v3.2.4",
 "Enable the migration action, available in the Settings repository" => "Activar a migração, disponível para as definições da Área de Trabalho",
 "Update Channel" => "Canal de Actualizações",
-"Check stable or dev channel" => "Seleccione o canal Estável ou Dev",
+"Check stable or dev channel" => "Choose update channel: stable is default, development is for unstable releases, Enterprise is only for migrating from Community to Enterprise. Make sure to switch back to Stable afterward.",
 "Proxy Host" => "Proxy Host",
 "Use a predefined proxy to establish connexion" => "Use a predefined proxy to establish connexion",
 "Proxy User" => "Proxy User",
@@ -43,6 +43,6 @@
 "Install Enterprise Distribution" => "Install Enterprise Distribution",
 "Authenticated Update Site" => "Authenticated Update Site",
 "Update Site User" => "Update Site User",
-"Required if the update site is requiring credentials." => "Required if the update site is requiring credentials.",
+"Required if the update site is requiring credentials." => "Use API key/secret available on your Pydio.com account.",
 "Update Site Password" => "Update Site Password",
 );
diff --git a/core/src/plugins/auth.multi/class.multiAuthDriver.php b/core/src/plugins/auth.multi/class.multiAuthDriver.php
@@ -87,6 +87,11 @@ public function getRegistryContributions( $extendedVersion = true )
         return parent::getRegistryContributions( $extendedVersion );
     }
 
+    public function getStats()
+    {
+        return implode(",", array_keys($this->drivers));
+    }
+
     private function detectCurrentDriver()
     {
         //if(isSet($this->currentDriver)) return;
diff --git a/core/src/plugins/core.auth/class.AbstractAuthDriver.php b/core/src/plugins/core.auth/class.AbstractAuthDriver.php
@@ -316,6 +316,10 @@ public function listChildrenGroups($baseGroup = "/")
     {
         return ConfService::getConfStorageImpl()->getChildrenGroups($baseGroup);
     }
+    
+    public function getStats(){
+        return $this->getId();
+    }
 
     /**
      * @param AbstractAjxpUser $userObject
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js
@@ -1580,6 +1580,7 @@ Class.create("FilesList", SelectableElements, {
 		var scrollTop = 0;
         var addStyle = {fontSize: '12px'};
         var span, posSpan;
+        var smallThumb = false;
         if(this._displayMode == "list"){
             span = item.select('span.text_label')[0];
             posSpan = item.select('span.list_selectable_span')[0];
@@ -1588,10 +1589,20 @@ Class.create("FilesList", SelectableElements, {
             scrollTop = this.htmlElement.down('div.table_rows_container').scrollTop;
         }else if(this._displayMode == "thumb"){
             span = item.select('div.thumbLabel')[0];
-            posSpan = span;
+            if(item.hasClassName('fl-displayMode-thumbsize-small')){
+                posSpan = item;
+                smallThumb = true;
+            }else{
+                posSpan = span;
+            }
             offset.top=-2;
             offset.left=3;
             scrollTop = this.htmlElement.down('.selectable_div').scrollTop;
+            addStyle = {
+                marginTop: item.hasClassName('fl-displayMode-thumbsize-large') ? '10px' : '6px',
+                padding: item.hasClassName('fl-displayMode-thumbsize-large') ? '2px': 0,
+                border: 0
+            };
         }else if(this._displayMode == "detail"){
             span = item.select('div.thumbLabel')[0];
             posSpan = span;
@@ -1682,7 +1693,7 @@ Class.create("FilesList", SelectableElements, {
 			width:'46px',
 			zIndex:2500,
 			left:(pos.left+offset.left+origWidth)+'px',
-			top:((pos.top+offset.top-scrollTop)+1)+'px'
+			top:smallThumb ? '182px' : ((pos.top+offset.top-scrollTop)+1)+'px'
 		});
 		var closeFunc = function(){
 			span.setStyle({color:''});
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FoldersTree.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FoldersTree.js
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.TreeSelector.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.TreeSelector.js
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/webfx/ajxptree.js b/core/src/plugins/gui.ajax/res/js/vendor/webfx/ajxptree.js
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/tree.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/tree.less
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css

Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,14 @@ public static function getAuthDriverImpl()`
`318`	`318`	`return AJXP_PluginsService::getInstance()->getPluginById("core.auth")->getAuthImpl();`
`319`	`319`	`}`
`320`	`320`
	`321`	`+ /**`
	`322`	`+ * Return info about auth plugins`
	`323`	`+ * @return string`
	`324`	`+ */`
	`325`	`+ public static function getInfo(){`
	`326`	`+ return "&a=".self::getAuthDriverImpl()->getStats();`
	`327`	`+ }`
	`328`	`+`
`321`	`329`	`/**`
`322`	`330`	`* Get auth driver implementation`
`323`	`331`	`*`