Proxy latest_note to avoid re-asking authentification to update site.

Author: cdujeu

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 {

core/src/plugins/action.updater/class.UpdateController.php

@@ -85,8 +85,25 @@ public function switchAction($action, $httpVars, $fileVars)
 
             case "get_upgrade_path":
 
+                if(isSet($httpVars["proxy_note"])){
+                    $latestNote = $_SESSION["pydio-upgrade-latest-note"];
+                    if(!empty($latestNote)){
+                        $html = file_get_contents($latestNote, null, AjaXplorerUpgrader::getContext());
+                        header("Content-type: text/html");
+                        echo $html;
+                        return;
+                    }
+                }
                 header("Content-type: application/json");
-                print AjaXplorerUpgrader::getUpgradePath($this->pluginConf["UPDATE_SITE"], "json", $this->pluginConf["UPDATE_CHANNEL"]);
+                $jsonString = AjaXplorerUpgrader::getUpgradePath($this->pluginConf["UPDATE_SITE"], "json", $this->pluginConf["UPDATE_CHANNEL"]);
+                $data = json_decode($jsonString, true);
+                if(!empty($this->pluginConf["UPDATE_SITE_USER"]) && isSet($data["latest_note"]) && strpos($data["latest_note"], $this->pluginConf["UPDATE_SITE"]) === 0 && ConfService::$useSession){
+                    $_SESSION["pydio-upgrade-latest-note"] = $data["latest_note"];
+                    $data["latest_note"] = rtrim(AJXP_Utils::detectServerURL(true), "/")."/?get_action=get_upgrade_path&proxy_note=true&secure_token=".$httpVars["secure_token"];
+                    echo json_encode($data);
+                }else{
+                    echo $jsonString;
+                }
 
             break;