From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sun, 13 Jun 2004 04:36:53 +0000 (+0000)
Subject: using new commandLine.inc style, readconsole() moved to install-utils()
X-Git-Tag: 1.5.0alpha1~2865
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=f48ddd1366ff9a41c7be7e01655e5181f37339a2;p=lhc%2Fweb%2Fwiklou.git

using new commandLine.inc style, readconsole() moved to install-utils()
---

diff --git a/maintenance/eval.php b/maintenance/eval.php
index 911fde49ec..6c59d0c38c 100755
--- a/maintenance/eval.php
+++ b/maintenance/eval.php
@@ -1,10 +1,5 @@
 <?php
-/*require_once( "../includes/DefaultSettings.php" );
-require_once( "../LocalSettings.php" );
-require_once( "../includes/MemCachedClient.inc.php" );*/
-
-
-require_once( "liveCmdLine.inc" );
+require_once( "commandLine.inc" );
 
 do {
 	$line = readconsole( "> " );
@@ -14,17 +9,6 @@ do {
 	}
 } while ( 1 );
 
-function readconsole( $prompt = "" ) {
-	if ( function_exists( "readline" ) ) {
-		return readline( $prompt );
-	} else {
-		print $prompt;
-		$fp = fopen( "php://stdin", "r" );
-		$resp = trim( fgets( $fp, 1024 ) );
-		fclose( $fp );
-		return $resp;
-	}
-}
 
 
 
diff --git a/maintenance/mcc.php b/maintenance/mcc.php
index f0b68264e8..6ebbfc1b35 100755
--- a/maintenance/mcc.php
+++ b/maintenance/mcc.php
@@ -1,10 +1,6 @@
 <?php
-/*require_once( "../includes/DefaultSettings.php" );
-require_once( "../LocalSettings.php" );
-require_once( "../includes/MemCachedClient.inc.php" );*/
 
-
-require_once( "liveCmdLine.inc" );
+require_once( "commandLine.inc" );
 
 $mcc = new memcached( array('persistant' => true) );
 $mcc->set_servers( $wgMemCachedServers );
@@ -68,19 +64,5 @@ do {
 	}
 } while ( !$quit );
 
-function readconsole( $prompt = "" ) {
-	if ( function_exists( "readline" ) ) {
-		return readline( $prompt );
-	} else {
-		print $prompt;
-		$fp = fopen( "php://stdin", "r" );
-		$resp = trim( fgets( $fp, 1024 ) );
-		fclose( $fp );
-		return $resp;
-	}
-}
-
-
-
 ?>