Fix various details on Share Center: display "view parameters" instea…

…d of "change parameters" if panel is in readonly mode. Disable some actions if in ajxp_* workspace.
pydio · Oct 19, 2015 · f5936ae · f5936ae
1 parent 2115463
commit f5936ae
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 35 deletions.
diff --git a/core/src/plugins/action.share/class.ShareCenter.php b/core/src/plugins/action.share/class.ShareCenter.php
@@ -36,7 +36,6 @@ class ShareCenter extends AJXP_Plugin
      */
     private $repository;
     private $urlBase;
-    private $baseProtocol;
 
     /**
      * @var ShareStore
@@ -53,41 +52,46 @@ protected function parseSpecificContributions(&$contribNode)
         parent::parseSpecificContributions($contribNode);
         $disableSharing = false;
         $downloadFolder = ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER");
-        if ($downloadFolder == "") {
-            $disableSharing = true;
-        } else if ((!is_dir($downloadFolder) || !is_writable($downloadFolder))) {
-            $this->logDebug("Disabling Public links, $downloadFolder is not writeable!", array("folder" => $downloadFolder, "is_dir" => is_dir($downloadFolder),"is_writeable" => is_writable($downloadFolder)));
-            $disableSharing = true;
-        } else {
-            if (AuthService::usersEnabled()) {
-                $loggedUser = AuthService::getLoggedUser();
-                if ($loggedUser != null && AuthService::isReservedUserId($loggedUser->getId())) {
-                    $disableSharing = true;
-                }
-            } else {
+        if ( empty($downloadFolder) || (!is_dir($downloadFolder) || !is_writable($downloadFolder))) {
+            $this->logError("Warning on public links, $downloadFolder is not writeable!", array("folder" => $downloadFolder, "is_dir" => is_dir($downloadFolder),"is_writeable" => is_writable($downloadFolder)));
+        }
+
+        $xpathesToRemove = array();
+
+        if( strpos(ConfService::getRepository()->getAccessType(), "ajxp_") === 0){
+
+            $xpathesToRemove[] = 'action[@name="share-file-minisite"]';
+            $xpathesToRemove[] = 'action[@name="share-folder-minisite-public"]';
+            $xpathesToRemove[] = 'action[@name="share-edit-shared"]';
+
+        }else if (AuthService::usersEnabled()) {
+
+            $loggedUser = AuthService::getLoggedUser();
+            if ($loggedUser != null && AuthService::isReservedUserId($loggedUser->getId())) {
                 $disableSharing = true;
             }
-            $xpathesToRemove = array();
-            if ($disableSharing) {
-                // All share- actions
-                $xpathesToRemove[] = 'action[contains(@name, "share-")]';
-            }else{
-                $folderSharingAllowed = $this->getAuthorization("folder", "any"); // $this->pluginConf["ENABLE_FOLDER_SHARING"];
-                $fileSharingAllowed = $this->getAuthorization("file"); //$this->pluginConf["ENABLE_FILE_PUBLIC_LINK"];
-                if($fileSharingAllowed === false){
-                    // Share file button
-                    $xpathesToRemove[] = 'action[@name="share-file-minisite"]';
-                }
-                if(!$folderSharingAllowed){
-                    // Share folder button
-                    $xpathesToRemove[] = 'action[@name="share-folder-minisite-public"]';
-                }
+
+        } else {
+
+            $disableSharing = true;
+
+        }
+        if ($disableSharing) {
+            // All share- actions
+            $xpathesToRemove[] = 'action[contains(@name, "share-")]';
+        }else{
+            $folderSharingAllowed = $this->getAuthorization("folder", "any");
+            $fileSharingAllowed = $this->getAuthorization("file");
+            if($fileSharingAllowed === false){
+                // Share file button
+                $xpathesToRemove[] = 'action[@name="share-file-minisite"]';
             }
             if(!$folderSharingAllowed){
                 // Share folder button
                 $xpathesToRemove[] = 'action[@name="share-folder-minisite-public"]';
             }
         }
+
         foreach($xpathesToRemove as $xpath){
             $actionXpath=new DOMXPath($contribNode->ownerDocument);
             $nodeList = $actionXpath->query($xpath, $contribNode);

diff --git a/core/src/plugins/action.share/manifest.xml b/core/src/plugins/action.share/manifest.xml
@@ -102,7 +102,7 @@
                                 <span class="mode-minipub no_share_leaf">AJXP_MESSAGE[share_center.138]</span>
                                 <span class="mode-ws no_share_leaf">AJXP_MESSAGE[share_center.139]</span>
                                 <span class="mode-minipub only_share_leaf">AJXP_MESSAGE[share_center.140]</span>
-                                <a><span class="params_view">AJXP_MESSAGE[share_center.141]</span><span class="params_hide">AJXP_MESSAGE[share_center.142]</span></a>
+                                <a><span class="params_view">AJXP_MESSAGE[share_center.141]</span><span class="params_hide">AJXP_MESSAGE[share_center.142]</span><span class="params_view_readonly">AJXP_MESSAGE[share_center.177]</span></a>
                                 <div class="SF_horizontal_actions SF_horizontal_pastilles"></div>
                             </div>
                             <div style="display:none;position:relative;margin:10px;min-height:85px;" id="share_result" class="">

diff --git a/core/src/plugins/action.share/res/i18n/ca.php b/core/src/plugins/action.share/res/i18n/ca.php
@@ -188,4 +188,5 @@
     "174" => "Reset Password",
     "175" => "Please set a password and make sure it's long enough!",
     "176" => "(Mandatory)",
+    "177" => "View parameters",
 );
diff --git a/core/src/plugins/action.share/res/i18n/de.php b/core/src/plugins/action.share/res/i18n/de.php
@@ -187,4 +187,5 @@
     "174" => "Deaktiviere Passwort",
     "175" => "Please set a password and make sure it's long enough!",
     "176" => "(Mandatory)",
+    "177" => "View parameters",
 );
diff --git a/core/src/plugins/action.share/res/i18n/en.php b/core/src/plugins/action.share/res/i18n/en.php
@@ -189,4 +189,5 @@
     "174" => "Reset Password",
     "175" => "Please set a password and make sure it's long enough!",
     "176" => "(Mandatory)",
+    "177" => "View parameters",
 );
diff --git a/core/src/plugins/action.share/res/i18n/es.php b/core/src/plugins/action.share/res/i18n/es.php
@@ -188,4 +188,5 @@
     "174" => "Disable Password",
     "175" => "Please set a password and make sure it's long enough!",
     "176" => "(Mandatory)",
+    "177" => "View parameters",
 );
diff --git a/core/src/plugins/action.share/res/i18n/fr.php b/core/src/plugins/action.share/res/i18n/fr.php
@@ -186,6 +186,7 @@
     "172" => "Désolé ce lien est déjà utilisé, veuillez en choisir un autre.",
     "173" => "Si vous voulez créer un lien durable, vous pouvez utiliser ce champ pour fixer la dernière partie du lien (e.g. https://.../mon-joli-lien). Laisser vide pour générer automatiquement.",
     "174" => "Remettre à zéro",
-    "175" => "Please set a password and make sure it's long enough!",
-    "176" => "(Mandatory)",
+    "175" => "Veuillez mettre un mot de passe et vous assurer qu'il est assez long!",
+    "176" => "(Obligatoire)",
+    "177" => "Voir les paramètres",
 );
diff --git a/core/src/plugins/action.share/res/i18n/it.php b/core/src/plugins/action.share/res/i18n/it.php
@@ -185,4 +185,5 @@
     "174" => "Disabilita Password",
     "175" => "Please set a password and make sure it's long enough!",
     "176" => "(Mandatory)",
+    "177" => "View parameters",
 );
diff --git a/core/src/plugins/action.share/res/i18n/pt.php b/core/src/plugins/action.share/res/i18n/pt.php
@@ -188,4 +188,5 @@
     "174" => "Reset Password",
     "175" => "Please set a password and make sure it's long enough!",
     "176" => "(Mandatory)",
+    "177" => "View parameters",
 );
diff --git a/core/src/plugins/action.share/res/i18n/ru.php b/core/src/plugins/action.share/res/i18n/ru.php
@@ -184,4 +184,5 @@
     "174" => "Выключить пароль",
     "175" => "Please set a password and make sure it's long enough!",
     "176" => "(Mandatory)",
+    "177" => "View parameters",
 );
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css
@@ -540,7 +540,7 @@ div.shadow_class
 .dialogContent input:disabled,
 .dialogContent input[type="text"]:disabled,
 .dialogContent input[type="password"]:disabled,
-.dialogContent option:disabled
+.dialogContent option:disabled,
 .dialogContent textarea:disabled
 {
     background: #eee;
@@ -5133,16 +5133,30 @@ form.share_expired div.macos_only{
     display: block !important;
 }
 
+div#target_repository_toggle span.params_view_readonly
+{
+    display: none;
+}
+
+.readonly_mode div#target_repository_toggle span.params_view_readonly{
+    display: inline;
+}
+
 #target_repository_toggle span.params_hide,
-.edit_parameters div#target_repository_toggle span.params_view
+.edit_parameters div#target_repository_toggle span.params_view,
+.readonly_mode div#target_repository_toggle span.params_view,
+.edit_parameters div#target_repository_toggle span.params_view_readonly
 {
     display: none !important;
 }
 .edit_parameters div#target_repository_toggle span.params_hide{
     display: inline !important;
 }
 
-.share_edit.type-ws span.params_hide, .share_edit.type-ws span.params_view{
+.share_edit.type-ws span.params_hide,
+.share_edit.type-ws span.params_view,
+.share_edit.type-ws span.params_view_readonly
+{
     display: none !important;
 }
 

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