From 061938cbb52215bca59b90350fdecc4cecf07a3c Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sat, 9 Jun 2012 17:56:23 +0200
Subject: [PATCH] finally fix the updater. next is an automatic updater. but
 this is a bit more tricky.

---
 config/config.sample.php |  1 +
 lib/updater.php          | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 3648bdebda..2205ee1b47 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -30,6 +30,7 @@ $CONFIG = array(
 "logfile" => "",
 "loglevel" => "",
 "passwordsalt" => "",
+"updatechecker" => true,
 // "datadirectory" => ""
 );
 ?>
diff --git a/lib/updater.php b/lib/updater.php
index deb0f05945..07904ef5f1 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -30,11 +30,12 @@ class OC_Updater{
 	 */
 	public static function check(){
 		OC_Appconfig::setValue('core', 'lastupdatedat',microtime(true));
+		if(OC_Appconfig::getValue('core', 'installedat','')=='') OC_Appconfig::setValue('core', 'installedat',microtime(true));
 
 		$updaterurl='http://apps.owncloud.com/updater.php';
 		$version=OC_Util::getVersion();
-		$version['installed']=OC_Config::getValue('installedat');
-		$version['updated']=OC_Appconfig::getValue('core', 'lastupdatedat', OC_Config::getValue( 'lastupdatedat'));
+		$version['installed']=OC_Appconfig::getValue('core', 'installedat');
+		$version['updated']=OC_Appconfig::getValue('core', 'lastupdatedat');
 		$version['updatechannel']='stable';
 		$version['edition']=OC_Util::getEditionString();
 		$versionstring=implode('x',$version);
@@ -57,15 +58,20 @@ class OC_Updater{
 	}
 
 	public static function ShowUpdatingHint(){
-		$data=OC_Updater::check();
-		if(isset($data['version']) and $data['version']<>'') {
-			$txt='<span style="color:#AA0000; font-weight:bold;">'.$data['versionstring'].' is available. Get <a href="'.$data['web'].'">more information</a></span>';
+		if(OC_Config::getValue('updatechecker', true)==true){
+			$data=OC_Updater::check();
+			if(isset($data['version']) and $data['version']<>'') {
+				$txt='<span style="color:#AA0000; font-weight:bold;">'.$data['versionstring'].' is available. Get <a href="'.$data['web'].'">more information</a></span>';
+			}else{
+				$txt='up to date';
+			}
 		}else{
-			$txt='up to date';
+			$txt='updates check is disabled';
 		}
 		return($txt);
 	}
 
+
 	/**
 	 * do ownCloud update
 	 */