From now on, pass the package name "pydio-core" to upgrader - we'll m…

…aintain ajaxplorer-core and pydio-core
pydio · Oct 11, 2013 · 9828ea6 · 9828ea6
1 parent 0dc0b9f
commit 9828ea6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/src/plugins/action.updater/class.AjaXplorerUpgrader.php b/core/src/plugins/action.updater/class.AjaXplorerUpgrader.php
@@ -96,9 +96,9 @@ public static function configureProxy($proxyHost, $proxyUser, $proxyPass){
 
     static function getUpgradePath($url, $format = "php", $channel="stable"){
         if(isSet(self::$context)){
-            $json = file_get_contents($url."?channel=".$channel."&version=".AJXP_VERSION, null, self::$context);
+            $json = file_get_contents($url."?channel=".$channel."&version=".AJXP_VERSION."&package=pydio-core", null, self::$context);
         }else{
-            $json = AJXP_Utils::getRemoteContent($url."?channel=".$channel."&version=".AJXP_VERSION);
+            $json = AJXP_Utils::getRemoteContent($url."?channel=".$channel."&version=".AJXP_VERSION."&package=pydio-core");
         }
         if($format == "php") return json_decode($json, true);
         else return $json;

diff --git a/dist/zip/upgrade/ajaxplorer_upgrade.php b/dist/zip/upgrade/ajaxplorer_upgrade.php
@@ -9,6 +9,7 @@
 define("CRT_PATH", realpath(dirname(__FILE__)));
 $requiredVersion = $_GET["version"];
 $requiredChannel = (isSet($_GET["channel"])?$_GET["channel"]:"stable");
+$basePackage = isSet($_GET["package"]) ? $_GET["package"] : "ajaxplorer-core";
 $hashMethod = "md5";
 
 function preparePackages($channel, $hashMethod){
@@ -65,7 +66,7 @@ function detectServerURL(){
 $var_today=time(); //today
 $var_referer='';//$_SERVER['HTTP_REFERRER']; //referer url
 $var_uservar='-'; //enter your own user defined variable
-$var_utmp='/update/'.$_SERVER['REMOTE_ADDR']; //this example adds a fake page request to the (fake) rss directory (the viewer IP to check for absolute unique RSS readers)
+$var_utmp='/update/'.$requiredVersion.'/'.$_SERVER['REMOTE_ADDR']; //this example adds a fake page request to the (fake) rss directory (the viewer IP to check for absolute unique RSS readers)
 $urchinUrl='http://www.google-analytics.com/__utm.gif?utmwv=1&utmn='.$var_utmn.'&utmsr=-&utmsc=-&utmul=-&utmje=0&utmfl=-&utmdt=-&utmhn='.$var_utmhn.'&utmr='.$var_referer.'&utmp='.$var_utmp.'&utmac='.$var_utmac.'&utmcc=__utma%3D'.$var_cookie.'.'.$var_random.'.'.$var_today.'.'.$var_today.'.'.$var_today.'.2%3B%2B__utmb%3D'.$var_cookie.'%3B%2B__utmc%3D'.$var_cookie.'%3B%2B__utmz%3D'.$var_cookie.'.'.$var_today.'.2.2.utmccn%3D(direct)%7Cutmcsr%3D(direct)%7Cutmcmd%3D(none)%3B%2B__utmv%3D'.$var_cookie.'.'.$var_uservar.'%3B';
 $handle = fopen ($urchinUrl, "r");
 $test = fgets($handle);