try disabling persistant connections

[lhc/web/wiklou.git] / install-utils.inc

diff --git a/install-utils.inc b/install-utils.inc
index 1cd8560..62d35c6 100644 (file)
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -62,7 +62,9 @@ function readconsole( $prompt = '' ) {
        } else {
                print $prompt;
                $fp = fopen( 'php://stdin', 'r' );
-               $resp = trim( fgets( $fp, 1024 ) );
+               $st = fgets($fp, 1024);
+               if ($st === false) return false;
+               $resp = trim( $st );
                fclose( $fp );
                return $resp;
        }
@@ -76,10 +78,12 @@ function replacevars( $ins ) {
        );
 
        foreach ( $varnames as $var ) {
-               global $$var;
-               $ins = str_replace( '{$' . $var . '}', $$var, $ins );
-               $ins = str_replace( '/*$' . $var . '*/`', '`' . $$var, $ins );
-               $ins = str_replace( '/*$' . $var . '*/', $$var, $ins );
+               if( isset( $GLOBALS[$var] ) ) {
+                       $val = addslashes( $GLOBALS[$var] );
+                       $ins = str_replace( '{$' . $var . '}', $val, $ins );
+                       $ins = str_replace( '/*$' . $var . '*/`', '`' . $val, $ins );
+                       $ins = str_replace( '/*$' . $var . '*/', $val, $ins );
+               }
        }
        return $ins;
 }