This commit was manufactured by cvs2svn to create tag 'REL1_4beta1'.1.4.0beta1

62 files changed, 542 insertions, 8042 deletions

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a674ad86cbcc..0776254beada 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -4,36 +4,98 @@ Security reminder: MediaWiki does not require PHP's register_globals
 setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
 
-== MediaWiki 1.4 BETA ==
-
-[Not everything is 100% working in beta yet, the installer needs fixes still.]
-
-Major changes from 1.3.x:
-* (?) Support for table prefixes for better sharing with other web apps
-* (?) PostgreSQL support
-* Optional article validation voting features
-* 'Recentchanges Patrol' to mark new edits that haven't yet been viewed
-* Support for faster C++ diff module (WikiDiff extension)
-* More scary link caching modes
-* Old manually maintained log pages replaced with searchable Special:Log
+== MediaWiki 1.4 BETA 1 ==
+
+''''' Thinking of using MySQL 4.1? Please read this first! '''''
+''''' Your PHP installation probably uses the OLD protocol '''''
+'''''   http://dev.mysql.com/doc/mysql/en/Old_client.html  '''''
+
+This is a beta release; while most things are working, there are some
+known problems and probably unknown problems. Don't run a public site
+on this beta unless you're willing to help with investigating and
+fixing any problems you encounter.
+
+CARELESS USE OF THIS CODE MAY RENDER YOU STERILE, GROW WEEDS IN YOUR
+YARD, AND FEED YOUR CAT TO A SEWER ALLIGATOR. DON'T SAY YOU WEREN'T
+WARNED, CAUSE WE WARNED YOU.
+
+If upgrading from an older release, see the file UPGRADING.
+
+=== New features ===
+
+* 'Recentchanges Patrol' to mark new edits that haven't yet been viewed.
+* New, searchable deletion/upload/protection logs
+* Image gallery generation (Special:Newimages and <gallery> tag)
+* SVG rasterization support (requires external support)
+* Users can select from the available localizations to override the
+  default user interface language.
+* Traditional/Simplified Chinese conversion support
+
+=== Installation and compatibility ===
+
+* The default MonoBook theme now works with PHP 5.0
+* Installation on systems with PHP's safe mode or other oddities
+  should work more reliably, as MonoBook no longer needs to
+  create a compiled template file for the wiki to run.
+* A table prefix may be specified, to avoid conflicts with other
+  web applications forced to share a database.
+* More thorough UTF-8 input validation; fixes non-ASCII uploaded
+  filenames from Safari.
+* Command-line database upgrade script.
+
+=== Customizability ===
+
+* Default user options can now be overridden in LocalSettings.
 * Skins system more modular: templates and CSS are now in /skins/
-* New user preference for limitting the image size for images on image description
-  pages 
-* Error pages no more offer edit / talk / watch links (bug #502)
-* Allow user to preview article on first edit (bug #530)
-* New dark background skin named Amethyst (thanks Sorwena and Sorkhiri)
-* [[RFC 1234]] will now make an internal link (bug #479)
-* PhpTal skins shown bogus 'What links here' etc on special pages (bug #511)
-* Experimental code to manage user and group rights (Special:Userlevels)
-* UI language switching
-* Adding filter and username exact search match for Special:Listusers (bug #770)
-* Special:Listadmins outdated, use Special:Listusers instead (bug #857)
-* Traditional/Simplified Chinese conversion
-* New tag "<gallery>" to generate a table of image thumbnails
-* Installer die if it can not write LocalSettings.php (bug #733)
-* Various special pages no more show the rss/atom feed links (bug #705)
-* Support for external authentication plug-ins
-* ... and more!
+  New skins can be dropped into this directory and used immediately.
+* More extension hooks have been added.
+* Authentication plugin hook.
+* More internal code documentation, generated with phpdoc:
+  http://www.mediawiki.org/docs/html/
+
+=== Optimization ===
+
+* For many operations, MediaWiki 1.4 should run faster and use
+  less memory than MediaWiki 1.3. Page rendering is up to twice
+  as fast. (Use a PHP accelerator such as Turck MMCache for best
+  results with any PHP application, though!)
+* The parser cache no longer requires memcached, and is enabled
+  by default. This avoids a lot of re-rendering of pages that
+  have been shown recently, greatly speeding longer page views.
+* Support for compiled PHP modules to speed up page diff and
+  Unicode validation/normalization. (Requires ability to compile
+  and load PHP extensions).
+
+=== What isn't ready yet ===
+
+* A new user/groups permissions scheme has been held back to 1.5.
+* An experimental SOAP interface will be made available as an extension
+* PostgreSQL support is largely working, but search and installer
+  support are not complete. These are being actively worked on
+  and should come in later betas.
+* E-mail notification of watched page changes and verification of
+  user-submitted e-mail addresses is not yet included. If updates
+  are available, this may make it into later betas.
+* Log pages are not automatically imported into the new log table
+  at upgrade time. A script to import old text log entries is
+  incomplete, but may be available by the time 1.4 finishes.
+* UI messages may be broken in Latin-1 mode in this release due to some
+  minor breakage in the language selection module.
+
+=== Misc bugs fixed ===
+
+* (bug 95) Templates no longer limited to 5 inclusions per page
+* New user preference for limiting the image size for images on image description
+  pages
+* (bug 502) Error pages no more offer edit / talk / watch links
+* (bug 530) Allow user to preview article on first edit
+* (bug 479) [[RFC 1234]] will now make an internal link
+* (bug 511) PhpTal skins shown bogus 'What links here' etc on special pages
+* (bug 770) Adding filter and username exact search match for Special:Listusers
+* (bug 733) Installer die if it can not write LocalSettings.php
+* (bug 705) Various special pages no more show the rss/atom feed links
+* (bug 114) use category backlinks in Special:Recentchangeslinked
+
 
 === Caveats ===
 
@@ -43,10 +105,6 @@ set $wgMimeType = "application/xhtml+xml"; to test for remaining problem
 cases, but this is not recommended on live sites. (This must be set for
 MathML to display properly in Mozilla.)
 
-The new 'MonoBook' skin is not compatible with PHP 5 due to bugs in the
-underlying PHPTAL library. It will be automatically disabled when running
-on PHP5; the older look and feel will be used instead.
-
 
 For notes on 1.3.x and older releases, see HISTORY.
 
@@ -67,6 +125,12 @@ wikitech-l list:
 
   http://mail.wikipedia.org/mailman/listinfo/mediawiki-l
 
+A low-traffic announcements-only list is also available:
+  http://mail.wikipedia.org/mailman/listinfo/mediawiki-announce
+
+It's highly recommended that you sign up for one of these lists if you're
+going to run a public MediaWiki, so you can be notified of security fixes.
+
 
 === IRC help ===
 
diff --git a/UPGRADE b/UPGRADE
new file mode 100644
index 000000000000..31edf4bdfa94
--- /dev/null
+++ b/UPGRADE
@@ -0,0 +1,130 @@
+== The basic theory ==
+
+Basically, to upgrade a wiki you:
+* Back up your data! (See Backups! below)
+* Extract the new archive. If you can do this in a clean directory that's
+  great, but it should work to extract over the old files too. This may
+  be easier if you have images etc in place and don't want to move them
+  around, but remember to back up first!
+* Run the installer to upgrade the database schema.
+
+=== Web installer ===
+
+You can use the web-based installer wizard if you first remove the
+LocalSettings.php (and AdminSettings.php, if any) files; be sure to
+give the installer the same information as you did on the original
+install (language/encoding, database name, password, etc). This will
+also generate a fresh LocalSettings.php, which you may need to customize.
+
+You may change some settings during the install, but be very careful!
+Changing the encoding in particular will generally leave you with a
+lot of corrupt pages, particularly if your wiki is not in English.
+
+=== Command-line upgrade ===
+
+Additionally, as of 1.4.0 you can run an in-place upgrade script from
+the command line, keeping your existing LocalSettings.php. This requires
+that you create an AdminSettings.php giving an appropriate database user
+and password with privileges to modify the database structure.
+
+Once the new files are in place, go into the maintenance subdirectory and
+run the script:
+
+  php update.php
+
+See caveats below on upgrading from 1.3.x or earlier.
+
+
+== Backups! ==
+
+To upgrade an existing MediaWiki installation, first BACK UP YOUR WIKI!
+If something goes wrong, you want to be able to start again.
+
+Your image files, configuration, etc can simply be copied or archived as
+you would any other files. (Make sure that the contents of your
+LocalSettings.php are not accidentally make public, as this contains
+a database password.)
+
+To back up the database, use the tools provided by your service provider
+(if applicable) or the standard mysqldump program.
+
+For general help on mysqldump:
+http://dev.mysql.com/doc/mysql/en/mysqldump.html
+
+WARNING: If using MySQL 4.1.x, mysqldump's charset conversion may in
+some cases damage data in your wiki. If necessary, set the charset
+option to 'latin1' to avoid the conversion. Fore more info see:
+http://mail.wikipedia.org/pipermail/wikitech-l/2004-November/026359.html
+
+
+== Caveats ==
+
+=== Upgrading from 1.3.x ===
+
+This should generally go smoothly.
+
+If you keep your LocalSettings.php, you may need to change the style paths
+to match the newly rearranged skin modules. Change these lines:
+  $wgStylePath        = "$wgScriptPath/stylesheets";
+  $wgStyleDirectory   = "$IP/stylesheets";
+  $wgLogo             = "$wgStylePath/images/wiki.png";
+
+to this:
+  $wgStylePath        = "$wgScriptPath/skins";
+  $wgStyleDirectory   = "$IP/skins";
+  $wgLogo             = "$wgStylePath/common/images/wiki.png";
+
+
+Note that the 1.3 beta releases included a potential vulnerability if PHP
+is configured with register_globals on and the includes directory is
+served to the web. For general safety, turn register_globals *off* if you
+don't _really_ need it for another package.
+
+If your hosting provider turns it on and you can't turn it off yourself,
+send them a kind note explaining that it can expose their servers and their
+customers to attacks.
+
+
+=== Upgrading from 1.2.x ===
+
+If you've been using the MediaWiki: namespace for custom page templates,
+note that things are a little different. The Template: namespace has been
+added which is more powerful -- templates can include parameters for
+instance.
+
+Any MediaWiki: entries that are not used by the software will be automatically
+moved to Template: entries at upgrade time. Be sure to go through and check
+that everything is working properly.
+
+Also, be sure to pick the correct character encoding -- some languages were
+only available in Latin-1 on 1.2.x and are now available for Unicode as well.
+If you want to upgrade an existing wiki from Latin-1 to Unicode you'll have
+to dump the database to SQL, run it through iconv or another conversion tool,
+and restore it. Sorry.
+
+
+=== Upgrading from 1.1.x or earlier ===
+
+This is less thoroughly tested, but should work.
+
+You need to specify the *admin* database username and password to the
+installer in order for it to successfully upgrade the database structure.
+You may wish to manually change the GRANTs later.
+
+If you have a very old database (earlier than organized MediaWiki releases
+in late August 2003) you may need to manually run some of the update SQL
+scripts in maintenance/archives before the installer is able to pick up
+with remaining updates.
+
+
+=== Upgrading from UseModWiki or old "phase 2" Wikipedia code ===
+
+There is a semi-maintained UseModWiki to MediaWiki conversion script at
+maintenance/importUseModWiki.php; it may require tweaking and customization
+to work for you.
+
+Install a new MediaWiki first, then use the conversion script which will
+output SQL statements; direct these to a file and then run that into your
+database.
+
+You will have to rebuild the links tables etc after importing.
diff --git a/config/index.php b/config/index.php
index 67e878911127..8cf8c6b52295 100644
--- a/config/index.php
+++ b/config/index.php
@@ -321,6 +321,7 @@ print "<li>Script URI path: <tt>" . htmlspecialchars( $conf->ScriptPath ) . "</t
 	$conf->DBuser = importPost( "DBuser", "wikiuser" );
 	$conf->DBpassword = importPost( "DBpassword" );
 	$conf->DBpassword2 = importPost( "DBpassword2" );
+	$conf->DBprefix = importPost( "DBprefix" );
 	$conf->RootPW = importPost( "RootPW" );
 	$conf->LanguageCode = importPost( "LanguageCode", "en" );
 	$conf->SysopName = importPost( "SysopName", "WikiSysop" );
@@ -342,6 +343,9 @@ if( $conf->DBpassword == "" ) {
 if( $conf->DBpassword != $conf->DBpassword2 ) {
 	$errs["DBpassword2"] = "Passwords don't match!";
 }
+if( !preg_match( '/^[A-Za-z_0-9]*$/', $conf->DBprefix ) ) {
+	$errs["DBprefix"] = "Invalid table prefix";
+}
 
 if( $conf->SysopPass == "" ) {
 	$errs["SysopPass"] = "Must not be blank";
@@ -394,6 +398,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 		eval($local);
 		$wgDBadminuser = "root";
 		$wgDBadminpassword = $conf->RootPW;
+		$wgDBprefix = $conf->DBprefix;
 		$wgCommandLineMode = true;
 		$wgUseDatabaseMessages = false;	/* FIXME: For database failure */
 		require_once( "includes/Setup.php" );
@@ -510,12 +515,14 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			print "<li>Creating tables...";
 			dbsource( "../maintenance/tables.sql", $wgDatabase );
 			dbsource( "../maintenance/interwiki.sql", $wgDatabase );
-			dbsource( "../maintenance/archives/patch-userlevels-defaultgroups.sql", $wgDatabase );
 			print " done.</li>\n";
 
 			print "<li>Initializing data...";
-			$wgDatabase->query( "INSERT INTO site_stats (ss_row_id,ss_total_views," .
-				"ss_total_edits,ss_good_articles) VALUES (1,0,0,0)" );
+			$wgDatabase->insert( 'site_stats',
+				array( 'ss_row_id'        => 1,
+				       'ss_total_views'   => 0,
+				       'ss_total_edits'   => 0,
+				       'ss_good_articles' => 0 ) );
 			# setting up the db user
 			if( $conf->Root ) {
 				print "<li>Granting user permissions...</li>\n";
@@ -539,32 +546,19 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 				print "<li>Skipped sysop account creation, no name given.</li>\n";
 			}
 
-			print "<li>Initialising log pages...";
-			$logs = array(
-				"uploadlogpage" => "uploadlogpagetext",
-				"dellogpage" => "dellogpagetext",
-				"protectlogpage" => "protectlogtext",
-				"blocklogpage" => "blocklogtext"
-			);
-			$metaNamespace = Namespace::getWikipedia();
+			$titleobj = Title::newFromText( wfMsgNoDB( "mainpage" ) );
 			$now = wfTimestampNow();
 			$won = wfInvertTimestamp( $now );
-			foreach( $logs as $page => $text ) {
-				$logTitle = $wgDatabase->strencode( $wgLang->ucfirst( str_replace( " ", "_", wfMsgNoDB( $page ) ) ) );
-				$logText = $wgDatabase->strencode( wfMsgNoDB( $text ) );
-				$wgDatabase->query( "INSERT INTO cur (cur_namespace,cur_title,cur_text," .
-				  "cur_restrictions,cur_timestamp,inverse_timestamp,cur_touched) " .
-				  "VALUES ($metaNamespace,'$logTitle','$logText','sysop','$now','$won','$now')" );
-			}
-			print "</li>\n";
-
-			$titleobj = Title::newFromText( wfMsgNoDB( "mainpage" ) );
-			$title = $titleobj->getDBkey();
-			$sql = "INSERT INTO cur (cur_namespace,cur_title,cur_text,cur_timestamp,inverse_timestamp,cur_touched,cur_user,cur_user_text) " .
-			  "VALUES (0,'$title','" .
-			  wfStrencode( wfMsg( "mainpagetext" ) . "\n\n" . wfMsg( "mainpagedocfooter" ) ) .
-			  "','$now','$won','$now',0,'MediaWiki default')";
-			$wgDatabase->query( $sql, $fname );
+			$wgDatabase->insert( 'cur',
+				array( 'cur_namespace'     => $titleobj->getNamespace(),
+				       'cur_title'         => $titleobj->getDBkey(),
+				       'cur_text'          => wfMsg( 'mainpagetext' ) . "\n\n" .
+				                              wfMsg( 'mainpagedocfooter' ),
+				       'cur_timestamp'     => $now,
+				       'inverse_timestamp' => $won,
+				       'cur_touched'       => $now,
+				       'cur_user'          => 0,
+				       'cur_user_text'     => 'MediaWiki default' ) );
 
 			print "<li><pre>";
 			initialiseMessages();
@@ -767,6 +761,16 @@ if( count( $errs ) ) {
 		you can specify new accounts/databases to be created.
 	</dt>
 
+	<dd><?php
+		aField( $conf, "DBprefix", "Database table prefix" );
+	?></dd>
+	<dt>
+		<p>If you need to share one database between multiple wikis, or
+		MediaWiki and another web application, you may choose to
+		add a prefix to all the table names to avoid conflicts.</p>
+		
+		<p>Avoid exotic characters; something like <tt>mw_</tt> is good.</p>
+	</dt>
 
 	<dd>
 		<?php
@@ -914,6 +918,7 @@ if ( \$wgCommandLineMode ) {
 \$wgDBname           = \"{$slconf['DBname']}\";
 \$wgDBuser           = \"{$slconf['DBuser']}\";
 \$wgDBpassword       = \"{$slconf['DBpassword']}\";
+\$wgDBprefix         = \"{$slconf['DBprefix']}\";
 
 ## To allow SQL queries through the wiki's Special:Askaql page,
 ## uncomment the next lines. THIS IS VERY INSECURE. If you want
@@ -925,6 +930,7 @@ if ( \$wgCommandLineMode ) {
 # \$wgDBsqluser        = \"sqluser\";
 # \$wgDBsqlpassword    = \"sqlpass\";
 
+# If you're on MySQL 3.x, this next line must be FALSE:
 \$wgDBmysql4 = \$wgEnablePersistentLC = {$conf->DBmysql4};
 
 ## Shared memory settings
diff --git a/config/installer.php b/config/installer.php
deleted file mode 100644
index 237c7a3f21eb..000000000000
--- a/config/installer.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-
-# MediaWiki web-based config/installation
-# Copyright (C) 2004 Brion Vibber <brion@pobox.com>
-# http://www.mediawiki.org/
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-# http://www.gnu.org/copyleft/gpl.html
-
-
-/**
- * This is to be the fancy new installer package for MediaWiki,
- * which will work with table prefixes, both MySQL and PostgreSQL, and
- * ideally such wacky things as text-based install as well as web.
- *
- * It's not done yet.
- *
- * @todo finish...
- * @package MediaWiki
- * @subpackage Installer
- */
-
-$IP = ".."; # Just to suppress notices, not for anything useful
-define( "MEDIAWIKI", true );
-define( "MEDIAWIKI_INSTALL", true );
-require_once( "../includes/Defines.php" );
-require_once( "../includes/DefaultSettings.php" );
-require_once( "../includes/MagicWord.php" );
-require_once( "../includes/Namespace.php" );
-require_once( "../install-utils.inc" );
-require_once( "../maintenance/updaters.inc" );
-require_once( "../maintenance/convertLinks.inc" );
-require_once( "../maintenance/archives/moveCustomMessages.inc" );
-
-class InstallInterface {
-	function message( $text ) {
-		echo $text . "\n";
-	}
-	
-	function warning( $text ) {
-		echo "** $text **\n";
-	}
-	
-	function formatLink( $url, $text = '' ) {
-		if( $text ) {
-			return "$text ($url)";
-		} else {
-			return $url;
-		}
-	}
-	
-	function showHeader() {
-		global $wgVersion;
-		echo "MediaWiki $wgVersion installation\n\n";
-	}
-}
-
-class Installer {
-	var $settings = array();
-	
-	function Installer( &$interface ) {
-		$this->ui =& $interface;
-	}
-	
-	function runInstall() {
-		$this->ui->showHeader();
-		$this->preInstallChecks();
-	}
-	
-	function override( $var, $value ) {
-		$this->settings[$var] = $value;
-	}
-	
-	function preInstallChecks() {
-		$checks = array(
-			'checkConfigured',
-			'checkInstalled',
-			'checkWritable',
-			'checkPHP',
-			'checkGlobals',
-			'checkSafeMode',
-			'checkSAPI',
-			'checkMemory',
-			'checkZlib',
-			'checkImageMagick',
-			'checkGD'
-		);
-		foreach( $checks as $check ) {
-			if( !$this->$check() ) {
-				$this->ui->warning( "Installation aborted." );
-				return false;
-			}
-		}
-	}
-	
-	function checkConfigured() {
-		if( file_exists( "../LocalSettings.php" ) || file_exists( "../AdminSettings.php" ) ) {
-			$this->ui->warning( "Already configured." );
-			return false;
-		}
-		return true;
-	}
-	
-	function checkInstalled() {
-		if( file_exists( "./LocalSettings.php" ) || file_exists( "./AdminSettings.php" ) ) {
-			$this->ui->warning( "Already configured; move LocalSettings.php from this directory to the parent dir and take the wiki for a spin." );
-			return false;
-		}
-		return true;
-	}
-	
-	function checkWritable() {
-		if( !is_writable( "." ) ) {
-			$this->ui->warning( "<h2>Can't write config file, aborting</h2>
-
-	<p>In order to configure the wiki you have to make the <tt>config</tt> subdirectory
-	writable by the web server. Once configuration is done you'll move the created
-	<tt>LocalSettings.php</tt> to the parent directory, and for added safety you can
-	then remove the <tt>config</tt> subdirectory entirely.</p>
-
-	<p>To make the directory writable on a Unix/Linux system:</p>
-
-	<pre>
-	cd <i>/path/to/wiki</i>
-	chmod a+w config
-	</pre>" );
-
-			return false;
-		}
-		return true;
-	}
-	
-	function checkPHP() {
-		$ver = phpversion();
-		if( version_compare( $ver, "4.1.2", "lt" ) ) {
-			$this->ui->warning( "Your version of PHP ($ver) is too old and will probably not work. We try to support 4.1.2 and above, but a current 4.3 or 5.0 release is preferred." );
-			return false;
-		}
-		$this->ui->message( "PHP version $ver, ok" );
-		if( version_compare( $ver, "gte", "5.0" ) ) {
-			$this->ui->warning( "A PHP5-compatible version of the PHPTAL template system is not yet bundled. To get the regular default page layout, you will need to manually install a development snapshot. (The wiki will function normally using an older layout if you do not.)" );
-		}
-		return true;
-	}
-	
-	function checkGlobals() {
-		if( ini_get( 'register_globals' ) ) {
-			$this->ui->warning( "PHP's " .
-				$this->ui->formatLink( "http://php.net/register_globals", "register_globals" ) .
-				"option is enabled." .
-				"MediaWiki will work correctly, but this setting
-	increases your exposure to potential security vulnerabilities in PHP-based
-	software running on your server. <b>You should disable it if you are able.</b>" );
-		}
-		return true;
-	}
-	
-	function checkSafeMode() {
-		if( ini_get( 'safe_mode' ) ) {
-			$this->ui->warning( "PHP's
-	<a href='http://www.php.net/features.safe-mode'>safe mode</a> is active!</b>
-	You will likely have problems caused by this. You may need to make the
-	'images' subdirectory writable or specify a TMP environment variable pointing to
-	a writable temporary directory owned by you, since safe mode breaks the system
-	temporary directory." );
-			$this->ui->message( "...due to safe mode restrictions, uploads will use flat directory mode if enabled." );
-			$this->override( 'wgHashedUploadDirectory', true );
-		} else {
-			$this->ui->message( "PHP is not running in safe mode (this is good!)" );
-			$this->ui->message( "...uploads will use hashed directory tree mode if enabled." );
-		}
-		return true;
-	}
-	
-	function checkSAPI() {
-		$sapi = php_sapi_name();
-		$this->ui->message( "PHP server API is $sapi..." );
-		switch( $sapi ) {
-			case "apache":
-			case "apache2handler":
-				$this->ui->message( "...ok, using pretty URLs (<tt>index.php/Page_Title</tt>)" );
-				break;
-			case "cgi":
-			case "cgi-fcgi":
-			case "apache2filter":
-				$this->ui->message( "using ugly URLs (<tt>index.php?title=Page_Title</tt>)" );
-				$this->override( 'prettyURLs', false );
-				# FIXME
-				break;
-			default:
-				$this->ui->message( "unknown; using pretty URLs (<tt>index.php/Page_Title</tt>), if you have trouble change this in <tt>LocalSettings.php</tt>" );
-		}
-		return true;
-	}
-	
-	function checkMemory() {
-		$memlimit = ini_get( "memory_limit" );
-		if( empty( $memlimit ) ) {
-			$this->ui->message( "PHP is configured with no <tt>memory_limit</tt>." );
-			return true;
-		} else {
-			$this->ui->message( "PHP's <tt>memory_limit</tt> is $memlimit... " );
-			$n = IntVal( $memlimit );
-			if( preg_match( '/^([0-9]+)[Mm]$/', trim( $memlimit ), $m ) ) {
-				$n = IntVal( $m[1] * (1024*1024) );
-			}
-			if( $n < 20*1024*1024 ) {
-				if( false === ini_set( "memory_limit", "20M" ) ) {
-					$this->ui->warning( "...failed to raise the limit to 20M; you may have problems" );
-				} else {
-					$this->ui->message( "...raising limit to 20M" );
-					$this->override( 'raiseMemory', true );
-				}
-			}
-			return true;
-		}
-	}
-	
-	function checkZlib() {
-		$zlib = function_exists( "gzencode" );
-		if( $zlib ) {
-			$this->ui->message( "Have zlib support; enabling output compression." );
-			# This is a runtime thing, we're just letting the user know about it?
-		} else {
-			$this->ui->message( "No zlib support." );
-		}
-		return true;
-	}
-	
-	function checkImageMagick() {
-		$imcheck = array( "/usr/bin", "/usr/local/bin", "/sw/bin", "/opt/local/bin" );
-		foreach( $imcheck as $dir ) {
-			$im = "$dir/convert";
-			if( file_exists( $im ) ) {
-				$this->ui->message( "Found ImageMagick: <tt>$im</tt>; image thumbnailing will be enabled if you enable uploads." );
-				$this->override( "wgImageMagick", $im );
-				$this->override( "wgUseImageResize", true );
-				break;
-			}
-		}
-		return true;
-	}
-	
-	function checkGD() {
-		$gd = function_exists( "imagejpeg" );
-		if( $gd ) {
-			$this->ui->message( "Found GD graphics library built-in, image thumbnailing will be enabled if you enable uploads" );
-			$this->override( "wgUseImageResize", true );
-		} else {
-			if( !isset( $this->settings['wgUseImageResize'] ) ) {
-				$this->warning( "Couldn't find GD library or ImageMagick; image thumbnailing disabled." );
-			}
-		}
-		return true;
-	}
-	
-	
-}
-
-$ui =& new InstallInterface();
-$i =& new Installer( $ui );
-$i->runInstall();
-
-?>
\ No newline at end of file
diff --git a/docs/design.doc b/docs/design.doc
index af1ee3054abb..8adff443f08f 100644
--- a/docs/design.doc
+++ b/docs/design.doc
@@ -118,9 +118,11 @@ Naming/coding conventions:
     values wpName ("p" for "POST").
 
   - Be kind to your release manager and don't use CVS keywords (Id,
-    Revision, etc.) to mark file versions; they make merging code between
-    different branches a pain for older versions (<1.12.x) of CVS, and
-    are kind of sketchy for versions after that.
+    Revision, etc.) to mark file versions. They make merging code
+    between different branches a pain for CVS, and are kind of sketchy
+    for versions after that. (Yes, you can use the '-kk' flag so that
+    merges ignore keywords, but that messes up binary  files. See
+    https://www.cvshome.org/docs/manual/cvs-1.11.18/cvs_5.html#SEC64).
     
 
     
\ No newline at end of file
diff --git a/extensions/Syslog.php b/extensions/Syslog.php
deleted file mode 100644
index d499bb955079..000000000000
--- a/extensions/Syslog.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/* Syslog.php -- an extension to log events to the system logger
- * Copyright 2004 Evan Prodromou <evan@wikitravel.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @author Evan Prodromou <evan@wikitravel.org>
- * @package MediaWiki
- * @subpackage Extensions
- */
-
-if (defined('MEDIAWIKI')) {
-
-	# Setup globals
-	
-	if (!isset($wgSyslogIdentity)) {
-		$wgSyslogIdentity = $wgDBname;
-	}
-	if (!isset($wgSyslogFacility)) {
-		$wgSyslogFacility = LOG_USER;
-	}
-
-	# Hook for article protection
-	
-	function syslogArticleProtect(&$article, &$user, $protect, &$reason, &$moveonly) {
-		$title = $article->mTitle;
-		syslog(LOG_NOTICE, "User '" . $user->getName() . "' " .
-			   (($protect) ? "protected" : "unprotected") . " article '" .
-			   $title->getPrefixedText() .
-			   "' for '" . $reason . "' " . (($moveonly) ? "(moves only)" : "") );
-		return true;
-	}
-
-	# Hook for article deletion
-	
-	function syslogArticleDelete(&$article, &$user, &$reason) {
-		$title = $article->mTitle;
-		syslog(LOG_NOTICE, "User '" . $user->getName() . "' deleted '" .
-			   $title->getPrefixedText() .
-			   "' for '" . $reason . "' ");
-		return true;
-	}
-
-	# Hook for article save
-	
-	function syslogArticleSave(&$article, &$user, &$text, $summary,
-							   $isminor, $iswatch, $section)
-	{
-		$title = $article->mTitle;
-		syslog(LOG_NOTICE, "User '" . $user->getName() . "' saved '" .
-			   $title->getPrefixedText() .
-			   "' with comment '" . $summary . "' ");
-		return true;
-	}
-
-	# Hook for IP & user blocks
-	
-	function syslogBlockIp(&$block, &$user) {
-		syslog(LOG_NOTICE, "User '" . $user->getName() . 
-			   "' blocked '" . (($block->mUser) ? $block->mUser : $block->mAddress) .
-			   "' for '" . $block->mReason . "' until '" . $block->mExpiry . "'");
-		return true;
-	}
-
-	function syslogEmailUser(&$to, &$from, &$subject, &$text) {
-		syslog(LOG_INFO, "Email sent from '$from' to '$to' with subject '$subject'");
-	}
-
-	# Hook for unwatch
-	
-	function syslogUnwatch(&$user, &$article) {
-		syslog(LOG_INFO, "User '" . $user->getName() . "' stopped watching '" .
-			   $article->mTitle->getPrefixedText() . "'");
-	}
-	
-	# Hook for login
-
-	function syslogUserLogin(&$user) {
-		syslog(LOG_INFO, "User '" . $user->getName() . "' logged in");
-		return true;
-	}
-
-	# Hook for logout
-	
-	function syslogUserLogout(&$user) {
-		syslog(LOG_INFO, "User '" . $user->getName() . "' logged out");
-		return true;
-	}
-
-	# Hook for watch
-	
-	function syslogWatch(&$user, &$article) {
-		syslog(LOG_INFO, "User '" . $user->getName() . "' started watching '" .
-			   $article->mTitle->getPrefixedText() . "'");
-	}
-
-	# Setup -- called once environment is configured
-	
-	function setupSyslog() {
-		
-		global $wgSyslogIdentity, $wgSyslogFacility, $_syslogId;
-		global $wgHooks;
-		
-		openlog($wgSyslogIdentity, LOG_ODELAY | LOG_PID, $wgSyslogFacility);
-		
-		$wgHooks['UserLoginComplete'][] = 'syslogUserLogin';
-		$wgHooks['UserLogout'][] = 'syslogUserLogout';
-		$wgHooks['BlockIpComplete'][] = 'syslogBlockIp';
-		$wgHooks['ArticleProtectComplete'][] = 'syslogArticleProtect';
-		$wgHooks['ArticleDeleteComplete'][] = 'syslogArticleDelete';
-		$wgHooks['ArticleSaveComplete'][] = 'syslogArticleSave';
-		$wgHooks['EmailUserComplete'][] = 'syslogEmailUser';
-		$wgHooks['WatchArticleComplete'][] = 'syslogWatch';
-		$wgHooks['UnwatchArticleComplete'][] = 'syslogUnwatch';
-		
-		return true;
-	}
-
-	# Add to global list of extensions
-	
-	$wgExtensionFunctions[] = setupSyslog;
-}
-
-?>
\ No newline at end of file
diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 42dae594c5f1..cb749cf4f304 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -5,8 +5,11 @@
  *
  * @package MediaWiki
  */
+ 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
 
-if ( $wgCategoryMagicGallery ) 
+if( $wgCategoryMagicGallery ) 
 	require_once('ImageGallery.php');
 
 /**
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c4eb85c462f8..1e2abbe45f0c 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -19,7 +19,7 @@ if( defined( 'MEDIAWIKI' ) ) {
  * MediaWiki version number
  * @global string $wgVersion
  */
-$wgVersion			= '1.4-beta0';
+$wgVersion			= '1.4beta1';
 
 /** 
  * Name of the site.
diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php
index 7a8c6e01aa6a..8184ce498732 100644
--- a/includes/ImageGallery.php
+++ b/includes/ImageGallery.php
@@ -97,20 +97,23 @@ class ImageGallery
 				wfMsg( "nbytes", $wgLang->formatNum( $img->getSize() ) )  . '<br />' :
 				'' ;
 			$textlink = $this->mShowFilename ?
-				$sk->makeKnownLinkObj( $nt, Language::truncate( $nt->getText(), 20, '...' ) ) . '<br />' :
+				$sk->makeKnownLinkObj( $nt, htmlspecialchars( $wgLang->truncate( $nt->getText(), 20, '...' ) ) ) . '<br />' :
 				'' ;
 
 			$s .= ($i%4==0) ? '<tr>' : '';
 			$s .= '<td valign="top" width="150px" style="background-color:#F0F0F0;">' .
 				'<table width="100%" height="150px">'.
 				'<tr><td align="center" valign="center" style="background-color:#F8F8F8;border:solid 1px #888888;">' .
-				$sk->makeKnownLinkObj( $nt, '<img  src="'.$img->createThumb(120,120).'" alt="">' ) . '</td></tr></table> ' .
+				$sk->makeKnownLinkObj( $nt, '<img  src="'.$img->createThumb(120,120).'" alt="" />' ) . '</td></tr></table> ' .
 				$textlink . $text . $nb; 
 
-			$s .= '</td>' .  (($i%4==3) ? '</tr>' : '');
+			$s .= "</td>\n" .  (($i%4==3) ? "</tr>\n" : '');
 
 			$i++;
 		}
+		if( $i %4 != 0 ) {
+			$s .= "</tr>\n";
+		}
 		$s .= '</table>';
 
 		return $s;
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index dc7c67fbf09f..65d7f84916b6 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -6,6 +6,9 @@
 /**
  *
  */
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 require_once( 'Image.php' );
 
 /**
@@ -132,7 +135,8 @@ class ImagePage extends Article {
 		$imagelinks = $dbr->tableName( 'imagelinks' );
 		
 		$sql = "SELECT cur_namespace,cur_title FROM $imagelinks,$cur WHERE il_to=" .
-		  $dbr->addQuotes( $this->mTitle->getDBkey() ) . " AND il_from=cur_id";
+		  $dbr->addQuotes( $this->mTitle->getDBkey() ) . " AND il_from=cur_id"
+		  . " LIMIT 500"; # quickie emergency brake
 		$res = $dbr->query( $sql, DB_SLAVE, "Article::imageLinks" );
 
 		if ( 0 == $dbr->numRows( $res ) ) {
diff --git a/includes/SpecialListadmins.php b/includes/SpecialListadmins.php
index 63e9e5fc660d..fba15ed7b741 100644
--- a/includes/SpecialListadmins.php
+++ b/includes/SpecialListadmins.php
@@ -1,23 +1,51 @@
 <?php
 /**
- * This old a redirect to Special:Listusers that now implement a filter
- * by user groups. The listadmins special page is now deprecated but kept
- * for backward compatibility.
- * 
+ *
  * @package MediaWiki
  * @subpackage SpecialPage
- * @deprecated
  */
 
 /**
- * Just redirect to Special:Listusers.
- * Kept for backward compatibility.
+ *
  */
-function wfSpecialListadmins() {
-	global $wgOut;
-	$t = Title::makeTitle( NS_SPECIAL, "Listusers" );
-	$wgOut->redirect ($t->getFullURL());
+require_once("QueryPage.php");
+
+/**
+ * This class is used to get a list of users flagged with "sysop" right.
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+class ListAdminsPage extends PageQueryPage {
+
+	function getName() {
+		return 'Listadmins';
+	}
+
+	function sortDescending() {
+		return false;
+	}
+
+	function getSQL() {
+		$dbr =& wfGetDB( DB_SLAVE );
+		$user = $dbr->tableName( 'user' );
+		$user_rights = $dbr->tableName( 'user_rights' );
+		$userspace = Namespace::getUser();
+		return "SELECT ur_rights as type,{$userspace} as namespace,".
+		       "user_name as title, user_name as value ".
+		       "FROM {$user} ,{$user_rights} WHERE user_id=ur_user AND ur_rights LIKE '%sysop%'";
+	}
 }
 
+/**
+ * constructor
+ */
+function wfSpecialListadmins() {
+	list( $limit, $offset ) = wfCheckLimits();
+
+	$sla = new ListAdminsPage();
+
+	return $sla->doQuery( $offset, $limit );
+}
 
 ?>
diff --git a/includes/SpecialListusers.php b/includes/SpecialListusers.php
index a44901b390fc..6f2e3617822f 100644
--- a/includes/SpecialListusers.php
+++ b/includes/SpecialListusers.php
@@ -38,87 +38,20 @@ require_once("QueryPage.php");
  * @subpackage SpecialPage
  */
 class ListUsersPage extends QueryPage {
-	var $requestedGroup = '';
 	var $requestedUser = '';
 		
 	function getName() {
 		return "Listusers";
 	}
 	function isSyndicated() { return false; }
-
-	/**
-	 * Show a drop down list to select a group as well as a user name
-	 * search box.
-	 * @TODO: localize
-	 */
-	function getPageHeader( ) {
-		global $wgScript;
-		
-		// Various variables used for the form
-		$action = htmlspecialchars( $wgScript );
-		$title = Title::makeTitle( NS_SPECIAL, 'Listusers' );
-		$special = htmlspecialchars( $title->getPrefixedDBkey() );
-
-		// form header
-		$out = '<form method="get" action="'.$action.'">' .
-				'<input type="hidden" name="title" value="'.$special.'" />' .
-				'Group: <select name="group">' .
-
-		// get all group names and id
-		$dbr = & wfGetDB( DB_SLAVE );
-		$group = $dbr->tableName( 'group' );
-		$sql = "SELECT group_id, group_name FROM $group;";
-		$result = $dbr->query($sql);
-		
-		// we want a default empty group
-		$out.= '<option value=""></option>';
-		
-		// build the dropdown list menu using datas from the database
-		while($agroup = $dbr->fetchObject( $result )) {
-			$selected = ($agroup->group_id == $this->requestedGroup) ? " selected " : "" ;
-			$out.= '<option value="'.$agroup->group_id.'" '.$selected.'>'.$agroup->group_name.'</option>';
-		}
-		$out .= '</select> ';
-
-		$out .= 'User: <input type="text" name="username" /> ';
-
-		// OK button, end of form.
-		$out .= '<input type="submit" /></form>';
-		// congratulations the form is now build
-		return $out;	
-	}
 	
 	function getSQL() {
 		$dbr =& wfGetDB( DB_SLAVE );
-	/* system showing possible actions for users
 		$user = $dbr->tableName( 'user' );
 		$user_rights = $dbr->tableName( 'user_rights' );
 		$userspace = Namespace::getUser();
 		return "SELECT ur_rights as type, $userspace as namespace, user_name as title, " .
 			"user_name as value FROM $user LEFT JOIN $user_rights ON user_id = ur_user";
-	*/
-	/** Show groups instead */
-		$user = $dbr->tableName( 'user' );
-		$group = $dbr->tableName( 'group' );
-		$user_groups = $dbr->tableName( 'user_groups' );
-		
-		$userspace = Namespace::getUser();
-		$sql = "SELECT group_name as type, $userspace AS namespace, user_name AS title, user_name as value " .
-			"FROM $user LEFT JOIN $user_groups ON user_id =ug_user " .
-			"LEFT JOIN $group ON ug_group = group_id ";
-		
-		if($this->requestedGroup != '') {
-			$sql .=  "WHERE group_id= '$this->requestedGroup' ";
-			if($this->requestedUser != '') {
-				$sql .= "AND user_name = '$this->requestedUser' ";
-			}
-		} else {
-			if($this->requestedUser !='') {
-				$sql .= "WHERE user_name = '$this->requestedUser' ";
-			}	
-		}				
-		
-		return $sql;
 	}
 	
 	function sortDescending() {
diff --git a/includes/SpecialMakesysop.php b/includes/SpecialMakesysop.php
index 57eb11ba307f..d8b065521cea 100644
--- a/includes/SpecialMakesysop.php
+++ b/includes/SpecialMakesysop.php
@@ -6,9 +6,6 @@
  * @deprecated
  */
 
-wfDebugDieBacktrace('Use SpecialUserlevels instead !!'); // [av]
-
-
 /**
  *
  */
diff --git a/includes/SpecialNewimages.php b/includes/SpecialNewimages.php
index 91865509aba3..9d0d51b461e9 100644
--- a/includes/SpecialNewimages.php
+++ b/includes/SpecialNewimages.php
@@ -51,7 +51,7 @@ function wfSpecialNewimages() {
 	$sk = $wgUser->getSkin();
 	$cap = wfMsg( 'ilshowmatch' );
 	$sub = wfMsg( 'ilsubmit' );
-	$titleObj = Title::makeTitle( NS_SPECIAL, 'Imagelist' );
+	$titleObj = Title::makeTitle( NS_SPECIAL, 'Newimages' );
 	$action = $titleObj->escapeLocalURL(  "sort={$sort}&limit={$limit}" );
 
 	$wgOut->addHTML( "<form id=\"imagesearch\" method=\"post\" action=\"" .
@@ -72,7 +72,7 @@ function wfSpecialNewimages() {
 		  "sort=bydate&limit={$num}&wpIlMatch=" . urlencode( $wpIlMatch ) );
 	}
 	$text = wfMsg( 'showlast', $fill, $bydate );
-	$wgOut->addHTML( $text."</p>\n" );
+	$wgOut->addHTML( $text."\n" );
 
 	$i=0;
 	$res = $dbr->query( $sql, 'wfSpecialImagelist' );
diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 9b9c51efd0ef..521aa21dbf8c 100644
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -41,6 +41,7 @@ $wgSpecialPages = array(
 	'Randompage'        => new SpecialPage( 'Randompage' ),
 	'Lonelypages'       => new SpecialPage( 'Lonelypages' ),
 	'Uncategorizedpages'=> new SpecialPage( 'Uncategorizedpages' ),
+	'Uncategorizedcategories'=> new SpecialPage( 'Uncategorizedcategories' ),
 	'Unusedimages'      => new SpecialPage( 'Unusedimages' )
 );
 
@@ -83,15 +84,13 @@ $wgSpecialPages = array_merge($wgSpecialPages, array (
 	'Blockip'		=> new SpecialPage( 'Blockip', 'block' ),
 	'Asksql'		=> new SpecialPage( 'Asksql', 'asksql' ),
 	'Undelete'		=> new SpecialPage( 'Undelete', 'delete' ),
-	// Makesysop is obsolete, replaced by Special:Userlevels [av]
-	# 'Makesysop'		=> new SpecialPage( 'Makesysop', 'userrights' ),
+	'Makesysop'		=> new SpecialPage( 'Makesysop', 'userrights' ),
 
 # Special:Import is half-written
 #	"Import"		=> new SpecialPage( "Import", "sysop" ),
 	'Lockdb'		=> new SpecialPage( 'Lockdb', 'siteadmin' ),
 	'Unlockdb'		=> new SpecialPage( 'Unlockdb', 'siteadmin' ),
-	'Sitesettings'  => new SpecialPage( 'Sitesettings', 'siteadmin' ),
-	'Userlevels'	=> new SpecialPage( 'Userlevels', 'userrights' ),
+#	'Sitesettings'  => new SpecialPage( 'Sitesettings', 'siteadmin' ),
 ));
 
 /**
@@ -263,11 +262,7 @@ class SpecialPage
 		if ( $this->mRestriction == "" ) {
 			return true;
 		} else {
-			if ( in_array( $this->mRestriction, $user->getRights() ) ) {
-				return true;
-			} else {
-				return false;
-			}
+			return $user->isAllowed( $this->mRestriction );
 		}
 	}
 
diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 6d9e60219a7d..dbb452d356fa 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -5,6 +5,9 @@
  * @subpackage SpecialPage
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /* to get a list of languages in setting user's language preference */
 require_once('languages/Names.php');
 
diff --git a/includes/SpecialRecentchangeslinked.php b/includes/SpecialRecentchangeslinked.php
index 6a86012d8c9d..90299237c1e5 100644
--- a/includes/SpecialRecentchangeslinked.php
+++ b/includes/SpecialRecentchangeslinked.php
@@ -65,13 +65,23 @@ function wfSpecialRecentchangeslinked( $par = NULL ) {
 		$cmq = 'AND cur_minor_edit=0';
 	} else { $cmq = ''; }
 
-	extract( $dbr->tableNames( 'cur', 'links' ) );
-
-	$sql = "SELECT cur_id,cur_namespace,cur_title,cur_user,cur_comment," .
-	  "cur_user_text,cur_timestamp,cur_minor_edit,cur_is_new FROM $links, $cur " .
-	  "WHERE cur_timestamp > '{$cutoff}' {$cmq} AND l_to=cur_id AND l_from=$id " .
-          "GROUP BY cur_id,cur_namespace,cur_title,cur_user,cur_comment,cur_user_text," .
-	  "cur_timestamp,cur_minor_edit,cur_is_new,inverse_timestamp ORDER BY inverse_timestamp LIMIT {$limit}";
+	// If target is a Category, use categorylinks and invert from and to
+	if ( $nt->getNamespace() == NS_CATEGORY ) {
+		extract( $dbr->tableNames( 'cur', 'categorylinks' ) );
+		$catkey = $dbr->addQuotes( $nt->getDBKey() );
+		$sql = "SELECT cur_id,cur_namespace,cur_title,cur_user,cur_comment," .
+	  	  "cur_user_text,cur_timestamp,cur_minor_edit,cur_is_new FROM $categorylinks, $cur " .
+	  	  "WHERE cur_timestamp > '{$cutoff}' {$cmq} AND cl_from=cur_id AND cl_to=$catkey " .
+	  	  "GROUP BY cur_id,cur_namespace,cur_title,cur_user,cur_comment,cur_user_text," .
+	  	  "cur_timestamp,cur_minor_edit,cur_is_new,inverse_timestamp ORDER BY inverse_timestamp LIMIT {$limit}";
+	} else {
+		extract( $dbr->tableNames( 'cur', 'links' ) );
+		$sql = "SELECT cur_id,cur_namespace,cur_title,cur_user,cur_comment," .
+		  "cur_user_text,cur_timestamp,cur_minor_edit,cur_is_new FROM $links, $cur " .
+		  "WHERE cur_timestamp > '{$cutoff}' {$cmq} AND l_to=cur_id AND l_from=$id " .
+			  "GROUP BY cur_id,cur_namespace,cur_title,cur_user,cur_comment,cur_user_text," .
+		  "cur_timestamp,cur_minor_edit,cur_is_new,inverse_timestamp ORDER BY inverse_timestamp LIMIT {$limit}";
+	}
 	$res = $dbr->query( $sql, $fname );
 
 	$wgOut->addHTML("&lt; ".$sk->makeKnownLinkObj($nt, "", "redirect=no" )."<br />\n");
diff --git a/includes/SpecialUncategorizedcategories.php b/includes/SpecialUncategorizedcategories.php
new file mode 100755
index 000000000000..77afdf278090
--- /dev/null
+++ b/includes/SpecialUncategorizedcategories.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+
+/**
+ *
+ */
+require_once( "SpecialUncategorizedpages.php" );
+
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+class UncategorizedCategoriesPage extends UncategorizedPagesPage {
+	function getName() {
+		return "Uncategorizedcategories";
+	}
+}
+
+/**
+ * constructor
+ */
+function wfSpecialUncategorizedcategories() {
+	list( $limit, $offset ) = wfCheckLimits();
+
+	$lpp = new UncategorizedPagesPage();
+	$lpp->requestedNamespace = NS_CATEGORY;
+
+	return $lpp->doQuery( $offset, $limit );
+}
+
+?>
\ No newline at end of file
diff --git a/includes/SpecialUncategorizedpages.php b/includes/SpecialUncategorizedpages.php
index 2d56ce9df6c5..b8d2cd9bc62d 100755
--- a/includes/SpecialUncategorizedpages.php
+++ b/includes/SpecialUncategorizedpages.php
@@ -16,7 +16,8 @@ require_once( "QueryPage.php" );
  * @subpackage SpecialPage
  */
 class UncategorizedPagesPage extends PageQueryPage {
-
+	var $requestedNamespace = 0;
+	
 	function getName() {
 		return "Uncategorizedpages";
 	}
@@ -36,7 +37,7 @@ class UncategorizedPagesPage extends PageQueryPage {
 
 		return "SELECT 'Uncategorizedpages' as type, cur_namespace AS namespace, cur_title AS title, cur_title AS value " .
 			"FROM $cur LEFT JOIN $categorylinks ON cur_id=cl_from ".
-			"WHERE cl_from IS NULL AND cur_namespace=0 AND cur_is_redirect=0";
+			"WHERE cl_from IS NULL AND cur_namespace=$this->requestedNamespace AND cur_is_redirect=0";
 	}
 }
 
diff --git a/includes/Title.php b/includes/Title.php
index 43f8e78cee4c..56ba47cfb12a 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -837,7 +837,7 @@ class Title {
 			/** If anon users can create an account,
 			    they need to reach the login page first! */
 			if( $wgUser->isAllowed( 'createaccount' )
-			    && $this->mId == NS_SPECIAL
+			    && $this->getNamespace() == NS_SPECIAL
 			    && $this->getText() == 'Userlogin' ) {
 				return true;
 			}
diff --git a/includes/User.php b/includes/User.php
index d9aa940dde6e..6355da0e7bee 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -9,7 +9,6 @@
  *
  */
 require_once( 'WatchedItem.php' );
-require_once( 'Group.php' );
 
 # Number of characters in user_token field
 define( 'USER_TOKEN_LENGTH', 32 );
@@ -31,9 +30,6 @@ class User {
 	var $mToken;
 	var $mRealName;
 	var $mHash;
-	/** Array of group id the user belong to */
-	var $mGroups;
-	/**#@-*/
 
 	/** Construct using User:loadDefaults() */
 	function User()	{
@@ -152,7 +148,6 @@ class User {
 		$this->mRealName = $this->mEmail = '';
 		$this->mPassword = $this->mNewpassword = '';
 		$this->mRights = array();
-		$this->mGroups = array();
 		
 		// Getting user defaults only if we have an available language
 		if( isset( $wgContLang ) ) {
@@ -345,7 +340,7 @@ class User {
 	 * Load a user from the database
 	 */
 	function loadFromDatabase() {
-		global $wgCommandLineMode, $wgAnonGroupId, $wgLoggedInGroupId;
+		global $wgCommandLineMode;
 		$fname = "User::loadFromDatabase";
 		if ( $this->mDataLoaded || $wgCommandLineMode ) {
 			return;
@@ -356,14 +351,7 @@ class User {
 
 		/** Anonymous user */
 		if(!$this->mId) {
-			/** Get rights */
-			$anong = Group::newFromId($wgAnonGroupId);
-			if (!$anong) 
-				wfDebugDieBacktrace("Please update your database schema "
-					."and populate initial group data from "
-					."maintenance/archives patches");
-			$anong->loadFromDatabase();
-			$this->mRights = explode(',', $anong->getRights());
+			$this->mRights = array();
 			$this->mDataLoaded = true;
 			return;
 		} # the following stuff is for non-anonymous users only
@@ -382,29 +370,18 @@ class User {
 			$this->decodeOptions( $s->user_options );
 			$this->mTouched = wfTimestamp(TS_MW,$s->user_touched);
 			$this->mToken = $s->user_token;
-
-			// Get groups id
-			$res = $dbr->select( 'user_groups', array( 'ug_group' ), array( 'ug_user' => $this->mId ) );
-
-			while($group = $dbr->fetchRow($res)) {
-				$this->mGroups[] = $group[0];
-			}
-
-			// add the default group for logged in user
-			$this->mGroups[] = $wgLoggedInGroupId;
-
-			$this->mRights = array();
-			// now we merge groups rights to get this user rights
-			foreach($this->mGroups as $aGroupId) {
-				$g = Group::newFromId($aGroupId);
-				$g->loadFromDatabase();
-				$this->mRights = array_merge($this->mRights, explode(',', $g->getRights()));
-			}
 			
-			// array merge duplicate rights which are part of several groups
-			$this->mRights = array_unique($this->mRights);
-			
-			$dbr->freeResult($res);
+			/* FIXME */
+			$res = $dbr->select('user_rights',
+				array( 'ur_rights' ),
+				array( 'ur_user' => $this->mId ) );
+			$s = $dbr->fetchObject( $res );
+			if( $s ) {
+				$this->mRights = explode( ',', $s->ur_rights );
+			} else {
+				$this->mRights = array();
+			}
+			$dbr->freeResult( $res );
 		}
 
 		$this->mDataLoaded = true;
@@ -586,52 +563,28 @@ class User {
 		$this->invalidateCache();
 	}
 
-	function getGroups() {
-		$this->loadFromDatabase();
-		return $this->mGroups;
-	}
-
-	function setGroups($groups) {
-		$this->loadFromDatabase();
-		$this->mGroups = $groups;
-		$this->invalidateCache();
-	}
-
 	/**
 	 * Check if a user is sysop
-	 * Die with backtrace. Use User:isAllowed() instead.
-	 * @deprecated
 	 */
 	function isSysop() {
-	/**
 		$this->loadFromDatabase();
 		if ( 0 == $this->mId ) { return false; }
 
 		return in_array( 'sysop', $this->mRights );
-	*/
-	wfDebugDieBacktrace("User::isSysop() is deprecated. Use User::isAllowed() instead");
 	}
 
-	/** @deprecated */
 	function isDeveloper() {
-	/**
 		$this->loadFromDatabase();
 		if ( 0 == $this->mId ) { return false; }
 
 		return in_array( 'developer', $this->mRights );
-	*/
-	wfDebugDieBacktrace("User::isDeveloper() is deprecated. Use User::isAllowed() instead");
 	}
 
-	/** @deprecated */
 	function isBureaucrat() {
-	/**
 		$this->loadFromDatabase();
 		if ( 0 == $this->mId ) { return false; }
 
 		return in_array( 'bureaucrat', $this->mRights );
-	*/
-	wfDebugDieBacktrace("User::isBureaucrat() is deprecated. Use User::isAllowed() instead");
 	}
 
 	/**
@@ -654,7 +607,35 @@ class User {
 	 */
 	function isAllowed($action='') {
 		$this->loadFromDatabase();
-		return in_array( $action , $this->mRights );
+		if( in_array( $action , $this->mRights ) ) {
+			return true;
+		}
+		
+		static $groupRights = array(
+			'asksql'        => 'nobody',
+			'siteadmin'     => 'developer',
+			'userrights'    => 'bureaucrat',
+			'patrol'        => 'sysop',
+			'protect'       => 'sysop',
+			'delete'        => 'sysop',
+			'rollback'      => 'sysop',
+			'block'         => 'sysop',
+			'editinterface' => 'sysop',
+			'move'          => 'user',
+			'read'          => '*',
+			'createaccount' => '*' );
+		
+		if( array_key_exists( $action, $groupRights ) ) {
+			$group = $groupRights[$action];
+			if( $group == 'user' ) {
+				return ($this->getId() != 0 );
+			} elseif( $group == '*' ) {
+				return true;
+			} else {
+				return in_array( $group, $this->mRights );
+			}
+		}
+		return false;
 	}
 
 	/**
@@ -838,20 +819,6 @@ class User {
 		$dbw->set( 'user_rights', 'ur_rights', implode( ',', $this->mRights ),
 			'ur_user='. $this->mId, $fname ); 
 		$wgMemc->delete( "$wgDBname:user:id:$this->mId" );
-		
-		// delete old groups
-		$dbw->delete( 'user_groups', array( 'ug_user' => $this->mId), $fname);
-		
-		// save new ones
-		foreach ($this->mGroups as $group) {
-			$dbw->replace( 'user_groups',
-				array(array('ug_user','ug_group')),
-				array(
-					'ug_user' => $this->mId,
-					'ug_group' => $group
-				), $fname
-			);
-		}
 	}
 
 	/**
@@ -931,15 +898,6 @@ class User {
 				'ur_rights' => implode( ',', $this->mRights )
 			), $fname
 		);
-		
-		foreach ($this->mGroups as $group) {
-			$dbw->insert( 'user_groups',
-				array(
-					'ug_user' => $this->mId,
-					'ug_group' => $group
-				), $fname
-			);
-		}
 	}
 
 	function spreadBlock() {
diff --git a/includes/normal/README b/includes/normal/README
index 3424507d6f27..f8207a1b2e3e 100644
--- a/includes/normal/README
+++ b/includes/normal/README
@@ -32,3 +32,24 @@ have been changed or you remove it.
 data from from the net if necessary. If it reports failure, something is
 going wrong!
 
+
+== Benchmarks ==
+
+Run 'make bench' to download some sample texts from Wikipedia and run some
+cheap benchmarks of some of the functions. Take all numbers with large
+grains of salt.
+
+
+== PHP module extension ==
+
+There's an experimental PHP extension module which wraps the ICU library's
+normalization functions. This is *MUCH* faster than doing this work in pure
+PHP code. This is in the 'normal' directory in MediaWiki's CVS extensions
+module. It is known to work with PHP 4.3.8 and 5.0.2 on Linux/x86 but hasn't
+been thoroughly tested on other configurations.
+
+If the php_normal.so module is loaded in php.ini, the normalization functions
+will automatically use it. If you can't (or don't want to) load it in php.ini,
+you may be able to load it using the dl() function before include()ing or
+require()ing UtfNormal.php, and it will be picked up.
+
diff --git a/includes/normal/UtfNormalGenerate.php b/includes/normal/UtfNormalGenerate.php
index 65128b706e66..efe25de5641e 100644
--- a/includes/normal/UtfNormalGenerate.php
+++ b/includes/normal/UtfNormalGenerate.php
@@ -26,6 +26,11 @@
  */
 
 /** */
+
+if( php_sapi_name() != 'cli' ) {
+	die( "Run me from the command line please.\n" );
+}
+
 require_once 'UtfNormalUtil.php';
 
 $in = fopen("DerivedNormalizationProps.txt", "rt" );
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 05da76a10191..0fcc73e10502 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -1,5 +1,7 @@
 <?php
 
+if( !defined( 'MEDIAWIKI' ) ) die();
+
 /**
  * HTML template for Special:Userlogin form
  * @package MediaWiki
diff --git a/includes/zhtable/Makefile b/includes/zhtable/Makefile
index 372109b65290..338d3d0bed51 100644
--- a/includes/zhtable/Makefile
+++ b/includes/zhtable/Makefile
@@ -42,7 +42,7 @@ wordlist: phrase_lib.txt EZ.txt.in tsi.src
 	iconv -c -f big5 -t utf8 tsi.src | $(SED) 's/# //g' | $(SED) 's/[ ][0-9].*//' > wordlist
 	$(SED) 's/\(.*\)\t[0-9][0-9]*.*/\1/' phrase_lib.txt | $(SED) '1,5d' >>wordlist
 	$(SED) '1,/BEGIN_TABLE/d' EZ.txt.in | colrm 1 8 | $(SED) 's/\t.*//' | $(GREP) "^...*" >> wordlist
-	sort wordlist | uniq | $(SED) 's/ //g' > t
+	cat wordlist | $(SED) '/[a-zA-Z]/d' | sort | uniq | $(SED) 's/ //g' > t
 	mv t wordlist
 
 printutf8: printutf8.c
diff --git a/install-utils.inc b/install-utils.inc
index 1fb2cc8e82b9..105818d4004d 100644
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -72,12 +72,14 @@ function replacevars( $ins ) {
 	$varnames = array(
 		"wgDBserver", "wgDBname", "wgDBintlname", "wgDBuser",
 		"wgDBpassword", "wgDBsqluser", "wgDBsqlpassword",
-		"wgDBadminuser", "wgDBadminpassword"
+		"wgDBadminuser", "wgDBadminpassword", "wgDBprefix"
 	);
 
 	foreach ( $varnames as $var ) {
 		global $$var;
 		$ins = str_replace( '{$' . $var . '}', $$var, $ins );
+		$ins = str_replace( '/*$' . $var . '*/`', '`' . $$var, $ins );
+		$ins = str_replace( '/*$' . $var . '*/', $$var, $ins );
 	}
 	return $ins;
 }
diff --git a/languages/Language.php b/languages/Language.php
index f43024f54b61..d61d3d504f85 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1016,6 +1016,7 @@ That comes to '''$5''' average edits per page, and '''$6''' views per edit.",
 'validate'		=> 'Validate page',
 'lonelypages'	=> 'Orphaned pages',
 'uncategorizedpages'	=> 'Uncategorized pages',
+'uncategorizedcategories'	=> 'Uncategorized categories',
 'unusedimages'	=> 'Unused images',
 'popularpages'	=> 'Popular pages',
 'nviews'		=> '$1 views',
diff --git a/languages/Names.php b/languages/Names.php
index d6fa2b154873..29413c1cfc25 100644
--- a/languages/Names.php
+++ b/languages/Names.php
@@ -185,6 +185,7 @@
 	'tr' => 'T&uuml;rk&ccedil;e',	# Turkish
 	'ts' => 'Xitsonga',		# Tsonga
 	'tt' => 'Tatar&ccedil;a',	# Tatar
+	'tum' => 'chiTumbuka',  # Tumbuka
 	'tw' => 'Twi',			# Twi -- FIXME
 	'ty' => 'Reo M&#257;`ohi',	# Tahitian
 	'ug' => 'Oyghurque',	# Uyghur
diff --git a/maintenance/InitialiseMessages.inc b/maintenance/InitialiseMessages.inc
index f3e3623824c7..755ccdcedcc9 100755
--- a/maintenance/InitialiseMessages.inc
+++ b/maintenance/InitialiseMessages.inc
@@ -180,7 +180,7 @@ function initialiseMessagesReal( $overwrite = false, $messageArray = false ) {
 		}
 	}
 
-	$dbw->insert( $cur, $arr, $fname );
+	$dbw->insert( 'cur', $arr, $fname );
 
 	# Clear the relevant memcached key
 	print 'Clearing message cache...';
diff --git a/maintenance/archives/importTests.php b/maintenance/archives/importTests.php
deleted file mode 100644
index ec9e6f9bd878..000000000000
--- a/maintenance/archives/importTests.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-/**
- * @deprecated
- * @package MediaWiki
- * @subpackage MaintenanceArchive
- */
-
-/** */
-print "This script is obsolete!";
-print "It is retained in the source here in case some of its
-code might be useful for ad-hoc conversion tasks, but it is
-not maintained and probably won't even work as is.";
-exit();
-
-?><html>
-<head>
-<title>Unit tests for UseMod-to-PediaWiki import script</title>
-<meta http-equiv="Refresh" content="10;URL=importTests.php">
-<style>
-.pass { color: green }
-.fail { color: red }
-</style>
-</head>
-<body>
-
-<?php
-
-# Unit tests for importUseModWiki
-# Well, more or less ;)
-
-$testingonly = true;
-
-setlocale( LC_ALL, "C" );
-
-include_once( "importUseModWiki.php" );
-
-$wgRootDirectory = "./testconvert";
-runTests();
-
-function runTests() {
-	$success =
-		testTimestamp()
-		&& testRecode()
-		&& testFreeToNormal()
-		&& testTransformTitle()
-		&& testMediaLinks()
-		&& testRemoveTalkLink()
-		&& testSubPages()
-		;
-	if( $success ) {
-		echo "\n<h1 class='pass'>** Passed all tests! **</h1>\n";
-	} else {
-		echo "\n<h1 class='fail'>-- FAILED ONE OR MORE TESTS --</h1>\n";
-	}
-	return $success;
-}
-
-function passTest( $testname, $note = "" ) {
-	if( $notes != "" ) $notes = " -- $notes";
-	echo "<span class='pass'>.. passed test $testname $notes</span><br />\n";
-	return true;
-}
-
-function failTest( $testname, $notes = "" ) {
-	if ( $notes != "" ) $notes = " -- $notes";
-	echo "<span class='fail'>** FAILED TEST $testname **$notes</span><br />\n";
-	return false;
-}
-
-function testTimestamp() {
-	$tn = "Timestamp";
-	$x = wfUnix2Timestamp( 0 );
-	if( $x != "19700101000000" ) {
-		return failTest( $tn, "wfUnix2Timestamp for epoch returned unexpected $x" );
-	}
-	
-	$x = wfTimestamp2Unix( "19700101000000" );
-	if( $x != 0 ) {
-		return failTest( $tn, "wfTimestamp2Unix for epoch returned unexpected $x" );
-	}
-	
-	return passTest( $tn );
-}
-
-function testRecode() {
-	$tn = "Recode";
-	
-	# These functions are dummies for now
-	$a = "abcd";
-	$x = recodeInput( $a );
-	if( $a != $x ) return failTest( $tn, "eo test returned different value" );
-
-	$a = "ĉeĥa ŝaŭmmanĝaĵo";
-	$x = recodeInput( $a );
-	if( $a != $x ) return failTest( $tn, "eo test returned different value" );
-	
-	return passTest( $tn );
-}
-
-function testFreeToNormal() {
-	$tn = "FreeToNormal";
-	$a = "WikiName"; $x = FreeToNormal( $a );
-	if( $a != $x ) return failTest( $tn, "$a -> $a != $x" );
-	
-	$a = "With_Underscore"; $x = FreeToNormal( $a );
-	if( $a != $x ) return failTest( $tn, "$a -> $a != $x" );
-	
-	$a = "With Space"; $x = FreeToNormal( $a );
-	if( "With_Space" != $x ) return failTest( $tn, "$a -> With_Space != $x" );
-	
-	$a = "Mixed case"; $x = FreeToNormal( $a );
-	if( "Mixed_Case" != $x ) return failTest( $tn, "$a -> Mixed_Case != $x" );
-	
-	$a = "\xe9cole"; $x = FreeToNormal( $a );
-	if( $a != $x ) return failTest( $tn, "$a -> $a != $x (must replicate high caps bug)" );
-	
-	return passTest( $tn );
-}
-
-function testTransformTitle() {
-	global $talkending;
-	$oldtalkending = $talkending;
-	$tn = "TransformTitle";
-	
-	$a = "WikiName"; $x = transformTitle( $a );
-	if( $x->namespace != 0 or $x->title != "WikiName" ) return failTest( $tn, "$a -> 0, WikiName instead -> $x->namespace , $x->title" );
-	
-	$talkending = "Talk";
-	$a = "WikiName/Talk"; $x = transformTitle( $a );
-	if( $x->namespace != 1 or $x->title != "WikiName" ) return failTest( $tn, "$a -> 1, WikiName instead -> $x->namespace , $x->title" );
-
-	$a = "WikiName/talk"; $x = transformTitle( $a );
-	if( $x->namespace != 1 or $x->title != "WikiName" ) return failTest( $tn, "$a -> 1, WikiName instead -> $x->namespace , $x->title" );
-	
-	$talkending = "Diskuto";
-	$a = "WikiName/Diskuto"; $x = transformTitle( $a );
-	if( $x->namespace != 1 or $x->title != "WikiName" ) return failTest( $tn, "$a -> 1, WikiName instead -> $x->namespace , $x->title" );
-
-	$talkending = $oldtalkending;
-	return passTest( $tn );
-}
-
-function testMediaLinks() {
-	$tn = "MediaLinks";
-
-	# Fetch
-	$a = "magic.gif";
-	$x = fetchMediaFile( "???", "magic.gif" );
-	
-
-	# Media links
-	$a = "[http://www.wikipedia.org/upload/magic.gif]";
-	$b = "[[Media:Magic.gif]]"; # Or should it?
-	$x = fixMediaLinks( $a );
-	if( $x != $b ) return failTest( $tn, "$a should be $b, is $x" );
-	
-	$a = "[http://www.wikipedia.org/upload/magic.gif Click image]";
-	$b = "[[Media:Magic.gif|Click image]]";
-	$x = fixMediaLinks( $a );
-	if( $x != $b ) return failTest( $tn, "$a should be $b, is $x" );
-
-	# Image links:
-	$a = "http://www.wikipedia.org/upload/magic.gif";
-	$b = "[[Image:Magic.gif]]";
-	$x = fixImageLinks( $a );
-	if( $x != $b ) return failTest( $tn, "$a should be $b, is $x" );
-
-	$a = "http://www.wikipedia.org/upload/a/a4/magic.gif";
-	$b = "[[Image:Magic.gif]]";
-	$x = fixImageLinks( $a );
-	if( $x != $b ) return failTest( $tn, "$a should be $b, is $x" );
-
-	return passTest( $tn );
-}
-
-function testRemoveTalkLink() {
-	global $talkending;
-	$tn = "RemoveTalkLink";
-	$oldtalkending = $talkending;
-	$talkending = "Talk";
-	
-	$a = "Blah blah blah blah\nFoo bar baz.\n/Talk";
-	$b = "Blah blah blah blah\nFoo bar baz.";
-	$x = removeTalkLink( $a );
-	if( $x != $b ) return failTest( $tn, "removing talk link: '$a' -> '$x', should be '$b'" );
-	
-	$a = "Blah blah blah blah\nFoo bar baz.\n[[/Talk]]";
-	$b = "Blah blah blah blah\nFoo bar baz.";
-	$x = removeTalkLink( $a );
-	if( $x != $b ) return failTest( $tn, "removing talk link: '$a' -> '$x', should be '$b'" );
-
-	$a = "Blah blah blah blah\nFoo bar baz.\n/talk"; # wait... should this not work?
-	$b = "Blah blah blah blah\nFoo bar baz.";
-	$x = removeTalkLink( $a );
-	if( $x != $b ) return failTest( $tn, "removing talk link: '$a' -> '$x', should be '$b'" );
-
-	$talkending = "Priparolu";
-	$a = "Blah blah blah blah\nFoo bar baz.\n/Priparolu";
-	$b = "Blah blah blah blah\nFoo bar baz.";
-	$x = removeTalkLink( $a );
-	if( $x != $b ) return failTest( $tn, "removing talk link: '$a' -> '$x', should be '$b'" );
-	
-	$talkending = $oldtalkending;
-	return passTest( $tn );
-}
-
-function testSubPages() {
-	$tn = "SubPages";
-	
-	$t = "TopPage";
-	$a = "Blah /Subpage blah";
-	$b = "Blah [[TopPage/Subpage|/Subpage]] blah";
-	$x = fixSubPages( $a, $t );
-	if ( $x != $b ) return failTest( "'$a' -> '$x', should be '$b'" );
-	
-	$a = "Blah /subpage blah";
-	$b = $a;
-	$x = fixSubPages( $a, $t );
-	if ( $x != $b ) return failTest( "'$a' -> '$x', should be '$b'" );
-	
-	$a = "Blah [[/Subpage]] blah";
-	$b = "Blah [[TopPage/Subpage|/Subpage]] blah";
-	$x = fixSubPages( $a, $t );
-	if ( $x != $b ) return failTest( "'$a' -> '$x', should be '$b'" );
-	
-	$a = "Blah [[/subpage]] blah";
-	$b = "Blah [[TopPage/Subpage|/subpage]] blah";
-	$x = fixSubPages( $a, $t );
-	if ( $x != $b ) return failTest( "'$a' -> '$x', should be '$b'" );
-	
-	$a = "Blah [[/Subpage|Fizzle]] blah";
-	$b = "Blah [[TopPage/Subpage|Fizzle]] blah";
-	$x = fixSubPages( $a, $t );
-	if ( $x != $b ) return failTest( "'$a' -> '$x', should be '$b'" );
-
-	$a = "Blah [[/subpage|Fizzle]] blah";
-	$b = "Blah [[TopPage/Subpage|Fizzle]] blah";
-	$x = fixSubPages( $a, $t );
-	if ( $x != $b ) return failTest( "'$a' -> '$x', should be '$b'" );
-	
-	$a = "Blah /\xc9cole blah";
-	$b = "Blah [[TopPage/\xc9cole|/\xc9cole]] blah";
-	$x = fixSubPages( $a, $t );
-	if ( $x != $b ) return failTest( "'$a' -> '$x', should be '$b'" );
-	
-	$a = "Blah /\xe9cole blah";
-	$b = $a;
-	$x = fixSubPages( $a, $t );
-	if ( $x != $b ) return failTest( "'$a' -> '$x', should be '$b'" );
-	
-	$a = "Blah [[/\xc9cole]] blah";
-	$b = "Blah [[TopPage/\xc9cole|/\xc9cole]] blah";
-	$x = fixSubPages( $a, $t );
-	if ( $x != $b ) return failTest( "'$a' -> '$x', should be '$b'" );
-	
-	$a = "Blah [[/\xe9cole]] blah";
-	$b = "Blah [[TopPage/\xe9cole|/\xe9cole]] blah";
-	$x = fixSubPages( $a, $t );
-	if ( $x != $b ) return failTest( "'$a' -> '$x', should be '$b'" );
-	
-	$a = "Blah [[/xe9cole|Fizzle]] blah";
-	$b = "Blah [[TopPage/\xe9cole|Fizzle]] blah";
-	$x = fixSubPages( $a, $t );
-	if ( $x != $b ) return failTest( "'$a' -> '$x', should be '$b'" );
-
-	$a = "Blah [[/subpage|Fizzle]] blah";
-	$b = "Blah [[TopPage/\xe9cole|Fizzle]] blah";
-	$x = fixSubPages( $a, $t );
-	if ( $x != $b ) return failTest( "'$a' -> '$x', should be '$b'" );
-	return passTest( $tn );
-}
-
-?>
-</body>
-</html>
diff --git a/maintenance/archives/importUseModWiki.php b/maintenance/archives/importUseModWiki.php
deleted file mode 100644
index 755acc14068e..000000000000
--- a/maintenance/archives/importUseModWiki.php
+++ /dev/null
@@ -1,486 +0,0 @@
-<?php
-/**
- * @deprecated
- * @package MediaWiki
- * @subpackage MaintenanceArchive
- */
-
-/** */
-print "This script is obsolete!";
-print "It is retained in the source here in case some of its
-code might be useful for ad-hoc conversion tasks, but it is
-not maintained and probably won't even work as is.";
-exit();
-
-/*
-	Import data from a UseModWiki into a PediaWiki wiki
-	2003-02-09 Brion VIBBER <brion@pobox.com>
-	Based loosely on Magnus's code from 2001-2002
-
-	  Pass one: collect data on links & title case, users
-	  Pass two: spit out SQL for
-	  Separately, be sure to run the link & index rebuilding scripts!
-
-  */
-
-/* globals
-	*/
-$wgRootDirectory = "/home/brion/vikio/wiki-ca/lib-http/db/wiki";
-$wgFieldSeparator = "\xb3"; # Some wikis may use different char
-	$FS = $wgFieldSeparator ;
-	$FS1 = $FS."1" ;
-	$FS2 = $FS."2" ;
-	$FS3 = $FS."3" ;
-
-# Images to import
-$imageimport = '(http:\/\/(?:www\.|meta\.|)wikipedia\.(?:com|org)\/upload\/(?:[a-z]\/[a-z][0-9]\/)?(.*\.(?:gif|jpg|jpeg|png)))';
-
-# Number of *seconds to add* to timestamp to get UTC/GMT
-#$wgTimezoneCorrection = 0;		# GMT
-$wgTimezoneCorrection = 8*3600;	# PST - California
-
-# Other options...
-$historyonly = false;		# Don't add converted revisions to cur table; just get old histories
-$lasthistoryonly = false;	# Only add the _original_ form of the _current_ revision
-
-/* Vary by language */
-$namespaces = array( 0 => "", 1 => "Talk:", 2 => "User:", 3 => "User_talk:", 4
-=> "Wikipedia:", 5 => "Wikipedia_talk:", 6 => "Image:", 7 => "Image_talk:" );
-$talkending = "Talk";
-$mediatext = "Media";
-$conversionscript = "Conversion script";
-$conversioncomment = "Automatic conversion";
-$redirectcomment = "Automatic converion, moved to \$1";
-$conversiontime = gmdate( "YmdHis" ); # Conversions will be marked with this timestamp
-
-# Stats and caches
-$oldtitles = array();
-$usercache = array();
-$titlecache = array();
-$linkcache = array();
-
-/**
- * Some oversimplified test types
- *
- * @deprecated
- * @package MediaWiki
- * @subpackage MaintenanceArchive
- */
-class Title {
-	var $title, $namespace;
-	function fromData( $namespace, $title ) {
-		$x = new Title;
-		$x->namespace = $namespace;
-		$x->title = $title;
-		return $x;
-	}
-}
-
-# See tests in importTests.php
-if( ! $testingonly ) {
-	firstPass();
-	secondPass();
-}
-
-# ------------------------------------------------------------------------------
-
-/* First pass:
-	Information please!
-	*/
-function firstPass()
-{
-	global $wgRootDirectory, $oldtitles;
-	
-	$letters = array(
-		'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
-		'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
-		'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'other' );
-	foreach( $letters as $letter ) {
-		firstPassDirectory( "$wgRootDirectory/page/$letter" );
-	}
-}
-
-function firstPassDirectory( $dir )
-{
-	global $titlecache;
-	
-	$mydir = opendir( $dir );
-	while( $entry = readdir( $mydir ) ) {
-		if( $entry != '.' && $entry != '..' ) {
-			if( is_dir( "$dir/$entry" ) ) {
-				firstPassDirectory( "$dir/$entry" );
-			}
-		} elseif( preg_match( '/$(.+)\.db$/', $entry, $m ) ) {
-			$titlecache[$title] = transformTitle( $m[1] );
-			countLinksFrom( $title );
-		} else {
-			echo "-- File '$entry' doesn't seem to contain an article. Skipping.\n";
-		}
-	}
-}
-
-/* Second pass:
-	make the dang SQL
-	*/
-function secondPass()
-{
-	global $titlecache, $usercache, $redirects;
-	
-	foreach( $usercache as $oldname => $user ) {
-		echo importUser( $oldname );
-	}
-	foreach( $titlecache as $oldtitle => $newtitle ) {
-		echo importPage( $oldtitle );
-	}
-	
-	echo "\n-- Done!\n";
-}
-
-
-# ------------------------------------------------------------------------------
-
-/* fetch_ functions
-	Grab a given item from the database
-	*/
-function fetchUser( $uid )
-{
-	global $FS,$FS2,$FS3, $wgRootDirectory;
-	
-	$fname = $wgRootDirectory . "/pages/" . $title;
-	if( !file_exists( $fname ) ) return false;
-	
-	$data = splitHash( implode( "", file( $fname ) ) );
-	# enough?
-	
-	return $data;
-}
-
-function fetchPage( $title )
-{
-	global $FS,$FS2,$FS3, $wgRootDirectory;
-	
-	$fname = $wgRootDirectory . "/pages/" . $title;
-	if( !file_exists( $fname ) ) return false;
-	
-	$page = splitHash( implode( "", file( $fname ) ) );
-	$section = splitHash( $FS2, $page["text_default"] );
-	$text = splitHash( $FS3, $section["data"] );
-	
-	return array ( "text" => $text["text"] , "summary" => $text["summary"] ,
-		"minor" => $text["minor"] , "ts" => $section["ts"] ,
-		"username" => $section["username"] , "host" => $section["host"] ) ;
-}
-
-function fetchKeptPages( $title )
-{
-	global $FS,$FS2,$FS3, $wgRootDirectory, $wgTimezoneCorrection;
-	
-	$fname = $wgRootDirectory . "/keep/" . $title . ".kp";
-	if( !file_exists( $fname ) ) return array();
-	
-	$keptlist = explode( $FS1, implode( "", file( $fname ) ) );
-	array_shift( $keptlist ); # Drop the junk at beginning of file
-	
-	$revisions = array();
-	foreach( $keptlist as $rev ) {
-		$section = splitHash( $FS2, $rev );
-		$text = splitHash( $FS3, $section["data"] );
-		if ( $text["text"] && $text["minor"] != "" && ( $section["ts"]*1 > 0 ) ) {
-			array_push( $revisions, array ( "text" => $text["text"] , "summary" => $text["summary"] ,
-				"minor" => $text["minor"] , "ts" => $section["ts"] ,
-				"username" => $section["username"] , "host" => $section["host"] ) );
-		} else {
-			echo "-- skipped a bad old revision\n";
-		}
-	}
-	return $revisions;
-}
-
-function splitHash ( $sep , $str ) {
-	$temp = explode ( $sep , $str ) ;
-	$ret = array () ;
-	for ( $i = 0; $i+1 < count ( $temp ) ; $i++ ) {
-		$ret[$temp[$i]] = $temp[++$i] ;
-		}
-	return $ret ;
-	}
-
-
-/* import_ functions
-	Take a fetched item and produce SQL
-	*/
-
-/* importUser
-	$uid is the UseMod user id number.
-	The new ones will be assigned arbitrarily and are for internal use only.
-	
-	THIS IS DELAYED SINCE PUBLIC DUMPS DONT INCLUDE USER DIR
-	*/
-function importUser( $uid )
-{
-	global $last_uid, $user_list, $wgTimestampCorrection;
-
-	return "";
-
-	$stuff = fetchUser( $uid );
-	$last_uid++;
-
-	$name = wfStrencode( $stuff->username );
-	$hash = md5hash( $stuff->password ); # Doable?
-	$tzoffset = $stuff['tzoffset'] - ($wgTimestampCorrection / 3600); # -8 to 0; +9 to +1
-	$hideminor = ($stuff['rcall'] ? 0 : 1);
-	$options = "cols={$stuff['editcols']}
-rows={$stuff['editrows']}
-rcdays={$stuff['rcdays']}
-timecorrection={$tzoffset}
-hideminor={$hideminor}
-	";
-	
-	$sql = "INSERT
-		INTO user (user_id,user_name,user_password,user_options)
-		VALUES ({$last_uid},'{$name}','{$hash}','{$options}');\n";
-	return $sql;
-}
-
-function checkUserCache( $name, $host )
-{
-	global $usercache;
-
-	if( $name ) {
-		if( in_array( $name, $usercache ) ) {
-			$userid = $usercache[$name];
-		} else {
-			# If we haven't imported user accounts
-			$userid = 0;
-		}
-		$username = wfStrencode( $name );
-	} else {
-		$userid = 0;
-		$username = wfStrencode( $host );
-	}
-	return array( $userid, $username );
-}
-
-function importPage( $title )
-{
-	global $wgTimezoneCorrection, $titlecache, $usercache;
-	global $conversionscript, $conversioncomment, $conversiontime;
-	global $historyonly, $lasthistoryonly;
-	
-	$page = fetchPage( $title );
-
-	$newtext = wfStrencode( rewritePage( $title, $page->text ) );
-	$t = renamePage( $title );
-	$newtitle = wfStrencode( $t->title );
-	$namespace = $t->namespace;
-		
-	# Current revision:
-	$text = wfStrencode( $page->text );
-	$minor = ($page->minor ? 1 : 0);
-	list( $userid, $username ) = checkUserCache( $page->username, $page->host );
-	$timestamp = wfUnix2Timestamp( $page->timestamp + $wgTimezoneCorrection );
-	$redirect = ( preg_match( '/^#REDIRECT/', $page->text ) ? 1 : 0 );
-	$sql = "\n";
-	if( !$historyonly ) {
-		$sql .= "INSERT
-		INTO cur (cur_namespace,cur_title,cur_text,cur_comment,cur_user,cur_user_text,cur_timestamp,cur_is_redirect,cur_minor_edit)
-		VALUES ($namespace,'$newtitle','$newtext','$conversioncomment',0,'$conversionscript','$conversiontime',$redirect,$minor);\n";
-	}
-	$sql .= "INSERT
-		INTO old (old_namespace,old_title,old_text,old_comment,old_user,old_user_text,old_timestamp,old_minor_edit)
-		VALUES";
-	$sqlfinal = "\t\t($namespace,'$newtitle','$text','$comment',$userid,'$username','$timestamp',$minor)\n";
-
-	# History
-	if( !$lasthistoryonly ) {
-		$revisions = fetchKeptPages( $title );
-		foreach( $revisions as $rev ) {
-			$text = wfStrencode( $rev->text );
-			$minor = ($rev->minor ? 1 : 0);
-			list( $userid, $username ) = checkUserCache( $rev->username, $rev->host );
-			$timestamp = wfUnix2Timestamp( $rev->timestamp + $wgTimezoneCorrection );
-			$sql .= "\t\t($namespace,'$newtitle','$text','$comment',$userid,'$username','$timestamp',$redirect,$minor),\n";
-		}
-	}
-	return $sql . $sqlfinal;
-}
-
-
-# Count up basic links
-function countLinksFrom( $title )
-{
-	$page = fetchPage( $title );
-	$page->text = preg_replace(
-		'/<nowiki>.*<\/nowiki>/sDU',
-		'',
-		$page->text );
-	$page->text = preg_replace(
-		'/\[\[\s*([0-9a-zA-Z_ \x80-\xff]+)\s*(?:\|\s*([^]]+))?\s*\]\]/e',
-		'countLinkTo( ucfirst( "$1" ) )',
-		$page->text );
-}
-
-function countLinkTo( $title )
-{
-	global $linkcache;
-	$t = transformTitle( $title );
-	$linkform = FreeToNormal( $t->title );
-	$x = $linkcache[$title];
-	if ( count ( $x ) ) {
-		$y = $x[$linkform] ;
-		if ( $y ) $y++; else $y = 1 ;
-		$x[$linkform] = $y ;
-	} else {
-		$x = array ( $linkform => 1 ) ;
-	}
-	$linkcache[$title] = $x;
-}
-
-# Preferentially change case
-function renamePage( $title )
-{
-	global $linkcache;
-	$t = transformTitle( $title );
-	
-	# We want to use the most frequently linked-to form as the title
-	$maxcount = 0 ; $maxform = $t->title ;
-	foreach ( $linkcache[$title] as $linkform => $count ) {
-		if ( $count > $maxcount ) {
-			$maxcount = $count ;
-			$maxform = $linkform ;
-		}
-	}
-	if( $maxform != $t->title) {
-		doRenamePage( $t, $maxform );
-	}
-}
-
-function doRenamePage( $title, $maxform )
-{
-	global $linkcache, $redirectcomment, $conversionscript, $conversiontime;
-	$sql = "INSERT INTO cur (cur_namespace,cur_title,cur_text,cur_comment,cur_user,cur_user_text,cur_timestamp,cur_is_redirect,cur_minor_edit)
-	VALUES ";
-	$redirsql = array();
-	foreach( $linkcache[$title] as $linkform => $count ) {
-		if( $linkform != $maxform ) {
-			$comment = wfStrencode( str_replace( "$1", $maxform, $redirectcomment ) );
-			array_push( $redirsql, "($namespace,'$redirtitle','$comment',0,'$conversionscript','$conversiontime',1,1)" );
-		}
-	}
-	$sql .= implode( ",\n\t", $redirsql ) . ";\n";
-	return $sql;
-}
-
-# Account for syntax changes
-function rewritePage( $title, $text )
-{
-	# ...
-	$text = removeTalkLink( $text );
-	$text = preg_replace( '/(^|<nowiki>).+?(<\/nowiki>|$)/esD',
-		'rewritePageBits( $title, "$1")',
-		$text );
-	return $text;
-}
-
-function rewritePageBits( $title, $text ) {
-	$text = fixSubpages( $title, $text );
-	$text = fixMedialinks( $text );
-	$text = fixImagelinks( $text );
-	return $text;
-}
-
-function removeTalkLink( &$text ) {
-	global $talkending;
-	return preg_replace( "[\\n*(?:\[\[)?/{$talkending}(?:\]\])?\\s*]sDi", '', $text );
-}
-
-function fixSubpages( $text, &$title ) {
-	$old = preg_quote( $text );
-	$text = preg_replace( "<(^|\s)/([A-Z\xc0-\xdf].*?)\b>",
-		"$1[[$title/$2|/$2]]", $text );
-	$text = preg_replace( "<\[\[/([^|]*?)\]\]>e",
-		"\"[[$title/\" . ucfirst( \"$1|/$1]]\" )", $text );
-	$text = preg_replace( "<\[\[/(.*?)\]\]>e",
-		"\"[[$title/\" . ucfirst( \"$1]]\" )", $text );
-	return $text;
-}
-
-function fixImagelinks( &$text ) {
-	global $imageimport, $namespaces;
-	return preg_replace( "/$imageimport/e",
-		'"[[{$namespaces[6]}" . fetchMediaFile( "$1", "$2" ) . "]]"',
-		$text );
-}
-
-function fixMedialinks( &$text ) {
-	global $imageimport, $mediatext;
-	$text = preg_replace( "/\[$imageimport\]/e",
-		'"[[$mediatext:" . fetchMediaFile( "$1", "$2" ) . "]]"',
-		$text );
-	return preg_replace( "/\[$imageimport (.+?)\]/e",
-		'"[[$mediatext:" . fetchMediaFile( "$1", "$2" ) . "|$3]]"',
-		$text );
-}
-
-function fetchMediaFile( $url, $filename )
-{
-	# Copy an image file into local upload space
-	# FIXME
-	return ucfirst( $filename );
-}
-
-# Simple move of talk pages, etc
-function transformTitle( $title, $dorename = false )
-{
-	global $talkending;
-	if( preg_match( "/^(.+)[ _]?\\/[ _]?($talkending)/i", $title, $m ) ) {
-		$thetitle = $m[1];
-		$namespace = 1;
-	} else {
-		$thetitle = $title;
-		$namespace = 0;
-	}
-	return Title::fromData( $namespace, $thetitle );
-}
-
-# Translated out of old usemod wiki...
-function FreeToNormal ( $id , $FreeUpper = true ) {
-  $id = str_replace ( " ", "_", $id ) ;
-  $id = ucfirst($id);
-  if (strstr($id, '_') != false) {  # Quick check for any space/underscores
-    $id = preg_replace ( '/__+/' , "_" , $id ) ;
-    $id = preg_replace ( '/^_/' , "", $id ) ;
-    $id = preg_replace ( '/_$/' , "", $id ) ;
-    #if ($UseSubpage) {
-      $id = preg_replace ( '|_/|', "/" , $id ) ;
-      $id = preg_replace ( '|/_|', "/" , $id ) ;
-    #}
-  }
-  if ($FreeUpper) {
-    # Note that letters after ' are *not* capitalized
-    if (preg_match ( '|[-_.,\(\)/][a-z]|' , $id ) ) { # Quick check for non-canon
-      $id = preg_replace ( '|([-_.,\(\)/])([a-z])|e' , '"$1" . strtoupper("$2")' , $id ) ;
-    }
-  }
-  return $id;
-}
-
-# Whee!
-function recodeInput( $text )
-{
-	return $text;
-}
-
-function wfUnix2Timestamp( $unixtime ) {
-        return gmdate( "YmdHis", $timestamp );
-}
-
-function wfTimestamp2Unix( $ts )
-{
-        return gmmktime( ( (int)substr( $ts, 8, 2) ),
-                  (int)substr( $ts, 10, 2 ), (int)substr( $ts, 12, 2 ),
-                  (int)substr( $ts, 4, 2 ), (int)substr( $ts, 6, 2 ),
-                  (int)substr( $ts, 0, 4 ) );
-}
-
-?>
diff --git a/maintenance/archives/patch-group-sysopfix.sql b/maintenance/archives/patch-group-sysopfix.sql
deleted file mode 100644
index c3152c7b9021..000000000000
--- a/maintenance/archives/patch-group-sysopfix.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- Fix to alpha versions that had incorrect rights assignments
--- breaking protected page edits by sysops.
--- 2004-10-27
-
-UPDATE `group`
-   SET group_rights=CONCAT(group_rights,',sysop')
- WHERE group_name IN('Sysops','Bureaucrat');
diff --git a/maintenance/archives/patch-rename-user_groups-and_rights.sql b/maintenance/archives/patch-rename-user_groups-and_rights.sql
deleted file mode 100644
index 4845d3c6d702..000000000000
--- a/maintenance/archives/patch-rename-user_groups-and_rights.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-
-ALTER TABLE user_groups
-	CHANGE user_id ug_user INT(5) UNSIGNED NOT NULL DEFAULT '0',
-	CHANGE group_id ug_group INT(5) UNSIGNED NOT NULL DEFAULT '0';
-
-ALTER TABLE user_rights
-	CHANGE user_id ur_user INT(5) UNSIGNED NOT NULL,
-	CHANGE user_rights ur_rights TINYBLOB NOT NULL DEFAULT '';
-
diff --git a/maintenance/archives/patch-rename-user_rights.sql b/maintenance/archives/patch-rename-user_rights.sql
new file mode 100644
index 000000000000..679d85c286ec
--- /dev/null
+++ b/maintenance/archives/patch-rename-user_rights.sql
@@ -0,0 +1,5 @@
+
+ALTER TABLE user_rights
+	CHANGE user_id ur_user INT(5) UNSIGNED NOT NULL,
+	CHANGE user_rights ur_rights TINYBLOB NOT NULL DEFAULT '';
+
diff --git a/maintenance/archives/patch-userlevels-defaultgroups.sql b/maintenance/archives/patch-userlevels-defaultgroups.sql
deleted file mode 100644
index 0871cdb8347c..000000000000
--- a/maintenance/archives/patch-userlevels-defaultgroups.sql
+++ /dev/null
@@ -1,13 +0,0 @@
---
--- Provide default groups
--- Should probably be inserted when someone create a new database
---
-
-INSERT INTO `group` (group_id,group_name,group_description,group_rights)
-	VALUES (1,'Anonymous','Anonymous users','read,edit,createaccount');
-INSERT INTO `group` (group_id,group_name,group_description,group_rights)
-	VALUES (2,'Loggedin','General logged in users','read,edit,move,upload');
-INSERT INTO `group` (group_id,group_name,group_description,group_rights)
-	VALUES (3,'Sysops','Operators of this site','read,edit,move,delete,undelete,protect,block,upload,asksql,rollback,patrol,editinterface,sysop');
-INSERT INTO `group` (group_id,group_name,group_description,group_rights)
-	VALUES (4,'Bureaucrat','The bureaucrat group is able to make sysops for example. They have no other rights.','read,edit,move,delete,undelete,protect,block,userrights,createaccount,upload,asksql,rollback,patrol,editinterface,siteadmin,sysop');
diff --git a/maintenance/archives/patch-userlevels-rights.sql b/maintenance/archives/patch-userlevels-rights.sql
deleted file mode 100644
index 9082c2855b07..000000000000
--- a/maintenance/archives/patch-userlevels-rights.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- Oct. 24 2004
--- Adds the group_rights field missing from early dev work
-
--- Hold group name and description
-ALTER TABLE `group` ADD group_rights tinyblob;
diff --git a/maintenance/archives/patch-userlevels.sql b/maintenance/archives/patch-userlevels.sql
deleted file mode 100644
index ccaa2665e105..000000000000
--- a/maintenance/archives/patch-userlevels.sql
+++ /dev/null
@@ -1,20 +0,0 @@
--- Oct. 1st 2004 - Ashar Voultoiz
--- Implement the new sitelevels
---
--- This is under development to provide a showcase in HEAD :o)
-
--- Hold group name and description
-CREATE TABLE `group` (
-  group_id int(5) unsigned NOT NULL auto_increment,
-  group_name varchar(50) NOT NULL default '',
-  group_description varchar(255) NOT NULL default '',
-  group_rights tinyblob,
-  PRIMARY KEY  (group_id)
-);
-
--- Relation table between user and groups
-CREATE TABLE user_groups (
-	ug_user int(5) unsigned NOT NULL default '0',
-	ug_group int(5) unsigned NOT NULL default '0',
-	PRIMARY KEY  (ug_user,ug_group)
-);
diff --git a/maintenance/changeuser.sql b/maintenance/changeuser.sql
index f6e5cf892175..ad1c6da6fff7 100644
--- a/maintenance/changeuser.sql
+++ b/maintenance/changeuser.sql
@@ -1,12 +1,12 @@
 set @oldname = 'At18'; 
 set @newname = 'Alfio';
 
-update low_priority user set user_name=@newname where user_name=@oldname;
-update low_priority user_newtalk set user_ip=@newname where user_ip=@oldname;
-update low_priority cur set cur_user_text=@newname where cur_user_text=@oldname;
-update low_priority old set old_user_text=@newname where old_user_text=@oldname;
-update low_priority archive set ar_user_text=@newname where ar_user_text=@oldname;
-update low_priority ipblocks set ipb_address=@newname where ipb_address=@oldname;
-update low_priority oldimage set oi_user_text=@newname where oi_user_text=@oldname;
-update low_priority recentchanges set rc_user_text=@newname where rc_user_text=@oldname;
+update low_priority /*$wgDBprefix*/user set user_name=@newname where user_name=@oldname;
+update low_priority /*$wgDBprefix*/user_newtalk set user_ip=@newname where user_ip=@oldname;
+update low_priority /*$wgDBprefix*/cur set cur_user_text=@newname where cur_user_text=@oldname;
+update low_priority /*$wgDBprefix*/old set old_user_text=@newname where old_user_text=@oldname;
+update low_priority /*$wgDBprefix*/archive set ar_user_text=@newname where ar_user_text=@oldname;
+update low_priority /*$wgDBprefix*/ipblocks set ipb_address=@newname where ipb_address=@oldname;
+update low_priority /*$wgDBprefix*/oldimage set oi_user_text=@newname where oi_user_text=@oldname;
+update low_priority /*$wgDBprefix*/recentchanges set rc_user_text=@newname where rc_user_text=@oldname;
 
diff --git a/maintenance/convertUtf8.php b/maintenance/convertUtf8.php
deleted file mode 100644
index def49e99094a..000000000000
--- a/maintenance/convertUtf8.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/**
- * @package MediaWiki
- * @subpackage Maintenance
- */
-
-die("This file is not complete; it's checked in so I don't forget it.");
-
-/*
-UTF-8 conversion of DOOOOOOOM
-
-1. Lock the wiki
-2. Make a convertlist of all pages
-3. Enable CONVERTLOCK mode and switch to UTF-8
-4. As quick as possible, convert the cur, images, *links, user, etc tables. Clear cache tables.
-5. Unlock the wiki. Attempts to access pages on the convertlist will be trapped to read-only.
-6. Go through the list, fixing up old revisions. Remove pages from the convertlist.
-*/
-
-
-if(function_exists("iconv")) {
-	# There are likely to be Windows code page 1252 chars in there.
-	# Convert them to the proper UTF-8 chars if possible.
-	function toUtf8($string) {
-		return wfStrencode(iconv("CP1252", "UTF-8", $string));
-	}
-} else {
-	# Will work from plain iso 8859-1 and may corrupt these chars
-	function toUtf8($string) {
-		return wfStrencode(utf8_encode($string));
-	}
-}
-
-
-
-# user table
-$sql = "SELECT user_id,user_name,user_real_name,user_options FROM user";
-$res = wfQuery( $sql, DB_WRITE );
-print "Converting " . wfNumResults( $res ) . " user accounts:\n";
-$n = 0;
-while( $s = wfFetchObject( $res ) ) {
-	$uname = toUtf8( $s->user_name );
-	$ureal = toUtf8( $s->user_real_name );
-	$uoptions = toUtf8( $s->user_options );
-	if( $uname != wfStrencode( $s->user_name ) ||
-		$ureal != wfStrencode( $s->user_real_name ) ||
-		$uoptions != wfStrencode( $s->user_options ) ) {
-		$now = wfTimestampNow();
-		$sql = "UPDATE user
-			SET user_name='$uname',user_real_name='$ureal',
-				user_options='$uoptions',user_touched='$now'
-			WHERE user_id={$s->user_id}";
-		wfQuery( $sql, DB_WRITE );
-		$wgMemc->delete( "$wgDBname:user:id:{$s->user_id}" );
-		$u++;
-	}
-	if( ++$n % 100 == 0 ) print "$n\n";
-}
-wfFreeResult( $res );
-if( $n ) {
-	printf("%2.02%% required conversion.\n\n", $u / $n);
-} else {
-	print "None?\n\n";
-}
-
-# ipblocks
-$sql = "SELECT DISTINCT ipb_reason FROM ipblocks";
-$res = wfQuery( $sql, DB_WRITE );
-print "Converting " . wfNumResults( $res ) . " IP block comments:\n";
-$n = 0;
-while( $s = wfFetchObject( $res ) ) {
-	$ucomment = toUtf8($s->ipb_reason);
-	$ocomment = wfStrencode( $s->ipb_reason );
-	if( $u != $o ) {
-		$sql = "UPDATE ipblocks SET ipb_reason='$ucomment' WHERE ipb_reason='$ocomment'";
-		wfQuery( $sql, DB_WRITE );
-		$u++;
-	}
-	if( ++$n % 100 == 0 ) print "$n\n";
-}
-wfFreeResult( $res );
-if( $n ) {
-	printf("%2.02%% required conversion.\n\n", $u / $n);
-} else {
-	print "None?\n\n";
-}
-
-# image
-$sql = "SELECT img_name,img_description,img_user_text FROM image";
-	img_name --> also need to rename files
-	img_description
-	img_user_text
-
-oldimage
-	oi_name
-	oi_archive_name --> also need to rename files
-	oi_user_text
-
-recentchanges
-	rc_user_text
-	rc_title
-	rc_comment
-
-# searchindex
-print "Clearing searchindex... don't forget to rebuild it.\n";
-$sql = "DELETE FROM searchindex";
-wfQuery( $sql, DB_WRITE );
-
-# linkscc
-print "Clearing linkscc...\n";
-$sql = "DELETE FROM linkscc";
-wfQuery( $sql, DB_WRITE );
-
-# querycache: just rebuild these
-print "Clearing querycache...\n";
-$sql = "DELETE FROM querycache";
-wfQuery( $sql, DB_WRITE );
-
-# objectcache
-print "Clearing objectcache...\n";
-$sql = "DELETE FROM objectcache";
-wfQuery( $sql, DB_WRITE );
-
-
-function unicodeLinks( $table, $field ) {
-	$sql = "SELECT DISTINCT $field FROM $table WHERE $field RLIKE '[\x80-\xff]'";
-	$res = wfQuery( $sql, DB_WRITE );
-	print "Converting " . wfNumResults( $res ) . " from $table:\n";
-	$n = 0;
-	while( $s = wfFetchObject( $res ) ) {
-		$ulink = toUtf8( $s->$field );
-		$olink = wfStrencode( $s->$field );
-		$sql = "UPDATE $table SET $field='$ulink' WHERE $field='$olink'";
-		wfQuery( $sql, DB_WRITE );
-		if( ++$n % 100 == 0 ) print "$n\n";
-	}
-	wfFreeResult( $res );
-	print "Done.\n\n";
-}
-unicodeLinks( "brokenlinks", "bl_to" );
-unicodeLinks( "imagelinks", "il_to" );
-unicodeLinks( "categorylinks", "cl_to" );
-
-
-# The big guys...
-$sql = "SELECT cur_id,cur_namespace,cur_title,cur_text,cur_user_text FROM cur
-WHERE cur_title rlike '[\x80-\xff]' OR cur_comment rlike '[\x80-\xff]'
-OR cur_user_text rlike '[\x80-\xff]' OR cur_text rlike '[\x80-\xff]'";
-$res = wfQuery( $sql, DB_WRITE );
-print "Converting " . wfNumResults( $res ) . " cur pages:\n";
-$n = 0;
-while( $s = wfFetchObject( $res ) ) {
-	$utitle = toUtf8( $s->cur_title );
-	$uuser = toUtf8( $s->cur_user_text );
-	$ucomment = toUtf8( $s->cur_comment );
-	$utext = toUtf8( $s->cur_text );
-	$now = wfTimestampNow();
-	
-	$sql = "UPDATE cur
-		SET cur_title='$utitle',cur_user_text='$uuser',
-			cur_comment='$ucomment',cur_text='$utext'
-		WHERE cur_id={$s->cur_id}";
-	wfQuery( $sql, DB_WRITE );
-	#$wgMemc->delete( "$wgDBname:user:id:{$s->user_id}" );
-	
-	$otitle = wfStrencode( $s->cur_title );
-	if( $otitle != $utitle ) {
-		# Also update titles in watchlist and old
-		$sql = "UPDATE old SET old_title='$utitle'
-			WHERE old_namespace={$s->cur_namespace} AND old_title='$otitle'";
-		wfQuery( $sql, DB_WRITE );
-		
-		$ns = IntVal( $s->cur_namespace) & ~1;
-		$sql = "UPDATE watchlist SET wl_title='$utitle'
-			WHERE wl_namespace=$ns AND wl_title='$otitle'";
-		wfQuery( $sql, DB_WRITE );
-		$u++;
-	}
-	
-	if( ++$n % 100 == 0 ) print "$n\n";
-}
-wfFreeResult( $res );
-if( $n ) {
-	printf("Updated old/watchlist titles on %2.02%%.\n\n", $u / $n);
-} else {
-	print "Didn't update any old/watchlist titles.\n\n";
-}
-
-/*
-old
-	old_title
-	old_text -> may be gzipped
-	old_comment
-	old_user_text
-
-archive
-	ar_title
-	ar_text -> may be gzipped
-	ar_comment
-	ar_user_text
-*/
-
-?>
diff --git a/maintenance/importUseModWiki.php b/maintenance/importUseModWiki.php
index 318483e71242..720e4ab8f396 100644
--- a/maintenance/importUseModWiki.php
+++ b/maintenance/importUseModWiki.php
@@ -21,6 +21,9 @@
  * @subpackage Maintenance
  */
 
+if( php_sapi_name() != 'cli' ) {
+	die( "Please customize the settings and run me from the command line." );
+}
 
 /** Set these correctly! */
 $wgImportEncoding = "CP1252"; /* We convert all to UTF-8 */
diff --git a/maintenance/initialdata.sql b/maintenance/initialdata.sql
deleted file mode 100644
index 141c71a85478..000000000000
--- a/maintenance/initialdata.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- SQL to load database with initial values for testing.
--- Most will be overwritten by install script.
---
-
-INSERT INTO user (user_name,user_rights,user_password)
-  VALUES ('WikiSysop','sysop','d41d8cd98f00b204e9800998ecf8427e'),
-  ('WikiDeveloper','sysop,developer','d41d8cd98f00b204e9800998ecf8427e');
-
-INSERT INTO cur (cur_namespace,cur_title,cur_text,cur_restrictions)
-  VALUES (4,'Upload_log','Below is a list of the most recent file uploads.\nAll times shown are server time (UTC).\n<ul>\n</ul>\n','sysop'),
-  (4,'Deletion_log','Below is a list of the most recent deletions.\nAll times shown are server time (UTC).\n<ul>\n</ul>\n','sysop'),
-  (0,'Main_Page','Wiki software successfully installed!',''),
-  (4,'Block log', 'This is a log of user blocking and unblocking actions. Automatically 
-blocked IP addresses are not be listed. See the [[Special:Ipblocklist|IP block list]] for
-the list of currently operational bans and blocks.', 'sysop');
-
-INSERT INTO site_stats VALUES (1,0,0,0);
-
diff --git a/maintenance/interwiki.sql b/maintenance/interwiki.sql
index e625552ee3ca..1b04ee976fc9 100644
--- a/maintenance/interwiki.sql
+++ b/maintenance/interwiki.sql
@@ -1,7 +1,7 @@
 -- Based more or less on the public interwiki map from MeatballWiki
 -- Default interwiki prefixes...
 
-REPLACE INTO interwiki (iw_prefix,iw_url,iw_local) VALUES
+REPLACE INTO /*$wgDBprefix*/interwiki (iw_prefix,iw_url,iw_local) VALUES
 ('AbbeNormal','http://www.ourpla.net/cgi-bin/pikie.cgi?$1',0),
 ('AcadWiki','http://xarch.tu-graz.ac.at/autocad/wiki/$1',0),
 ('Acronym','http://www.acronymfinder.com/af-query.asp?String=exact&Acronym=$1',0),
diff --git a/maintenance/recount.sql b/maintenance/recount.sql
index 93e1024b4f0e..2bf4a7fba806 100644
--- a/maintenance/recount.sql
+++ b/maintenance/recount.sql
@@ -2,7 +2,7 @@
 -- Recalculate the article count
 -- 
 
-SELECT @foo:=COUNT(*) FROM cur
+SELECT @foo:=COUNT(*) FROM /*$wgDBprefix*/cur
   WHERE cur_namespace=0 AND cur_is_redirect=0 AND cur_text like '%[[%';
-UPDATE site_stats SET ss_good_articles=@foo;
+UPDATE /*$wgDBprefix*/site_stats SET ss_good_articles=@foo;
 
diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index db2c0704ce9f..eb1035fd2ffe 100644
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -4,7 +4,7 @@
 --
 -- Indexes should be defined here; please import the rest from indexes.sql.
 
-CREATE TABLE user (
+CREATE TABLE /*$wgDBprefix*/user (
   user_id int(5) unsigned NOT NULL auto_increment,
   user_name varchar(255) binary NOT NULL default '',
   user_real_name varchar(255) binary NOT NULL default '',
@@ -19,20 +19,20 @@ CREATE TABLE user (
 );
 
 -- TODO: de-blob this; it should be a property table
-CREATE TABLE user_rights (
+CREATE TABLE /*$wgDBprefix*/user_rights (
   ur_user int(5) unsigned NOT NULL,
   ur_rights tinyblob NOT NULL default '',
   UNIQUE KEY ur_user (ur_user)
 );
 
-CREATE TABLE user_newtalk (
+CREATE TABLE /*$wgDBprefix*/user_newtalk (
   user_id int(5) NOT NULL default '0',
   user_ip varchar(40) NOT NULL default '',
   INDEX user_id (user_id),
   INDEX user_ip (user_ip)
 );
 
-CREATE TABLE cur (
+CREATE TABLE /*$wgDBprefix*/cur (
   cur_id int(8) unsigned NOT NULL auto_increment,
   cur_namespace tinyint(2) unsigned NOT NULL default '0',
   cur_title varchar(255) binary NOT NULL default '',
@@ -63,7 +63,7 @@ CREATE TABLE cur (
   INDEX namespace_redirect_timestamp(cur_namespace,cur_is_redirect,cur_timestamp)
 );
 
-CREATE TABLE old (
+CREATE TABLE /*$wgDBprefix*/old (
   old_id int(8) unsigned NOT NULL auto_increment,
   old_namespace tinyint(2) unsigned NOT NULL default '0',
   old_title varchar(255) binary NOT NULL default '',
@@ -83,7 +83,7 @@ CREATE TABLE old (
   INDEX usertext_timestamp (old_user_text,inverse_timestamp)
 );
 
-CREATE TABLE archive (
+CREATE TABLE /*$wgDBprefix*/archive (
   ar_namespace tinyint(2) unsigned NOT NULL default '0',
   ar_title varchar(255) binary NOT NULL default '',
   ar_text mediumtext NOT NULL default '',
@@ -101,7 +101,7 @@ CREATE TABLE archive (
 -- Track links that do exist
 -- l_from and l_to key to cur_id
 --
-CREATE TABLE links (
+CREATE TABLE /*$wgDBprefix*/links (
   l_from int(8) unsigned NOT NULL default '0',
   l_to int(8) unsigned NOT NULL default '0',
   UNIQUE KEY l_from(l_from,l_to),
@@ -113,7 +113,7 @@ CREATE TABLE links (
 -- bl_from keys to cur_id
 -- bl_to is a text link (namespace:title)
 --
-CREATE TABLE brokenlinks (
+CREATE TABLE /*$wgDBprefix*/brokenlinks (
   bl_from int(8) unsigned NOT NULL default '0',
   bl_to varchar(255) binary NOT NULL default '',
   UNIQUE KEY bl_from(bl_from,bl_to),
@@ -125,7 +125,7 @@ CREATE TABLE brokenlinks (
 -- il_from keys to cur_id, il_to keys to image_name.
 -- We don't distinguish live from broken links.
 --
-CREATE TABLE imagelinks (
+CREATE TABLE /*$wgDBprefix*/imagelinks (
   il_from int(8) unsigned NOT NULL default '0',
   il_to varchar(255) binary NOT NULL default '',
   UNIQUE KEY il_from(il_from,il_to),
@@ -138,7 +138,7 @@ CREATE TABLE imagelinks (
 -- cl_sortkey is the title of the linking page or an optional override
 -- cl_timestamp marks when the link was last added
 --
-CREATE TABLE categorylinks (
+CREATE TABLE /*$wgDBprefix*/categorylinks (
   cl_from int(8) unsigned NOT NULL default '0',
   cl_to varchar(255) binary NOT NULL default '',
   cl_sortkey varchar(255) binary NOT NULL default '',
@@ -153,12 +153,12 @@ CREATE TABLE categorylinks (
 -- cache arrays to reduce database load slurping up
 -- from links and brokenlinks.
 --
-CREATE TABLE linkscc (
+CREATE TABLE /*$wgDBprefix*/linkscc (
   lcc_pageid INT UNSIGNED NOT NULL UNIQUE KEY,
   lcc_cacheobj MEDIUMBLOB NOT NULL
 );
 
-CREATE TABLE site_stats (
+CREATE TABLE /*$wgDBprefix*/site_stats (
   ss_row_id int(8) unsigned NOT NULL,
   ss_total_views bigint(20) unsigned default '0',
   ss_total_edits bigint(20) unsigned default '0',
@@ -166,11 +166,11 @@ CREATE TABLE site_stats (
   UNIQUE KEY ss_row_id (ss_row_id)
 );
 
-CREATE TABLE hitcounter (
+CREATE TABLE /*$wgDBprefix*/hitcounter (
   hc_id INTEGER UNSIGNED NOT NULL
 ) TYPE=HEAP MAX_ROWS=25000;
 
-CREATE TABLE ipblocks (
+CREATE TABLE /*$wgDBprefix*/ipblocks (
   ipb_id int(8) NOT NULL auto_increment,
   ipb_address varchar(40) binary NOT NULL default '',
   ipb_user int(8) unsigned NOT NULL default '0',
@@ -185,7 +185,7 @@ CREATE TABLE ipblocks (
   INDEX ipb_user (ipb_user)
 );
 
-CREATE TABLE image (
+CREATE TABLE /*$wgDBprefix*/image (
   img_name varchar(255) binary NOT NULL default '',
   img_size int(8) unsigned NOT NULL default '0',
   img_description tinyblob NOT NULL default '',
@@ -197,7 +197,7 @@ CREATE TABLE image (
   INDEX img_timestamp (img_timestamp)
 );
 
-CREATE TABLE oldimage (
+CREATE TABLE /*$wgDBprefix*/oldimage (
   oi_name varchar(255) binary NOT NULL default '',
   oi_archive_name varchar(255) binary NOT NULL default '',
   oi_size int(8) unsigned NOT NULL default 0,
@@ -208,7 +208,7 @@ CREATE TABLE oldimage (
   INDEX oi_name (oi_name(10))
 );
 
-CREATE TABLE recentchanges (
+CREATE TABLE /*$wgDBprefix*/recentchanges (
   rc_id int(8) NOT NULL auto_increment,
   rc_timestamp varchar(14) binary NOT NULL default '',
   rc_cur_time varchar(14) binary NOT NULL default '',
@@ -237,7 +237,7 @@ CREATE TABLE recentchanges (
   INDEX rc_ip (rc_ip)
 );
 
-CREATE TABLE watchlist (
+CREATE TABLE /*$wgDBprefix*/watchlist (
   wl_user int(5) unsigned NOT NULL,
   wl_namespace tinyint(2) unsigned NOT NULL default '0',
   wl_title varchar(255) binary NOT NULL default '',
@@ -245,7 +245,7 @@ CREATE TABLE watchlist (
   KEY namespace_title (wl_namespace,wl_title)
 );
 
-CREATE TABLE math (
+CREATE TABLE /*$wgDBprefix*/math (
   math_inputhash varchar(16) NOT NULL,
   math_outputhash varchar(16) NOT NULL,
   math_html_conservativeness tinyint(1) NOT NULL,
@@ -257,7 +257,7 @@ CREATE TABLE math (
 
 -- Table searchindex must be MyISAM for fulltext support
 
-CREATE TABLE searchindex (
+CREATE TABLE /*$wgDBprefix*/searchindex (
   si_page int(8) unsigned NOT NULL,
   si_title varchar(255) NOT NULL default '',
   si_text mediumtext NOT NULL default '',
@@ -267,7 +267,7 @@ CREATE TABLE searchindex (
 
 ) TYPE=MyISAM;
 
-CREATE TABLE interwiki (
+CREATE TABLE /*$wgDBprefix*/interwiki (
   iw_prefix char(32) NOT NULL,
   iw_url char(127) NOT NULL,
   iw_local BOOL NOT NULL,
@@ -275,7 +275,7 @@ CREATE TABLE interwiki (
 );
 
 -- Used for caching expensive grouped queries
-CREATE TABLE querycache (
+CREATE TABLE /*$wgDBprefix*/querycache (
   qc_type char(32) NOT NULL,
   qc_value int(5) unsigned NOT NULL default '0',
   qc_namespace tinyint(2) unsigned NOT NULL default '0',
@@ -284,7 +284,7 @@ CREATE TABLE querycache (
 );
 
 -- For a few generic cache operations if not using Memcached
-CREATE TABLE objectcache (
+CREATE TABLE /*$wgDBprefix*/objectcache (
   keyname char(255) binary not null default '',
   value mediumblob,
   exptime datetime,
@@ -293,7 +293,7 @@ CREATE TABLE objectcache (
 );
 
 -- For storing revision text
-CREATE TABLE blobs (
+CREATE TABLE /*$wgDBprefix*/blobs (
   blob_index char(255) binary NOT NULL default '',
   blob_data longblob NOT NULL default '',
   UNIQUE key blob_index (blob_index)
@@ -301,7 +301,7 @@ CREATE TABLE blobs (
 
 -- For article validation
 
-CREATE TABLE `validate` (
+CREATE TABLE /*$wgDBprefix*/validate (
   `val_user` int(11) NOT NULL default '0',
   `val_title` varchar(255) binary NOT NULL default '',
   `val_timestamp` varchar(14) binary NOT NULL default '',
@@ -312,7 +312,7 @@ CREATE TABLE `validate` (
 );
 
 
-CREATE TABLE logging (
+CREATE TABLE /*$wgDBprefix*/logging (
   -- Symbolic keys for the general log type and the action type
   -- within the log. The output format will be controlled by the
   -- action field, but only the type controls categorization.
@@ -338,22 +338,3 @@ CREATE TABLE logging (
   KEY page_time (log_namespace, log_title, log_timestamp)
 );
 
-
-
-
-
--- Hold group name and description
-CREATE TABLE `group` (
-  group_id int(5) unsigned NOT NULL auto_increment,
-  group_name varchar(50) NOT NULL default '',
-  group_description varchar(255) NOT NULL default '',
-  group_rights tinyblob,
-  PRIMARY KEY  (group_id)
-);
-
--- Relation table between user and groups
-CREATE TABLE user_groups (
-	ug_user int(5) unsigned NOT NULL default '0',
-	ug_group int(5) unsigned NOT NULL default '0',
-	PRIMARY KEY  (ug_user,ug_group)
-);
diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 8f83a480b599..0448522314e7 100644
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -19,7 +19,6 @@ $wgNewTables = array(
 	array( 'categorylinks', 'patch-categorylinks.sql' ),
 	array( 'logging',       'patch-logging.sql' ),
 	array( 'user_rights',   'patch-user_rights.sql' ),
-	array( 'user_groups',   'patch-userlevels.sql' ),
 );
 
 $wgNewFields = array(
@@ -32,8 +31,7 @@ $wgNewFields = array(
 	array( 'recentchanges', 'rc_patrolled',     'patch-rc-patrol.sql' ),
 	array( 'user',          'user_real_name',   'patch-user-realname.sql' ),
 	array( 'user',          'user_token',       'patch-user_token.sql' ),
-	array( 'user_rights',   'ur_user',          'patch-rename-user_groups-and_rights.sql' ),
-	array( 'group',         'group_rights',     'patch-userlevels-rights.sql' ),
+	array( 'user_rights',   'ur_user',          'patch-rename-user_rights.sql' ),
 );
 
 function add_table( $name, $patch ) {
@@ -66,6 +64,8 @@ function do_revision_updates() {
 }
 
 function update_passwords() {
+	wfDebugDieBacktrace( "This function needs to be updated or removed.\n" );
+	
 	global $wgDatabase;
 	$fname = "Update script: update_passwords()";
 	print "\nIt appears that you need to update the user passwords in your\n" .
@@ -123,7 +123,7 @@ function do_index_update() {
 function do_linkscc_1_3_update() {
 	// Update linkscc table to 1.3 schema if necessary
 	global $wgDatabase, $wgVersion;
-	if( ( strpos( "1.3", $wgVersion ) === 0 ) && $wgDatabase->tableExists( "linkscc" )
+	if( $wgDatabase->tableExists( "linkscc" )
 		&& $wgDatabase->fieldExists( "linkscc", "lcc_title" ) ) {
 		echo "Altering lcc_title field from linkscc table... ";
 		dbsource( "maintenance/archives/patch-linkscc-1.3.sql", $wgDatabase );
@@ -144,35 +144,6 @@ function do_image_name_unique_update() {
 	}
 }
 
-# Assumes that the group table has been added.
-function do_group_update() {
-	global $wgDatabase;
-	$res = $wgDatabase->safeQuery( 'SELECT COUNT(*) AS c FROM !',
-		$wgDatabase->tableName( 'group' ) );
-	$row = $wgDatabase->fetchObject( $res );
-	$wgDatabase->freeResult( $res );
-	if( $row->c == 0 ) {
-		echo "Adding default group definitions... ";
-		dbsource( "maintenance/archives/patch-userlevels-defaultgroups.sql", $wgDatabase );
-		echo "ok\n";
-	} else {
-		echo "...group definitions already in place.\n";
-		$res = $wgDatabase->safeQuery( "SELECT COUNT(*) AS n FROM !
-		                                 WHERE group_name IN ('Sysops','Bureaucrat')
-		                                   AND group_rights NOT LIKE 'sysop'",
-		                               $wgDatabase->tableName( 'group' ) );
-		$row = $wgDatabase->fetchObject( $res );
-		$wgDatabase->freeResult( $res );
-		if( $row->n ) {
-			echo "Fixing sysops group permissions... ";
-			dbsource( "maintenance/archives/patch-group-sysopfix.sql", $wgDatabase );
-			echo "ok\n";
-		} else {
-			echo "...sysop group permissions look ok.\n";
-		}
-	}
-}
-
 function do_all_updates() {
 	global $wgNewTables, $wgNewFields;
 	
@@ -188,9 +159,6 @@ function do_all_updates() {
 		flush();
 	}
 	
-	# Add default group data
-	do_group_update(); flush();
-
 	# Do schema updates which require special handling
 	do_interwiki_update(); flush();
 	do_index_update(); flush();
diff --git a/maintenance/users.sql b/maintenance/users.sql
index dc23ed356f33..4d74987b3159 100644
--- a/maintenance/users.sql
+++ b/maintenance/users.sql
@@ -17,99 +17,3 @@ GRANT DELETE,INSERT,SELECT,UPDATE ON `{$wgDBname}`.*
  TO {$wgDBuser}@localhost IDENTIFIED BY '{$wgDBpassword}';
 GRANT DELETE,INSERT,SELECT,UPDATE ON `{$wgDBname}`.*
  TO {$wgDBuser}@localhost.localdomain IDENTIFIED BY '{$wgDBpassword}';
-
-GRANT SELECT (user_id,user_name,user_options) ON `{$wgDBname}`.user
- TO {$wgDBsqluser}@'%' IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.user_rights
- TO {$wgDBsqluser}@'%' IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.cur
- TO {$wgDBsqluser}@'%' IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.old
- TO {$wgDBsqluser}@'%' IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.archive
- TO {$wgDBsqluser}@'%' IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.links
- TO {$wgDBsqluser}@'%' IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.brokenlinks
- TO {$wgDBsqluser}@'%' IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.imagelinks
- TO {$wgDBsqluser}@'%' IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.site_stats
- TO {$wgDBsqluser}@'%' IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.ipblocks
- TO {$wgDBsqluser}@'%' IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.image
- TO {$wgDBsqluser}@'%' IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.oldimage
- TO {$wgDBsqluser}@'%' IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.recentchanges
- TO {$wgDBsqluser}@'%' IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.watchlist
- TO {$wgDBsqluser}@'%' IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.math
- TO {$wgDBsqluser}@'%' IDENTIFIED BY '{$wgDBsqlpassword}';
-
-GRANT SELECT (user_id,user_name,user_options)
- ON `{$wgDBname}`.user
- TO {$wgDBsqluser}@localhost IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.user_rights
- TO {$wgDBsqluser}@localhost IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.cur
- TO {$wgDBsqluser}@localhost IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.old
- TO {$wgDBsqluser}@localhost IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.archive
- TO {$wgDBsqluser}@localhost IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.links
- TO {$wgDBsqluser}@localhost IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.brokenlinks
- TO {$wgDBsqluser}@localhost IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.imagelinks
- TO {$wgDBsqluser}@localhost IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.site_stats
- TO {$wgDBsqluser}@localhost IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.ipblocks
- TO {$wgDBsqluser}@localhost IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.image
- TO {$wgDBsqluser}@localhost IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.oldimage
- TO {$wgDBsqluser}@localhost IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.recentchanges
- TO {$wgDBsqluser}@localhost IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.watchlist
- TO {$wgDBsqluser}@localhost IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.math
- TO {$wgDBsqluser}@localhost IDENTIFIED BY '{$wgDBsqlpassword}';
-
-GRANT SELECT (user_id,user_name,user_options)
- ON `{$wgDBname}`.user
- TO {$wgDBsqluser}@localhost.localdomain IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.user_rights
- TO {$wgDBsqluser}@localhost.localdomain IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.cur
- TO {$wgDBsqluser}@localhost.localdomain IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.old
- TO {$wgDBsqluser}@localhost.localdomain IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.archive
- TO {$wgDBsqluser}@localhost.localdomain IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.links
- TO {$wgDBsqluser}@localhost.localdomain IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.brokenlinks
- TO {$wgDBsqluser}@localhost.localdomain IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.imagelinks
- TO {$wgDBsqluser}@localhost.localdomain IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.site_stats
- TO {$wgDBsqluser}@localhost.localdomain IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.ipblocks
- TO {$wgDBsqluser}@localhost.localdomain IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.image
- TO {$wgDBsqluser}@localhost.localdomain IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.oldimage
- TO {$wgDBsqluser}@localhost.localdomain IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.recentchanges
- TO {$wgDBsqluser}@localhost.localdomain IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.watchlist
- TO {$wgDBsqluser}@localhost.localdomain IDENTIFIED BY '{$wgDBsqlpassword}';
-GRANT SELECT ON `{$wgDBname}`.math
- TO {$wgDBsqluser}@localhost.localdomain IDENTIFIED BY '{$wgDBsqlpassword}';
-
diff --git a/maintenance/wikipedia-interwiki.sql b/maintenance/wikipedia-interwiki.sql
index c42b47d8f681..77ab327b1cbb 100644
--- a/maintenance/wikipedia-interwiki.sql
+++ b/maintenance/wikipedia-interwiki.sql
@@ -1,7 +1,7 @@
 -- For convenience, here are the *in-project* interwiki prefixes
 -- for Wikipedia.
 
-REPLACE INTO interwiki (iw_prefix,iw_url,iw_local) VALUES
+REPLACE INTO /*$wgDBprefix*/interwiki (iw_prefix,iw_url,iw_local) VALUES
 ('w','http://www.wikipedia.org/wiki/$1',1),
 ('m','http://meta.wikipedia.org/wiki/$1',1),
 ('meta','http://meta.wikipedia.org/wiki/$1',1),
diff --git a/maintenance/wiktionary-interwiki.sql b/maintenance/wiktionary-interwiki.sql
index a2863a87ccd3..787962d5b7a4 100644
--- a/maintenance/wiktionary-interwiki.sql
+++ b/maintenance/wiktionary-interwiki.sql
@@ -1,7 +1,7 @@
 -- For convenience, here are the *in-project* interwiki prefixes
 -- for Wikipedia.
 
-REPLACE INTO interwiki (iw_prefix,iw_url,iw_local) VALUES
+REPLACE INTO /*$wgDBprefix*/interwiki (iw_prefix,iw_url,iw_local) VALUES
 ('w','http://www.wikipedia.org/wiki/$1',1),
 ('m','http://meta.wikipedia.org/wiki/$1',1),
 ('meta','http://meta.wikipedia.org/wiki/$1',1),
diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 729739b27697..20ed3b4a0831 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -7,6 +7,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /**
  * @todo document
  * @package MediaWiki
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 978ce43860ae..ccdeefcba244 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -10,6 +10,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /** */
 require_once('includes/SkinTemplate.php');
 
diff --git a/skins/MySkin.php b/skins/MySkin.php
index 22fd1e97a6d5..2f551b4606d7 100644
--- a/skins/MySkin.php
+++ b/skins/MySkin.php
@@ -7,6 +7,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /** */
 require_once('MonoBook.php');
 
diff --git a/skins/Nostalgia.php b/skins/Nostalgia.php
index 0b914bdc86e4..d29aaf8f65b0 100644
--- a/skins/Nostalgia.php
+++ b/skins/Nostalgia.php
@@ -7,6 +7,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /**
  * @todo document
  * @package MediaWiki
diff --git a/skins/Standard.php b/skins/Standard.php
index 6698cf2a4d77..155331d6fe38 100644
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -7,6 +7,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /**
  * @todo document
  * @package MediaWiki
diff --git a/skins/disabled/Amethyst.php b/skins/disabled/Amethyst.php
index 3bfaa18f99a2..f387f2077982 100644
--- a/skins/disabled/Amethyst.php
+++ b/skins/disabled/Amethyst.php
@@ -12,6 +12,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /** */
 require_once('includes/SkinPHPTal.php');
 if( class_exists( 'SkinPHPTal' ) ) {
diff --git a/skins/disabled/Chick.php b/skins/disabled/Chick.php
index ee28850a109c..205feb67008d 100644
--- a/skins/disabled/Chick.php
+++ b/skins/disabled/Chick.php
@@ -7,6 +7,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /** */
 require_once('includes/SkinPHPTal.php');
 if( class_exists( 'SkinPHPTal' ) ) {
diff --git a/skins/disabled/MonoBookTal.php b/skins/disabled/MonoBookTal.php
index bc0f1215c77b..876150ce2222 100644
--- a/skins/disabled/MonoBookTal.php
+++ b/skins/disabled/MonoBookTal.php
@@ -14,6 +14,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /** */
 require_once('includes/SkinPHPTal.php');
 
diff --git a/skins/disabled/WikimediaWiki.php b/skins/disabled/WikimediaWiki.php
index 608c8b80ec11..87564df04f1e 100644
--- a/skins/disabled/WikimediaWiki.php
+++ b/skins/disabled/WikimediaWiki.php
@@ -6,6 +6,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /** */
 
 require_once('includes/SkinPHPTal.php');
diff --git a/soap/client.php b/soap/client.php
deleted file mode 100644
index b9d75cfd2a1f..000000000000
--- a/soap/client.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
-        print "This script must be run from the command line\n";
-        exit();
-}
-
-
-require_once('nusoap.php');
-
-$t = 'Hello, World!';
-
-$s = new soapclient( 'http://mediawiki.mormo.org:80/soap/' );
-print "==echoString==\n";
-$r = $s->call( 'echoString', array( $t ) );
-
-print( $r . "\n" );
-print( "Error: ".$s->getError() . "\n" );
-
-print "\n\n==getArticle==\n";
-$r = $s->call( 'getArticle', array( 'Frankfurt' ) );
-
-print_r( $r );
-print( "Error: ".$s->getError() . "\n" );
-
-print "\n\n==getArticleByVersion==\n";
-$r = $s->call( 'getArticleByVersion', array( 'Frankfurt am Main', 0 ) );
-
-print_r( $r );
-print( "Error: ".$s->getError() . "\n" );
-
-print "\n\n==getArticleRevisions==\n";
-$r = $s->call( 'getArticleRevisions', array( 'Frankfurt am Main' ) );
-
-print_r( $r );
-print( "Error: ".$s->getError() . "\n" );
-
-print "\n\n==searchTitles==\n";
-$r = $s->call( 'searchTitles', array( 'Frankfurt', 0 ) );
-
-print_r( $r );
-print( "Error: ".$s->getError() . "\n" );
-
-?>
-
diff --git a/soap/index.php b/soap/index.php
deleted file mode 100644
index 71d4b0c1004f..000000000000
--- a/soap/index.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-# SOAP remote API for MediaWiki
-#
-# Copyright (C) 2004 Jens Frank, jeluf@gmx.de
-# http://www.mediawiki.org/
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-# http://www.gnu.org/copyleft/gpl.html
-
-require_once('nusoap.php');
-
-#
-# Initialize the environment
-#
-unset( $wgEnableSOAP );
-unset( $IP );
-@ini_set( "allow_url_fopen", 0 ); # For security...
-
-if(!file_exists("../LocalSettings.php")) {
-        die( "You'll have to <a href='../config/index.php'>set the wiki up</a> first!" );
-}
-
-define( "MEDIAWIKI", true );
-
-require_once( '../includes/Defines.php' );
-require_once( '../LocalSettings.php' );
-
-ini_set( "include_path", "$IP:" . ini_get("include_path") );
-
-require_once( '../includes/Setup.php' );
-
-#
-# SOAP must be activated in the Configuration. Else, exit.
-#
-if ( ! $wgEnableSOAP ) {
-	print "You have to enable SOAP by setting \$wgEnableSoap=true; in LocalSettings.php\n";
-	exit;
-}
-
-#
-# Set up server and register methods.
-#
-
-$s = new soap_server;
-
-$s->register('echoString');		# For testing
-$s->register('getArticle');		# For testing
-$s->register('getArticleByVersion');
-$s->register('getArticleRevisions');
-$s->register('searchTitles');
-
-# Convert decimal to ASCII-encoded
-#
-function decasc( $n ) {
-	return strtoupper(base_convert( $n, 10, 36));
-}
-# Test function
-# Return the string.
-#
-function echoString( $in ) {
-	if ( is_string( $in ) ) {
-		return $in;
-	} else {
-		return new soap_fault('Client', 'The parameter to this service must be a string');
-	}
-}
-
-# Test function
-# Return an array:
-#   name   	IN  name of the page to get, e.g. Wikipedia talk:Village Pump
-#   title  	OUT Title of the page, DB form, e.g. Village_Pump
-#   namespace	OUT Namespace of the article, e.g. 3 for Wikipedia_talk.
-#   text	OUT Wikitext of the requested page
-#
-function getArticle( $name ) {
-	global $wgWhitelistEdit, $wgWhitelistRead;
-
-	if ( $wgWhitelistEdit || $wgWhitelistRead ) {
-		return new soap_fault('Client', 'SOAP not available in whitelist mode.');
-	}
-
-	if ( ! is_string( $name ) ) {
-		return new soap_fault('Client', 'The parameter to this service must be a string');
-	}
-	require_once('Title.php');
-	if( $name == '' ) {
-		$name = wfMsg( "mainpage" );
-	}
-	$wgTitle = Title::newFromText( $name );
-	$dbr =& wfGetDB( DB_SLAVE );
-	$text = $dbr->selectField( 'cur', 'cur_text', 
-		"cur_title='".$wgTitle->getDBkey()."' AND cur_namespace=".$wgTitle->getNamespace(),
-		'SOAP::getArticle' );
-	if ( false === $text ) {
-		return new soap_fault('Client', 'Page does not exist.');
-	}
-	return array(
-		'title' => $wgTitle->getDBkey(),
-		'namespace' => $wgTitle->getNamespace(),
-		'text' => $text
-	);
-}
-
-# getArticleByVersion
-# Returns the wikitext and metadata of an article, either current or old revision.
-#   title	IN   title of the page, including namespace prefix
-#   version	IN   version number of the page, or 0 for cur.
-#
-#   title	OUT  title of the page, without namespace prefix
-#   namespace   OUT  namespace number of that article
-#   id		OUT  ID number of this page
-#   timestamp   OUT  timestamp of this page
-#   text	OUT  wikitext of this page
-#   
-function getArticleByVersion( $title, $version ) {
-	global $wgWhitelistEdit, $wgWhitelistRead;
-	$fname = 'SOAP::getArticleByVersion';
-
-	# Check parameters
-	#
-	if ( $wgWhitelistEdit || $wgWhitelistRead ) {
-		return new soap_fault('Client', 'SOAP not available in whitelist mode.');
-	}
-	if ( ! is_string( $title ) ) {
-		return new soap_fault('Client', 'The first parameter to this service must be a string');
-	}
-	if ( intval( $version ) != $version ) {
-		return new soap_fault('Client', 'The second parameter to this service must be an integer');
-	}
-
-	# Instantiate a title object
-	#
-	require_once('Title.php');
-	if( $title == '' ) {
-		$title = wfMsg( "mainpage" );
-	}
-	$wgTitle = Title::newFromText( $title );
-
-	$dbr =& wfGetDB( DB_SLAVE );
-
-	# set up SQL query
-	#
-	if ( $version == 0 ) {
-		# Get current revision
-		#
-		$sql = "SELECT cur_title AS title, cur_namespace AS namespace, cur_id AS id,
-				cur_timestamp AS timestamp, cur_text as text FROM cur
-			WHERE cur_title = '" . $wgTitle->getDBkey()."' AND cur_namespace=".$wgTitle->getNamespace();
-	} else {
-		$sql = "SELECT old_title AS title, old_namespace AS namespace, old_id AS id,
-				old_timestamp AS timestamp, old_text AS text FROM old
-			WHERE old_title = '" . $wgTitle->getDBkey()."' AND old_id=".intval( $version );
-	}
-
-	$res = $dbr->query( $sql, $fname, true );
-
-	if ( ! $res ) {
-		return new soap_fault( 'Server', $dbr->lastError() );
-	}
-
-	if ( ! ( $line = $dbr->fetchObject( $res ) ) ) {
-		return new soap_fault( 'Client', 'That page or revision does not exist.' );
-	}
-
-	$answer['title'] = $line->title;
-	$answer['namespace'] = $line->namespace;
-	$answer['id'] = $line->id;
-	$answer['timestamp'] = $line->timestamp;
-	$answer['text'] = $line->text;
-
-	return $answer;
-}
-
-# getArticleRevisions
-# Return a list of all revisions of a page.
-#   title	IN   title of the page, including namespace prefix
-# 
-#   title	OUT  title of the page, without namespace prefix
-#   namespace	OUT  namespace number of that article
-#   id		OUT  ID number of this page
-#   revisions	OUT  list of revisions of this page. Array consisting of elements with
-#		     the following fields:
-#	id	   OUT	revision id of this revision
-#	comment	   OUT	edit comment of this revision
-#	user	   OUT	user name of the user adding this revision
-#	timestamp  OUT	timestamp of this revision
-#	minor	   OUT	is this change a minor change
-#	unique	   OUT	unique ID of this revision. built from (curid,timestamp,hash(text))
-#
-function getArticleRevisions( $title ) {
-	global $wgWhitelistEdit, $wgWhitelistRead;
-	$fname = 'SOAP::getArticleRevisions';
-
-	# Check parameters
-	#
-	if ( $wgWhitelistEdit || $wgWhitelistRead ) {
-		return new soap_fault('Client', 'SOAP not available in whitelist mode.');
-	}
-	if ( ! is_string( $title ) ) {
-		return new soap_fault('Client', 'The first parameter to this service must be a string');
-	}
-
-	# Instantiate a title object
-	#
-	require_once('Title.php');
-	if( $title == '' ) {
-		$title = wfMsg( "mainpage" );
-	}
-	$wgTitle = Title::newFromText( $title );
-
-	$dbr =& wfGetDB( DB_SLAVE );
-
-	# set up SQL query
-	#
-	$sql1 = "SELECT cur_id, cur_comment, cur_user_text, cur_timestamp, cur_minor_edit, cur_text
-		FROM cur
-		WHERE cur_title = '" . $wgTitle->getDBkey()."' AND cur_namespace=".$wgTitle->getNamespace();
-
-	$sql2 = "SELECT old_id, old_comment, old_user_text, old_timestamp, old_minor_edit, old_text
-		FROM old
-		WHERE old_title = '" . $wgTitle->getDBkey()."' AND old_namespace=".$wgTitle->getNamespace();
-	
-	$res = $dbr->query( $sql1, $fname, true );
-
-	if ( ! $res ) {
-		return new soap_fault( 'Server', $dbr->lastError() );
-	}
-
-	if ( ! ( $line = $dbr->fetchObject( $res ) ) ) {
-		return new soap_fault( 'Client', 'That page or revision does not exist.' );
-	}
-
-	$curid = $line->cur_id;
-
-	$revisions[] = array( 
-		'id' => 0,
-		'comment' => $line->cur_comment,
-		'user' => $line->cur_user_text,
-		'timestamp' => $line->cur_timestamp,
-		'minor' => $line->cur_minor_edit,
-		'unique' => decasc($curid).'-'.
-			decasc(wfTimestamp2Unix($line->cur_timestamp)).'-'.
-			decasc(crc32($line->cur_text))
-	);
-
-	$answer = array(
-		'title' => $wgTitle->getDBkey(),
-		'namespace' => $wgTitle->getNamespace(),
-		'id' => $curid
-	);
-
-	
-	$res = $dbr->query( $sql2, $fname, true );
-	$answer['count'] = 1;
-
-	if ( $res ) {
-		while ( $line = $dbr->fetchObject( $res ) ) {
-			$revisions[] = array(
-				'id' => $line->old_id,
-				'comment' => $line->old_comment,
-				'user' => $line->old_user_text,
-				'timestamp' => $line->old_timestamp,
-				'minor' => $line->old_minor_edit,
-				'unique' => decasc($curid).'-'.
-					decasc(wfTimestamp2Unix($line->old_timestamp)).'-'.
-					decasc(crc32($line->old_text))
-			);
-			$answer['count'] ++;
-		}
-	}
-	$answer['revisions'] = $revisions;
-
-	return $answer;
-}
-
-# searchTitles
-# Returns a list of article titles matching a search string
-#   pattern	IN   search pattern
-#   main_only	IN   if 1, search only the main namespace, if 0, search all namespaces
-#
-#   count	OUT  number of results
-#   base	OUT  base URL of the hits. Concatenate with title_url to get full url.
-#   hits	OUT  list of hits. Array consisting of elements with the following fields:
-#	title	   OUT	title of the hit. "Display style". Does not include namespace.
-#	title_ns   OUT	title of the hit. "Display style". Includes namespace.
-#	title_url  OUT	title of the hit. URL escaped. Includes namespace prefix.
-#	namespace  OUT  numerical namespace ID
-#
-function searchTitles( $pattern, $main_only ) {
-	global $wgWhitelistEdit, $wgWhitelistRead, $wgLang, $wgServer, $wgArticlePath;
-	$fname = 'SOAP::getArticleRevisions';
-
-	# Check parameters
-	#
-	if ( $wgWhitelistEdit || $wgWhitelistRead ) {
-		return new soap_fault('Client', 'SOAP not available in whitelist mode.');
-	}
-	if ( ! is_string( $pattern ) ) {
-		return new soap_fault('Client', 'The first parameter to this service must be a string');
-	}
-	if ( $main_only != 0 && $main_only != 1 ) {
-		return new soap_fault('Client', 'The second parameter to this service must be 0 or 1');
-	}
-	
-
-	# Connect to the DB
-	$dbr =& wfGetDB( DB_SLAVE );
-
-	# Normalize the search pattern
-	$pattern = $dbr->strencode( $wgLang->stripForSearch( $pattern ) );
-
-	# Prepare the query
-
-	$sql = 'SELECT cur_id, cur_namespace, cur_title FROM cur, searchindex WHERE '
-		. ( $main_only ? 'cur_namespace=0 AND ' :'' )
-		. "cur_id=si_page AND MATCH(si_title) AGAINST('{$pattern}' IN BOOLEAN MODE)";
-	
-	$res = $dbr->query( $sql, $fname, true );
-
-	if ( ! $res ) {
-		return new soap_fault( 'Server', $dbr->lastError() );
-	}
-
-	$answer = array(
-		'count' =>	0,
-		'base' =>	$wgServer.$wgArticlePath,
-		'hits' =>	array(),
-	);
-	while ( ($line = $dbr->fetchObject( $res )) && $answer['count'] < 200 ) {
-		$nt = Title::newFromDBkey( $wgLang->getNsText( $line->cur_namespace ) . ':' . $line->cur_title );
-		$answer['hits'][] = array(
-			'title' => $nt->getText(),
-			'title_ns' => $nt->getPrefixedText(),
-			'title_url' => $nt->getPartialURL(),
-			'namespace' => $line->cur_namespace
-		);
-		$answer['count']++;
-	}
-
-	return $answer;
-}
-
-# SOAP uses POST, if POST data is available, process it. Else produce an error.
-if ( isset( $HTTP_RAW_POST_DATA ) ) {
-	$s->service( $HTTP_RAW_POST_DATA );
-} else {
-	print( "You need a SOAP client to access SOAP services." );
-}
-
-?>
diff --git a/soap/nusoap.php b/soap/nusoap.php
deleted file mode 100644
index a973cf10dce7..000000000000
--- a/soap/nusoap.php
+++ /dev/null
@@ -1,5574 +0,0 @@
-<?php
-
-/*
-
-NuSOAP - Web Services Toolkit for PHP
-
-Copyright (c) 2002 NuSphere Corporation
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-If you have any questions or comments, please email:
-
-Dietrich Ayala
-dietrich@ganx4.com
-http://dietrich.ganx4.com/nusoap
-
-NuSphere Corporation
-http://www.nusphere.com
-
-*/
-
-/* load classes
-
-// necessary classes
-require_once('class.soapclient.php');
-require_once('class.soap_val.php');
-require_once('class.soap_parser.php');
-require_once('class.soap_fault.php');
-
-// transport classes
-require_once('class.soap_transport_http.php');
-
-// optional add-on classes
-require_once('class.xmlschema.php');
-require_once('class.wsdl.php');
-
-// server class
-require_once('class.soap_server.php');*/
-
-/**
-*
-* nusoap_base
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @access   public
-*/
-class nusoap_base {
-
-	var $title = 'NuSOAP';
-	var $version = '0.6.7';
-	var $revision = '1.1';
-	var $error_str = false;
-    var $debug_str = '';
-	// toggles automatic encoding of special characters as entities
-	// (should always be true, I think)
-	var $charencoding = true;
-
-    /**
-	*  set schema version
-	*
-	* @var      XMLSchemaVersion
-	* @access   public
-	*/
-	var $XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema';
-	
-    /**
-	*  set charset encoding for outgoing messages
-	*
-	* @var      soap_defencoding
-	* @access   public
-	*/
-	//var $soap_defencoding = 'UTF-8';
-    var $soap_defencoding = 'ISO-8859-1';
-
-	/**
-	*  load namespace uris into an array of uri => prefix
-	*
-	* @var      namespaces
-	* @access   public
-	*/
-	var $namespaces = array(
-		'SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',
-		'xsd' => 'http://www.w3.org/2001/XMLSchema',
-		'xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-		'SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/',
-		'si' => 'http://soapinterop.org/xsd');
-	var $usedNamespaces = array();
-
-	/**
-	* load types into typemap array
-	* is this legacy yet?
-	* no, this is used by the xmlschema class to verify type => namespace mappings.
-	* @var      typemap
-	* @access   public
-	*/
-	var $typemap = array(
-	'http://www.w3.org/2001/XMLSchema' => array(
-		'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',
-		'duration'=>'','dateTime'=>'string','time'=>'string','date'=>'string','gYearMonth'=>'',
-		'gYear'=>'','gMonthDay'=>'','gDay'=>'','gMonth'=>'','hexBinary'=>'string','base64Binary'=>'string',
-		// derived datatypes
-		'normalizedString'=>'string','token'=>'string','language'=>'','NMTOKEN'=>'','NMTOKENS'=>'','Name'=>'','NCName'=>'','ID'=>'',
-		'IDREF'=>'','IDREFS'=>'','ENTITY'=>'','ENTITIES'=>'','integer'=>'integer','nonPositiveInteger'=>'integer',
-		'negativeInteger'=>'integer','long'=>'integer','int'=>'integer','short'=>'integer','byte'=>'integer','nonNegativeInteger'=>'integer',
-		'unsignedLong'=>'','unsignedInt'=>'','unsignedShort'=>'','unsignedByte'=>'','positiveInteger'=>''),
-	'http://www.w3.org/1999/XMLSchema' => array(
-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',
-		'float'=>'double','dateTime'=>'string',
-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),
-	'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),
-	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),
-    'http://xml.apache.org/xml-soap' => array('Map')
-	);
-
-	/**
-	*  entities to convert
-	*
-	* @var      xmlEntities
-	* @access   public
-	*/
-	var $xmlEntities = array('quot' => '"','amp' => '&',
-		'lt' => '<','gt' => '>','apos' => "'");
-
-	/**
-	* adds debug data to the class level debug string
-	*
-	* @param    string $string debug data
-	* @access   private
-	*/
-	function debug($string){
-		$this->debug_str .= get_class($this).": $string\n";
-	}
-
-	/**
-	* expands entities, e.g. changes '<' to '&lt;'.
-	*
-	* @param	string	$val	The string in which to expand entities.
-	* @access	private
-	*/
-	function expandEntities($val) {
-		if ($this->charencoding) {
-	    	$val = str_replace('&', '&amp;', $val);
-	    	$val = str_replace("'", '&apos;', $val);
-	    	$val = str_replace('"', '&quot;', $val);
-	    	$val = str_replace('<', '&lt;', $val);
-	    	$val = str_replace('>', '&gt;', $val);
-	    }
-	    return $val;
-	}
-
-	/**
-	* returns error string if present
-	*
-	* @return   boolean $string error string
-	* @access   public
-	*/
-	function getError(){
-		if($this->error_str != ''){
-			return $this->error_str;
-		}
-		return false;
-	}
-
-	/**
-	* sets error string
-	*
-	* @return   boolean $string error string
-	* @access   private
-	*/
-	function setError($str){
-		$this->error_str = $str;
-	}
-
-	/**
-	* detect if array is a simple array or a struct (associative array)
-	*
-	* @param	$val	The PHP array
-	* @return	string	(arraySimple|arrayStruct)
-	* @access	private
-	*/
-	function isArraySimpleOrStruct($val) {
-        $keyList = array_keys($val);
-		foreach ($keyList as $keyListValue) {
-			if (!is_int($keyListValue)) {
-				return 'arrayStruct';
-			}
-		}
-		return 'arraySimple';
-	}
-
-	/**
-	* serializes PHP values in accordance w/ section 5. Type information is
-	* not serialized if $use == 'literal'.
-	*
-	* @return	string
-    * @access	public
-	*/
-	function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded'){
-    	if(is_object($val) && get_class($val) == 'soapval'){
-        	return $val->serialize($use);
-        }
-		$this->debug( "in serialize_val: $val, $name, $type, $name_ns, $type_ns, $attributes, $use");
-		// if no name, use item
-		$name = (!$name|| is_numeric($name)) ? 'soapVal' : $name;
-		// if name has ns, add ns prefix to name
-		$xmlns = '';
-        if($name_ns){
-			$prefix = 'nu'.rand(1000,9999);
-			$name = $prefix.':'.$name;
-			$xmlns .= " xmlns:$prefix=\"$name_ns\"";
-		}
-		// if type is prefixed, create type prefix
-		if($type_ns != '' && $type_ns == $this->namespaces['xsd']){
-			// need to fix this. shouldn't default to xsd if no ns specified
-		    // w/o checking against typemap
-			$type_prefix = 'xsd';
-		} elseif($type_ns){
-			$type_prefix = 'ns'.rand(1000,9999);
-			$xmlns .= " xmlns:$type_prefix=\"$type_ns\"";
-		}
-		// serialize attributes if present
-		$atts = '';
-		if($attributes){
-			foreach($attributes as $k => $v){
-				$atts .= " $k=\"$v\"";
-			}
-		}
-        // serialize if an xsd built-in primitive type
-        if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){
-        	if (is_bool($val)) {
-        		if ($type == 'boolean') {
-	        		$val = $val ? 'true' : 'false';
-	        	} elseif (! $val) {
-	        		$val = 0;
-	        	}
-			} else if (is_string($val)) {
-				$val = $this->expandEntities($val);
-			}
-			if ($use == 'literal') {
-	        	return "<$name$xmlns>$val</$name>";
-        	} else {
-	        	return "<$name$xmlns xsi:type=\"xsd:$type\">$val</$name>";
-        	}
-        }
-		// detect type and serialize
-		$xml = '';
-		switch(true) {
-			case ($type == '' && is_null($val)):
-				if ($use == 'literal') {
-					// TODO: depends on nillable
-					$xml .= "<$name$xmlns/>";
-				} else {
-					$xml .= "<$name$xmlns xsi:nil=\"true\"/>";
-				}
-				break;
-			case (is_bool($val) || $type == 'boolean'):
-        		if ($type == 'boolean') {
-	        		$val = $val ? 'true' : 'false';
-	        	} elseif (! $val) {
-	        		$val = 0;
-	        	}
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns $atts>$val</$name>";
-				} else {
-					$xml .= "<$name$xmlns xsi:type=\"xsd:boolean\"$atts>$val</$name>";
-				}
-				break;
-			case (is_int($val) || is_long($val) || $type == 'int'):
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns $atts>$val</$name>";
-				} else {
-					$xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";
-				}
-				break;
-			case (is_float($val)|| is_double($val) || $type == 'float'):
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns $atts>$val</$name>";
-				} else {
-					$xml .= "<$name$xmlns xsi:type=\"xsd:float\"$atts>$val</$name>";
-				}
-				break;
-			case (is_string($val) || $type == 'string'):
-				$val = $this->expandEntities($val);
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns $atts>$val</$name>";
-				} else {
-					$xml .= "<$name$xmlns xsi:type=\"xsd:string\"$atts>$val</$name>";
-				}
-				break;
-			case is_object($val):
-				$name = get_class($val);
-				foreach(get_object_vars($val) as $k => $v){
-					$pXml = isset($pXml) ? $pXml.$this->serialize_val($v,$k,false,false,false,false,$use) : $this->serialize_val($v,$k,false,false,false,false,$use);
-				}
-				$xml .= '<'.$name.'>'.$pXml.'</'.$name.'>';
-				break;
-			break;
-			case (is_array($val) || $type):
-				// detect if struct or array
-				$valueType = $this->isArraySimpleOrStruct($val);
-                if($valueType=='arraySimple' || ereg('^ArrayOf',$type)){
-					$i = 0;
-					if(is_array($val) && count($val)> 0){
-						foreach($val as $v){
-	                    	if(is_object($v) && get_class($v) ==  'soapval'){
-								$tt_ns = $v->type_ns;
-								$tt = $v->type;
-							} elseif (is_array($v)) {
-								$tt = $this->isArraySimpleOrStruct($v);
-							} else {
-								$tt = gettype($v);
-	                        }
-							$array_types[$tt] = 1;
-							$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);
-							++$i;
-						}
-						if(count($array_types) > 1){
-							$array_typename = 'xsd:ur-type';
-						} elseif(isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {
-							if ($tt == 'integer') {
-								$tt = 'int';
-							}
-							$array_typename = 'xsd:'.$tt;
-						} elseif(isset($tt) && $tt == 'arraySimple'){
-							$array_typename = 'SOAP-ENC:Array';
-						} elseif(isset($tt) && $tt == 'arrayStruct'){
-							$array_typename = 'unnamed_struct_use_soapval';
-						} else {
-							// if type is prefixed, create type prefix
-							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']){
-								 $array_typename = 'xsd:' . $tt;
-							} elseif ($tt_ns) {
-								$tt_prefix = 'ns' . rand(1000, 9999);
-								$array_typename = "$tt_prefix:$tt";
-								$xmlns .= " xmlns:$tt_prefix=\"$tt_ns\"";
-							} else {
-								$array_typename = $tt;
-							}
-						}
-						$array_type = $i;
-						if ($use == 'literal') {
-							$type_str = '';
-						} else if (isset($type) && isset($type_prefix)) {
-							$type_str = " xsi:type=\"$type_prefix:$type\"";
-						} else {
-							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"".$array_typename."[$array_type]\"";
-						}
-					// empty array
-					} else {
-						if ($use == 'literal') {
-							$type_str = '';
-						} else if (isset($type) && isset($type_prefix)) {
-							$type_str = " xsi:type=\"$type_prefix:$type\"";
-						} else {
-							$type_str = " xsi:type=\"SOAP-ENC:Array\"";
-						}
-					}
-					$xml = "<$name$xmlns$type_str$atts>".$xml."</$name>";
-				} else {
-					// got a struct
-					if(isset($type) && isset($type_prefix)){
-						$type_str = " xsi:type=\"$type_prefix:$type\"";
-					} else {
-						$type_str = '';
-					}
-					if ($use == 'literal') {
-						$xml .= "<$name$xmlns $atts>";
-					} else {
-						$xml .= "<$name$xmlns$type_str$atts>";
-					}
-					foreach($val as $k => $v){
-						// Apache Map
-						if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {
-							$xml .= '<item>';
-							$xml .= $this->serialize_val($k,'key',false,false,false,false,$use);
-							$xml .= $this->serialize_val($v,'value',false,false,false,false,$use);
-							$xml .= '</item>';
-						} else {
-							$xml .= $this->serialize_val($v,$k,false,false,false,false,$use);
-						}
-					}
-					$xml .= "</$name>";
-				}
-				break;
-			default:
-				$xml .= 'not detected, got '.gettype($val).' for '.$val;
-				break;
-		}
-		return $xml;
-	}
-
-    /**
-    * serialize message
-    *
-    * @param string body
-    * @param string headers optional
-    * @param array namespaces optional
-    * @param string style optional (rpc|document)
-    * @param string use optional (encoded|literal)
-    * @return string message
-    * @access public
-    */
-    function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded'){
-    // TODO: add an option to automatically run utf8_encode on $body and $headers
-    // if $this->soap_defencoding is UTF-8.  Not doing this automatically allows
-    // one to send arbitrary UTF-8 characters, not just characters that map to ISO-8859-1
-
-	// serialize namespaces
-    $ns_string = '';
-	foreach(array_merge($this->namespaces,$namespaces) as $k => $v){
-		$ns_string .= " xmlns:$k=\"$v\"";
-	}
-	if($style == 'rpc' && $use == 'encoded') {
-		$ns_string = ' SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"' . $ns_string;
-	}
-
-	// serialize headers
-	if($headers){
-		$headers = "<SOAP-ENV:Header>".$headers."</SOAP-ENV:Header>";
-	}
-	// serialize envelope
-	return
-	'<?xml version="1.0" encoding="'.$this->soap_defencoding .'"?'.">".
-	'<SOAP-ENV:Envelope'.$ns_string.">".
-	$headers.
-	"<SOAP-ENV:Body>".
-		$body.
-	"</SOAP-ENV:Body>".
-	"</SOAP-ENV:Envelope>";
-    }
-
-    function formatDump($str){
-		$str = htmlspecialchars($str);
-		return nl2br($str);
-    }
-
-	/**
-	* contracts a qualified name
-	*
-	* @param    string $string qname
-	* @return	string contracted qname
-	* @access   private
-	*/
-	function contractQname($qname){
-		// get element namespace
-		//$this->xdebug("Contract $qname");
-		if (strrpos($qname, ':')) {
-			// get unqualified name
-			$name = substr($qname, strrpos($qname, ':') + 1);
-			// get ns
-			$ns = substr($qname, 0, strrpos($qname, ':'));
-			$p = $this->getPrefixFromNamespace($ns);
-			if ($p) {
-				return $p . ':' . $name;
-			}
-			return $qname;
-		} else {
-			return $qname;
-		}
-	}
-
-	/**
-	* expands a qualified name
-	*
-	* @param    string $string qname
-	* @return	string expanded qname
-	* @access   private
-	*/
-	function expandQname($qname){
-		// get element prefix
-		if(strpos($qname,':') && !ereg('^http://',$qname)){
-			// get unqualified name
-			$name = substr(strstr($qname,':'),1);
-			// get ns prefix
-			$prefix = substr($qname,0,strpos($qname,':'));
-			if(isset($this->namespaces[$prefix])){
-				return $this->namespaces[$prefix].':'.$name;
-			} else {
-				return $qname;
-			}
-		} else {
-			return $qname;
-		}
-	}
-
-    /**
-    * returns the local part of a prefixed string
-    * returns the original string, if not prefixed
-    *
-    * @param string
-    * @return string
-    * @access public
-    */
-	function getLocalPart($str){
-		if($sstr = strrchr($str,':')){
-			// get unqualified name
-			return substr( $sstr, 1 );
-		} else {
-			return $str;
-		}
-	}
-
-	/**
-    * returns the prefix part of a prefixed string
-    * returns false, if not prefixed
-    *
-    * @param string
-    * @return mixed
-    * @access public
-    */
-	function getPrefix($str){
-		if($pos = strrpos($str,':')){
-			// get prefix
-			return substr($str,0,$pos);
-		}
-		return false;
-	}
-
-	/**
-    * pass it a prefix, it returns a namespace
-	* returns false if no namespace registered with the given prefix
-    *
-    * @param string
-    * @return mixed
-    * @access public
-    */
-	function getNamespaceFromPrefix($prefix){
-		if (isset($this->namespaces[$prefix])) {
-			return $this->namespaces[$prefix];
-		}
-		//$this->setError("No namespace registered for prefix '$prefix'");
-		return false;
-	}
-
-	/**
-    * returns the prefix for a given namespace (or prefix)
-    * or false if no prefixes registered for the given namespace
-    *
-    * @param string
-    * @return mixed
-    * @access public
-    */
-	function getPrefixFromNamespace($ns) {
-		foreach ($this->namespaces as $p => $n) {
-			if ($ns == $n || $ns == $p) {
-			    $this->usedNamespaces[$p] = $n;
-				return $p;
-			}
-		}
-		return false;
-	}
-
-    function varDump($data) {
-		ob_start();
-		var_dump($data);
-		$ret_val = ob_get_contents();
-		ob_end_clean();
-		return $ret_val;
-	}
-}
-
-// XML Schema Datatype Helper Functions
-
-//xsd:dateTime helpers
-
-/**
-* convert unix timestamp to ISO 8601 compliant date string
-*
-* @param    string $timestamp Unix time stamp
-* @access   public
-*/
-function timestamp_to_iso8601($timestamp,$utc=true){
-	$datestr = date('Y-m-d\TH:i:sO',$timestamp);
-	if($utc){
-		$eregStr =
-		'([0-9]{4})-'.	// centuries & years CCYY-
-		'([0-9]{2})-'.	// months MM-
-		'([0-9]{2})'.	// days DD
-		'T'.			// separator T
-		'([0-9]{2}):'.	// hours hh:
-		'([0-9]{2}):'.	// minutes mm:
-		'([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...
-		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'; // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
-
-		if(ereg($eregStr,$datestr,$regs)){
-			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);
-		}
-		return false;
-	} else {
-		return $datestr;
-	}
-}
-
-/**
-* convert ISO 8601 compliant date string to unix timestamp
-*
-* @param    string $datestr ISO 8601 compliant date string
-* @access   public
-*/
-function iso8601_to_timestamp($datestr){
-	$eregStr =
-	'([0-9]{4})-'.	// centuries & years CCYY-
-	'([0-9]{2})-'.	// months MM-
-	'([0-9]{2})'.	// days DD
-	'T'.			// separator T
-	'([0-9]{2}):'.	// hours hh:
-	'([0-9]{2}):'.	// minutes mm:
-	'([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...
-	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'; // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
-	if(ereg($eregStr,$datestr,$regs)){
-		// not utc
-		if($regs[8] != 'Z'){
-			$op = substr($regs[8],0,1);
-			$h = substr($regs[8],1,2);
-			$m = substr($regs[8],strlen($regs[8])-2,2);
-			if($op == '-'){
-				$regs[4] = $regs[4] + $h;
-				$regs[5] = $regs[5] + $m;
-			} elseif($op == '+'){
-				$regs[4] = $regs[4] - $h;
-				$regs[5] = $regs[5] - $m;
-			}
-		}
-		return strtotime("$regs[1]-$regs[2]-$regs[3] $regs[4]:$regs[5]:$regs[6]Z");
-	} else {
-		return false;
-	}
-}
-
-function usleepWindows($usec)
-{
-	$start = gettimeofday();
-	
-	do
-	{
-		$stop = gettimeofday();
-		$timePassed = 1000000 * ($stop['sec'] - $start['sec'])
-		+ $stop['usec'] - $start['usec'];
-	}
-	while ($timePassed < $usec);
-}
-
-?><?php
-
-
-
-/**
-* soap_fault class, allows for creation of faults
-* mainly used for returning faults from deployed functions
-* in a server instance.
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @access public
-*/
-class soap_fault extends nusoap_base {
-
-	var $faultcode;
-	var $faultactor;
-	var $faultstring;
-	var $faultdetail;
-
-	/**
-	* constructor
-    *
-    * @param string $faultcode (client | server)
-    * @param string $faultactor only used when msg routed between multiple actors
-    * @param string $faultstring human readable error message
-    * @param string $faultdetail
-	*/
-	function soap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
-		$this->faultcode = $faultcode;
-		$this->faultactor = $faultactor;
-		$this->faultstring = $faultstring;
-		$this->faultdetail = $faultdetail;
-	}
-
-	/**
-	* serialize a fault
-	*
-	* @access   public
-	*/
-	function serialize(){
-		$ns_string = '';
-		foreach($this->namespaces as $k => $v){
-			$ns_string .= "\n  xmlns:$k=\"$v\"";
-		}
-		$return_msg =
-			'<?xml version="1.0" encoding="'.$this->soap_defencoding.'"?>'.
-			'<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"'.$ns_string.">\n".
-				'<SOAP-ENV:Body>'.
-				'<SOAP-ENV:Fault>'.
-					'<faultcode>'.$this->expandEntities($this->faultcode).'</faultcode>'.
-					'<faultactor>'.$this->expandEntities($this->faultactor).'</faultactor>'.
-					'<faultstring>'.$this->expandEntities($this->faultstring).'</faultstring>'.
-					'<detail>'.$this->serialize_val($this->faultdetail).'</detail>'.
-				'</SOAP-ENV:Fault>'.
-				'</SOAP-ENV:Body>'.
-			'</SOAP-ENV:Envelope>';
-		return $return_msg;
-	}
-}
-
-
-
-?><?php
-
-
-
-/**
-* parses an XML Schema, allows access to it's data, other utility methods
-* no validation... yet.
-* very experimental and limited. As is discussed on XML-DEV, I'm one of the people
-* that just doesn't have time to read the spec(s) thoroughly, and just have a couple of trusty
-* tutorials I refer to :)
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @access   public
-*/
-class XMLSchema extends nusoap_base  {
-	
-	// files
-	var $schema = '';
-	var $xml = '';
-	// namespaces
-	var $enclosingNamespaces;
-	// schema info
-	var $schemaInfo = array();
-	var $schemaTargetNamespace = '';
-	// types, elements, attributes defined by the schema
-	var $attributes = array();
-	var $complexTypes = array();
-	var $currentComplexType = false;
-	var $elements = array();
-	var $currentElement = false;
-	var $simpleTypes = array();
-	var $currentSimpleType = false;
-	// imports
-	var $imports = array();
-	// parser vars
-	var $parser;
-	var $position = 0;
-	var $depth = 0;
-	var $depth_array = array();
-	var $message = array();
-	var $defaultNamespace = array();
-    
-	/**
-	* constructor
-	*
-	* @param    string $schema schema document URI
-	* @param    string $xml xml document URI
-	* @param	string $namespaces namespaces defined in enclosing XML
-	* @access   public
-	*/
-	function XMLSchema($schema='',$xml='',$namespaces=array()){
-
-		$this->debug('xmlschema class instantiated, inside constructor');
-		// files
-		$this->schema = $schema;
-		$this->xml = $xml;
-
-		// namespaces
-		$this->enclosingNamespaces = $namespaces;
-		$this->namespaces = array_merge($this->namespaces, $namespaces);
-
-		// parse schema file
-		if($schema != ''){
-			$this->debug('initial schema file: '.$schema);
-			$this->parseFile($schema, 'schema');
-		}
-
-		// parse xml file
-		if($xml != ''){
-			$this->debug('initial xml file: '.$xml);
-			$this->parseFile($xml, 'xml');
-		}
-
-	}
-
-    /**
-    * parse an XML file
-    *
-    * @param string $xml, path/URL to XML file
-    * @param string $type, (schema | xml)
-	* @return boolean
-    * @access public
-    */
-	function parseFile($xml,$type){
-		// parse xml file
-		if($xml != ""){
-			$xmlStr = @join("",@file($xml));
-			if($xmlStr == ""){
-				$msg = 'Error reading XML from '.$xml;
-				$this->setError($msg);
-				$this->debug($msg);
-			return false;
-			} else {
-				$this->debug("parsing $xml");
-				$this->parseString($xmlStr,$type);
-				$this->debug("done parsing $xml");
-			return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* parse an XML string
-	*
-	* @param    string $xml path or URL
-    * @param string $type, (schema|xml)
-	* @access   private
-	*/
-	function parseString($xml,$type){
-		// parse xml string
-		if($xml != ""){
-
-	    	// Create an XML parser.
-	    	$this->parser = xml_parser_create();
-	    	// Set the options for parsing the XML data.
-	    	xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
-
-	    	// Set the object for the parser.
-	    	xml_set_object($this->parser, $this);
-
-	    	// Set the element handlers for the parser.
-			if($type == "schema"){
-		    	xml_set_element_handler($this->parser, 'schemaStartElement','schemaEndElement');
-		    	xml_set_character_data_handler($this->parser,'schemaCharacterData');
-			} elseif($type == "xml"){
-				xml_set_element_handler($this->parser, 'xmlStartElement','xmlEndElement');
-		    	xml_set_character_data_handler($this->parser,'xmlCharacterData');
-			}
-
-		    // Parse the XML file.
-		    if(!xml_parse($this->parser,$xml,true)){
-			// Display an error message.
-				$errstr = sprintf('XML error parsing XML schema on line %d: %s',
-				xml_get_current_line_number($this->parser),
-				xml_error_string(xml_get_error_code($this->parser))
-				);
-				$this->debug($errstr);
-				$this->debug("XML payload:\n" . $xml);
-				$this->setError($errstr);
-	    	}
-            
-			xml_parser_free($this->parser);
-		} else{
-			$this->debug('no xml passed to parseString()!!');
-			$this->setError('no xml passed to parseString()!!');
-		}
-	}
-
-	/**
-	* start-element handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $name element name
-	* @param    string $attrs associative array of attributes
-	* @access   private
-	*/
-	function schemaStartElement($parser, $name, $attrs) {
-		
-		// position in the total number of elements, starting from 0
-		$pos = $this->position++;
-		$depth = $this->depth++;
-		// set self as current value for this depth
-		$this->depth_array[$depth] = $pos;
-		$this->message[$pos] = array('cdata' => ''); 
-		if ($depth > 0) {
-			$this->defaultNamespace[$pos] = $this->defaultNamespace[$this->depth_array[$depth - 1]];
-		} else {
-			$this->defaultNamespace[$pos] = false;
-		}
-
-		// get element prefix
-		if($prefix = $this->getPrefix($name)){
-			// get unqualified name
-			$name = $this->getLocalPart($name);
-		} else {
-        	$prefix = '';
-        }
-		
-        // loop thru attributes, expanding, and registering namespace declarations
-        if(count($attrs) > 0){
-        	foreach($attrs as $k => $v){
-                // if ns declarations, add to class level array of valid namespaces
-				if(ereg("^xmlns",$k)){
-                	//$this->xdebug("$k: $v");
-                	//$this->xdebug('ns_prefix: '.$this->getPrefix($k));
-                	if($ns_prefix = substr(strrchr($k,':'),1)){
-                		//$this->xdebug("Add namespace[$ns_prefix] = $v");
-						$this->namespaces[$ns_prefix] = $v;
-					} else {
-						$this->defaultNamespace[$pos] = $v;
-						if (! $this->getPrefixFromNamespace($v)) {
-							$this->namespaces['ns'.(count($this->namespaces)+1)] = $v;
-						}
-					}
-					if($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema'){
-						$this->XMLSchemaVersion = $v;
-						$this->namespaces['xsi'] = $v.'-instance';
-					}
-				}
-        	}
-        	foreach($attrs as $k => $v){
-                // expand each attribute
-                $k = strpos($k,':') ? $this->expandQname($k) : $k;
-                $v = strpos($v,':') ? $this->expandQname($v) : $v;
-        		$eAttrs[$k] = $v;
-        	}
-        	$attrs = $eAttrs;
-        } else {
-        	$attrs = array();
-        }
-		// find status, register data
-		switch($name){
-			case 'all':
-			case 'choice':
-			case 'sequence':
-				//$this->xdebug("compositor $name for currentComplexType: $this->currentComplexType and currentElement: $this->currentElement");
-				$this->complexTypes[$this->currentComplexType]['compositor'] = $name;
-				if($name == 'all' || $name == 'sequence'){
-					$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';
-				}
-			break;
-			case 'attribute':
-            	//$this->xdebug("parsing attribute $attrs[name] $attrs[ref] of value: ".$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']);
-            	$this->xdebug("parsing attribute " . $this->varDump($attrs));
-            	if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
-					$v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-					if (!strpos($v, ':')) {
-						// no namespace in arrayType attribute value...
-						if ($this->defaultNamespace[$pos]) {
-							// ...so use the default
-							$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'] = $this->defaultNamespace[$pos] . ':' . $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-						}
-					}
-            	}
-                if(isset($attrs['name'])){
-					$this->attributes[$attrs['name']] = $attrs;
-					$aname = $attrs['name'];
-				} elseif(isset($attrs['ref']) && $attrs['ref'] == 'http://schemas.xmlsoap.org/soap/encoding/:arrayType'){
-					if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
-	                	$aname = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-	                } else {
-	                	$aname = '';
-	                }
-				} elseif(isset($attrs['ref'])){
-					$aname = $attrs['ref'];
-                    $this->attributes[$attrs['ref']] = $attrs;
-				}
-                
-				if(isset($this->currentComplexType)){
-					$this->complexTypes[$this->currentComplexType]['attrs'][$aname] = $attrs;
-				} elseif(isset($this->currentElement)){
-					$this->elements[$this->currentElement]['attrs'][$aname] = $attrs;
-				}
-				// arrayType attribute
-				if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']) || $this->getLocalPart($aname) == 'arrayType'){
-					$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-                	$prefix = $this->getPrefix($aname);
-					if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])){
-						$v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-					} else {
-						$v = '';
-					}
-                    if(strpos($v,'[,]')){
-                        $this->complexTypes[$this->currentComplexType]['multidimensional'] = true;
-                    }
-                    $v = substr($v,0,strpos($v,'[')); // clip the []
-                    if(!strpos($v,':') && isset($this->typemap[$this->XMLSchemaVersion][$v])){
-                        $v = $this->XMLSchemaVersion.':'.$v;
-                    }
-                    $this->complexTypes[$this->currentComplexType]['arrayType'] = $v;
-				}
-			break;
-			case 'complexType':
-				if(isset($attrs['name'])){
-					$this->xdebug('processing named complexType '.$attrs['name']);
-					$this->currentElement = false;
-					$this->currentComplexType = $attrs['name'];
-					$this->complexTypes[$this->currentComplexType] = $attrs;
-					$this->complexTypes[$this->currentComplexType]['typeClass'] = 'complexType';
-					if(isset($attrs['base']) && ereg(':Array$',$attrs['base'])){
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-					} else {
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';
-					}
-				}else{
-					$this->xdebug('processing unnamed complexType for element '.$this->currentElement);
-					$this->currentComplexType = $this->currentElement . '_ContainedType';
-					$this->currentElement = false;
-					$this->complexTypes[$this->currentComplexType] = $attrs;
-					$this->complexTypes[$this->currentComplexType]['typeClass'] = 'complexType';
-					if(isset($attrs['base']) && ereg(':Array$',$attrs['base'])){
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-					} else {
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';
-					}
-				}
-			break;
-			case 'element':
-				// elements defined as part of a complex type should
-				// not really be added to $this->elements, but for some
-				// reason, they are
-				if(isset($attrs['type'])){
-					$this->xdebug("processing typed element ".$attrs['name']." of type ".$attrs['type']);
-					$this->currentElement = $attrs['name'];
-					$this->elements[ $attrs['name'] ] = $attrs;
-					$this->elements[ $attrs['name'] ]['typeClass'] = 'element';
-					if (!isset($this->elements[ $attrs['name'] ]['form'])) {
-						$this->elements[ $attrs['name'] ]['form'] = $this->schemaInfo['elementFormDefault'];
-					}
-					$ename = $attrs['name'];
-				} elseif(isset($attrs['ref'])){
-					$ename = $attrs['ref'];
-				} else {
-					$this->xdebug("processing untyped element ".$attrs['name']);
-					$this->currentElement = $attrs['name'];
-					$this->elements[ $attrs['name'] ] = $attrs;
-					$this->elements[ $attrs['name'] ]['typeClass'] = 'element';
-					$this->elements[ $attrs['name'] ]['type'] = $this->schemaTargetNamespace . ':' . $attrs['name'] . '_ContainedType';
-					if (!isset($this->elements[ $attrs['name'] ]['form'])) {
-						$this->elements[ $attrs['name'] ]['form'] = $this->schemaInfo['elementFormDefault'];
-					}
-				}
-				if(isset($ename) && $this->currentComplexType){
-					$this->complexTypes[$this->currentComplexType]['elements'][$ename] = $attrs;
-				}
-			break;
-			// we ignore enumeration values
-			//case 'enumeration':
-			//break;
-			case 'import':
-			    if (isset($attrs['schemaLocation'])) {
-					//$this->xdebug('import namespace ' . $attrs['namespace'] . ' from ' . $attrs['schemaLocation']);
-                    $this->imports[$attrs['namespace']][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);
-				} else {
-					//$this->xdebug('import namespace ' . $attrs['namespace']);
-                    $this->imports[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
-					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {
-						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];
-					}
-				}
-			break;
-			case 'restriction':
-				//$this->xdebug("in restriction for currentComplexType: $this->currentComplexType and currentElement: $this->currentElement");
-				if($this->currentElement){
-					$this->elements[$this->currentElement]['type'] = $attrs['base'];
-				} elseif($this->currentSimpleType){
-					$this->simpleTypes[$this->currentSimpleType]['type'] = $attrs['base'];
-				} elseif($this->currentComplexType){
-					$this->complexTypes[$this->currentComplexType]['restrictionBase'] = $attrs['base'];
-					if(strstr($attrs['base'],':') == ':Array'){
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-					}
-				}
-			break;
-			case 'schema':
-				$this->schemaInfo = $attrs;
-				$this->schemaInfo['schemaVersion'] = $this->getNamespaceFromPrefix($prefix);
-				if (isset($attrs['targetNamespace'])) {
-					$this->schemaTargetNamespace = $attrs['targetNamespace'];
-				}
-				if (!isset($attrs['elementFormDefault'])) {
-					$this->schemaInfo['elementFormDefault'] = 'unqualified';
-				}
-			break;
-			case 'simpleType':
-				if(isset($attrs['name'])){
-					$this->xdebug("processing simpleType for name " . $attrs['name']);
-					$this->currentSimpleType = $attrs['name'];
-					$this->simpleTypes[ $attrs['name'] ] = $attrs;
-					$this->simpleTypes[ $attrs['name'] ]['typeClass'] = 'simpleType';
-					$this->simpleTypes[ $attrs['name'] ]['phpType'] = 'scalar';
-				} else {
-					//echo 'not parsing: '.$name;
-					//var_dump($attrs);
-				}
-			break;
-			default:
-				//$this->xdebug("do not have anything to do for element $name");
-		}
-	}
-
-	/**
-	* end-element handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $name element name
-	* @access   private
-	*/
-	function schemaEndElement($parser, $name) {
-		// bring depth down a notch
-		$this->depth--;
-		// position of current element is equal to the last value left in depth_array for my depth
-		if(isset($this->depth_array[$this->depth])){
-        	$pos = $this->depth_array[$this->depth];
-        }
-		// move on...
-		if($name == 'complexType'){
-			$this->currentComplexType = false;
-			$this->currentElement = false;
-		}
-		if($name == 'element'){
-			$this->currentElement = false;
-		}
-		if($name == 'simpleType'){
-			$this->currentSimpleType = false;
-		}
-	}
-
-	/**
-	* element content handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $data element content
-	* @access   private
-	*/
-	function schemaCharacterData($parser, $data){
-		$pos = $this->depth_array[$this->depth - 1];
-		$this->message[$pos]['cdata'] .= $data;
-	}
-
-	/**
-	* serialize the schema
-	*
-	* @access   public
-	*/
-	function serializeSchema(){
-
-		$schemaPrefix = $this->getPrefixFromNamespace($this->XMLSchemaVersion);
-		$xml = '';
-		// imports
-		if (sizeof($this->imports) > 0) {
-			foreach($this->imports as $ns => $list) {
-				foreach ($list as $ii) {
-					if ($ii['location'] != '') {
-						$xml .= " <$schemaPrefix:import location=\"" . $ii['location'] . '" namespace="' . $ns . "\" />\n";
-					} else {
-						$xml .= " <$schemaPrefix:import namespace=\"" . $ns . "\" />\n";
-					}
-				}
-			} 
-		} 
-		// complex types
-		foreach($this->complexTypes as $typeName => $attrs){
-			$contentStr = '';
-			// serialize child elements
-			if(isset($attrs['elements']) && (count($attrs['elements']) > 0)){
-				foreach($attrs['elements'] as $element => $eParts){
-					if(isset($eParts['ref'])){
-						$contentStr .= "   <$schemaPrefix:element ref=\"$element\"/>\n";
-					} else {
-						$contentStr .= "   <$schemaPrefix:element name=\"$element\" type=\"" . $this->contractQName($eParts['type']) . "\"/>\n";
-					}
-				}
-			}
-			// attributes
-			if(isset($attrs['attrs']) && (count($attrs['attrs']) >= 1)){
-				foreach($attrs['attrs'] as $attr => $aParts){
-					$contentStr .= "    <$schemaPrefix:attribute ref=\"".$this->contractQName($aParts['ref']).'"';
-					if(isset($aParts['http://schemas.xmlsoap.org/wsdl/:arrayType'])){
-						$this->usedNamespaces['wsdl'] = $this->namespaces['wsdl'];
-						$contentStr .= ' wsdl:arrayType="'.$this->contractQName($aParts['http://schemas.xmlsoap.org/wsdl/:arrayType']).'"';
-					}
-					$contentStr .= "/>\n";
-				}
-			}
-			// if restriction
-			if( isset($attrs['restrictionBase']) && $attrs['restrictionBase'] != ''){
-				$contentStr = "   <$schemaPrefix:restriction base=\"".$this->contractQName($attrs['restrictionBase'])."\">\n".$contentStr."   </$schemaPrefix:restriction>\n";
-			}
-			// compositor obviates complex/simple content
-			if(isset($attrs['compositor']) && ($attrs['compositor'] != '')){
-				$contentStr = "  <$schemaPrefix:$attrs[compositor]>\n".$contentStr."  </$schemaPrefix:$attrs[compositor]>\n";
-			}
-			// complex or simple content
-			elseif((isset($attrs['elements']) && count($attrs['elements']) > 0) || (isset($attrs['attrs']) && count($attrs['attrs']) > 0)){
-				$contentStr = "  <$schemaPrefix:complexContent>\n".$contentStr."  </$schemaPrefix:complexContent>\n";
-			}
-			// finalize complex type
-			if($contentStr != ''){
-				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\">\n".$contentStr." </$schemaPrefix:complexType>\n";
-			} else {
-				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\"/>\n";
-			}
-			$xml .= $contentStr;
-		}
-		// simple types
-		if(isset($this->simpleTypes) && count($this->simpleTypes) > 0){
-			foreach($this->simpleTypes as $typeName => $attr){
-				$xml .= " <$schemaPrefix:simpleType name=\"$typeName\">\n  <restriction base=\"".$this->contractQName($eParts['type'])."\"/>\n </$schemaPrefix:simpleType>";
-			}
-		}
-		// elements
-		if(isset($this->elements) && count($this->elements) > 0){
-			foreach($this->elements as $element => $eParts){
-				$xml .= " <$schemaPrefix:element name=\"$element\" type=\"".$this->contractQName($eParts['type'])."\"/>\n";
-			}
-		}
-		// attributes
-		if(isset($this->attributes) && count($this->attributes) > 0){
-			foreach($this->attributes as $attr => $aParts){
-				$xml .= " <$schemaPrefix:attribute name=\"$attr\" type=\"".$this->contractQName($aParts['type'])."\"\n/>";
-			}
-		}
-		// finish 'er up
-		$el = "<$schemaPrefix:schema targetNamespace=\"$this->schemaTargetNamespace\"\n";
-		foreach (array_diff($this->usedNamespaces, $this->enclosingNamespaces) as $nsp => $ns) {
-			$el .= " xmlns:$nsp=\"$ns\"\n";
-		}
-		$xml = $el . ">\n".$xml."</$schemaPrefix:schema>\n";
-		return $xml;
-	}
-
-	/**
-	* adds debug data to the clas level debug string
-	*
-	* @param    string $string debug data
-	* @access   private
-	*/
-	function xdebug($string){
-		$this->debug('<' . $this->schemaTargetNamespace . '> '.$string);
-	}
-
-    /**
-    * get the PHP type of a user defined type in the schema
-    * PHP type is kind of a misnomer since it actually returns 'struct' for assoc. arrays
-    * returns false if no type exists, or not w/ the given namespace
-    * else returns a string that is either a native php type, or 'struct'
-    *
-    * @param string $type, name of defined type
-    * @param string $ns, namespace of type
-    * @return mixed
-    * @access public
-    */
-	function getPHPType($type,$ns){
-		if(isset($this->typemap[$ns][$type])){
-			//print "found type '$type' and ns $ns in typemap<br>";
-			return $this->typemap[$ns][$type];
-		} elseif(isset($this->complexTypes[$type])){
-			//print "getting type '$type' and ns $ns from complexTypes array<br>";
-			return $this->complexTypes[$type]['phpType'];
-		}
-		return false;
-	}
-
-	/**
-    * returns an array of information about a given type
-    * returns false if no type exists by the given name
-    *
-	*	 typeDef = array(
-	*	 'elements' => array(), // refs to elements array
-	*	'restrictionBase' => '',
-	*	'phpType' => '',
-	*	'order' => '(sequence|all)',
-	*	'attrs' => array() // refs to attributes array
-	*	)
-    *
-    * @param string
-    * @return mixed
-    * @access public
-    */
-	function getTypeDef($type){
-		//$this->debug("in getTypeDef for type $type");
-		if(isset($this->complexTypes[$type])){
-			$this->xdebug("in getTypeDef, found complexType $type");
-			return $this->complexTypes[$type];
-		} elseif(isset($this->simpleTypes[$type])){
-			$this->xdebug("in getTypeDef, found simpleType $type");
-			if (!isset($this->simpleTypes[$type]['phpType'])) {
-				// get info for type to tack onto the simple type
-				// TODO: can this ever really apply (i.e. what is a simpleType really?)
-				$uqType = substr($this->simpleTypes[$type]['type'], strrpos($this->simpleTypes[$type]['type'], ':') + 1);
-				$ns = substr($this->simpleTypes[$type]['type'], 0, strrpos($this->simpleTypes[$type]['type'], ':'));
-				$etype = $this->getTypeDef($uqType);
-				if ($etype) {
-					if (isset($etype['phpType'])) {
-						$this->simpleTypes[$type]['phpType'] = $etype['phpType'];
-					}
-					if (isset($etype['elements'])) {
-						$this->simpleTypes[$type]['elements'] = $etype['elements'];
-					}
-				}
-			}
-			return $this->simpleTypes[$type];
-		} elseif(isset($this->elements[$type])){
-			$this->xdebug("in getTypeDef, found element $type");
-			if (!isset($this->elements[$type]['phpType'])) {
-				// get info for type to tack onto the element
-				$uqType = substr($this->elements[$type]['type'], strrpos($this->elements[$type]['type'], ':') + 1);
-				$ns = substr($this->elements[$type]['type'], 0, strrpos($this->elements[$type]['type'], ':'));
-				$etype = $this->getTypeDef($uqType);
-				if ($etype) {
-					if (isset($etype['phpType'])) {
-						$this->elements[$type]['phpType'] = $etype['phpType'];
-					}
-					if (isset($etype['elements'])) {
-						$this->elements[$type]['elements'] = $etype['elements'];
-					}
-				} elseif ($ns == 'http://www.w3.org/2001/XMLSchema') {
-					$this->elements[$type]['phpType'] = 'scalar';
-				}
-			}
-			return $this->elements[$type];
-		} elseif(isset($this->attributes[$type])){
-			$this->xdebug("in getTypeDef, found attribute $type");
-			return $this->attributes[$type];
-		}
-		$this->xdebug("in getTypeDef, did not find $type");
-		return false;
-	}
-
-	/**
-    * returns a sample serialization of a given type, or false if no type by the given name
-    *
-    * @param string $type, name of type
-    * @return mixed
-    * @access public
-    */
-    function serializeTypeDef($type){
-    	//print "in sTD() for type $type<br>";
-	if($typeDef = $this->getTypeDef($type)){
-		$str .= '<'.$type;
-	    if(is_array($typeDef['attrs'])){
-		foreach($attrs as $attName => $data){
-		    $str .= " $attName=\"{type = ".$data['type']."}\"";
-		}
-	    }
-	    $str .= " xmlns=\"".$this->schema['targetNamespace']."\"";
-	    if(count($typeDef['elements']) > 0){
-		$str .= ">";
-		foreach($typeDef['elements'] as $element => $eData){
-		    $str .= $this->serializeTypeDef($element);
-		}
-		$str .= "</$type>";
-	    } elseif($typeDef['typeClass'] == 'element') {
-		$str .= "></$type>";
-	    } else {
-		$str .= "/>";
-	    }
-			return $str;
-	}
-    	return false;
-    }
-
-    /**
-    * returns HTML form elements that allow a user
-    * to enter values for creating an instance of the given type.
-    *
-    * @param string $name, name for type instance
-    * @param string $type, name of type
-    * @return string
-    * @access public
-	*/
-	function typeToForm($name,$type){
-		// get typedef
-		if($typeDef = $this->getTypeDef($type)){
-			// if struct
-			if($typeDef['phpType'] == 'struct'){
-				$buffer .= '<table>';
-				foreach($typeDef['elements'] as $child => $childDef){
-					$buffer .= "
-					<tr><td align='right'>$childDef[name] (type: ".$this->getLocalPart($childDef['type'])."):</td>
-					<td><input type='text' name='parameters[".$name."][$childDef[name]]'></td></tr>";
-				}
-				$buffer .= '</table>';
-			// if array
-			} elseif($typeDef['phpType'] == 'array'){
-				$buffer .= '<table>';
-				for($i=0;$i < 3; $i++){
-					$buffer .= "
-					<tr><td align='right'>array item (type: $typeDef[arrayType]):</td>
-					<td><input type='text' name='parameters[".$name."][]'></td></tr>";
-				}
-				$buffer .= '</table>';
-			// if scalar
-			} else {
-				$buffer .= "<input type='text' name='parameters[$name]'>";
-			}
-		} else {
-			$buffer .= "<input type='text' name='parameters[$name]'>";
-		}
-		return $buffer;
-	}
-	
-	/**
-	* adds a complex type to the schema
-	* 
-	* example: array
-	* 
-	* addType(
-	* 	'ArrayOfstring',
-	* 	'complexType',
-	* 	'array',
-	* 	'',
-	* 	'SOAP-ENC:Array',
-	* 	array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'string[]'),
-	* 	'xsd:string'
-	* );
-	* 
-	* example: PHP associative array ( SOAP Struct )
-	* 
-	* addType(
-	* 	'SOAPStruct',
-	* 	'complexType',
-	* 	'struct',
-	* 	'all',
-	* 	array('myVar'=> array('name'=>'myVar','type'=>'string')
-	* );
-	* 
-	* @param name
-	* @param typeClass (complexType|simpleType|attribute)
-	* @param phpType: currently supported are array and struct (php assoc array)
-	* @param compositor (all|sequence|choice)
-	* @param restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param elements = array ( name = array(name=>'',type=>'') )
-	* @param attrs = array(
-	* 	array(
-	*		'ref' => "http://schemas.xmlsoap.org/soap/encoding/:arrayType",
-	*		"http://schemas.xmlsoap.org/wsdl/:arrayType" => "string[]"
-	* 	)
-	* )
-	* @param arrayType: namespace:name (http://www.w3.org/2001/XMLSchema:string)
-	*
-	*/
-	function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType=''){
-		$this->complexTypes[$name] = array(
-	    'name'		=> $name,
-	    'typeClass'	=> $typeClass,
-	    'phpType'	=> $phpType,
-		'compositor'=> $compositor,
-	    'restrictionBase' => $restrictionBase,
-		'elements'	=> $elements,
-	    'attrs'		=> $attrs,
-	    'arrayType'	=> $arrayType
-		);
-		
-		$this->xdebug("addComplexType $name: " . $this->varDump($this->complexTypes[$name]));
-	}
-	
-	/**
-	* adds a simple type to the schema
-	*
-	* @param name
-	* @param restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param typeClass (simpleType)
-	* @param phpType: (scalar)
-	* @see xmlschema
-	* 
-	*/
-	function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar') {
-		$this->simpleTypes[$name] = array(
-	    'name'		=> $name,
-	    'typeClass'	=> $typeClass,
-	    'phpType'	=> $phpType,
-	    'type' => $restrictionBase
-		);
-		
-		$this->xdebug("addSimpleType $name: " . $this->varDump($this->simpleTypes[$name]));
-	}
-}
-
-
-
-?><?php
-
-
-
-/**
-* for creating serializable abstractions of native PHP types
-* NOTE: this is only really used when WSDL is not available.
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @access   public
-*/
-class soapval extends nusoap_base {
-	/**
-	* constructor
-	*
-	* @param    string $name optional name
-	* @param    string $type optional type name
-	* @param	mixed $value optional value
-	* @param	string $namespace optional namespace of value
-	* @param	string $type_namespace optional namespace of type
-	* @param	array $attributes associative array of attributes to add to element serialization
-	* @access   public
-	*/
-  	function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
-		$this->name = $name;
-		$this->value = $value;
-		$this->type = $type;
-		$this->element_ns = $element_ns;
-		$this->type_ns = $type_ns;
-		$this->attributes = $attributes;
-    }
-
-	/**
-	* return serialized value
-	*
-	* @return	string XML data
-	* @access   private
-	*/
-	function serialize($use='encoded') {
-		return $this->serialize_val($this->value,$this->name,$this->type,$this->element_ns,$this->type_ns,$this->attributes,$use);
-    }
-
-	/**
-	* decodes a soapval object into a PHP native type
-	*
-	* @param	object $soapval optional SOAPx4 soapval object, else uses self
-	* @return	mixed
-	* @access   public
-	*/
-	function decode(){
-		return $this->value;
-	}
-}
-
-
-
-?><?php
-
-
-
-/**
-* transport class for sending/receiving data via HTTP and HTTPS
-* NOTE: PHP must be compiled with the CURL extension for HTTPS support
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @access public
-*/
-class soap_transport_http extends nusoap_base {
-
-	var $url = '';
-	var $uri = '';
-	var $scheme = '';
-	var $host = '';
-	var $port = '';
-	var $path = '';
-	var $request_method = 'POST';
-	var $protocol_version = '1.0';
-	var $encoding = '';
-	var $outgoing_headers = array();
-	var $incoming_headers = array();
-	var $outgoing_payload = '';
-	var $incoming_payload = '';
-	var $useSOAPAction = true;
-	var $persistentConnection = false;
-	var $ch = false;	// cURL handle
-	var $username;
-	var $password;
-	
-	/**
-	* constructor
-	*/
-	function soap_transport_http($url){
-		$this->url = $url;
-		
-		$u = parse_url($url);
-		foreach($u as $k => $v){
-			$this->debug("$k = $v");
-			$this->$k = $v;
-		}
-		
-		// add any GET params to path
-		if(isset($u['query']) && $u['query'] != ''){
-            $this->path .= '?' . $u['query'];
-		}
-		
-		// set default port
-		if(!isset($u['port'])){
-			if($u['scheme'] == 'https'){
-				$this->port = 443;
-			} else {
-				$this->port = 80;
-			}
-		}
-		
-		$this->uri = $this->path;
-		
-		// build headers
-		ereg('\$Revisio' . 'n: ([^ ]+)', $this->revision, $rev);
-		$this->outgoing_headers['User-Agent'] = $this->title.'/'.$this->version.' ('.$rev[1].')';
-		if (!isset($u['port'])) {
-			$this->outgoing_headers['Host'] = $this->host;
-		} else {
-			$this->outgoing_headers['Host'] = $this->host.':'.$this->port;
-		}
-		
-		if (isset($u['user']) && $u['user'] != '') {
-			$this->setCredentials($u['user'], isset($u['pass']) ? $u['pass'] : '');
-		}
-	}
-	
-	function connect($connection_timeout=0,$response_timeout=30){
-	  	// For PHP 4.3 with OpenSSL, change https scheme to ssl, then treat like
-	  	// "regular" socket.
-	  	// TODO: disabled for now because OpenSSL must be *compiled* in (not just
-	  	//       loaded), and until PHP5 stream_get_wrappers is not available.
-//	  	if ($this->scheme == 'https') {
-//		  	if (version_compare(phpversion(), '4.3.0') >= 0) {
-//		  		if (extension_loaded('openssl')) {
-//		  			$this->scheme = 'ssl';
-//		  			$this->debug('Using SSL over OpenSSL');
-//		  		}
-//		  	}
-//		}
-		$this->debug("connect connection_timeout $connection_timeout, response_timeout $response_timeout, scheme $this->scheme, host $this->host, port $this->port");
-	  if ($this->scheme == 'http' || $this->scheme == 'ssl') {
-		// use persistent connection
-		if($this->persistentConnection && isset($this->fp) && is_resource($this->fp)){
-			if (!feof($this->fp)) {
-				$this->debug('Re-use persistent connection');
-				return true;
-			}
-			fclose($this->fp);
-			$this->debug('Closed persistent connection at EOF');
-		}
-
-		// munge host if using OpenSSL
-		if ($this->scheme == 'ssl') {
-			$host = 'ssl://' . $this->host;
-		} else {
-			$host = $this->host;
-		}
-		$this->debug('calling fsockopen with host ' . $host);
-
-		// open socket
-		if($connection_timeout > 0){
-			$this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str, $connection_timeout);
-		} else {
-			$this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str);
-		}
-		
-		// test pointer
-		if(!$this->fp) {
-			$msg = 'Couldn\'t open socket connection to server ' . $this->url;
-			if ($this->errno) {
-				$msg .= ', Error ('.$this->errno.'): '.$this->error_str;
-			} else {
-				$msg .= ' prior to connect().  This is often a problem looking up the host name.';
-			}
-			$this->debug($msg);
-			$this->setError($msg);
-			return false;
-		}
-		
-		// set response timeout
-		socket_set_timeout( $this->fp, $response_timeout);
-
-		$this->debug('socket connected');
-		return true;
-	  } else if ($this->scheme == 'https') {
-		if (!extension_loaded('curl')) {
-			$this->setError('CURL Extension, or OpenSSL extension w/ PHP version >= 4.3 is required for HTTPS');
-			return false;
-		}
-		$this->debug('connect using https');
-		// init CURL
-		$this->ch = curl_init();
-		// set url
-		$hostURL = ($this->port != '') ? "https://$this->host:$this->port" : "https://$this->host";
-		// add path
-		$hostURL .= $this->path;
-		curl_setopt($this->ch, CURLOPT_URL, $hostURL);
-		// ask for headers in the response output
-		curl_setopt($this->ch, CURLOPT_HEADER, 1);
-		// ask for the response output as the return value
-		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, 1);
-		// encode
-		// We manage this ourselves through headers and encoding
-//		if(function_exists('gzuncompress')){
-//			curl_setopt($this->ch, CURLOPT_ENCODING, 'deflate');
-//		}
-		// persistent connection
-		if ($this->persistentConnection) {
-			// The way we send data, we cannot use persistent connections, since
-			// there will be some "junk" at the end of our request.
-			//curl_setopt($this->ch, CURL_HTTP_VERSION_1_1, true);
-			$this->persistentConnection = false;
-			$this->outgoing_headers['Connection'] = 'close';
-		}
-		// set timeout (NOTE: cURL does not have separate connection and response timeouts)
-		if ($connection_timeout != 0) {
-			curl_setopt($this->ch, CURLOPT_TIMEOUT, $connection_timeout);
-		}
-
-		// recent versions of cURL turn on peer/host checking by default,
-		// while PHP binaries are not compiled with a default location for the
-		// CA cert bundle, so disable peer/host checking.
-//curl_setopt($this->ch, CURLOPT_CAINFO, 'f:\php-4.3.2-win32\extensions\curl-ca-bundle.crt');		
-		curl_setopt($this->ch, CURLOPT_SSL_VERIFYPEER, 0);
-		curl_setopt($this->ch, CURLOPT_SSL_VERIFYHOST, 0);
-
-		/*
-			TODO: support client certificates (thanks Tobias Boes)
-        curl_setopt($this->ch, CURLOPT_CAINFO, '$pathToPemFiles/rootca.pem');
-        curl_setopt($this->ch, CURLOPT_SSL_VERIFYPEER, 1);
-        curl_setopt($this->ch, CURLOPT_SSL_VERIFYHOST, 1);
-        curl_setopt($this->ch, CURLOPT_SSLCERT, '$pathToPemFiles/mycert.pem');
-        curl_setopt($this->ch, CURLOPT_SSLKEY, '$pathToPemFiles/mykey.pem');
-		*/
-		$this->debug('cURL connection set up');
-		return true;
-	  } else {
-		$this->setError('Unknown scheme ' . $this->scheme);
-		$this->debug('Unknown scheme ' . $this->scheme);
-		return false;
-	  }
-	}
-	
-	/**
-	* send the SOAP message via HTTP
-	*
-	* @param    string $data message data
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @return	string data
-	* @access   public
-	*/
-	function send($data, $timeout=0, $response_timeout=30) {
-		
-		$this->debug('entered send() with data of length: '.strlen($data));
-
-		$this->tryagain = true;
-		$tries = 0;
-		while ($this->tryagain) {
-			$this->tryagain = false;
-			if ($tries++ < 2) {
-				// make connnection
-				if (!$this->connect($timeout, $response_timeout)){
-					return false;
-				}
-				
-				// send request
-				if (!$this->sendRequest($data)){
-					return false;
-				}
-				
-				// get response
-				$respdata = $this->getResponse();
-			} else {
-				$this->setError('Too many tries to get an OK response');
-			}
-		}		
-		$this->debug('end of send()');
-		return $respdata;
-	}
-
-
-	/**
-	* send the SOAP message via HTTPS 1.0 using CURL
-	*
-	* @param    string $msg message data
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @return	string data
-	* @access   public
-	*/
-	function sendHTTPS($data, $timeout=0, $response_timeout=30) {
-		return $this->send($data, $timeout, $response_timeout);
-	}
-	
-	/**
-	* if authenticating, set user credentials here
-	*
-	* @param    string $username
-	* @param    string $password
-	* @param	string $authtype
-	* @param	array $digestRequest
-	* @access   public
-	*/
-	function setCredentials($username, $password, $authtype = 'basic', $digestRequest = array()) {
-		global $_SERVER;
-
-		$this->debug("Set credentials for authtype $authtype");
-		// cf. RFC 2617
-		if ($authtype == 'basic') {
-			$this->outgoing_headers['Authorization'] = 'Basic '.base64_encode($username.':'.$password);
-		} elseif ($authtype == 'digest') {
-			if (isset($digestRequest['nonce'])) {
-				$digestRequest['nc'] = isset($digestRequest['nc']) ? $digestRequest['nc']++ : 1;
-				
-				// calculate the Digest hashes (calculate code based on digest implementation found at: http://www.rassoc.com/gregr/weblog/stories/2002/07/09/webServicesSecurityHttpDigestAuthenticationWithoutActiveDirectory.html)
-	
-				// A1 = unq(username-value) ":" unq(realm-value) ":" passwd
-				$A1 = $username. ':' . $digestRequest['realm'] . ':' . $password;
-	
-				// H(A1) = MD5(A1)
-				$HA1 = md5($A1);
-	
-				// A2 = Method ":" digest-uri-value
-				$A2 = 'POST:' . $this->uri;
-	
-				// H(A2)
-				$HA2 =  md5($A2);
-	
-				// KD(secret, data) = H(concat(secret, ":", data))
-				// if qop == auth:
-				// request-digest  = <"> < KD ( H(A1),     unq(nonce-value)
-				//                              ":" nc-value
-				//                              ":" unq(cnonce-value)
-				//                              ":" unq(qop-value)
-				//                              ":" H(A2)
-				//                            ) <">
-				// if qop is missing,
-				// request-digest  = <"> < KD ( H(A1), unq(nonce-value) ":" H(A2) ) > <">
-	
-				$unhashedDigest = '';
-				$nonce = isset($digestRequest['nonce']) ? $digestRequest['nonce'] : '';
-				$cnonce = $nonce;
-				if ($digestRequest['qop'] != '') {
-					$unhashedDigest = $HA1 . ':' . $nonce . ':' . sprintf("%08d", $digestRequest['nc']) . ':' . $cnonce . ':' . $digestRequest['qop'] . ':' . $HA2;
-				} else {
-					$unhashedDigest = $HA1 . ':' . $nonce . ':' . $HA2;
-				}
-	
-				$hashedDigest = md5($unhashedDigest);
-	
-				$this->outgoing_headers['Authorization'] = 'Digest username="' . $username . '", realm="' . $digestRequest['realm'] . '", nonce="' . $nonce . '", uri="' . $this->uri . '", cnonce="' . $cnonce . '", nc=' . sprintf("%08x", $digestRequest['nc']) . ', qop="' . $digestRequest['qop'] . '", response="' . $hashedDigest . '"';
-			}
-		}
-		$this->username = $username;
-		$this->password = $password;
-		$this->authtype = $authtype;
-		$this->digestRequest = $digestRequest;
-		
-		if (isset($this->outgoing_headers['Authorization'])) {
-			$this->debug('Authorization header set: ' . substr($this->outgoing_headers['Authorization'], 0, 12) . '...');
-		} else {
-			$this->debug('Authorization header not set');
-		}
-	}
-	
-	/**
-	* set the soapaction value
-	*
-	* @param    string $soapaction
-	* @access   public
-	*/
-	function setSOAPAction($soapaction) {
-		$this->outgoing_headers['SOAPAction'] = '"' . $soapaction . '"';
-	}
-	
-	/**
-	* use http encoding
-	*
-	* @param    string $enc encoding style. supported values: gzip, deflate, or both
-	* @access   public
-	*/
-	function setEncoding($enc='gzip, deflate'){
-		$this->protocol_version = '1.1';
-		$this->outgoing_headers['Accept-Encoding'] = $enc;
-		$this->outgoing_headers['Connection'] = 'close';
-		$this->persistentConnection = false;
-		set_magic_quotes_runtime(0);
-		// deprecated
-		$this->encoding = $enc;
-	}
-	
-	/**
-	* set proxy info here
-	*
-	* @param    string $proxyhost
-	* @param    string $proxyport
-	* @param	string $proxyusername
-	* @param	string $proxypassword
-	* @access   public
-	*/
-	function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '') {
-		$this->uri = $this->url;
-		$this->host = $proxyhost;
-		$this->port = $proxyport;
-		if ($proxyusername != '' && $proxypassword != '') {
-			$this->outgoing_headers['Proxy-Authorization'] = ' Basic '.base64_encode($proxyusername.':'.$proxypassword);
-		}
-	}
-	
-	/**
-	* decode a string that is encoded w/ "chunked' transfer encoding
- 	* as defined in RFC2068 19.4.6
-	*
-	* @param    string $buffer
-	* @param    string $lb
-	* @returns	string
-	* @access   public
-	*/
-	function decodeChunked($buffer, $lb){
-		// length := 0
-		$length = 0;
-		$new = '';
-		
-		// read chunk-size, chunk-extension (if any) and CRLF
-		// get the position of the linebreak
-		$chunkend = strpos($buffer, $lb);
-		if ($chunkend == FALSE) {
-			$this->debug('no linebreak found in decodeChunked');
-			return $new;
-		}
-		$temp = substr($buffer,0,$chunkend);
-		$chunk_size = hexdec( trim($temp) );
-		$chunkstart = $chunkend + strlen($lb);
-		// while (chunk-size > 0) {
-		while ($chunk_size > 0) {
-			$this->debug("chunkstart: $chunkstart chunk_size: $chunk_size");
-			$chunkend = strpos( $buffer, $lb, $chunkstart + $chunk_size);
-		  	
-			// Just in case we got a broken connection
-		  	if ($chunkend == FALSE) {
-		  	    $chunk = substr($buffer,$chunkstart);
-				// append chunk-data to entity-body
-		    	$new .= $chunk;
-		  	    $length += strlen($chunk);
-		  	    break;
-			}
-			
-		  	// read chunk-data and CRLF
-		  	$chunk = substr($buffer,$chunkstart,$chunkend-$chunkstart);
-		  	// append chunk-data to entity-body
-		  	$new .= $chunk;
-		  	// length := length + chunk-size
-		  	$length += strlen($chunk);
-		  	// read chunk-size and CRLF
-		  	$chunkstart = $chunkend + strlen($lb);
-			
-		  	$chunkend = strpos($buffer, $lb, $chunkstart) + strlen($lb);
-			if ($chunkend == FALSE) {
-				break; //Just in case we got a broken connection
-			}
-			$temp = substr($buffer,$chunkstart,$chunkend-$chunkstart);
-			$chunk_size = hexdec( trim($temp) );
-			$chunkstart = $chunkend;
-		}
-		return $new;
-	}
-	
-	/*
-	 *	Writes payload, including HTTP headers, to $this->outgoing_payload.
-	 */
-	function buildPayload($data) {
-		// add content-length header
-		$this->outgoing_headers['Content-Length'] = strlen($data);
-		
-		// start building outgoing payload:
-		$this->outgoing_payload = "$this->request_method $this->uri HTTP/$this->protocol_version\r\n";
-
-		// loop thru headers, serializing
-		foreach($this->outgoing_headers as $k => $v){
-			$this->outgoing_payload .= $k.': '.$v."\r\n";
-		}
-		
-		// header/body separator
-		$this->outgoing_payload .= "\r\n";
-		
-		// add data
-		$this->outgoing_payload .= $data;
-	}
-
-	function sendRequest($data){
-		// build payload
-		$this->buildPayload($data);
-
-	  if ($this->scheme == 'http' || $this->scheme == 'ssl') {
-		// send payload
-		if(!fputs($this->fp, $this->outgoing_payload, strlen($this->outgoing_payload))) {
-			$this->setError('couldn\'t write message data to socket');
-			$this->debug('couldn\'t write message data to socket');
-			return false;
-		}
-		$this->debug('wrote data to socket, length = ' . strlen($this->outgoing_payload));
-		return true;
-	  } else if ($this->scheme == 'https') {
-		// set payload
-		// TODO: cURL does say this should only be the verb, and in fact it
-		// turns out that the URI and HTTP version are appended to this, which
-		// some servers refuse to work with
-		//curl_setopt($this->ch, CURLOPT_CUSTOMREQUEST, $this->outgoing_payload);
-		foreach($this->outgoing_headers as $k => $v){
-			$curl_headers[] = "$k: $v";
-		}
-		curl_setopt($this->ch, CURLOPT_HTTPHEADER, $curl_headers);
-		if ($this->request_method == "POST") {
-	  		curl_setopt($this->ch, CURLOPT_POST, 1);
-	  		curl_setopt($this->ch, CURLOPT_POSTFIELDS, $data);
-	  	} else {
-	  	}
-		$this->debug('set cURL payload');
-		return true;
-	  }
-	}
-
-	function getResponse(){
-		$this->incoming_payload = '';
-	    
-	  if ($this->scheme == 'http' || $this->scheme == 'ssl') {
-	    // loop until headers have been retrieved
-	    $data = '';
-	    while (!isset($lb)){
-
-			// We might EOF during header read.
-			if(feof($this->fp)) {
-				$this->incoming_payload = $data;
-				$this->debug('found no headers before EOF after length ' . strlen($data));
-				$this->debug("received before EOF:\n" . $data);
-				$this->setError('server failed to send headers');
-				return false;
-			}
-
-			$tmp = fgets($this->fp, 256);
-			$tmplen = strlen($tmp);
-			$this->debug("read line of $tmplen bytes: " . trim($tmp));
-
-			if ($tmplen == 0) {
-				$this->incoming_payload = $data;
-				$this->debug('socket read of headers timed out after length ' . strlen($data));
-				$this->debug("read before timeout:\n" . $data);
-				$this->setError('socket read of headers timed out');
-				return false;
-			}
-
-			$data .= $tmp;
-			$pos = strpos($data,"\r\n\r\n");
-			if($pos > 1){
-				$lb = "\r\n";
-			} else {
-				$pos = strpos($data,"\n\n");
-				if($pos > 1){
-					$lb = "\n";
-				}
-			}
-			// remove 100 header
-			if(isset($lb) && ereg('^HTTP/1.1 100',$data)){
-				unset($lb);
-				$data = '';
-			}//
-		}
-		// store header data
-		$this->incoming_payload .= $data;
-		$this->debug('found end of headers after length ' . strlen($data));
-		// process headers
-		$header_data = trim(substr($data,0,$pos));
-		$header_array = explode($lb,$header_data);
-		$this->incoming_headers = array();
-		foreach($header_array as $header_line){
-			$arr = explode(':',$header_line, 2);
-			if(count($arr) > 1){
-				$header_name = strtolower(trim($arr[0]));
-				$this->incoming_headers[$header_name] = trim($arr[1]);
-			} else if (isset($header_name)) {
-				$this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;
-			}
-		}
-		
-		// loop until msg has been received
-		if (isset($this->incoming_headers['content-length'])) {
-			$content_length = $this->incoming_headers['content-length'];
-			$chunked = false;
-			$this->debug("want to read content of length $content_length");
-		} else {
-			$content_length =  2147483647;
-			if (isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked') {
-				$chunked = true;
-				$this->debug("want to read chunked content");
-			} else {
-				$chunked = false;
-				$this->debug("want to read content to EOF");
-			}
-		}
-		$data = '';
-		do {
-			if ($chunked) {
-				$tmp = fgets($this->fp, 256);
-				$tmplen = strlen($tmp);
-				$this->debug("read chunk line of $tmplen bytes");
-				if ($tmplen == 0) {
-					$this->incoming_payload = $data;
-					$this->debug('socket read of chunk length timed out after length ' . strlen($data));
-					$this->debug("read before timeout:\n" . $data);
-					$this->setError('socket read of chunk length timed out');
-					return false;
-				}
-				$content_length = hexdec(trim($tmp));
-				$this->debug("chunk length $content_length");
-			}
-			$strlen = 0;
-		    while (($strlen < $content_length) && (!feof($this->fp))) {
-		    	$readlen = min(8192, $content_length - $strlen);
-				$tmp = fread($this->fp, $readlen);
-				$tmplen = strlen($tmp);
-				$this->debug("read buffer of $tmplen bytes");
-				if (($tmplen == 0) && (!feof($this->fp))) {
-					$this->incoming_payload = $data;
-					$this->debug('socket read of body timed out after length ' . strlen($data));
-					$this->debug("read before timeout:\n" . $data);
-					$this->setError('socket read of body timed out');
-					return false;
-				}
-				$strlen += $tmplen;
-				$data .= $tmp;
-			}
-			if ($chunked && ($content_length > 0)) {
-				$tmp = fgets($this->fp, 256);
-				$tmplen = strlen($tmp);
-				$this->debug("read chunk terminator of $tmplen bytes");
-				if ($tmplen == 0) {
-					$this->incoming_payload = $data;
-					$this->debug('socket read of chunk terminator timed out after length ' . strlen($data));
-					$this->debug("read before timeout:\n" . $data);
-					$this->setError('socket read of chunk terminator timed out');
-					return false;
-				}
-			}
-		} while ($chunked && ($content_length > 0) && (!feof($this->fp)));
-		if (feof($this->fp)) {
-			$this->debug('read to EOF');
-		}
-		$this->debug('read body of length ' . strlen($data));
-		$this->incoming_payload .= $data;
-		$this->debug('received a total of '.strlen($this->incoming_payload).' bytes of data from server');
-		
-		// close filepointer
-		if(
-			(isset($this->incoming_headers['connection']) && strtolower($this->incoming_headers['connection']) == 'close') || 
-			(! $this->persistentConnection) || feof($this->fp)){
-			fclose($this->fp);
-			$this->fp = false;
-			$this->debug('closed socket');
-		}
-		
-		// connection was closed unexpectedly
-		if($this->incoming_payload == ''){
-			$this->setError('no response from server');
-			return false;
-		}
-		
-		// decode transfer-encoding
-//		if(isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked'){
-//			if(!$data = $this->decodeChunked($data, $lb)){
-//				$this->setError('Decoding of chunked data failed');
-//				return false;
-//			}
-			//print "<pre>\nde-chunked:\n---------------\n$data\n\n---------------\n</pre>";
-			// set decoded payload
-//			$this->incoming_payload = $header_data.$lb.$lb.$data;
-//		}
-	
-	  } else if ($this->scheme == 'https') {
-		// send and receive
-		$this->debug('send and receive with cURL');
-		$this->incoming_payload = curl_exec($this->ch);
-		$data = $this->incoming_payload;
-
-        $cErr = curl_error($this->ch);
-		if ($cErr != '') {
-        	$err = 'cURL ERROR: '.curl_errno($this->ch).': '.$cErr.'<br>';
-			foreach(curl_getinfo($this->ch) as $k => $v){
-				$err .= "$k: $v<br>";
-			}
-			$this->debug($err);
-			$this->setError($err);
-			curl_close($this->ch);
-	    	return false;
-		} else {
-			//echo '<pre>';
-			//var_dump(curl_getinfo($this->ch));
-			//echo '</pre>';
-		}
-		// close curl
-		$this->debug('No cURL error, closing cURL');
-		curl_close($this->ch);
-		
-		// remove 100 header
-		if (ereg('^HTTP/1.1 100',$data)) {
-			if ($pos = strpos($data,"\r\n\r\n")) {
-				$data = ltrim(substr($data,$pos));
-			} elseif($pos = strpos($data,"\n\n") ) {
-				$data = ltrim(substr($data,$pos));
-			}
-		}
-		
-		// separate content from HTTP headers
-		if ($pos = strpos($data,"\r\n\r\n")) {
-			$lb = "\r\n";
-		} elseif( $pos = strpos($data,"\n\n")) {
-			$lb = "\n";
-		} else {
-			$this->debug('no proper separation of headers and document');
-			$this->setError('no proper separation of headers and document');
-			return false;
-		}
-		$header_data = trim(substr($data,0,$pos));
-		$header_array = explode($lb,$header_data);
-		$data = ltrim(substr($data,$pos));
-		$this->debug('found proper separation of headers and document');
-		$this->debug('cleaned data, stringlen: '.strlen($data));
-		// clean headers
-		foreach ($header_array as $header_line) {
-			$arr = explode(':',$header_line,2);
-			if (count($arr) > 1) {
-				$this->incoming_headers[strtolower(trim($arr[0]))] = trim($arr[1]);
-			}
-		}
-	  }
-
- 		// see if we need to resend the request with http digest authentication
- 		if (isset($this->incoming_headers['www-authenticate']) && strstr($header_array[0], '401 Unauthorized')) {
- 			$this->debug('Got 401 Unauthorized with WWW-Authenticate: ' . $this->incoming_headers['www-authenticate']);
- 			if (substr("Digest ", $this->incoming_headers['www-authenticate'])) {
- 				$this->debug('Server wants digest authentication');
- 				// remove "Digest " from our elements
- 				$digestString = str_replace('Digest ', '', $this->incoming_headers['www-authenticate']);
- 				
- 				// parse elements into array
- 				$digestElements = explode(',', $digestString);
- 				foreach ($digestElements as $val) {
- 					$tempElement = explode('=', trim($val));
- 					$digestRequest[$tempElement[0]] = str_replace("\"", '', $tempElement[1]);
- 				}
-
-				// should have (at least) qop, realm, nonce
- 				if (isset($digestRequest['nonce'])) {
- 					$this->setCredentials($this->username, $this->password, 'digest', $digestRequest);
- 					$this->tryagain = true;
- 					return false;
- 				}
- 			}
-			$this->debug('HTTP authentication failed');
-			$this->setError('HTTP authentication failed');
-			return false;
- 		}
-		
-		// decode content-encoding
-		if(isset($this->incoming_headers['content-encoding']) && $this->incoming_headers['content-encoding'] != ''){
-			if(strtolower($this->incoming_headers['content-encoding']) == 'deflate' || strtolower($this->incoming_headers['content-encoding']) == 'gzip'){
-    			// if decoding works, use it. else assume data wasn't gzencoded
-    			if(function_exists('gzuncompress')){
-					//$timer->setMarker('starting decoding of gzip/deflated content');
-					if($this->incoming_headers['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)){
-    					$data = $degzdata;
-					} elseif($this->incoming_headers['content-encoding'] == 'gzip' && $degzdata = gzinflate(substr($data, 10))){	// do our best
-						$data = $degzdata;
-					} else {
-						$this->setError('Errors occurred when trying to decode the data');
-					}
-					//$timer->setMarker('finished decoding of gzip/deflated content');
-					//print "<xmp>\nde-inflated:\n---------------\n$data\n-------------\n</xmp>";
-					// set decoded payload
-					$this->incoming_payload = $header_data.$lb.$lb.$data;
-    			} else {
-					$this->setError('The server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
-				}
-			}
-		}
-		
-		if(strlen($data) == 0){
-			$this->debug('no data after headers!');
-			$this->setError('no data present after HTTP headers');
-			return false;
-		}
-		
-		return $data;
-	}
-
-	function setContentType($type, $charset = false) {
-		$this->outgoing_headers['Content-Type'] = $type . ($charset ? '; charset=' . $charset : '');
-	}
-
-	function usePersistentConnection(){
-		if (isset($this->outgoing_headers['Accept-Encoding'])) {
-			return false;
-		}
-		$this->protocol_version = '1.1';
-		$this->persistentConnection = true;
-		$this->outgoing_headers['Connection'] = 'Keep-Alive';
-		return true;
-	}
-}
-
-?><?php
-
-
-
-/**
-*
-* soap_server allows the user to create a SOAP server
-* that is capable of receiving messages and returning responses
-*
-* NOTE: WSDL functionality is experimental
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @access   public
-*/
-class soap_server extends nusoap_base {
-	var $headers = array();			// HTTP headers of request
-	var $request = '';				// HTTP request
-	var $requestHeaders = '';		// SOAP headers from request (incomplete namespace resolution) (text)
-	var $document = '';				// SOAP body request portion (incomplete namespace resolution) (text)
-	var $requestSOAP = '';			// SOAP payload for request (text)
-	var $methodURI = '';			// requested method namespace URI
-	var $methodname = '';			// name of method requested
-	var $methodparams = array();	// method parameters from request
-	var $xml_encoding = '';			// character set encoding of incoming (request) messages
-	var $SOAPAction = '';			// SOAP Action from request
-
-	var $outgoing_headers = array();// HTTP headers of response
-	var $response = '';				// HTTP response
-	var $responseHeaders = '';		// SOAP headers for response (text)
-	var $responseSOAP = '';			// SOAP payload for response (text)
-	var $methodreturn = false;		// method return to place in response
-	var $methodreturnisliteralxml = false;	// whether $methodreturn is a string of literal XML
-	var $fault = false;				// SOAP fault for response
-	var $result = 'successful';		// text indication of result (for debugging)
-
-	var $operations = array();		// assoc array of operations => opData
-	var $wsdl = false;				// wsdl instance
-	var $externalWSDLURL = false;	// URL for WSDL
-	var $debug_flag = false;		// whether to append debug to response as XML comment
-	
-	/**
-	* constructor
-    * the optional parameter is a path to a WSDL file that you'd like to bind the server instance to.
-	*
-    * @param mixed $wsdl file path or URL (string), or wsdl instance (object)
-	* @access   public
-	*/
-	function soap_server($wsdl=false){
-
-		// turn on debugging?
-		global $debug;
-		global $_REQUEST;
-		global $_SERVER;
-		global $HTTP_SERVER_VARS;
-
-		if (isset($debug)) {
-			$this->debug_flag = $debug;
-		} else if (isset($_REQUEST['debug'])) {
-			$this->debug_flag = $_REQUEST['debug'];
-		} else if (isset($_SERVER['QUERY_STRING'])) {
-			$qs = explode('&', $_SERVER['QUERY_STRING']);
-			foreach ($qs as $v) {
-				if (substr($v, 0, 6) == 'debug=') {
-					$this->debug_flag = substr($v, 6);
-				}
-			}
-		} else if (isset($HTTP_SERVER_VARS['QUERY_STRING'])) {
-			$qs = explode('&', $HTTP_SERVER_VARS['QUERY_STRING']);
-			foreach ($qs as $v) {
-				if (substr($v, 0, 6) == 'debug=') {
-					$this->debug_flag = substr($v, 6);
-				}
-			}
-		}
-
-		// wsdl
-		if($wsdl){
-			if (is_object($wsdl) && is_a($wsdl, 'wsdl')) {
-				$this->wsdl = $wsdl;
-				$this->externalWSDLURL = $this->wsdl->wsdl;
-				$this->debug('Use existing wsdl instance from ' . $this->externalWSDLURL);
-			} else {
-				$this->debug('Create wsdl from ' . $wsdl);
-				$this->wsdl = new wsdl($wsdl);
-				$this->externalWSDLURL = $wsdl;
-			}
-			$this->debug("wsdl...\n" . $this->wsdl->debug_str);
-			$this->wsdl->debug_str = '';
-			if($err = $this->wsdl->getError()){
-				die('WSDL ERROR: '.$err);
-			}
-		}
-	}
-
-	/**
-	* processes request and returns response
-	*
-	* @param    string $data usually is the value of $HTTP_RAW_POST_DATA
-	* @access   public
-	*/
-	function service($data){
-		global $QUERY_STRING;
-		if(isset($_SERVER['QUERY_STRING'])){
-			$qs = $_SERVER['QUERY_STRING'];
-		} elseif(isset($GLOBALS['QUERY_STRING'])){
-			$qs = $GLOBALS['QUERY_STRING'];
-		} elseif(isset($QUERY_STRING) && $QUERY_STRING != ''){
-			$qs = $QUERY_STRING;
-		}
-
-		if(isset($qs) && ereg('wsdl', $qs) ){
-			// This is a request for WSDL
-			if($this->externalWSDLURL){
-              if (strpos($this->externalWSDLURL,"://")!==false) { // assume URL
-				header('Location: '.$this->externalWSDLURL);
-              } else { // assume file
-                header("Content-Type: text/xml\r\n");
-                $fp = fopen($this->externalWSDLURL, 'r');
-                fpassthru($fp);
-              }
-			} else {
-				header("Content-Type: text/xml; charset=ISO-8859-1\r\n");
-				print $this->wsdl->serialize();
-			}
-		} elseif($data == '' && $this->wsdl){
-			// print web interface
-			print $this->webDescription();
-		} else {
-			// handle the request
-			$this->parse_request($data);
-			if (! $this->fault) {
-				$this->invoke_method();
-			}
-			if (! $this->fault) {
-				$this->serialize_return();
-			}
-			$this->send_response();
-		}
-	}
-
-	/**
-	* parses HTTP request headers.
-	*
-	* The following fields are set by this function (when successful)
-	*
-	* headers
-	* request
-	* xml_encoding
-	* SOAPAction
-	*
-	* @access   private
-	*/
-	function parse_http_headers() {
-		global $HTTP_SERVER_VARS;
-		global $_SERVER;
-
-		$this->request = '';
-		if(function_exists('getallheaders')){
-			$this->headers = getallheaders();
-			foreach($this->headers as $k=>$v){
-				$this->request .= "$k: $v\r\n";
-				$this->debug("$k: $v");
-			}
-			// get SOAPAction header
-			if(isset($this->headers['SOAPAction'])){
-				$this->SOAPAction = str_replace('"','',$this->headers['SOAPAction']);
-			}
-			// get the character encoding of the incoming request
-			if(strpos($this->headers['Content-Type'],'=')){
-				$enc = str_replace('"','',substr(strstr($this->headers["Content-Type"],'='),1));
-				if(eregi('^(ISO-8859-1|US-ASCII|UTF-8)$',$enc)){
-					$this->xml_encoding = strtoupper($enc);
-				} else {
-					$this->xml_encoding = 'US-ASCII';
-				}
-			} else {
-				// should be US-ASCII, but for XML, let's be pragmatic and admit UTF-8 is most common
-				$this->xml_encoding = 'UTF-8';
-			}
-		} elseif(isset($_SERVER) && is_array($_SERVER)){
-			foreach ($_SERVER as $k => $v) {
-				if (substr($k, 0, 5) == 'HTTP_') {
-					$k = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($k, 5)))));
-				} else {
-					$k = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', $k))));
-				}
-				if ($k == 'Soapaction') {
-					// get SOAPAction header
-					$k = 'SOAPAction';
-					$v = str_replace('"', '', $v);
-					$v = str_replace('\\', '', $v);
-					$this->SOAPAction = $v;
-				} else if ($k == 'Content-Type') {
-					// get the character encoding of the incoming request
-					if (strpos($v, '=')) {
-						$enc = substr(strstr($v, '='), 1);
-						$enc = str_replace('"', '', $enc);
-						$enc = str_replace('\\', '', $enc);
-						if (eregi('^(ISO-8859-1|US-ASCII|UTF-8)$', $enc)) {
-							$this->xml_encoding = strtoupper($enc);
-						} else {
-							$this->xml_encoding = 'US-ASCII';
-						}
-					} else {
-						// should be US-ASCII, but for XML, let's be pragmatic and admit UTF-8 is most common
-						$this->xml_encoding = 'UTF-8';
-					}
-				}
-				$this->headers[$k] = $v;
-				$this->request .= "$k: $v\r\n";
-				$this->debug("$k: $v");
-			}
-		} elseif (is_array($HTTP_SERVER_VARS)) {
-			foreach ($HTTP_SERVER_VARS as $k => $v) {
-				if (substr($k, 0, 5) == 'HTTP_') {
-					$k = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($k, 5)))));
-					if ($k == 'Soapaction') {
-						// get SOAPAction header
-						$k = 'SOAPAction';
-						$v = str_replace('"', '', $v);
-						$v = str_replace('\\', '', $v);
-						$this->SOAPAction = $v;
-					} else if ($k == 'Content-Type') {
-						// get the character encoding of the incoming request
-						if (strpos($v, '=')) {
-							$enc = substr(strstr($v, '='), 1);
-							$enc = str_replace('"', '', $enc);
-							$enc = str_replace('\\', '', $enc);
-							if (eregi('^(ISO-8859-1|US-ASCII|UTF-8)$', $enc)) {
-								$this->xml_encoding = strtoupper($enc);
-							} else {
-								$this->xml_encoding = 'US-ASCII';
-							}
-						} else {
-							// should be US-ASCII, but for XML, let's be pragmatic and admit UTF-8 is most common
-							$this->xml_encoding = 'UTF-8';
-						}
-					}
-					$this->headers[$k] = $v;
-					$this->request .= "$k: $v\r\n";
-					$this->debug("$k: $v");
-				}
-			}
-		}
-	}
-
-	/**
-	* parses a request
-	*
-	* The following fields are set by this function (when successful)
-	*
-	* headers
-	* request
-	* xml_encoding
-	* SOAPAction
-	* request
-	* requestSOAP
-	* methodURI
-	* methodname
-	* methodparams
-	* requestHeaders
-	* document
-	*
-	* This sets the fault field on error
-	*
-	* @param    string $data XML string
-	* @access   private
-	*/
-	function parse_request($data='') {
-		$this->debug('entering parse_request() on '.date('H:i Y-m-d'));
-		$this->parse_http_headers();
-		$this->debug('got character encoding: '.$this->xml_encoding);
-		// uncompress if necessary
-		if (isset($this->headers['Content-Encoding']) && $this->headers['Content-Encoding'] != '') {
-			$this->debug('got content encoding: ' . $this->headers['Content-Encoding']);
-			if ($this->headers['Content-Encoding'] == 'deflate' || $this->headers['Content-Encoding'] == 'gzip') {
-		    	// if decoding works, use it. else assume data wasn't gzencoded
-				if (function_exists('gzuncompress')) {
-					if ($this->headers['Content-Encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
-						$data = $degzdata;
-					} elseif ($this->headers['Content-Encoding'] == 'gzip' && $degzdata = gzinflate(substr($data, 10))) {
-						$data = $degzdata;
-					} else {
-						$this->fault('Server', 'Errors occurred when trying to decode the data');
-						return;
-					}
-				} else {
-					$this->fault('Server', 'This Server does not support compressed data');
-					return;
-				}
-			}
-		}
-		$this->request .= "\r\n".$data;
-		$this->requestSOAP = $data;
-		// parse response, get soap parser obj
-		$parser = new soap_parser($data,$this->xml_encoding);
-		// parser debug
-		$this->debug("parser debug: \n".$parser->debug_str);
-		// if fault occurred during message parsing
-		if($err = $parser->getError()){
-			$this->result = 'fault: error in msg parsing: '.$err;
-			$this->fault('Server',"error in msg parsing:\n".$err);
-		// else successfully parsed request into soapval object
-		} else {
-			// get/set methodname
-			$this->methodURI = $parser->root_struct_namespace;
-			$this->methodname = $parser->root_struct_name;
-			$this->debug('method name: '.$this->methodname);
-			$this->debug('calling parser->get_response()');
-			$this->methodparams = $parser->get_response();
-			// get SOAP headers
-			$this->requestHeaders = $parser->getHeaders();
-            // add document for doclit support
-            $this->document = $parser->document;
-		}
-		$this->debug('leaving parse_request() on '.date('H:i Y-m-d'));
-	}
-
-	/**
-	* invokes a PHP function for the requested SOAP method
-	*
-	* The following fields are set by this function (when successful)
-	*
-	* methodreturn
-	*
-	* Note that the PHP function that is called may also set the following
-	* fields to affect the response sent to the client
-	*
-	* responseHeaders
-	* outgoing_headers
-	*
-	* This sets the fault field on error
-	*
-	* @access   private
-	*/
-	function invoke_method() {
-		$this->debug('entering invoke_method');
-		// does method exist?
-		if(!function_exists($this->methodname)){
-			// "method not found" fault here
-			$this->debug("method '$this->methodname' not found!");
-			$this->result = 'fault: method not found';
-			$this->fault('Server',"method '$this->methodname' not defined in service");
-			return;
-		}
-		if($this->wsdl){
-			if(!$this->opData = $this->wsdl->getOperationData($this->methodname)){
-			//if(
-		    	$this->fault('Server',"Operation '$this->methodname' is not defined in the WSDL for this service");
-				return;
-		    }
-		    $this->debug('opData is ' . $this->varDump($this->opData));
-		}
-		$this->debug("method '$this->methodname' exists");
-		// evaluate message, getting back parameters
-		// verify that request parameters match the method's signature
-		if(! $this->verify_method($this->methodname,$this->methodparams)){
-			// debug
-			$this->debug('ERROR: request not verified against method signature');
-			$this->result = 'fault: request failed validation against method signature';
-			// return fault
-			$this->fault('Server',"Operation '$this->methodname' not defined in service.");
-			return;
-		}
-
-		// if there are parameters to pass
-        $this->debug('params var dump '.$this->varDump($this->methodparams));
-		if($this->methodparams){
-			$this->debug("calling '$this->methodname' with params");
-			if (! function_exists('call_user_func_array')) {
-				$this->debug('calling method using eval()');
-				$funcCall = $this->methodname.'(';
-				foreach($this->methodparams as $param) {
-					$funcCall .= "\"$param\",";
-				}
-				$funcCall = substr($funcCall, 0, -1).')';
-				$this->debug('function call:<br>'.$funcCall);
-				@eval("\$this->methodreturn = $funcCall;");
-			} else {
-				$this->debug('calling method using call_user_func_array()');
-				$this->methodreturn = call_user_func_array("$this->methodname",$this->methodparams);
-			}
-		} else {
-			// call method w/ no parameters
-			$this->debug("calling $this->methodname w/ no params");
-			$m = $this->methodname;
-			$this->methodreturn = @$m();
-		}
-        $this->debug('methodreturn var dump'.$this->varDump($this->methodreturn));
-		$this->debug("leaving invoke_method: called method $this->methodname, received $this->methodreturn of type ".gettype($this->methodreturn));
-	}
-
-	/**
-	* serializes the return value from a PHP function into a full SOAP Envelope
-	*
-	* The following fields are set by this function (when successful)
-	*
-	* responseSOAP
-	*
-	* This sets the fault field on error
-	*
-	* @access   private
-	*/
-	function serialize_return() {
-		$this->debug("Entering serialize_return");
-		// if we got nothing back. this might be ok (echoVoid)
-		if(isset($this->methodreturn) && ($this->methodreturn != '' || is_bool($this->methodreturn))) {
-			// if fault
-			if(get_class($this->methodreturn) == 'soap_fault'){
-				$this->debug('got a fault object from method');
-				$this->fault = $this->methodreturn;
-				return;
-			} elseif ($this->methodreturnisliteralxml) {
-				$return_val = $this->methodreturn;
-			// returned value(s)
-			} else {
-				$this->debug('got a(n) '.gettype($this->methodreturn).' from method');
-				$this->debug('serializing return value');
-				if($this->wsdl){
-					// weak attempt at supporting multiple output params
-					if(sizeof($this->opData['output']['parts']) > 1){
-				    	$opParams = $this->methodreturn;
-				    } else {
-				    	// TODO: is this really necessary?
-				    	$opParams = array($this->methodreturn);
-				    }
-				    $return_val = $this->wsdl->serializeRPCParameters($this->methodname,'output',$opParams);
-					if($errstr = $this->wsdl->getError()){
-						$this->debug('got wsdl error: '.$errstr);
-						$this->fault('Server', 'got wsdl error: '.$errstr);
-						return;
-					}
-				} else {
-				    $return_val = $this->serialize_val($this->methodreturn, 'return');
-				}
-			}
-			$this->debug('return val: '.$this->varDump($return_val));
-		} else {
-			$return_val = '';
-			$this->debug('got no response from method');
-		}
-		$this->debug('serializing response');
-		if ($this->wsdl) {
-			if ($this->opData['style'] == 'rpc') {
-				$payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";
-			} else {
-				$payload = $return_val;
-			}
-		} else {
-			$payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";
-		}
-		$this->result = 'successful';
-		if($this->wsdl){
-			//if($this->debug_flag){
-            	$this->debug("WSDL debug data:\n".$this->wsdl->debug_str);
-            //	}
-			// Added: In case we use a WSDL, return a serialized env. WITH the usedNamespaces.
-			$this->responseSOAP = $this->serializeEnvelope($payload,$this->responseHeaders,$this->wsdl->usedNamespaces,$this->opData['style']);
-		} else {
-			$this->responseSOAP = $this->serializeEnvelope($payload,$this->responseHeaders);
-		}
-		$this->debug("Leaving serialize_return");
-	}
-
-	/**
-	* sends an HTTP response
-	*
-	* The following fields are set by this function (when successful)
-	*
-	* outgoing_headers
-	* response
-	*
-	* @access   private
-	*/
-	function send_response() {
-		$this->debug('Enter send_response');
-		if ($this->fault) {
-			$payload = $this->fault->serialize();
-			$this->outgoing_headers[] = "HTTP/1.0 500 Internal Server Error";
-			$this->outgoing_headers[] = "Status: 500 Internal Server Error";
-		} else {
-			$payload = $this->responseSOAP;
-			// Some combinations of PHP+Web server allow the Status
-			// to come through as a header.  Since OK is the default
-			// just do nothing.
-			// $this->outgoing_headers[] = "HTTP/1.0 200 OK";
-			// $this->outgoing_headers[] = "Status: 200 OK";
-		}
-        // add debug data if in debug mode
-		if(isset($this->debug_flag) && $this->debug_flag){
-			while (strpos($this->debug_str, '--')) {
-				$this->debug_str = str_replace('--', '- -', $this->debug_str);
-			}
-        	$payload .= "<!--\n" . $this->debug_str . "\n-->";
-        }
-		$this->outgoing_headers[] = "Server: $this->title Server v$this->version";
-		ereg('\$Revisio' . 'n: ([^ ]+)', $this->revision, $rev);
-		$this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (".$rev[1].")";
-		// Let the Web server decide about this
-		//$this->outgoing_headers[] = "Connection: Close\r\n";
-		$this->outgoing_headers[] = "Content-Type: text/xml; charset=$this->soap_defencoding";
-		//begin code to compress payload - by John
-		if (strlen($payload) > 1024 && isset($this->headers) && isset($this->headers['Accept-Encoding'])) {	
-		   if (strstr($this->headers['Accept-Encoding'], 'deflate')) {
-				if (function_exists('gzcompress')) {
-					if (isset($this->debug_flag) && $this->debug_flag) {
-						$payload .= "<!-- Content being deflated -->";
-					}
-					$this->outgoing_headers[] = "Content-Encoding: deflate";
-					$payload = gzcompress($payload);
-				} else {
-					if (isset($this->debug_flag) && $this->debug_flag) {
-						$payload .= "<!-- Content will not be deflated: no gzcompress -->";
-					}
-				}
-		   } else if (strstr($this->headers['Accept-Encoding'], 'gzip')) {
-				if (function_exists('gzencode')) {
-					if (isset($this->debug_flag) && $this->debug_flag) {
-						$payload .= "<!-- Content being gzipped -->";
-					}
-					$this->outgoing_headers[] = "Content-Encoding: gzip";
-					$payload = gzencode($payload);
-				} else {
-					if (isset($this->debug_flag) && $this->debug_flag) {
-						$payload .= "<!-- Content will not be gzipped: no gzencode -->";
-					}
-				}
-			}
-		}
-		//end code
-		$this->outgoing_headers[] = "Content-Length: ".strlen($payload);
-		reset($this->outgoing_headers);
-		foreach($this->outgoing_headers as $hdr){
-			header($hdr, false);
-		}
-		$this->response = join("\r\n",$this->outgoing_headers)."\r\n".$payload;
-		print $payload;
-	}
-
-	/**
-	* takes the value that was created by parsing the request
-	* and compares to the method's signature, if available.
-	*
-	* @param	mixed
-	* @return	boolean
-	* @access   private
-	*/
-	function verify_method($operation,$request){
-		if(isset($this->wsdl) && is_object($this->wsdl)){
-			if($this->wsdl->getOperationData($operation)){
-				return true;
-			}
-	    } elseif(isset($this->operations[$operation])){
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	* add a method to the dispatch map
-	*
-	* @param    string $methodname
-	* @param    string $in array of input values
-	* @param    string $out array of output values
-	* @access   public
-	*/
-	function add_to_map($methodname,$in,$out){
-			$this->operations[$methodname] = array('name' => $methodname,'in' => $in,'out' => $out);
-	}
-
-	/**
-	* register a service with the server
-	*
-	* @param    string $methodname
-	* @param    string $in assoc array of input values: key = param name, value = param type
-	* @param    string $out assoc array of output values: key = param name, value = param type
-	* @param	string $namespace
-	* @param	string $soapaction
-	* @param	string $style optional (rpc|document)
-	* @param	string $use optional (encoded|literal)
-	* @param	string $documentation optional Description to include in WSDL
-	* @access   public
-	*/
-	function register($name,$in=false,$out=false,$namespace=false,$soapaction=false,$style=false,$use=false,$documentation=''){
-		if($this->externalWSDLURL){
-			die('You cannot bind to an external WSDL file, and register methods outside of it! Please choose either WSDL or no WSDL.');
-		}
-	    if(false == $in) {
-		}
-		if(false == $out) {
-		}
-		if(false == $namespace) {
-		}
-		if(false == $soapaction) {
-			$SERVER_NAME = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : $GLOBALS['SERVER_NAME'];
-			$SCRIPT_NAME = isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : $GLOBALS['SCRIPT_NAME'];
-			$soapaction = "http://$SERVER_NAME$SCRIPT_NAME/$name";
-		}
-		if(false == $style) {
-			$style = "rpc";
-		}
-		if(false == $use) {
-			$use = "encoded";
-		}
-		
-		$this->operations[$name] = array(
-	    'name' => $name,
-	    'in' => $in,
-	    'out' => $out,
-	    'namespace' => $namespace,
-	    'soapaction' => $soapaction,
-	    'style' => $style);
-        if($this->wsdl){
-        	$this->wsdl->addOperation($name,$in,$out,$namespace,$soapaction,$style,$use,$documentation);
-	    }
-		return true;
-	}
-
-	/**
-	* create a fault. this also acts as a flag to the server that a fault has occured.
-	*
-	* @param	string faultcode
-	* @param	string faultstring
-	* @param	string faultactor
-	* @param	string faultdetail
-	* @access   public
-	*/
-	function fault($faultcode,$faultstring,$faultactor='',$faultdetail=''){
-		$this->fault = new soap_fault($faultcode,$faultactor,$faultstring,$faultdetail);
-	}
-
-    /**
-    * prints html description of services
-    *
-    * @access private
-    */
-    function webDescription(){
-		$b = '
-		<html><head><title>NuSOAP: '.$this->wsdl->serviceName.'</title>
-		<style type="text/css">
-		    body    { font-family: arial; color: #000000; background-color: #ffffff; margin: 0px 0px 0px 0px; }
-		    p       { font-family: arial; color: #000000; margin-top: 0px; margin-bottom: 12px; }
-		    pre { background-color: silver; padding: 5px; font-family: Courier New; font-size: x-small; color: #000000;}
-		    ul      { margin-top: 10px; margin-left: 20px; }
-		    li      { list-style-type: none; margin-top: 10px; color: #000000; }
-		    .content{
-			margin-left: 0px; padding-bottom: 2em; }
-		    .nav {
-			padding-top: 10px; padding-bottom: 10px; padding-left: 15px; font-size: .70em;
-			margin-top: 10px; margin-left: 0px; color: #000000;
-			background-color: #ccccff; width: 20%; margin-left: 20px; margin-top: 20px; }
-		    .title {
-			font-family: arial; font-size: 26px; color: #ffffff;
-			background-color: #999999; width: 105%; margin-left: 0px;
-			padding-top: 10px; padding-bottom: 10px; padding-left: 15px;}
-		    .hidden {
-			position: absolute; visibility: hidden; z-index: 200; left: 250px; top: 100px;
-			font-family: arial; overflow: hidden; width: 600;
-			padding: 20px; font-size: 10px; background-color: #999999;
-			layer-background-color:#FFFFFF; }
-		    a,a:active  { color: charcoal; font-weight: bold; }
-		    a:visited   { color: #666666; font-weight: bold; }
-		    a:hover     { color: cc3300; font-weight: bold; }
-		</style>
-		<script language="JavaScript" type="text/javascript">
-		<!--
-		// POP-UP CAPTIONS...
-		function lib_bwcheck(){ //Browsercheck (needed)
-		    this.ver=navigator.appVersion
-		    this.agent=navigator.userAgent
-		    this.dom=document.getElementById?1:0
-		    this.opera5=this.agent.indexOf("Opera 5")>-1
-		    this.ie5=(this.ver.indexOf("MSIE 5")>-1 && this.dom && !this.opera5)?1:0;
-		    this.ie6=(this.ver.indexOf("MSIE 6")>-1 && this.dom && !this.opera5)?1:0;
-		    this.ie4=(document.all && !this.dom && !this.opera5)?1:0;
-		    this.ie=this.ie4||this.ie5||this.ie6
-		    this.mac=this.agent.indexOf("Mac")>-1
-		    this.ns6=(this.dom && parseInt(this.ver) >= 5) ?1:0;
-		    this.ns4=(document.layers && !this.dom)?1:0;
-		    this.bw=(this.ie6 || this.ie5 || this.ie4 || this.ns4 || this.ns6 || this.opera5)
-		    return this
-		}
-		var bw = new lib_bwcheck()
-		//Makes crossbrowser object.
-		function makeObj(obj){
-		    this.evnt=bw.dom? document.getElementById(obj):bw.ie4?document.all[obj]:bw.ns4?document.layers[obj]:0;
-		    if(!this.evnt) return false
-		    this.css=bw.dom||bw.ie4?this.evnt.style:bw.ns4?this.evnt:0;
-		    this.wref=bw.dom||bw.ie4?this.evnt:bw.ns4?this.css.document:0;
-		    this.writeIt=b_writeIt;
-		    return this
-		}
-		// A unit of measure that will be added when setting the position of a layer.
-		//var px = bw.ns4||window.opera?"":"px";
-		function b_writeIt(text){
-		    if (bw.ns4){this.wref.write(text);this.wref.close()}
-		    else this.wref.innerHTML = text
-		}
-		//Shows the messages
-		var oDesc;
-		function popup(divid){
-		    if(oDesc = new makeObj(divid)){
-			oDesc.css.visibility = "visible"
-		    }
-		}
-		function popout(){ // Hides message
-		    if(oDesc) oDesc.css.visibility = "hidden"
-		}
-		//-->
-		</script>
-		</head>
-		<body>
-		<div class=content>
-			<br><br>
-			<div class=title>'.$this->wsdl->serviceName.'</div>
-			<div class=nav>
-				<p>View the <a href="'.(isset($GLOBALS['PHP_SELF']) ? $GLOBALS['PHP_SELF'] : $_SERVER['PHP_SELF']).'?wsdl">WSDL</a> for the service.
-				Click on an operation name to view it&apos;s details.</p>
-				<ul>';
-				foreach($this->wsdl->getOperations() as $op => $data){
-				    $b .= "<li><a href='#' onclick=\"popup('$op')\">$op</a></li>";
-				    // create hidden div
-				    $b .= "<div id='$op' class='hidden'>
-				    <a href='#' onclick='popout()'><font color='#ffffff'>Close</font></a><br><br>";
-				    foreach($data as $donnie => $marie){ // loop through opdata
-						if($donnie == 'input' || $donnie == 'output'){ // show input/output data
-						    $b .= "<font color='white'>".ucfirst($donnie).':</font><br>';
-						    foreach($marie as $captain => $tenille){ // loop through data
-								if($captain == 'parts'){ // loop thru parts
-								    $b .= "&nbsp;&nbsp;$captain:<br>";
-					                //if(is_array($tenille)){
-								    	foreach($tenille as $joanie => $chachi){
-											$b .= "&nbsp;&nbsp;&nbsp;&nbsp;$joanie: $chachi<br>";
-								    	}
-					        		//}
-								} else {
-								    $b .= "&nbsp;&nbsp;$captain: $tenille<br>";
-								}
-						    }
-						} else {
-						    $b .= "<font color='white'>".ucfirst($donnie).":</font> $marie<br>";
-						}
-				    }
-					$b .= '</div>';
-				}
-				$b .= '
-				<ul>
-			</div>
-		</div></body></html>';
-		return $b;
-    }
-
-    /**
-    * sets up wsdl object
-    * this acts as a flag to enable internal WSDL generation
-    *
-    * @param string $serviceName, name of the service
-    * @param string $namespace optional tns namespace
-    * @param string $endpoint optional URL of service endpoint
-    * @param string $style optional (rpc|document) WSDL style (also specified by operation)
-    * @param string $transport optional SOAP transport
-    * @param string $schemaTargetNamespace optional targetNamespace for service schema
-    */
-    function configureWSDL($serviceName,$namespace = false,$endpoint = false,$style='rpc', $transport = 'http://schemas.xmlsoap.org/soap/http', $schemaTargetNamespace = false)
-    {
-		$SERVER_NAME = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : $GLOBALS['SERVER_NAME'];
-		$SERVER_PORT = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : $GLOBALS['SERVER_PORT'];
-		if ($SERVER_PORT == 80) {
-			$SERVER_PORT = '';
-		} else {
-			$SERVER_PORT = ':' . $SERVER_PORT;
-		}
-		$SCRIPT_NAME = isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : $GLOBALS['SCRIPT_NAME'];
-        if(false == $namespace) {
-            $namespace = "http://$SERVER_NAME/soap/$serviceName";
-        }
-        
-        if(false == $endpoint) {
-        	if (isset($_SERVER['HTTPS'])) {
-        		$HTTPS = $_SERVER['HTTPS'];
-        	} elseif (isset($GLOBALS['HTTPS'])) {
-        		$HTTPS = $GLOBALS['HTTPS'];
-        	} else {
-        		$HTTPS = '0';
-        	}
-        	if ($HTTPS == '1' || $HTTPS == 'on') {
-        		$SCHEME = 'https';
-        	} else {
-        		$SCHEME = 'http';
-        	}
-            $endpoint = "$SCHEME://$SERVER_NAME$SERVER_PORT$SCRIPT_NAME";
-        }
-        
-        if(false == $schemaTargetNamespace) {
-            $schemaTargetNamespace = $namespace;
-        }
-        
-		$this->wsdl = new wsdl;
-		$this->wsdl->serviceName = $serviceName;
-        $this->wsdl->endpoint = $endpoint;
-		$this->wsdl->namespaces['tns'] = $namespace;
-		$this->wsdl->namespaces['soap'] = 'http://schemas.xmlsoap.org/wsdl/soap/';
-		$this->wsdl->namespaces['wsdl'] = 'http://schemas.xmlsoap.org/wsdl/';
-		if ($schemaTargetNamespace != $namespace) {
-			$this->wsdl->namespaces['types'] = $schemaTargetNamespace;
-		}
-        $this->wsdl->schemas[$schemaTargetNamespace][0] = new xmlschema('', '', $this->wsdl->namespaces);
-        $this->wsdl->schemas[$schemaTargetNamespace][0]->schemaTargetNamespace = $schemaTargetNamespace;
-        $this->wsdl->schemas[$schemaTargetNamespace][0]->imports['http://schemas.xmlsoap.org/soap/encoding/'][0] = array('location' => '', 'loaded' => true);
-        $this->wsdl->schemas[$schemaTargetNamespace][0]->imports['http://schemas.xmlsoap.org/wsdl/'][0] = array('location' => '', 'loaded' => true);
-        $this->wsdl->bindings[$serviceName.'Binding'] = array(
-        	'name'=>$serviceName.'Binding',
-            'style'=>$style,
-            'transport'=>$transport,
-            'portType'=>$serviceName.'PortType');
-        $this->wsdl->ports[$serviceName.'Port'] = array(
-        	'binding'=>$serviceName.'Binding',
-            'location'=>$endpoint,
-            'bindingType'=>'http://schemas.xmlsoap.org/wsdl/soap/');
-    }
-}
-
-
-
-?><?php
-
-
-
-/**
-* parses a WSDL file, allows access to it's data, other utility methods
-* 
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @access public 
-*/
-class wsdl extends nusoap_base {
-	// URL or filename of the root of this WSDL
-    var $wsdl; 
-    // define internal arrays of bindings, ports, operations, messages, etc.
-    var $schemas = array();
-    var $currentSchema;
-    var $message = array();
-    var $complexTypes = array();
-    var $messages = array();
-    var $currentMessage;
-    var $currentOperation;
-    var $portTypes = array();
-    var $currentPortType;
-    var $bindings = array();
-    var $currentBinding;
-    var $ports = array();
-    var $currentPort;
-    var $opData = array();
-    var $status = '';
-    var $documentation = false;
-    var $endpoint = ''; 
-    // array of wsdl docs to import
-    var $import = array(); 
-    // parser vars
-    var $parser;
-    var $position = 0;
-    var $depth = 0;
-    var $depth_array = array();
-	// for getting wsdl
-	var $proxyhost = '';
-    var $proxyport = '';
-	var $proxyusername = '';
-	var $proxypassword = '';
-	var $timeout = 0;
-	var $response_timeout = 30;
-
-    /**
-     * constructor
-     * 
-     * @param string $wsdl WSDL document URL
-	 * @param string $proxyhost
-	 * @param string $proxyport
-	 * @param string $proxyusername
-	 * @param string $proxypassword
-	 * @param integer $timeout set the connection timeout
-	 * @param integer $response_timeout set the response timeout
-     * @access public 
-     */
-    function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30){
-        $this->wsdl = $wsdl;
-        $this->proxyhost = $proxyhost;
-        $this->proxyport = $proxyport;
-		$this->proxyusername = $proxyusername;
-		$this->proxypassword = $proxypassword;
-		$this->timeout = $timeout;
-		$this->response_timeout = $response_timeout;
-        
-        // parse wsdl file
-        if ($wsdl != "") {
-            $this->debug('initial wsdl URL: ' . $wsdl);
-            $this->parseWSDL($wsdl);
-        }
-        // imports
-        // TODO: handle imports more properly, grabbing them in-line and nesting them
-        	$imported_urls = array();
-        	$imported = 1;
-        	while ($imported > 0) {
-        		$imported = 0;
-        		// Schema imports
-        		foreach ($this->schemas as $ns => $list) {
-        			foreach ($list as $xs) {
-						$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!
-			            foreach ($xs->imports as $ns2 => $list2) {
-			                for ($ii = 0; $ii < count($list2); $ii++) {
-			                	if (! $list2[$ii]['loaded']) {
-			                		$this->schemas[$ns]->imports[$ns2][$ii]['loaded'] = true;
-			                		$url = $list2[$ii]['location'];
-									if ($url != '') {
-										$urlparts = parse_url($url);
-										if (!isset($urlparts['host'])) {
-											$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . 
-													substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];
-										}
-										if (! in_array($url, $imported_urls)) {
-						                	$this->parseWSDL($url);
-					                		$imported++;
-					                		$imported_urls[] = $url;
-					                	}
-									} else {
-										$this->debug("Unexpected scenario: empty URL for unloaded import");
-									}
-								}
-							}
-			            } 
-        			}
-        		}
-        		// WSDL imports
-				$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!
-	            foreach ($this->import as $ns => $list) {
-	                for ($ii = 0; $ii < count($list); $ii++) {
-	                	if (! $list[$ii]['loaded']) {
-	                		$this->import[$ns][$ii]['loaded'] = true;
-	                		$url = $list[$ii]['location'];
-							if ($url != '') {
-								$urlparts = parse_url($url);
-								if (!isset($urlparts['host'])) {
-									$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . 
-											substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];
-								}
-								if (! in_array($url, $imported_urls)) {
-				                	$this->parseWSDL($url);
-			                		$imported++;
-			                		$imported_urls[] = $url;
-			                	}
-							} else {
-								$this->debug("Unexpected scenario: empty URL for unloaded import");
-							}
-						}
-					}
-	            } 
-			}
-        // add new data to operation data
-        foreach($this->bindings as $binding => $bindingData) {
-            if (isset($bindingData['operations']) && is_array($bindingData['operations'])) {
-                foreach($bindingData['operations'] as $operation => $data) {
-                    $this->debug('post-parse data gathering for ' . $operation);
-                    $this->bindings[$binding]['operations'][$operation]['input'] = 
-						isset($this->bindings[$binding]['operations'][$operation]['input']) ? 
-						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[ $bindingData['portType'] ][$operation]['input']) :
-						$this->portTypes[ $bindingData['portType'] ][$operation]['input'];
-                    $this->bindings[$binding]['operations'][$operation]['output'] = 
-						isset($this->bindings[$binding]['operations'][$operation]['output']) ?
-						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[ $bindingData['portType'] ][$operation]['output']) :
-						$this->portTypes[ $bindingData['portType'] ][$operation]['output'];
-                    if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ])){
-						$this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ];
-					}
-					if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ])){
-                   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ];
-                    }
-					if (isset($bindingData['style'])) {
-                        $this->bindings[$binding]['operations'][$operation]['style'] = $bindingData['style'];
-                    }
-                    $this->bindings[$binding]['operations'][$operation]['transport'] = isset($bindingData['transport']) ? $bindingData['transport'] : '';
-                    $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[ $bindingData['portType'] ][$operation]['documentation']) ? $this->portTypes[ $bindingData['portType'] ][$operation]['documentation'] : '';
-                    $this->bindings[$binding]['operations'][$operation]['endpoint'] = isset($bindingData['endpoint']) ? $bindingData['endpoint'] : '';
-                } 
-            } 
-        }
-    }
-
-    /**
-     * parses the wsdl document
-     * 
-     * @param string $wsdl path or URL
-     * @access private 
-     */
-    function parseWSDL($wsdl = '')
-    {
-        if ($wsdl == '') {
-            $this->debug('no wsdl passed to parseWSDL()!!');
-            $this->setError('no wsdl passed to parseWSDL()!!');
-            return false;
-        }
-        
-        // parse $wsdl for url format
-        $wsdl_props = parse_url($wsdl);
-
-        if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'http' || $wsdl_props['scheme'] == 'https')) {
-            $this->debug('getting WSDL http(s) URL ' . $wsdl);
-        	// get wsdl
-	        $tr = new soap_transport_http($wsdl);
-			$tr->request_method = 'GET';
-			$tr->useSOAPAction = false;
-			if($this->proxyhost && $this->proxyport){
-				$tr->setProxy($this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword);
-			}
-			if (isset($wsdl_props['user'])) {
-                $tr->setCredentials($wsdl_props['user'],$wsdl_props['pass']);
-            }
-			$wsdl_string = $tr->send('', $this->timeout, $this->response_timeout);
-			//$this->debug("WSDL request\n" . $tr->outgoing_payload);
-			//$this->debug("WSDL response\n" . $tr->incoming_payload);
-			$this->debug("transport debug data...\n" . $tr->debug_str);
-			// catch errors
-			if($err = $tr->getError() ){
-				$errstr = 'HTTP ERROR: '.$err;
-				$this->debug($errstr);
-	            $this->setError($errstr);
-				unset($tr);
-	            return false;
-			}
-			unset($tr);
-        } else {
-            // $wsdl is not http(s), so treat it as a file URL or plain file path
-        	if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'file') && isset($wsdl_props['path'])) {
-        		$path = isset($wsdl_props['host']) ? ($wsdl_props['host'] . ':' . $wsdl_props['path']) : $wsdl_props['path'];
-        	} else {
-        		$path = $wsdl;
-        	}
-            $this->debug('getting WSDL file ' . $path);
-            if ($fp = @fopen($path, 'r')) {
-                $wsdl_string = '';
-                while ($data = fread($fp, 32768)) {
-                    $wsdl_string .= $data;
-                } 
-                fclose($fp);
-            } else {
-            	$errstr = "Bad path to WSDL file $path";
-            	$this->debug($errstr);
-                $this->setError($errstr);
-                return false;
-            } 
-        }
-        // end new code added
-        // Create an XML parser.
-        $this->parser = xml_parser_create(); 
-        // Set the options for parsing the XML data.
-        // xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-        xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0); 
-        // Set the object for the parser.
-        xml_set_object($this->parser, $this); 
-        // Set the element handlers for the parser.
-        xml_set_element_handler($this->parser, 'start_element', 'end_element');
-        xml_set_character_data_handler($this->parser, 'character_data');
-        // Parse the XML file.
-        if (!xml_parse($this->parser, $wsdl_string, true)) {
-            // Display an error message.
-            $errstr = sprintf(
-				'XML error parsing WSDL from %s on line %d: %s',
-				$wsdl,
-                xml_get_current_line_number($this->parser),
-                xml_error_string(xml_get_error_code($this->parser))
-                );
-            $this->debug($errstr);
-			$this->debug("XML payload:\n" . $wsdl_string);
-            $this->setError($errstr);
-            return false;
-        } 
-		// free the parser
-        xml_parser_free($this->parser);
-		// catch wsdl parse errors
-		if($this->getError()){
-			return false;
-		}
-        return true;
-    } 
-
-    /**
-     * start-element handler
-     * 
-     * @param string $parser XML parser object
-     * @param string $name element name
-     * @param string $attrs associative array of attributes
-     * @access private 
-     */
-    function start_element($parser, $name, $attrs)
-    {
-        if ($this->status == 'schema') {
-            $this->currentSchema->schemaStartElement($parser, $name, $attrs);
-            $this->debug_str .= $this->currentSchema->debug_str;
-            $this->currentSchema->debug_str = '';
-        } elseif (ereg('schema$', $name)) {
-            // $this->debug("startElement for $name ($attrs[name]). status = $this->status (".$this->getLocalPart($name).")");
-            $this->status = 'schema';
-            $this->currentSchema = new xmlschema('', '', $this->namespaces);
-            $this->currentSchema->schemaStartElement($parser, $name, $attrs);
-            $this->debug_str .= $this->currentSchema->debug_str;
-            $this->currentSchema->debug_str = '';
-        } else {
-            // position in the total number of elements, starting from 0
-            $pos = $this->position++;
-            $depth = $this->depth++; 
-            // set self as current value for this depth
-            $this->depth_array[$depth] = $pos;
-            $this->message[$pos] = array('cdata' => ''); 
-            // get element prefix
-            if (ereg(':', $name)) {
-                // get ns prefix
-                $prefix = substr($name, 0, strpos($name, ':')); 
-                // get ns
-                $namespace = isset($this->namespaces[$prefix]) ? $this->namespaces[$prefix] : ''; 
-                // get unqualified name
-                $name = substr(strstr($name, ':'), 1);
-            } 
-
-            if (count($attrs) > 0) {
-                foreach($attrs as $k => $v) {
-                    // if ns declarations, add to class level array of valid namespaces
-                    if (ereg("^xmlns", $k)) {
-                        if ($ns_prefix = substr(strrchr($k, ':'), 1)) {
-                            $this->namespaces[$ns_prefix] = $v;
-                        } else {
-                            $this->namespaces['ns' . (count($this->namespaces) + 1)] = $v;
-                        } 
-                        if ($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema') {
-                            $this->XMLSchemaVersion = $v;
-                            $this->namespaces['xsi'] = $v . '-instance';
-                        } 
-                    } //  
-                    // expand each attribute
-                    $k = strpos($k, ':') ? $this->expandQname($k) : $k;
-                    if ($k != 'location' && $k != 'soapAction' && $k != 'namespace') {
-                        $v = strpos($v, ':') ? $this->expandQname($v) : $v;
-                    } 
-                    $eAttrs[$k] = $v;
-                } 
-                $attrs = $eAttrs;
-            } else {
-                $attrs = array();
-            } 
-            // find status, register data
-            switch ($this->status) {
-                case 'message':
-                    if ($name == 'part') {
-                    	if (isset($attrs['type'])) {
-		                    $this->debug("msg " . $this->currentMessage . ": found part $attrs[name]: " . implode(',', $attrs));
-		                    $this->messages[$this->currentMessage][$attrs['name']] = $attrs['type'];
-            			} 
-			            if (isset($attrs['element'])) {
-			                $this->messages[$this->currentMessage][$attrs['name']] = $attrs['element'];
-			            } 
-        			} 
-        			break;
-			    case 'portType':
-			        switch ($name) {
-			            case 'operation':
-			                $this->currentPortOperation = $attrs['name'];
-			                $this->debug("portType $this->currentPortType operation: $this->currentPortOperation");
-			                if (isset($attrs['parameterOrder'])) {
-			                	$this->portTypes[$this->currentPortType][$attrs['name']]['parameterOrder'] = $attrs['parameterOrder'];
-			        		} 
-			        		break;
-					    case 'documentation':
-					        $this->documentation = true;
-					        break; 
-					    // merge input/output data
-					    default:
-					        $m = isset($attrs['message']) ? $this->getLocalPart($attrs['message']) : '';
-					        $this->portTypes[$this->currentPortType][$this->currentPortOperation][$name]['message'] = $m;
-					        break;
-					} 
-			    	break;
-				case 'binding':
-				    switch ($name) {
-				        case 'binding': 
-				            // get ns prefix
-				            if (isset($attrs['style'])) {
-				            $this->bindings[$this->currentBinding]['prefix'] = $prefix;
-					    	} 
-					    	$this->bindings[$this->currentBinding] = array_merge($this->bindings[$this->currentBinding], $attrs);
-					    	break;
-						case 'header':
-						    $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus]['headers'][] = $attrs;
-						    break;
-						case 'operation':
-						    if (isset($attrs['soapAction'])) {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['soapAction'] = $attrs['soapAction'];
-						    } 
-						    if (isset($attrs['style'])) {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['style'] = $attrs['style'];
-						    } 
-						    if (isset($attrs['name'])) {
-						        $this->currentOperation = $attrs['name'];
-						        $this->debug("current binding operation: $this->currentOperation");
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['name'] = $attrs['name'];
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['binding'] = $this->currentBinding;
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['endpoint'] = isset($this->bindings[$this->currentBinding]['endpoint']) ? $this->bindings[$this->currentBinding]['endpoint'] : '';
-						    } 
-						    break;
-						case 'input':
-						    $this->opStatus = 'input';
-						    break;
-						case 'output':
-						    $this->opStatus = 'output';
-						    break;
-						case 'body':
-						    if (isset($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus])) {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = array_merge($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus], $attrs);
-						    } else {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = $attrs;
-						    } 
-						    break;
-					} 
-					break;
-				case 'service':
-					switch ($name) {
-					    case 'port':
-					        $this->currentPort = $attrs['name'];
-					        $this->debug('current port: ' . $this->currentPort);
-					        $this->ports[$this->currentPort]['binding'] = $this->getLocalPart($attrs['binding']);
-					
-					        break;
-					    case 'address':
-					        $this->ports[$this->currentPort]['location'] = $attrs['location'];
-					        $this->ports[$this->currentPort]['bindingType'] = $namespace;
-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['bindingType'] = $namespace;
-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['endpoint'] = $attrs['location'];
-					        break;
-					} 
-					break;
-			} 
-		// set status
-		switch ($name) {
-			case 'import':
-			    if (isset($attrs['location'])) {
-                    $this->import[$attrs['namespace']][] = array('location' => $attrs['location'], 'loaded' => false);
-                    $this->debug('parsing import ' . $attrs['namespace']. ' - ' . $attrs['location'] . ' (' . count($this->import[$attrs['namespace']]).')');
-				} else {
-                    $this->import[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
-					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {
-						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];
-					}
-                    $this->debug('parsing import ' . $attrs['namespace']. ' - [no location] (' . count($this->import[$attrs['namespace']]).')');
-				}
-				break;
-			//wait for schema
-			//case 'types':
-			//	$this->status = 'schema';
-			//	break;
-			case 'message':
-				$this->status = 'message';
-				$this->messages[$attrs['name']] = array();
-				$this->currentMessage = $attrs['name'];
-				break;
-			case 'portType':
-				$this->status = 'portType';
-				$this->portTypes[$attrs['name']] = array();
-				$this->currentPortType = $attrs['name'];
-				break;
-			case "binding":
-				if (isset($attrs['name'])) {
-				// get binding name
-					if (strpos($attrs['name'], ':')) {
-			    		$this->currentBinding = $this->getLocalPart($attrs['name']);
-					} else {
-			    		$this->currentBinding = $attrs['name'];
-					} 
-					$this->status = 'binding';
-					$this->bindings[$this->currentBinding]['portType'] = $this->getLocalPart($attrs['type']);
-					$this->debug("current binding: $this->currentBinding of portType: " . $attrs['type']);
-				} 
-				break;
-			case 'service':
-				$this->serviceName = $attrs['name'];
-				$this->status = 'service';
-				$this->debug('current service: ' . $this->serviceName);
-				break;
-			case 'definitions':
-				foreach ($attrs as $name => $value) {
-					$this->wsdl_info[$name] = $value;
-				} 
-				break;
-			} 
-		} 
-	} 
-
-	/**
-	* end-element handler
-	* 
-	* @param string $parser XML parser object
-	* @param string $name element name
-	* @access private 
-	*/
-	function end_element($parser, $name){ 
-		// unset schema status
-		if (/*ereg('types$', $name) ||*/ ereg('schema$', $name)) {
-			$this->status = "";
-			$this->schemas[$this->currentSchema->schemaTargetNamespace][] = $this->currentSchema;
-		} 
-		if ($this->status == 'schema') {
-			$this->currentSchema->schemaEndElement($parser, $name);
-		} else {
-			// bring depth down a notch
-			$this->depth--;
-		} 
-		// end documentation
-		if ($this->documentation) {
-			//TODO: track the node to which documentation should be assigned; it can be a part, message, etc.
-			//$this->portTypes[$this->currentPortType][$this->currentPortOperation]['documentation'] = $this->documentation;
-			$this->documentation = false;
-		} 
-	} 
-
-	/**
-	 * element content handler
-	 * 
-	 * @param string $parser XML parser object
-	 * @param string $data element content
-	 * @access private 
-	 */
-	function character_data($parser, $data)
-	{
-		$pos = isset($this->depth_array[$this->depth]) ? $this->depth_array[$this->depth] : 0;
-		if (isset($this->message[$pos]['cdata'])) {
-			$this->message[$pos]['cdata'] .= $data;
-		} 
-		if ($this->documentation) {
-			$this->documentation .= $data;
-		} 
-	} 
-	
-	function getBindingData($binding)
-	{
-		if (is_array($this->bindings[$binding])) {
-			return $this->bindings[$binding];
-		} 
-	}
-	
-	/**
-	 * returns an assoc array of operation names => operation data
-	 * 
-	 * @param string $bindingType eg: soap, smtp, dime (only soap is currently supported)
-	 * @return array 
-	 * @access public 
-	 */
-	function getOperations($bindingType = 'soap')
-	{
-		$ops = array();
-		if ($bindingType == 'soap') {
-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';
-		}
-		// loop thru ports
-		foreach($this->ports as $port => $portData) {
-			// binding type of port matches parameter
-			if ($portData['bindingType'] == $bindingType) {
-				//$this->debug("getOperations for port $port");
-				//$this->debug("port data: " . $this->varDump($portData));
-				//$this->debug("bindings: " . $this->varDump($this->bindings[ $portData['binding'] ]));
-				// merge bindings
-				if (isset($this->bindings[ $portData['binding'] ]['operations'])) {
-					$ops = array_merge ($ops, $this->bindings[ $portData['binding'] ]['operations']);
-				}
-			}
-		} 
-		return $ops;
-	} 
-	
-	/**
-	 * returns an associative array of data necessary for calling an operation
-	 * 
-	 * @param string $operation , name of operation
-	 * @param string $bindingType , type of binding eg: soap
-	 * @return array 
-	 * @access public 
-	 */
-	function getOperationData($operation, $bindingType = 'soap')
-	{
-		if ($bindingType == 'soap') {
-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';
-		}
-		// loop thru ports
-		foreach($this->ports as $port => $portData) {
-			// binding type of port matches parameter
-			if ($portData['bindingType'] == $bindingType) {
-				// get binding
-				//foreach($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {
-				foreach(array_keys($this->bindings[ $portData['binding'] ]['operations']) as $bOperation) {
-					if ($operation == $bOperation) {
-						$opData = $this->bindings[ $portData['binding'] ]['operations'][$operation];
-					    return $opData;
-					} 
-				} 
-			}
-		} 
-	}
-	
-	/**
-    * returns an array of information about a given type
-    * returns false if no type exists by the given name
-    *
-	*	 typeDef = array(
-	*	 'elements' => array(), // refs to elements array
-	*	'restrictionBase' => '',
-	*	'phpType' => '',
-	*	'order' => '(sequence|all)',
-	*	'attrs' => array() // refs to attributes array
-	*	)
-    *
-    * @param $type string
-    * @param $ns string
-    * @return mixed
-    * @access public
-    * @see xmlschema
-    */
-	function getTypeDef($type, $ns) {
-		if ((! $ns) && isset($this->namespaces['tns'])) {
-			$ns = $this->namespaces['tns'];
-		}
-		if (isset($this->schemas[$ns])) {
-			foreach ($this->schemas[$ns] as $xs) {
-				$t = $xs->getTypeDef($type);
-				$this->debug_str .= $xs->debug_str;
-				$xs->debug_str = '';
-				if ($t) {
-					return $t;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	* serialize the parsed wsdl
-	* 
-	* @return string , serialization of WSDL
-	* @access public 
-	*/
-	function serialize()
-	{
-		$xml = '<?xml version="1.0" encoding="ISO-8859-1"?><definitions';
-		foreach($this->namespaces as $k => $v) {
-			$xml .= " xmlns:$k=\"$v\"";
-		} 
-		// 10.9.02 - add poulter fix for wsdl and tns declarations
-		if (isset($this->namespaces['wsdl'])) {
-			$xml .= " xmlns=\"" . $this->namespaces['wsdl'] . "\"";
-		} 
-		if (isset($this->namespaces['tns'])) {
-			$xml .= " targetNamespace=\"" . $this->namespaces['tns'] . "\"";
-		} 
-		$xml .= '>'; 
-		// imports
-		if (sizeof($this->import) > 0) {
-			foreach($this->import as $ns => $list) {
-				foreach ($list as $ii) {
-					if ($ii['location'] != '') {
-						$xml .= '<import location="' . $ii['location'] . '" namespace="' . $ns . '" />';
-					} else {
-						$xml .= '<import namespace="' . $ns . '" />';
-					}
-				}
-			} 
-		} 
-		// types
-		if (count($this->schemas)>=1) {
-			$xml .= '<types>';
-			foreach ($this->schemas as $ns => $list) {
-				foreach ($list as $xs) {
-					$xml .= $xs->serializeSchema();
-				}
-			}
-			$xml .= '</types>';
-		} 
-		// messages
-		if (count($this->messages) >= 1) {
-			foreach($this->messages as $msgName => $msgParts) {
-				$xml .= '<message name="' . $msgName . '">';
-				if(is_array($msgParts)){
-					foreach($msgParts as $partName => $partType) {
-						// print 'serializing '.$partType.', sv: '.$this->XMLSchemaVersion.'<br>';
-						if (strpos($partType, ':')) {
-						    $typePrefix = $this->getPrefixFromNamespace($this->getPrefix($partType));
-						} elseif (isset($this->typemap[$this->namespaces['xsd']][$partType])) {
-						    // print 'checking typemap: '.$this->XMLSchemaVersion.'<br>';
-						    $typePrefix = 'xsd';
-						} else {
-						    foreach($this->typemap as $ns => $types) {
-						        if (isset($types[$partType])) {
-						            $typePrefix = $this->getPrefixFromNamespace($ns);
-						        } 
-						    } 
-						    if (!isset($typePrefix)) {
-						        die("$partType has no namespace!");
-						    } 
-						} 
-						$xml .= '<part name="' . $partName . '" type="' . $typePrefix . ':' . $this->getLocalPart($partType) . '" />';
-					}
-				}
-				$xml .= '</message>';
-			} 
-		} 
-		// bindings & porttypes
-		if (count($this->bindings) >= 1) {
-			$binding_xml = '';
-			$portType_xml = '';
-			foreach($this->bindings as $bindingName => $attrs) {
-				$binding_xml .= '<binding name="' . $bindingName . '" type="tns:' . $attrs['portType'] . '">';
-				$binding_xml .= '<soap:binding style="' . $attrs['style'] . '" transport="' . $attrs['transport'] . '"/>';
-				$portType_xml .= '<portType name="' . $attrs['portType'] . '">';
-				foreach($attrs['operations'] as $opName => $opParts) {
-					$binding_xml .= '<operation name="' . $opName . '">';
-					$binding_xml .= '<soap:operation soapAction="' . $opParts['soapAction'] . '" style="'. $attrs['style'] . '"/>';
-					if (isset($opParts['input']['encodingStyle']) && $opParts['input']['encodingStyle'] != '') {
-						$enc_style = ' encodingStyle="' . $opParts['input']['encodingStyle'] . '"';
-					} else {
-						$enc_style = '';
-					}
-					$binding_xml .= '<input><soap:body use="' . $opParts['input']['use'] . '" namespace="' . $opParts['input']['namespace'] . '"' . $enc_style . '/></input>';
-					if (isset($opParts['output']['encodingStyle']) && $opParts['output']['encodingStyle'] != '') {
-						$enc_style = ' encodingStyle="' . $opParts['output']['encodingStyle'] . '"';
-					} else {
-						$enc_style = '';
-					}
-					$binding_xml .= '<output><soap:body use="' . $opParts['output']['use'] . '" namespace="' . $opParts['output']['namespace'] . '"' . $enc_style . '/></output>';
-					$binding_xml .= '</operation>';
-					$portType_xml .= '<operation name="' . $opParts['name'] . '"';
-					if (isset($opParts['parameterOrder'])) {
-					    $portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';
-					} 
-					$portType_xml .= '>';
-					if(isset($opParts['documentation']) && $opParts['documentation'] != '') {
-						$portType_xml .= '<documentation>' . htmlspecialchars($opParts['documentation']) . '</documentation>';
-					}
-					$portType_xml .= '<input message="tns:' . $opParts['input']['message'] . '"/>';
-					$portType_xml .= '<output message="tns:' . $opParts['output']['message'] . '"/>';
-					$portType_xml .= '</operation>';
-				} 
-				$portType_xml .= '</portType>';
-				$binding_xml .= '</binding>';
-			} 
-			$xml .= $portType_xml . $binding_xml;
-		} 
-		// services
-		$xml .= '<service name="' . $this->serviceName . '">';
-		if (count($this->ports) >= 1) {
-			foreach($this->ports as $pName => $attrs) {
-				$xml .= '<port name="' . $pName . '" binding="tns:' . $attrs['binding'] . '">';
-				$xml .= '<soap:address location="' . $attrs['location'] . '"/>';
-				$xml .= '</port>';
-			} 
-		} 
-		$xml .= '</service>';
-		return $xml . '</definitions>';
-	} 
-	
-	/**
-	 * serialize a PHP value according to a WSDL message definition
-	 * 
-	 * TODO
-	 * - multi-ref serialization
-	 * - validate PHP values against type definitions, return errors if invalid
-	 * 
-	 * @param string $ type name
-	 * @param mixed $ param value
-	 * @return mixed new param or false if initial value didn't validate
-	 */
-	function serializeRPCParameters($operation, $direction, $parameters)
-	{
-		$this->debug('in serializeRPCParameters with operation '.$operation.', direction '.$direction.' and '.count($parameters).' param(s), and xml schema version ' . $this->XMLSchemaVersion); 
-		
-		if ($direction != 'input' && $direction != 'output') {
-			$this->debug('The value of the \$direction argument needs to be either "input" or "output"');
-			$this->setError('The value of the \$direction argument needs to be either "input" or "output"');
-			return false;
-		} 
-		if (!$opData = $this->getOperationData($operation)) {
-			$this->debug('Unable to retrieve WSDL data for operation: ' . $operation);
-			$this->setError('Unable to retrieve WSDL data for operation: ' . $operation);
-			return false;
-		}
-		$this->debug($this->varDump($opData));
-
-		// Get encoding style for output and set to current
-		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
-			$encodingStyle = $opData['output']['encodingStyle'];
-			$enc_style = $encodingStyle;
-		}
-
-		// set input params
-		$xml = '';
-		if (isset($opData[$direction]['parts']) && sizeof($opData[$direction]['parts']) > 0) {
-			
-			$use = $opData[$direction]['use'];
-			$this->debug("use=$use");
-			$this->debug('got ' . count($opData[$direction]['parts']) . ' part(s)');
-			if (is_array($parameters)) {
-				$parametersArrayType = $this->isArraySimpleOrStruct($parameters);
-				$this->debug('have ' . $parametersArrayType . ' parameters');
-				foreach($opData[$direction]['parts'] as $name => $type) {
-					$this->debug('serializing part "'.$name.'" of type "'.$type.'"');
-					// Track encoding style
-					if (isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
-						$encodingStyle = $opData[$direction]['encodingStyle'];			
-						$enc_style = $encodingStyle;
-					} else {
-						$enc_style = false;
-					}
-					// NOTE: add error handling here
-					// if serializeType returns false, then catch global error and fault
-					if ($parametersArrayType == 'arraySimple') {
-						$p = array_shift($parameters);
-						$this->debug('calling serializeType w/indexed param');
-						$xml .= $this->serializeType($name, $type, $p, $use, $enc_style);
-					} elseif (isset($parameters[$name])) {
-						$this->debug('calling serializeType w/named param');
-						$xml .= $this->serializeType($name, $type, $parameters[$name], $use, $enc_style);
-					} else {
-						// TODO: only send nillable
-						$this->debug('calling serializeType w/null param');
-						$xml .= $this->serializeType($name, $type, null, $use, $enc_style);
-					}
-				}
-			} else {
-				$this->debug('no parameters passed.');
-			}
-		}
-		return $xml;
-	} 
-	
-	/**
-	 * serialize a PHP value according to a WSDL message definition
-	 * 
-	 * TODO
-	 * - multi-ref serialization
-	 * - validate PHP values against type definitions, return errors if invalid
-	 * 
-	 * @param string $ type name
-	 * @param mixed $ param value
-	 * @return mixed new param or false if initial value didn't validate
-	 */
-	function serializeParameters($operation, $direction, $parameters)
-	{
-		$this->debug('in serializeParameters with operation '.$operation.', direction '.$direction.' and '.count($parameters).' param(s), and xml schema version ' . $this->XMLSchemaVersion); 
-		
-		if ($direction != 'input' && $direction != 'output') {
-			$this->debug('The value of the \$direction argument needs to be either "input" or "output"');
-			$this->setError('The value of the \$direction argument needs to be either "input" or "output"');
-			return false;
-		} 
-		if (!$opData = $this->getOperationData($operation)) {
-			$this->debug('Unable to retrieve WSDL data for operation: ' . $operation);
-			$this->setError('Unable to retrieve WSDL data for operation: ' . $operation);
-			return false;
-		}
-		$this->debug($this->varDump($opData));
-		
-		// Get encoding style for output and set to current
-		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
-			$encodingStyle = $opData['output']['encodingStyle'];
-			$enc_style = $encodingStyle;
-		}
-		
-		// set input params
-		$xml = '';
-		if (isset($opData[$direction]['parts']) && sizeof($opData[$direction]['parts']) > 0) {
-			
-			$use = $opData[$direction]['use'];
-			$this->debug("use=$use");
-			$this->debug('got ' . count($opData[$direction]['parts']) . ' part(s)');
-			if (is_array($parameters)) {
-				$parametersArrayType = $this->isArraySimpleOrStruct($parameters);
-				$this->debug('have ' . $parametersArrayType . ' parameters');
-				foreach($opData[$direction]['parts'] as $name => $type) {
-					$this->debug('serializing part "'.$name.'" of type "'.$type.'"');
-					// Track encoding style
-					if(isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
-						$encodingStyle = $opData[$direction]['encodingStyle'];			
-						$enc_style = $encodingStyle;
-					} else {
-						$enc_style = false;
-					}
-					// NOTE: add error handling here
-					// if serializeType returns false, then catch global error and fault
-					if ($parametersArrayType == 'arraySimple') {
-						$p = array_shift($parameters);
-						$this->debug('calling serializeType w/indexed param');
-						$xml .= $this->serializeType($name, $type, $p, $use, $enc_style);
-					} elseif (isset($parameters[$name])) {
-						$this->debug('calling serializeType w/named param');
-						$xml .= $this->serializeType($name, $type, $parameters[$name], $use, $enc_style);
-					} else {
-						// TODO: only send nillable
-						$this->debug('calling serializeType w/null param');
-						$xml .= $this->serializeType($name, $type, null, $use, $enc_style);
-					}
-				}
-			} else {
-				$this->debug('no parameters passed.');
-			}
-		}
-		return $xml;
-	} 
-	
-	/**
-	 * serializes a PHP value according a given type definition
-	 * 
-	 * @param string $name , name of type (part)
-	 * @param string $type , type of type, heh (type or element)
-	 * @param mixed $value , a native PHP value (parameter value)
-	 * @param string $use , use for part (encoded|literal)
-	 * @param string $encodingStyle , use to add encoding changes to serialisation
-	 * @return string serialization
-	 * @access public 
-	 */
-	function serializeType($name, $type, $value, $use='encoded', $encodingStyle=false)
-	{
-		$this->debug("in serializeType: $name, $type, $value, $use, $encodingStyle");
-		if($use == 'encoded' && $encodingStyle) {
-			$encodingStyle = ' SOAP-ENV:encodingStyle="' . $encodingStyle . '"';
-		}
-
-		// if a soap_val has been supplied, let its type override the WSDL
-    	if (is_object($value) && get_class($value) == 'soapval') {
-    		// TODO: get attributes from soapval?
-    		if ($value->type_ns) {
-    			$type = $value->type_ns . ':' . $value->type;
-    		} else {
-	    		$type = $value->type;
-	    	}
-	    	$value = $value->value;
-	    	$forceType = true;
-	    	$this->debug("in serializeType: soapval overrides type to $type, value to $value");
-        } else {
-        	$forceType = false;
-        }
-
-		$xml = '';
-		if (strpos($type, ':')) {
-			$uqType = substr($type, strrpos($type, ':') + 1);
-			$ns = substr($type, 0, strrpos($type, ':'));
-			$this->debug("got a prefixed type: $uqType, $ns");
-			if ($this->getNamespaceFromPrefix($ns)) {
-				$ns = $this->getNamespaceFromPrefix($ns);
-				$this->debug("expanded prefixed type: $uqType, $ns");
-			}
-
-			if($ns == $this->XMLSchemaVersion){
-				
-				if (is_null($value)) {
-					if ($use == 'literal') {
-						// TODO: depends on nillable
-						return "<$name/>";
-					} else {
-						return "<$name xsi:nil=\"true\"/>";
-					}
-				}
-		    	if ($uqType == 'boolean' && !$value) {
-					$value = 'false';
-				} elseif ($uqType == 'boolean') {
-					$value = 'true';
-				} 
-				if ($uqType == 'string' && gettype($value) == 'string') {
-					$value = $this->expandEntities($value);
-				} 
-				// it's a scalar
-				// TODO: what about null/nil values?
-				// check type isn't a custom type extending xmlschema namespace
-				if (!$this->getTypeDef($uqType, $ns)) {
-					if ($use == 'literal') {
-						if ($forceType) {
-							return "<$name xsi:type=\"" . $this->getPrefixFromNamespace($this->XMLSchemaVersion) . ":$uqType\">$value</$name>";
-						} else {
-							return "<$name>$value</$name>";
-						}
-					} else {
-						return "<$name xsi:type=\"" . $this->getPrefixFromNamespace($this->XMLSchemaVersion) . ":$uqType\"$encodingStyle>$value</$name>";
-					}
-				}
-			} else if ($ns == 'http://xml.apache.org/xml-soap') {
-				if ($uqType == 'Map') {
-					$contents = '';
-					foreach($value as $k => $v) {
-						$this->debug("serializing map element: key $k, value $v");
-						$contents .= '<item>';
-						$contents .= $this->serialize_val($k,'key',false,false,false,false,$use);
-						$contents .= $this->serialize_val($v,'value',false,false,false,false,$use);
-						$contents .= '</item>';
-					}
-					if ($use == 'literal') {
-						if ($forceType) {
-						return "<$name xsi:type=\"" . $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap') . ":$uqType\">$contents</$name>";
-						} else {
-							return "<$name>$contents</$name>";
-						}
-					} else {
-						return "<$name xsi:type=\"" . $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap') . ":$uqType\"$encodingStyle>$contents</$name>";
-					}
-				}
-			}
-		} else {
-			$this->debug("No namespace for type $type");
-			$ns = '';
-			$uqType = $type;
-		}
-		if(!$typeDef = $this->getTypeDef($uqType, $ns)){
-			$this->setError("$type ($uqType) is not a supported type.");
-			$this->debug("$type ($uqType) is not a supported type.");
-			return false;
-		} else {
-			foreach($typeDef as $k => $v) {
-				$this->debug("typedef, $k: $v");
-			}
-		}
-		$phpType = $typeDef['phpType'];
-		$this->debug("serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '') ); 
-		// if php type == struct, map value to the <all> element names
-		if ($phpType == 'struct') {
-			if (isset($typeDef['typeClass']) && $typeDef['typeClass'] == 'element') {
-				$elementName = $uqType;
-				if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {
-					$elementNS = " xmlns=\"$ns\"";
-				}
-			} else {
-				$elementName = $name;
-				$elementNS = '';
-			}
-			if (is_null($value)) {
-				if ($use == 'literal') {
-					// TODO: depends on nillable
-					return "<$elementName$elementNS/>";
-				} else {
-					return "<$elementName$elementNS xsi:nil=\"true\"/>";
-				}
-			}
-			if ($use == 'literal') {
-				if ($forceType) {
-					$xml = "<$elementName$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">";
-				} else {
-					$xml = "<$elementName$elementNS>";
-				}
-			} else {
-				$xml = "<$elementName$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>";
-			}
-			
-			if (isset($typeDef['elements']) && is_array($typeDef['elements'])) {
-				if (is_array($value)) {
-					$xvalue = $value;
-				} elseif (is_object($value)) {
-					$xvalue = get_object_vars($value);
-				} else {
-					$this->debug("value is neither an array nor an object for XML Schema type $ns:$uqType");
-					$xvalue = array();
-				}
-				// toggle whether all elements are present - ideally should validate against schema
-				if(count($typeDef['elements']) != count($xvalue)){
-					$optionals = true;
-				}
-				foreach($typeDef['elements'] as $eName => $attrs) {
-					// if user took advantage of a minOccurs=0, then only serialize named parameters
-					if(isset($optionals) && !isset($xvalue[$eName])){
-						// do nothing
-					} else {
-						// get value
-						if (isset($xvalue[$eName])) {
-						    $v = $xvalue[$eName];
-						} else {
-						    $v = null;
-						}
-						// TODO: if maxOccurs > 1 (not just unbounded), then allow serialization of an array
-						if (isset($attrs['maxOccurs']) && $attrs['maxOccurs'] == 'unbounded' && isset($v) && is_array($v) && $this->isArraySimpleOrStruct($v) == 'arraySimple') {
-							$vv = $v;
-							foreach ($vv as $k => $v) {
-								if (isset($attrs['type'])) {
-									// serialize schema-defined type
-								    $xml .= $this->serializeType($eName, $attrs['type'], $v, $use, $encodingStyle);
-								} else {
-									// serialize generic type
-								    $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");
-								    $xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);
-								}
-							}
-						} else {
-							if (isset($attrs['type'])) {
-								// serialize schema-defined type
-							    $xml .= $this->serializeType($eName, $attrs['type'], $v, $use, $encodingStyle);
-							} else {
-								// serialize generic type
-							    $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");
-							    $xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);
-							}
-						}
-					}
-				} 
-			} else {
-				$this->debug("Expected elements for XML Schema type $ns:$uqType");
-			}
-			$xml .= "</$elementName>";
-		} elseif ($phpType == 'array') {
-			if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {
-				$elementNS = " xmlns=\"$ns\"";
-			} else {
-				$elementNS = '';
-			}
-			if (is_null($value)) {
-				if ($use == 'literal') {
-					// TODO: depends on nillable
-					return "<$name$elementNS/>";
-				} else {
-					return "<$name$elementNS xsi:nil=\"true\"/>";
-				}
-			}
-			if (isset($typeDef['multidimensional'])) {
-				$nv = array();
-				foreach($value as $v) {
-					$cols = ',' . sizeof($v);
-					$nv = array_merge($nv, $v);
-				} 
-				$value = $nv;
-			} else {
-				$cols = '';
-			} 
-			if (is_array($value) && sizeof($value) >= 1) {
-				$rows = sizeof($value);
-				$contents = '';
-				foreach($value as $k => $v) {
-					$this->debug("serializing array element: $k, $v of type: $typeDef[arrayType]");
-					//if (strpos($typeDef['arrayType'], ':') ) {
-					if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {
-					    $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
-					} else {
-					    $contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
-					} 
-				}
-				$this->debug('contents: '.$this->varDump($contents));
-			} else {
-				$rows = 0;
-				$contents = null;
-			}
-			// TODO: for now, an empty value will be serialized as a zero element
-			// array.  Revisit this when coding the handling of null/nil values.
-			if ($use == 'literal') {
-				$xml = "<$name$elementNS>"
-					.$contents
-					."</$name>";
-			} else {
-				$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/').':Array" '.
-					$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/')
-					.':arrayType="'
-					.$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType']))
-					.":".$this->getLocalPart($typeDef['arrayType'])."[$rows$cols]\">"
-					.$contents
-					."</$name>";
-			}
-		} elseif ($phpType == 'scalar') {
-			if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {
-				$elementNS = " xmlns=\"$ns\"";
-			} else {
-				$elementNS = '';
-			}
-			if ($use == 'literal') {
-				if ($forceType) {
-					return "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value</$name>";
-				} else {
-					return "<$name$elementNS>$value</$name>";
-				}
-			} else {
-				return "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>$value</$name>";
-			}
-		}
-		$this->debug('returning: '.$this->varDump($xml));
-		return $xml;
-	}
-	
-	/**
-	* adds an XML Schema complex type to the WSDL types
-	*
-	* @param name
-	* @param typeClass (complexType|simpleType|attribute)
-	* @param phpType: currently supported are array and struct (php assoc array)
-	* @param compositor (all|sequence|choice)
-	* @param restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param elements = array ( name = array(name=>'',type=>'') )
-	* @param attrs = array(
-	* 	array(
-	*		'ref' => "http://schemas.xmlsoap.org/soap/encoding/:arrayType",
-	*		"http://schemas.xmlsoap.org/wsdl/:arrayType" => "string[]"
-	* 	)
-	* )
-	* @param arrayType: namespace:name (http://www.w3.org/2001/XMLSchema:string)
-	* @see xmlschema
-	* 
-	*/
-	function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType='') {
-		if (count($elements) > 0) {
-	    	foreach($elements as $n => $e){
-	            // expand each element
-	            foreach ($e as $k => $v) {
-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;
-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;
-		            $ee[$k] = $v;
-		    	}
-	    		$eElements[$n] = $ee;
-	    	}
-	    	$elements = $eElements;
-		}
-		
-		if (count($attrs) > 0) {
-	    	foreach($attrs as $n => $a){
-	            // expand each attribute
-	            foreach ($a as $k => $v) {
-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;
-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;
-		            $aa[$k] = $v;
-		    	}
-	    		$eAttrs[$n] = $aa;
-	    	}
-	    	$attrs = $eAttrs;
-		}
-
-		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;
-		$arrayType = strpos($arrayType,':') ? $this->expandQname($arrayType) : $arrayType;
-
-		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
-		$this->schemas[$typens][0]->addComplexType($name,$typeClass,$phpType,$compositor,$restrictionBase,$elements,$attrs,$arrayType);
-	}
-
-	/**
-	* adds an XML Schema simple type to the WSDL types
-	*
-	* @param name
-	* @param restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param typeClass (simpleType)
-	* @param phpType: (scalar)
-	* @see xmlschema
-	* 
-	*/
-	function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar') {
-		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;
-
-		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
-		$this->schemas[$typens][0]->addSimpleType($name, $restrictionBase, $typeClass, $phpType);
-	}
-
-	/**
-	* register a service with the server
-	* 
-	* @param string $methodname 
-	* @param string $in assoc array of input values: key = param name, value = param type
-	* @param string $out assoc array of output values: key = param name, value = param type
-	* @param string $namespace optional The namespace for the operation
-	* @param string $soapaction optional The soapaction for the operation
-	* @param string $style (rpc|document) optional The style for the operation
-	* @param string $use (encoded|literal) optional The use for the parameters (cannot mix right now)
-	* @param string $documentation optional The description to include in the WSDL
-	* @access public 
-	*/
-	function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = ''){
-		if ($style == 'rpc' && $use == 'encoded') {
-			$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-		} else {
-			$encodingStyle = '';
-		} 
-		// get binding
-		$this->bindings[ $this->serviceName . 'Binding' ]['operations'][$name] =
-		array(
-		'name' => $name,
-		'binding' => $this->serviceName . 'Binding',
-		'endpoint' => $this->endpoint,
-		'soapAction' => $soapaction,
-		'style' => $style,
-		'input' => array(
-			'use' => $use,
-			'namespace' => $namespace,
-			'encodingStyle' => $encodingStyle,
-			'message' => $name . 'Request',
-			'parts' => $in),
-		'output' => array(
-			'use' => $use,
-			'namespace' => $namespace,
-			'encodingStyle' => $encodingStyle,
-			'message' => $name . 'Response',
-			'parts' => $out),
-		'namespace' => $namespace,
-		'transport' => 'http://schemas.xmlsoap.org/soap/http',
-		'documentation' => $documentation); 
-		// add portTypes
-		// add messages
-		if($in)
-		{
-			foreach($in as $pName => $pType)
-			{
-				if(strpos($pType,':')) {
-					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);
-				}
-				$this->messages[$name.'Request'][$pName] = $pType;
-			}
-		} else {
-            $this->messages[$name.'Request']= '0';
-        }
-		if($out)
-		{
-			foreach($out as $pName => $pType)
-			{
-				if(strpos($pType,':')) {
-					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);
-				}
-				$this->messages[$name.'Response'][$pName] = $pType;
-			}
-		} else {
-            $this->messages[$name.'Response']= '0';
-        }
-		return true;
-	} 
-}
-?><?php
-
-
-
-/**
-*
-* soap_parser class parses SOAP XML messages into native PHP values
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @access   public
-*/
-class soap_parser extends nusoap_base {
-
-	var $xml = '';
-	var $xml_encoding = '';
-	var $method = '';
-	var $root_struct = '';
-	var $root_struct_name = '';
-	var $root_struct_namespace = '';
-	var $root_header = '';
-    var $document = '';			// incoming SOAP body (text)
-	// determines where in the message we are (envelope,header,body,method)
-	var $status = '';
-	var $position = 0;
-	var $depth = 0;
-	var $default_namespace = '';
-	var $namespaces = array();
-	var $message = array();
-    var $parent = '';
-	var $fault = false;
-	var $fault_code = '';
-	var $fault_str = '';
-	var $fault_detail = '';
-	var $depth_array = array();
-	var $debug_flag = true;
-	var $soapresponse = NULL;
-	var $responseHeaders = '';	// incoming SOAP headers (text)
-	var $body_position = 0;
-	// for multiref parsing:
-	// array of id => pos
-	var $ids = array();
-	// array of id => hrefs => pos
-	var $multirefs = array();
-	// toggle for auto-decoding element content
-	var $decode_utf8 = true;
-
-	/**
-	* constructor
-	*
-	* @param    string $xml SOAP message
-	* @param    string $encoding character encoding scheme of message
-	* @param    string $method
-	* @param    string $decode_utf8 whether to decode UTF-8 to ISO-8859-1
-	* @access   public
-	*/
-	function soap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
-		$this->xml = $xml;
-		$this->xml_encoding = $encoding;
-		$this->method = $method;
-		$this->decode_utf8 = $decode_utf8;
-
-		// Check whether content has been read.
-		if(!empty($xml)){
-			$this->debug('Entering soap_parser(), length='.strlen($xml).', encoding='.$encoding);
-			// Create an XML parser - why not xml_parser_create_ns?
-			$this->parser = xml_parser_create($this->xml_encoding);
-			// Set the options for parsing the XML data.
-			//xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-			xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
-			xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, $this->xml_encoding);
-			// Set the object for the parser.
-			xml_set_object($this->parser, $this);
-			// Set the element handlers for the parser.
-			xml_set_element_handler($this->parser, 'start_element','end_element');
-			xml_set_character_data_handler($this->parser,'character_data');
-
-			// Parse the XML file.
-			if(!xml_parse($this->parser,$xml,true)){
-			    // Display an error message.
-			    $err = sprintf('XML error parsing SOAP payload on line %d: %s',
-			    xml_get_current_line_number($this->parser),
-			    xml_error_string(xml_get_error_code($this->parser)));
-				$this->debug($err);
-				$this->debug("XML payload:\n" . $xml);
-				$this->setError($err);
-			} else {
-				$this->debug('parsed successfully, found root struct: '.$this->root_struct.' of name '.$this->root_struct_name);
-				// get final value
-				$this->soapresponse = $this->message[$this->root_struct]['result'];
-				// get header value: no, because this is documented as XML string
-//				if($this->root_header != '' && isset($this->message[$this->root_header]['result'])){
-//					$this->responseHeaders = $this->message[$this->root_header]['result'];
-//				}
-				// resolve hrefs/ids
-				if(sizeof($this->multirefs) > 0){
-					foreach($this->multirefs as $id => $hrefs){
-						$this->debug('resolving multirefs for id: '.$id);
-						$idVal = $this->buildVal($this->ids[$id]);
-						foreach($hrefs as $refPos => $ref){
-							$this->debug('resolving href at pos '.$refPos);
-							$this->multirefs[$id][$refPos] = $idVal;
-						}
-					}
-				}
-			}
-			xml_parser_free($this->parser);
-		} else {
-			$this->debug('xml was empty, didn\'t parse!');
-			$this->setError('xml was empty, didn\'t parse!');
-		}
-	}
-
-	/**
-	* start-element handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $name element name
-	* @param    string $attrs associative array of attributes
-	* @access   private
-	*/
-	function start_element($parser, $name, $attrs) {
-		// position in a total number of elements, starting from 0
-		// update class level pos
-		$pos = $this->position++;
-		// and set mine
-		$this->message[$pos] = array('pos' => $pos,'children'=>'','cdata'=>'');
-		// depth = how many levels removed from root?
-		// set mine as current global depth and increment global depth value
-		$this->message[$pos]['depth'] = $this->depth++;
-
-		// else add self as child to whoever the current parent is
-		if($pos != 0){
-			$this->message[$this->parent]['children'] .= '|'.$pos;
-		}
-		// set my parent
-		$this->message[$pos]['parent'] = $this->parent;
-		// set self as current parent
-		$this->parent = $pos;
-		// set self as current value for this depth
-		$this->depth_array[$this->depth] = $pos;
-		// get element prefix
-		if(strpos($name,':')){
-			// get ns prefix
-			$prefix = substr($name,0,strpos($name,':'));
-			// get unqualified name
-			$name = substr(strstr($name,':'),1);
-		}
-		// set status
-		if($name == 'Envelope'){
-			$this->status = 'envelope';
-		} elseif($name == 'Header'){
-			$this->root_header = $pos;
-			$this->status = 'header';
-		} elseif($name == 'Body'){
-			$this->status = 'body';
-			$this->body_position = $pos;
-		// set method
-		} elseif($this->status == 'body' && $pos == ($this->body_position+1)){
-			$this->status = 'method';
-			$this->root_struct_name = $name;
-			$this->root_struct = $pos;
-			$this->message[$pos]['type'] = 'struct';
-			$this->debug("found root struct $this->root_struct_name, pos $this->root_struct");
-		}
-		// set my status
-		$this->message[$pos]['status'] = $this->status;
-		// set name
-		$this->message[$pos]['name'] = htmlspecialchars($name);
-		// set attrs
-		$this->message[$pos]['attrs'] = $attrs;
-
-		// loop through atts, logging ns and type declarations
-        $attstr = '';
-		foreach($attrs as $key => $value){
-        	$key_prefix = $this->getPrefix($key);
-			$key_localpart = $this->getLocalPart($key);
-			// if ns declarations, add to class level array of valid namespaces
-            if($key_prefix == 'xmlns'){
-				if(ereg('^http://www.w3.org/[0-9]{4}/XMLSchema$',$value)){
-					$this->XMLSchemaVersion = $value;
-					$this->namespaces['xsd'] = $this->XMLSchemaVersion;
-					$this->namespaces['xsi'] = $this->XMLSchemaVersion.'-instance';
-				}
-                $this->namespaces[$key_localpart] = $value;
-				// set method namespace
-				if($name == $this->root_struct_name){
-					$this->methodNamespace = $value;
-				}
-			// if it's a type declaration, set type
-            } elseif($key_localpart == 'type'){
-            	$value_prefix = $this->getPrefix($value);
-                $value_localpart = $this->getLocalPart($value);
-				$this->message[$pos]['type'] = $value_localpart;
-				$this->message[$pos]['typePrefix'] = $value_prefix;
-                if(isset($this->namespaces[$value_prefix])){
-                	$this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];
-                } else if(isset($attrs['xmlns:'.$value_prefix])) {
-					$this->message[$pos]['type_namespace'] = $attrs['xmlns:'.$value_prefix];
-                }
-				// should do something here with the namespace of specified type?
-			} elseif($key_localpart == 'arrayType'){
-				$this->message[$pos]['type'] = 'array';
-				/* do arrayType ereg here
-				[1]    arrayTypeValue    ::=    atype asize
-				[2]    atype    ::=    QName rank*
-				[3]    rank    ::=    '[' (',')* ']'
-				[4]    asize    ::=    '[' length~ ']'
-				[5]    length    ::=    nextDimension* Digit+
-				[6]    nextDimension    ::=    Digit+ ','
-				*/
-				$expr = '([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]';
-				if(ereg($expr,$value,$regs)){
-					$this->message[$pos]['typePrefix'] = $regs[1];
-					$this->message[$pos]['arrayTypePrefix'] = $regs[1];
-	                if (isset($this->namespaces[$regs[1]])) {
-	                	$this->message[$pos]['arrayTypeNamespace'] = $this->namespaces[$regs[1]];
-	                } else if (isset($attrs['xmlns:'.$regs[1]])) {
-						$this->message[$pos]['arrayTypeNamespace'] = $attrs['xmlns:'.$regs[1]];
-	                }
-					$this->message[$pos]['arrayType'] = $regs[2];
-					$this->message[$pos]['arraySize'] = $regs[3];
-					$this->message[$pos]['arrayCols'] = $regs[4];
-				}
-			}
-			// log id
-			if($key == 'id'){
-				$this->ids[$value] = $pos;
-			}
-			// root
-			if($key_localpart == 'root' && $value == 1){
-				$this->status = 'method';
-				$this->root_struct_name = $name;
-				$this->root_struct = $pos;
-				$this->debug("found root struct $this->root_struct_name, pos $pos");
-			}
-            // for doclit
-            $attstr .= " $key=\"$value\"";
-		}
-        // get namespace - must be done after namespace atts are processed
-		if(isset($prefix)){
-			$this->message[$pos]['namespace'] = $this->namespaces[$prefix];
-			$this->default_namespace = $this->namespaces[$prefix];
-		} else {
-			$this->message[$pos]['namespace'] = $this->default_namespace;
-		}
-        if($this->status == 'header'){
-        	if ($this->root_header != $pos) {
-	        	$this->responseHeaders .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";
-	        }
-        } elseif($this->root_struct_name != ''){
-        	$this->document .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";
-        }
-	}
-
-	/**
-	* end-element handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $name element name
-	* @access   private
-	*/
-	function end_element($parser, $name) {
-		// position of current element is equal to the last value left in depth_array for my depth
-		$pos = $this->depth_array[$this->depth--];
-
-        // get element prefix
-		if(strpos($name,':')){
-			// get ns prefix
-			$prefix = substr($name,0,strpos($name,':'));
-			// get unqualified name
-			$name = substr(strstr($name,':'),1);
-		}
-		
-		// build to native type
-		if(isset($this->body_position) && $pos > $this->body_position){
-			// deal w/ multirefs
-			if(isset($this->message[$pos]['attrs']['href'])){
-				// get id
-				$id = substr($this->message[$pos]['attrs']['href'],1);
-				// add placeholder to href array
-				$this->multirefs[$id][$pos] = 'placeholder';
-				// add set a reference to it as the result value
-				$this->message[$pos]['result'] =& $this->multirefs[$id][$pos];
-            // build complex values
-			} elseif($this->message[$pos]['children'] != ''){
-			
-				// if result has already been generated (struct/array
-				if(!isset($this->message[$pos]['result'])){
-					$this->message[$pos]['result'] = $this->buildVal($pos);
-				}
-				
-			// set value of simple type
-			} else {
-            	//$this->debug('adding data for scalar value '.$this->message[$pos]['name'].' of value '.$this->message[$pos]['cdata']);
-            	if (isset($this->message[$pos]['type'])) {
-					$this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
-				} else {
-					$parent = $this->message[$pos]['parent'];
-					if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
-						$this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
-					} else {
-						$this->message[$pos]['result'] = $this->message[$pos]['cdata'];
-					}
-				}
-
-				/* add value to parent's result, if parent is struct/array
-				$parent = $this->message[$pos]['parent'];
-				if($this->message[$parent]['type'] != 'map'){
-					if(strtolower($this->message[$parent]['type']) == 'array'){
-						$this->message[$parent]['result'][] = $this->message[$pos]['result'];
-					} else {
-						$this->message[$parent]['result'][$this->message[$pos]['name']] = $this->message[$pos]['result'];
-					}
-				}
-				*/
-			}
-		}
-		
-        // for doclit
-        if($this->status == 'header'){
-        	if ($this->root_header != $pos) {
-	        	$this->responseHeaders .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";
-	        }
-        } elseif($pos >= $this->root_struct){
-        	$this->document .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";
-        }
-		// switch status
-		if($pos == $this->root_struct){
-			$this->status = 'body';
-			$this->root_struct_namespace = $this->message[$pos]['namespace'];
-		} elseif($name == 'Body'){
-			$this->status = 'envelope';
-		 } elseif($name == 'Header'){
-			$this->status = 'envelope';
-		} elseif($name == 'Envelope'){
-			//
-		}
-		// set parent back to my parent
-		$this->parent = $this->message[$pos]['parent'];
-	}
-
-	/**
-	* element content handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $data element content
-	* @access   private
-	*/
-	function character_data($parser, $data){
-		$pos = $this->depth_array[$this->depth];
-		if ($this->xml_encoding=='UTF-8'){
-			// TODO: add an option to disable this for folks who want
-			// raw UTF-8 that, e.g., might not map to iso-8859-1
-			// TODO: this can also be handled with xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, "ISO-8859-1");
-			if($this->decode_utf8){
-				$data = utf8_decode($data);
-			}
-		}
-        $this->message[$pos]['cdata'] .= $data;
-        // for doclit
-        if($this->status == 'header'){
-        	$this->responseHeaders .= $data;
-        } else {
-        	$this->document .= $data;
-        }
-	}
-
-	/**
-	* get the parsed message
-	*
-	* @return	mixed
-	* @access   public
-	*/
-	function get_response(){
-		return $this->soapresponse;
-	}
-
-	/**
-	* get the parsed headers
-	*
-	* @return	string XML or empty if no headers
-	* @access   public
-	*/
-	function getHeaders(){
-	    return $this->responseHeaders;
-	}
-
-	/**
-	* decodes entities
-	*
-	* @param    string $text string to translate
-	* @access   private
-	*/
-	function decode_entities($text){
-		foreach($this->entities as $entity => $encoded){
-			$text = str_replace($encoded,$entity,$text);
-		}
-		return $text;
-	}
-
-	/**
-	* decodes simple types into PHP variables
-	*
-	* @param    string $value value to decode
-	* @param    string $type XML type to decode
-	* @param    string $typens XML type namespace to decode
-	* @access   private
-	*/
-	function decodeSimple($value, $type, $typens) {
-		// TODO: use the namespace!
-		if ((!isset($type)) || $type == 'string' || $type == 'long' || $type == 'unsignedLong') {
-			return (string) $value;
-		}
-		if ($type == 'int' || $type == 'integer' || $type == 'short' || $type == 'byte') {
-			return (int) $value;
-		}
-		if ($type == 'float' || $type == 'double' || $type == 'decimal') {
-			return (double) $value;
-		}
-		if ($type == 'boolean') {
-			if (strtolower($value) == 'false' || strtolower($value) == 'f') {
-				return false;
-			}
-			return (boolean) $value;
-		}
-		if ($type == 'base64' || $type == 'base64Binary') {
-			return base64_decode($value);
-		}
-		// obscure numeric types
-		if ($type == 'nonPositiveInteger' || $type == 'negativeInteger'
-			|| $type == 'nonNegativeInteger' || $type == 'positiveInteger'
-			|| $type == 'unsignedInt'
-			|| $type == 'unsignedShort' || $type == 'unsignedByte') {
-			return (int) $value;
-		}
-		// everything else
-		return (string) $value;
-	}
-
-	/**
-	* builds response structures for compound values (arrays/structs)
-	*
-	* @param    string $pos position in node tree
-	* @access   private
-	*/
-	function buildVal($pos){
-		if(!isset($this->message[$pos]['type'])){
-			$this->message[$pos]['type'] = '';
-		}
-		$this->debug('inside buildVal() for '.$this->message[$pos]['name']."(pos $pos) of type ".$this->message[$pos]['type']);
-		// if there are children...
-		if($this->message[$pos]['children'] != ''){
-			$children = explode('|',$this->message[$pos]['children']);
-			array_shift($children); // knock off empty
-			// md array
-			if(isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != ''){
-            	$r=0; // rowcount
-            	$c=0; // colcount
-            	foreach($children as $child_pos){
-					$this->debug("got an MD array element: $r, $c");
-					$params[$r][] = $this->message[$child_pos]['result'];
-				    $c++;
-				    if($c == $this->message[$pos]['arrayCols']){
-				    	$c = 0;
-						$r++;
-				    }
-                }
-            // array
-			} elseif($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array'){
-                $this->debug('adding array '.$this->message[$pos]['name']);
-                foreach($children as $child_pos){
-                	$params[] = &$this->message[$child_pos]['result'];
-                }
-            // apache Map type: java hashtable
-            } elseif($this->message[$pos]['type'] == 'Map' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap'){
-                foreach($children as $child_pos){
-                	$kv = explode("|",$this->message[$child_pos]['children']);
-                   	$params[$this->message[$kv[1]]['result']] = &$this->message[$kv[2]]['result'];
-                }
-            // generic compound type
-            //} elseif($this->message[$pos]['type'] == 'SOAPStruct' || $this->message[$pos]['type'] == 'struct') {
-		    } else {
-	    		// Apache Vector type: treat as an array
-				if ($this->message[$pos]['type'] == 'Vector' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {
-					$notstruct = 1;
-				} else {
-	            	// is array or struct?
-	            	foreach($children as $child_pos){
-	            		if(isset($keys) && isset($keys[$this->message[$child_pos]['name']])){
-	            			$notstruct = 1;
-	            			break;
-	            		}
-	            		$keys[$this->message[$child_pos]['name']] = 1;
-	            	}
-	            }
-            	//
-            	foreach($children as $child_pos){
-            		if(isset($notstruct)){
-            			$params[] = &$this->message[$child_pos]['result'];
-            		} else {
-            			if (isset($params[$this->message[$child_pos]['name']])) {
-            				// de-serialize repeated element name into an array
-            				if (!is_array($params[$this->message[$child_pos]['name']])) {
-            					$params[$this->message[$child_pos]['name']] = array($params[$this->message[$child_pos]['name']]);
-            				}
-            				$params[$this->message[$child_pos]['name']][] = &$this->message[$child_pos]['result'];
-            			} else {
-					    	$params[$this->message[$child_pos]['name']] = &$this->message[$child_pos]['result'];
-					    }
-                	}
-                }
-			}
-			return is_array($params) ? $params : array();
-		} else {
-        	$this->debug('no children');
-            if(strpos($this->message[$pos]['cdata'],'&')){
-		    	return  strtr($this->message[$pos]['cdata'],array_flip($this->entities));
-            } else {
-            	return $this->message[$pos]['cdata'];
-            }
-		}
-	}
-}
-
-
-
-?><?php
-
-
-
-/**
-*
-* soapclient higher level class for easy usage.
-*
-* usage:
-*
-* // instantiate client with server info
-* $soapclient = new soapclient( string path [ ,boolean wsdl] );
-*
-* // call method, get results
-* echo $soapclient->call( string methodname [ ,array parameters] );
-*
-* // bye bye client
-* unset($soapclient);
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @access   public
-*/
-class soapclient extends nusoap_base  {
-
-	var $username = '';
-	var $password = '';
-	var $authtype = '';
-	var $requestHeaders = false;	// SOAP headers in request (text)
-	var $responseHeaders = '';		// SOAP headers from response (incomplete namespace resolution) (text)
-	var $document = '';				// SOAP body response portion (incomplete namespace resolution) (text)
-	var $endpoint;
-	var $error_str = false;
-    var $proxyhost = '';
-    var $proxyport = '';
-	var $proxyusername = '';
-	var $proxypassword = '';
-    var $xml_encoding = '';			// character set encoding of incoming (response) messages
-	var $http_encoding = false;
-	var $timeout = 0;				// HTTP connection timeout
-	var $response_timeout = 30;		// HTTP response timeout
-	var $endpointType = '';
-	var $persistentConnection = false;
-	var $defaultRpcParams = false;	// This is no longer used
-	var $request = '';				// HTTP request
-	var $response = '';				// HTTP response
-	var $responseData = '';			// SOAP payload of response
-	// toggles whether the parser decodes element content w/ utf8_decode()
-    var $decode_utf8 = true;
-	
-	/**
-	* fault related variables
-	*
-	* @var      fault
-	* @var      faultcode
-	* @var      faultstring
-	* @var      faultdetail
-	* @access   public
-	*/
-	var $fault, $faultcode, $faultstring, $faultdetail;
-
-	/**
-	* constructor
-	*
-	* @param    mixed $endpoint SOAP server or WSDL URL (string), or wsdl instance (object)
-	* @param    bool $wsdl optional, set to true if using WSDL
-	* @param	int $portName optional portName in WSDL document
-	* @param    string $proxyhost
-	* @param    string $proxyport
-	* @param	string $proxyusername
-	* @param	string $proxypassword
-	* @param	integer $timeout set the connection timeout
-	* @param	integer $response_timeout set the response timeout
-	* @access   public
-	*/
-	function soapclient($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
-		$this->endpoint = $endpoint;
-		$this->proxyhost = $proxyhost;
-		$this->proxyport = $proxyport;
-		$this->proxyusername = $proxyusername;
-		$this->proxypassword = $proxypassword;
-		$this->timeout = $timeout;
-		$this->response_timeout = $response_timeout;
-
-		// make values
-		if($wsdl){
-			$this->endpointType = 'wsdl';
-			if (is_object($endpoint) && is_a($endpoint, 'wsdl')) {
-				$this->wsdl = $endpoint;
-				$this->endpoint = $this->wsdl->wsdl;
-				$this->wsdlFile = $this->endpoint;
-				$this->debug('existing wsdl instance created from ' . $this->endpoint);
-			} else {
-				$this->wsdlFile = $this->endpoint;
-				
-				// instantiate wsdl object and parse wsdl file
-				$this->debug('instantiating wsdl class with doc: '.$endpoint);
-				$this->wsdl =& new wsdl($this->wsdlFile,$this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword,$this->timeout,$this->response_timeout);
-			}
-			$this->debug("wsdl debug...\n".$this->wsdl->debug_str);
-			$this->wsdl->debug_str = '';
-			// catch errors
-			if($errstr = $this->wsdl->getError()){
-				$this->debug('got wsdl error: '.$errstr);
-				$this->setError('wsdl error: '.$errstr);
-			} elseif($this->operations = $this->wsdl->getOperations()){
-				$this->debug( 'got '.count($this->operations).' operations from wsdl '.$this->wsdlFile);
-			} else {
-				$this->debug( 'getOperations returned false');
-				$this->setError('no operations defined in the WSDL document!');
-			}
-		}
-	}
-
-	/**
-	* calls method, returns PHP native type
-	*
-	* @param    string $method SOAP server URL or path
-	* @param    array $params An array, associative or simple, of the parameters
-	*			              for the method call, or a string that is the XML
-	*			              for the call.  For rpc style, this call will
-	*			              wrap the XML in a tag named after the method, as
-	*			              well as the SOAP Envelope and Body.  For document
-	*			              style, this will only wrap with the Envelope and Body.
-	*			              IMPORTANT: when using an array with document style,
-	*			              in which case there
-	*                         is really one parameter, the root of the fragment
-	*                         used in the call, which encloses what programmers
-	*                         normally think of parameters.  A parameter array
-	*                         *must* include the wrapper.
-	* @param	string $namespace optional method namespace (WSDL can override)
-	* @param	string $soapAction optional SOAPAction value (WSDL can override)
-	* @param	boolean $headers optional array of soapval objects for headers
-	* @param	boolean $rpcParams optional no longer used
-	* @param	string	$style optional (rpc|document) the style to use when serializing parameters (WSDL can override)
-	* @param	string	$use optional (encoded|literal) the use when serializing parameters (WSDL can override)
-	* @return	mixed
-	* @access   public
-	*/
-	function call($operation,$params=array(),$namespace='',$soapAction='',$headers=false,$rpcParams=null,$style='rpc',$use='encoded'){
-		$this->operation = $operation;
-		$this->fault = false;
-		$this->error_str = '';
-		$this->request = '';
-		$this->response = '';
-		$this->responseData = '';
-		$this->faultstring = '';
-		$this->faultcode = '';
-		$this->opData = array();
-		
-		$this->debug("call: $operation, $params, $namespace, $soapAction, $headers, $style, $use; endpointType: $this->endpointType");
-		if ($headers) {
-			$this->requestHeaders = $headers;
-		}
-		// serialize parameters
-		if($this->endpointType == 'wsdl' && $opData = $this->getOperationData($operation)){
-			// use WSDL for operation
-			$this->opData = $opData;
-			foreach($opData as $key => $value){
-				$this->debug("$key -> $value");
-			}
-			if (isset($opData['soapAction'])) {
-				$soapAction = $opData['soapAction'];
-			}
-			$this->endpoint = $opData['endpoint'];
-			$namespace = isset($opData['input']['namespace']) ? $opData['input']['namespace'] :	($namespace != '' ? $namespace : 'http://testuri.org');
-			$style = $opData['style'];
-			$use = $opData['input']['use'];
-			// add ns to ns array
-			if($namespace != '' && !isset($this->wsdl->namespaces[$namespace])){
-				$this->wsdl->namespaces['nu'] = $namespace;
-            }
-            $nsPrefix = $this->wsdl->getPrefixFromNamespace($namespace);
-			// serialize payload
-			if (is_string($params)) {
-				$this->debug("serializing param string for WSDL operation $operation");
-				$payload = $params;
-			} elseif (is_array($params)) {
-				$this->debug("serializing param array for WSDL operation $operation");
-				$payload = $this->wsdl->serializeRPCParameters($operation,'input',$params);
-			} else {
-				$this->debug('params must be array or string');
-				$this->setError('params must be array or string');
-				return false;
-			}
-            $usedNamespaces = $this->wsdl->usedNamespaces;
-			// Partial fix for multiple encoding styles in the same function call
-			$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-			if (isset($opData['output']['encodingStyle']) && $encodingStyle != $opData['output']['encodingStyle']) {
-				$methodEncodingStyle = ' SOAP-ENV:encodingStyle="' . $opData['output']['encodingStyle'] . '"';
-			} else {
-				$methodEncodingStyle = '';
-			}
-			$this->debug("wsdl debug: \n".$this->wsdl->debug_str);
-			$this->wsdl->debug_str = '';
-			if ($errstr = $this->wsdl->getError()) {
-				$this->debug('got wsdl error: '.$errstr);
-				$this->setError('wsdl error: '.$errstr);
-				return false;
-			}
-		} elseif($this->endpointType == 'wsdl') {
-			// operation not in WSDL
-			$this->setError( 'operation '.$operation.' not present.');
-			$this->debug("operation '$operation' not present.");
-			$this->debug("wsdl debug: \n".$this->wsdl->debug_str);
-			$this->wsdl->debug_str = '';
-			return false;
-		} else {
-			// no WSDL
-            if($namespace == ''){
-            	$namespace = 'http://testuri.org';
-            }
-			//$this->namespaces['ns1'] = $namespace;
-			$nsPrefix = 'ns1';
-			// serialize 
-			$payload = '';
-			if (is_string($params)) {
-				$this->debug("serializing param string for operation $operation");
-				$payload = $params;
-			} elseif (is_array($params)) {
-				$this->debug("serializing param array for operation $operation");
-				foreach($params as $k => $v){
-					$payload .= $this->serialize_val($v,$k,false,false,false,false,$use);
-				}
-			} else {
-				$this->debug('params must be array or string');
-				$this->setError('params must be array or string');
-				return false;
-			}
-			$usedNamespaces = array();
-			$methodEncodingStyle = '';
-		}
-		// wrap RPC calls with method element
-		if ($style == 'rpc') {
-			if ($use == 'literal') {
-				$this->debug("wrapping RPC request with literal method element");
-				$payload = "<$operation xmlns=\"$namespace\">" . $payload . "</$operation>";
-			} else {
-				$this->debug("wrapping RPC request with encoded method element");
-				$payload = "<$nsPrefix:$operation$methodEncodingStyle xmlns:$nsPrefix=\"$namespace\">" .
-							$payload .
-							"</$nsPrefix:$operation>";
-			}
-		}
-		// serialize envelope
-		$soapmsg = $this->serializeEnvelope($payload,$this->requestHeaders,$usedNamespaces,$style,$use);
-		$this->debug("endpoint: $this->endpoint, soapAction: $soapAction, namespace: $namespace, style: $style, use: $use");
-		$this->debug('SOAP message length: ' . strlen($soapmsg) . ' contents: ' . substr($soapmsg, 0, 1000));
-		// send
-		$return = $this->send($this->getHTTPBody($soapmsg),$soapAction,$this->timeout,$this->response_timeout);
-		if($errstr = $this->getError()){
-			$this->debug('Error: '.$errstr);
-			return false;
-		} else {
-			$this->return = $return;
-			$this->debug('sent message successfully and got a(n) '.gettype($return).' back');
-			
-			// fault?
-			if(is_array($return) && isset($return['faultcode'])){
-				$this->debug('got fault');
-				$this->setError($return['faultcode'].': '.$return['faultstring']);
-				$this->fault = true;
-				foreach($return as $k => $v){
-					$this->$k = $v;
-					$this->debug("$k = $v<br>");
-				}
-				return $return;
-			} else {
-				// array of return values
-				if(is_array($return)){
-					// multiple 'out' parameters
-					if(sizeof($return) > 1){
-						return $return;
-					}
-					// single 'out' parameter
-					return array_shift($return);
-				// nothing returned (ie, echoVoid)
-				} else {
-					return "";
-				}
-			}
-		}
-	}
-
-	/**
-	* get available data pertaining to an operation
-	*
-	* @param    string $operation operation name
-	* @return	array array of data pertaining to the operation
-	* @access   public
-	*/
-	function getOperationData($operation){
-		if(isset($this->operations[$operation])){
-			return $this->operations[$operation];
-		}
-		$this->debug("No data for operation: $operation");
-	}
-
-    /**
-    * send the SOAP message
-    *
-    * Note: if the operation has multiple return values
-    * the return value of this method will be an array
-    * of those values.
-    *
-	* @param    string $msg a SOAPx4 soapmsg object
-	* @param    string $soapaction SOAPAction value
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @return	mixed native PHP types.
-	* @access   private
-	*/
-	function send($msg, $soapaction = '', $timeout=0, $response_timeout=30) {
-		// detect transport
-		switch(true){
-			// http(s)
-			case ereg('^http',$this->endpoint):
-				$this->debug('transporting via HTTP');
-				if($this->persistentConnection == true && is_object($this->persistentConnection)){
-					$http =& $this->persistentConnection;
-				} else {
-					$http = new soap_transport_http($this->endpoint);
-					if ($this->persistentConnection) {
-						$http->usePersistentConnection();
-					}
-				}
-				$http->setContentType($this->getHTTPContentType(), $this->getHTTPContentTypeCharset());
-				$http->setSOAPAction($soapaction);
-				if($this->proxyhost && $this->proxyport){
-					$http->setProxy($this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword);
-				}
-                if($this->username != '' && $this->password != '') {
-					$http->setCredentials($this->username, $this->password, $this->authtype);
-				}
-				if($this->http_encoding != ''){
-					$http->setEncoding($this->http_encoding);
-				}
-				$this->debug('sending message, length: '.strlen($msg));
-				if(ereg('^http:',$this->endpoint)){
-				//if(strpos($this->endpoint,'http:')){
-					$this->responseData = $http->send($msg,$timeout,$response_timeout);
-				} elseif(ereg('^https',$this->endpoint)){
-				//} elseif(strpos($this->endpoint,'https:')){
-					//if(phpversion() == '4.3.0-dev'){
-						//$response = $http->send($msg,$timeout,$response_timeout);
-                   		//$this->request = $http->outgoing_payload;
-						//$this->response = $http->incoming_payload;
-					//} else
-					if (extension_loaded('curl')) {
-						$this->responseData = $http->sendHTTPS($msg,$timeout,$response_timeout);
-					} else {
-						$this->setError('CURL Extension, or OpenSSL extension w/ PHP version >= 4.3 is required for HTTPS');
-					}								
-				} else {
-					$this->setError('no http/s in endpoint url');
-				}
-				$this->request = $http->outgoing_payload;
-				$this->response = $http->incoming_payload;
-				$this->debug("transport debug data...\n".$http->debug_str);
-				
-				// save transport object if using persistent connections
-				if ($this->persistentConnection) {
-					$http->debug_str = '';
-					if (!is_object($this->persistentConnection)) {
-						$this->persistentConnection = $http;
-					}
-				}
-				
-				if($err = $http->getError()){
-					$this->setError('HTTP Error: '.$err);
-					return false;
-				} elseif($this->getError()){
-					return false;
-				} else {
-					$this->debug('got response, length: '. strlen($this->responseData).' type: '.$http->incoming_headers['content-type']);
-					return $this->parseResponse($http->incoming_headers, $this->responseData);
-				}
-			break;
-			default:
-				$this->setError('no transport found, or selected transport is not yet supported!');
-			return false;
-			break;
-		}
-	}
-
-	/**
-	* processes SOAP message returned from server
-	*
-	* @param	array	$headers	The HTTP headers
-	* @param	string	$data		unprocessed response data from server
-	* @return	mixed	value of the message, decoded into a PHP type
-	* @access   protected
-	*/
-    function parseResponse($headers, $data) {
-		$this->debug('Entering parseResponse() for data of length ' . strlen($data) . ' and type ' . $headers['content-type']);
-		if (!strstr($headers['content-type'], 'text/xml')) {
-			$this->setError('Response not of type text/xml');
-			return false;
-		}
-		if (strpos($headers['content-type'], '=')) {
-			$enc = str_replace('"', '', substr(strstr($headers["content-type"], '='), 1));
-			$this->debug('Got response encoding: ' . $enc);
-			if(eregi('^(ISO-8859-1|US-ASCII|UTF-8)$',$enc)){
-				$this->xml_encoding = strtoupper($enc);
-			} else {
-				$this->xml_encoding = 'US-ASCII';
-			}
-		} else {
-			// should be US-ASCII, but for XML, let's be pragmatic and admit UTF-8 is most common
-			$this->xml_encoding = 'UTF-8';
-		}
-		$this->debug('Use encoding: ' . $this->xml_encoding . ' when creating soap_parser');
-		$parser = new soap_parser($data,$this->xml_encoding,$this->operation,$this->decode_utf8);
-		// add parser debug data to our debug
-		$this->debug($parser->debug_str);
-		// if parse errors
-		if($errstr = $parser->getError()){
-			$this->setError( $errstr);
-			// destroy the parser object
-			unset($parser);
-			return false;
-		} else {
-			// get SOAP headers
-			$this->responseHeaders = $parser->getHeaders();
-			// get decoded message
-			$return = $parser->get_response();
-            // add document for doclit support
-            $this->document = $parser->document;
-			// destroy the parser object
-			unset($parser);
-			// return decode message
-			return $return;
-		}
-	 }
-
-	/**
-	* set the SOAP headers
-	*
-	* @param	$headers string XML
-	* @access   public
-	*/
-	function setHeaders($headers){
-		$this->requestHeaders = $headers;
-	}
-
-	/**
-	* get the response headers
-	*
-	* @return	mixed object SOAPx4 soapval object or empty if no headers
-	* @access   public
-	*/
-	function getHeaders(){
-	    if($this->responseHeaders != '') {
-			return $this->responseHeaders;
-	    }
-	}
-
-	/**
-	* set proxy info here
-	*
-	* @param    string $proxyhost
-	* @param    string $proxyport
-	* @param	string $proxyusername
-	* @param	string $proxypassword
-	* @access   public
-	*/
-	function setHTTPProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '') {
-		$this->proxyhost = $proxyhost;
-		$this->proxyport = $proxyport;
-		$this->proxyusername = $proxyusername;
-		$this->proxypassword = $proxypassword;
-	}
-
-	/**
-	* if authenticating, set user credentials here
-	*
-	* @param    string $username
-	* @param    string $password
-	* @param	string $authtype (basic|digest)
-	* @access   public
-	*/
-	function setCredentials($username, $password, $authtype = 'basic') {
-		$this->username = $username;
-		$this->password = $password;
-		$this->authtype = $authtype;
-	}
-	
-	/**
-	* use HTTP encoding
-	*
-	* @param    string $enc
-	* @access   public
-	*/
-	function setHTTPEncoding($enc='gzip, deflate'){
-		$this->http_encoding = $enc;
-	}
-	
-	/**
-	* use HTTP persistent connections if possible
-	*
-	* @access   public
-	*/
-	function useHTTPPersistentConnection(){
-		$this->persistentConnection = true;
-	}
-	
-	/**
-	* gets the default RPC parameter setting.
-	* If true, default is that call params are like RPC even for document style.
-	* Each call() can override this value.
-	*
-	* This is no longer used.
-	*
-	* @access public
-	* @deprecated
-	*/
-	function getDefaultRpcParams() {
-		return $this->defaultRpcParams;
-	}
-
-	/**
-	* sets the default RPC parameter setting.
-	* If true, default is that call params are like RPC even for document style
-	* Each call() can override this value.
-	*
-	* @param    boolean $rpcParams
-	* @access public
-	*/
-	function setDefaultRpcParams($rpcParams) {
-		$this->defaultRpcParams = $rpcParams;
-	}
-	
-	/**
-	* dynamically creates proxy class, allowing user to directly call methods from wsdl
-	*
-	* @return   object soap_proxy object
-	* @access   public
-	*/
-	function getProxy(){
-		$evalStr = '';
-		foreach($this->operations as $operation => $opData){
-			if($operation != ''){
-				// create param string
-				$paramStr = '';
-				if(sizeof($opData['input']['parts']) > 0){
-					foreach($opData['input']['parts'] as $name => $type){
-						$paramStr .= "\$$name,";
-					}
-					$paramStr = substr($paramStr,0,strlen($paramStr)-1);
-				}
-				$opData['namespace'] = !isset($opData['namespace']) ? 'http://testuri.com' : $opData['namespace'];
-				$evalStr .= "function $operation ($paramStr){
-					// load params into array
-					\$params = array($paramStr);
-					return \$this->call('$operation',\$params,'".$opData['namespace']."','".(isset($opData['soapAction']) ? $opData['soapAction'] : '')."');
-				}";
-				unset($paramStr);
-			}
-		}
-		$r = rand();
-		$evalStr = 'class soap_proxy_'.$r.' extends soapclient {
-				'.$evalStr.'
-			}';
-		//print "proxy class:<pre>$evalStr</pre>";
-		// eval the class
-		eval($evalStr);
-		// instantiate proxy object
-		eval("\$proxy = new soap_proxy_$r('');");
-		// transfer current wsdl data to the proxy thereby avoiding parsing the wsdl twice
-		$proxy->endpointType = 'wsdl';
-		$proxy->wsdlFile = $this->wsdlFile;
-		$proxy->wsdl = $this->wsdl;
-		$proxy->operations = $this->operations;
-		$proxy->defaultRpcParams = $this->defaultRpcParams;
-		// transfer other state
-		$proxy->username = $this->username;
-		$proxy->password = $this->password;
-		$proxy->proxyhost = $this->proxyhost;
-		$proxy->proxyport = $this->proxyport;
-		$proxy->proxyusername = $this->proxyusername;
-		$proxy->proxypassword = $this->proxypassword;
-		$proxy->timeout = $this->timeout;
-		$proxy->response_timeout = $this->response_timeout;
-		$proxy->http_encoding = $this->http_encoding;
-		$proxy->persistentConnection = $this->persistentConnection;
-		return $proxy;
-	}
-
-	/**
-	* gets the HTTP body for the current request.
-	*
-	* @param string $soapmsg The SOAP payload
-	* @return string The HTTP body, which includes the SOAP payload
-	* @access protected
-	*/
-	function getHTTPBody($soapmsg) {
-		return $soapmsg;
-	}
-	
-	/**
-	* gets the HTTP content type for the current request.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type for the current request.
-	* @access protected
-	*/
-	function getHTTPContentType() {
-		return 'text/xml';
-	}
-	
-	/**
-	* gets the HTTP content type charset for the current request.
-	* returns false for non-text content types.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type charset for the current request.
-	* @access protected
-	*/
-	function getHTTPContentTypeCharset() {
-		return $this->soap_defencoding;
-	}
-
-	/*
-	* whether or not parser should decode utf8 element content
-    *
-    * @return   always returns true
-    * @access   public
-    */
-    function decodeUTF8($bool){
-		$this->decode_utf8 = $bool;
-		return true;
-    }
-}
-?>
diff --git a/tests/.htaccess b/tests/.htaccess
new file mode 100644
index 000000000000..3a4288278871
--- /dev/null
+++ b/tests/.htaccess
@@ -0,0 +1 @@
+Deny from all
diff --git a/texvc.phtml b/texvc.phtml
deleted file mode 100644
index 7f427d8916a1..000000000000
--- a/texvc.phtml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-include( "./LocalSettings.php" );
-include( "Setup.php" );
-header( "Content-type: text/xml; charset={$wgInputEncoding}" );
-print "<";
-print "?xml version=\"1.0\" encoding=\"utf-8\"?";
-print ">";
-?>
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><title>texvc</title></head><body>
-<?php
-print "<form method=\"post\" action=\"{$wgServer}{$wgScriptPath}/texvc_cgi.phtml\">"
-?>
-<textarea name='math' rows='10' cols='80'><?php
-	global $math;
-	$math = preg_replace ("/\\\\\\\\/", '\\', $math);
-	print $math;
-?></textarea><br /><input type="submit" value="Preview" name="preview" /></form>
-<?php
-function xlinkToMathImage ( $tex, $outputhash )
-{
-	global $wgMathPath;
-	return "<img src=\"".$wgMathPath."/".$outputhash.".png\" alt=\"".wfEscapeHTML($tex)."\" />";
-}
-
-function texvc_cgi_renderMath( $tex )
-{
-	global $wgMathDirectory, $wgTmpDirectory, $wgInputEncoding;
-	$dbr =& wfGetDB( DB_SLAVE );
-	$mf   = wfMsg( "math_failure" );
-	$munk = wfMsg( "math_unknown_error" );
-
-	$image = "";
-	$outhtml = "";
-	$outtex = "";
-
-	$fname = "texvc_cgi_renderMath";
-
-	$md5 = md5($tex);
-	$md5_sql = pack("H32", $md5);
-
-	$mathTable = $dbr->tableName( 'math' );
-	$rpage = $dbr->selectRow( 'math', array('math_outputhash','math_html_conservativeness','math_html','math_mathml'),
-	  array( 'math_inputhash' => $md5_sql ) );
-	
-	if ( $rpage === false )
-	{
-		$cmd = "./math/texvc ".wfEscapeShellArg($wgTmpDirectory)." ".
-					  wfEscapeShellArg($wgMathDirectory)." ".wfEscapeShellArg($tex)." ".wfEscapeShellArg($wgInputEncoding);
-		$contents = `$cmd`;
-
-		if (strlen($contents) == 0)
-			return "<h3>".$mf." (".$munk."): ".wfEscapeHTML($tex)."</h3>";
-		$retval = substr ($contents, 0, 1);
-
-		if (($retval == "C") || ($retval == "M") || ($retval == "L")) {
-			if ($retval == "C")
-				$conservativeness = 2;
-			else if ($retval == "M")
-				$conservativeness = 1;
-			else
-				$conservativeness = 0;
-			$outdata = substr ($contents, 33);
-
-			$i = strpos($outdata, "\000");
-
-			$outhtml = substr($outdata, 0, $i);
-			$mathml = substr($outdata, $i+1);
-
-			#$sql_html = "'".mysql_escape_string($outhtml)."'";
-			#$sql_mathml = "'".mysql_escape_string($mathml)."'";
-		} else if (($retval == "c") || ($retval == "m") || ($retval == "l"))  {
-			$outhtml = substr ($contents, 33);
-			if ($retval == "c")
-				$conservativeness = 2;
-			else if ($retval == "m")
-				$conservativeness = 1;
-			else
-				$conservativeness = 0;
-			#$sql_html = "'".mysql_escape_string($outhtml)."'";
-			$mathml = NULL;
-			#$sql_mathml = 'NULL';
-		} else if ($retval == "X") {
-			$outhtml = NULL;
-			$mathml = substr ($contents, 33);
-			#$sql_html = 'NULL';
-			#$sql_mathml = "'".mysql_escape_string($mathml)."'";
-			$conservativeness = 0;
-		} else if ($retval == "+") {
-			$outhtml = NULL;
-			$mathml = NULL;
-			#$sql_html = 'NULL';
-			#$sql_mathml = 'NULL';
-			$conservativeness = 0;
-		} else {
-			if ($retval == "E")
-				$errmsg = wfMsg( "math_lexing_error" );
-			else if ($retval == "S")
-				$errmsg = wfMsg( "math_syntax_error" );
-			else if ($retval == "F")
-				$errmsg = wfMsg( "math_unknown_function" );
-			else
-				$errmsg = $munk;
-			return "<h3>".$mf." (".$errmsg.substr($contents, 1)."): ".wfEscapeHTML($tex)."</h3>";
-		}
-
-		$outmd5 = substr ($contents, 1, 32);
-		if (!preg_match("/^[a-f0-9]{32}$/", $outmd5))
-			return "<h3>".$mf." (".$munk."): ".wfEscapeHTML($tex)."</h3>";
-
-		$outmd5_sql = pack("H32", $outmd5);
-		
-		# Someone may have inserted the same hash since the SELECT, but that's no big deal, just ignore errors
-		$dbw =& wfGetDB( DB_MASTER );
-		$dbw->insert( 'math', 
-		  array( 
-		    'math_inputhash' => $md5_sql, 
-			'math_outputhash' => $outmd5_sql,
-			'math_html_conservativeness' => $conservativeness,
-			'math_html' => $outhtml,
-			'math_mathml' => $mathml,
-		  ), $fname, array( 'IGNORE' ) 
-		);
-		
-// we don't really care if it fails
-	} else {
-		$outmd5 = unpack ("H32md5", $rpage->math_outputhash);
-		$outmd5 = $outmd5 ['md5'];
-		$outhtml = $rpage->math_html;
-		$conservativeness = $rpage->math_html_conservativeness;
-		$mathml = $rpage->math_mathml;
-	}
-	if ( is_null( $mathml ) || $mathml === '' )
-		$mathml = "<h3>Failed to generate MathML</h3>";
-	else
-		$mathml = "<h3>MathML</h3><math xmlns=\"http://www.w3.org/1998/Math/MathML\">$mathml</math>";
-	$image = "<h3>Image</h3>" . xlinkToMathImage ( $tex, $outmd5 );
-	$cmd = "./math/texvc_tex ".escapeshellarg($tex)." ".escapeshellarg($wgInputEncoding);
-	$outtex = `$cmd`;
-
-	if ( is_null( $outhtml ) || $outhtml === '' )
-		$outhtml = "<h3>Failed to generate HTML</h3>";
-	else
-		if ( $conservativeness == 2)
-			$outhtml = "<h3>HTML (conservative)</h3>" . $outhtml;
-		else if ( $conservativeness == 1)
-			$outhtml = "<h3>HTML (moderate)</h3>" . $outhtml;
-		else
-			$outhtml = "<h3>HTML (liberal)</h3>" . $outhtml;
-
-	if ( $outtex == '' )
-		$outtex = "<h3>Failed to generate TeX</h3>";
-	else
-		$outtex = "<h3>TeX</h3>" . wfEscapeHTML($outtex);
-
-	return $outtex . $outhtml . $mathml . $image;
-}
-
-global $math;
-if ($math != '')
-	print texvc_cgi_renderMath($math);
-?>
-</body></html>