From ef794b01aee9e1a2439359555184da5ec4b7b5f8 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sat, 24 May 2008 05:13:09 +0000
Subject: Correct URLs VS:
 ----------------------------------------------------------------------

---
 usr/local/www/system_firmware_auto.php  | 6 ++++--
 usr/local/www/system_firmware_check.php | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php
index 285eed2..6994be6 100755
--- a/usr/local/www/system_firmware_auto.php
+++ b/usr/local/www/system_firmware_auto.php
@@ -35,9 +35,11 @@ require("guiconfig.inc");
 
 $curcfg = $config['system']['firmware'];
 
-if(isset($curcfg['alturl']['enable'])
+if(isset($curcfg['alturl']['enable']))
 	$updater_url = "{$config['system']['firmware']['alturl']['firmwareurl']}";
-
+else
+	$updater_url = $g['update_url'];
+	
 $pgtitle = array("Diagnostics","Firmware","Auto Update");
 include("head.inc");
 
diff --git a/usr/local/www/system_firmware_check.php b/usr/local/www/system_firmware_check.php
index 308bdc4..fa60ec5 100755
--- a/usr/local/www/system_firmware_check.php
+++ b/usr/local/www/system_firmware_check.php
@@ -115,7 +115,7 @@ update_output_window($static_text);
 if(isset($curcfg['alturl']['enable']))
 	$updater_url = "{$config['system']['firmware']['alturl']['firmwareurl']}";
 else 
-	$updater_url = "${g['update_url']}";
+	$updater_url = $g['update_url'];
 
 update_status("Downloading current version information...");
 $latest_version = download_file_with_progress_bar("{$updater_url}/version", "/tmp/{$g['product_name']}_version");
@@ -131,7 +131,7 @@ if(!$latest_version) {
 		if(isset($curcfg['alturl']['enable']))
 			update_output_window("Could not contact custom update server.");
 		else 
-			update_output_window("Could not contact {$g['product_name']} update server.");
+			update_output_window("Could not contact {$g['product_name']} update server {$updater_url}.");
 } else {
 	if($needs_system_upgrade) {
 		echo "\n<script language=\"JavaScript\">$('invokeupgrade').style.visibility = 'visible';</script>";
-- 
cgit v1.1