diff --git a/htroot/Status.html b/htroot/Status.html index 6da534324..f8e7a0b42 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -38,24 +38,24 @@ #(hintVersionAvailable)#::
-
latest public version is #[latestVersion]#. - You can download a more recent version of YaCy. Click here to aquire a direct download location: +
Latest public version is v#[latestVersion]#. + You can download a more recent version of YaCy. Click here to install this update and restart YaCy:
-
#(/hintVersionAvailable)# - + #(hintStatusVirgin)#::
You have not published your peer seed yet. This happens automatically, just wait. diff --git a/htroot/Status.java b/htroot/Status.java index d26e453ae..dca4d82e5 100644 --- a/htroot/Status.java +++ b/htroot/Status.java @@ -154,6 +154,16 @@ public class Status { double thisVersion = Double.parseDouble(env.getConfig("version","0.1")); // cut off the SVN Rev in the Version try {thisVersion = Math.round(thisVersion*1000.0)/1000.0;} catch (NumberFormatException e) {} + + if ((adminaccess) && !(((plasmaSwitchboard) env).updaterCallback == null) && (((plasmaSwitchboard) env).updaterCallback.updateYaCyIsPossible() == true)){ + prop.put("hintVersionAvailable", 1); + prop.put("hintVersionAvailable_latestVersion", ((plasmaSwitchboard) env).updaterCallback.getYaCyUpdateReleaseVersion()); + if ((post != null) && (post.containsKey("aquirerelease"))) { + ((plasmaSwitchboard) env).updaterCallback.grantYaCyUpdate(); + } + } + + /* if ((adminaccess) && (yacyVersion.latestRelease >= (thisVersion+0.01))) { // only new Versions(not new SVN) if ((yacyVersion.latestMainRelease != null) || (yacyVersion.latestDevRelease != null)) { @@ -168,7 +178,8 @@ public class Status { prop.putASIS("hintVersionDownload_versionResMain", (yacyVersion.latestMainRelease == null) ? "-" : yacyVersion.latestMainRelease.toAnchor()); prop.putASIS("hintVersionDownload_versionResDev", (yacyVersion.latestDevRelease == null) ? "-" : yacyVersion.latestDevRelease.toAnchor()); prop.put("hintVersionAvailable_latestVersion", Double.toString(yacyVersion.latestRelease)); - + */ + // hostname and port String extendedPortString = env.getConfig("port", "8080"); int pos = extendedPortString.indexOf(":");