Add a default sorting field and direction for server sorting. Set this params via the filesystem mixin instead of access.fs only.

cdujeu · cdujeu · commit 0ff09da7c762 · 2015-06-25T14:12:11.000+02:00
diff --git a/core/src/plugins/access.fs/class.fsAccessDriver.php b/core/src/plugins/access.fs/class.fsAccessDriver.php
@@ -922,11 +922,13 @@ public function switchAction($action, $httpVars, $fileVars)
                     break;
                 }
                 $orderField = $orderDirection = null;
-                if ($this->getFilteredOption("REMOTE_SORTING")) {
-                    $orderDirection = isSet($httpVars["order_direction"])?strtolower($httpVars["order_direction"]):"asc";
-                    $orderField = isSet($httpVars["order_column"])?$httpVars["order_column"]:null;
+                $defaultOrder = $this->repository->getOption("REMOTE_SORTING_DEFAULT_COLUMN");
+                $defaultDirection = $this->repository->getOption("REMOTE_SORTING_DEFAULT_DIRECTION");
+                if ($this->repository->getOption("REMOTE_SORTING")) {
+                    $orderDirection = isSet($httpVars["order_direction"])?strtolower($httpVars["order_direction"]):$defaultDirection;
+                    $orderField = isSet($httpVars["order_column"])?$httpVars["order_column"]:$defaultOrder;
                     if ($orderField != null && !in_array($orderField, array("ajxp_label", "filesize", "ajxp_modiftime", "mimestring"))) {
-                        $orderField = "ajxp_label";
+                        $orderField = $defaultOrder;
                     }
                 }
                 if(isSet($httpVars["recursive"]) && $httpVars["recursive"] == "true"){
@@ -945,6 +947,7 @@ public function switchAction($action, $httpVars, $fileVars)
                 if(isSet($crt_nodes)){
                     $crt_nodes += $countFiles;
                 }
+                $totalPages = $crtPage = 1;
                 if (isSet($threshold) && isSet($limitPerPage) && $countFiles > $threshold) {
                     $offset = 0;
                     $crtPage = 1;
@@ -969,13 +972,13 @@ public function switchAction($action, $httpVars, $fileVars)
                 } else {
                     AJXP_XMLWriter::renderAjxpHeaderNode($parentAjxpNode);
                 }
-                if (isSet($totalPages) && isSet($crtPage)) {
+                if (isSet($totalPages) && isSet($crtPage) && ($totalPages > 1 || ! AJXP_Utils::userAgentIsNativePydioApp())) {
                     $remoteOptions = null;
                     if ($this->getFilteredOption("REMOTE_SORTING")) {
                         $remoteOptions = array(
                             "remote_order" => "true",
-                            "currentOrderCol" => isSet($orderField)?$orderField:"ajxp_label",
-                            "currentOrderDir"=> isSet($orderDirection)?$orderDirection:"asc"
+                            "currentOrderCol" => isSet($orderField)?$orderField:$defaultOrder,
+                            "currentOrderDir"=> isSet($orderDirection)?$orderDirection:$defaultDirection
                         );
                     }
                     AJXP_XMLWriter::renderPaginationData(
@@ -987,7 +990,7 @@ public function switchAction($action, $httpVars, $fileVars)
                     );
                     if (!$lsOptions["f"]) {
                         AJXP_XMLWriter::close();
-                        exit(1);
+                        break;
                     }
                 }
 
@@ -1127,13 +1130,13 @@ public function switchAction($action, $httpVars, $fileVars)
     protected function orderNodes($nodes, $path, $orderField, $orderDirection){
 
         usort($nodes, "strcasecmp");
-        if (isSet($orderField) && isSet($orderDirection) && $orderField == "ajxp_label" && $orderDirection == "desc") {
+        if (!empty($orderField) && !empty($orderDirection) && $orderField == "ajxp_label" && $orderDirection == "desc") {
             $nodes = array_reverse($nodes);
         }
         if (!empty($this->driverConf["SCANDIR_RESULT_SORTFONC"])) {
             usort($nodes, $this->driverConf["SCANDIR_RESULT_SORTFONC"]);
         }
-        if (isSet($orderField) && isSet($orderDirection) && $orderField != "ajxp_label") {
+        if (!empty($orderField) && !empty($orderDirection) && $orderField != "ajxp_label") {
             $toSort = array();
             foreach ($nodes as $node) {
                 if($orderField == "filesize") $toSort[$node] = is_file($path."/".$node) ? $this->filesystemFileSize($path."/".$node) : 0;
diff --git a/core/src/plugins/access.fs/manifest.xml b/core/src/plugins/access.fs/manifest.xml
@@ -12,7 +12,6 @@
         <param name="PURGE_AFTER" type="integer" label="CONF_MESSAGE[Purge Days (Hard limit)]" description="CONF_MESSAGE[Option to purge documents after a given number of days (even if shared). This require a manual set up of a CRON task. Leave to 0 if you don't wan't to use this feature.]" default="0"/>
         <param name="PURGE_AFTER_SOFT" type="integer" label="CONF_MESSAGE[Purge Days (Soft limit)]" description="CONF_MESSAGE[Option to purge documents after a given number of days (if not shared). This require a manual set up of a CRON task. Leave to 0 if you don't wan't to use this feature.]" default="0"/>
         <param name="DATA_TEMPLATE" type="string" label="CONF_MESSAGE[Data template]" description="CONF_MESSAGE[Path to a directory on the filesystem whose content will be copied to the repository the first time it is loaded.]" default=""/>
-        <param name="REMOTE_SORTING" type="boolean" label="CONF_MESSAGE[Remote Sorting]" description="CONF_MESSAGE[Force remote sorting when in paginated mode. Warning, this can impact the performances.]" default="true"/>
         <global_param name="PROBE_REAL_SIZE" type="boolean" label="CONF_MESSAGE[Real Size Probing]" description="CONF_MESSAGE[Use system command line to get the filesize instead of php built-in function (fixes the 2Go limitation)]" default="false"/>
         <global_param name="USE_POSIX" type="boolean" label="CONF_MESSAGE[Use POSIX]" description="CONF_MESSAGE[Use php POSIX extension to read files permissions. Only works on *nix systems.]" default="false"/>
         <global_param name="USE_XSENDFILE" type="boolean" label="CONF_MESSAGE[X-SendFile Active]" description="CONF_MESSAGE[Delegates all download operations to the webserver using the X-SendFile header. Warning, this is an external module to install for Apache. Module is active by default in Lighttpd. Warning, you have to manually add the folders where files will be downloaded in the module configuration (XSendFilePath directive)]" default="false"/>
diff --git a/core/src/plugins/core.ajaxplorer/ajxp_mixins.xml b/core/src/plugins/core.ajaxplorer/ajxp_mixins.xml
@@ -33,6 +33,9 @@
             <param group="MIXIN_MESSAGE[Filesystem Commons]" name="CHARSET" type="string" label="MIXIN_MESSAGE[Character Encoding]" description="MIXIN_MESSAGE[If your server does not set correctly its charset, it can be good to specify it here manually.]" mandatory="false"/>
             <param group="MIXIN_MESSAGE[Filesystem Commons]" name="PAGINATION_THRESHOLD" type="integer" label="MIXIN_MESSAGE[Pagination Threshold]" description="MIXIN_MESSAGE[When a folder will contain more items than this number, display will switch to pagination mode, for better performances.]" default="500"/>
             <param group="MIXIN_MESSAGE[Filesystem Commons]" name="PAGINATION_NUMBER" type="integer" label="MIXIN_MESSAGE[#Items per page]" description="MIXIN_MESSAGE[Once in pagination mode, number of items to display per page.]" default="200"/>
+            <param group="MIXIN_MESSAGE[Filesystem Commons]" name="REMOTE_SORTING" type="boolean" label="MIXIN_MESSAGE[Remote Sorting]" description="MIXIN_MESSAGE[Force remote sorting when in paginated mode. Warning, this can impact the performances.]" default="true"/>
+            <param group="MIXIN_MESSAGE[Filesystem Commons]" name="REMOTE_SORTING_DEFAULT_COLUMN" type="select" label="MIXIN_MESSAGE[Remote Sorting Default Field]" description="MIXIN_MESSAGE[Default field to sort on]" default="ajxp_label" choices="ajxp_label|Name,ajxp_modiftime|Modification date,filesize|File size,mimestring|File Type" mandatory="true" expose="true"/>
+            <param group="MIXIN_MESSAGE[Filesystem Commons]" name="REMOTE_SORTING_DEFAULT_DIRECTION" type="select" label="MIXIN_MESSAGE[Remote Sorting Default Direction]" description="MIXIN_MESSAGE[Default sorting direction]" default="asc" choices="asc|Ascending,desc|Descending" mandatory="true" expose="true"/>
             <global_param group="MIXIN_MESSAGE[Filesystem Commons]" name="SHOW_HIDDEN_FILES" type="boolean" label="MIXIN_MESSAGE[Show hidden files]" description="MIXIN_MESSAGE[Show files beginning with a .]" default="false"/>
             <global_param group="MIXIN_MESSAGE[Filesystem Commons]" name="HIDE_RECYCLE" type="boolean" label="MIXIN_MESSAGE[Hide recycle bin]" description="MIXIN_MESSAGE[Whether to show the recycle bin folder. Unlike in the following options, the folder will be hidden but still writeable.]" default="false"/>
             <global_param group="MIXIN_MESSAGE[Filesystem Commons]" name="HIDE_EXTENSIONS" type="string" label="MIXIN_MESSAGE[Hide extensions]" description="MIXIN_MESSAGE[Comma-separated list of extensions to hide. Extensions, files and folders that are hidden are also access forbidden.]" default="ser"/>
diff --git a/core/src/plugins/core.ajaxplorer/i18n/conf/en.php b/core/src/plugins/core.ajaxplorer/i18n/conf/en.php
@@ -142,14 +142,16 @@
 "For multiple authentication, apply this role to users authenticated via this driver" => "For multiple authentication, apply this role to users authenticated via this driver",
 "DSN" => "DSN",
 "Data Source Name" => "Data Source Name",
-"User" => "User",
-"User name" => "User name",
-"Password" => "Password",
-"User password" => "User password",
 "Host" => "Host",
 "Database server" => "Database server",
 "Database" => "Database",
 "Database name" => "Database name",
 "File" => "File",
 "Database file" => "Database file",
+    "Remote Sorting" => "Remote Sorting",
+    "Force remote sorting when in paginated mode. Warning, this can impact the performances." => "Force remote sorting when in paginated mode. Warning, this can impact the performances.",
+    "Remote Sorting Default Field" => "Remote Sorting Default Field",
+    "Default field to sort on" => "Default field to sort on",
+    "Remote Sorting Default Direction" => "Remote Sorting Default Direction",
+    "Default sorting direction" => "Default sorting direction",
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/conf/fr.php b/core/src/plugins/core.ajaxplorer/i18n/conf/fr.php
@@ -113,7 +113,6 @@
 "Hide files" => "Cacher des fichiers",
 "Comma-separated list of specific files to hide" => "Liste, séparée par des virgules, de fichiers à cacher.",
 "Metadata and indexation" => "Métadonnées et indexation",
-"Default Metasources" => "Metasources par défaut",
 "Comma-separated list of metastore and meta plugins, that will be automatically applied to all repositories created with this driver" => "Liste des metastore et des plugins meta (séparés par des virgules) appliqués automatiquement lors de la création de dépôts utilisant ce driver.",
 "Pydio Main Options" => "Options principales de Pydio",
 "Server URL" => "URL du serveur",
@@ -138,4 +137,22 @@
 "Explicitly disable WebDAV access for this repository." => "Désactiver explicitement l'accès WebDAV pour ce dépôt.",
 "Allow to group admins" => "Autoriser le groupe administrateur",
 "Allow group administrators to create a repository from this template." => "Autoriser le groupe administrateur à créer un dépôt à partir de ce modèle.",
+    "Skip auto-update admin rights" => "Passer la mise à jour des droits admin",
+    "If you have tons of workspaces (which is not recommanded), admin users login can take a long time while updating admin access to all repositories. Use this option to disable this step, admin will always have access to the Settings." => "Si vous avez de nombreux workspaces (ce qui n'est pas recommandé), l'identification d'un utilisateur administrateur peut prendre du temps afin de s'assurer que l'admin a accès à tous les workspaces. Vous pouvez désactiver cette étape.",
+    "Auto apply role" => "Appliquer le rôle automatiquement",
+    "For multiple authentication, apply this role to users authenticated via this driver" => "Pour des authentifications multiples, définir un rôle qui sera appliqué automatiquement aux utilisateurs identifiés via ce driver.",
+    "DSN" => "DSN",
+    "Data Source Name" => "Data Source Name",
+    "Host" => "Hôte",
+    "Database server" => "Serveur de Base de Données",
+    "Database" => "Base de Données",
+    "Database name" => "Nom de la base de données",
+    "File" => "Fichiers",
+    "Database file" => "Fichier de la base de données",
+    "Remote Sorting" => "Tri distant",
+    "Force remote sorting when in paginated mode. Warning, this can impact the performances." => "Forcer le tri sur le serveur plutôt que dans l'interface en mode paginé. Attention, ceci peut impacter les performances.",
+    "Remote Sorting Default Field" => "Champ par défaut.",
+    "Default field to sort on" => "Champ par défaut pour le tri distant.",
+    "Remote Sorting Default Direction" => "Direction par défaut.",
+    "Default sorting direction" => "Direction par défaut (croissant / décroissant) pour le tri distant.",
 );
