[action.share] Reset max download and max expiration time Fix #1004

pydio · Dec 2, 2015 · 25a8d3d · 25a8d3d
1 parent 85b7754
commit 25a8d3d
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/core/src/plugins/action.share/class.ShareCenter.php b/core/src/plugins/action.share/class.ShareCenter.php
@@ -1592,11 +1592,19 @@ public function createSharedMinisite($httpVars, $repository, $accessDriver)
         if(isSet($httpVars["minisite_layout"])){
             $data["AJXP_TEMPLATE_NAME"] = $httpVars["minisite_layout"];
         }
-        if(isSet($httpVars["expiration"]) && intval($httpVars["expiration"]) > 0){
-            $data["EXPIRE_TIME"] = time() + intval($httpVars["expiration"]) * 86400;
+        if(isSet($httpVars["expiration"])){
+            if(intval($httpVars["expiration"]) > 0){
+                $data["EXPIRE_TIME"] = time() + intval($httpVars["expiration"]) * 86400;
+            }else if(isSet($data["EXPIRE_TIME"])) {
+                unset($data["EXPIRE_TIME"]);
+            }
         }
-        if(isSet($httpVars["downloadlimit"]) && intval($httpVars["downloadlimit"]) > 0){
-            $data["DOWNLOAD_LIMIT"] = intval($httpVars["downloadlimit"]);
+        if(isSet($httpVars["downloadlimit"])){
+            if(intval($httpVars["downloadlimit"]) > 0){
+                $data["DOWNLOAD_LIMIT"] = intval($httpVars["downloadlimit"]);
+            }else if(isSet($data["DOWNLOAD_LIMIT"])){
+                unset($data["DOWNLOAD_LIMIT"]);
+            }
         }
         if(AuthService::usersEnabled()){
             $data["OWNER_ID"] = AuthService::getLoggedUser()->getId();