1 files changed, 4 insertions, 52 deletions

diff --git a/src/etc/inc/xmlrpc.inc b/src/etc/inc/xmlrpc.inc
index e96e783..001777c 100644
--- a/src/etc/inc/xmlrpc.inc
+++ b/src/etc/inc/xmlrpc.inc
@@ -1,7 +1,5 @@
 <?php
 /*
-	$Id$
-
 	xmlrpc.inc
 	Copyright (C) 2005-2006 Colin Smith
 	All rights reserved.
@@ -28,11 +26,6 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-/*
-	pfSense_BUILDER_BINARIES:
-	pfSense_MODULE:	utils
-*/
-
 require_once("auth.inc");
 require_once("xmlrpc_client.inc");
 
@@ -52,30 +45,6 @@ function xmlrpc_params_to_php($params) {
  *   xmlrpc_value_to_php: Convert an XMLRPC value into a PHP scalar/array and return it.
  */
 function xmlrpc_value_to_php($raw_value) {
-	/*
-		switch ($raw_value->kindOf()) {
-			case "scalar":
-				if ($raw_value->scalartyp() == "boolean") {
-					$return = (boolean) $raw_value->scalarval();
-				}
-				$return = $raw_value->scalarval();
-				break;
-			case "array":
-				$return = array();
-				for ($i = 0; $i < $raw_value->arraysize(); $i++) {
-					$value = $raw_value->arraymem($i);
-					$return[] = xmlrpc_value_to_php($value);
-				}
-				break;
-			case "struct":
-				$return = array();
-				for ($i = 0; $i < $raw_value->arraysize(); $i++) {
-					list($key, $value) = $raw_value->structeach();
-					$return[$key] = xmlrpc_value_to_php($value);
-				}
-				break;
-		}
-	*/
 	return XML_RPC_decode($raw_value);
 }
 
@@ -85,25 +54,6 @@ function xmlrpc_value_to_php($raw_value) {
 function php_value_to_xmlrpc($value, $force_array = false) {
 	$toreturn = XML_RPC_encode($value);
 	return $force_array ? array($toreturn) : $toreturn;
-	/*
-		if (gettype($value) == "array") {
-			$xmlrpc_type = "array";
-			$toreturn = array();
-			foreach ($value as $key => $val) {
-				if (is_string($key)) {
-					$xmlrpc_type = "struct";
-				}
-				$toreturn[$key] = php_value_to_xmlrpc($val);
-			}
-			return new XML_RPC_Value($toreturn, $xmlrpc_type);
-		} else {
-			if ($force_array == true) {
-				return new XML_RPC_Value(array(new XML_RPC_Value($value, gettype($value))), "array");
-			} else {
-				return new XML_RPC_Value($value, gettype($value));
-			}
-		}
-	*/
 }
 
 /*
@@ -123,7 +73,8 @@ function xmlrpc_auth(&$params) {
 			array_shift($params);
 			unset($params['xmlrpcauth']);
 			return true;
-		} else if (!empty($params['xmlrpcauth']) && (authenticate_user("admin", $params['xmlrpcauth'], $authcfg) ||
+		} else if (!empty($params['xmlrpcauth']) &&
+		    (authenticate_user("admin", $params['xmlrpcauth'], $authcfg) ||
 		    authenticate_user("admin", $params['xmlrpcauth']))) {
 			array_shift($params);
 			unset($params['xmlrpcauth']);
@@ -133,7 +84,8 @@ function xmlrpc_auth(&$params) {
 		array_shift($params);
 		unset($params['xmlrpcauth']);
 		return true;
-	} else if (!empty($params['xmlrpcauth']) && authenticate_user("admin", $params['xmlrpcauth'])) {
+	} else if (!empty($params['xmlrpcauth']) &&
+	    authenticate_user("admin", $params['xmlrpcauth'])) {
 		array_shift($params);
 		unset($params['xmlrpcauth']);
 		return true;