From 4b0a8d96c091b3e6a7731e35e56763792e69356e Mon Sep 17 00:00:00 2001
From: Anthony Parsons <ant@specialops.ath.cx>
Date: Thu, 17 Nov 2005 23:38:59 +0000
Subject: [PATCH] Minor edits in con.php/COPYING Changed a sprintf to a
 vsprintf in class debugmysqli

---
 COPYING                   |  2 +-
 con.php                   | 44 +++++++++++++++++++++++---------------------
 lib/class.debugmysqli.php |  2 +-
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/COPYING b/COPYING
index bad3bda..57624c3 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright © 2004, 2005 Anthony Parsons
+Copyright © 2004-2005 Anthony Parsons
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the use
diff --git a/con.php b/con.php
index 4b42b9a..d3fdce6 100644
--- a/con.php
+++ b/con.php
@@ -1,15 +1,20 @@
 <?php
 /**
- * Generic setup file.
+ * con.php: Generic setup file.
+ *
  * Contains user authentication, database connection and other exciting stuff.
+ * Everything else depends on this file. Don't touch it unless you know what
+ * you're doing, all the config is done in other places.
+ *
+ * @author Anthony Parsons (irc://specialops.ath.cx/whitefyre)
+ * @license file:COPYING
  * @version $Id$
  */
 
 /**
- * Source revision displayed in page footer.
- * This is actually inaccurate, since it's only the revision number of this file.
- * Doing it accurately would mean parsing out the maximum version using EVERY file.
- * Not worth the overhead IMO.
+ * Source revision (for this file) displayed in the page footer.
+ * This is deliberately inaccurate, since doing it accurately would involve
+ * parsing out the version number from EVERY file.
  */
 define('SO2VER', '$Rev$');
 
@@ -25,15 +30,11 @@ if ( version_compare(PHP_VERSION, '5.0', '<') ) {
 	die('Fatal Server Error: PHP 5.0 or higher is required.');
 }
 
-/**
- * Use verbose errors. They won't be shown to the general public anyway.
- */
+/** Use verbose errors. They won't be shown to the general public anyway. */
 error_reporting(E_ALL|E_STRICT);
 
 
-/**
- * Start counting for that timer at the bottom of each page.
- */
+/** Start counting for that timer at the bottom of each page. */
 define('CLOCK',  microtime(1));
 
 
@@ -46,12 +47,15 @@ class InvalidInputException extends Exception {}
 class DatabaseException     extends Exception {}
 class RateLimitException    extends Exception {}
 
+
 /**
  * SPL exception classes
  *
  * These classes are defined in the Standard PHP Library in PHP 5.1 and above.
- * They're used in SO2 the same as the above 3. If you know you're only going
- * to be running Special Ops 2 on a 5.1 server, you can delete this bit.
+ * They're used in SO2 the same as the above ones.
+ * If you know you're only going to be running Special Ops 2 on a 5.1 server,
+ * you can delete this block of code to speed all the pages up by a tiny amount.
+ * Then again, if you want blinding speed, why would you use OOP-heavy code?
  */
 if ( version_compare(PHP_VERSION, '5.1', '<') ) {
 	class OutOfBoundsException extends Exception {}
@@ -81,6 +85,7 @@ function __autoload($classname)
 	require 'lib/class.'.$classname.'.php';
 }
 
+
 /**
  * Debug settings
  *
@@ -91,11 +96,7 @@ if ( !isset($_SERVER['REMOTE_ADDR']) || $_SERVER['REMOTE_ADDR'] === $_SERVER['SE
 	define('DEVELOPER', 1);
 
 
-/**
- * Create page object.
- *
- * The earlier this is done the better, because it contains the error handler stuff.
- */
+/** Create page object. The earlier this is done the better, because it contains the error handler stuff. */
 $page = new page;
 
 
@@ -107,8 +108,8 @@ $page = new page;
  */
 if ( defined('DEVELOPER') ) {
 	/**
-	 * This lets us switch off XHTML mode later if something buggers up.
-	 * Fixing PHP errors is a lot easier when they're not hidden behind XML ones.
+	 * Using the output buffer lets us switch off XHTML mode later if something buggers up.
+	 * Fixing PHP errors is a lot less stressful when they're not hidden behind XML ones.
 	 */
 	ob_start();
 
@@ -133,12 +134,13 @@ set_exception_handler('e_handler');
 
 
 /**
- * Database thingers
+ * Database thingers.
  *
  * @example res/mysql_ident.example
  */
 require 'mysql_ident.php';
 
+
 /**
  * Open database connection here
  *
diff --git a/lib/class.debugmysqli.php b/lib/class.debugmysqli.php
index 4b38916..2cf0397 100644
--- a/lib/class.debugmysqli.php
+++ b/lib/class.debugmysqli.php
@@ -15,7 +15,7 @@ class debugmysqli extends mysqli
 			$result2 = $this->query('SHOW WARNINGS');
 			$out = '';
 			while ( $row = $result2->fetch_row() )
-				$out .= sprintf("%s #%s: %s\n", $row[0], $row[1], $row[2]);
+				$out .= vsprintf("%s #%s: %s\n", $row);
 			throw new RuntimeException("MySQLi query() warning(s)\n".$out."\nQuery given was: \n".$q, E_USER_WARNING);
 		}
 		$this->c++;
-- 
2.11.4.GIT