From 29cf4f50f15665574218523c6f70637319d7db4f Mon Sep 17 00:00:00 2001
From: xq2005 <xq2005@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 9 Jul 2010 08:02:51 +0000
Subject: [PATCH] modify by xu qing on web.pm update.php updateprocess.php for
 update page to remember user's last choice

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6685 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-UI/ui.old/log.php              |  6 +++---
 xCAT-UI/ui.old/update.php           | 17 ++++++++++++++---
 xCAT-UI/ui.old/updateprocess.php    | 10 +++++++---
 xCAT-server/lib/xcat/plugins/web.pm |  2 +-
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/xCAT-UI/ui.old/log.php b/xCAT-UI/ui.old/log.php
index 10d74fb07..34daff862 100644
--- a/xCAT-UI/ui.old/log.php
+++ b/xCAT-UI/ui.old/log.php
@@ -4,9 +4,9 @@ header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
 header("Cache-Control: no-store, no-cache, must-revalidate");
 header("Cache-Control: post-check=0, pre-check=0", false);
 header("Pragma: no-cache");
-require_once "../lib/functions.php";
-require_once "../lib/security.php";
-require_once "jsonwrapper.php";
+require_once "lib/functions.php";
+require_once "lib/security.php";
+require_once "security/jsonwrapper.php";
 
     if(isset($_GET["logout"]) or isset($_POST["logout"])){
 	logout();
diff --git a/xCAT-UI/ui.old/update.php b/xCAT-UI/ui.old/update.php
index aeee5a7bd..7a70f5e86 100644
--- a/xCAT-UI/ui.old/update.php
+++ b/xCAT-UI/ui.old/update.php
@@ -25,9 +25,20 @@
         $StableRepository = "http://xcat.sourceforge.net/yum/xcat-core/";
     }
 
-    echo "<input type=\"radio\" name= \"reporadio\" value=\"" . $DevelRepository . "\">" . $DevelRepository . "(<strong>Devel</strong>)<br/>";
-    echo "<input type=\"radio\" name=\"reporadio\" value=\"" . $StableRepository . "\">" . $StableRepository . "(<strong>Stable</strong>)<br/>";
-    if(isset($_COOKIE["xcatrepository"]))
+    echo "<input type='radio' ";
+    if (1 == $_COOKIE["xcatrepository"])
+    {
+        echo "checked='true'";
+    }
+    echo "name='reporadio' value='" . $DevelRepository . "'>" . $DevelRepository . "(<strong>Devel</strong>)<br/>";
+    echo "<input type='radio' ";
+    if (2 == $_COOKIE["xcatrepository"])
+    {
+        echo "checked='true'";
+    }
+    echo "name='reporadio' value='" . $StableRepository . "'>" . $StableRepository . "(<strong>Stable</strong>)<br/>";
+
+    if((1 != $_COOKIE["xcatrepository"]) && (2 != $_COOKIE["xcatrepository"]))
     {
         echo "<input type=\"radio\" checked=\"true\" name=\"reporadio\" value=\"\">Other:";
         echo "<input style=\"width: 500px\" id=repositoryaddr value=\"" . $_COOKIE["xcatrepository"] ."\"<br/>";
diff --git a/xCAT-UI/ui.old/updateprocess.php b/xCAT-UI/ui.old/updateprocess.php
index 40ec988cd..92dda5d4c 100644
--- a/xCAT-UI/ui.old/updateprocess.php
+++ b/xCAT-UI/ui.old/updateprocess.php
@@ -57,13 +57,17 @@ if (!checkRpmPath($sRpmPath))
 }
 
 //set cookie must in front of any output
-if (isset($_REQUEST["remember"]))
+if (1 == $_REQUEST["remember"])
 {
-    setcookie("xcatrepository", $sRpmPath, time() + 864000, "/");
+    setcookie("xcatrepository", "1", time() + 864000, "/");
+}
+elseif(2 == $_REQUEST["remember"])
+{
+    setcookie("xcatrepository", "2", time() + 864000, "/");
 }
 else
 {
-    setcookie("xcatrepository", "", time() - 172800, "/");
+    setcookie("xcatrepository", $sRpmPath, time() + 864000, "/");
 }
 
 echo "<div class=\"mContent\">It will update <b>" . $sRpmNames ."</b> from <b>" . $sRpmPath . "</b>.<ul>";
diff --git a/xCAT-server/lib/xcat/plugins/web.pm b/xCAT-server/lib/xcat/plugins/web.pm
index 38093581d..1b470feed 100644
--- a/xCAT-server/lib/xcat/plugins/web.pm
+++ b/xCAT-server/lib/xcat/plugins/web.pm
@@ -367,7 +367,7 @@ sub web_update {
             }
 
             #update rpm by rpm packages.
-            $cmd = "rpm -U " . $LocalRpmFilePath;
+            $cmd = "rpm -U " . $LocalRpmFilePath . " 2>&1";
             $ReturnInfo = $ReturnInfo . readpipe($cmd);
         }
         $callback->({info=>$ReturnInfo});