From 9db190c7e736ec8d063187d4241b59feaf7dc2d1 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 22 Jun 2011 11:28:20 +0200
Subject: update to MediaWiki 1.17.0

---
 maintenance/mcc.php | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'maintenance/mcc.php')

diff --git a/maintenance/mcc.php b/maintenance/mcc.php
index e90266ae..a8c79a72 100644
--- a/maintenance/mcc.php
+++ b/maintenance/mcc.php
@@ -8,14 +8,14 @@
  */
 
 /** */
-require_once( dirname(__FILE__) . '/commandLine.inc' );
+require_once( dirname( __FILE__ ) . '/commandLine.inc' );
 
-$mcc = new MWMemcached( array('persistant' => true/*, 'debug' => true*/) );
+$mcc = new MWMemcached( array( 'persistant' => true/*, 'debug' => true*/ ) );
 $mcc->set_servers( $wgMemCachedServers );
-#$mcc->set_debug( true );
+# $mcc->set_debug( true );
 
-function mccShowHelp($command) {
-	$commandList = array( 
+function mccShowHelp( $command ) {
+	$commandList = array(
 		'get' => 'grabs something',
 		'getsock' => 'lists sockets',
 		'set' => 'changes something',
@@ -27,14 +27,15 @@ function mccShowHelp($command) {
 		'quit' => 'exit mcc',
 		'help' => 'help about a command',
 	);
-	if( !$command ) { 
+	if ( !$command ) {
 		$command = 'fullhelp';
 	}
-	if( $command === 'fullhelp' ) {
-		foreach( $commandList as $cmd => $desc ) {
-			print "$cmd: $desc\n";
+	if ( $command === 'fullhelp' ) {
+		$max_cmd_len = max( array_map( 'strlen', array_keys( $commandList ) ) );
+		foreach ( $commandList as $cmd => $desc ) {
+			printf( "%-{$max_cmd_len}s: %s\n", $cmd, $desc );
 		}
-	} elseif( isset( $commandList[$command] ) ) {
+	} elseif ( isset( $commandList[$command] ) ) {
 		print "$command: $commandList[$command]\n";
 	} else {
 		print "$command: command does not exist or no help for it\n";
@@ -46,8 +47,8 @@ do {
 	$showhelp = false;
 	$quit = false;
 
-	$line = readconsole( '> ' );
-	if ($line === false) exit;
+	$line = Maintenance::readconsole();
+	if ( $line === false ) exit;
 
 	$args = explode( ' ', $line );
 	$command = array_shift( $args );
@@ -56,7 +57,7 @@ do {
 	switch ( $command ) {
 		case 'help':
 			// show an help message
-			mccShowHelp(array_shift($args));
+			mccShowHelp( array_shift( $args ) );
 		break;
 
 		case 'get':
@@ -70,7 +71,7 @@ do {
 				$res = $res[$args[1]];
 			}
 			if ( $res === false ) {
-				#print 'Error: ' . $mcc->error_string() . "\n";
+				# print 'Error: ' . $mcc->error_string() . "\n";
 				print "MemCached error\n";
 			} elseif ( is_string( $res ) ) {
 				print "$res\n";
@@ -106,7 +107,7 @@ do {
 				$value = implode( ' ', $args );
 			}
 			if ( !$mcc->set( $key, $value, 0 ) ) {
-				#print 'Error: ' . $mcc->error_string() . "\n";
+				# print 'Error: ' . $mcc->error_string() . "\n";
 				print "MemCached error\n";
 			}
 			break;
@@ -114,14 +115,14 @@ do {
 		case 'delete':
 			$key = implode( ' ', $args );
 			if ( !$mcc->delete( $key ) ) {
-				#print 'Error: ' . $mcc->error_string() . "\n";
+				# print 'Error: ' . $mcc->error_string() . "\n";
 				print "MemCached error\n";
 			}
 			break;
 
 		case 'history':
 			if ( function_exists( 'readline_list_history' ) ) {
-				foreach( readline_list_history() as $num => $line) {
+				foreach ( readline_list_history() as $num => $line ) {
 					print "$num: $line\n";
 				}
 			} else {
-- 
cgit v1.2.3-54-g00ecf