From 387a61cb666236e71a73c1c1ecf33e5ab4c3a2ae Mon Sep 17 00:00:00 2001 From: cdujeu Date: Thu, 7 Aug 2014 12:51:14 +0200 Subject: [PATCH] Fix legacy Private Minisite --- core/src/plugins/action.share/class.ShareCenter.php | 4 +++- core/src/plugins/action.share/res/minisite.php | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/plugins/action.share/class.ShareCenter.php b/core/src/plugins/action.share/class.ShareCenter.php index 8a2c96ebea..a57b3153cf 100644 --- a/core/src/plugins/action.share/class.ShareCenter.php +++ b/core/src/plugins/action.share/class.ShareCenter.php @@ -960,10 +960,12 @@ public static function loadMinisite($data, $hash = '') if (!empty($data["PRELOG_USER"])) { AuthService::logUser($data["PRELOG_USER"], "", true); $html = str_replace("AJXP_PRELOGED_USER", "ajxp_preloged_user", $html); - } else { + } else if(isSet($data["PRESET_LOGIN"])) { $_SESSION["PENDING_REPOSITORY_ID"] = $repository; $_SESSION["PENDING_FOLDER"] = "/"; $html = str_replace("AJXP_PRELOGED_USER", $data["PRESET_LOGIN"], $html); + } else{ + $html = str_replace("AJXP_PRELOGED_USER", "ajxp_legacy_minisite", $html); } if(isSet($hash)){ $_SESSION["CURRENT_MINISITE"] = $hash; diff --git a/core/src/plugins/action.share/res/minisite.php b/core/src/plugins/action.share/res/minisite.php index 625b8cec60..beb72ef8c7 100644 --- a/core/src/plugins/action.share/res/minisite.php +++ b/core/src/plugins/action.share/res/minisite.php @@ -129,6 +129,10 @@ "PASSWORD_AUTH_ONLY":true, "SERVER_PERMANENT_PARAMS":"minisite_session=AJXP_LINK_HASH" }; + if(startParameters["PRESET_LOGIN"] == "ajxp_legacy_minisite"){ + delete startParameters["PRESET_LOGIN"]; + startParameters["PASSWORD_AUTH_ONLY"] = false; + } document.observe("ajaxplorer:before_gui_load", function(e){ ajaxplorer.currentThemeUsesIconFonts = true; document.documentElement.className += " ajxp_theme_AJXP_THEME";