From 5e776c527cbc5a00c0ba67510457560ec6bb7057 Mon Sep 17 00:00:00 2001
From: tomas <tomas@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Tue, 26 Apr 2005 14:09:09 +0000
Subject: [PATCH] Error handling fixed.

---
 .../modules/archiveServer/var/install/install.php  | 10 +++++-----
 .../modules/storageServer/var/install/install.php  | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/livesupport/modules/archiveServer/var/install/install.php b/livesupport/modules/archiveServer/var/install/install.php
index 62e11591b..f3e9b1fad 100644
--- a/livesupport/modules/archiveServer/var/install/install.php
+++ b/livesupport/modules/archiveServer/var/install/install.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.6 $
+    Version  : $Revision: 1.7 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/var/install/install.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -33,7 +33,7 @@ if(isset($arr["DOCUMENT_ROOT"]) && $arr["DOCUMENT_ROOT"] != ""){
     header("HTTP/1.1 400");
     header("Content-type: text/plain; charset=UTF-8");
     echo "400 Not executable\r\n";
-    exit;
+    exit(1);
 }
 
 require_once '../conf.php';
@@ -46,7 +46,7 @@ function errCallback($err)
     echo "ERROR:\n";
     echo "request: "; print_r($_REQUEST);
     echo "gm:\n".$err->getMessage()."\ndi:\n".$err->getDebugInfo().
-        "\nui:\n".$err->getUserInfo()."\n</pre>\n";
+        "\nui:\n".$err->getUserInfo()."\n";
     exit(1);
 }
 
@@ -76,11 +76,11 @@ echo "# Install ...\n";
 #PEAR::setErrorHandling(PEAR_ERROR_PRINT, "%s<hr>\n");
 PEAR::setErrorHandling(PEAR_ERROR_DIE, "%s<hr>\n");
 $r = $gb->install();
-if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit; }
+if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit(1); }
 
 echo "# Testing ...\n";
 $r = $gb->test();
-if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit; }
+if(PEAR::isError($r)){ echo $r->getMessage()."\n"; exit(1); }
 $log = $gb->test_log;
 if($log) echo "# testlog:\n{$log}";
 
diff --git a/livesupport/modules/storageServer/var/install/install.php b/livesupport/modules/storageServer/var/install/install.php
index 5f28ec8ed..2a8d9daaf 100644
--- a/livesupport/modules/storageServer/var/install/install.php
+++ b/livesupport/modules/storageServer/var/install/install.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.15 $
+    Version  : $Revision: 1.16 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/install/install.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -33,7 +33,7 @@ if(isset($arr["DOCUMENT_ROOT"]) && $arr["DOCUMENT_ROOT"] != ""){
     header("HTTP/1.1 400");
     header("Content-type: text/plain; charset=UTF-8");
     echo "400 Not executable\r\n";
-    exit;
+    exit(1);
 }
 
 require_once '../conf.php';
@@ -48,7 +48,7 @@ function errCallback($err)
     echo "ERROR:\n";
     echo "request: "; print_r($_REQUEST);
     echo "gm:\n".$err->getMessage()."\ndi:\n".$err->getDebugInfo().
-        "\nui:\n".$err->getUserInfo()."\n</pre>\n";
+        "\nui:\n".$err->getUserInfo()."\n";
     exit(1);
 }
 
@@ -83,11 +83,11 @@ echo "# Install ...\n";
 #PEAR::setErrorHandling(PEAR_ERROR_PRINT, "%s<hr>\n");
 PEAR::setErrorHandling(PEAR_ERROR_DIE, "%s<hr>\n");
 $r = $gb->install();
-if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit; }
+if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit(1); }
 
 echo "# Testing ...\n";
 $r = $gb->test();
-if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit; }
+if(PEAR::isError($r)){ echo $r->getMessage()."\n"; exit(1); }
 $log = $gb->test_log;
 if($log) echo "# testlog:\n{$log}";
 
@@ -114,12 +114,12 @@ if(!($fp = @fopen($config['storageDir']."/_writeTest", 'w'))){
 
 echo "# Install Transport submodule ...";
 $r = $tr->install();
-if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit; }
+if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit(1); }
 echo "\n";
 
 echo "# Install Prefs submodule ...";
 $r = $pr->install();
-if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit; }
+if(PEAR::isError($r)){ echo $r->getUserInfo()."\n"; exit(1); }
 echo "\n";
 
 echo "#storageServer submodules: OK\n";